summaryrefslogtreecommitdiffstats
path: root/board/shannon
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-09-18 09:21:33 +0000
committerwdenk <wdenk>2003-09-18 09:21:33 +0000
commit5f535fe170e2cd90ee65922cbad1a5428d85a9e6 (patch)
treed0b1d5af2252f461fd3533c90e5aa215d6ac5b1d /board/shannon
parentb0639ca33214eedeb026ce45ad1871d477cdbfb8 (diff)
downloadbootable_bootloader_goldelico_gta04-5f535fe170e2cd90ee65922cbad1a5428d85a9e6.zip
bootable_bootloader_goldelico_gta04-5f535fe170e2cd90ee65922cbad1a5428d85a9e6.tar.gz
bootable_bootloader_goldelico_gta04-5f535fe170e2cd90ee65922cbad1a5428d85a9e6.tar.bz2
* 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.c2
-rw-r--r--board/shannon/shannon.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/shannon/flash.c b/board/shannon/flash.c
index 74f5f69..65ebc27 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 1876e3e..c090bde 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;