sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Merge with git://www.denx.de/git/u-boot-testing

This commit is contained in:
Wolfgang Denk 2007-05-15 22:12:06 +02:00
parent e73865897f 426a44277f
commit 6844535a71
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/main.c
View File

@ -113,7 +113,7 @@ static __inline__ int abortboot(int bootdelay)
u_int i; u_int i;
# ifdef CONFIG_AUTOBOOT_PROMPT # ifdef CONFIG_AUTOBOOT_PROMPT
printf (CONFIG_AUTOBOOT_PROMPT, bootdelay); printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
# endif # endif
# ifdef CONFIG_AUTOBOOT_DELAY_STR # ifdef CONFIG_AUTOBOOT_DELAY_STR
@ -187,7 +187,7 @@ static __inline__ int abortboot(int bootdelay)
} }
# if DEBUG_BOOTKEYS # if DEBUG_BOOTKEYS
if (!abort) if (!abort)
puts ("key timeout\n"); puts("key timeout\n");
# endif # endif
#ifdef CONFIG_SILENT_CONSOLE #ifdef CONFIG_SILENT_CONSOLE
@ -244,13 +244,13 @@ static __inline__ int abortboot(int bootdelay)
# endif # endif
break; break;
} }
udelay (10000); udelay(10000);
} }
printf ("\b\b\b%2d ", bootdelay); printf("\b\b\b%2d ", bootdelay);
} }
putc ('\n'); putc('\n');
#ifdef CONFIG_SILENT_CONSOLE #ifdef CONFIG_SILENT_CONSOLE
if (abort) if (abort)