diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index 25cd833..d870d12 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -162,9 +162,6 @@
 # undef CONFIG_SYS_HZ
 #endif
 #define CONFIG_SYS_HZ 1000
-#ifndef CONFIG_SYS_BAUDRATE_TABLE
-# define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#endif
 
 /* Blackfin POST tests */
 #ifdef CONFIG_POST_BSPEC1_GPIO_LEDS
diff --git a/board/fads/fads.h b/board/fads/fads.h
index 3dc5358..1a3d22a 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -147,8 +147,6 @@
 
 #define	CONFIG_SYS_HZ		        1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
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/A3000.h b/include/configs/A3000.h
index 0c21bd8..b85244a 100644
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	5
 
diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h
index e7c6f96..e7a6c80 100644
--- a/include/configs/AMX860.h
+++ b/include/configs/AMX860.h
@@ -121,8 +121,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 48e6df5..ecf5fb8 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -101,8 +101,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero)
  */
diff --git a/include/configs/BMW.h b/include/configs/BMW.h
index e1951eb..633e9bd 100644
--- a/include/configs/BMW.h
+++ b/include/configs/BMW.h
@@ -51,7 +51,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_CLOCKS_IN_MHZ	1	/* clocks passsed to Linux in MHz	*/
 
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index ed3f9e1..b2b9e07 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
 
diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index abf4ef4..7ac182f 100644
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -203,8 +203,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFF00100	/* "bad" address		*/
 
 /*
diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index 723bdf3..aa5ce29 100644
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -216,8 +216,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100	/* "bad" address		*/
 
 #define CONFIG_LOOPW
diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 77414ab..c8821fd 100644
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
 
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 346b49c..eb9fe46 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE 9600
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef	CONFIG_MONITOR_IS_IN_RAM		/* starts uboot direct */
 
diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index c6a17b0..da40c18 100644
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -145,7 +145,6 @@
 #define CONFIG_ENV_IS_IN_FLASH	1      /* Environment is in FLASH	*/
 
 #define CONFIG_BAUDRATE		9600   /* console baudrate = 9600 bps	*/
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_ETHADDR		00:01:77:00:60:40
 #define CONFIG_IPADDR		192.168.0.30
diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index a0acfd2..1638d35 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -96,8 +96,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero)
  */
diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h
index 841bf11..9bac44e 100644
--- a/include/configs/ESTEEM192E.h
+++ b/include/configs/ESTEEM192E.h
@@ -102,10 +102,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks	*/
 
-
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index c427093..2703625 100644
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -122,8 +122,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index 57336f9..35c0c7e 100644
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -154,8 +154,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index 438d19e..559a83f 100644
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -100,8 +100,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h
index 339bb59..fa6105d 100644
--- a/include/configs/FLAGADM.h
+++ b/include/configs/FLAGADM.h
@@ -112,8 +112,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 38d905a..6d7ca27 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index ca0b1cc..b074c7d 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 68a0cfd..1ea4108 100644
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -64,16 +64,6 @@
 #define CONFIG_BAUDRATE			38400
 
 /*
- * Set allowable console baud rates
- */
-#define CONFIG_SYS_BAUDRATE_TABLE		{ 9600,		\
-					  19200,	\
-					  38400,	\
-					  57600,	\
-					  115200,	\
-					}
-
-/*
  * Print console information
  */
 #undef	 CONFIG_SYS_CONSOLE_INFO_QUIET
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 8f4e544..a62ef63 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -190,7 +190,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h
index 27bd146..94b05dc 100644
--- a/include/configs/IAD210.h
+++ b/include/configs/IAD210.h
@@ -166,8 +166,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index b011d50..81f219c 100644
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -170,8 +170,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index be778fe..6d0937f 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -215,8 +215,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index ba8d633..2379718 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -135,8 +135,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index d966306..6dd9812 100644
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -175,8 +175,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS	0x04400000
 
 #define CONFIG_MISC_INIT_R	1	/* We need misc_init_r()	*/
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 922b079..d6474bd 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -160,8 +160,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* Decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS	0x09900000
 
 #define CONFIG_MISC_INIT_R			/* We need misc_init_r()	*/
diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index b827954..f98a66b 100644
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -129,8 +129,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index 9b0c32a..d6e9b23 100644
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -126,8 +126,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index 0f4ea41..c3855c3 100644
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -139,8 +139,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 6f462be..a1eaeff 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -36,7 +36,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT		5000
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index bfbb06c..d417e24 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 7bb6dfe..733aece 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 104fcde..9524e10 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -42,7 +42,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef  CONFIG_WATCHDOG
 
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index b843e07..30584fe 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -33,7 +33,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index dd8a560..2feb783 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -33,7 +33,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 1d3b5c3..ac200f5 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -43,7 +43,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG		/* disable watchdog */
 
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index de15163..1a03f5d 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT 10000	/* timeout in milliseconds */
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index e34dc40..9c2a3bb 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -46,7 +46,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 928b044..706e3d6 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef	CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 216244c..896d0d8 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT		5000
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 29b9b2a..64f8302 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index d0044b1..0d09f0e 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index e2e2445..64928e9 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index d934d8e..b623c33 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef CONFIG_WATCHDOG
 
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index f31972c..3bdb867 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 813f0cb..3487e49 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -41,7 +41,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
diff --git a/include/configs/MBX.h b/include/configs/MBX.h
index 79780bd..95ddc97 100644
--- a/include/configs/MBX.h
+++ b/include/configs/MBX.h
@@ -119,8 +119,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 969ba7e..8d1ca48 100644
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -74,8 +74,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index b9c1638..3ff36ad 100644
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -162,8 +162,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index f7fba0c..1391ce5 100644
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -140,8 +140,6 @@
 					   1MB - 64K FLASH0 SEG =960K
 					   (size=0xf0000)*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * NS16550 Configuration
  */
diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index f304272..84a167d 100644
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -49,7 +49,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	5
 
diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 0724752..52d1729 100644
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -66,7 +66,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOT_RETRY_TIME	-1
diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index 46151da..8350830 100644
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -124,8 +124,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index e36476e..31fe893 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -155,8 +155,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index acf5dcb..fd3ab16 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -168,8 +168,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index c58899b..5ca01a0 100644
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -156,8 +156,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index 3494b7a..61b19ab 100644
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -137,8 +137,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 7e3ba2a..5015b79 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -159,8 +159,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/NX823.h b/include/configs/NX823.h
index bb0d3a3..8b13eb0 100644
--- a/include/configs/NX823.h
+++ b/include/configs/NX823.h
@@ -101,8 +101,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index 77cedc0..7e1c11e 100644
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -50,7 +50,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT		""
 #define CONFIG_BOOTDELAY	5
diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index a8d20ca..c3f295b 100644
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -50,7 +50,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		9600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_PREBOOT		""
 #define CONFIG_BOOTDELAY	5
diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index cde0fd6..fbcf8e5 100644
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -200,8 +200,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 74ced5a..c37aafd 100644
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -200,8 +200,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS 0xFDFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 60aabf3..992443a 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -117,10 +117,6 @@
 #undef  CONFIG_SYS_EXT_SERIAL_CLOCK
 #define CONFIG_SYS_BASE_BAUD		691200
 
-/* The following table includes the supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	\
-	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_LOAD_ADDR	0x100000	/* default load address */
 #define CONFIG_SYS_EXTBDINFO	1	/* To use extended board_into (bd_t) */
 
diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index dae4577..93876b1 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -171,7 +171,6 @@
 /*
  * Serial port configuration
  */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index 36efbf2..fa77ffd 100644
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -255,8 +255,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index 5c6ed07..efa7bd6 100644
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -255,8 +255,6 @@
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index b0bee82..3156320 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -165,8 +165,6 @@ CONFIG_SPI
 
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index a8e9a4a..9befacb 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -162,8 +162,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * JFFS2 partitions
  */
diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 40980fe..b042c67 100644
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 267ece1..b215c2d 100644
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -134,8 +134,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h
index 74926d8..8ffb014 100644
--- a/include/configs/RPXlite.h
+++ b/include/configs/RPXlite.h
@@ -103,8 +103,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index efc59fe..f8bcf0f 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -178,7 +178,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address */
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Low Level Configuration Settings
diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index c1865fc..d4d3d57 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -216,9 +216,6 @@
 #define CONFIG_SYS_LOAD_ADDR     0x100000     /* default load address */
 #define CONFIG_SYS_HZ            1000         /* decrementer freq: 1 ms ticks */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index 0f8084e..671d521 100644
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -180,8 +180,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index 73216dc..87d52ba 100644
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -234,8 +234,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFFFFFFC	/* "bad" address		*/
 
 #define CONFIG_MISC_INIT_R		/* have misc_init_r() function	*/
diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 833b18a..e42e2cd 100644
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -109,8 +109,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index fba5b5e..cffeb11 100644
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -121,8 +121,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index 01c2b3d..ea09368 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -90,8 +90,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * BOOTP options
diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 774c98f..b7fbe5e 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -188,8 +188,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index 35171b6..f54fcb3 100644
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -226,7 +226,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* takes up to 10 msec		*/
 
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM , FLASH_BASE1_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index 9ba307e..84e4891 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -194,7 +194,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM , FLASH_BASE1_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h
index c93b12e..d95a226 100644
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -48,7 +48,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		19200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #undef  CONFIG_WATCHDOG
 
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 72c6523..0c52775 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -200,8 +200,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Enable loopw command.
  */
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index f2a2e33..b26e4f4 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -166,8 +166,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index f6b856c..a9bf525 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -161,8 +161,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 626cf19..58c9716 100644
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -268,8 +268,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFFFFFFC	/* "bad" address		*/
 
 /*
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 413ce64..c2618dc 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -332,8 +332,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0x40000104	/* "bad" address		*/
 
 /*
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 6114bb0..d217d3b 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 911560c..52e1125 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -152,8 +152,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index fd90501..e36a2bb 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -155,8 +155,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 3e3f6de..473301a 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -189,8 +189,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index cdf4885..ed61f0f 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -154,8 +154,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 7ccc614..4d7effb 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -155,8 +155,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 79bea34..db7c1c3 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -158,8 +158,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 7693459..af528fd 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -158,8 +158,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 8636ff4..b1cb406 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -201,8 +201,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 5204771..c960a54 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -198,8 +198,6 @@
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Enable loopw command.
  */
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 76cd394..082f3f9 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -181,9 +181,6 @@
 /* we configure PWM Timer 4 to 1ms 1000Hz  */
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* support additional compression methods */
 #define CONFIG_BZIP2
 #define CONFIG_LZO
diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index c06909f..0b6453b 100644
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -86,9 +86,6 @@
 /* don't allow baudrate change	*/
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/* supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE		{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * select ethernet configuration
  *
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 1fafbed..a2b347a 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -71,9 +71,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		18432000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index 8421c79..6bf0add 100644
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -100,9 +100,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		((46080000 * 20) / 25)	/* AG101 */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index ffc70a6..747d061 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -100,9 +100,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		((18432000 * 20) / 25)	/* AG101P */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
index a4628e4..35f88cc 100644
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -99,9 +99,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_CLK		33000000	/* AG102 */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Ethernet
  */
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 2adf8f9..6715cb4 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -157,7 +157,6 @@
 				"rw rootfstype=jffs2 panic=20"
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 8f06cd7..aebca71 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -112,7 +112,6 @@
 #define	CONFIG_ENV_OVERWRITE
 #define	CONFIG_CONS_INDEX	1
 #define	CONFIG_BAUDRATE		115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include	<config_cmd_default.h>
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index d468e49..f89a567 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -147,7 +147,6 @@
  */
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(2)
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 7e6c155..9f908ce 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -129,7 +129,6 @@
 #define CONFIG_USART_BASE	ATMEL_BASE_DBGU
 #define CONFIG_USART_ID		0/* ignored in arm */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_BAUDRATE			115200
 
 /*
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index db52ee6..07b1968 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -73,7 +73,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 /* LED */
 #define CONFIG_AT91_LED
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 5140b26..6fd0b83 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -67,7 +67,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 57600, 38400, 19200, 9600}
 
 /* LCD */
 #define CONFIG_LCD
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f424e5a..40308ca 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -71,7 +71,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 /* LCD */
 #define CONFIG_LCD			1
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 159857d..f46b91b 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -178,7 +178,6 @@
 	"rw rootfstype=jffs2"
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 79ea1f2..45f8baf 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -62,7 +62,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 /* LCD */
 #define CONFIG_LCD			1
