global: Move remaining CONFIG_SYS_NS16550_* to CFG_SYS_NS16550_*
The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NS16550
namespace do not easily transition to Kconfig. In many cases they likely
should come from the device tree instead. Move these out of CONFIG
namespace and in to CFG namespace.
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index b8cbdc3..059885e 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -151,13 +151,13 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
+#define CFG_SYS_NS16550_CLK get_bus_freq(0)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)
/* SERDES */
#define CONFIG_FSL_SERDES
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index dba15da..bde8fa8 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -235,13 +235,13 @@
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
+#define CFG_SYS_NS16550_CLK get_bus_freq(0)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
/*
* I2C
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index fd721f3..05c0977 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -322,13 +322,13 @@
/* Serial Port */
#undef CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
+#define CFG_SYS_NS16550_CLK get_bus_freq(0)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
/* I2C */
#define I2C_PCA9557_ADDR1 0x18
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 173f620..132786a 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -163,15 +163,15 @@
* open - index 2
* shorted - index 1
*/
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0)/2)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C */
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index c99e6ba..824190a 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -12,8 +12,8 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
-#define CONFIG_SYS_NS16550_COM1 KW_UART0_BASE
+#define CFG_SYS_NS16550_CLK CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_COM1 KW_UART0_BASE
/*
* Serial Port configuration
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 8b43fe0..e67da1f 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -12,8 +12,8 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
-#define CONFIG_SYS_NS16550_COM1 KW_UART0_BASE
+#define CFG_SYS_NS16550_CLK CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_COM1 KW_UART0_BASE
/*
* Serial Port configuration
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 7cb10b2..b8f3d70 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -294,15 +294,15 @@
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0)/2)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 3fa2d01..777a64e 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -267,15 +267,15 @@
* open - index 2
* shorted - index 1
*/
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0)/2)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C bus multiplexer */
#define I2C_MUX_PCA_ADDR 0x70
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index c5a28fa..710f105 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -269,13 +269,13 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0)/2)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/*
* I2C
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 795120c..4c60364 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -229,13 +229,13 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0)/2)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/*
* I2C
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index e3cbc64..ba4a989 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -89,15 +89,15 @@
* open - index 2
* shorted - index 1
*/
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0)/2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0)/2)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
-#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
-#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x11C500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x11C600)
+#define CFG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
+#define CFG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
/* I2C */
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 13b1ff3..25d9c96 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -158,12 +158,12 @@
#endif
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
-#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */
-#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
-#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
-#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2 0x48022000 /* UART1 */
+#define CFG_SYS_NS16550_COM3 0x48024000 /* UART2 */
+#define CFG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
+#define CFG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
+#define CFG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */
#define CONFIG_POWER_TPS65910
diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index cb649b5..7c5e7ce 100644
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -83,12 +83,12 @@
#define CONSOLE_COLOR_RED 0x001F
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
-#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
-#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */
-#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
-#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
-#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
+#define CFG_SYS_NS16550_COM2 0x48022000 /* UART1 */
+#define CFG_SYS_NS16550_COM3 0x48024000 /* UART2 */
+#define CFG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
+#define CFG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
+#define CFG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
#ifdef CONFIG_MTD_RAW_NAND
#define CFG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index b7b1cb0..abd868c 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -88,7 +88,7 @@
"echo WARNING: Could not determine device tree to use; fi; \0"
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
/* Ethernet support */
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 08bae9b..452887d 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -136,11 +136,11 @@
#endif /* Regular Boot */
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
-#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
-#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */
-#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
-#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
-#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
+#define CFG_SYS_NS16550_COM2 0x48022000 /* UART1 */
+#define CFG_SYS_NS16550_COM3 0x48024000 /* UART2 */
+#define CFG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
+#define CFG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
+#define CFG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
#endif /* ! __CONFIG_AM335X_SHC_H */
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 7df5f14..4af9eda 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -36,12 +36,12 @@
BOOTENV
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
-#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */
-#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
-#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
-#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2 0x48022000 /* UART1 */
+#define CFG_SYS_NS16550_COM3 0x48024000 /* UART2 */
+#define CFG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
+#define CFG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
+#define CFG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */
#define CONFIG_POWER_TPS65910
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index b61c800..4ff8528 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -14,7 +14,7 @@
#include <asm/arch/omap.h>
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_CLK 48000000
+#define CFG_SYS_NS16550_CLK 48000000
/* I2C Configuration */
@@ -41,7 +41,7 @@
#define V_SCLK (V_OSCK)
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
#ifndef CONFIG_SPL_BUILD
/* USB Device Firmware Update support */
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index d8b0531..c3b6a3f 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -16,9 +16,9 @@
#define CONFIG_IODELAY_RECALIBRATION
-#define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
+#define CFG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
+#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
#define CONFIG_SYS_OMAP_ABE_SYSCK
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 0eed8db..3114cf0 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -14,7 +14,7 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK 25000000
+#define CFG_SYS_NS16550_CLK 25000000
/* Miscellaneous configurable options */
diff --git a/include/configs/ap152.h b/include/configs/ap152.h
index 7124711..f067445 100644
--- a/include/configs/ap152.h
+++ b/include/configs/ap152.h
@@ -14,7 +14,7 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK 25000000
+#define CFG_SYS_NS16550_CLK 25000000
/* Miscellaneous configurable options */
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 6a4092a..f0a02ae 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -14,7 +14,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define FDT_MODULE "apalis-v1.2"
#define FDT_MODULE_V1_0 "apalis"
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 84bd88f..4f00b3b 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -21,7 +21,7 @@
* Apalis UART4: NVIDIA UARTC
*/
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define UBOOT_UPDATE \
"uboot_hwpart=1\0" \
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 7224bd8..e3b6956 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -33,7 +33,7 @@
/*
* Serial console configuration
*/
-#define CONFIG_SYS_NS16550_CLK 19660800
+#define CFG_SYS_NS16550_CLK 19660800
/* Init Stack Pointer */
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index c0429ae..1932713 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -26,7 +26,7 @@
/*
* UART configuration
*/
-#define CONFIG_SYS_NS16550_CLK 33333333
+#define CFG_SYS_NS16550_CLK 33333333
/*
* Ethernet PHY configuration
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 31f107a..f29729d 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -181,12 +181,12 @@
/*DFUARGS*/
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
-#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */
-#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
-#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
-#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2 0x48022000 /* UART1 */
+#define CFG_SYS_NS16550_COM3 0x48024000 /* UART2 */
+#define CFG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
+#define CFG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
+#define CFG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */
#define CONFIG_POWER_TPS65910
diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h
index 1bae49e..cba109b 100644
--- a/include/configs/bcm7260.h
+++ b/include/configs/bcm7260.h
@@ -10,7 +10,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_NS16550_COM1 0xf040c000
+#define CFG_SYS_NS16550_COM1 0xf040c000
#define CONFIG_SYS_INIT_RAM_ADDR 0x10200000
diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h
index 4b41dc2..a07f1b7 100644
--- a/include/configs/bcm7445.h
+++ b/include/configs/bcm7445.h
@@ -10,7 +10,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_SYS_NS16550_COM1 0xf040ab00
+#define CFG_SYS_NS16550_COM1 0xf040ab00
#define CONFIG_SYS_INIT_RAM_ADDR 0x80200000
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 795de46..76189a4 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -26,7 +26,7 @@
/* 12MB Malloc size */
/* console configuration */
-#define CONFIG_SYS_NS16550_CLK 25000000
+#define CFG_SYS_NS16550_CLK 25000000
/*
* Increase max uncompressed/gunzip size, keeping size same as EMMC linux
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 481baff..9f51b9c 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -97,7 +97,7 @@
*/
#define V_NS16550_CLK 81000000
-#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
+#define CFG_SYS_NS16550_CLK V_NS16550_CLK
/*
* Serial console configuration.
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 1d51bb4..6b5f650 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -18,7 +18,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* SPI */
#define CONFIG_TEGRA_SLINK_CTRLS 6
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 773ce3f..1bf6baf 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -14,8 +14,8 @@
/* legacy #defines for non DM bur-board */
#ifndef CONFIG_DM
-#define CONFIG_SYS_NS16550_CLK (48000000)
-#define CONFIG_SYS_NS16550_COM1 0x44e09000
+#define CFG_SYS_NS16550_CLK (48000000)
+#define CFG_SYS_NS16550_COM1 0x44e09000
#endif /* CONFIG_DM */
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index f3416b5..35c5a4f 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -22,7 +22,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* SPI */
#define CONFIG_TEGRA_SLINK_CTRLS 6
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 0672b7d..55e2d74 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -20,7 +20,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* SPI */
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index bfa076b..1e5154a 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -97,12 +97,12 @@
NANDARGS
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
-#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */
-#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */
-#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
-#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
-#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
+#define CFG_SYS_NS16550_COM1 0x44e09000 /* UART0 */
+#define CFG_SYS_NS16550_COM2 0x48022000 /* UART1 */
+#define CFG_SYS_NS16550_COM3 0x48024000 /* UART2 */
+#define CFG_SYS_NS16550_COM4 0x481a6000 /* UART3 */
+#define CFG_SYS_NS16550_COM5 0x481a8000 /* UART4 */
+#define CFG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* SPL */
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 63dac1d..b7511ad 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -15,7 +15,7 @@
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000
/* NS16550-ish UARTs */
-#define CONFIG_SYS_NS16550_CLK 48000000
+#define CFG_SYS_NS16550_CLK 48000000
/* Ethernet: davicom DM9000 */
#define CONFIG_DM9000_BASE 0xb6000000
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 0641d5c..8f05821 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -14,8 +14,8 @@
#include <asm/arch/omap.h>
/* Serial support */
-#define CONFIG_SYS_NS16550_CLK 48000000
-#define CONFIG_SYS_NS16550_COM1 0x44e09000
+#define CFG_SYS_NS16550_CLK 48000000
+#define CFG_SYS_NS16550_COM1 0x44e09000
/* NAND support */
#define CFG_SYS_NAND_ECCSIZE 512
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index b758086..2ba3c3b 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -13,7 +13,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_SDIO1
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* NAND support */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index c9d384e..ffed71a 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -22,7 +22,7 @@
* Colibri UART-C: NVIDIA UARTB
*/
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define UBOOT_UPDATE \
"uboot_hwpart=1\0" \
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index f8ba4e8..4f0188d 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -94,7 +94,7 @@
/*
* Serial Driver info
*/
-#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
+#define CFG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index e03a24a..24cf554 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -15,7 +15,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 93201be..e1d18a7 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -27,9 +27,9 @@
#elif (CONFIG_CONS_INDEX == 3)
#define CONSOLEDEV "ttyS2"
#endif
-#define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
-#define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
+#define CFG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
+#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
#define CONFIG_SYS_OMAP_ABE_SYSCK
diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h
index 0d61724..a1400eb 100644
--- a/include/configs/gardena-smart-gateway-mt7688.h
+++ b/include/configs/gardena-smart-gateway-mt7688.h
@@ -20,8 +20,8 @@
/* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_CLK 40000000
-#define CONFIG_SYS_NS16550_COM1 0xb0000c00
+#define CFG_SYS_NS16550_CLK 40000000
+#define CFG_SYS_NS16550_COM1 0xb0000c00
#endif
/* UART */
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index fe4b02c..211dab4 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -17,10 +17,10 @@
#define CONFIG_TEGRA_ENABLE_UARTD
/* UARTD: keyboard satellite board UART, default */
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
#ifdef CONFIG_TEGRA_ENABLE_UARTA
/* UARTA: debug board UART */
-#define CONFIG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE
#endif
/* NAND support */
diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h
index bfc0fa5..1d7b171 100644
--- a/include/configs/hsdk-4xd.h
+++ b/include/configs/hsdk-4xd.h
@@ -28,7 +28,7 @@
/*
* UART configuration
*/
-#define CONFIG_SYS_NS16550_CLK 33330000
+#define CFG_SYS_NS16550_CLK 33330000
/*
* Ethernet PHY configuration
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index ce3cb20..9e092e1 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -27,7 +27,7 @@
/*
* UART configuration
*/
-#define CONFIG_SYS_NS16550_CLK 33330000
+#define CFG_SYS_NS16550_CLK 33330000
/*
* Ethernet PHY configuration
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 69aa55f..b846889 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 7acdb0f..57b0fc9 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -148,7 +148,7 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK get_serial_clock()
+#define CFG_SYS_NS16550_CLK get_serial_clock()
/*
* I2C
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 30ba606..e6e54fb 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -330,8 +330,8 @@
* Retain non-DM serial port for debug purposes.
*/
#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR + 0x11C500)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR + 0x11C500)
#endif
#ifndef __ASSEMBLY__
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 38860bf..7ed1f15 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -35,7 +35,7 @@
#define CONFIG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE
/* serial port */
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
/* SPL */
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 5434c4f..1f642fb 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -36,7 +36,7 @@
/*
* Serial Driver info
*/
-#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
+#define CFG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID)
diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h
index b9c853d..28372d4 100644
--- a/include/configs/linkit-smart-7688.h
+++ b/include/configs/linkit-smart-7688.h
@@ -20,8 +20,8 @@
/* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_CLK 40000000
-#define CONFIG_SYS_NS16550_COM3 0xb0000e00
+#define CFG_SYS_NS16550_CLK 40000000
+#define CFG_SYS_NS16550_COM3 0xb0000e00
#endif
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 148598f..b57eb52 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -26,7 +26,7 @@
/* GPIO */
-#define CONFIG_SYS_NS16550_CLK (get_serial_clock())
+#define CFG_SYS_NS16550_CLK (get_serial_clock())
#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 3f2dfa6..3579f9c 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -47,7 +47,7 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK get_serial_clock()
+#define CFG_SYS_NS16550_CLK get_serial_clock()
/*
* I2C
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index bd2f74c..4566511 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -227,7 +227,7 @@
* Serial Port
*/
#ifndef CONFIG_LPUART
-#define CONFIG_SYS_NS16550_CLK get_serial_clock()
+#define CFG_SYS_NS16550_CLK get_serial_clock()
#endif
/*
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 8c43f65..1e2db12 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -60,7 +60,7 @@
#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK get_serial_clock()
+#define CFG_SYS_NS16550_CLK get_serial_clock()
/* I2C */
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 06830f4..323feb6 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -145,7 +145,7 @@
* Serial Port
*/
#ifndef CONFIG_LPUART
-#define CONFIG_SYS_NS16550_CLK get_serial_clock()
+#define CFG_SYS_NS16550_CLK get_serial_clock()
#endif
/*
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index 7dd5649..587f23b 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -28,7 +28,7 @@
/* I2C */
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
/* Miscellaneous configurable options */
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 2fc06c1..6fc509a 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -40,7 +40,7 @@
#define CPU_RELEASE_ADDR secondary_boot_addr
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK (get_serial_clock())
+#define CFG_SYS_NS16550_CLK (get_serial_clock())
/* SD boot SPL */
#ifdef CONFIG_SD_BOOT
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 40b4cb9..8a3c87c 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -40,7 +40,7 @@
#define CPU_RELEASE_ADDR secondary_boot_addr
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK (get_serial_clock())
+#define CFG_SYS_NS16550_CLK (get_serial_clock())
/* SD boot SPL */
#ifdef CONFIG_SD_BOOT
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 5668e07..2117b08 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -45,7 +45,7 @@
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
/*
* During booting, IFC is mapped at the region of 0x30000000.
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 895c566..c79a507 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -37,7 +37,7 @@
/* I2C */
/* Serial Port */
-#define CONFIG_SYS_NS16550_CLK (get_serial_clock())
+#define CFG_SYS_NS16550_CLK (get_serial_clock())
/*
* During booting, IFC is mapped at the region of 0x30000000.
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index b90a84d..a8d8d8b 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* NAND support */
diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h
index 1f733d1..e09e9c8 100644
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -22,8 +22,8 @@
/* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_CLK 50000000
-#define CONFIG_SYS_NS16550_COM1 0xbe000c00
+#define CFG_SYS_NS16550_CLK 50000000
+#define CFG_SYS_NS16550_COM1 0xbe000c00
#endif
/* Serial common */
diff --git a/include/configs/mt7628.h b/include/configs/mt7628.h
index da16e3b..bb12ebf 100644
--- a/include/configs/mt7628.h
+++ b/include/configs/mt7628.h
@@ -14,8 +14,8 @@
/* Serial SPL */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_CLK 40000000
-#define CONFIG_SYS_NS16550_COM1 0xb0000c00
+#define CFG_SYS_NS16550_CLK 40000000
+#define CFG_SYS_NS16550_COM1 0xb0000c00
#endif
/* Serial common */
diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h
index eaffe0b..3da7619 100644
--- a/include/configs/mt8183.h
+++ b/include/configs/mt8183.h
@@ -12,8 +12,8 @@
#include <linux/sizes.h>
-#define CONFIG_SYS_NS16550_COM1 0x11005200
-#define CONFIG_SYS_NS16550_CLK 26000000
+#define CFG_SYS_NS16550_COM1 0x11005200
+#define CFG_SYS_NS16550_CLK 26000000
/* Environment settings */
#include <config_distro_bootcmd.h>
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h
index 3475988..0f7981a 100644
--- a/include/configs/mt8516.h
+++ b/include/configs/mt8516.h
@@ -12,8 +12,8 @@
#include <linux/sizes.h>
-#define CONFIG_SYS_NS16550_COM1 0x11005000
-#define CONFIG_SYS_NS16550_CLK 26000000
+#define CFG_SYS_NS16550_COM1 0x11005000
+#define CFG_SYS_NS16550_CLK 26000000
/* Environment settings */
#include <config_distro_bootcmd.h>
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 4f1067c..e870fc8 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -32,9 +32,9 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK CONFIG_SYS_TCLK
#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
+#define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
#endif
#if defined(CONFIG_ARMADA_38X) && !defined(CONFIG_SYS_BAUDRATE_TABLE)
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 310bdde..2623f99 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -40,12 +40,12 @@
*/
#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
-#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
+#define CFG_SYS_NS16550_CLK V_NS16550_CLK
/*
* select serial console configuration
*/
-#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
+#define CFG_SYS_NS16550_COM3 OMAP34XX_UART3
#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index c59e103..baa4521 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* SPI */
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index cce5556..883cc0b 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -28,7 +28,7 @@
#include <configs/ti_omap5_common.h>
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE
+#define CFG_SYS_NS16550_COM3 UART3_BASE
/* MMC ENV related defines */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 81ca68d..2b47d4c 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -91,7 +91,7 @@
/*
* Serial Driver info
*/
-#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
+#define CFG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 0658206..9fc22f0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -319,13 +319,13 @@
* shorted - index 1
*/
#undef CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
+#define CFG_SYS_NS16550_CLK get_bus_freq(0)
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
-#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500)
-#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
+#define CFG_SYS_NS16550_COM1 (CONFIG_SYS_CCSRBAR+0x4500)
+#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_CCSRBAR+0x4600)
/* I2C */
#if !CONFIG_IS_ENABLED(DM_I2C)
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index c12f4d0..a945f4e 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -17,7 +17,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h
index ed3201a..7180783 100644
--- a/include/configs/pdu001.h
+++ b/include/configs/pdu001.h
@@ -50,11 +50,11 @@
"\0"
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1 UART0_BASE
-#define CONFIG_SYS_NS16550_COM2 UART1_BASE
-#define CONFIG_SYS_NS16550_COM3 UART2_BASE
-#define CONFIG_SYS_NS16550_COM4 UART3_BASE
-#define CONFIG_SYS_NS16550_COM5 UART4_BASE
-#define CONFIG_SYS_NS16550_COM6 UART5_BASE
+#define CFG_SYS_NS16550_COM1 UART0_BASE
+#define CFG_SYS_NS16550_COM2 UART1_BASE
+#define CFG_SYS_NS16550_COM3 UART2_BASE
+#define CFG_SYS_NS16550_COM4 UART3_BASE
+#define CFG_SYS_NS16550_COM5 UART4_BASE
+#define CFG_SYS_NS16550_COM6 UART5_BASE
#endif /* ! __CONFIG_PDU001_H */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 09f0ed9..99db59c 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* NAND support */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index c7f03a1..4887747 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -22,7 +22,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5765f2c..c9dd750 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -38,9 +38,9 @@
#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_CLK (48000000)
-#define CONFIG_SYS_NS16550_COM1 0x44e09000
-#define CONFIG_SYS_NS16550_COM4 0x481a6000
+#define CFG_SYS_NS16550_CLK (48000000)
+#define CFG_SYS_NS16550_COM1 0x44e09000
+#define CFG_SYS_NS16550_COM4 0x481a6000
/* I2C Configuration */
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index c29bc44..6054fa4 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -52,8 +52,8 @@
* Serial
*/
-#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
-#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
+#define CFG_SYS_NS16550_CLK V_NS16550_CLK
+#define CFG_SYS_NS16550_COM3 OMAP34XX_UART3
#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \
115200 }
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 029f898..2b2d78b 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -75,7 +75,7 @@
/*
* Serial / UART configurations
*/
-#define CONFIG_SYS_NS16550_CLK 100000000
+#define CFG_SYS_NS16550_CLK 100000000
/*
* SDMMC configurations
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1ed0a26..cd2a74f 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -19,16 +19,16 @@
/* ns16550 reg in the low bits of cpu reg */
#ifdef CONFIG_MACH_SUNIV
/* suniv doesn't have apb2 and uart is connected to apb1 */
-#define CONFIG_SYS_NS16550_CLK 100000000
+#define CFG_SYS_NS16550_CLK 100000000
#else
-#define CONFIG_SYS_NS16550_CLK 24000000
+#define CFG_SYS_NS16550_CLK 24000000
#endif
#ifndef CONFIG_DM_SERIAL
-# define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE
-# define CONFIG_SYS_NS16550_COM2 SUNXI_UART1_BASE
-# define CONFIG_SYS_NS16550_COM3 SUNXI_UART2_BASE
-# define CONFIG_SYS_NS16550_COM4 SUNXI_UART3_BASE
-# define CONFIG_SYS_NS16550_COM5 SUNXI_R_UART_BASE
+# define CFG_SYS_NS16550_COM1 SUNXI_UART0_BASE
+# define CFG_SYS_NS16550_COM2 SUNXI_UART1_BASE
+# define CFG_SYS_NS16550_COM3 SUNXI_UART2_BASE
+# define CFG_SYS_NS16550_COM4 SUNXI_UART3_BASE
+# define CFG_SYS_NS16550_COM5 SUNXI_R_UART_BASE
#endif
/* CPU */
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 38a43b7..92ee920 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -19,7 +19,7 @@
/*
* UART configuration
*/
-#define CONFIG_SYS_NS16550_CLK 166666666
+#define CFG_SYS_NS16550_CLK 166666666
/*
* Even though the board houses Realtek RTL8211E PHY
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index f8e741a..0987966 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -14,7 +14,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 2377b47..ddf753d 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* NAND support */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 2915db7..92df457 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -26,7 +26,7 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
+#define CFG_SYS_NS16550_CLK V_NS16550_CLK
#ifdef CONFIG_ARM64
#define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 60632c5..9614fe6 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -77,8 +77,8 @@
#define CONFIG_SYS_TIMERBASE 0x4802E000
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_CLK (48000000)
-#define CONFIG_SYS_NS16550_COM1 0x48020000 /* Base EVM has UART0 */
+#define CFG_SYS_NS16550_CLK (48000000)
+#define CFG_SYS_NS16550_COM1 0x48020000 /* Base EVM has UART0 */
/* CPU */
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index f2dbe35..1bd2a18 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -30,8 +30,8 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_CLK (48000000)
-#define CONFIG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */
+#define CFG_SYS_NS16550_CLK (48000000)
+#define CFG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */
/* allow overwriting serial config and ethaddr */
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index fb01777..00eb329 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -17,7 +17,7 @@
#include <asm/arch/omap.h>
/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_CLK 48000000
+#define CFG_SYS_NS16550_CLK 48000000
/*
* SPL related defines. The Public RAM memory map the ROM defines the
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index aaeea77..119b4c0 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -34,13 +34,13 @@
#define KEYSTONE_SRAM_SCRATCH_SPACE_END (TI_SRAM_SCRATCH_BOARD_EEPROM_END)
/* UART Configuration */
-#define CONFIG_SYS_NS16550_COM1 KS2_UART0_BASE
-#define CONFIG_SYS_NS16550_COM2 KS2_UART1_BASE
+#define CFG_SYS_NS16550_COM1 KS2_UART0_BASE
+#define CFG_SYS_NS16550_COM2 KS2_UART1_BASE
#ifndef CONFIG_SOC_K2G
-#define CONFIG_SYS_NS16550_CLK ks_clk_get_rate(KS2_CLK1_6)
+#define CFG_SYS_NS16550_CLK ks_clk_get_rate(KS2_CLK1_6)
#else
-#define CONFIG_SYS_NS16550_CLK ks_clk_get_rate(uart_pll_clk) / 2
+#define CFG_SYS_NS16550_CLK ks_clk_get_rate(uart_pll_clk) / 2
#endif
/* SPI Configuration */
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 80d2a01..d282c39 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -26,15 +26,15 @@
/* NS16550 Configuration */
#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
-#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
+#define CFG_SYS_NS16550_CLK V_NS16550_CLK
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200}
/* Select serial console configuration */
#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
-#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2
-#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
+#define CFG_SYS_NS16550_COM1 OMAP34XX_UART1
+#define CFG_SYS_NS16550_COM2 OMAP34XX_UART2
+#define CFG_SYS_NS16550_COM3 OMAP34XX_UART3
#endif
/* Physical Memory Map */
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index eb93034..ce50e35 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -27,9 +27,9 @@
/*
* Hardware drivers
*/
-#define CONFIG_SYS_NS16550_CLK 48000000
+#define CFG_SYS_NS16550_CLK 48000000
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE
+#define CFG_SYS_NS16550_COM3 UART3_BASE
#endif
/* TWL6030 */
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index a1efb57..c49c177 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -29,7 +29,7 @@
/*
* Hardware drivers
*/
-#define CONFIG_SYS_NS16550_CLK 48000000
+#define CFG_SYS_NS16550_CLK 48000000
/*
* Environment setup
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index b14726a..22d783c 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -14,7 +14,7 @@
/*
* Serial Port
*/
-#define CONFIG_SYS_NS16550_CLK 40000000
+#define CFG_SYS_NS16550_CLK 40000000
/*
* Command
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index b562d44..e4cbc7d 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
#define CONFIG_TEGRA_UARTA_GPU
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* SPI */
diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index 02ddc6f..338d8af 100644
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -12,7 +12,7 @@
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000
-#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_MIPS_TIMER_FREQ
+#define CFG_SYS_NS16550_CLK CONFIG_SYS_MIPS_TIMER_FREQ
#define CONFIG_SYS_SDRAM_BASE 0x80000000
#if defined(CONFIG_DDRTYPE_H5TQ1G63BFA) || defined(CONFIG_DDRTYPE_MT47H128M8HQ)
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 03aa7ad..b2dc04a 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -16,7 +16,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 0bd5a1e..f7a5077 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -15,7 +15,7 @@
/* Board-specific serial config */
#define CONFIG_TEGRA_ENABLE_UARTD
-#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
+#define CFG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
/* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h
index 84e5ba3..2107bec 100644
--- a/include/configs/vocore2.h
+++ b/include/configs/vocore2.h
@@ -19,8 +19,8 @@
#define CONFIG_SYS_UBOOT_BASE 0
/* Serial SPL */
-#define CONFIG_SYS_NS16550_CLK 40000000
-#define CONFIG_SYS_NS16550_COM3 0xb0000e00
+#define CFG_SYS_NS16550_CLK 40000000
+#define CFG_SYS_NS16550_COM3 0xb0000e00
/* RAM */
diff --git a/include/configs/x530.h b/include/configs/x530.h
index 318e368..a0162ca 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -13,9 +13,9 @@
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK CONFIG_SYS_TCLK
#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
+#define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
#endif
/*
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 7090fce..b93451c 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -127,10 +127,10 @@
/* Serial Driver Info */
/*====================*/
-#define CONFIG_SYS_NS16550_COM1 IOADDR(0x0D050020) /* Base address */
+#define CFG_SYS_NS16550_COM1 IOADDR(0x0D050020) /* Base address */
/* Input clk to NS16550 (in Hz; the SYS_CLK_FREQ is in kHz) */
-#define CONFIG_SYS_NS16550_CLK get_board_sys_clk()
+#define CFG_SYS_NS16550_CLK get_board_sys_clk()
/*======================*/
/* Ethernet Driver Info */