From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Roese <sr@denx.de>
Date: Mon, 11 May 2015 09:44:51 +0200
Subject: [U-Boot] [PATCH v2 4/4] autoboot.c: Add feature to stop
 autobooting via SHA256 encrypted password
In-Reply-To: <55505748.1080205@gmail.com>
References: <1431000847-22183-5-git-send-email-sr@denx.de>
 <1431071533-5908-1-git-send-email-sr@denx.de> <55505748.1080205@gmail.com>
Message-ID: <55505DF3.3030303@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Andreas,

On 11.05.2015 09:16, Andreas Bie?mann wrote:
>>   #  ifdef CONFIG_AUTOBOOT_DELAY_STR
>>   	if (delaykey[0].str == NULL)
>>   		delaykey[0].str = CONFIG_AUTOBOOT_DELAY_STR;
>>   #  endif
>> -#  ifdef CONFIG_AUTOBOOT_STOP_STR
>> +#  ifdef CONFIG_AUTOBOOT_DELAY_STR2
>>   	if (delaykey[1].str == NULL)
>> -		delaykey[1].str = CONFIG_AUTOBOOT_STOP_STR;
>> +		delaykey[1].str = CONFIG_AUTOBOOT_DELAY_STR2;
>> +#  endif
>> +#  ifdef CONFIG_AUTOBOOT_STOP_STR
>> +	if (delaykey[2].str == NULL)
>> +		delaykey[2].str = CONFIG_AUTOBOOT_STOP_STR;
>> +#  endif
>> +#  ifdef CONFIG_AUTOBOOT_STOP_STR2
>> +	if (delaykey[3].str == NULL)
>> +		delaykey[3].str = CONFIG_AUTOBOOT_STOP_STR2;
>>   #  endif
>>
>>   	for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i++) {
>
> isn't this part removed before in 2/4 'autoboot.c: Remove
> CONFIG_AUTOBOOT_STOP_STR2 and CONFIG_AUTOBOOT_DELAY_STR2'?

Right. I messed up while rebasing. v3 will follow hopefully today.

Thanks,
Stefan