diff --git a/include/configs/atc.h b/include/configs/atc.h
index bf1f202..75f950b 100644
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -171,8 +171,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_RESET_ADDRESS 0xFFF00100	/* "bad" address		*/
 
 #define CONFIG_SYS_ALLOC_DPRAM
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index a5ec224..1417240 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -54,7 +54,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_STUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index f325d2b..01e5e90 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -127,8 +127,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index c5226ab..14b8146 100644
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -62,7 +62,6 @@
 #define CONFIG_CONS_INDEX		0
 
 #define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x10009000
 #define CONFIG_SYS_SERIAL1		0x1000A000
 
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 6b68f10..81c9b9b 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -173,7 +173,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 71faf1c..2512a75 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 81e4de4..408e918 100644
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -56,8 +56,6 @@
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * BOOTP options
diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 785ab0a..d85a600 100644
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -56,8 +56,6 @@
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * BOOTP options
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 6d97a0c..c9fdc2c 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -81,7 +81,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		19200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
 
 /* ---
  * set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 7691fb3..4a3b01d 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -56,7 +56,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 8b6a687..a877066 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -487,7 +487,6 @@
 #endif
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #if defined(CONFIG_CPU9G20)
 #define CONFIG_SYS_PROMPT		"CPU9G20=> "
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 1b43c54..dc676df 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -197,7 +197,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x21000000
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_PROMPT		"CPUAT91=> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 781878e..aa7a6ba 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -65,7 +65,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * I2C Configuration
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 989472b..0adbb1f 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -143,7 +143,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 42caf1e..bd17419 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index b05cfba..b232c50 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index a75bce6..92d7227 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0x01c20000
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_HZ_CLOCK
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
 
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 4f14e04..57a6148 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -73,7 +73,6 @@ extern unsigned int davinci_arm_clk_get(void);
 #define CONFIG_SYS_NS16550_CLK		24000000
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* I2C Configuration */
 #define CONFIG_HARD_I2C
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 310d577..f0cc780 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -89,7 +89,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /*===================*/
 /* I2C Configuration */
 /*===================*/
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 949174a..c07002a 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -58,7 +58,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /*===================*/
 /* I2C Configuration */
 /*===================*/
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index c931ede..a62d7aa 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -56,7 +56,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /* I2C Configuration */
 #define CONFIG_HARD_I2C
 #define CONFIG_DRIVER_DAVINCI_I2C
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 854099b..fb26643 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -90,7 +90,6 @@
 #define CONFIG_SYS_NS16550_CLK	CONFIG_SYS_HZ_CLOCK	/* Input clock to NS16550 */
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 /*===================*/
 /* I2C Configuration */
 /*===================*/
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 1d5cf2c..13ddc5c 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -59,7 +59,6 @@
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 #undef	CONFIG_BOOTARGS
diff --git a/include/configs/debris.h b/include/configs/debris.h
index 303630d..32aa4e5 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -294,7 +294,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_FLASH_BANKS		{ FLASH_BASE0_PRELIM }
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index afb1de6..3238ac7 100644
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -93,9 +93,6 @@
 #define CONFIG_SYS_MAXARGS		8	/* max number of command args	*/
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size	*/
 #define CONFIG_SYS_LOAD_ADDR		0x00100000	/* default load address		*/
