* 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
diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c
index ebbd6f4..9a67755 100644
--- a/board/at91rm9200dk/flash.c
+++ b/board/at91rm9200dk/flash.c
@@ -160,7 +160,7 @@
 		if (i == 0)
 			flashbase = PHYS_FLASH_1;
 		else
-			panic ("configured to many flash banks!\n");
+			panic ("configured too many flash banks!\n");
 
 		sector = 0;
 		start_address = flashbase;
diff --git a/board/cradle/flash.c b/board/cradle/flash.c
index e2d174e..d867a11 100644
--- a/board/cradle/flash.c
+++ b/board/cradle/flash.c
@@ -59,7 +59,7 @@
 		flashbase = PHYS_FLASH_2;
 		break;
 	 default:
-		panic("configured to many flash banks!\n");
+		panic("configured too many flash banks!\n");
 		break;
       }
       for (j = 0; j < flash_info[i].sector_count; j++)
diff --git a/board/csb226/flash.c b/board/csb226/flash.c
index 9801773..6b0e51a 100644
--- a/board/csb226/flash.c
+++ b/board/csb226/flash.c
@@ -62,7 +62,7 @@
 				flashbase = PHYS_FLASH_1;
 				break;
 			default:
-				panic("configured to many flash banks!\n");
+				panic("configured too many flash banks!\n");
 				break;
 		}
 		for (j = 0; j < flash_info[i].sector_count; j++) {
diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c
index 4416393..60874ba 100644
--- a/board/dnp1110/flash.c
+++ b/board/dnp1110/flash.c
@@ -74,7 +74,7 @@
 		 flash_get_offsets(PHYS_FLASH_1, &flash_info[i]);
 		break;
 	   default:
-		panic("configured to many flash banks!\n");
+		panic("configured too many flash banks!\n");
 		break;
 	}
 	size += flash_info[i].size;
diff --git a/board/ep7312/flash.c b/board/ep7312/flash.c
index 1ee0a37..c687cc7 100644
--- a/board/ep7312/flash.c
+++ b/board/ep7312/flash.c
@@ -50,7 +50,7 @@
 		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++) {
 			flash_info[i].start[j] = flashbase + j * MAIN_SECT_SIZE;
 		}
diff --git a/board/impa7/flash.c b/board/impa7/flash.c
index da4d31e..3e380e5 100644
--- a/board/impa7/flash.c
+++ b/board/impa7/flash.c
@@ -53,7 +53,7 @@
 	else if (i == 1)
 	  flashbase = PHYS_FLASH_2;
 	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++)
 	{
 	    if (j <= 7)
diff --git a/board/innokom/flash.c b/board/innokom/flash.c
index 3caf43d..29c9166 100644
--- a/board/innokom/flash.c
+++ b/board/innokom/flash.c
@@ -276,7 +276,7 @@
 				flashbase = PHYS_FLASH_1;
 				break;
 			default:
-				panic("configured to many flash banks!\n");
+				panic("configured too many flash banks!\n");
 				break;
 		}
 		for (j = 0; j < flash_info[i].sector_count; j++) {
diff --git a/board/lart/flash.c b/board/lart/flash.c
index ad6134b..013c2fd 100644
--- a/board/lart/flash.c
+++ b/board/lart/flash.c
@@ -86,7 +86,7 @@
 	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++)
 	{
 	    if (j <= 7)
diff --git a/board/logodl/flash.c b/board/logodl/flash.c
index cef0b4d..8c304f9 100644
--- a/board/logodl/flash.c
+++ b/board/logodl/flash.c
@@ -91,7 +91,7 @@
 		flashbase = PHYS_FLASH_2;
 		break;
 	   default:
-		panic("configured to many flash banks!\n");
+		panic("configured too many flash banks!\n");
 		break;
 	}
 	for (j = 0; j < flash_info[i].sector_count; j++)
