Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

This converts the following to Kconfig: CONFIG_SPL_NS16550_MIN_FUNCTIONS CONFIG_SYS_NS16550_MEM32 CONFIG_SYS_NS16550_PORT_MAPPED CONFIG_SYS_NS16550_REG_SIZE CONFIG_SYS_NS16550_SERIAL To do this we also introduce CONFIG_SPL_SYS_NS16550_SERIAL so that platforms can enable the legacy driver here for SPL. Signed-off-by: Tom Rini <trini@konsulko.com>
2026-06-13 15:03:58 +03:00 · 2022-12-04 09:39:03 -05:00
parent 57c3afbc27
commit 9591b63531
386 changed files with 397 additions and 369 deletions
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -15,7 +15,6 @@
 /*
 * SERIAL
 */
-#define CONFIG_SYS_NS16550_MEM32

 /*
 * Flash
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -151,8 +151,6 @@
 /*
 * Serial Port
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)

 #define CONFIG_SYS_BAUDRATE_TABLE \
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -235,8 +235,6 @@
 #define CONFIG_SYS_INIT_SP_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)

 #define CONFIG_SYS_BAUDRATE_TABLE \
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -322,10 +322,7 @@ extern unsigned long get_sdram_size(void);

 /* Serial Port */
 #undef	CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)
-#define CONFIG_SPL_NS16550_MIN_FUNCTIONS

 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -163,8 +163,6 @@
 * open - index 2
 * shorted - index 1
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0)/2)

 #define CONFIG_SYS_BAUDRATE_TABLE	\
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -12,8 +12,6 @@
 /*
 * NS16550 Configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_TCLK
 #define CONFIG_SYS_NS16550_COM1		KW_UART0_BASE

--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -12,8 +12,6 @@
 /*
 * NS16550 Configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_TCLK
 #define CONFIG_SYS_NS16550_COM1		KW_UART0_BASE

--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -294,8 +294,6 @@
 #define CONFIG_SYS_INIT_SP_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0)/2)

 #define CONFIG_SYS_BAUDRATE_TABLE	\
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -267,8 +267,6 @@
 * open - index 2
 * shorted - index 1
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0)/2)

 #define CONFIG_SYS_BAUDRATE_TABLE	\
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -269,8 +269,6 @@
 /*
 * Serial Port
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0)/2)
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -229,8 +229,6 @@
 /*
 * Serial Port
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0)/2)
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -89,8 +89,6 @@
 * open - index 2
 * shorted - index 1
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0)/2)

 #define CONFIG_SYS_BAUDRATE_TABLE	\
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -15,10 +15,6 @@

 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_CLK		48000000
-#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_SERIAL
-#endif

 /* I2C Configuration */

--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -33,10 +33,6 @@
 /*
 * Serial console configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#ifndef CONFIG_DM_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
-#endif
 #define CONFIG_SYS_NS16550_CLK		19660800

 /* Init Stack Pointer */
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -26,9 +26,7 @@
 /*
 * UART configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		33333333
-#define CONFIG_SYS_NS16550_MEM32

 /*
 * Ethernet PHY configuration
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -97,8 +97,6 @@ extern phys_addr_t prior_stage_fdt_address;
 */
 #define V_NS16550_CLK			81000000

-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK

 /*
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -14,8 +14,6 @@

 /* legacy #defines for non DM bur-board */
 #ifndef CONFIG_DM
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000

--- a/include/configs/chromebook_coral.h
+++ b/include/configs/chromebook_coral.h
@@ -18,7 +18,4 @@
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"

-#define CONFIG_SYS_NS16550_MEM32
-#undef CONFIG_SYS_NS16550_PORT_MAPPED
-
 #endif	/* __CONFIG_H */
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -14,12 +14,8 @@
 #include <asm/arch/omap.h>

 /* Serial support */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		48000000
 #define CONFIG_SYS_NS16550_COM1		0x44e09000
-#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#endif

 /* NAND support */
 #define CFG_SYS_NAND_ECCSIZE		512
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -14,7 +14,6 @@

 #ifndef CONFIG_INTERNAL_UART
 /* Use BayTrail internal HS UART which is memory-mapped */
-#undef  CONFIG_SYS_NS16550_PORT_MAPPED
 #endif

 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -13,7 +13,6 @@
 #include <configs/x86-common.h>

 /* ns16550 UART is memory-mapped in Quark SoC */
-#undef  CONFIG_SYS_NS16550_PORT_MAPPED

 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=serial\0" \
--- a/include/configs/gardena-smart-gateway-mt7688.h
+++ b/include/configs/gardena-smart-gateway-mt7688.h
@@ -20,9 +20,7 @@

 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_CLK		40000000
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0xb0000c00
 #endif