-
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_MISC_INIT_R	1
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 88b085d..4a03546 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -77,7 +77,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SPI
 #define CONFIG_SPI_FLASH
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 21c471a..4d8be2b 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -188,8 +188,6 @@
  * UART/CONSOLE
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
-
 #define CONFIG_BAUDRATE 115200
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE	ATMEL_BASE_DBGU
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index 120055f..eb7d72b 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -94,7 +94,6 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 #define CONFIG_MXC_GPIO
 
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 29b0d33..7dc6cca 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -83,7 +83,6 @@
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * I2C Configuration
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 221d3e0..7adedc9 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -376,9 +376,6 @@
 
 #define CONFIG_SYS_HZ            1000         /* decrementer freq: 1 ms ticks */
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 604d2dd..5aed0ed 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -103,7 +103,6 @@
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART3			/* USART 3 is DBGU */
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index dd7c73f..44c5532 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -82,7 +82,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /*
  * Command definition
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index e27216a..cc84c9c 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -191,7 +191,6 @@
 
 #define CONFIG_SYS_MEMTEST_START	EBI_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x700000)
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 38400, 19200, 9600, 2400 }
 
 #endif /* __GRASSHOPPER_CONFIG_H */
 /* vim: set ts=8 noet: */
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 2a40de1..7935aea 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -387,9 +387,6 @@
 #define CONFIG_SYS_MEMTEST_END     ( CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 \
 			    - CONFIG_SYS_MEM_END_USAGE )
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE  { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 6d2d4fb..0e9188d 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -98,7 +98,6 @@
 #define CONFIG_SYS_NS16550_CLK		clk_get(DAVINCI_UART2_CLKID)
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Network & Ethernet Configuration
diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index d849b5c..0f29cd1 100644
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -105,8 +105,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_SYS_ALLOC_DPRAM		1	/* use allocation routines	*/
 /*
  * Low Level Configuration Settings
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 520fa4c..791f3f5 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -39,7 +39,6 @@
 #define CONFIG_CONS_INDEX		0
 
 #define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0xfff3cf0c
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 50dd918..86bfa01 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -47,7 +47,6 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE		19200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600 , 19200 , 38400 , 57600, 115200 }
 #define CONFIG_ETHADDR		00:06:3b:01:41:55
 #define CONFIG_ETHPRIME
 #define CONFIG_IPADDR		192.168.30.1
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index ea48d64..186d8b9 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -92,7 +92,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index c1f1aa6..7d2876b 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -105,7 +105,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONS_INDEX	1		/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200		/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Flash & Environment
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index bbcbce1..a340e97 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -87,7 +87,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 3153eb5..1728358 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -65,7 +65,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 70c9bb4..f632a2c 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -47,9 +47,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 0a704cb..fea40fc 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -65,7 +65,6 @@
 #define CONFIG_CONS_INDEX	0
 #define CONFIG_BAUDRATE		38400
 #define CONFIG_PL01x_PORTS	{ (void *) (CONFIG_SYS_SERIAL0), (void *) (CONFIG_SYS_SERIAL1) }
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x16000000
 #define CONFIG_SYS_SERIAL1		0x17000000
 
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 57610a6..ca2d92d 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -74,7 +74,6 @@
 #define CONFIG_PL01x_PORTS	{ (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
 #define CONFIG_CONS_INDEX	0
 #define CONFIG_BAUDRATE		38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x16000000
 #define CONFIG_SYS_SERIAL1		0x17000000
 
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index d644fea..296bbe1 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -182,7 +182,6 @@
 #define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM + PHYS_SDRAM_SIZE)
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT	"jade> "
 #define CONFIG_SYS_CBSIZE	256
diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 203a4b2..e49dc28 100644
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -114,8 +114,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x00100000
 #define CONFIG_SYS_HZ			1000
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_INIT_RAM_ADDR	0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE	0x1000
 #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index cdf6827..bb96034 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -282,7 +282,6 @@
  */
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		57600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 361ffc5..7c8eb64 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -130,9 +130,6 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_CPUSPEED		0x161		/* set core clock to 400/200/100 MHz */
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
 #define CONFIG_PXA_MMC
 #define CONFIG_CMD_MMC
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index e23b0a1..405bc69 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -243,8 +243,6 @@
  */
 #ifdef CONFIG_WATCHDOG
 #define CONFIG_SYS_BAUDRATE_TABLE	{		38400, 57600, 115200 }
-#else
-#define CONFIG_SYS_BAUDRATE_TABLE	{  9600, 19200, 38400, 57600, 115200 }
 #endif
 
 /*----------------------------------------------------------------------*/
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index c62f4d0..b8389e8 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -136,7 +136,6 @@
 #define	CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 #define	CONFIG_CONS_INDEX		0
 #define	CONFIG_BAUDRATE			115200	/* Default baud rate */
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * MMC Driver
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index db1e87d..1e897e2 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -89,7 +89,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 3e73775..c0c95ed 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -107,7 +107,6 @@
 
 #define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_TSI108_CSR_RST_BASE+0x7808)
 #define CONFIG_SYS_NS16550_COM2	(CONFIG_SYS_TSI108_CSR_RST_BASE+0x7C08)
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	3	/* autoboot after 3 seconds */
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 52e15cc..aca367f 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -60,8 +60,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-/* List of legal baudrate settings for this board */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_TEXT_BASE		0x8FFC0000
 #define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 9c1b255..81476ec 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -133,9 +133,6 @@
 #define CONFIG_SYS_HZ			3686400
 #define CONFIG_SYS_CPUSPEED		0x141
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 7210b6e..efca287 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -57,7 +57,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* No NOR flash present */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 0c18e50..48e6b83 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -125,7 +125,6 @@
 #define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 #define CONFIG_CONS_INDEX		0
 #define CONFIG_BAUDRATE			115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * DMA
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 87638a4..cc720e8 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -84,7 +84,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 6ce97bc..7634de7 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -85,7 +85,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index bd57baa..a98230a 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -89,7 +89,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /*
  * Command definition
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 58b6f1c..ba1a129 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -138,7 +138,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index f48a41e..333ba61 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -80,7 +80,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index a77e5b2..453cef9 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -94,7 +94,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 99daafb..c80e5e8 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -106,7 +106,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index a04db3f..7cd7173 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -83,7 +83,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 90652c6..9fca0e1 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -70,7 +70,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index feabc05..7469038 100644
--- a/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@ -115,7 +115,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	       1
 #define CONFIG_BAUDRATE			       115200
-#define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, 115200}
 
 /* Command definition */
 #include <config_cmd_default.h>
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 20db397..de20771 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -106,7 +106,6 @@
 #define CONFIG_PL011_SERIAL
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CFG_SERIAL0		0x101FD000
 #define CFG_SERIAL1		0x101FB000
 
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index c495423..f465a56 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -122,9 +122,6 @@
 
 #define	CONFIG_SYS_HZ			(CPU_CLK_FREQ/64)
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define NS9750_ETH_PHY_ADDRESS	(0x0000)
 
 /*-----------------------------------------------------------------------
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 43de18b..f591a86 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -83,8 +83,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 46d1643..13762cc 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -118,8 +118,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX        1
 #define CONFIG_BAUDRATE          115200
-#define CONFIG_SYS_BAUDRATE_TABLE       {9600, 19200, 38400, 57600, 115200}
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index d3a2438..639d4a3 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -81,8 +81,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE	115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index f7900e0..f1cadb2 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -85,8 +85,6 @@
 
 #define CONFIG_CONS_INDEX	   1
 #define CONFIG_BAUDRATE		   115200
-#define CONFIG_SYS_BAUDRATE_TABLE	   { 9600, 19200, 38400, 57600, 115200 }
-
 
 /*
  * Command line configuration.
diff --git a/include/configs/origen.h b/include/configs/origen.h
index d4d0f84..6dcd25d 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -117,9 +117,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE		(256 << 10)	/* 256KB */
 
diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 8599378..7abc42a 100644
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -88,7 +88,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200, 19200, 38400, 57600, 9600}
 
 #define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 88f4bfb..c4ea5ff 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -55,7 +55,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			9600
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index d1fef25..9fa6733 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -59,7 +59,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index d056884..810233f 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -54,9 +54,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 #undef	CONFIG_BOOTARGS
 
diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 43ec38f..19b80d1 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -117,8 +117,6 @@
 
 #define CONFIG_IXP425_TIMER_CLK		66666666
 #define CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks */
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Stack sizes
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index eba5616..cdb3593 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -361,7 +361,6 @@
 #endif
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"pm9261> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index bf31c13..d202d0a 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -394,7 +394,6 @@
 #endif
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"u-boot-pm9263> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 4779878..a044346 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -167,7 +167,6 @@
 				"rootfstype=jffs2"
 
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT		"U-Boot> "
 #define CONFIG_SYS_CBSIZE		256
diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 4ceee17..5cd6609 100644
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -368,7 +368,6 @@
 /*
  * Serial port config
  *
- * CONFIG_SYS_BAUDRATE_TABLE		- List of valid baud rates
  * CONFIG_SYS_NS16550			- Include the NS16550 driver
  * CONFIG_SYS_NS16550_SERIAL		- Include the serial (wrapper) driver
  * CONFIG_SYS_NS16550_CLK		- Frequency of reference clock
@@ -376,7 +375,6 @@
  * CONFIG_SYS_NS16550_COM1		- Base address of 1st serial port
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		3686400
diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 327863e..f4c9143 100644
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -346,9 +346,6 @@
 #define CONFIG_SYS_MEMTEST_END		( CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 \
 				- CONFIG_SYS_MEM_END_USAGE )
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 0666f7b..387661b 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -246,9 +246,6 @@
 
 #define RTC	1				/* enable 32KHz osc */
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
 #define CONFIG_PXA_MMC
 #define CONFIG_CMD_MMC
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index f5a137e..da32b30 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -40,9 +40,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 #undef CONFIG_BOOTARGS
 
diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h
index ebd8223..a3fc465 100644
--- a/include/configs/qi_lb60.h
+++ b/include/configs/qi_lb60.h
@@ -22,7 +22,6 @@
 
 #define CONFIG_SYS_UART_BASE	JZ4740_UART0_BASE /* Base of the UART channel */
 #define CONFIG_BAUDRATE		57600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 3e36bb0..3b63ac2 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -122,7 +122,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index dcfa29a..4f24651 100644
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -142,8 +142,6 @@
 
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 9cdfc14..65dcffb 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -46,8 +46,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE		512
-/* List of legal baudrate settings for this board */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_TEXT_BASE - 0x100000)
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index b0655c3..a7b3628 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -70,8 +70,6 @@
 #define CONFIG_SYS_PBSIZE		256
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_SYS_BARGSIZE	512
-/* List of legal baudrate settings for this board */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 57600, 38400, 19200, 9600 }
 
 #define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_TEXT_BASE - 0x100000)
diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 3a70041..df7f40c 100644
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -161,9 +161,6 @@
 
 #define	CONFIG_SYS_HZ			1000		/* decrementer freq: 1 ms ticks	*/
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index e133a17..f3d3e4d 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -190,9 +190,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE	(256 << 10)	/* 256 KiB */
 
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 00db374..9337d5b 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -215,9 +215,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE	(256 << 10)	/* regular stack 256KB */
 
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 43036b2..f3b0fc1 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -620,9 +620,6 @@
 #define CONFIG_SYS_MEMTEST_END		( CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 \
 				- CONFIG_SYS_MEM_END_USAGE )
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index cdf8659..316e3fb 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -61,7 +61,6 @@
 #define CONFIG_USART_BASE               ATMEL_BASE_DBGU
 #define CONFIG_USART_ID                 ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_BOOTDELAY	3
 
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 180c5da..1494a2e 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -87,7 +87,6 @@
 #define CONFIG_SYS_HZ			3686400	     /* incrementer freq: 3.6864 MHz */
 #define CONFIG_SYS_CPUSPEED		0x141	     /* core clock - register value  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_BAUDRATE 115200
 /*
  * Definitions related to passing arguments to kernel.
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 7d16320..bfbb2c3 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -144,9 +144,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* support additional compression methods */
 #define CONFIG_BZIP2
 #define CONFIG_LZO
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 0f63040..23df401 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -126,9 +126,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_RD_LVL
 
 /* Stack sizes */
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index a2b9441..47a3d41 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -144,9 +144,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 6663629..5ab8665 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -183,9 +183,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Stack sizes
  *
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 702134b..868e6ae 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -116,9 +116,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE		(256 << 10)	/* 256KB */
 
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index cee65d1..bb2a463 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -104,7 +104,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_SYS_PROMPT		"Snapper> "
 
 /* I2C - Bit-bashed */
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index e7f5a0d..cbaa643 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -151,8 +151,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index 2248680..0d939ee 100644
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -177,8 +177,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index fc2b57d..4ef835e 100644
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -38,8 +38,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 #define CONFIG_PREBOOT	"echo;" \
diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index 7c3f334..2dd1a33 100644
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_NS16550_CLK		clk_get_rate(TNETV107X_LPSC_UART1)
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /* Flash and environment info */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 0043926..def5306 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -75,7 +75,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 #define CONFIG_BOOTDELAY	3
 
diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index 2c66f33..1a5f680 100644
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -90,7 +90,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define	CONFIG_USART_ID			ATMEL_ID_SYS
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 /* SD/MMC card */
 #define CONFIG_MMC
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 5e38de2..2d0a1b1 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -166,9 +166,6 @@
 
 #define CONFIG_SYS_HZ			1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /* Stack sizes */
 #define CONFIG_STACKSIZE		(256 << 10) /* regular stack 256KB */
 
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index af464e1..c020ff4 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -172,9 +172,6 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_CPUSPEED		0x207		/* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
 
-						/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #ifdef CONFIG_MMC
 #define CONFIG_PXA_MMC
 #define CONFIG_CMD_MMC
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 2623dbc..9c1d525 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -171,7 +171,6 @@
 /* console is UART2 on TT-01 */
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /* ethernet setup for the onboard smc9118 */
 #define CONFIG_MII
diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 3dfafa5..6821528 100644
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -93,7 +93,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART0 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_MXC_GPIO
 
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 95028de..2cfbec8 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -70,7 +70,6 @@
 				  (void *)CFG_SERIAL2 }
 #define CONFIG_CONS_INDEX	2
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Devices and file systems
diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 9da318d..62ef2c5 100644
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -182,8 +182,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_AUTO_COMPLETE	1       /* add autocompletion support   */
 
 /*
diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 1e59ef3..d203bb4 100644
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -58,7 +58,6 @@
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		57600
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_AUTOBOOT_PROMPT	"autoboot in %d seconds\n", bootdelay
diff --git a/include/configs/v37.h b/include/configs/v37.h
index a3fdc38..e36d249 100644
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -142,8 +142,6 @@
 
 #define	CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 9ddc7b1..0a5ce64 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -74,7 +74,6 @@
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_SYS_NS16550_CLK		921600
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * SDRAM
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index bb835e0..ff23a92 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -93,7 +93,6 @@
 #define CONFIG_CONS_INDEX	0
 
 #define CONFIG_BAUDRATE			38400
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0		0x101F1000
 #define CONFIG_SYS_SERIAL1		0x101F2000
 
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 466d930..bf882b0 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -160,8 +160,6 @@
 
 #define	CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks	*/
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index f6904f3..76ab1bd 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX			3
 #define CONFIG_BAUDRATE				115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{9600, 19200, 38400, 57600, 115200}
 
 /***********************************************************
  * Command definition
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 7802f44..ed18dbe 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -76,7 +76,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 941f80c..a0cc247 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -67,9 +67,6 @@
 
 #define CONFIG_BAUDRATE		115200
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
-
-
 /*
  * BOOTP options
  */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index afe1e89..cacf7ea 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -67,7 +67,6 @@
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_STUART			1
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index d7ce6c6..4573149 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -69,7 +69,6 @@
 #define CONFIG_MXC_UART_BASE	UART2_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART2 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Ethernet
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