diff --git a/board/lubbock/flash.c b/board/lubbock/flash.c
index 9e07b11..ba82892 100644
--- a/board/lubbock/flash.c
+++ b/board/lubbock/flash.c
@@ -76,7 +76,7 @@
 			flash_get_offsets (PHYS_FLASH_2, &flash_info[i]);
 			break;
 		default:
-			panic ("configured to many flash banks!\n");
+			panic ("configured too many flash banks!\n");
 			break;
 		}
 		size += flash_info[i].size;
diff --git a/board/ml2/flash.c b/board/ml2/flash.c
index 090725d..4f805a6 100644
--- a/board/ml2/flash.c
+++ b/board/ml2/flash.c
@@ -72,7 +72,7 @@
 		if (i==0)
 			flashbase = CFG_FLASH_BASE;
 		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++)
 				flash_info[i].start[j]=flashbase + j * SECT_SIZE;
 
diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c
index 91517c4..829396b 100644
--- a/board/mpl/vcma9/flash.c
+++ b/board/mpl/vcma9/flash.c
@@ -80,7 +80,7 @@
 	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++)
 	{
 	    if (j <= 3)
diff --git a/board/omap1510inn/flash.c b/board/omap1510inn/flash.c
index 6b2739d..9453987 100644
--- a/board/omap1510inn/flash.c
+++ b/board/omap1510inn/flash.c
@@ -72,7 +72,7 @@
 			flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
 			break;
 		default:
-			panic ("configured to many flash banks!\n");
+			panic ("configured too many flash banks!\n");
 			break;
 		}
 		size += flash_info[i].size;
diff --git a/board/omap1610inn/flash.c b/board/omap1610inn/flash.c
index 59f5b68..0108545 100644
--- a/board/omap1610inn/flash.c
+++ b/board/omap1610inn/flash.c
@@ -96,7 +96,7 @@
 			flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
 			break;
 		default:
-			panic ("configured to many flash banks!\n");
+			panic ("configured too many flash banks!\n");
 			break;
 		}
 		size += flash_info[i].size;
diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c
index 2f7ce52..d52a847 100644
--- a/board/sc520_cdp/flash.c
+++ b/board/sc520_cdp/flash.c
@@ -234,7 +234,7 @@
 			flashbase = SC520_FLASH_BANK2_BASE;
 			break;
 		default:
-			panic("configured to many flash banks!\n");
+			panic("configured too many flash banks!\n");
 		}
 
 		id = identify_flash(flashbase, 4);
diff --git a/board/sc520_cdp/flash_old.c b/board/sc520_cdp/flash_old.c
index 416b01d..3c0f6d6 100644
--- a/board/sc520_cdp/flash_old.c
+++ b/board/sc520_cdp/flash_old.c
@@ -101,7 +101,7 @@
 			flashbase = SC520_FLASH_BANK0_BASE;
 			break;
 		default:
-			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/sc520_spunk/flash.c b/board/sc520_spunk/flash.c
index d97dc21..4942e59 100644
--- a/board/sc520_spunk/flash.c
+++ b/board/sc520_spunk/flash.c
@@ -239,7 +239,7 @@
 			flashbase = SC520_FLASH_BANK0_BASE;
 			break;
 		default:
-			panic("configured to many flash banks!\n");
+			panic("configured too many flash banks!\n");
 		}
 
 		id = identify_flash(flashbase, 2);
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 @@
 	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..c090bde4 100644
--- a/board/shannon/shannon.c
+++ b/board/shannon/shannon.c
@@ -60,7 +60,7 @@
 	*(unsigned long *)temp = 0x00060006;
 
 	}
-#endif /* CONFIG_INIT_CRITICAL */
+#endif /* CONFIG_INFERNO */
 
 	/* arch number for shannon */
 	gd->bd->bi_arch_number = 97;
diff --git a/board/smdk2410/flash.c b/board/smdk2410/flash.c
index d7479f0..a37c6f8 100644
--- a/board/smdk2410/flash.c
+++ b/board/smdk2410/flash.c
@@ -80,7 +80,7 @@
 	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++)
 	{
 	    if (j <= 3)