--- a/include/configs/hsdk-4xd.h
+++ b/include/configs/hsdk-4xd.h
@@ -28,9 +28,7 @@
 /*
 * UART configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		33330000
-#define CONFIG_SYS_NS16550_MEM32

 /*
 * Ethernet PHY configuration
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -27,9 +27,7 @@
 /*
 * UART configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		33330000
-#define CONFIG_SYS_NS16550_MEM32

 /*
 * Ethernet PHY configuration
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -148,7 +148,6 @@
 /*
 * Serial Port
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()

 /*
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -330,8 +330,6 @@
 * Retain non-DM serial port for debug purposes.
 */
 #if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		(get_bus_freq(0) / 2)
 #define CONFIG_SYS_NS16550_COM1	(CONFIG_SYS_CCSRBAR + 0x11C500)
 #endif
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -36,7 +36,6 @@
 /*
 * Serial Driver info
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)

 #define CONFIG_SYS_SPI_CLK		clk_get(DAVINCI_SPI0_CLKID)
--- a/include/configs/linkit-smart-7688.h
+++ b/include/configs/linkit-smart-7688.h
@@ -20,9 +20,7 @@

 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_CLK		40000000
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM3		0xb0000e00

 #endif
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -26,8 +26,6 @@

 /* GPIO */

-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_serial_clock())

 #define CONFIG_HWCONFIG
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -47,8 +47,6 @@
 /*
 * Serial Port
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()

 /*
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -227,10 +227,6 @@
 * Serial Port
 */
 #ifndef CONFIG_LPUART
-#define CONFIG_SYS_NS16550_SERIAL
-#ifndef CONFIG_DM_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-#endif
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 #endif

--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -60,10 +60,6 @@
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_SDRAM_BASE

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#ifndef CONFIG_DM_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-#endif
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()

 /* I2C */
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -145,10 +145,6 @@
 * Serial Port
 */
 #ifndef CONFIG_LPUART
-#define CONFIG_SYS_NS16550_SERIAL
-#ifndef CONFIG_DM_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-#endif
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 #endif

--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -28,8 +28,6 @@
 /* I2C */

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)

 /* Miscellaneous configurable options */
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -40,8 +40,6 @@
 #define CPU_RELEASE_ADDR               secondary_boot_addr

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK          (get_serial_clock())

 /* SD boot SPL */
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -40,8 +40,6 @@
 #define CPU_RELEASE_ADDR               secondary_boot_addr

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK          (get_serial_clock())

 /* SD boot SPL */
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -45,8 +45,6 @@


 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)

 /*
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -37,8 +37,6 @@
 /* I2C */

 /* Serial Port */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE     1
 #define CONFIG_SYS_NS16550_CLK          (get_serial_clock())

 /*
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -33,7 +33,6 @@
 /*
 * Serial driver
 */
-#define CONFIG_SYS_NS16550_PORT_MAPPED

 /*
 * Flash configuration
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -22,9 +22,7 @@

 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_CLK		50000000
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0xbe000c00
 #endif

--- a/include/configs/mt7628.h
+++ b/include/configs/mt7628.h
@@ -14,9 +14,7 @@

 /* Serial SPL */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SERIAL)
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_CLK		40000000
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM1		0xb0000c00
 #endif

--- a/include/configs/mt8183.h
+++ b/include/configs/mt8183.h
@@ -12,9 +12,6 @@
 #include <linux/sizes.h>


-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_COM1		0x11005200
 #define CONFIG_SYS_NS16550_CLK		26000000

--- a/include/configs/mt8516.h
+++ b/include/configs/mt8516.h
@@ -12,9 +12,6 @@
 #include <linux/sizes.h>


-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_COM1		0x11005000
 #define CONFIG_SYS_NS16550_CLK		26000000

--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -32,10 +32,8 @@
 /*
 * NS16550 Configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_TCLK
 #if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_COM1		MV_UART_CONSOLE_BASE
 #endif

--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -40,7 +40,6 @@
 */
 #define V_NS16550_CLK		48000000		/* 48MHz (APLL96/2) */

-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK

 /*
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -319,10 +319,7 @@
 * shorted - index 1
 */
 #undef CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)
-#define CONFIG_SPL_NS16550_MIN_FUNCTIONS

 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -8,8 +8,6 @@

 #include "rockchip-common.h"

-#define CONFIG_SYS_NS16550_MEM32
-
 /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */
 #define CONFIG_IRAM_BASE		0xff020000

--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -8,8 +8,6 @@

 #include "rockchip-common.h"

-#define CONFIG_SYS_NS16550_MEM32
-
 #define CONFIG_IRAM_BASE		0xfff80000

 #define CONFIG_SYS_SDRAM_BASE		0
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -7,8 +7,6 @@
 #define _ROCKCHIP_COMMON_H_
 #include <linux/sizes.h>

-#define CONFIG_SYS_NS16550_MEM32
-
 /* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */

 #ifndef CONFIG_SPL_BUILD
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */

 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x44e09000
 #define CONFIG_SYS_NS16550_COM4		0x481a6000
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -52,11 +52,6 @@
 * Serial
 */

-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#endif
-
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3

