diff options
author | wdenk <wdenk> | 2003-09-18 09:21:33 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2003-09-18 09:21:33 +0000 |
commit | 5f535fe170e2cd90ee65922cbad1a5428d85a9e6 (patch) | |
tree | d0b1d5af2252f461fd3533c90e5aa215d6ac5b1d /board/shannon | |
parent | b0639ca33214eedeb026ce45ad1871d477cdbfb8 (diff) | |
download | u-boot-5f535fe170e2cd90ee65922cbad1a5428d85a9e6.tar.gz u-boot-5f535fe170e2cd90ee65922cbad1a5428d85a9e6.tar.bz2 u-boot-5f535fe170e2cd90ee65922cbad1a5428d85a9e6.zip |
* Patches by Anders Larsen, 17 Sep 2003:
- fix spelling errors
- set GD_FLG_DEVINIT flag only after device function pointers
are valid
- Allow CFG_ALT_MEMTEST on systems where address zero isn't
writeable
- enable 3.rd UART (ST-UART) on PXA(XScale) CPUs
- trigger watchdog while waiting in serial driver
Diffstat (limited to 'board/shannon')
-rw-r--r-- | board/shannon/flash.c | 2 | ||||
-rw-r--r-- | board/shannon/shannon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/shannon/flash.c b/board/shannon/flash.c index 74f5f6929b..65ebc279c5 100644 --- a/board/shannon/flash.c +++ b/board/shannon/flash.c @@ -73,7 +73,7 @@ ulong flash_init(void) if (i == 0) flashbase = PHYS_FLASH_1; else - panic("configured to many flash banks!\n"); + panic("configured too many flash banks!\n"); for (j = 0; j < flash_info[i].sector_count; j++) { diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c index 1876e3ed31..c090bde4aa 100644 --- a/board/shannon/shannon.c +++ b/board/shannon/shannon.c @@ -60,7 +60,7 @@ int board_init (void) *(unsigned long *)temp = 0x00060006; } -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_INFERNO */ /* arch number for shannon */ gd->bd->bi_arch_number = 97; |