From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerry Van Baren Date: Thu, 17 Jul 2008 06:21:32 -0400 Subject: [U-Boot-Users] v1.3.4-rc1 released In-Reply-To: <20080717082426.9823F240EE@gemini.denx.de> References: <20080717082426.9823F240EE@gemini.denx.de> Message-ID: <487F1D2C.4050409@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Wolfgang Denk wrote: > In message <487EE97F.8010603@denx.de> you wrote: >> Didnt know this ... so we must change something in common/main.c :-( > > Yes. > >> Whats with something like this? > > Looks way too complicated to me. What do you think about the PATCH / > RFC I posted yesterday? > > Best regards, > > Wolfgang Denk I presume you considered and discarded using a special #define (e.g. CONFIG_AUTOBOOT_PROMPT_0) for the no value case. It only hurts our #ifdef hellcount a little and changes our "touch" count from to 5 (4 if I fix sacsng). diff --git a/common/main.c b/common/main.c index 79ad291..09e6033 100644 --- a/common/main.c +++ b/common/main.c @@ -115,8 +115,10 @@ static __inline__ int abortboot(int bootdelay) u_int presskey_max = 0; u_int i; -# ifdef CONFIG_AUTOBOOT_PROMPT +# if defined(CONFIG_AUTOBOOT_PROMPT) printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); +# elif defined(CONFIG_AUTOBOOT_PROMPT_0) + c # endif # ifdef CONFIG_AUTOBOOT_DELAY_STR