diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index e11205d..a55b268 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -14,6 +14,5 @@
 #define CONFIG_CMD_EXPORTENV 1
 #define CONFIG_CMD_GO 1
 #define CONFIG_CMD_IMPORTENV 1
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #endif
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
new file mode 100644
index 0000000..430890c
--- /dev/null
+++ b/include/config_fallbacks.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2012 Texas Instruments
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License Version 2. This file is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __CONFIG_FALLBACKS_H
+#define __CONFIG_FALLBACKS_H
+
+#ifndef CONFIG_SYS_BAUDRATE_TABLE
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+#endif
+
+#endif	/* __CONFIG_FALLBACKS_H */
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index b598371..fd074fb 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -142,7 +142,6 @@
 #define CONFIG_SYS_INIT_CHAN2		0
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 88fba5c..9a65cbc 100644
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -186,7 +186,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    14745600 /* use external serial clock   */
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 50796af..9994476 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -137,7 +137,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	14745600 /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index 0f79f1e..7f48499 100644
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -135,7 +135,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 015027d..39c29ec 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -62,7 +62,6 @@
 
 #define CONFIG_BAUDRATE		115200	    /* ... at 115200 bps */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_TIMESTAMP			/* Print image info with timestamp */
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 73925cd..8a73a9a 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -75,7 +75,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1		*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps		*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index 70b2215..be9238e 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -111,7 +111,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	14745600 /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 4d6d56a..84e4e78 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -194,7 +194,6 @@
 #define CONFIG_SYS_BASE_BAUD		691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index e73be59..63d838f 100644
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 20e5113..afe8d6e 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -123,7 +123,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index a024e2b..cf1d1b3 100644
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -136,7 +136,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 21b5d6f..d17458e 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -145,7 +145,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index 856583c..a0d16d2 100644
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -144,7 +144,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 4a7363f..98b8ef5 100644
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -146,7 +146,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 3768934..a6af86c 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -239,7 +239,6 @@
 #define CONFIG_SYS_HZ			1000		/* decr freq: 1ms ticks */
 #define CONFIG_SYS_BUS_CLK		133000000	/* 133 MHz (CPU = 5*Bus = 666MHz)		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_TCLK		133000000
diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index 35c1801..35daed0 100644
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -120,7 +120,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	1843200	 /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 8fde1a3..4aaceb7 100644
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -140,7 +140,6 @@
  * drives the system clock.
  */
 #define CONFIG_SYS_BASE_BAUD       403225
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index 96b2ecf..c3f3a24 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -328,7 +328,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CONFIG_SYS_TCLK		133000000
 
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_750FX_HID0		0x8000c084
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 0d77fcf..d48f092 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -266,7 +266,6 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 #define CONFIG_SYS_TCLK		133000000
 
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_750FX_HID0		0x8000c084
diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index 7432de1..f6e2652 100644
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -110,7 +110,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 69868c6..24df85a 100644
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -124,7 +124,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	11059200  /* use external serial clock	*/
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index 3aec672..b905402 100644
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -145,7 +145,6 @@
 #define	CONFIG_SYS_HZ			1000		/* decr freq: 1ms ticks	*/
 #define CONFIG_SYS_BUS_CLK		100000000	/* 100 MHz		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #ifdef CONFIG_EVB64260_750CX
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 2eeae6c..43c8842 100644
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -125,7 +125,6 @@
 #define CONFIG_BAUDRATE		115200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 88c368d..d64dd8d 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -162,7 +162,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 7cea807..4a41b5c 100644
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -187,7 +187,6 @@
 #define CONFIG_SYS_BASE_BAUD       691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index d22434a..afb8273 100644
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -129,7 +129,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 93c36cc..135ef55 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -53,7 +53,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 46c2e07..ef652b2 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -205,7 +205,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index f3f9d89..9961fb5 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -189,7 +189,6 @@
 #define CONFIG_SYS_BASE_BAUD       916667
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 64cacff..4df9f4c 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -149,7 +149,6 @@
 #define CONFIG_SYS_INIT_CHAN2	 1
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index fd6d8c4..e4ea178 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -305,7 +305,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xff800000
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 767fa33..0474140 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -246,7 +246,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xFE000000
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index a63c575..ade4893 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -47,7 +47,6 @@
 
 #define CONFIG_PSC_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200, 230400}
 
 #define CONFIG_PCI		1
diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index 9457bd3..f94ad5c 100644
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -48,7 +48,6 @@
 
 #define CONFIG_PSC_CONSOLE	1
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200,\
 						230400}
 
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 53af631..619a800 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_PBSIZE		256		/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16		/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512		/* Buffer size for Boot Arguments passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 
 /* SCIF */
diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index f761450..47110af 100644
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -116,7 +116,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index ab9b89a..9f754c2 100644
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -114,7 +114,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 28baadd..f7ef643 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -171,7 +171,6 @@
 #define	CONFIG_SYS_HZ			1000		/* decr freq: 1ms ticks	*/
 #define CONFIG_SYS_BUS_CLK		133000000	/* 133 MHz		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index d43b401..bf39d00 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -111,7 +111,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 1250000 }
 
 
diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index 0f1b264..6be5c25 100644
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -122,7 +122,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 33ffb36..ae5bc2e 100644
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -100,7 +100,6 @@
 
 #define CONFIG_SYS_NIOS_FIXEDBAUD	1		/* Baudrate is fixed	*/
 #define CONFIG_BAUDRATE		115200		/* Initial baudrate	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}	/* It's fixed ;-)	*/
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	1		/* Suppress console info*/
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 9a93396..242aa31 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -182,7 +182,6 @@
 #define CONFIG_SYS_BASE_BAUD       691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index f668d1d..3fe2b3e 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -102,7 +102,6 @@
 
 #define CONFIG_SYS_NIOS_FIXEDBAUD	1		/* Baudrate is fixed	*/
 #define CONFIG_BAUDRATE		115200		/* Initial baudrate	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}	/* It's fixed ;-)	*/
 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	1		/* Suppress console info*/
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 1692ed1..1cce57e 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -146,7 +146,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 7addabb..9b01e4f 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -46,7 +46,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 5fa5ac5..2d45618 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -203,7 +203,6 @@
 #define CONFIG_SYS_BASE_BAUD		691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 4cedf07..9ddf626 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -189,7 +189,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xFE000000
diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 96b562c..feaadf3 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -59,7 +59,6 @@
 #define CONFIG_SERIAL_MULTI	1	/* support multiple consoles */
 #define CONFIG_PSC_CONSOLE2	6	/* second console is on PSC6 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index e2e392c..2267d59 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -62,7 +62,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 7136233..3a01292 100644
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -198,7 +198,6 @@
 #define	I2C_TRISTATE	{ __I2C_DIR &= ~SDA; }
 #endif
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index f7f3736..6ea3faa 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -63,7 +63,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1			*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps			*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 #define CONFIG_BOOTCOUNT_LIMIT	1
 
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index a1d51e9..16b2dac 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -63,7 +63,6 @@
  */
 #define CONFIG_PSC_CONSOLE	3	/* console is on PSC3 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index 621ea3f..5b8f41f 100644
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -144,7 +144,6 @@
 #define CONFIG_SYS_BASE_BAUD       691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index 36840cc..2ca4ed0 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -131,7 +131,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 58cd064..1d97d3e 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -138,7 +138,6 @@
 
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600}
 
 #define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address		*/
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 4676ce7..93caacc 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -146,7 +146,6 @@
 
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{9600}
 
 #define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address		*/
diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index eeb4088..504ad96 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -133,7 +133,6 @@
 #define CONFIG_SYS_BASE_BAUD	    691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,     \
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 3baa02c..5f925b3 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -62,7 +62,6 @@
 
 #define CONFIG_BAUDRATE		115200	    /* ... at 115200 bps */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_TIMESTAMP			/* Print image info with timestamp */
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 924b694..4cda22f 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -173,7 +173,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 72995bc..5350f61 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -167,7 +167,6 @@
 
 #define CONFIG_SYS_BUS_CLK		133000000	/* 133 MHz		*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index ef38102..1c13904 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -50,7 +50,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 /* define to enable silent console */
 #define CONFIG_SILENT_CONSOLE
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index a52e4da..bdd2239 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -101,7 +101,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600,	\
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index f72a942..c55571c 100644
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -94,7 +94,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index 586642d..78ee2b5 100644
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -92,7 +92,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 67362e5..c1105df 100644
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -99,7 +99,6 @@
 #define CONFIG_SYS_LOAD_ADDR			0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/aev.h b/include/configs/aev.h
index 5678773..8d0890f 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -59,7 +59,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index a9e1be8..76ef56f 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -37,7 +37,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 95774e0..42a134b 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -77,7 +77,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 38400 }
 
 /* SCIF */
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index e473e7a..d4c5bbd 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -51,7 +51,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index e1b3830..0abe090 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -60,7 +60,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		57600	/* ... at 57600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 #define CONFIG_SILENT_CONSOLE	1	/* needed to silence i2c_init() */
 
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index f312cad..329e4e3 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -114,7 +114,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 1250000 }
 
 
diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index c800753..2997f52 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -157,7 +157,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index 10c91e3..58aa88b 100644
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -122,7 +122,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_ALLOC_DPRAM
diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index a31bf42..a9cfe26 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -58,7 +58,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		9600	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index f0b8494..fb5f868 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -171,7 +171,6 @@
 #define CONFIG_SYS_EXT_SERIAL_CLOCK	3868400	/* use external serial clock */
 #undef  CONFIG_SYS_BASE_BAUD
 #define CONFIG_BAUDRATE		38400	/* Default baud rate */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
     { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400 }
 
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index cf54fcb..5d18ac7 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -170,7 +170,6 @@
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK		/* use internal serial clock */
 #define CONFIG_SYS_BASE_BAUD		691200
 #define CONFIG_BAUDRATE		38400	/* Default baud rate */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE      \
     { 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400 }
 
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 400454f..d517334 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -59,7 +59,6 @@
  */
 #define CONFIG_PSC_CONSOLE	4	/* console is on PSC4  */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200  bps  */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h
index 89c59b7..4eda91e 100644
--- a/include/configs/dvlhost.h
+++ b/include/configs/dvlhost.h
@@ -100,7 +100,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x00010000
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
 					  115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE	1
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 6f20827..4d09132 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -117,7 +117,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 9e9b25b..9b7cc66 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -95,7 +95,6 @@
 
 #define CONFIG_CONS_INDEX	1	/*Console on UART0 */
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{ 9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600 }
 
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index a88e910..2b40f59 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -173,7 +173,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_FLASH_BASE		0xFF800000
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index fa44708..04c0708 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -184,7 +184,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 8ce297d..3df1fae 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512	/* Buffer size for Boot Arguments
 								passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate
 												settings for this board */
 
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 9249533..a38298f 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -65,7 +65,6 @@
 					/* register later on to  */
 					/* enable UART function! */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index d37b39f..dd6c41d 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -67,7 +67,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 85f1b03..7068ff8 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -61,7 +61,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 8b8a3fb..5006322 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -48,7 +48,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 6bdd35d..f3639dd 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -55,7 +55,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 6d5044c..fb9a3f9 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -54,7 +54,6 @@
  * Serial console configuration
  */
 #define CONFIG_BAUDRATE		38400	/* ... at 38400 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 077079c..76e911a 100644
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -49,7 +49,6 @@
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* Only interrupt boot if space is pressed */
diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 2e680e5..354072a 100644
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -48,7 +48,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1	*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* Partitions */
diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 1e80ec0..8c9f3d1 100644
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -289,7 +289,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define	CONFIG_SYS_I2C_SPEED		50000
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index c62cf67..2b0b616 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -57,7 +57,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1	*/
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index db5c7e1..cfa4d8c 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -53,7 +53,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 9600 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_CMDLINE_EDITING	1	/* add command line history */
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index e338b66..f5adccb 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -54,7 +54,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index f6208ca..7a01705 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -78,7 +78,6 @@
 #define CONFIG_SYS_HZ			1000	/* decr. freq: 1 ms ticks */
 
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_LOADS_ECHO
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index e308448..405bc69 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -242,7 +242,6 @@
  * When the watchdog is enabled, output must be fast enough in Linux.
  */
 #ifdef CONFIG_WATCHDOG
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{		38400, 57600, 115200 }
 #endif
 
diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h
index 2addd34..3e4131e 100644
--- a/include/configs/manroland/mpc5200-common.h
+++ b/include/configs/manroland/mpc5200-common.h
@@ -39,7 +39,6 @@
  * Serial console configuration
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1	*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200,\
 					 230400 }
 
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index c67dfaa..b56b273 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -88,7 +88,6 @@
 #error "Select only one console device!"
 #endif
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_MII		1
diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 9652a6e..22e95b3 100644
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -62,7 +62,6 @@
 #else
 #define CONFIG_BAUDRATE		9600	/* ... at 115200 bps */
 #endif
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_MII
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 25a815c..efca136 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -36,7 +36,6 @@
 # define CONFIG_XILINX_UARTLITE
 # define CONFIG_SERIAL_BASE	XILINX_UARTLITE_BASEADDR
 # define CONFIG_BAUDRATE	XILINX_UARTLITE_BAUDRATE
-# undef CONFIG_SYS_BAUDRATE_TABLE
 # define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 # define CONSOLE_ARG	"console=console=ttyUL0,115200\0"
 #elif XILINX_UART16550_BASEADDR
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index fdeebc8..bdcae59 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -75,7 +75,6 @@
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_NETCONSOLE	1	/* network console */
 #define CONFIG_BAUDRATE		115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 3d7c820..0f7edff 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_PBSIZE		256	/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE		512	/* Buffer size for Boot Arguments passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index de77aa2..afa82cf 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -61,7 +61,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index f5d6731..7cf641f 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -63,7 +63,6 @@
 #define CONFIG_SYS_PBSIZE		256		/* Buffer size for Console output */
 #define CONFIG_SYS_MAXARGS		16		/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE		512		/* Buffer size for Boot Arguments passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate settings for this board */
 
 /* SCIF */
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 0e14dce..18bd37e 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -215,7 +215,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
diff --git a/include/configs/munices.h b/include/configs/munices.h
index a0296d8..425a1d8 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -61,7 +61,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define	CONFIG_TIMESTAMP	1	/* Print image info with timestamp */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 229ba5d..1a63791 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -70,7 +70,6 @@
 
 #define CONFIG_CONS_INDEX	1	/*Console on UART0 */
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, \
 					  115200,230400, 460800, 921600 }
 /* auto boot */
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 6863576..17017a5 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -46,7 +46,6 @@
 #define CONFIG_ALTERA_JTAG_UART_BYPASS
 #define CONFIG_SYS_NIOS_FIXEDBAUD
 #define CONFIG_BAUDRATE		CONFIG_SYS_UART_BAUD
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{CONFIG_BAUDRATE}
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index cce2b63..22eb004 100644
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -43,7 +43,6 @@
  */
 #define CONFIG_PSC_CONSOLE	5	/* console is on PSC5 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 3a2d849..b60ece3 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -89,7 +89,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	(-2)
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{115200}
 
 /* allow to overwrite serial and ethaddr */
diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index ac4e5fc..5ff410d 100644
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -55,7 +55,6 @@
 # define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_CLK_FREQ
 
 #define CONFIG_BAUDRATE			CONFIG_SYS_UART_BAUD
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{CONFIG_BAUDRATE}
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 #define CONSOLE_ARG			"console=console=ttyS0,115200\0"
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index c70cc6b..e44009e 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -108,7 +108,6 @@
 #define CONFIG_MPSC			/* MV64460 Serial		*/
 #define CONFIG_MPSC_PORT	0
 #define CONFIG_BAUDRATE		115200	/* console baudrate		*/
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index ff1468b..d7b1ca2 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -90,7 +90,6 @@
 #undef CONFIG_SYS_EXT_SERIAL_CLOCK
 #define CONFIG_BAUDRATE		115200
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE						\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,		\
 			57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 0685837..1c4d722 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -62,7 +62,6 @@ Serial console configuration
 					/* register later on to */
 					/*enable UART function! */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 91fefc4..4a98545 100644
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -60,7 +60,6 @@
 #else
 #define CONFIG_BAUDRATE		9600	/* ... at 115200 bps */
 #endif
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index ea282a6..dc5ec3a 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -117,7 +117,6 @@
 #define CONFIG_SERIAL_MULTI
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index e7a8c41..59b45c8 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -63,7 +63,6 @@
 /* Buffer size for Boot Arguments passed to kernel */
 #define CONFIG_SYS_BARGSIZE	512
 /* List of legal baudrate settings for this board */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 3a25b30..af9524e 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -26,7 +26,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_BOOTARGS		"console=ttySC3,115200"
 #define CONFIG_BOOTDELAY	3
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 
 #define CONFIG_SYS_LONGHELP	1	/* undef to save memory	*/
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 2d74235..cab6660 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -158,7 +158,6 @@
 #define CONFIG_SYS_BASE_BAUD		691200
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE					\
 	{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400,	\
 	 57600, 115200, 230400, 460800, 921600 }
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index b616456..2d6e51d 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -235,7 +235,6 @@
 #define CONFIG_SYS_BASE_BAUD		921600	/* internal clock */
 
 /* The following table includes the supported baudrates */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 7c3a948..73d2a87 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -73,7 +73,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 0a8df7f..59728f5 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_MAXARGS		16	/* max args accepted for monitor commands */
 #define CONFIG_SYS_BARGSIZE	512	/* Buffer size for Boot Arguments
 								passed to kernel */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }	/* List of legal baudrate
 												settings for this board */
 
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index e94f913..1e71bcc 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -87,7 +87,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200 }
 
 /* SCIF */
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 3c8b24c..fe40bf0 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -46,7 +46,6 @@
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC */
 
 #define CONFIG_BAUDRATE		115200	    /* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /* PCI */
diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index a958fd0..f27466c 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -48,7 +48,6 @@
  */
 #define CONFIG_PSC_CONSOLE	6	/* console is on PSC6 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #ifdef CONFIG_STK52XX
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 84a5f9d..47bb846 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -54,7 +54,6 @@
  */
 #define CONFIG_PSC_CONSOLE	1	/* console is on PSC1 */
 #define CONFIG_BAUDRATE		115200	/* ... at 115200 bps */
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index e2173de..bd7bac0 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -121,7 +121,6 @@
 #define CONFIG_XILINX_UARTLITE
 #define CONFIG_SERIAL_BASE		XPAR_UARTLITE_0_BASEADDR
 #define CONFIG_BAUDRATE			XPAR_UARTLITE_0_BAUDRATE
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
 #else
 #ifdef XPAR_UARTNS550_0_BASEADDR
@@ -132,7 +131,6 @@
 #define CONFIG_SYS_NS16550_COM1		XPAR_UARTNS550_0_BASEADDR
 #define CONFIG_SYS_NS16550_CLK		XPAR_UARTNS550_0_CLOCK_FREQ_HZ
 #define CONFIG_BAUDRATE			115200
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 115200 }
 #endif
 #endif
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index e686891..d72921e 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -118,7 +118,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400}
 #define CONFIG_BAUDRATE			115200
diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 6535ea2..63279b0 100644
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -133,7 +133,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_SERIAL_MULTI
 
-#undef CONFIG_SYS_BAUDRATE_TABLE
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
diff --git a/mkconfig b/mkconfig
index 438530b..daa1810 100755
--- a/mkconfig
+++ b/mkconfig
@@ -167,6 +167,7 @@ cat << EOF >> config.h
 #include <config_defaults.h>
 #include <configs/${CONFIG_NAME}.h>
 #include <asm/config.h>
+#include <config_fallbacks.h>
 EOF
 
 exit 0