--- a/include/configs/socfpga_arria10_socdk.h
+++ b/include/configs/socfpga_arria10_socdk.h
@@ -18,7 +18,6 @@
 /*
 * Serial / UART configurations
 */
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}

 /*
--- a/include/configs/socfpga_chameleonv3.h
+++ b/include/configs/socfpga_chameleonv3.h
@@ -17,7 +17,6 @@
 /*
 * Serial / UART configurations
 */
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}

 #define CONFIG_EXTRA_ENV_SETTINGS \
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -76,7 +76,6 @@
 * Serial / UART configurations
 */
 #define CONFIG_SYS_NS16550_CLK		100000000
-#define CONFIG_SYS_NS16550_MEM32

 /*
 * SDMMC configurations
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -16,7 +16,6 @@
 #include <linux/stringify.h>

 /* Serial & console */
-#define CONFIG_SYS_NS16550_SERIAL
 /* ns16550 reg in the low bits of cpu reg */
 #ifdef CONFIG_MACH_SUNIV
 /* suniv doesn't have apb2 and uart is connected to apb1 */
@@ -25,7 +24,6 @@
 #define CONFIG_SYS_NS16550_CLK		24000000
 #endif
 #ifndef CONFIG_DM_SERIAL
-# define CONFIG_SYS_NS16550_REG_SIZE	-4
 # define CONFIG_SYS_NS16550_COM1		SUNXI_UART0_BASE
 # define CONFIG_SYS_NS16550_COM2		SUNXI_UART1_BASE
 # define CONFIG_SYS_NS16550_COM3		SUNXI_UART2_BASE
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -19,7 +19,6 @@
 /*
 * UART configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		166666666

 /*
--- a/include/configs/theadorable-x86-dfi-bt700.h
+++ b/include/configs/theadorable-x86-dfi-bt700.h
@@ -13,7 +13,6 @@
 #include <configs/x86-common.h>

 /* Use BayTrail internal HS UART which is memory-mapped */
-#undef  CONFIG_SYS_NS16550_PORT_MAPPED

 /* Set the board specific parameters */
 #define DEF_ENV_TFTPDIR		"theadorable-x86-dfi"
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -77,8 +77,6 @@
 #define CONFIG_SYS_TIMERBASE		0x4802E000

 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_CLK		(48000000)
 #define CONFIG_SYS_NS16550_COM1		0x48020000	/* Base EVM has UART0 */

--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -30,8 +30,6 @@
 /*
 * NS16550 Configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE (-4)
 #define CONFIG_SYS_NS16550_CLK      (48000000)
 #define CONFIG_SYS_NS16550_COM1     0x48024000  /* Base EVM has UART2 */

--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -17,12 +17,6 @@
 #include <asm/arch/omap.h>

 /* NS16550 Configuration */
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_NS16550_SERIAL
-#ifndef CONFIG_DM_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#endif
-#endif
 #define CONFIG_SYS_NS16550_CLK		48000000

 /*
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -34,7 +34,6 @@
 #define KEYSTONE_SRAM_SCRATCH_SPACE_END		(TI_SRAM_SCRATCH_BOARD_EEPROM_END)

 /* UART Configuration */
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_COM1		KS2_UART0_BASE
 #define CONFIG_SYS_NS16550_COM2		KS2_UART1_BASE

--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -27,10 +27,6 @@
 /* NS16550 Configuration */
 #define V_NS16550_CLK			48000000	/* 48MHz (APLL96/2) */
 #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
-#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#endif /* !CONFIG_DM_SERIAL */
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600, \
 					115200}

--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -29,8 +29,6 @@
 */
 #define CONFIG_SYS_NS16550_CLK		48000000
 #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
 #endif

--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -30,10 +30,6 @@
 * Hardware drivers
 */
 #define CONFIG_SYS_NS16550_CLK		48000000
-#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#endif

 /*
 * Environment setup
--- a/include/configs/vocore2.h
+++ b/include/configs/vocore2.h
@@ -19,9 +19,7 @@
 #define CONFIG_SYS_UBOOT_BASE		0

 /* Serial SPL */
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_NS16550_CLK		40000000
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM3		0xb0000e00

 /* RAM */
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -13,10 +13,8 @@
 /*
 * NS16550 Configuration
 */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		CONFIG_SYS_TCLK
 #if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_COM1		MV_UART_CONSOLE_BASE
 #endif

--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -21,7 +21,6 @@
 /*-----------------------------------------------------------------------
 * Serial Configuration
 */
-#define CONFIG_SYS_NS16550_PORT_MAPPED

 /*
 * Miscellaneous configurable options
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -127,8 +127,6 @@
 /* Serial Driver Info */
 /*====================*/

-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
 #define CONFIG_SYS_NS16550_COM1		IOADDR(0x0D050020) /* Base address */

 /* Input clk to NS16550 (in Hz; the SYS_CLK_FREQ is in kHz) */
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -26,7 +26,7 @@

 #include <linux/types.h>

-#ifdef CONFIG_DM_SERIAL
+#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)
 /*
 * For driver model we always use one byte per register, and sort out the
 * differences in the driver