[U-Boot-Users] v1.3.4-rc1 released

[Heiko Schocher <hs@denx.de>]

Hello Wolfgang,

Wolfgang Denk wrote:
> Dear Heiko,
>
> in message <487E4C16.5050603@invitel.hu> you wrote:
>> diff --git a/include/configs/sc3.h b/include/configs/sc3.h
>> index f6e40de..0ff889a 100644
>> --- a/include/configs/sc3.h
>> +++ b/include/configs/sc3.h
>> @@ -132,7 +132,8 @@
>>
>>  #if 1	/* feel free to disable for development */
>>  #define CONFIG_AUTOBOOT_KEYED		/* Enable password protection	*/
>> -#define CONFIG_AUTOBOOT_PROMPT		"\nSC3 - booting... stop with ENTER\n"
>> +#define CONFIG_AUTOBOOT_PROMPT		"\nSC3 - booting in %d seconds ..." \
>> +					" stop with ENTER\n"
>>  #define CONFIG_AUTOBOOT_DELAY_STR	"\r"	/* 1st "password"	*/
>>  #define CONFIG_AUTOBOOT_DELAY_STR2	"\n"	/* 1st "password"	*/
>>  #endif

Didnt know this ... so we must change something in common/main.c :-(

Whats with something like this?

diff --git a/common/main.c b/common/main.c
index 79ad291..a8d05f4 100644
--- a/common/main.c
+++ b/common/main.c
@@ -87,6 +87,13 @@ int do_mdm_init = 0;
 extern void mdm_init(void); /* defined in board.c */
 #endif

+void __autoboot_prompt(int bootdelay)
+{
+	return;
+}
+void inline autoboot_prompt(int bootdelay)
+                __attribute__((weak, alias("__autoboot_prompt")));
+
 /***************************************************************************
  * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
  * returns: 0 -  no key string, allow autoboot
@@ -115,9 +122,7 @@ static __inline__ int abortboot(int bootdelay)
 	u_int presskey_max = 0;
 	u_int i;

-#  ifdef CONFIG_AUTOBOOT_PROMPT
-	printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
-#  endif
+	autoboot_prompt(bootdelay);

 #  ifdef CONFIG_AUTOBOOT_DELAY_STR
 	if (delaykey[0].str == NULL)


and of course, we must also fix all boards which use CONFIG_AUTOBOOT_PROMPT :-(

bye
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany