Skip to contentSkip to conversation

global: Move remaining CONFIG_SYS_NOR_* to CFG_SYS_NOR_*

PATCH In review Tom Rini 4 participants 40 messages Nov 16, 2022 – Jan 20, 2023 Page 1 of 3

Subsystems (58)
Network drivers Arm (32-bit) x86 USB +54 more subsystems
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/17 global: Move remaining CONFIG_SYS_NOR_* to CFG_SYS_NOR_*

The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NOR 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.

---
 board/freescale/ls1043aqds/ls1043aqds.c | 48 +++++++-------
 board/freescale/ls1043ardb/ls1043ardb.c | 32 +++++-----
 board/freescale/ls1046aqds/ls1046aqds.c | 48 +++++++-------
 board/freescale/ls1088a/ls1088a.c       | 26 ++++----
 include/configs/P1010RDB.h              | 42 ++++++-------
 include/configs/T102xRDB.h              | 38 +++++------
 include/configs/T104xRDB.h              | 48 +++++++-------
 include/configs/T208xQDS.h              | 60 +++++++++---------
 include/configs/T208xRDB.h              | 36 +++++------
 include/configs/T4240RDB.h              | 48 +++++++-------
 include/configs/km/pg-wcom-ls102xa.h    | 24 +++----
 include/configs/kmcent2.h               | 34 +++++-----
 include/configs/ls1021aqds.h            | 60 +++++++++---------
 include/configs/ls1021atwr.h            | 24 +++----
 include/configs/ls1043aqds.h            | 84 ++++++++++++-------------
 include/configs/ls1043ardb.h            | 64 +++++++++----------
 include/configs/ls1046aqds.h            | 84 ++++++++++++-------------
 include/configs/ls1088aqds.h            | 66 +++++++++----------
 include/configs/ls1088ardb.h            | 26 ++++----
 include/configs/ls2080aqds.h            | 66 +++++++++----------
 include/configs/ls2080ardb.h            | 38 +++++------
 21 files changed, 498 insertions(+), 498 deletions(-)
board/freescale/ls1043aqds/ls1043aqds.c +24 -24
index 481d3a5d9bd9..5fe40c4bdb25 100644
@@ -59,13 +59,13 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 		"nor0",
 		CONFIG_SYS_NOR0_CSPR,
 		CONFIG_SYS_NOR0_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 
 	},
@@ -73,13 +73,13 @@ struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 		"nor1",
 		CONFIG_SYS_NOR1_CSPR,
 		CONFIG_SYS_NOR1_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 	},
 	{
@@ -128,26 +128,26 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 		"nor0",
 		CONFIG_SYS_NOR0_CSPR,
 		CONFIG_SYS_NOR0_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 	},
 	{
 		"nor1",
 		CONFIG_SYS_NOR1_CSPR,
 		CONFIG_SYS_NOR1_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 	},
 	{
board/freescale/ls1043ardb/ls1043ardb.c +16 -16
index 7f3212819885..a8a7263a6538 100644
@@ -33,15 +33,15 @@ DECLARE_GLOBAL_DATA_PTR;
 struct ifc_regs ifc_cfg_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 	{
 		"nor",
-		CONFIG_SYS_NOR_CSPR,
-		CONFIG_SYS_NOR_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_CSPR,
+		CFG_SYS_NOR_CSPR_EXT,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 
 	},
@@ -89,15 +89,15 @@ struct ifc_regs ifc_cfg_nand_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 	},
 	{
 		"nor",
-		CONFIG_SYS_NOR_CSPR,
-		CONFIG_SYS_NOR_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_CSPR,
+		CFG_SYS_NOR_CSPR_EXT,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 	},
 	{
board/freescale/ls1046aqds/ls1046aqds.c +24 -24

76 lines not on this page · raw message

board/freescale/ls1088a/ls1088a.c +13 -13
index b70c198188bf..ff3abc830229 100644
@@ -43,13 +43,13 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 		"nor0",
 		CONFIG_SYS_NOR0_CSPR_EARLY,
 		CONFIG_SYS_NOR0_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 		0,
 		CONFIG_SYS_NOR0_CSPR,
@@ -59,17 +59,17 @@ struct ifc_regs ifc_cfg_ifc_nor_boot[CONFIG_SYS_FSL_IFC_BANK_COUNT] = {
 		"nor1",
 		CONFIG_SYS_NOR1_CSPR_EARLY,
 		CONFIG_SYS_NOR0_CSPR_EXT,
-		CONFIG_SYS_NOR_AMASK_EARLY,
-		CONFIG_SYS_NOR_CSOR,
+		CFG_SYS_NOR_AMASK_EARLY,
+		CFG_SYS_NOR_CSOR,
 		{
-			CONFIG_SYS_NOR_FTIM0,
-			CONFIG_SYS_NOR_FTIM1,
-			CONFIG_SYS_NOR_FTIM2,
-			CONFIG_SYS_NOR_FTIM3
+			CFG_SYS_NOR_FTIM0,
+			CFG_SYS_NOR_FTIM1,
+			CFG_SYS_NOR_FTIM2,
+			CFG_SYS_NOR_FTIM3
 		},
 		0,
 		CONFIG_SYS_NOR1_CSPR,
-		CONFIG_SYS_NOR_AMASK,
+		CFG_SYS_NOR_AMASK,
 	},
 	{
 		"nand",
include/configs/P1010RDB.h +21 -21

64 lines not on this page · raw message

include/configs/T102xRDB.h +19 -19
index 6eaa4144959d..978cc6714ec6 100644
@@ -139,26 +139,26 @@
 				CSPR_PORT_SIZE_16 | \
 				CSPR_MSEL_NOR | \
 				CSPR_V)
-#define CONFIG_SYS_NOR_AMASK	IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK	IFC_AMASK(128*1024*1024)
 
 /* NOR Flash Timing Params */
 #if defined(CONFIG_TARGET_T1024RDB)
-#define CONFIG_SYS_NOR_CSOR	CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_CSOR	CSOR_NAND_TRHZ_80
 #elif defined(CONFIG_TARGET_T1023RDB)
-#define CONFIG_SYS_NOR_CSOR    (CSOR_NOR_ADM_SHIFT(0) | \
+#define CFG_SYS_NOR_CSOR    (CSOR_NOR_ADM_SHIFT(0) | \
 				CSOR_NAND_TRHZ_80 | CSOR_NOR_ADM_SHFT_MODE_EN)
 #endif
-#define CONFIG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
 				FTIM0_NOR_TEADC(0x5) | \
 				FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
 				FTIM1_NOR_TRAD_NOR(0x1A) |\
 				FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
 				FTIM2_NOR_TCH(0x4) | \
 				FTIM2_NOR_TWPH(0x0E) | \
 				FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3	0x0
+#define CFG_SYS_NOR_FTIM3	0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
@@ -247,21 +247,21 @@
 #define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3		CFG_SYS_NOR_FTIM3
 #else
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT		CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1		CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1		CFG_SYS_NAND_AMASK
include/configs/T104xRDB.h +24 -24

77 lines not on this page · raw message

include/configs/T208xQDS.h +30 -30

88 lines not on this page · raw message

include/configs/T208xRDB.h +18 -18
index 111f2e6245f9..0616f8a86dff 100644
@@ -98,22 +98,22 @@
 				CSPR_PORT_SIZE_16 | \
 				CSPR_MSEL_NOR | \
 				CSPR_V)
-#define CONFIG_SYS_NOR_AMASK	IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK	IFC_AMASK(128*1024*1024)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR	CSOR_NAND_TRHZ_80
+#define CFG_SYS_NOR_CSOR	CSOR_NAND_TRHZ_80
 
-#define CONFIG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
 				FTIM0_NOR_TEADC(0x5) | \
 				FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
 				FTIM1_NOR_TRAD_NOR(0x1A) |\
 				FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
 				FTIM2_NOR_TCH(0x4) | \
 				FTIM2_NOR_TWPH(0x0E) | \
 				FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3	0x0
+#define CFG_SYS_NOR_FTIM3	0x0
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
@@ -187,21 +187,21 @@
 #define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NAND_FTIM3
 #define CONFIG_SYS_CSPR1_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR1		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK1		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR1		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS1_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS1_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS1_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS1_FTIM3		CFG_SYS_NOR_FTIM3
 #else
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT		CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR1		CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK1		CFG_SYS_NAND_AMASK
include/configs/T4240RDB.h +24 -24

78 lines not on this page · raw message

include/configs/km/pg-wcom-ls102xa.h +12 -12
index d883b188ce3a..cc8c37ec0bf5 100644
@@ -41,25 +41,25 @@
 				CSPR_TE | \
 				CSPR_MSEL_NOR | \
 				CSPR_V)
-#define CONFIG_SYS_NOR_AMASK		IFC_AMASK(64 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK		IFC_AMASK(64 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR_CSOR		(CSOR_NOR_AVD_TGL_PGM_EN | \
+#define CFG_SYS_NOR_CSOR		(CSOR_NOR_AVD_TGL_PGM_EN | \
 					CSOR_NOR_ADM_SHIFT(0x4) | \
 					CSOR_NOR_NOR_MODE_ASYNC_NOR | \
 					CSOR_NOR_TRHZ_20 | \
 					CSOR_NOR_BCTLD)
-#define CONFIG_SYS_NOR_FTIM0		(FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_FTIM0		(FTIM0_NOR_TACSE(0x1) | \
 					FTIM0_NOR_TEADC(0x7) | \
 					FTIM0_NOR_TAVDS(0x0) | \
 					FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1		(FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1		(FTIM1_NOR_TACO(0x1) | \
 					FTIM1_NOR_TRAD_NOR(0x21) | \
 					FTIM1_NOR_TSEQRAD_NOR(0x21))
-#define CONFIG_SYS_NOR_FTIM2		(FTIM2_NOR_TCS(0x1) | \
+#define CFG_SYS_NOR_FTIM2		(FTIM2_NOR_TCS(0x1) | \
 					FTIM2_NOR_TCH(0x1) | \
 					FTIM2_NOR_TWPH(0x6) | \
 					FTIM2_NOR_TWP(0xb))
-#define CONFIG_SYS_NOR_FTIM3		0
+#define CFG_SYS_NOR_FTIM3		0
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
@@ -69,12 +69,12 @@
 
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 
 /* NAND Flash Definitions */
 #define CFG_SYS_NAND_BASE		0x68000000
include/configs/kmcent2.h +17 -17
index 51ee68655333..16fd6d562d41 100644
@@ -193,38 +193,38 @@
 #define CONFIG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | \
 					CONFIG_SYS_FLASH_BASE)
 
-#define CONFIG_SYS_NOR_CSPR_EXT	(0x0f)
-#define CONFIG_SYS_NOR_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
+#define CFG_SYS_NOR_CSPR_EXT	(0x0f)
+#define CFG_SYS_NOR_CSPR	(CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE) | \
 				CSPR_PORT_SIZE_16 | /* Port size = 16 bit */\
 				0x00000010 |	    /* drive TE high */\
 				CSPR_MSEL_NOR |	    /* MSEL = NOR */\
 				CSPR_V)		    /* valid */
-#define CONFIG_SYS_NOR_AMASK	IFC_AMASK(64 * 1024 * 1024) /* 64MB */
-#define CONFIG_SYS_NOR_CSOR	(CSOR_NOR_AVD_TGL_PGM_EN | /* AVD toggle */\
+#define CFG_SYS_NOR_AMASK	IFC_AMASK(64 * 1024 * 1024) /* 64MB */
+#define CFG_SYS_NOR_CSOR	(CSOR_NOR_AVD_TGL_PGM_EN | /* AVD toggle */\
 				CSOR_NOR_TRHZ_20 | \
 				CSOR_NOR_BCTLD)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x1) | \
 				FTIM0_NOR_TEADC(0x7) | \
 				FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x1) | \
 				FTIM1_NOR_TRAD_NOR(0x21) | \
 				FTIM1_NOR_TSEQRAD_NOR(0x21))
-#define CONFIG_SYS_NOR_FTIM2	(FTIM2_NOR_TCH(0x1) | \
+#define CFG_SYS_NOR_FTIM2	(FTIM2_NOR_TCH(0x1) | \
 				FTIM2_NOR_TCS(0x1) | \
 				FTIM2_NOR_TWP(0xb) | \
 				FTIM2_NOR_TWPH(0x6))
-#define CONFIG_SYS_NOR_FTIM3	0x0
-
-#define CONFIG_SYS_CSPR0_EXT	CONFIG_SYS_NOR_CSPR_EXT
-#define CONFIG_SYS_CSPR0	CONFIG_SYS_NOR_CSPR
-#define CONFIG_SYS_AMASK0	CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0	CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0	CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1	CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2	CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3	CONFIG_SYS_NOR_FTIM3
+#define CFG_SYS_NOR_FTIM3	0x0
+
+#define CONFIG_SYS_CSPR0_EXT	CFG_SYS_NOR_CSPR_EXT
+#define CONFIG_SYS_CSPR0	CFG_SYS_NOR_CSPR
+#define CONFIG_SYS_AMASK0	CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0	CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0	CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1	CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2	CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3	CFG_SYS_NOR_FTIM3
 
 /* More NOR Flash params */
 
include/configs/ls1021aqds.h +30 -30

91 lines not on this page · raw message

include/configs/ls1021atwr.h +12 -12
index 2c96b6f77895..1ac59a2d4597 100644
@@ -74,23 +74,23 @@
 				CSPR_PORT_SIZE_16 | \
 				CSPR_MSEL_NOR | \
 				CSPR_V)
-#define CONFIG_SYS_NOR_AMASK		IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK		IFC_AMASK(128 * 1024 * 1024)
 
 /* NOR Flash Timing Params */
-#define CONFIG_SYS_NOR_CSOR		(CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR		(CSOR_NOR_ADM_SHIFT(4) | \
 					CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0		(FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_FTIM0		(FTIM0_NOR_TACSE(0x4) | \
 					FTIM0_NOR_TEADC(0x5) | \
 					FTIM0_NOR_TAVDS(0x0) | \
 					FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1		(FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1		(FTIM1_NOR_TACO(0x35) | \
 					FTIM1_NOR_TRAD_NOR(0x1A) | \
 					FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2		(FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2		(FTIM2_NOR_TCS(0x4) | \
 					FTIM2_NOR_TCH(0x4) | \
 					FTIM2_NOR_TWP(0x1c) | \
 					FTIM2_NOR_TWPH(0x0e))
-#define CONFIG_SYS_NOR_FTIM3		0
+#define CFG_SYS_NOR_FTIM3		0
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
@@ -126,12 +126,12 @@
 #define CONFIG_SYS_FPGA_FTIM3           0x0
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR1_EXT		CONFIG_SYS_FPGA_CSPR_EXT
 #define CONFIG_SYS_CSPR1		CONFIG_SYS_FPGA_CSPR
 #define CONFIG_SYS_AMASK1		CONFIG_SYS_FPGA_AMASK
include/configs/ls1043aqds.h +42 -42

123 lines not on this page · raw message

include/configs/ls1043ardb.h +32 -32

98 lines not on this page · raw message

include/configs/ls1046aqds.h +42 -42

124 lines not on this page · raw message

include/configs/ls1088aqds.h +33 -33

104 lines not on this page · raw message

include/configs/ls1088ardb.h +13 -13
index 2ca1384c2315..27510adae677 100644
@@ -21,8 +21,8 @@
 
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 #define CONFIG_SYS_NOR0_CSPR_EXT	(0x0)
-#define CONFIG_SYS_NOR_AMASK		IFC_AMASK(128 * 1024 * 1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY	IFC_AMASK(64 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK		IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK_EARLY	IFC_AMASK(64 * 1024 * 1024)
 
 #define CONFIG_SYS_NOR0_CSPR					\
 	(CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)		| \
@@ -34,16 +34,16 @@
 	CSPR_PORT_SIZE_16					| \
 	CSPR_MSEL_NOR						| \
 	CSPR_V)
-#define CONFIG_SYS_NOR_CSOR	CSOR_NOR_ADM_SHIFT(6)
-#define CONFIG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_CSOR	CSOR_NOR_ADM_SHIFT(6)
+#define CFG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x1) | \
 				FTIM0_NOR_TEADC(0x1) | \
 				FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x1) | \
 				FTIM1_NOR_TRAD_NOR(0x1))
-#define CONFIG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x0) | \
+#define CFG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x0) | \
 				FTIM2_NOR_TCH(0x0) | \
 				FTIM2_NOR_TWP(0x1))
-#define CONFIG_SYS_NOR_FTIM3	0x04000000
+#define CFG_SYS_NOR_FTIM3	0x04000000
 #define CONFIG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
@@ -153,12 +153,12 @@
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 #endif
 
 #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
include/configs/ls2080aqds.h +33 -33

103 lines not on this page · raw message

include/configs/ls2080ardb.h +19 -19
index 086c46902c86..daca3be16c51 100644
@@ -33,8 +33,8 @@
 #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT)
 
 #define CONFIG_SYS_NOR0_CSPR_EXT	(0x0)
-#define CONFIG_SYS_NOR_AMASK		IFC_AMASK(128*1024*1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY	IFC_AMASK(64*1024*1024)
+#define CFG_SYS_NOR_AMASK		IFC_AMASK(128*1024*1024)
+#define CFG_SYS_NOR_AMASK_EARLY	IFC_AMASK(64*1024*1024)
 
 #define CONFIG_SYS_NOR0_CSPR					\
 	(CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)		| \
@@ -46,18 +46,18 @@
 	CSPR_PORT_SIZE_16					| \
 	CSPR_MSEL_NOR						| \
 	CSPR_V)
-#define CONFIG_SYS_NOR_CSOR	CSOR_NOR_ADM_SHIFT(12)
-#define CONFIG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR	CSOR_NOR_ADM_SHIFT(12)
+#define CFG_SYS_NOR_FTIM0	(FTIM0_NOR_TACSE(0x4) | \
 				FTIM0_NOR_TEADC(0x5) | \
 				FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1	(FTIM1_NOR_TACO(0x35) | \
 				FTIM1_NOR_TRAD_NOR(0x1a) |\
 				FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
+#define CFG_SYS_NOR_FTIM2	(FTIM2_NOR_TCS(0x4) | \
 				FTIM2_NOR_TCH(0x4) | \
 				FTIM2_NOR_TWPH(0x0E) | \
 				FTIM2_NOR_TWP(0x1c))
-#define CONFIG_SYS_NOR_FTIM3	0x04000000
+#define CFG_SYS_NOR_FTIM3	0x04000000
 #define CONFIG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
@@ -140,12 +140,12 @@
 #define CONFIG_SYS_CSPR2_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR2		CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR2_FINAL		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK2		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK2		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR2		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS2_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS2_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS2_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS2_FTIM3		CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR0_EXT		CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK0		CFG_SYS_NAND_AMASK
@@ -160,12 +160,12 @@
 #define CONFIG_SYS_CSPR0_EXT		CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0		CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR0_FINAL		CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0		CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0		CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0		CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1		CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2		CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3		CONFIG_SYS_NOR_FTIM3
+#define CONFIG_SYS_AMASK0		CFG_SYS_NOR_AMASK
+#define CONFIG_SYS_CSOR0		CFG_SYS_NOR_CSOR
+#define CONFIG_SYS_CS0_FTIM0		CFG_SYS_NOR_FTIM0
+#define CONFIG_SYS_CS0_FTIM1		CFG_SYS_NOR_FTIM1
+#define CONFIG_SYS_CS0_FTIM2		CFG_SYS_NOR_FTIM2
+#define CONFIG_SYS_CS0_FTIM3		CFG_SYS_NOR_FTIM3
 #define CONFIG_SYS_CSPR2_EXT		CFG_SYS_NAND_CSPR_EXT
 #define CONFIG_SYS_CSPR2		CFG_SYS_NAND_CSPR
 #define CONFIG_SYS_AMASK2		CFG_SYS_NAND_AMASK
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/17 powerpc: Rename CONFIG_NS16550_MIN_FUNCTIONS

This symbol is specific to the PowerPC SPL implementation, so rename this to reflect that it's in SPL and used / tested there, so that we can then safely migrate it to Kconfig.

---
 README                          | 2 +-
 drivers/serial/ns16550.c        | 8 ++++----
 drivers/serial/serial_ns16550.c | 4 ++--
 include/configs/P1010RDB.h      | 4 +---
 include/configs/p1_p2_rdb_pc.h  | 4 +---
 scripts/config_whitelist.txt    | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)
README +1 -1
index f5407576276c..f71832b689ed 100644
@@ -1619,7 +1619,7 @@ use the "saveenv" command to store a valid environment.
 - CONFIG_SYS_FAULT_MII_ADDR:
 		MII address of the PHY to check for the Ethernet link state.
 
-- CONFIG_NS16550_MIN_FUNCTIONS:
+- CONFIG_SPL_NS16550_MIN_FUNCTIONS:
 		Define this if you desire to only have use of the NS16550_init
 		and NS16550_putc functions for the serial driver located at
 		drivers/serial/ns16550.c.  This option is useful for saving
drivers/serial/ns16550.c +4 -4
index 7592979cab5d..5a693d2f02ae 100644
@@ -272,7 +272,7 @@ void ns16550_init(struct ns16550 *com_port, int baud_divisor)
 #endif
 }
 
-#ifndef CONFIG_NS16550_MIN_FUNCTIONS
+#if !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS)
 void ns16550_reinit(struct ns16550 *com_port, int baud_divisor)
 {
 	serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
@@ -281,7 +281,7 @@ void ns16550_reinit(struct ns16550 *com_port, int baud_divisor)
 	serial_out(ns16550_getfcr(com_port), &com_port->fcr);
 	ns16550_setbrg(com_port, baud_divisor);
 }
-#endif /* CONFIG_NS16550_MIN_FUNCTIONS */
+#endif /* !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS) */
 
 void ns16550_putc(struct ns16550 *com_port, char c)
 {
@@ -299,7 +299,7 @@ void ns16550_putc(struct ns16550 *com_port, char c)
 		schedule();
 }
 
-#ifndef CONFIG_NS16550_MIN_FUNCTIONS
+#if !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS)
 char ns16550_getc(struct ns16550 *com_port)
 {
 	while ((serial_in(&com_port->lsr) & UART_LSR_DR) == 0) {
@@ -317,7 +317,7 @@ int ns16550_tstc(struct ns16550 *com_port)
 	return (serial_in(&com_port->lsr) & UART_LSR_DR) != 0;
 }
 
-#endif /* CONFIG_NS16550_MIN_FUNCTIONS */
+#endif /* !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS) */
 
 #ifdef CONFIG_DEBUG_UART_NS16550
 
drivers/serial/serial_ns16550.c +2 -2
index 97b6a4ff40d2..76aa1e5afb42 100644
@@ -11,7 +11,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 
-#ifndef CONFIG_NS16550_MIN_FUNCTIONS
+#if !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS)
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -251,4 +251,4 @@ void ns16550_serial_initialize(void)
 #endif
 }
 
-#endif /* !CONFIG_NS16550_MIN_FUNCTIONS */
+#endif /* !CONFIG_IS_ENABLED(NS16550_MIN_FUNCTIONS) */
include/configs/P1010RDB.h +1 -3
index 154bf584f29f..9afd834f9faf 100644
@@ -325,9 +325,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)
-#if defined(CONFIG_SPL_BUILD) && CONFIG_IS_ENABLED(INIT_MINIMAL)
-#define CONFIG_NS16550_MIN_FUNCTIONS
-#endif
+#define CONFIG_SPL_NS16550_MIN_FUNCTIONS
 
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
include/configs/p1_p2_rdb_pc.h +1 -3
index 38f360b53ca0..838c62c67111 100644
@@ -322,9 +322,7 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		get_bus_freq(0)
-#if defined(CONFIG_SPL_BUILD) && CONFIG_IS_ENABLED(INIT_MINIMAL)
-#define CONFIG_NS16550_MIN_FUNCTIONS
-#endif
+#define CONFIG_SPL_NS16550_MIN_FUNCTIONS
 
 #define CONFIG_SYS_BAUDRATE_TABLE	\
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
scripts/config_whitelist.txt +1 -1
index 68f334847179..d96e5be1f76c 100644
@@ -186,7 +186,6 @@ CONFIG_NETMASK
 CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NOBQFMAN
 CONFIG_NORBOOT
-CONFIG_NS16550_MIN_FUNCTIONS
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
@@ -278,6 +277,7 @@ CONFIG_SPI_FLASH_QUAD
 CONFIG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
 CONFIG_SPI_N25Q256A_RESET
+CONFIG_SPL_NS16550_MIN_FUNCTIONS
 CONFIG_SRIO1
 CONFIG_SRIO2
 CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET
Signature · 1 line
2.25.1
Reviewed-by on v1 2/17
#2 lore raw

Re: [PATCH 02/17] powerpc: Rename CONFIG_NS16550_MIN_FUNCTIONS

Quoted 6 lines · Tom Rini

This symbol is specific to the PowerPC SPL implementation, so rename this to reflect that it's in SPL and used / tested there, so that we can then safely migrate it to Kconfig.

Quoted 9 lines
---
 README                          | 2 +-
 drivers/serial/ns16550.c        | 8 ++++----
 drivers/serial/serial_ns16550.c | 4 ++--
 include/configs/P1010RDB.h      | 4 +---
 include/configs/p1_p2_rdb_pc.h  | 4 +---
 scripts/config_whitelist.txt    | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)
author
#3 lore raw

PATCH 3/17 Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

In reply to Tom Rini

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

---
 README                                        |  7 ---
 arch/arm/include/asm/arch-bcmcygnus/configs.h |  4 --
 arch/arm/include/asm/arch-bcmnsp/configs.h    |  3 --
 configs/10m50_defconfig                       |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PA_NAND_defconfig            |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PB_NAND_defconfig            |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P1020RDB-PC_NAND_defconfig            |  1 +
 configs/P1020RDB-PD_NAND_defconfig            |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P2020RDB-PC_NAND_defconfig            |  1 +
 configs/SBx81LIFKW_defconfig                  |  1 +
 configs/SBx81LIFXCAT_defconfig                |  1 +
 configs/axs101_defconfig                      |  1 +
 configs/axs103_defconfig                      |  1 +
 configs/bayleybay_defconfig                   |  1 +
 configs/bcm7260_defconfig                     |  1 +
 configs/bcm7445_defconfig                     |  1 +
 configs/cherryhill_defconfig                  |  1 +
 configs/chromebit_mickey_defconfig            |  1 +
 configs/chromebook_bob_defconfig              |  1 +
 configs/chromebook_coral_defconfig            |  1 +
 configs/chromebook_jerry_defconfig            |  1 +
 configs/chromebook_kevin_defconfig            |  1 +
 configs/chromebook_link64_defconfig           |  1 +
 configs/chromebook_link_defconfig             |  1 +
 configs/chromebook_minnie_defconfig           |  1 +
 configs/chromebook_samus_defconfig            |  1 +
 configs/chromebook_samus_tpl_defconfig        |  1 +
 configs/chromebook_speedy_defconfig           |  1 +
 configs/chromebox_panther_defconfig           |  1 +
 ...-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig     |  1 +
 configs/coreboot64_defconfig                  |  1 +
 configs/coreboot_defconfig                    |  1 +
 configs/cougarcanyon2_defconfig               |  1 +
 configs/crownbay_defconfig                    |  1 +
 configs/d2net_v2_defconfig                    |  1 +
 configs/dns325_defconfig                      |  1 +
 configs/dockstar_defconfig                    |  1 +
 configs/dreamplug_defconfig                   |  1 +
 configs/ds109_defconfig                       |  1 +
 configs/eaidk-610-rk3399_defconfig            |  1 +
 configs/efi-x86_payload32_defconfig           |  1 +
 configs/efi-x86_payload64_defconfig           |  1 +
 configs/elgin-rv1108_defconfig                |  1 +
 configs/evb-px30_defconfig                    |  1 +
 configs/evb-px5_defconfig                     |  1 +
 configs/evb-rk3036_defconfig                  |  1 +
 configs/evb-rk3128_defconfig                  |  1 +
 configs/evb-rk3229_defconfig                  |  1 +
 configs/evb-rk3288_defconfig                  |  1 +
 configs/evb-rk3308_defconfig                  |  1 +
 configs/evb-rk3328_defconfig                  |  1 +
 configs/evb-rk3399_defconfig                  |  1 +
 configs/evb-rk3568_defconfig                  |  1 +
 configs/evb-rv1108_defconfig                  |  1 +
 configs/ficus-rk3399_defconfig                |  1 +
 configs/firefly-px30_defconfig                |  1 +
 configs/firefly-rk3288_defconfig              |  1 +
 configs/firefly-rk3399_defconfig              |  1 +
 configs/geekbox_defconfig                     |  1 +
 configs/goflexhome_defconfig                  |  1 +
 configs/guruplug_defconfig                    |  1 +
 configs/hsdk_4xd_defconfig                    |  1 +
 configs/hsdk_defconfig                        |  1 +
 configs/ib62x0_defconfig                      |  1 +
 configs/iconnect_defconfig                    |  1 +
 configs/inetspace_v2_defconfig                |  1 +
 configs/k2e_evm_defconfig                     |  1 +
 configs/k2e_hs_evm_defconfig                  |  1 +
 configs/k2g_evm_defconfig                     |  1 +
 configs/k2g_hs_evm_defconfig                  |  1 +
 configs/k2hk_evm_defconfig                    |  1 +
 configs/k2hk_hs_evm_defconfig                 |  1 +
 configs/k2l_evm_defconfig                     |  1 +
 configs/k2l_hs_evm_defconfig                  |  1 +
 configs/khadas-edge-captain-rk3399_defconfig  |  1 +
 configs/khadas-edge-rk3399_defconfig          |  1 +
 configs/khadas-edge-v-rk3399_defconfig        |  1 +
 configs/kylin-rk3036_defconfig                |  1 +
 configs/leez-rk3399_defconfig                 |  1 +
 configs/lion-rk3368_defconfig                 |  1 +
 configs/malta64_defconfig                     |  1 +
 configs/malta64el_defconfig                   |  1 +
 configs/malta_defconfig                       |  1 +
 configs/maltael_defconfig                     |  1 +
 configs/minnowmax_defconfig                   |  1 +
 configs/miqi-rk3288_defconfig                 |  1 +
 configs/mk808_defconfig                       |  1 +
 configs/nanopc-t4-rk3399_defconfig            |  1 +
 configs/nanopi-m4-2gb-rk3399_defconfig        |  1 +
 configs/nanopi-m4-rk3399_defconfig            |  1 +
 configs/nanopi-m4b-rk3399_defconfig           |  1 +
 configs/nanopi-neo4-rk3399_defconfig          |  1 +
 configs/nanopi-r2s-rk3328_defconfig           |  1 +
 configs/nanopi-r4s-rk3399_defconfig           |  1 +
 configs/nas220_defconfig                      |  1 +
 configs/net2big_v2_defconfig                  |  1 +
 configs/netspace_lite_v2_defconfig            |  1 +
 configs/netspace_max_v2_defconfig             |  1 +
 configs/netspace_mini_v2_defconfig            |  1 +
 configs/netspace_v2_defconfig                 |  1 +
 configs/nsa310s_defconfig                     |  1 +
 configs/odroid-go2_defconfig                  |  1 +
 configs/openrd_base_defconfig                 |  1 +
 configs/openrd_client_defconfig               |  1 +
 configs/openrd_ultimate_defconfig             |  1 +
 configs/orangepi-rk3399_defconfig             |  1 +
 configs/phycore-rk3288_defconfig              |  1 +
 configs/pinebook-pro-rk3399_defconfig         |  1 +
 configs/pogo_e02_defconfig                    |  1 +
 configs/pogo_v4_defconfig                     |  1 +
 configs/popmetal-rk3288_defconfig             |  1 +
 configs/puma-rk3399_defconfig                 |  1 +
 configs/px30-core-ctouch2-of10-px30_defconfig |  1 +
 configs/px30-core-ctouch2-px30_defconfig      |  1 +
 configs/px30-core-edimm2.2-px30_defconfig     |  1 +
 configs/qemu-x86_64_defconfig                 |  1 +
 configs/qemu-x86_defconfig                    |  1 +
 configs/roc-cc-rk3308_defconfig               |  1 +
 configs/roc-cc-rk3328_defconfig               |  1 +
 configs/roc-pc-mezzanine-rk3399_defconfig     |  1 +
 configs/roc-pc-rk3399_defconfig               |  1 +
 configs/rock-pi-4-rk3399_defconfig            |  1 +
 configs/rock-pi-4c-rk3399_defconfig           |  1 +
 configs/rock-pi-e-rk3328_defconfig            |  1 +
 configs/rock-pi-n10-rk3399pro_defconfig       |  1 +
 configs/rock-pi-n8-rk3288_defconfig           |  1 +
 configs/rock2_defconfig                       |  1 +
 configs/rock64-rk3328_defconfig               |  1 +
 configs/rock960-rk3399_defconfig              |  1 +
 configs/rock_defconfig                        |  1 +
 configs/rockpro64-rk3399_defconfig            |  1 +
 configs/sheep-rk3368_defconfig                |  1 +
 configs/sheevaplug_defconfig                  |  1 +
 configs/slimbootloader_defconfig              |  1 +
 configs/socfpga_agilex_atf_defconfig          |  1 +
 configs/socfpga_agilex_defconfig              |  1 +
 configs/socfpga_agilex_vab_defconfig          |  1 +
 configs/socfpga_arria10_defconfig             |  1 +
 configs/socfpga_chameleonv3_defconfig         |  1 +
 configs/socfpga_n5x_atf_defconfig             |  1 +
 configs/socfpga_n5x_defconfig                 |  1 +
 configs/socfpga_n5x_vab_defconfig             |  1 +
 configs/socfpga_stratix10_atf_defconfig       |  1 +
 configs/socfpga_stratix10_defconfig           |  1 +
 configs/som-db5800-som-6867_defconfig         |  1 +
 ...able-x86-conga-qa3-e3845-pcie-x4_defconfig |  1 +
 .../theadorable-x86-conga-qa3-e3845_defconfig |  1 +
 configs/tinker-rk3288_defconfig               |  1 +
 configs/tinker-s-rk3288_defconfig             |  1 +
 configs/vyasa-rk3288_defconfig                |  1 +
 configs/xtfpga_defconfig                      |  1 +
 drivers/serial/Kconfig                        | 47 +++++++++++++++----
 include/configs/10m50_devboard.h              |  1 -
 include/configs/MPC837XERDB.h                 |  2 -
 include/configs/MPC8548CDS.h                  |  2 -
 include/configs/P1010RDB.h                    |  3 --
 include/configs/P2041RDB.h                    |  2 -
 include/configs/SBx81LIFKW.h                  |  2 -
 include/configs/SBx81LIFXCAT.h                |  2 -
 include/configs/T102xRDB.h                    |  2 -
 include/configs/T104xRDB.h                    |  2 -
 include/configs/T208xQDS.h                    |  2 -
 include/configs/T208xRDB.h                    |  2 -
 include/configs/T4240RDB.h                    |  2 -
 include/configs/am43xx_evm.h                  |  4 --
 include/configs/ax25-ae350.h                  |  4 --
 include/configs/axs10x.h                      |  2 -
 include/configs/bcmstb.h                      |  2 -
 include/configs/bur_am335x_common.h           |  2 -
 include/configs/chromebook_coral.h            |  3 --
 include/configs/cm_t43.h                      |  4 --
 include/configs/dfi-bt700.h                   |  1 -
 include/configs/galileo.h                     |  1 -
 .../configs/gardena-smart-gateway-mt7688.h    |  2 -
 include/configs/hsdk-4xd.h                    |  2 -
 include/configs/hsdk.h                        |  2 -
 include/configs/km/pg-wcom-ls102xa.h          |  1 -
 include/configs/kmcent2.h                     |  2 -
 include/configs/legoev3.h                     |  1 -
 include/configs/linkit-smart-7688.h           |  2 -
 include/configs/ls1012a_common.h              |  2 -
 include/configs/ls1021aiot.h                  |  2 -
 include/configs/ls1021aqds.h                  |  4 --
 include/configs/ls1021atsn.h                  |  4 --
 include/configs/ls1021atwr.h                  |  4 --
 include/configs/ls1028a_common.h              |  2 -
 include/configs/ls1043a_common.h              |  2 -
 include/configs/ls1046a_common.h              |  2 -
 include/configs/ls1088a_common.h              |  2 -
 include/configs/ls2080a_common.h              |  2 -
 include/configs/malta.h                       |  1 -
 include/configs/mt7621.h                      |  2 -
 include/configs/mt7628.h                      |  2 -
 include/configs/mt8183.h                      |  3 --
 include/configs/mt8516.h                      |  3 --
 include/configs/mv-common.h                   |  2 -
 include/configs/nokia_rx51.h                  |  1 -
 include/configs/p1_p2_rdb_pc.h                |  3 --
 include/configs/px30_common.h                 |  2 -
 include/configs/rk3308_common.h               |  2 -
 include/configs/rockchip-common.h             |  2 -
 include/configs/siemens-am33x-common.h        |  1 -
 include/configs/sniper.h                      |  5 --
 include/configs/socfpga_arria10_socdk.h       |  1 -
 include/configs/socfpga_chameleonv3.h         |  1 -
 include/configs/socfpga_soc64_common.h        |  1 -
 include/configs/sunxi-common.h                |  2 -
 include/configs/tb100.h                       |  1 -
 include/configs/theadorable-x86-dfi-bt700.h   |  1 -
 include/configs/ti814x_evm.h                  |  2 -
 include/configs/ti816x_evm.h                  |  2 -
 include/configs/ti_am335x_common.h            |  6 ---
 include/configs/ti_armv7_keystone2.h          |  1 -
 include/configs/ti_omap3_common.h             |  4 --
 include/configs/ti_omap4_common.h             |  2 -
 include/configs/ti_omap5_common.h             |  4 --
 include/configs/vocore2.h                     |  2 -
 include/configs/x530.h                        |  2 -
 include/configs/x86-common.h                  |  1 -
 include/configs/xtfpga.h                      |  2 -
 include/ns16550.h                             |  2 +-
 226 files changed, 193 insertions(+), 172 deletions(-)
README +0 -7
index f71832b689ed..9086207954ea 100644
@@ -1619,13 +1619,6 @@ use the "saveenv" command to store a valid environment.
 - CONFIG_SYS_FAULT_MII_ADDR:
 		MII address of the PHY to check for the Ethernet link state.
 
-- CONFIG_SPL_NS16550_MIN_FUNCTIONS:
-		Define this if you desire to only have use of the NS16550_init
-		and NS16550_putc functions for the serial driver located at
-		drivers/serial/ns16550.c.  This option is useful for saving
-		space for already greatly restricted images, including but not
-		limited to NAND_SPL configurations.
-
 - CONFIG_DISPLAY_BOARDINFO
 		Display information about the board that U-Boot is running on
 		when U-Boot starts up. The board function checkboard() is called
arch/arm/include/asm/arch-bcmcygnus/configs.h +0 -4
index 327c0e06977b..0c7262352d53 100644
@@ -11,10 +11,6 @@
 /* uArchitecture specifics */
 
 /* Serial Info */
-/* Post pad 3 bytes after each reg addr */
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_MEM32
-
 #define CONFIG_SYS_NS16550_CLK		100000000
 #define CONFIG_SYS_NS16550_CLK_DIV	54
 #define CONFIG_SYS_NS16550_COM3		0x18023000
arch/arm/include/asm/arch-bcmnsp/configs.h +0 -3
index 05fa9b9612d5..44699476b08b 100644
@@ -11,9 +11,6 @@
 /* uArchitecture specifics */
 
 /* Serial Info */
-/* no padding */
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-
 #define CONFIG_SYS_NS16550_CLK		0x03b9aca0
 #define CONFIG_SYS_NS16550_COM1		0x18000300
 
configs/10m50_defconfig +1 -0
index dd88d10274c1..28966e0d0a41 100644
@@ -47,5 +47,6 @@ CONFIG_PHY_GIGE=y
 CONFIG_ALTERA_TSE=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_TIMER=y
 CONFIG_ALTERA_TIMER=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -0
index e15ca5ea2b5d..0690582cdfee 100644
@@ -130,6 +130,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_NAND_defconfig +1 -0
index b3af4450d00f..785f2d86f189 100644
@@ -129,6 +129,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -0
index a61f4d017a68..696cb7e77fbe 100644
@@ -133,6 +133,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_NAND_defconfig +1 -0
index 7f7870d82c52..ee8c2bebd4b2 100644
@@ -132,6 +132,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
index 3f93b318c92f..f2eb7ed737b7 100644
@@ -143,6 +143,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
index f3fc4c82a54d..1f12338bc35d 100644
@@ -142,6 +142,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PD_NAND_defconfig +1 -0
index cc02fe6a8ac9..4682677471ad 100644
@@ -145,6 +145,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -0
index 9162774ad70c..d917c5470b1b 100644
@@ -148,6 +148,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_NAND_defconfig +1 -0
index 1269d22f90c6..89d366c96a43 100644
@@ -147,6 +147,7 @@ CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/SBx81LIFKW_defconfig +1 -0
index 73ef73c484ef..0df58f4419af 100644
@@ -64,6 +64,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/SBx81LIFXCAT_defconfig +1 -0
index 9fa0fda84f26..d68bccdf162d 100644
@@ -62,6 +62,7 @@ CONFIG_PHY_FIXED=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/axs101_defconfig +1 -0
index a5436db7ac72..85a70c0996b2 100644
@@ -56,6 +56,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/axs103_defconfig +1 -0
index 7fbec63c58f1..00d43e24c5a5 100644
@@ -56,6 +56,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/bayleybay_defconfig +1 -0
index 5f43f4c0ee90..90a734fcdad0 100644
@@ -59,6 +59,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/bcm7260_defconfig +1 -0
index 920e8828460e..25703cf67cea 100644
@@ -41,4 +41,5 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 # CONFIG_EFI_LOADER is not set
configs/bcm7445_defconfig +1 -0
index b44eabaa4251..9c64baaa19b3 100644
@@ -45,6 +45,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_BCMSTB_SPI=y
configs/cherryhill_defconfig +1 -0
index 06987ab82860..321121e3f729 100644
@@ -50,6 +50,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_RTL8169=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/chromebit_mickey_defconfig +1 -0
index 59ae29a80e02..2240988dd0db 100644
@@ -94,6 +94,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/chromebook_bob_defconfig +1 -0
index 3d2f40fb9554..d768e11db51e 100644
@@ -92,6 +92,7 @@ CONFIG_DM_RESET=y
 CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/chromebook_coral_defconfig +1 -0
index 45905c6792b8..a38b3b78c08a 100644
@@ -102,6 +102,7 @@ CONFIG_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SOUND_DA7219=y
 CONFIG_SOUND_I8254=y
configs/chromebook_jerry_defconfig +1 -0
index ffa8070cb39e..150dba140865 100644
@@ -97,6 +97,7 @@ CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
configs/chromebook_kevin_defconfig +1 -0
index e8ec8855dda3..94d14d012da2 100644
@@ -93,6 +93,7 @@ CONFIG_DM_RESET=y
 CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/chromebook_link64_defconfig +1 -0
index b645cba90709..570c4e82a473 100644
@@ -79,6 +79,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SPL_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
configs/chromebook_link_defconfig +1 -0
index 541b7fadead4..43cf53045b40 100644
@@ -68,6 +68,7 @@ CONFIG_SYS_I2C_INTEL=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
configs/chromebook_minnie_defconfig +1 -0
index ca453ac8b9d0..08e1e5be415c 100644
@@ -96,6 +96,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_ROCKCHIP=y
configs/chromebook_samus_defconfig +1 -0
index 27bf046f991a..aa3d6f2b9d19 100644
@@ -70,6 +70,7 @@ CONFIG_SYS_I2C_DW=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_SOUND_RT5677=y
configs/chromebook_samus_tpl_defconfig +1 -0
index e9222648758b..77735739b825 100644
@@ -91,6 +91,7 @@ CONFIG_CROS_EC_LPC=y
 # CONFIG_SPL_PINCTRL is not set
 # CONFIG_TPL_PINCTRL is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_SOUND_RT5677=y
configs/chromebook_speedy_defconfig +1 -0
index 92018fb78eef..d5aaee9dde17 100644
@@ -95,6 +95,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
configs/chromebox_panther_defconfig +1 -0
index b78e98c2045a..e83f2dfe7f39 100644
@@ -59,6 +59,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_RTL8169=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0
index 0d904675f73f..31979f32bc5f 100644
@@ -69,6 +69,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/conga-qeval20-qa3-e3845_defconfig +1 -0
index 6fed3f2ecda9..18d58bec2010 100644
@@ -65,6 +65,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/coreboot64_defconfig +1 -0
index 20c0c1816968..e4da59bae927 100644
@@ -61,6 +61,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_CONSOLE_SCROLL_LINES=5
configs/coreboot_defconfig +1 -0
index d8c5be66ad7b..e297494663e0 100644
@@ -55,6 +55,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_CONSOLE_SCROLL_LINES=5
configs/cougarcanyon2_defconfig +1 -0
index 094b21666e16..203eff8e165a 100644
@@ -53,6 +53,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/crownbay_defconfig +1 -0
index 4521172f42bf..cb0f0d7c8d02 100644
@@ -57,6 +57,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_SPI=y
configs/d2net_v2_defconfig +1 -0
index 5eea1ec9a724..e3e0accac5df 100644
@@ -67,6 +67,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/dns325_defconfig +1 -0
index 16a866f6b475..9d5fa0e247d4 100644
@@ -60,6 +60,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/dockstar_defconfig +1 -0
index 6c805f41568c..4f79942c378a 100644
@@ -56,6 +56,7 @@ CONFIG_PHY_MARVELL=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/dreamplug_defconfig +1 -0
index 86fe0692a0a3..0339759d2d97 100644
@@ -63,6 +63,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/ds109_defconfig +1 -0
index 93aef472b54d..b914808515c0 100644
@@ -57,6 +57,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/eaidk-610-rk3399_defconfig +1 -0
index 5abdadf2d56f..c364c9ecc8df 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/efi-x86_payload32_defconfig +1 -0
index 83f532d6e543..8d1fc22eb93c 100644
@@ -52,6 +52,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 # CONFIG_GZIP is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
configs/efi-x86_payload64_defconfig +1 -0
index 28aaff69e978..89e6d1febc8b 100644
@@ -52,6 +52,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 # CONFIG_GZIP is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
configs/elgin-rv1108_defconfig +1 -0
index 1f4ca01c50f8..36f57d58128b 100644
@@ -48,6 +48,7 @@ CONFIG_PINCTRL_ROCKCHIP_RV1108=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/evb-px30_defconfig +1 -0
index 6bc777c51c16..bb6f21b2e634 100644
@@ -101,6 +101,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/evb-px5_defconfig +1 -0
index f41c7580b4c6..2e3bff8cf04e 100644
@@ -78,6 +78,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_PANIC_HANG=y
 CONFIG_SPL_TINY_MEMSET=y
configs/evb-rk3036_defconfig +1 -0
index 8ef40d847c77..289f47f4ae89 100644
@@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 # CONFIG_SPL_SYSRESET is not set
 CONFIG_USB=y
configs/evb-rk3128_defconfig +1 -0
index ce10750857ee..06a044b93496 100644
@@ -46,6 +46,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/evb-rk3229_defconfig +1 -0
index f8ca1f6597be..33202e48fe76 100644
@@ -72,6 +72,7 @@ CONFIG_SPL_RAM=y
 CONFIG_TPL_RAM=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
configs/evb-rk3288_defconfig +1 -0
index 7c0b856ca567..8f8d34c7038f 100644
@@ -81,6 +81,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/evb-rk3308_defconfig +1 -0
index 8502fcc51e62..0aeaf01d9a70 100644
@@ -74,6 +74,7 @@ CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/evb-rk3328_defconfig +1 -0
index 9421845b0377..8a6d19a1769e 100644
@@ -88,6 +88,7 @@ CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 # CONFIG_TPL_SYSRESET is not set
 CONFIG_USB=y
configs/evb-rk3399_defconfig +1 -0
index e7da9c4e5ff7..3050fd59922c 100644
@@ -61,6 +61,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/evb-rk3568_defconfig +1 -0
index db3acf5be53f..7374ee42fb19 100644
@@ -63,5 +63,6 @@ CONFIG_SPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
configs/evb-rv1108_defconfig +1 -0
index 5de5de465cb0..aab322311162 100644
@@ -42,6 +42,7 @@ CONFIG_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/ficus-rk3399_defconfig +1 -0
index d48dcc1a0ece..3aee6b647136 100644
@@ -55,6 +55,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/firefly-px30_defconfig +1 -0
index 1f91118426e7..2a6d2edbab02 100644
@@ -100,6 +100,7 @@ CONFIG_DM_RESET=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/firefly-rk3288_defconfig +1 -0
index 63c53a0248f2..26967a67cc94 100644
@@ -78,6 +78,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/firefly-rk3399_defconfig +1 -0
index a37870628c65..547517253288 100644
@@ -61,6 +61,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/geekbox_defconfig +1 -0
index 1d7832b9591c..c23d0549a4a2 100644
@@ -27,5 +27,6 @@ CONFIG_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
configs/goflexhome_defconfig +1 -0
index 6fdb3ea68003..cc59e2c7762a 100644
@@ -63,6 +63,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/guruplug_defconfig +1 -0
index 794cf4b23d7a..482f76d99a9f 100644
@@ -62,6 +62,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/hsdk_4xd_defconfig +1 -0
index 8c6ad5a0d17d..bba406726850 100644
@@ -60,6 +60,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/hsdk_defconfig +1 -0
index 9543c785bba9..4715f9d9d7d0 100644
@@ -59,6 +59,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/ib62x0_defconfig +1 -0
index 9290cb7af688..6a879f568500 100644
@@ -60,6 +60,7 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/iconnect_defconfig +1 -0
index ce5a089d3270..c130d522d9c9 100644
@@ -60,6 +60,7 @@ CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/inetspace_v2_defconfig +1 -0
index 42f812c31f0e..7dce414a1c58 100644
@@ -67,6 +67,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/k2e_evm_defconfig +1 -0
index 25007793b3a0..96bcba6e94ff 100644
@@ -92,6 +92,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2e_hs_evm_defconfig +1 -0
index 6c8a284e7c70..0d1c97dd4b09 100644
@@ -67,6 +67,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2g_evm_defconfig +1 -0
index 6182101f1197..bded09788026 100644
@@ -96,6 +96,7 @@ CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_CADENCE_QSPI=y
configs/k2g_hs_evm_defconfig +1 -0
index fd169c3e957a..a851d8508221 100644
@@ -70,6 +70,7 @@ CONFIG_NOP_PHY=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_CADENCE_QSPI=y
configs/k2hk_evm_defconfig +1 -0
index fec29f2c9119..b0069fd60b01 100644
@@ -92,6 +92,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2hk_hs_evm_defconfig +1 -0
index f6ac484f2e85..9ca26ae61f51 100644
@@ -67,6 +67,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2l_evm_defconfig +1 -0
index 13d612ac3fb6..153abb7eb936 100644
@@ -93,6 +93,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2l_hs_evm_defconfig +1 -0
index 59ec3a6346f3..2990a702d999 100644
@@ -71,6 +71,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/khadas-edge-captain-rk3399_defconfig +1 -0
index dff052230846..754fd4e3c6d5 100644
@@ -56,6 +56,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/khadas-edge-rk3399_defconfig +1 -0
index 5a8b69c0f94a..7518f7f2edef 100644
@@ -55,6 +55,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/khadas-edge-v-rk3399_defconfig +1 -0
index f54a610a2748..4c4301a9e7c5 100644
@@ -56,6 +56,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/kylin-rk3036_defconfig +1 -0
index 1ad635daa985..646f0086c6e3 100644
@@ -60,6 +60,7 @@ CONFIG_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 # CONFIG_SPL_SYSRESET is not set
 CONFIG_USB=y
configs/leez-rk3399_defconfig +1 -0
index a8326f03a23f..5a958ee36a3f 100644
@@ -51,6 +51,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/lion-rk3368_defconfig +1 -0
index 1ace7b795a09..ee401b763d90 100644
@@ -97,6 +97,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
configs/malta64_defconfig +1 -0
index 054c5e6d618e..b635c651aaea 100644
@@ -45,3 +45,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/malta64el_defconfig +1 -0
index 55f624bbeeb9..243213cb8197 100644
@@ -47,3 +47,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/malta_defconfig +1 -0
index 53762a94e2a3..ed41e298f443 100644
@@ -44,3 +44,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/maltael_defconfig +1 -0
index 8b86d74dc41a..63e5fcb6a5ce 100644
@@ -46,3 +46,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/minnowmax_defconfig +1 -0
index 66f3036313c4..52ed763424a8 100644
@@ -65,6 +65,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_RTL8169=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/miqi-rk3288_defconfig +1 -0
index 0811e70dcefe..9346cafc64c6 100644
@@ -75,6 +75,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/mk808_defconfig +1 -0
index 403a84befdc3..7ba8338add5a 100644
@@ -99,6 +99,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
configs/nanopc-t4-rk3399_defconfig +1 -0
index 03fa857996ce..8fad8c643f22 100644
@@ -55,6 +55,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-m4-2gb-rk3399_defconfig +1 -0
index 67ca98563b5f..c5f13c060be4 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-m4-rk3399_defconfig +1 -0
index afa51bc8fa3b..b6a604b6943d 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-m4b-rk3399_defconfig +1 -0
index d02eb1851a7a..767befe2d2c9 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-neo4-rk3399_defconfig +1 -0
index d2d9bf91c564..383ec1f39eee 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-r2s-rk3328_defconfig +1 -0
index 82264de90889..40d3117b4f08 100644
@@ -91,6 +91,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSINFO=y
 CONFIG_SYSRESET=y
 # CONFIG_TPL_SYSRESET is not set
configs/nanopi-r4s-rk3399_defconfig +1 -0
index 2185f87d7d06..40a45a0f4bbe 100644
@@ -52,6 +52,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nas220_defconfig +1 -0
index 9cebc704ce98..e54809c781fc 100644
@@ -64,6 +64,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/net2big_v2_defconfig +1 -0
index c10e1a501394..c294789440e0 100644
@@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_lite_v2_defconfig +1 -0
index 75907e05c57f..f6748e12ea4e 100644
@@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_max_v2_defconfig +1 -0
index db08ca576339..4525604b4390 100644
@@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_mini_v2_defconfig +1 -0
index dda3b6b5f93d..bf9bbd4e5e79 100644
@@ -66,6 +66,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_v2_defconfig +1 -0
index 21534c59fde7..f505f4368ea7 100644
@@ -68,6 +68,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/nsa310s_defconfig +1 -0
index afa0cad0418f..4c4a8aad566f 100644
@@ -54,6 +54,7 @@ CONFIG_PHY_MARVELL=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_UBIFS_SILENCE_MSG=y
configs/odroid-go2_defconfig +1 -0
index 4705f61e4243..33adcc952cf0 100644
@@ -104,6 +104,7 @@ CONFIG_DM_RESET=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/openrd_base_defconfig +1 -0
index c2e879c9bde8..49617dae1a85 100644
@@ -62,5 +62,6 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_client_defconfig +1 -0
index 01bfaed978b9..34a0fc3c3b1a 100644
@@ -63,5 +63,6 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_ultimate_defconfig +1 -0
index 7c641038178f..b1343cea590b 100644
@@ -63,5 +63,6 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/orangepi-rk3399_defconfig +1 -0
index 39245e8784b2..0980d8156965 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/phycore-rk3288_defconfig +1 -0
index 8a274187d093..0632a928bc0a 100644
@@ -78,6 +78,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/pinebook-pro-rk3399_defconfig +1 -0
index 528b7bb69f24..dfbf5e70f4a1 100644
@@ -80,6 +80,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/pogo_e02_defconfig +1 -0
index d0071f3af521..e7e6e73d3ea2 100644
@@ -56,6 +56,7 @@ CONFIG_PHY_MARVELL=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/pogo_v4_defconfig +1 -0
index 3b08cb7b1d14..28fee390fd38 100644
@@ -75,6 +75,7 @@ CONFIG_PCI_MVEBU=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_EMULATION=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
configs/popmetal-rk3288_defconfig +1 -0
index f6c49da574c5..91123784b544 100644
@@ -75,6 +75,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/puma-rk3399_defconfig +1 -0
index c2b0b39c7b2c..9a5be3e91390 100644
@@ -92,6 +92,7 @@ CONFIG_DM_RESET=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_ISL1208=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/px30-core-ctouch2-of10-px30_defconfig +1 -0
index 9175c7c85ae1..9c36750bde03 100644
@@ -100,6 +100,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/px30-core-ctouch2-px30_defconfig +1 -0
index 0aa7cca7b8b6..db1ceaa31f37 100644
@@ -100,6 +100,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/px30-core-edimm2.2-px30_defconfig +1 -0
index d731b9687886..d2cca48304d3 100644
@@ -100,6 +100,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/qemu-x86_64_defconfig +1 -0
index 8433b5734f62..0f4811e5d7a5 100644
@@ -70,6 +70,7 @@ CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_NVME_PCI=y
 CONFIG_SPL_DM_RTC=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
configs/qemu-x86_defconfig +1 -0
index f82f628d5bb7..a8222122fc9d 100644
@@ -50,6 +50,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_NVME_PCI=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
configs/roc-cc-rk3308_defconfig +1 -0
index 670211e2e9d7..0a029c4098f7 100644
@@ -74,6 +74,7 @@ CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/roc-cc-rk3328_defconfig +1 -0
index 7f1259d82c1f..8172ed0ad228 100644
@@ -95,6 +95,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SYSRESET=y
configs/roc-pc-mezzanine-rk3399_defconfig +1 -0
index 3cdcc729f853..6827c98ed9f1 100644
@@ -71,6 +71,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/roc-pc-rk3399_defconfig +1 -0
index e03442afa462..cf4a58de1c5a 100644
@@ -68,6 +68,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/rock-pi-4-rk3399_defconfig +1 -0
index 83721cedf3dd..54a400405bec 100644
@@ -62,6 +62,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock-pi-4c-rk3399_defconfig +1 -0
index ac9a3f983066..e74ba07e4467 100644
@@ -62,6 +62,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock-pi-e-rk3328_defconfig +1 -0
index c0c1ebf34025..0ffb073f3137 100644
@@ -96,6 +96,7 @@ CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SYSRESET=y
configs/rock-pi-n10-rk3399pro_defconfig +1 -0
index fcb3a681ca00..2443f292469e 100644
@@ -63,6 +63,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock-pi-n8-rk3288_defconfig +1 -0
index 4ed98c0a511d..18c6d1b92253 100644
@@ -74,6 +74,7 @@ CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 # CONFIG_RAM_ROCKCHIP_DEBUG is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/rock2_defconfig +1 -0
index 38a5f3a80c0f..54d01456b1ef 100644
@@ -77,6 +77,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/rock64-rk3328_defconfig +1 -0
index e75011bee5f4..73a4f06eb9b1 100644
@@ -92,6 +92,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
configs/rock960-rk3399_defconfig +1 -0
index 6ed5ef868e5e..f2c914f41f5d 100644
@@ -65,6 +65,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock_defconfig +1 -0
index bd6183ba5b8d..26638405bf73 100644
@@ -63,6 +63,7 @@ CONFIG_REGULATOR_ACT8846=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
configs/rockpro64-rk3399_defconfig +1 -0
index ba48d021f4fc..5b8d678f6bb5 100644
@@ -79,6 +79,7 @@ CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/sheep-rk3368_defconfig +1 -0
index 01f104a97d03..40cd91c045c1 100644
@@ -29,5 +29,6 @@ CONFIG_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
configs/sheevaplug_defconfig +1 -0
index 52f5aba8cab5..74b6e1a0ea77 100644
@@ -66,6 +66,7 @@ CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/slimbootloader_defconfig +1 -0
index b6b9f88c00bb..f5d16f64d734 100644
@@ -31,5 +31,6 @@ CONFIG_SYSCON=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_CONSOLE_SCROLL_LINES=5
 # CONFIG_GZIP is not set
configs/socfpga_agilex_atf_defconfig +1 -0
index 68440926c078..9269eccf17ab 100644
@@ -82,6 +82,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_agilex_defconfig +1 -0
index de9ebd072263..48fb06722323 100644
@@ -75,6 +75,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_agilex_vab_defconfig +1 -0
index 7642498ea9ca..da4545effff8 100644
@@ -83,6 +83,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_arria10_defconfig +1 -0
index 08ae6c502b41..4e2dc0c9857e 100644
@@ -62,6 +62,7 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
configs/socfpga_chameleonv3_defconfig +1 -0
index 478efc59ea91..00c4cf30089a 100644
@@ -29,6 +29,7 @@ CONFIG_FS_LOADER=y
 CONFIG_SPL_FS_LOADER=y
 CONFIG_MMC_DW=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_DESIGNWARE_APB_TIMER=y
configs/socfpga_n5x_atf_defconfig +1 -0
index 0feda3b04f75..4d856d535a3d 100644
@@ -81,6 +81,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_n5x_defconfig +1 -0
index fa19f555f20a..1056932cd35e 100644
@@ -72,6 +72,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_n5x_vab_defconfig +1 -0
index 12e8ebf0138f..a6714b265e18 100644
@@ -82,6 +82,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_stratix10_atf_defconfig +1 -0
index 5ee9f5ff9da7..e0e6b2d04610 100644
@@ -83,6 +83,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_stratix10_defconfig +1 -0
index f689105695c1..919863270f83 100644
@@ -80,6 +80,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/som-db5800-som-6867_defconfig +1 -0
index 5d401e6c2d7e..5b724697123e 100644
@@ -60,6 +60,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +1 -0
index 22544c0913aa..440c170c6b1e 100644
@@ -65,6 +65,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/theadorable-x86-conga-qa3-e3845_defconfig +1 -0
index 8741ecbb2d71..b91c3b135479 100644
@@ -64,6 +64,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/tinker-rk3288_defconfig +1 -0
index 85d94a6ea89f..5976a84491e4 100644
@@ -83,6 +83,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/tinker-s-rk3288_defconfig +1 -0
index 7dfbad808383..078f829c2dff 100644
@@ -83,6 +83,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/vyasa-rk3288_defconfig +1 -0
index cbae60f98768..0c9d61b8053c 100644
@@ -83,6 +83,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/xtfpga_defconfig +1 -0
index 31483296802c..d4e8d7586353 100644
@@ -46,5 +46,6 @@ CONFIG_SYS_MAX_FLASH_SECT=1027
 CONFIG_PHYLIB=y
 CONFIG_ETHOC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SYSRESET=y
 CONFIG_OF_LIBFDT=y
drivers/serial/Kconfig +39 -8

72 lines not on this page · raw message

include/configs/10m50_devboard.h +0 -1
index afd7cc89bf8e..719caf7b0c3b 100644
@@ -15,7 +15,6 @@
 /*
  * SERIAL
  */
-#define CONFIG_SYS_NS16550_MEM32
 
 /*
  * Flash
include/configs/MPC837XERDB.h +0 -2
index c4cde1cc512e..b8cbdc36754b 100644
@@ -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 \
include/configs/MPC8548CDS.h +0 -2
index b241939fc387..dba15dae749b 100644
@@ -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 \
include/configs/P1010RDB.h +0 -3
index 9afd834f9faf..fd721f30b3aa 100644
@@ -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}
include/configs/P2041RDB.h +0 -2
index b9311fc5e4f9..173f6205e08f 100644
@@ -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	\
include/configs/SBx81LIFKW.h +0 -2
index 9629d735a271..c99e6ba781a4 100644
@@ -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
 
include/configs/SBx81LIFXCAT.h +0 -2
index 67e42b94c117..8b43fe0c9939 100644
@@ -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
 
include/configs/T102xRDB.h +0 -2
index 978cc6714ec6..7cb10b205db1 100644
@@ -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	\
include/configs/T104xRDB.h +0 -2
index f26e9d6e8692..3fa2d01dcc2a 100644
@@ -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	\
include/configs/T208xQDS.h +0 -2
index 62f07108126d..c5a28fadb004 100644
@@ -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}
include/configs/T208xRDB.h +0 -2
index 0616f8a86dff..795120c02a87 100644
@@ -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}
include/configs/T4240RDB.h +0 -2
index 2eb4e73efa9e..e3cbc649fa19 100644
@@ -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	\
include/configs/am43xx_evm.h +0 -4
index a0951fbf6235..b61c8005c33f 100644
@@ -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 */
 
include/configs/ax25-ae350.h +0 -4
index cf5125fdfa63..7224bd8d1f49 100644
@@ -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 */
include/configs/axs10x.h +0 -2
index f2357b5785a1..c0429ae15c4c 100644
@@ -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
include/configs/bcmstb.h +0 -2
index 5aa720da3d74..481baff11d9a 100644
@@ -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
 
 /*
include/configs/bur_am335x_common.h +0 -2
index a6de28a42b2e..773ce3f6a6f8 100644
@@ -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
 
include/configs/chromebook_coral.h +0 -3
index 0eeea80b32f4..d14c1d445b25 100644
@@ -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 */
include/configs/cm_t43.h +0 -4
index 9061eba6686a..0641d5c0a238 100644
@@ -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
include/configs/dfi-bt700.h +0 -1
index 4297047e8ce2..52f2d50118a4 100644
@@ -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" \
include/configs/galileo.h +0 -1
index 545408a4baa5..472f236b9b6e 100644
@@ -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" \
include/configs/gardena-smart-gateway-mt7688.h +0 -2
index 965fa87c6577..0d61724db8c4 100644
@@ -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
 
include/configs/hsdk-4xd.h +0 -2
index 4af845ea9c2d..bfc0fa5c442c 100644
@@ -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
include/configs/hsdk.h +0 -2
index 0ce65e7755ea..ce3cb20732db 100644
@@ -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
include/configs/km/pg-wcom-ls102xa.h +0 -1
index cc8c37ec0bf5..7acdb0fa038e 100644
@@ -148,7 +148,6 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 
 /*
include/configs/kmcent2.h +0 -2
index 16fd6d562d41..30ba6065253e 100644
@@ -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
include/configs/legoev3.h +0 -1
index f0ae9248af34..5434c4f7679f 100644
@@ -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)
include/configs/linkit-smart-7688.h +0 -2
index 9eedd47c07e5..b9c853d7dfef 100644
@@ -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
include/configs/ls1012a_common.h +0 -2
index 77f84e1c9eaa..148598fab465 100644
@@ -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
include/configs/ls1021aiot.h +0 -2
index 885774f63d47..3f2dfa640c9c 100644
@@ -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()
 
 /*
include/configs/ls1021aqds.h +0 -4
index 6b23134ecc99..bd2f74c1262a 100644
@@ -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
 
include/configs/ls1021atsn.h +0 -4
index fce91192dff7..8c43f652ab65 100644
@@ -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 */
include/configs/ls1021atwr.h +0 -4
index 1ac59a2d4597..06830f401a31 100644
@@ -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
 
include/configs/ls1028a_common.h +0 -2
index 43dbeea1b3bd..7dd5649005b7 100644
@@ -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 */
include/configs/ls1043a_common.h +0 -2
index 47367845a07f..2fc06c1dd2dc 100644
@@ -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 */
include/configs/ls1046a_common.h +0 -2
index 07ec2c956379..40b4cb964d11 100644
@@ -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 */
include/configs/ls1088a_common.h +0 -2
index dec661d6b194..5668e07d1354 100644
@@ -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)
 
 /*
include/configs/ls2080a_common.h +0 -2
index d8997208e973..895c566fea2f 100644
@@ -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())
 
 /*
include/configs/malta.h +0 -1
index 30c2e41eec53..2dd34ea7313c 100644
@@ -33,7 +33,6 @@
 /*
  * Serial driver
  */
-#define CONFIG_SYS_NS16550_PORT_MAPPED
 
 /*
  * Flash configuration
include/configs/mt7621.h +0 -2
index 9b1ba3655e82..1f733d112dd7 100644
@@ -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
 
include/configs/mt7628.h +0 -2
index 43527017d84a..da16e3b21a4b 100644
@@ -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
 
include/configs/mt8183.h +0 -3
index c93d70ddf1a6..eaffe0bf4c95 100644
@@ -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
 
include/configs/mt8516.h +0 -3
index 7228f3e42884..347598868bb5 100644
@@ -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
 
include/configs/mv-common.h +0 -2
index 6d4fff3820c1..4f1067c23bbc 100644
@@ -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
 
include/configs/nokia_rx51.h +0 -1
index a88cfe77d50c..6f16e336d146 100644
@@ -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
 
 /*
include/configs/p1_p2_rdb_pc.h +0 -3
index 838c62c67111..065820689caf 100644
@@ -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}
include/configs/px30_common.h +0 -2
index 49d1878ebdd7..8b151ef18836 100644
@@ -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
 
include/configs/rk3308_common.h +0 -2
index 200b34b35bae..263d1bd180c5 100644
@@ -8,8 +8,6 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_NS16550_MEM32
-
 #define CONFIG_IRAM_BASE		0xfff80000
 
 #define CONFIG_SYS_SDRAM_BASE		0
include/configs/rockchip-common.h +0 -2
index 4c964cc37708..1f6b82f2d022 100644
@@ -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
include/configs/siemens-am33x-common.h +0 -1
index d071f590f106..5765f2ccb5e7 100644
@@ -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
include/configs/sniper.h +0 -5
index 0187fca5f0d9..c29bc448eed6 100644
@@ -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
 
include/configs/socfpga_arria10_socdk.h +0 -1
index f712928d3c86..49883ea7a3cc 100644
@@ -18,7 +18,6 @@
 /*
  * Serial / UART configurations
  */
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
 /*
include/configs/socfpga_chameleonv3.h +0 -1
index 75d2081fac88..7012097276c7 100644
@@ -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 \
include/configs/socfpga_soc64_common.h +0 -1
index 86cc3771ba59..029f898b64ff 100644
@@ -76,7 +76,6 @@
  * Serial / UART configurations
  */
 #define CONFIG_SYS_NS16550_CLK		100000000
-#define CONFIG_SYS_NS16550_MEM32
 
 /*
  * SDMMC configurations
include/configs/sunxi-common.h +0 -2
index d9e4c8b699f4..1ed0a262bc61 100644
@@ -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
include/configs/tb100.h +0 -1
index 16bdc39b750e..38a43b726f03 100644
@@ -19,7 +19,6 @@
 /*
  * UART configuration
  */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		166666666
 
 /*
include/configs/theadorable-x86-dfi-bt700.h +0 -1
index bb3186e21921..663a49e7b6c5 100644
@@ -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"
include/configs/ti814x_evm.h +0 -2
index 97166e010f7d..60632c58c67d 100644
@@ -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 */
 
include/configs/ti816x_evm.h +0 -2
index efd3a0db04eb..f2dbe3544a5d 100644
@@ -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 */
 
include/configs/ti_am335x_common.h +0 -6
index 5d5df6b10191..fb017771688e 100644
@@ -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
 
 /*
include/configs/ti_armv7_keystone2.h +0 -1
index a4a45fad9dc8..aaeea77281b6 100644
@@ -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
 
include/configs/ti_omap3_common.h +0 -4
index 6cc443c8e9cb..80d2a011f0fe 100644
@@ -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}
 
include/configs/ti_omap4_common.h +0 -2
index 0568946fc824..eb930341c3a8 100644
@@ -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
 
include/configs/ti_omap5_common.h +0 -4
index 24bbf9e7c2c6..a1efb57f1b09 100644
@@ -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
include/configs/vocore2.h +0 -2
index 6f36d6964b9b..84e5ba39f148 100644
@@ -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 */
include/configs/x530.h +0 -2
index 0add626e81a5..318e3680a6e1 100644
@@ -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
 
include/configs/x86-common.h +0 -1
index 8e22d6e5d876..f76c1f8be0fd 100644
@@ -21,7 +21,6 @@
 /*-----------------------------------------------------------------------
  * Serial Configuration
  */
-#define CONFIG_SYS_NS16550_PORT_MAPPED
 
 /*
  * Miscellaneous configurable options
include/configs/xtfpga.h +0 -2
index 58d01f4bb428..7090fcef6804 100644
@@ -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) */
include/ns16550.h +1 -1
index 3d9002d9f151..0ee5c4d6de75 100644
@@ -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
Signature · 1 line
2.25.1
Reviewed-by on v1 3/17
#4 lore raw

Re: [PATCH 03/17] Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

Quoted 229 lines · Tom Rini

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
---
 README                                        |  7 ---
 arch/arm/include/asm/arch-bcmcygnus/configs.h |  4 --
 arch/arm/include/asm/arch-bcmnsp/configs.h    |  3 --
 configs/10m50_defconfig                       |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PA_NAND_defconfig            |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PB_NAND_defconfig            |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P1020RDB-PC_NAND_defconfig            |  1 +
 configs/P1020RDB-PD_NAND_defconfig            |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P2020RDB-PC_NAND_defconfig            |  1 +
 configs/SBx81LIFKW_defconfig                  |  1 +
 configs/SBx81LIFXCAT_defconfig                |  1 +
 configs/axs101_defconfig                      |  1 +
 configs/axs103_defconfig                      |  1 +
 configs/bayleybay_defconfig                   |  1 +
 configs/bcm7260_defconfig                     |  1 +
 configs/bcm7445_defconfig                     |  1 +
 configs/cherryhill_defconfig                  |  1 +
 configs/chromebit_mickey_defconfig            |  1 +
 configs/chromebook_bob_defconfig              |  1 +
 configs/chromebook_coral_defconfig            |  1 +
 configs/chromebook_jerry_defconfig            |  1 +
 configs/chromebook_kevin_defconfig            |  1 +
 configs/chromebook_link64_defconfig           |  1 +
 configs/chromebook_link_defconfig             |  1 +
 configs/chromebook_minnie_defconfig           |  1 +
 configs/chromebook_samus_defconfig            |  1 +
 configs/chromebook_samus_tpl_defconfig        |  1 +
 configs/chromebook_speedy_defconfig           |  1 +
 configs/chromebox_panther_defconfig           |  1 +
 ...-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig     |  1 +
 configs/coreboot64_defconfig                  |  1 +
 configs/coreboot_defconfig                    |  1 +
 configs/cougarcanyon2_defconfig               |  1 +
 configs/crownbay_defconfig                    |  1 +
 configs/d2net_v2_defconfig                    |  1 +
 configs/dns325_defconfig                      |  1 +
 configs/dockstar_defconfig                    |  1 +
 configs/dreamplug_defconfig                   |  1 +
 configs/ds109_defconfig                       |  1 +
 configs/eaidk-610-rk3399_defconfig            |  1 +
 configs/efi-x86_payload32_defconfig           |  1 +
 configs/efi-x86_payload64_defconfig           |  1 +
 configs/elgin-rv1108_defconfig                |  1 +
 configs/evb-px30_defconfig                    |  1 +
 configs/evb-px5_defconfig                     |  1 +
 configs/evb-rk3036_defconfig                  |  1 +
 configs/evb-rk3128_defconfig                  |  1 +
 configs/evb-rk3229_defconfig                  |  1 +
 configs/evb-rk3288_defconfig                  |  1 +
 configs/evb-rk3308_defconfig                  |  1 +
 configs/evb-rk3328_defconfig                  |  1 +
 configs/evb-rk3399_defconfig                  |  1 +
 configs/evb-rk3568_defconfig                  |  1 +
 configs/evb-rv1108_defconfig                  |  1 +
 configs/ficus-rk3399_defconfig                |  1 +
 configs/firefly-px30_defconfig                |  1 +
 configs/firefly-rk3288_defconfig              |  1 +
 configs/firefly-rk3399_defconfig              |  1 +
 configs/geekbox_defconfig                     |  1 +
 configs/goflexhome_defconfig                  |  1 +
 configs/guruplug_defconfig                    |  1 +
 configs/hsdk_4xd_defconfig                    |  1 +
 configs/hsdk_defconfig                        |  1 +
 configs/ib62x0_defconfig                      |  1 +
 configs/iconnect_defconfig                    |  1 +
 configs/inetspace_v2_defconfig                |  1 +
 configs/k2e_evm_defconfig                     |  1 +
 configs/k2e_hs_evm_defconfig                  |  1 +
 configs/k2g_evm_defconfig                     |  1 +
 configs/k2g_hs_evm_defconfig                  |  1 +
 configs/k2hk_evm_defconfig                    |  1 +
 configs/k2hk_hs_evm_defconfig                 |  1 +
 configs/k2l_evm_defconfig                     |  1 +
 configs/k2l_hs_evm_defconfig                  |  1 +
 configs/khadas-edge-captain-rk3399_defconfig  |  1 +
 configs/khadas-edge-rk3399_defconfig          |  1 +
 configs/khadas-edge-v-rk3399_defconfig        |  1 +
 configs/kylin-rk3036_defconfig                |  1 +
 configs/leez-rk3399_defconfig                 |  1 +
 configs/lion-rk3368_defconfig                 |  1 +
 configs/malta64_defconfig                     |  1 +
 configs/malta64el_defconfig                   |  1 +
 configs/malta_defconfig                       |  1 +
 configs/maltael_defconfig                     |  1 +
 configs/minnowmax_defconfig                   |  1 +
 configs/miqi-rk3288_defconfig                 |  1 +
 configs/mk808_defconfig                       |  1 +
 configs/nanopc-t4-rk3399_defconfig            |  1 +
 configs/nanopi-m4-2gb-rk3399_defconfig        |  1 +
 configs/nanopi-m4-rk3399_defconfig            |  1 +
 configs/nanopi-m4b-rk3399_defconfig           |  1 +
 configs/nanopi-neo4-rk3399_defconfig          |  1 +
 configs/nanopi-r2s-rk3328_defconfig           |  1 +
 configs/nanopi-r4s-rk3399_defconfig           |  1 +
 configs/nas220_defconfig                      |  1 +
 configs/net2big_v2_defconfig                  |  1 +
 configs/netspace_lite_v2_defconfig            |  1 +
 configs/netspace_max_v2_defconfig             |  1 +
 configs/netspace_mini_v2_defconfig            |  1 +
 configs/netspace_v2_defconfig                 |  1 +
 configs/nsa310s_defconfig                     |  1 +
 configs/odroid-go2_defconfig                  |  1 +
 configs/openrd_base_defconfig                 |  1 +
 configs/openrd_client_defconfig               |  1 +
 configs/openrd_ultimate_defconfig             |  1 +
 configs/orangepi-rk3399_defconfig             |  1 +
 configs/phycore-rk3288_defconfig              |  1 +
 configs/pinebook-pro-rk3399_defconfig         |  1 +
 configs/pogo_e02_defconfig                    |  1 +
 configs/pogo_v4_defconfig                     |  1 +
 configs/popmetal-rk3288_defconfig             |  1 +
 configs/puma-rk3399_defconfig                 |  1 +
 configs/px30-core-ctouch2-of10-px30_defconfig |  1 +
 configs/px30-core-ctouch2-px30_defconfig      |  1 +
 configs/px30-core-edimm2.2-px30_defconfig     |  1 +
 configs/qemu-x86_64_defconfig                 |  1 +
 configs/qemu-x86_defconfig                    |  1 +
 configs/roc-cc-rk3308_defconfig               |  1 +
 configs/roc-cc-rk3328_defconfig               |  1 +
 configs/roc-pc-mezzanine-rk3399_defconfig     |  1 +
 configs/roc-pc-rk3399_defconfig               |  1 +
 configs/rock-pi-4-rk3399_defconfig            |  1 +
 configs/rock-pi-4c-rk3399_defconfig           |  1 +
 configs/rock-pi-e-rk3328_defconfig            |  1 +
 configs/rock-pi-n10-rk3399pro_defconfig       |  1 +
 configs/rock-pi-n8-rk3288_defconfig           |  1 +
 configs/rock2_defconfig                       |  1 +
 configs/rock64-rk3328_defconfig               |  1 +
 configs/rock960-rk3399_defconfig              |  1 +
 configs/rock_defconfig                        |  1 +
 configs/rockpro64-rk3399_defconfig            |  1 +
 configs/sheep-rk3368_defconfig                |  1 +
 configs/sheevaplug_defconfig                  |  1 +
 configs/slimbootloader_defconfig              |  1 +
 configs/socfpga_agilex_atf_defconfig          |  1 +
 configs/socfpga_agilex_defconfig              |  1 +
 configs/socfpga_agilex_vab_defconfig          |  1 +
 configs/socfpga_arria10_defconfig             |  1 +
 configs/socfpga_chameleonv3_defconfig         |  1 +
 configs/socfpga_n5x_atf_defconfig             |  1 +
 configs/socfpga_n5x_defconfig                 |  1 +
 configs/socfpga_n5x_vab_defconfig             |  1 +
 configs/socfpga_stratix10_atf_defconfig       |  1 +
 configs/socfpga_stratix10_defconfig           |  1 +
 configs/som-db5800-som-6867_defconfig         |  1 +
 ...able-x86-conga-qa3-e3845-pcie-x4_defconfig |  1 +
 .../theadorable-x86-conga-qa3-e3845_defconfig |  1 +
 configs/tinker-rk3288_defconfig               |  1 +
 configs/tinker-s-rk3288_defconfig             |  1 +
 configs/vyasa-rk3288_defconfig                |  1 +
 configs/xtfpga_defconfig                      |  1 +
 drivers/serial/Kconfig                        | 47 +++++++++++++++----
 include/configs/10m50_devboard.h              |  1 -
 include/configs/MPC837XERDB.h                 |  2 -
 include/configs/MPC8548CDS.h                  |  2 -
 include/configs/P1010RDB.h                    |  3 --
 include/configs/P2041RDB.h                    |  2 -
 include/configs/SBx81LIFKW.h                  |  2 -
 include/configs/SBx81LIFXCAT.h                |  2 -
 include/configs/T102xRDB.h                    |  2 -
 include/configs/T104xRDB.h                    |  2 -
 include/configs/T208xQDS.h                    |  2 -
 include/configs/T208xRDB.h                    |  2 -
 include/configs/T4240RDB.h                    |  2 -
 include/configs/am43xx_evm.h                  |  4 --
 include/configs/ax25-ae350.h                  |  4 --
 include/configs/axs10x.h                      |  2 -
 include/configs/bcmstb.h                      |  2 -
 include/configs/bur_am335x_common.h           |  2 -
 include/configs/chromebook_coral.h            |  3 --
 include/configs/cm_t43.h                      |  4 --
 include/configs/dfi-bt700.h                   |  1 -
 include/configs/galileo.h                     |  1 -
 .../configs/gardena-smart-gateway-mt7688.h    |  2 -
 include/configs/hsdk-4xd.h                    |  2 -
 include/configs/hsdk.h                        |  2 -
 include/configs/km/pg-wcom-ls102xa.h          |  1 -
 include/configs/kmcent2.h                     |  2 -
 include/configs/legoev3.h                     |  1 -
 include/configs/linkit-smart-7688.h           |  2 -
 include/configs/ls1012a_common.h              |  2 -
 include/configs/ls1021aiot.h                  |  2 -
 include/configs/ls1021aqds.h                  |  4 --
 include/configs/ls1021atsn.h                  |  4 --
 include/configs/ls1021atwr.h                  |  4 --
 include/configs/ls1028a_common.h              |  2 -
 include/configs/ls1043a_common.h              |  2 -
 include/configs/ls1046a_common.h              |  2 -
 include/configs/ls1088a_common.h              |  2 -
 include/configs/ls2080a_common.h              |  2 -
 include/configs/malta.h                       |  1 -
 include/configs/mt7621.h                      |  2 -
 include/configs/mt7628.h                      |  2 -
 include/configs/mt8183.h                      |  3 --
 include/configs/mt8516.h                      |  3 --
 include/configs/mv-common.h                   |  2 -
 include/configs/nokia_rx51.h                  |  1 -
 include/configs/p1_p2_rdb_pc.h                |  3 --
 include/configs/px30_common.h                 |  2 -
 include/configs/rk3308_common.h               |  2 -
 include/configs/rockchip-common.h             |  2 -
 include/configs/siemens-am33x-common.h        |  1 -
 include/configs/sniper.h                      |  5 --
 include/configs/socfpga_arria10_socdk.h       |  1 -
 include/configs/socfpga_chameleonv3.h         |  1 -
 include/configs/socfpga_soc64_common.h        |  1 -
 include/configs/sunxi-common.h                |  2 -
 include/configs/tb100.h                       |  1 -
 include/configs/theadorable-x86-dfi-bt700.h   |  1 -
 include/configs/ti814x_evm.h                  |  2 -
 include/configs/ti816x_evm.h                  |  2 -
 include/configs/ti_am335x_common.h            |  6 ---
 include/configs/ti_armv7_keystone2.h          |  1 -
 include/configs/ti_omap3_common.h             |  4 --
Quoted 8 lines
 include/configs/ti_omap4_common.h             |  2 -
 include/configs/ti_omap5_common.h             |  4 --
 include/configs/vocore2.h                     |  2 -
 include/configs/x530.h                        |  2 -
 include/configs/x86-common.h                  |  1 -
 include/configs/xtfpga.h                      |  2 -
 include/ns16550.h                             |  2 +-
 226 files changed, 193 insertions(+), 172 deletions(-)
author
#5 lore raw

PATCH v2 3/17 Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

In reply to Tom Rini

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.

---
Changes in v2:
- Rework the logic a log as this wasn't right the first time but the uncmd_spl logic "saved" the mistake.

---
 README                                        |  7 ---
 arch/arm/include/asm/arch-bcmcygnus/configs.h |  4 --
 arch/arm/include/asm/arch-bcmnsp/configs.h    |  3 --
 configs/10m50_defconfig                       |  1 +
 configs/MPC837XERDB_defconfig                 |  2 +-
 configs/MPC8548CDS_36BIT_defconfig            |  2 +-
 configs/MPC8548CDS_defconfig                  |  2 +-
 configs/MPC8548CDS_legacy_defconfig           |  2 +-
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  3 +-
 configs/P1010RDB-PA_36BIT_NOR_defconfig       |  2 +-
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig    |  2 +-
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig  |  2 +-
 configs/P1010RDB-PA_NAND_defconfig            |  3 +-
 configs/P1010RDB-PA_NOR_defconfig             |  2 +-
 configs/P1010RDB-PA_SDCARD_defconfig          |  2 +-
 configs/P1010RDB-PA_SPIFLASH_defconfig        |  2 +-
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  3 +-
 configs/P1010RDB-PB_36BIT_NOR_defconfig       |  2 +-
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig    |  2 +-
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig  |  2 +-
 configs/P1010RDB-PB_NAND_defconfig            |  3 +-
 configs/P1010RDB-PB_NOR_defconfig             |  2 +-
 configs/P1010RDB-PB_SDCARD_defconfig          |  2 +-
 configs/P1010RDB-PB_SPIFLASH_defconfig        |  2 +-
 configs/P1020RDB-PC_36BIT_NAND_defconfig      |  3 +-
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig    |  2 +-
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig  |  2 +-
 configs/P1020RDB-PC_36BIT_defconfig           |  2 +-
 configs/P1020RDB-PC_NAND_defconfig            |  3 +-
 configs/P1020RDB-PC_SDCARD_defconfig          |  2 +-
 configs/P1020RDB-PC_SPIFLASH_defconfig        |  2 +-
 configs/P1020RDB-PC_defconfig                 |  2 +-
 configs/P1020RDB-PD_NAND_defconfig            |  3 +-
 configs/P1020RDB-PD_SDCARD_defconfig          |  2 +-
 configs/P1020RDB-PD_SPIFLASH_defconfig        |  2 +-
 configs/P1020RDB-PD_defconfig                 |  2 +-
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  3 +-
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig    |  2 +-
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig  |  2 +-
 configs/P2020RDB-PC_36BIT_defconfig           |  2 +-
 configs/P2020RDB-PC_NAND_defconfig            |  3 +-
 configs/P2020RDB-PC_SDCARD_defconfig          |  2 +-
 configs/P2020RDB-PC_SPIFLASH_defconfig        |  2 +-
 configs/P2020RDB-PC_defconfig                 |  2 +-
 configs/P2041RDB_NAND_defconfig               |  2 +-
 configs/P2041RDB_SDCARD_defconfig             |  2 +-
 configs/P2041RDB_SPIFLASH_defconfig           |  2 +-
 configs/P2041RDB_defconfig                    |  2 +-
 configs/SBx81LIFKW_defconfig                  |  3 +-
 configs/SBx81LIFXCAT_defconfig                |  3 +-
 configs/T1024RDB_NAND_defconfig               |  2 +-
 configs/T1024RDB_SDCARD_defconfig             |  2 +-
 configs/T1024RDB_SPIFLASH_defconfig           |  2 +-
 configs/T1024RDB_defconfig                    |  2 +-
 configs/T1042D4RDB_NAND_defconfig             |  2 +-
 configs/T1042D4RDB_SDCARD_defconfig           |  2 +-
 configs/T1042D4RDB_SPIFLASH_defconfig         |  2 +-
 configs/T1042D4RDB_defconfig                  |  2 +-
 configs/T2080QDS_NAND_defconfig               |  2 +-
 configs/T2080QDS_SDCARD_defconfig             |  2 +-
 configs/T2080QDS_SECURE_BOOT_defconfig        |  2 +-
 configs/T2080QDS_SPIFLASH_defconfig           |  2 +-
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig     |  2 +-
 configs/T2080QDS_defconfig                    |  2 +-
 configs/T2080RDB_NAND_defconfig               |  2 +-
 configs/T2080RDB_SDCARD_defconfig             |  2 +-
 configs/T2080RDB_SPIFLASH_defconfig           |  2 +-
 configs/T2080RDB_defconfig                    |  2 +-
 configs/T2080RDB_revD_NAND_defconfig          |  2 +-
 configs/T2080RDB_revD_SDCARD_defconfig        |  2 +-
 configs/T2080RDB_revD_SPIFLASH_defconfig      |  2 +-
 configs/T2080RDB_revD_defconfig               |  2 +-
 configs/T4240RDB_SDCARD_defconfig             |  2 +-
 configs/T4240RDB_defconfig                    |  2 +-
 configs/am43xx_evm_qspiboot_defconfig         |  2 +-
 configs/am43xx_hs_evm_qspi_defconfig          |  2 +-
 configs/axs101_defconfig                      |  1 +
 configs/axs103_defconfig                      |  1 +
 configs/bayleybay_defconfig                   |  1 +
 configs/bcm7260_defconfig                     |  3 +-
 configs/bcm7445_defconfig                     |  3 +-
 configs/cherryhill_defconfig                  |  1 +
 configs/chromebit_mickey_defconfig            |  1 +
 configs/chromebook_bob_defconfig              |  1 +
 configs/chromebook_coral_defconfig            |  1 +
 configs/chromebook_jerry_defconfig            |  1 +
 configs/chromebook_kevin_defconfig            |  1 +
 configs/chromebook_link64_defconfig           |  1 +
 configs/chromebook_link_defconfig             |  1 +
 configs/chromebook_minnie_defconfig           |  1 +
 configs/chromebook_samus_defconfig            |  1 +
 configs/chromebook_samus_tpl_defconfig        |  1 +
 configs/chromebook_speedy_defconfig           |  1 +
 configs/chromebox_panther_defconfig           |  1 +
 ...-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig     |  1 +
 configs/coreboot64_defconfig                  |  1 +
 configs/coreboot_defconfig                    |  1 +
 configs/cougarcanyon2_defconfig               |  1 +
 configs/crownbay_defconfig                    |  1 +
 configs/d2net_v2_defconfig                    |  3 +-
 configs/dns325_defconfig                      |  3 +-
 configs/dockstar_defconfig                    |  3 +-
 configs/dreamplug_defconfig                   |  3 +-
 configs/ds109_defconfig                       |  3 +-
 configs/eaidk-610-rk3399_defconfig            |  1 +
 configs/efi-x86_payload32_defconfig           |  1 +
 configs/efi-x86_payload64_defconfig           |  1 +
 configs/elgin-rv1108_defconfig                |  1 +
 configs/evb-px30_defconfig                    |  1 +
 configs/evb-px5_defconfig                     |  1 +
 configs/evb-rk3036_defconfig                  |  1 +
 configs/evb-rk3128_defconfig                  |  1 +
 configs/evb-rk3229_defconfig                  |  1 +
 configs/evb-rk3288_defconfig                  |  1 +
 configs/evb-rk3308_defconfig                  |  1 +
 configs/evb-rk3328_defconfig                  |  1 +
 configs/evb-rk3399_defconfig                  |  1 +
 configs/evb-rk3568_defconfig                  |  1 +
 configs/evb-rv1108_defconfig                  |  1 +
 configs/ficus-rk3399_defconfig                |  1 +
 configs/firefly-px30_defconfig                |  1 +
 configs/firefly-rk3288_defconfig              |  1 +
 configs/firefly-rk3399_defconfig              |  1 +
 configs/geekbox_defconfig                     |  1 +
 configs/goflexhome_defconfig                  |  3 +-
 configs/guruplug_defconfig                    |  3 +-
 configs/hsdk_4xd_defconfig                    |  1 +
 configs/hsdk_defconfig                        |  1 +
 configs/ib62x0_defconfig                      |  3 +-
 configs/iconnect_defconfig                    |  3 +-
 configs/inetspace_v2_defconfig                |  3 +-
 configs/k2e_evm_defconfig                     |  1 +
 configs/k2e_hs_evm_defconfig                  |  1 +
 configs/k2g_evm_defconfig                     |  1 +
 configs/k2g_hs_evm_defconfig                  |  1 +
 configs/k2hk_evm_defconfig                    |  1 +
 configs/k2hk_hs_evm_defconfig                 |  1 +
 configs/k2l_evm_defconfig                     |  1 +
 configs/k2l_hs_evm_defconfig                  |  1 +
 configs/khadas-edge-captain-rk3399_defconfig  |  1 +
 configs/khadas-edge-rk3399_defconfig          |  1 +
 configs/khadas-edge-v-rk3399_defconfig        |  1 +
 configs/kylin-rk3036_defconfig                |  1 +
 configs/leez-rk3399_defconfig                 |  1 +
 configs/lion-rk3368_defconfig                 |  1 +
 configs/ls1012a2g5rdb_qspi_defconfig          |  2 +-
 configs/ls1012a2g5rdb_tfa_defconfig           |  2 +-
 configs/ls1012afrdm_qspi_defconfig            |  2 +-
 configs/ls1012afrdm_tfa_defconfig             |  2 +-
 .../ls1012afrwy_qspi_SECURE_BOOT_defconfig    |  2 +-
 configs/ls1012afrwy_qspi_defconfig            |  2 +-
 configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig |  2 +-
 configs/ls1012afrwy_tfa_defconfig             |  2 +-
 configs/ls1012aqds_qspi_defconfig             |  2 +-
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1012aqds_tfa_defconfig              |  2 +-
 configs/ls1012ardb_qspi_SECURE_BOOT_defconfig |  2 +-
 configs/ls1012ardb_qspi_defconfig             |  2 +-
 configs/ls1012ardb_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1012ardb_tfa_defconfig              |  2 +-
 configs/ls1021aiot_qspi_defconfig             |  2 +-
 configs/ls1021aiot_sdcard_defconfig           |  2 +-
 configs/ls1021aqds_nand_defconfig             |  2 +-
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1021aqds_qspi_defconfig             |  2 +-
 configs/ls1021aqds_sdcard_ifc_defconfig       |  2 +-
 configs/ls1021aqds_sdcard_qspi_defconfig      |  2 +-
 configs/ls1021atsn_qspi_defconfig             |  2 +-
 configs/ls1021atsn_sdcard_defconfig           |  2 +-
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1021atwr_qspi_defconfig             |  2 +-
 ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig |  2 +-
 configs/ls1021atwr_sdcard_ifc_defconfig       |  2 +-
 configs/ls1021atwr_sdcard_qspi_defconfig      |  2 +-
 configs/ls1028aqds_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1028aqds_tfa_defconfig              |  2 +-
 configs/ls1028ardb_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1028ardb_tfa_defconfig              |  2 +-
 configs/ls1043aqds_defconfig                  |  2 +-
 configs/ls1043aqds_nand_defconfig             |  2 +-
 configs/ls1043aqds_nor_ddr3_defconfig         |  2 +-
 configs/ls1043aqds_qspi_defconfig             |  2 +-
 configs/ls1043aqds_sdcard_ifc_defconfig       |  2 +-
 configs/ls1043aqds_sdcard_qspi_defconfig      |  2 +-
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1043aqds_tfa_defconfig              |  2 +-
 configs/ls1043ardb_SECURE_BOOT_defconfig      |  2 +-
 configs/ls1043ardb_defconfig                  |  2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig |  2 +-
 configs/ls1043ardb_nand_defconfig             |  2 +-
 .../ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  2 +-
 configs/ls1043ardb_sdcard_defconfig           |  2 +-
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1043ardb_tfa_defconfig              |  2 +-
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig |  2 +-
 configs/ls1046afrwy_tfa_defconfig             |  2 +-
 configs/ls1046aqds_SECURE_BOOT_defconfig      |  2 +-
 configs/ls1046aqds_defconfig                  |  2 +-
 configs/ls1046aqds_nand_defconfig             |  2 +-
 configs/ls1046aqds_qspi_defconfig             |  2 +-
 configs/ls1046aqds_sdcard_ifc_defconfig       |  2 +-
 configs/ls1046aqds_sdcard_qspi_defconfig      |  2 +-
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1046aqds_tfa_defconfig              |  2 +-
 configs/ls1046ardb_emmc_defconfig             |  2 +-
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig |  2 +-
 configs/ls1046ardb_qspi_defconfig             |  2 +-
 configs/ls1046ardb_qspi_spl_defconfig         |  2 +-
 .../ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  2 +-
 configs/ls1046ardb_sdcard_defconfig           |  2 +-
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1046ardb_tfa_defconfig              |  2 +-
 configs/ls1088aqds_defconfig                  |  2 +-
 configs/ls1088aqds_qspi_SECURE_BOOT_defconfig |  2 +-
 configs/ls1088aqds_qspi_defconfig             |  2 +-
 configs/ls1088aqds_sdcard_ifc_defconfig       |  2 +-
 configs/ls1088aqds_sdcard_qspi_defconfig      |  2 +-
 configs/ls1088aqds_tfa_defconfig              |  2 +-
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig |  2 +-
 configs/ls1088ardb_qspi_defconfig             |  2 +-
 ...1088ardb_sdcard_qspi_SECURE_BOOT_defconfig |  2 +-
 configs/ls1088ardb_sdcard_qspi_defconfig      |  2 +-
 configs/ls1088ardb_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls1088ardb_tfa_defconfig              |  2 +-
 configs/ls2080aqds_SECURE_BOOT_defconfig      |  2 +-
 configs/ls2080aqds_defconfig                  |  2 +-
 configs/ls2080aqds_nand_defconfig             |  2 +-
 configs/ls2080aqds_qspi_defconfig             |  2 +-
 configs/ls2080aqds_sdcard_defconfig           |  2 +-
 configs/ls2080ardb_SECURE_BOOT_defconfig      |  2 +-
 configs/ls2080ardb_defconfig                  |  2 +-
 configs/ls2080ardb_nand_defconfig             |  2 +-
 configs/ls2081ardb_defconfig                  |  2 +-
 configs/ls2088aqds_tfa_defconfig              |  2 +-
 configs/ls2088ardb_qspi_SECURE_BOOT_defconfig |  2 +-
 configs/ls2088ardb_qspi_defconfig             |  2 +-
 configs/ls2088ardb_tfa_SECURE_BOOT_defconfig  |  2 +-
 configs/ls2088ardb_tfa_defconfig              |  2 +-
 configs/malta64_defconfig                     |  1 +
 configs/malta64el_defconfig                   |  1 +
 configs/malta_defconfig                       |  1 +
 configs/maltael_defconfig                     |  1 +
 configs/minnowmax_defconfig                   |  1 +
 configs/miqi-rk3288_defconfig                 |  1 +
 configs/mk808_defconfig                       |  1 +
 configs/nanopc-t4-rk3399_defconfig            |  1 +
 configs/nanopi-m4-2gb-rk3399_defconfig        |  1 +
 configs/nanopi-m4-rk3399_defconfig            |  1 +
 configs/nanopi-m4b-rk3399_defconfig           |  1 +
 configs/nanopi-neo4-rk3399_defconfig          |  1 +
 configs/nanopi-r2s-rk3328_defconfig           |  1 +
 configs/nanopi-r4s-rk3399_defconfig           |  1 +
 configs/nas220_defconfig                      |  3 +-
 configs/net2big_v2_defconfig                  |  3 +-
 configs/netspace_lite_v2_defconfig            |  3 +-
 configs/netspace_max_v2_defconfig             |  3 +-
 configs/netspace_mini_v2_defconfig            |  3 +-
 configs/netspace_v2_defconfig                 |  3 +-
 configs/nsa310s_defconfig                     |  3 +-
 configs/odroid-go2_defconfig                  |  1 +
 configs/omap4_panda_defconfig                 |  2 +-
 configs/omap4_sdp4430_defconfig               |  2 +-
 configs/omap5_uevm_defconfig                  |  2 +-
 configs/openrd_base_defconfig                 |  3 +-
 configs/openrd_client_defconfig               |  3 +-
 configs/openrd_ultimate_defconfig             |  3 +-
 configs/orangepi-rk3399_defconfig             |  1 +
 configs/phycore-rk3288_defconfig              |  1 +
 configs/pinebook-pro-rk3399_defconfig         |  1 +
 configs/pogo_e02_defconfig                    |  3 +-
 configs/pogo_v4_defconfig                     |  3 +-
 configs/popmetal-rk3288_defconfig             |  1 +
 configs/puma-rk3399_defconfig                 |  1 +
 configs/px30-core-ctouch2-of10-px30_defconfig |  1 +
 configs/px30-core-ctouch2-px30_defconfig      |  1 +
 configs/px30-core-edimm2.2-px30_defconfig     |  1 +
 configs/qemu-x86_64_defconfig                 |  1 +
 configs/qemu-x86_defconfig                    |  1 +
 configs/roc-cc-rk3308_defconfig               |  1 +
 configs/roc-cc-rk3328_defconfig               |  1 +
 configs/roc-pc-mezzanine-rk3399_defconfig     |  1 +
 configs/roc-pc-rk3399_defconfig               |  1 +
 configs/rock-pi-4-rk3399_defconfig            |  1 +
 configs/rock-pi-4c-rk3399_defconfig           |  1 +
 configs/rock-pi-e-rk3328_defconfig            |  1 +
 configs/rock-pi-n10-rk3399pro_defconfig       |  1 +
 configs/rock-pi-n8-rk3288_defconfig           |  1 +
 configs/rock2_defconfig                       |  1 +
 configs/rock64-rk3328_defconfig               |  1 +
 configs/rock960-rk3399_defconfig              |  1 +
 configs/rock_defconfig                        |  1 +
 configs/rockpro64-rk3399_defconfig            |  1 +
 configs/sheep-rk3368_defconfig                |  1 +
 configs/sheevaplug_defconfig                  |  3 +-
 configs/slimbootloader_defconfig              |  1 +
 configs/socfpga_agilex_atf_defconfig          |  1 +
 configs/socfpga_agilex_defconfig              |  1 +
 configs/socfpga_agilex_vab_defconfig          |  1 +
 configs/socfpga_arria10_defconfig             |  1 +
 configs/socfpga_chameleonv3_defconfig         |  1 +
 configs/socfpga_n5x_atf_defconfig             |  1 +
 configs/socfpga_n5x_defconfig                 |  1 +
 configs/socfpga_n5x_vab_defconfig             |  1 +
 configs/socfpga_stratix10_atf_defconfig       |  1 +
 configs/socfpga_stratix10_defconfig           |  1 +
 configs/som-db5800-som-6867_defconfig         |  1 +
 configs/ten64_tfa_defconfig                   |  2 +-
 ...able-x86-conga-qa3-e3845-pcie-x4_defconfig |  1 +
 .../theadorable-x86-conga-qa3-e3845_defconfig |  1 +
 configs/ti816x_evm_defconfig                  |  2 +-
 configs/tinker-rk3288_defconfig               |  1 +
 configs/tinker-s-rk3288_defconfig             |  1 +
 configs/vyasa-rk3288_defconfig                |  1 +
 configs/xtfpga_defconfig                      |  3 +-
 drivers/serial/Kconfig                        | 54 ++++++++++++++++---
 drivers/serial/Makefile                       |  2 +-
 include/configs/10m50_devboard.h              |  1 -
 include/configs/MPC837XERDB.h                 |  2 -
 include/configs/MPC8548CDS.h                  |  2 -
 include/configs/P1010RDB.h                    |  3 --
 include/configs/P2041RDB.h                    |  2 -
 include/configs/SBx81LIFKW.h                  |  2 -
 include/configs/SBx81LIFXCAT.h                |  2 -
 include/configs/T102xRDB.h                    |  2 -
 include/configs/T104xRDB.h                    |  2 -
 include/configs/T208xQDS.h                    |  2 -
 include/configs/T208xRDB.h                    |  2 -
 include/configs/T4240RDB.h                    |  2 -
 include/configs/am43xx_evm.h                  |  4 --
 include/configs/ax25-ae350.h                  |  4 --
 include/configs/axs10x.h                      |  2 -
 include/configs/bcmstb.h                      |  2 -
 include/configs/bur_am335x_common.h           |  2 -
 include/configs/chromebook_coral.h            |  3 --
 include/configs/cm_t43.h                      |  4 --
 include/configs/dfi-bt700.h                   |  1 -
 include/configs/galileo.h                     |  1 -
 .../configs/gardena-smart-gateway-mt7688.h    |  2 -
 include/configs/hsdk-4xd.h                    |  2 -
 include/configs/hsdk.h                        |  2 -
 include/configs/km/pg-wcom-ls102xa.h          |  1 -
 include/configs/kmcent2.h                     |  2 -
 include/configs/legoev3.h                     |  1 -
 include/configs/linkit-smart-7688.h           |  2 -
 include/configs/ls1012a_common.h              |  2 -
 include/configs/ls1021aiot.h                  |  2 -
 include/configs/ls1021aqds.h                  |  4 --
 include/configs/ls1021atsn.h                  |  4 --
 include/configs/ls1021atwr.h                  |  4 --
 include/configs/ls1028a_common.h              |  2 -
 include/configs/ls1043a_common.h              |  2 -
 include/configs/ls1046a_common.h              |  2 -
 include/configs/ls1088a_common.h              |  2 -
 include/configs/ls2080a_common.h              |  2 -
 include/configs/malta.h                       |  1 -
 include/configs/mt7621.h                      |  2 -
 include/configs/mt7628.h                      |  2 -
 include/configs/mt8183.h                      |  3 --
 include/configs/mt8516.h                      |  3 --
 include/configs/mv-common.h                   |  2 -
 include/configs/nokia_rx51.h                  |  1 -
 include/configs/p1_p2_rdb_pc.h                |  3 --
 include/configs/px30_common.h                 |  2 -
 include/configs/rk3308_common.h               |  2 -
 include/configs/rockchip-common.h             |  2 -
 include/configs/siemens-am33x-common.h        |  1 -
 include/configs/sniper.h                      |  5 --
 include/configs/socfpga_arria10_socdk.h       |  1 -
 include/configs/socfpga_chameleonv3.h         |  1 -
 include/configs/socfpga_soc64_common.h        |  1 -
 include/configs/sunxi-common.h                |  2 -
 include/configs/tb100.h                       |  1 -
 include/configs/theadorable-x86-dfi-bt700.h   |  1 -
 include/configs/ti814x_evm.h                  |  2 -
 include/configs/ti816x_evm.h                  |  2 -
 include/configs/ti_am335x_common.h            |  6 ---
 include/configs/ti_armv7_keystone2.h          |  1 -
 include/configs/ti_omap3_common.h             |  4 --
 include/configs/ti_omap4_common.h             |  2 -
 include/configs/ti_omap5_common.h             |  4 --
 include/configs/vocore2.h                     |  2 -
 include/configs/x530.h                        |  2 -
 include/configs/x86-common.h                  |  1 -
 include/configs/xtfpga.h                      |  2 -
 include/ns16550.h                             |  2 +-
 386 files changed, 397 insertions(+), 369 deletions(-)
README +0 -7
index f71832b689ed..9086207954ea 100644
@@ -1619,13 +1619,6 @@ use the "saveenv" command to store a valid environment.
 - CONFIG_SYS_FAULT_MII_ADDR:
 		MII address of the PHY to check for the Ethernet link state.
 
-- CONFIG_SPL_NS16550_MIN_FUNCTIONS:
-		Define this if you desire to only have use of the NS16550_init
-		and NS16550_putc functions for the serial driver located at
-		drivers/serial/ns16550.c.  This option is useful for saving
-		space for already greatly restricted images, including but not
-		limited to NAND_SPL configurations.
-
 - CONFIG_DISPLAY_BOARDINFO
 		Display information about the board that U-Boot is running on
 		when U-Boot starts up. The board function checkboard() is called
arch/arm/include/asm/arch-bcmcygnus/configs.h +0 -4
index 327c0e06977b..0c7262352d53 100644
@@ -11,10 +11,6 @@
 /* uArchitecture specifics */
 
 /* Serial Info */
-/* Post pad 3 bytes after each reg addr */
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_MEM32
-
 #define CONFIG_SYS_NS16550_CLK		100000000
 #define CONFIG_SYS_NS16550_CLK_DIV	54
 #define CONFIG_SYS_NS16550_COM3		0x18023000
arch/arm/include/asm/arch-bcmnsp/configs.h +0 -3
index 05fa9b9612d5..44699476b08b 100644
@@ -11,9 +11,6 @@
 /* uArchitecture specifics */
 
 /* Serial Info */
-/* no padding */
-#define CONFIG_SYS_NS16550_REG_SIZE	1
-
 #define CONFIG_SYS_NS16550_CLK		0x03b9aca0
 #define CONFIG_SYS_NS16550_COM1		0x18000300
 
configs/10m50_defconfig +1 -0
index dd88d10274c1..28966e0d0a41 100644
@@ -47,5 +47,6 @@ CONFIG_PHY_GIGE=y
 CONFIG_ALTERA_TSE=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_TIMER=y
 CONFIG_ALTERA_TIMER=y
configs/MPC837XERDB_defconfig +1 -1
index 675b2de151c7..7054333d7373 100644
@@ -206,7 +206,7 @@ CONFIG_DM_ETH_PHY=y
 CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_FSL=y
configs/MPC8548CDS_36BIT_defconfig +1 -1
index e5c45a1bffab..85b055a93ffe 100644
@@ -85,5 +85,5 @@ CONFIG_TSEC_ENET=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_ADDR_MAP=y
configs/MPC8548CDS_defconfig +1 -1
index 85ec76a59714..0d21b893d8bb 100644
@@ -84,4 +84,4 @@ CONFIG_TSEC_ENET=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
configs/MPC8548CDS_legacy_defconfig +1 -1
index 852ac9a6eeb3..b01919ec675a 100644
@@ -84,4 +84,4 @@ CONFIG_TSEC_ENET=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
configs/P1010RDB-PA_36BIT_NAND_defconfig +2 -1
index e15ca5ea2b5d..a3d9a8b4b76c 100644
@@ -129,7 +129,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_36BIT_NOR_defconfig +1 -1
index dcf74f5d6af5..2ca02503993f 100644
@@ -93,7 +93,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +1 -1
index 230c6d02831c..5d57aa3ba4bc 100644
@@ -114,7 +114,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +1 -1
index 982420db74c4..a13b48c20ece 100644
@@ -116,7 +116,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_NAND_defconfig +2 -1
index b3af4450d00f..a9c7652fab08 100644
@@ -128,7 +128,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_NOR_defconfig +1 -1
index 537d8bf576b0..a0277d0aa61b 100644
@@ -92,7 +92,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_SDCARD_defconfig +1 -1
index dd9120970bab..f43a5a0c5428 100644
@@ -113,7 +113,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PA_SPIFLASH_defconfig +1 -1
index ff7cfa246159..ef52f948827e 100644
@@ -115,7 +115,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +2 -1
index a61f4d017a68..2b2744dd74ed 100644
@@ -132,7 +132,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_36BIT_NOR_defconfig +1 -1
index 92a7e0966936..29b7d8480958 100644
@@ -95,7 +95,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +1 -1
index 84e2d3c587a4..98164d2bade1 100644
@@ -116,7 +116,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +1 -1
index b883b81e0cd8..d74fbecfaa12 100644
@@ -118,7 +118,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_NAND_defconfig +2 -1
index 7f7870d82c52..efd0a7eb8966 100644
@@ -131,7 +131,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_NOR_defconfig +1 -1
index 3e16470608e5..44e98b9520f5 100644
@@ -94,7 +94,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_SDCARD_defconfig +1 -1
index e985f8cd75d0..9c6504376602 100644
@@ -115,7 +115,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1010RDB-PB_SPIFLASH_defconfig +1 -1
index 9f4ae14e0b23..4b967352f4de 100644
@@ -117,7 +117,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +2 -1
index 3f93b318c92f..b65e65187873 100644
@@ -142,7 +142,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -1
index 3b3cf1ee7a5e..034a971bc8b4 100644
@@ -124,7 +124,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -1
index aba5b9cedd43..9476c28e98b1 100644
@@ -126,7 +126,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_36BIT_defconfig +1 -1
index ce0ba0e37574..ecd5e978c8b2 100644
@@ -104,7 +104,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_NAND_defconfig +2 -1
index f3fc4c82a54d..80f4d22518c4 100644
@@ -141,7 +141,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_SDCARD_defconfig +1 -1
index 25eb5d5da74a..50fc0c124e83 100644
@@ -123,7 +123,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -1
index 054320f356cd..dafb430e4c0c 100644
@@ -125,7 +125,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PC_defconfig +1 -1
index aae886b75c4e..411b4f05a44c 100644
@@ -103,7 +103,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PD_NAND_defconfig +2 -1
index cc02fe6a8ac9..8b0b6e4e6808 100644
@@ -144,7 +144,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PD_SDCARD_defconfig +1 -1
index dc82da81b816..6a17f085a7f5 100644
@@ -126,7 +126,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -1
index 7b80edeeeb92..2738b208f16f 100644
@@ -128,7 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P1020RDB-PD_defconfig +1 -1
index 5fecb6684735..fdd7703f72cf 100644
@@ -106,7 +106,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +2 -1
index 9162774ad70c..5904aa54b291 100644
@@ -147,7 +147,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +1 -1
index fd143b610b98..938148df93af 100644
@@ -129,7 +129,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -1
index edb8b9958eae..c4a41c4c0ebf 100644
@@ -131,7 +131,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_36BIT_defconfig +1 -1
index b1dbca6e7ea3..a4ed8fb39cd4 100644
@@ -109,7 +109,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_NAND_defconfig +2 -1
index 1269d22f90c6..9b4ca39d34f3 100644
@@ -146,7 +146,8 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_SDCARD_defconfig +1 -1
index b5394d05b7ff..a6d98b42ce1c 100644
@@ -128,7 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -1
index 431ca31302c9..b3e4a1f0d0eb 100644
@@ -130,7 +130,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2020RDB-PC_defconfig +1 -1
index 1ee46f9fbe9f..f1a9c058caac 100644
@@ -108,7 +108,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2041RDB_NAND_defconfig +1 -1
index 2ba566644627..0eec5089332d 100644
@@ -98,7 +98,7 @@ CONFIG_SYS_FMAN_FW_ADDR=0x100000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2041RDB_SDCARD_defconfig +1 -1
index 9a2796fc7fce..f9f4c31ddb6c 100644
@@ -93,7 +93,7 @@ CONFIG_SYS_FMAN_FW_ADDR=0xD2000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2041RDB_SPIFLASH_defconfig +1 -1
index 8cb00d5d316b..6a974370088c 100644
@@ -95,7 +95,7 @@ CONFIG_SYS_FMAN_FW_ADDR=0x110000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/P2041RDB_defconfig +1 -1
index c0bd16bd61f8..1725a8a5a9cc 100644
@@ -90,7 +90,7 @@ CONFIG_SYS_FMAN_FW_ADDR=0xEFF00000
 CONFIG_MII=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/SBx81LIFKW_defconfig +2 -1
index 73ef73c484ef..fa7c35b9ef77 100644
@@ -63,7 +63,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/SBx81LIFXCAT_defconfig +2 -1
index 9fa0fda84f26..125871301e34 100644
@@ -61,7 +61,8 @@ CONFIG_MV88E61XX_FIXED_PORTS=0x300
 CONFIG_PHY_FIXED=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/T1024RDB_NAND_defconfig +1 -1
index 2aada043e83a..f21c53d59f1e 100644
@@ -129,7 +129,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0x200000
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1024RDB_SDCARD_defconfig +1 -1
index e5661b0b6052..6f9f5a2603a8 100644
@@ -123,7 +123,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1024RDB_SPIFLASH_defconfig +1 -1
index 320f22e348ea..76a59604f2f4 100644
@@ -126,7 +126,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1024RDB_defconfig +1 -1
index 1f571b6e6fa0..a4825909e7ad 100644
@@ -98,7 +98,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FW_ADDR=0xEFE00000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1042D4RDB_NAND_defconfig +1 -1
index 4088d40de30d..1aa0e9eec17f 100644
@@ -129,7 +129,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x380000
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1042D4RDB_SDCARD_defconfig +1 -1
index 5a6f9a8d248f..ba1820e93a29 100644
@@ -123,7 +123,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x124000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -1
index 2d03b4eb1424..98cd9b71e035 100644
@@ -126,7 +126,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x130000
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T1042D4RDB_defconfig +1 -1
index 8f283fa8fd26..f6301a57cfd9 100644
@@ -98,7 +98,7 @@ CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0xEFF10000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080QDS_NAND_defconfig +1 -1
index beb0259488de..dd7473ef7fd7 100644
@@ -136,7 +136,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080QDS_SDCARD_defconfig +1 -1
index 7ee5fb4f476b..364aab584778 100644
@@ -130,7 +130,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -1
index c050e310c8fb..c6710a0413c3 100644
@@ -104,7 +104,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080QDS_SPIFLASH_defconfig +1 -1
index 0ff651ae6880..a705542eea70 100644
@@ -133,7 +133,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -1
index 98065da77d6d..d6d6ec0fbf0d 100644
@@ -93,7 +93,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_REMOTE=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080QDS_defconfig +1 -1
index 88e943d4d0d2..802213de2b9e 100644
@@ -105,7 +105,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_NAND_defconfig +1 -1
index 23f6ee6e431c..a881488dbea1 100644
@@ -136,7 +136,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_SDCARD_defconfig +1 -1
index c2d95c10ab0b..562a79955c4d 100644
@@ -130,7 +130,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_SPIFLASH_defconfig +1 -1
index 2194ff6c5171..00018033a358 100644
@@ -133,7 +133,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_defconfig +1 -1
index 7f57b004d576..0cb359de9478 100644
@@ -104,7 +104,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_revD_NAND_defconfig +1 -1
index 5d4573a7f9d5..cbe1bb4e3f62 100644
@@ -138,7 +138,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_revD_SDCARD_defconfig +1 -1
index 7ca9a8b036ec..80a2c003e6a9 100644
@@ -132,7 +132,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_revD_SPIFLASH_defconfig +1 -1
index 39fcd2dad392..99bee8e5ead5 100644
@@ -135,7 +135,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T2080RDB_revD_defconfig +1 -1
index 8d1011d06c5d..aa6a053209ef 100644
@@ -106,7 +106,7 @@ CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_DS1307=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T4240RDB_SDCARD_defconfig +1 -1
index 9b082674d60d..b445b6bde1f1 100644
@@ -119,7 +119,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/T4240RDB_defconfig +1 -1
index 662edc32c619..a807ac834742 100644
@@ -94,7 +94,7 @@ CONFIG_MII=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_FSL=y
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_ESPI=y
configs/am43xx_evm_qspiboot_defconfig +1 -1
index 0b759c8c2c40..fc6cad59cf45 100644
@@ -53,7 +53,7 @@ CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
configs/am43xx_hs_evm_qspi_defconfig +1 -1
index 68a96518878b..08cac404c6e2 100644
@@ -55,7 +55,7 @@ CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
configs/axs101_defconfig +1 -0
index a5436db7ac72..85a70c0996b2 100644
@@ -56,6 +56,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/axs103_defconfig +1 -0
index 7fbec63c58f1..00d43e24c5a5 100644
@@ -56,6 +56,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/bayleybay_defconfig +1 -0
index 5f43f4c0ee90..90a734fcdad0 100644
@@ -59,6 +59,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/bcm7260_defconfig +2 -1
index 920e8828460e..f8e0327d8f58 100644
@@ -40,5 +40,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCMSTB=y
 CONFIG_MTD=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 # CONFIG_EFI_LOADER is not set
configs/bcm7445_defconfig +2 -1
index b44eabaa4251..81433b02cbcf 100644
@@ -44,7 +44,8 @@ CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_BCMSTB_SPI=y
configs/cherryhill_defconfig +1 -0
index 06987ab82860..321121e3f729 100644
@@ -50,6 +50,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_RTL8169=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/chromebit_mickey_defconfig +1 -0
index 59ae29a80e02..2240988dd0db 100644
@@ -94,6 +94,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/chromebook_bob_defconfig +1 -0
index 3d2f40fb9554..d768e11db51e 100644
@@ -92,6 +92,7 @@ CONFIG_DM_RESET=y
 CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/chromebook_coral_defconfig +1 -0
index 45905c6792b8..a38b3b78c08a 100644
@@ -102,6 +102,7 @@ CONFIG_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SOUND_DA7219=y
 CONFIG_SOUND_I8254=y
configs/chromebook_jerry_defconfig +1 -0
index ffa8070cb39e..150dba140865 100644
@@ -97,6 +97,7 @@ CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
configs/chromebook_kevin_defconfig +1 -0
index e8ec8855dda3..94d14d012da2 100644
@@ -93,6 +93,7 @@ CONFIG_DM_RESET=y
 CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/chromebook_link64_defconfig +1 -0
index b645cba90709..570c4e82a473 100644
@@ -79,6 +79,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SPL_DM_RTC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
configs/chromebook_link_defconfig +1 -0
index 541b7fadead4..43cf53045b40 100644
@@ -68,6 +68,7 @@ CONFIG_SYS_I2C_INTEL=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
configs/chromebook_minnie_defconfig +1 -0
index ca453ac8b9d0..08e1e5be415c 100644
@@ -96,6 +96,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_ROCKCHIP=y
configs/chromebook_samus_defconfig +1 -0
index 27bf046f991a..aa3d6f2b9d19 100644
@@ -70,6 +70,7 @@ CONFIG_SYS_I2C_DW=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_SOUND_RT5677=y
configs/chromebook_samus_tpl_defconfig +1 -0
index e9222648758b..77735739b825 100644
@@ -91,6 +91,7 @@ CONFIG_CROS_EC_LPC=y
 # CONFIG_SPL_PINCTRL is not set
 # CONFIG_TPL_PINCTRL is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_SOUND_RT5677=y
configs/chromebook_speedy_defconfig +1 -0
index 92018fb78eef..d5aaee9dde17 100644
@@ -95,6 +95,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
configs/chromebox_panther_defconfig +1 -0
index b78e98c2045a..e83f2dfe7f39 100644
@@ -59,6 +59,7 @@ CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_RTL8169=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +1 -0
index 0d904675f73f..31979f32bc5f 100644
@@ -69,6 +69,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/conga-qeval20-qa3-e3845_defconfig +1 -0
index 6fed3f2ecda9..18d58bec2010 100644
@@ -65,6 +65,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/coreboot64_defconfig +1 -0
index 20c0c1816968..e4da59bae927 100644
@@ -61,6 +61,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_CONSOLE_SCROLL_LINES=5
configs/coreboot_defconfig +1 -0
index d8c5be66ad7b..e297494663e0 100644
@@ -55,6 +55,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_CONSOLE_SCROLL_LINES=5
configs/cougarcanyon2_defconfig +1 -0
index 094b21666e16..203eff8e165a 100644
@@ -53,6 +53,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/crownbay_defconfig +1 -0
index 4521172f42bf..cb0f0d7c8d02 100644
@@ -57,6 +57,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_SPI=y
configs/d2net_v2_defconfig +2 -1
index 5eea1ec9a724..71c57ed5aba0 100644
@@ -66,7 +66,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/dns325_defconfig +2 -1
index 16a866f6b475..6c35f31a29d7 100644
@@ -59,7 +59,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/dockstar_defconfig +2 -1
index 6c805f41568c..a17d01f3fd27 100644
@@ -55,7 +55,8 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/dreamplug_defconfig +2 -1
index 86fe0692a0a3..6deb05575c1c 100644
@@ -62,7 +62,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/ds109_defconfig +2 -1
index 93aef472b54d..9088fffb25e2 100644
@@ -56,7 +56,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/eaidk-610-rk3399_defconfig +1 -0
index 5abdadf2d56f..c364c9ecc8df 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/efi-x86_payload32_defconfig +1 -0
index 83f532d6e543..8d1fc22eb93c 100644
@@ -52,6 +52,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 # CONFIG_GZIP is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
configs/efi-x86_payload64_defconfig +1 -0
index 28aaff69e978..89e6d1febc8b 100644
@@ -52,6 +52,7 @@ CONFIG_ATAPI=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 # CONFIG_GZIP is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
configs/elgin-rv1108_defconfig +1 -0
index 1f4ca01c50f8..36f57d58128b 100644
@@ -48,6 +48,7 @@ CONFIG_PINCTRL_ROCKCHIP_RV1108=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/evb-px30_defconfig +1 -0
index 6bc777c51c16..bb6f21b2e634 100644
@@ -101,6 +101,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/evb-px5_defconfig +1 -0
index f41c7580b4c6..2e3bff8cf04e 100644
@@ -78,6 +78,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_PANIC_HANG=y
 CONFIG_SPL_TINY_MEMSET=y
configs/evb-rk3036_defconfig +1 -0
index 8ef40d847c77..289f47f4ae89 100644
@@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_PINCTRL=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 # CONFIG_SPL_SYSRESET is not set
 CONFIG_USB=y
configs/evb-rk3128_defconfig +1 -0
index ce10750857ee..06a044b93496 100644
@@ -46,6 +46,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/evb-rk3229_defconfig +1 -0
index f8ca1f6597be..33202e48fe76 100644
@@ -72,6 +72,7 @@ CONFIG_SPL_RAM=y
 CONFIG_TPL_RAM=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
configs/evb-rk3288_defconfig +1 -0
index 7c0b856ca567..8f8d34c7038f 100644
@@ -81,6 +81,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/evb-rk3308_defconfig +1 -0
index 8502fcc51e62..0aeaf01d9a70 100644
@@ -74,6 +74,7 @@ CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/evb-rk3328_defconfig +1 -0
index 9421845b0377..8a6d19a1769e 100644
@@ -88,6 +88,7 @@ CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 # CONFIG_TPL_SYSRESET is not set
 CONFIG_USB=y
configs/evb-rk3399_defconfig +1 -0
index e7da9c4e5ff7..3050fd59922c 100644
@@ -61,6 +61,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/evb-rk3568_defconfig +1 -0
index db3acf5be53f..7374ee42fb19 100644
@@ -63,5 +63,6 @@ CONFIG_SPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
configs/evb-rv1108_defconfig +1 -0
index 5de5de465cb0..aab322311162 100644
@@ -42,6 +42,7 @@ CONFIG_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/ficus-rk3399_defconfig +1 -0
index d48dcc1a0ece..3aee6b647136 100644
@@ -55,6 +55,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/firefly-px30_defconfig +1 -0
index 1f91118426e7..2a6d2edbab02 100644
@@ -100,6 +100,7 @@ CONFIG_DM_RESET=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/firefly-rk3288_defconfig +1 -0
index 63c53a0248f2..26967a67cc94 100644
@@ -78,6 +78,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/firefly-rk3399_defconfig +1 -0
index a37870628c65..547517253288 100644
@@ -61,6 +61,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/geekbox_defconfig +1 -0
index 1d7832b9591c..c23d0549a4a2 100644
@@ -27,5 +27,6 @@ CONFIG_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
configs/goflexhome_defconfig +2 -1
index 6fdb3ea68003..8ee11833095d 100644
@@ -62,7 +62,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/guruplug_defconfig +2 -1
index 794cf4b23d7a..1889743f081f 100644
@@ -61,7 +61,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/hsdk_4xd_defconfig +1 -0
index 8c6ad5a0d17d..bba406726850 100644
@@ -60,6 +60,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/hsdk_defconfig +1 -0
index 9543c785bba9..4715f9d9d7d0 100644
@@ -59,6 +59,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/ib62x0_defconfig +2 -1
index 9290cb7af688..beee58962a5c 100644
@@ -59,7 +59,8 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/iconnect_defconfig +2 -1
index ce5a089d3270..f536dd3bcb55 100644
@@ -59,7 +59,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PCI_MVEBU=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/inetspace_v2_defconfig +2 -1
index 42f812c31f0e..1fa1a5afa78f 100644
@@ -66,7 +66,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/k2e_evm_defconfig +1 -0
index 25007793b3a0..96bcba6e94ff 100644
@@ -92,6 +92,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2e_hs_evm_defconfig +1 -0
index 6c8a284e7c70..0d1c97dd4b09 100644
@@ -67,6 +67,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2g_evm_defconfig +1 -0
index 6182101f1197..bded09788026 100644
@@ -96,6 +96,7 @@ CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_CADENCE_QSPI=y
configs/k2g_hs_evm_defconfig +1 -0
index fd169c3e957a..a851d8508221 100644
@@ -70,6 +70,7 @@ CONFIG_NOP_PHY=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_CADENCE_QSPI=y
configs/k2hk_evm_defconfig +1 -0
index fec29f2c9119..b0069fd60b01 100644
@@ -92,6 +92,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2hk_hs_evm_defconfig +1 -0
index f6ac484f2e85..9ca26ae61f51 100644
@@ -67,6 +67,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2l_evm_defconfig +1 -0
index 13d612ac3fb6..153abb7eb936 100644
@@ -93,6 +93,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/k2l_hs_evm_defconfig +1 -0
index 59ec3a6346f3..2990a702d999 100644
@@ -71,6 +71,7 @@ CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
configs/khadas-edge-captain-rk3399_defconfig +1 -0
index dff052230846..754fd4e3c6d5 100644
@@ -56,6 +56,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/khadas-edge-rk3399_defconfig +1 -0
index 5a8b69c0f94a..7518f7f2edef 100644
@@ -55,6 +55,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/khadas-edge-v-rk3399_defconfig +1 -0
index f54a610a2748..4c4301a9e7c5 100644
@@ -56,6 +56,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/kylin-rk3036_defconfig +1 -0
index 1ad635daa985..646f0086c6e3 100644
@@ -60,6 +60,7 @@ CONFIG_PINCTRL=y
 CONFIG_DM_REGULATOR_FIXED=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 # CONFIG_SPL_SYSRESET is not set
 CONFIG_USB=y
configs/leez-rk3399_defconfig +1 -0
index a8326f03a23f..5a958ee36a3f 100644
@@ -51,6 +51,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/lion-rk3368_defconfig +1 -0
index 1ace7b795a09..ee401b763d90 100644
@@ -97,6 +97,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
configs/ls1012a2g5rdb_qspi_defconfig +1 -1
index dbb0ce0221f1..b551f5bdee07 100644
@@ -60,7 +60,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_FSL_PFE=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012a2g5rdb_tfa_defconfig +1 -1
index a8b4ce2bab98..21ccc5557391 100644
@@ -58,7 +58,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_FSL_PFE=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012afrdm_qspi_defconfig +1 -1
index 1a4fc999db7e..f1c9169a72da 100644
@@ -58,7 +58,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012afrdm_tfa_defconfig +1 -1
index 7e9076a1f99b..f40ede127b59 100644
@@ -56,7 +56,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +1 -1
index 7bfe1f7cae50..ff5e323d57cb 100644
@@ -61,7 +61,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012afrwy_qspi_defconfig +1 -1
index 2327d8924376..3b073241e45c 100644
@@ -64,7 +64,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +1 -1
index 250440a70acc..238886d0dfdf 100644
@@ -59,7 +59,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012afrwy_tfa_defconfig +1 -1
index f1600c4005b6..ccd8fb9801fc 100644
@@ -62,7 +62,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1012aqds_qspi_defconfig +1 -1
index e4a26dc0ab2f..fcef5e5d5bbe 100644
@@ -85,7 +85,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF8563=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +1 -1
index c9fa1099303c..c2996a1372e1 100644
@@ -75,7 +75,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF8563=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012aqds_tfa_defconfig +1 -1
index 773a3e6b2b6d..a1709f4525b2 100644
@@ -84,7 +84,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF8563=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +1 -1
index c9f0635de17b..3639b4dd93db 100644
@@ -65,7 +65,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012ardb_qspi_defconfig +1 -1
index c1c21cb187c7..4fc7b3873468 100644
@@ -67,7 +67,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig +1 -1
index 503fe95c88dc..f162111d0bea 100644
@@ -63,7 +63,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1012ardb_tfa_defconfig +1 -1
index 727d10ffaaa8..cc640461cf4d 100644
@@ -64,7 +64,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021aiot_qspi_defconfig +1 -1
index 72129a70a8ca..e6cd6a7d19c4 100644
@@ -68,7 +68,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021aiot_sdcard_defconfig +1 -1
index c67f329f92ea..d5d335445707 100644
@@ -98,7 +98,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0xf40000
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021aqds_nand_defconfig +1 -1
index 14aa19fe726e..c3c6678bb494 100644
@@ -130,7 +130,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -1
index 2f1b41f06869..40228acaa896 100644
@@ -96,7 +96,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1021aqds_qspi_defconfig +1 -1
index 1c38d99dfca1..ebf6fdb463c6 100644
@@ -84,7 +84,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021aqds_sdcard_ifc_defconfig +1 -1
index 4a642f4a6c29..07d52c249d01 100644
@@ -127,7 +127,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -1
index 1b5d8229c664..6834a696b630 100644
@@ -112,7 +112,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021atsn_qspi_defconfig +1 -1
index 877a771b51cb..e5e732a50863 100644
@@ -69,7 +69,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021atsn_sdcard_defconfig +1 -1
index 9695164a93f2..29dc23e179e2 100644
@@ -96,7 +96,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -1
index 290d53f852c1..86060806fe45 100644
@@ -80,7 +80,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1021atwr_qspi_defconfig +1 -1
index b3a93179c226..ed7e91e9b5fc 100644
@@ -77,7 +77,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -1
index cb3d1580d35b..f84f4dd66093 100644
@@ -112,7 +112,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_U_QE=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -1
index c53827c63760..40a0ea703256 100644
@@ -111,7 +111,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -1
index 46ab9a26f0f1..621a0238d449 100644
@@ -105,7 +105,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +1 -1
index 753583d47b44..525c7df6d0f4 100644
@@ -86,7 +86,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1028aqds_tfa_defconfig +1 -1
index b5e243bc0e9b..dde204eaa0df 100644
@@ -92,7 +92,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1028ardb_tfa_SECURE_BOOT_defconfig +1 -1
index fad07863db58..b8df245025f3 100644
@@ -80,7 +80,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1028ardb_tfa_defconfig +1 -1
index 20354f7e86bf..5b1cf988cf07 100644
@@ -86,7 +86,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1043aqds_defconfig +1 -1
index 9b3c77fe56b6..a7e9583c735e 100644
@@ -99,7 +99,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043aqds_nand_defconfig +1 -1
index 29cbac313547..774d41308ba5 100644
@@ -130,7 +130,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043aqds_nor_ddr3_defconfig +1 -1
index 21bb036ee8c7..f759baf36db6 100644
@@ -100,7 +100,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043aqds_qspi_defconfig +1 -1
index fd7f3bb69b3c..e7dbf41b972e 100644
@@ -89,7 +89,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1043aqds_sdcard_ifc_defconfig +1 -1
index 14931f72197d..627abc81c9c5 100644
@@ -127,7 +127,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043aqds_sdcard_qspi_defconfig +1 -1
index 22844636e27d..f4dcbd4a926b 100644
@@ -115,7 +115,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -1
index b75c75230fcd..307fbfcbb7db 100644
@@ -98,7 +98,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1043aqds_tfa_defconfig +1 -1
index 21199b9d0681..667fc2123a24 100644
@@ -107,7 +107,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1043ardb_SECURE_BOOT_defconfig +1 -1
index df227d80371e..7d980c3c4691 100644
@@ -86,7 +86,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_defconfig +1 -1
index 0e2fa0284dcb..b345d13caa02 100644
@@ -89,7 +89,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x60940000
 CONFIG_SYS_QE_FMAN_FW_IN_NOR=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +1 -1
index 6b9971f138a0..d4546348bbd0 100644
@@ -110,7 +110,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_nand_defconfig +1 -1
index 0aa046a425b7..f0f8cbf34e0e 100644
@@ -117,7 +117,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FMAN_FW_IN_NAND=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +1 -1
index a6c33de39712..529cd93bd248 100644
@@ -110,7 +110,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_sdcard_defconfig +1 -1
index ddf280a5628f..bfe9260d1b72 100644
@@ -115,7 +115,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +1 -1
index 7ca5457c2d28..391e95a48d5f 100644
@@ -84,7 +84,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1043ardb_tfa_defconfig +1 -1
index 5fe6bae3a1ba..2ebde25bd93c 100644
@@ -90,7 +90,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SYS_QE_FW_ADDR=0x940000
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +1 -1
index 7d9f5330016b..0df5b85869b6 100644
@@ -67,7 +67,7 @@ CONFIG_SYS_FMAN_FW_ADDR=0x900000
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046afrwy_tfa_defconfig +1 -1
index 03e944fa7a15..a095bbcb82ee 100644
@@ -76,7 +76,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046aqds_SECURE_BOOT_defconfig +1 -1
index e9cf20d5f743..2bf8a9492561 100644
@@ -98,7 +98,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_defconfig +1 -1
index 0e2f4094f792..5fe73bc8ac70 100644
@@ -101,7 +101,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_nand_defconfig +1 -1
index 75851ad390d7..7c8a1e70fad2 100644
@@ -130,7 +130,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_qspi_defconfig +1 -1
index 552bb43f7a1d..937581536af9 100644
@@ -91,7 +91,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_sdcard_ifc_defconfig +1 -1
index 312464484dac..4d3c0580a1b7 100644
@@ -130,7 +130,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_sdcard_qspi_defconfig +1 -1
index 344899ef6f21..480ab0379538 100644
@@ -118,7 +118,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1 -1
index 0a363533ff2f..a0d57b19354f 100644
@@ -99,7 +99,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046aqds_tfa_defconfig +1 -1
index 26fc4592a966..e08af4d1a2cf 100644
@@ -109,7 +109,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1046ardb_emmc_defconfig +1 -1
index d9c716ebabde..1a09fdadd3b8 100644
@@ -111,7 +111,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +1 -1
index 61b7244ff22f..346a954760f1 100644
@@ -86,7 +86,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_qspi_defconfig +1 -1
index 05115ea71e45..4361cd223dba 100644
@@ -90,7 +90,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_qspi_spl_defconfig +1 -1
index ac2cede0d3d3..560362695ff5 100644
@@ -119,7 +119,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +1 -1
index 6074b6b3142b..cdcfa63bf458 100644
@@ -109,7 +109,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_sdcard_defconfig +1 -1
index 07b077767ace..e0442390db0d 100644
@@ -111,7 +111,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_SYS_QE_FMAN_FW_IN_MMC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +1 -1
index 2432154f77b2..da6c2431bf72 100644
@@ -79,7 +79,7 @@ CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1046ardb_tfa_defconfig +1 -1
index 0aa2792c3c4c..f9aab31acff3 100644
@@ -85,7 +85,7 @@ CONFIG_PCIE_LAYERSCAPE_EP=y
 CONFIG_POWER_LEGACY=y
 CONFIG_POWER_I2C=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls1088aqds_defconfig +1 -1
index 8556c003555c..aecd74d15b9b 100644
@@ -101,7 +101,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +1 -1
index d4f2268041f0..8d1fc5f20418 100644
@@ -93,7 +93,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088aqds_qspi_defconfig +1 -1
index af63278bb3c4..7c6e6b7637c3 100644
@@ -96,7 +96,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088aqds_sdcard_ifc_defconfig +1 -1
index 6b42170ffbd6..64296dbe0b2e 100644
@@ -121,7 +121,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls1088aqds_sdcard_qspi_defconfig +1 -1
index dedefb3a0a3f..2b4712e07e3d 100644
@@ -116,7 +116,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088aqds_tfa_defconfig +1 -1
index 60f26f018308..c8ab5723539a 100644
@@ -118,7 +118,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +1 -1
index a819ebfefffa..18213e5cc5cf 100644
@@ -89,7 +89,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088ardb_qspi_defconfig +1 -1
index c56975333813..eb88cec6e029 100644
@@ -92,7 +92,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +1 -1
index 2b96382f2482..33aedcfbd20a 100644
@@ -111,7 +111,7 @@ CONFIG_MII=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_SCSI_AHCI_PLAT=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088ardb_sdcard_qspi_defconfig +1 -1
index 426363538408..db28ae196f64 100644
@@ -112,7 +112,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +1 -1
index 2e812943fd39..0ec80be2ea6a 100644
@@ -90,7 +90,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls1088ardb_tfa_defconfig +1 -1
index 9c12f2be9ce0..27323be40890 100644
@@ -96,7 +96,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -1
index 817ae8d728b3..f66f5298366e 100644
@@ -96,7 +96,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2080aqds_defconfig +1 -1
index b3e75847cca3..d601c083e28c 100644
@@ -99,7 +99,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2080aqds_nand_defconfig +1 -1
index effcd33629b8..e2b6044d1fae 100644
@@ -112,7 +112,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls2080aqds_qspi_defconfig +1 -1
index eb57948414df..8abd58d53eb6 100644
@@ -92,7 +92,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls2080aqds_sdcard_defconfig +1 -1
index e5702b815923..389b32b2d6db 100644
@@ -106,7 +106,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_QSPI=y
configs/ls2080ardb_SECURE_BOOT_defconfig +1 -1
index face1e05320a..e4d15dda14d0 100644
@@ -94,7 +94,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2080ardb_defconfig +1 -1
index ba6f5090d471..4030fd4693bf 100644
@@ -97,7 +97,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2080ardb_nand_defconfig +1 -1
index 500029003031..b6e154b78b5c 100644
@@ -116,7 +116,7 @@ CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/ls2081ardb_defconfig +1 -1
index 58bae66baa00..fc43c535b5c4 100644
@@ -86,7 +86,7 @@ CONFIG_RTC_PCF8563=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2088aqds_tfa_defconfig +1 -1
index 9c6012460b37..09df15154e78 100644
@@ -112,7 +112,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +1 -1
index 6e1fe901ff4a..8cdfe5cc0bdc 100644
@@ -82,7 +82,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2088ardb_qspi_defconfig +1 -1
index 8441814f13f5..84c9f1526652 100644
@@ -89,7 +89,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1 -1
index dc9a47463f49..3ac03305c7a9 100644
@@ -100,7 +100,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2088ardb_tfa_defconfig +1 -1
index 361098568097..41891d83ace1 100644
@@ -108,7 +108,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/malta64_defconfig +1 -0
index 054c5e6d618e..b635c651aaea 100644
@@ -45,3 +45,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/malta64el_defconfig +1 -0
index 55f624bbeeb9..243213cb8197 100644
@@ -47,3 +47,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/malta_defconfig +1 -0
index 53762a94e2a3..ed41e298f443 100644
@@ -44,3 +44,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/maltael_defconfig +1 -0
index 8b86d74dc41a..63e5fcb6a5ce 100644
@@ -46,3 +46,4 @@ CONFIG_PCI_GT64120=y
 CONFIG_PCI_MSC01=y
 CONFIG_RTC_MC146818=y
 CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
configs/minnowmax_defconfig +1 -0
index 66f3036313c4..52ed763424a8 100644
@@ -65,6 +65,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_RTL8169=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/miqi-rk3288_defconfig +1 -0
index 0811e70dcefe..9346cafc64c6 100644
@@ -75,6 +75,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/mk808_defconfig +1 -0
index 403a84befdc3..7ba8338add5a 100644
@@ -99,6 +99,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
configs/nanopc-t4-rk3399_defconfig +1 -0
index 03fa857996ce..8fad8c643f22 100644
@@ -55,6 +55,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-m4-2gb-rk3399_defconfig +1 -0
index 67ca98563b5f..c5f13c060be4 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-m4-rk3399_defconfig +1 -0
index afa51bc8fa3b..b6a604b6943d 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-m4b-rk3399_defconfig +1 -0
index d02eb1851a7a..767befe2d2c9 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-neo4-rk3399_defconfig +1 -0
index d2d9bf91c564..383ec1f39eee 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nanopi-r2s-rk3328_defconfig +1 -0
index 82264de90889..40d3117b4f08 100644
@@ -91,6 +91,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSINFO=y
 CONFIG_SYSRESET=y
 # CONFIG_TPL_SYSRESET is not set
configs/nanopi-r4s-rk3399_defconfig +1 -0
index 2185f87d7d06..40a45a0f4bbe 100644
@@ -52,6 +52,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/nas220_defconfig +2 -1
index 9cebc704ce98..0590fc95c47c 100644
@@ -63,7 +63,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/net2big_v2_defconfig +2 -1
index c10e1a501394..b3278142c837 100644
@@ -67,7 +67,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_lite_v2_defconfig +2 -1
index 75907e05c57f..dfdb06b2378d 100644
@@ -67,7 +67,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_max_v2_defconfig +2 -1
index db08ca576339..995c0ccb1b77 100644
@@ -67,7 +67,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_mini_v2_defconfig +2 -1
index dda3b6b5f93d..877a39cfa7c2 100644
@@ -65,7 +65,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/netspace_v2_defconfig +2 -1
index 21534c59fde7..24f7d8b4bce0 100644
@@ -67,7 +67,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_KIRKWOOD_SPI=y
configs/nsa310s_defconfig +2 -1
index afa0cad0418f..e7d6ffd9259c 100644
@@ -53,7 +53,8 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_UBIFS_SILENCE_MSG=y
configs/odroid-go2_defconfig +1 -0
index 4705f61e4243..33adcc952cf0 100644
@@ -104,6 +104,7 @@ CONFIG_DM_RESET=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/omap4_panda_defconfig +1 -1
index 2c4e26c290a7..0cae1c61508e 100644
@@ -46,7 +46,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_CONS_INDEX=3
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OMAP3=y
configs/omap4_sdp4430_defconfig +1 -1
index 2315a84285ec..e15c6d5cb13a 100644
@@ -43,7 +43,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_CONS_INDEX=3
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB_GADGET=y
configs/omap5_uevm_defconfig +1 -1
index bd0ede759cb9..d12199766ad3 100644
@@ -56,7 +56,7 @@ CONFIG_PALMAS_POWER=y
 CONFIG_SCSI=y
 CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_CONS_INDEX=3
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_DWC3=y
configs/openrd_base_defconfig +2 -1
index c2e879c9bde8..45bd307a1c42 100644
@@ -61,6 +61,7 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_client_defconfig +2 -1
index 01bfaed978b9..9c9f6c463d65 100644
@@ -62,6 +62,7 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/openrd_ultimate_defconfig +2 -1
index 7c641038178f..fbcdf4b3630b 100644
@@ -62,6 +62,7 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/orangepi-rk3399_defconfig +1 -0
index 39245e8784b2..0980d8156965 100644
@@ -51,6 +51,7 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/phycore-rk3288_defconfig +1 -0
index 8a274187d093..0632a928bc0a 100644
@@ -78,6 +78,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/pinebook-pro-rk3399_defconfig +1 -0
index 528b7bb69f24..dfbf5e70f4a1 100644
@@ -80,6 +80,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/pogo_e02_defconfig +2 -1
index d0071f3af521..116e5d0ed3e7 100644
@@ -55,7 +55,8 @@ CONFIG_MTD_RAW_NAND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/pogo_v4_defconfig +2 -1
index 3b08cb7b1d14..018c2f50331f 100644
@@ -74,7 +74,8 @@ CONFIG_PCI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_EMULATION=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
configs/popmetal-rk3288_defconfig +1 -0
index f6c49da574c5..91123784b544 100644
@@ -75,6 +75,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/puma-rk3399_defconfig +1 -0
index c2b0b39c7b2c..9a5be3e91390 100644
@@ -92,6 +92,7 @@ CONFIG_DM_RESET=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_ISL1208=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/px30-core-ctouch2-of10-px30_defconfig +1 -0
index 9175c7c85ae1..9c36750bde03 100644
@@ -100,6 +100,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/px30-core-ctouch2-px30_defconfig +1 -0
index 0aa7cca7b8b6..db1ceaa31f37 100644
@@ -100,6 +100,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/px30-core-edimm2.2-px30_defconfig +1 -0
index d731b9687886..d2cca48304d3 100644
@@ -100,6 +100,7 @@ CONFIG_RNG_ROCKCHIP=y
 # CONFIG_SPECIFY_CONSOLE_INDEX is not set
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_DM_THERMAL=y
configs/qemu-x86_64_defconfig +1 -0
index 8433b5734f62..0f4811e5d7a5 100644
@@ -70,6 +70,7 @@ CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_NVME_PCI=y
 CONFIG_SPL_DM_RTC=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
configs/qemu-x86_defconfig +1 -0
index f82f628d5bb7..a8222122fc9d 100644
@@ -50,6 +50,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_NVME_PCI=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
configs/roc-cc-rk3308_defconfig +1 -0
index 670211e2e9d7..0a029c4098f7 100644
@@ -74,6 +74,7 @@ CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/roc-cc-rk3328_defconfig +1 -0
index 7f1259d82c1f..8172ed0ad228 100644
@@ -95,6 +95,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SYSRESET=y
configs/roc-pc-mezzanine-rk3399_defconfig +1 -0
index 3cdcc729f853..6827c98ed9f1 100644
@@ -71,6 +71,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/roc-pc-rk3399_defconfig +1 -0
index e03442afa462..cf4a58de1c5a 100644
@@ -68,6 +68,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/rock-pi-4-rk3399_defconfig +1 -0
index 83721cedf3dd..54a400405bec 100644
@@ -62,6 +62,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock-pi-4c-rk3399_defconfig +1 -0
index ac9a3f983066..e74ba07e4467 100644
@@ -62,6 +62,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock-pi-e-rk3328_defconfig +1 -0
index c0c1ebf34025..0ffb073f3137 100644
@@ -96,6 +96,7 @@ CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SYSRESET=y
configs/rock-pi-n10-rk3399pro_defconfig +1 -0
index fcb3a681ca00..2443f292469e 100644
@@ -63,6 +63,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock-pi-n8-rk3288_defconfig +1 -0
index 4ed98c0a511d..18c6d1b92253 100644
@@ -74,6 +74,7 @@ CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 # CONFIG_RAM_ROCKCHIP_DEBUG is not set
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
configs/rock2_defconfig +1 -0
index 38a5f3a80c0f..54d01456b1ef 100644
@@ -77,6 +77,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/rock64-rk3328_defconfig +1 -0
index e75011bee5f4..73a4f06eb9b1 100644
@@ -92,6 +92,7 @@ CONFIG_TPL_RAM=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSINFO=y
 CONFIG_SYSINFO_SMBIOS=y
configs/rock960-rk3399_defconfig +1 -0
index 6ed5ef868e5e..f2c914f41f5d 100644
@@ -65,6 +65,7 @@ CONFIG_DM_RNG=y
 CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
configs/rock_defconfig +1 -0
index bd6183ba5b8d..26638405bf73 100644
@@ -63,6 +63,7 @@ CONFIG_REGULATOR_ACT8846=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SERIAL=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
configs/rockpro64-rk3399_defconfig +1 -0
index ba48d021f4fc..5b8d678f6bb5 100644
@@ -79,6 +79,7 @@ CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
configs/sheep-rk3368_defconfig +1 -0
index 01f104a97d03..40cd91c045c1 100644
@@ -29,5 +29,6 @@ CONFIG_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
configs/sheevaplug_defconfig +2 -1
index 52f5aba8cab5..79f36c036040 100644
@@ -65,7 +65,8 @@ CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_MV=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
configs/slimbootloader_defconfig +1 -0
index b6b9f88c00bb..f5d16f64d734 100644
@@ -31,5 +31,6 @@ CONFIG_SYSCON=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 # CONFIG_PCI_PNP is not set
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_CONSOLE_SCROLL_LINES=5
 # CONFIG_GZIP is not set
configs/socfpga_agilex_atf_defconfig +1 -0
index 68440926c078..9269eccf17ab 100644
@@ -82,6 +82,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_agilex_defconfig +1 -0
index de9ebd072263..48fb06722323 100644
@@ -75,6 +75,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_agilex_vab_defconfig +1 -0
index 7642498ea9ca..da4545effff8 100644
@@ -83,6 +83,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_arria10_defconfig +1 -0
index 08ae6c502b41..4e2dc0c9857e 100644
@@ -62,6 +62,7 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
configs/socfpga_chameleonv3_defconfig +1 -0
index 478efc59ea91..00c4cf30089a 100644
@@ -29,6 +29,7 @@ CONFIG_FS_LOADER=y
 CONFIG_SPL_FS_LOADER=y
 CONFIG_MMC_DW=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_DESIGNWARE_APB_TIMER=y
configs/socfpga_n5x_atf_defconfig +1 -0
index 0feda3b04f75..4d856d535a3d 100644
@@ -81,6 +81,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_n5x_defconfig +1 -0
index fa19f555f20a..1056932cd35e 100644
@@ -72,6 +72,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_n5x_vab_defconfig +1 -0
index 12e8ebf0138f..a6714b265e18 100644
@@ -82,6 +82,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_stratix10_atf_defconfig +1 -0
index 5ee9f5ff9da7..e0e6b2d04610 100644
@@ -83,6 +83,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/socfpga_stratix10_defconfig +1 -0
index f689105695c1..919863270f83 100644
@@ -80,6 +80,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
 CONFIG_DM_RESET=y
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SPI=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
configs/som-db5800-som-6867_defconfig +1 -0
index 5d401e6c2d7e..5b724697123e 100644
@@ -60,6 +60,7 @@ CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/ten64_tfa_defconfig +1 -1
index 48b2ffc7521d..0209f62d2f56 100644
@@ -81,7 +81,7 @@ CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_RX8025=y
 CONFIG_DM_SCSI=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +1 -0
index 22544c0913aa..440c170c6b1e 100644
@@ -65,6 +65,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/theadorable-x86-conga-qa3-e3845_defconfig +1 -0
index 8741ecbb2d71..b91c3b135479 100644
@@ -64,6 +64,7 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
 CONFIG_E1000=y
+CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
configs/ti816x_evm_defconfig +1 -1
index 47dbf342776a..bab7b29bf896 100644
@@ -77,6 +77,6 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
 CONFIG_MII=y
 CONFIG_DRIVER_TI_EMAC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
 CONFIG_SPI=y
 # CONFIG_USE_PRIVATE_LIBGCC is not set
configs/tinker-rk3288_defconfig +1 -0
index 85d94a6ea89f..5976a84491e4 100644
@@ -83,6 +83,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/tinker-s-rk3288_defconfig +1 -0
index 7dfbad808383..078f829c2dff 100644
@@ -83,6 +83,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/vyasa-rk3288_defconfig +1 -0
index cbae60f98768..0c9d61b8053c 100644
@@ -83,6 +83,7 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
configs/xtfpga_defconfig +2 -1
index 31483296802c..c58514669dde 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=1027
 CONFIG_PHYLIB=y
 CONFIG_ETHOC=y
-CONFIG_SYS_NS16550=y
+CONFIG_SYS_NS16550_SERIAL=y
+CONFIG_SYS_NS16550_REG_SIZE=-4
 CONFIG_SYSRESET=y
 CONFIG_OF_LIBFDT=y
drivers/serial/Kconfig +46 -8

77 lines not on this page · raw message

drivers/serial/Makefile +1 -1
index eb7b8f23ee90..45cf94c74c61 100644
@@ -25,7 +25,7 @@ ifdef CONFIG_DM_SERIAL
 obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o
 else
 obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
-obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o
+obj-$(CONFIG_$(SPL_)SYS_NS16550_SERIAL) += serial_ns16550.o
 endif
 
 obj-$(CONFIG_ALTERA_UART) += altera_uart.o
include/configs/10m50_devboard.h +0 -1
index afd7cc89bf8e..719caf7b0c3b 100644
@@ -15,7 +15,6 @@
 /*
  * SERIAL
  */
-#define CONFIG_SYS_NS16550_MEM32
 
 /*
  * Flash
include/configs/MPC837XERDB.h +0 -2
index c4cde1cc512e..b8cbdc36754b 100644
@@ -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 \
include/configs/MPC8548CDS.h +0 -2
index b241939fc387..dba15dae749b 100644
@@ -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 \
include/configs/P1010RDB.h +0 -3
index 9afd834f9faf..fd721f30b3aa 100644
@@ -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}
include/configs/P2041RDB.h +0 -2
index b9311fc5e4f9..173f6205e08f 100644
@@ -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	\
include/configs/SBx81LIFKW.h +0 -2
index 9629d735a271..c99e6ba781a4 100644
@@ -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
 
include/configs/SBx81LIFXCAT.h +0 -2
index 67e42b94c117..8b43fe0c9939 100644
@@ -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
 
include/configs/T102xRDB.h +0 -2
index 978cc6714ec6..7cb10b205db1 100644
@@ -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	\
include/configs/T104xRDB.h +0 -2
index f26e9d6e8692..3fa2d01dcc2a 100644
@@ -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	\
include/configs/T208xQDS.h +0 -2
index 62f07108126d..c5a28fadb004 100644
@@ -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}
include/configs/T208xRDB.h +0 -2
index 0616f8a86dff..795120c02a87 100644
@@ -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}
include/configs/T4240RDB.h +0 -2
index 2eb4e73efa9e..e3cbc649fa19 100644
@@ -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	\
include/configs/am43xx_evm.h +0 -4
index a0951fbf6235..b61c8005c33f 100644
@@ -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 */
 
include/configs/ax25-ae350.h +0 -4
index cf5125fdfa63..7224bd8d1f49 100644
@@ -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 */
include/configs/axs10x.h +0 -2
index f2357b5785a1..c0429ae15c4c 100644
@@ -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
include/configs/bcmstb.h +0 -2
index 5aa720da3d74..481baff11d9a 100644
@@ -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
 
 /*
include/configs/bur_am335x_common.h +0 -2
index a6de28a42b2e..773ce3f6a6f8 100644
@@ -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
 
include/configs/chromebook_coral.h +0 -3
index 0eeea80b32f4..d14c1d445b25 100644
@@ -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 */
include/configs/cm_t43.h +0 -4
index 9061eba6686a..0641d5c0a238 100644
@@ -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
include/configs/dfi-bt700.h +0 -1
index 4297047e8ce2..52f2d50118a4 100644
@@ -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" \
include/configs/galileo.h +0 -1
index 545408a4baa5..472f236b9b6e 100644
@@ -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" \
include/configs/gardena-smart-gateway-mt7688.h +0 -2
index 965fa87c6577..0d61724db8c4 100644
@@ -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
 
include/configs/hsdk-4xd.h +0 -2
index 4af845ea9c2d..bfc0fa5c442c 100644
@@ -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
include/configs/hsdk.h +0 -2
index 0ce65e7755ea..ce3cb20732db 100644
@@ -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
include/configs/km/pg-wcom-ls102xa.h +0 -1
index cc8c37ec0bf5..7acdb0fa038e 100644
@@ -148,7 +148,6 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		get_serial_clock()
 
 /*
include/configs/kmcent2.h +0 -2
index 16fd6d562d41..30ba6065253e 100644
@@ -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
include/configs/legoev3.h +0 -1
index f0ae9248af34..5434c4f7679f 100644
@@ -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)
include/configs/linkit-smart-7688.h +0 -2
index 9eedd47c07e5..b9c853d7dfef 100644
@@ -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
include/configs/ls1012a_common.h +0 -2
index 77f84e1c9eaa..148598fab465 100644
@@ -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
include/configs/ls1021aiot.h +0 -2
index 885774f63d47..3f2dfa640c9c 100644
@@ -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()
 
 /*
include/configs/ls1021aqds.h +0 -4
index 6b23134ecc99..bd2f74c1262a 100644
@@ -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
 
include/configs/ls1021atsn.h +0 -4
index fce91192dff7..8c43f652ab65 100644
@@ -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 */
include/configs/ls1021atwr.h +0 -4
index 1ac59a2d4597..06830f401a31 100644
@@ -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
 
include/configs/ls1028a_common.h +0 -2
index 43dbeea1b3bd..7dd5649005b7 100644
@@ -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 */
include/configs/ls1043a_common.h +0 -2
index 47367845a07f..2fc06c1dd2dc 100644
@@ -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 */
include/configs/ls1046a_common.h +0 -2
index 07ec2c956379..40b4cb964d11 100644
@@ -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 */
include/configs/ls1088a_common.h +0 -2
index dec661d6b194..5668e07d1354 100644
@@ -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)
 
 /*
include/configs/ls2080a_common.h +0 -2
index d8997208e973..895c566fea2f 100644
@@ -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())
 
 /*
include/configs/malta.h +0 -1
index 30c2e41eec53..2dd34ea7313c 100644
@@ -33,7 +33,6 @@
 /*
  * Serial driver
  */
-#define CONFIG_SYS_NS16550_PORT_MAPPED
 
 /*
  * Flash configuration
include/configs/mt7621.h +0 -2
index 9b1ba3655e82..1f733d112dd7 100644
@@ -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
 
include/configs/mt7628.h +0 -2
index 43527017d84a..da16e3b21a4b 100644
@@ -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
 
include/configs/mt8183.h +0 -3
index c93d70ddf1a6..eaffe0bf4c95 100644
@@ -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
 
include/configs/mt8516.h +0 -3
index 7228f3e42884..347598868bb5 100644
@@ -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
 
include/configs/mv-common.h +0 -2
index 6d4fff3820c1..4f1067c23bbc 100644
@@ -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
 
include/configs/nokia_rx51.h +0 -1
index 99a020c3c71d..310bdde7cb55 100644
@@ -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
 
 /*
include/configs/p1_p2_rdb_pc.h +0 -3
index 838c62c67111..065820689caf 100644
@@ -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}
include/configs/px30_common.h +0 -2
index 49d1878ebdd7..8b151ef18836 100644
@@ -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
 
include/configs/rk3308_common.h +0 -2
index 200b34b35bae..263d1bd180c5 100644
@@ -8,8 +8,6 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_NS16550_MEM32
-
 #define CONFIG_IRAM_BASE		0xfff80000
 
 #define CONFIG_SYS_SDRAM_BASE		0
include/configs/rockchip-common.h +0 -2
index 4c964cc37708..1f6b82f2d022 100644
@@ -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
include/configs/siemens-am33x-common.h +0 -1
index d071f590f106..5765f2ccb5e7 100644
@@ -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
include/configs/sniper.h +0 -5
index 0187fca5f0d9..c29bc448eed6 100644
@@ -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
 
include/configs/socfpga_arria10_socdk.h +0 -1
index f712928d3c86..49883ea7a3cc 100644
@@ -18,7 +18,6 @@
 /*
  * Serial / UART configurations
  */
-#define CONFIG_SYS_NS16550_MEM32
 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
 /*
include/configs/socfpga_chameleonv3.h +0 -1
index 75d2081fac88..7012097276c7 100644
@@ -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 \
include/configs/socfpga_soc64_common.h +0 -1
index 86cc3771ba59..029f898b64ff 100644
@@ -76,7 +76,6 @@
  * Serial / UART configurations
  */
 #define CONFIG_SYS_NS16550_CLK		100000000
-#define CONFIG_SYS_NS16550_MEM32
 
 /*
  * SDMMC configurations
include/configs/sunxi-common.h +0 -2
index d9e4c8b699f4..1ed0a262bc61 100644
@@ -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
include/configs/tb100.h +0 -1
index 16bdc39b750e..38a43b726f03 100644
@@ -19,7 +19,6 @@
 /*
  * UART configuration
  */
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK		166666666
 
 /*
include/configs/theadorable-x86-dfi-bt700.h +0 -1
index bb3186e21921..663a49e7b6c5 100644
@@ -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"
include/configs/ti814x_evm.h +0 -2
index 97166e010f7d..60632c58c67d 100644
@@ -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 */
 
include/configs/ti816x_evm.h +0 -2
index efd3a0db04eb..f2dbe3544a5d 100644
@@ -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 */
 
include/configs/ti_am335x_common.h +0 -6
index 5d5df6b10191..fb017771688e 100644
@@ -17,12 +17,6 @@
 #include <asm/arch/omap.h>
 
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

include/configs/ti_armv7_keystone2.h +0 -1
index a4a45fad9dc8..aaeea77281b6 100644

Lines of this file are not shown. View the raw message.

include/configs/ti_omap3_common.h +0 -4
index 6cc443c8e9cb..80d2a011f0fe 100644

Lines of this file are not shown. View the raw message.

include/configs/ti_omap4_common.h +0 -2
index 0568946fc824..eb930341c3a8 100644

Lines of this file are not shown. View the raw message.

include/configs/ti_omap5_common.h +0 -4
index 24bbf9e7c2c6..a1efb57f1b09 100644

Lines of this file are not shown. View the raw message.

include/configs/vocore2.h +0 -2
index 6f36d6964b9b..84e5ba39f148 100644

Lines of this file are not shown. View the raw message.

include/configs/x530.h +0 -2
index 0add626e81a5..318e3680a6e1 100644

Lines of this file are not shown. View the raw message.

include/configs/x86-common.h +0 -1
index 8e22d6e5d876..f76c1f8be0fd 100644

Lines of this file are not shown. View the raw message.

include/configs/xtfpga.h +0 -2
index 58d01f4bb428..7090fcef6804 100644

Lines of this file are not shown. View the raw message.

include/ns16550.h +1 -1
index 3d9002d9f151..0ee5c4d6de75 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#6 lore raw

[BUG] Re: [PATCHv2 03/17] Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

Quoted 11 lines · Tom Rini

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.

Since this patch (which was with branch next after v2023.01) there is no UART output from main U-Boot on pinea64-lts_defconfig. SPL output is ok.

Best regards

Heinrich

#7 lore raw

Re: [BUG] Re: [PATCHv2 03/17] Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

On Fri, 20 Jan 2023 17:09:01 +0100
Heinrich Schuchardt <[email protected]> wrote:

Hi Heinrich,

Quoted 8 lines · Tom Rini
Quoted 7 lines

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
Quoted 8 lines
Quoted 4 lines

To do this we also introduce CONFIG_SPL_SYS_NS16550_SERIAL so that platforms can enable the legacy driver here for SPL.

Since this patch (which was with branch next after v2023.01) there is no UART output from main U-Boot on pinea64-lts_defconfig. SPL output is ok.

Indeed, see this thread:
https://lore.kernel.org/u-boot/[email protected]/

I believe Tom is about to queue the proper fix?

Thanks for the report!

Cheers,
Andre

#8 lore raw

Re: [BUG] Re: [PATCHv2 03/17] Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

Quoted 16 lines · On Fri, 20 Jan 2023 16:24:36 +0000 Andre Przywara <[email protected]>…

On Fri, 20 Jan 2023 17:09:01 +0100
Heinrich Schuchardt <[email protected]> wrote:

Hi Heinrich,

Quoted 11 lines · Tom Rini
Quoted 10 lines

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.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Since this patch (which was with branch next after v2023.01) there is no UART output from main U-Boot on pinea64-lts_defconfig. SPL output is ok.

Indeed, see this thread:
https://lore.kernel.org/u-boot/[email protected]/

I am just seeing that the eventual patch is not in this thread, but here:
https://lore.kernel.org/u-boot/[email protected]/

Cheers,
Andre

author
#9 lore raw

Re: [BUG] Re: [PATCHv2 03/17] Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

Quoted 22 lines · Andre Przywara
Quoted 19 lines · On Fri, 20 Jan 2023 16:24:36 +0000 Andre Przywara <[email protected]>…

On Fri, 20 Jan 2023 17:09:01 +0100
Heinrich Schuchardt <[email protected]> wrote:

Hi Heinrich,

Quoted 14 lines · Tom Rini
Quoted 11 lines

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.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Since this patch (which was with branch next after v2023.01) there is no UART output from main U-Boot on pinea64-lts_defconfig. SPL output is ok.

Indeed, see this thread:
https://lore.kernel.org/u-boot/[email protected]/

I am just seeing that the eventual patch is not in this thread, but here:
https://lore.kernel.org/u-boot/[email protected]/

Yes, and I'll go and bring that whole series in today. I wanted to have it out a bit longer in case there was yet another problem with the conversion that still wasn't fixed.

Signature · 1 line
Tom
author
#10 lore raw

PATCH 4/17 global: Move remaining CONFIG_SYS_NS16550_* to CFG_SYS_NS16550_*

In reply to Tom Rini

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.

---
 arch/arm/cpu/armv7/ls102xa/fdt.c              |  2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c       |  2 +-
 arch/arm/include/asm/arch-bcmcygnus/configs.h |  6 +-
 arch/arm/include/asm/arch-bcmnsp/configs.h    |  4 +-
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  8 +--
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  4 +-
 arch/arm/include/asm/arch-lpc32xx/config.h    |  4 +-
 arch/arm/include/asm/arch-ls102xa/config.h    |  4 +-
 arch/arm/mach-davinci/da850_lowlevel.c        |  6 +-
 arch/arm/mach-davinci/spl.c                   |  4 +-
 arch/arm/mach-keystone/init.c                 |  4 +-
 arch/arm/mach-lpc32xx/devices.c               |  8 +--
 arch/arm/mach-omap2/am33xx/board.c            | 32 +++++-----
 arch/arm/mach-tegra/board.c                   |  4 +-
 arch/powerpc/cpu/mpc85xx/fdt.c                | 12 ++--
 arch/powerpc/include/asm/config.h             |  2 +-
 board/Synology/ds109/ds109.c                  | 10 +--
 board/eets/pdu001/mux.c                       | 12 ++--
 board/emulation/qemu-ppce500/qemu-ppce500.c   |  2 +-
 board/freescale/p1010rdb/p1010rdb.c           |  2 +-
 board/freescale/p1010rdb/spl.c                |  2 +-
 board/freescale/p1010rdb/spl_minimal.c        |  6 +-
 board/freescale/p1_p2_rdb_pc/spl.c            |  2 +-
 board/freescale/p1_p2_rdb_pc/spl_minimal.c    |  6 +-
 board/freescale/t102xrdb/spl.c                |  2 +-
 board/freescale/t104xrdb/spl.c                |  2 +-
 board/freescale/t208xqds/spl.c                |  2 +-
 board/freescale/t208xrdb/spl.c                |  2 +-
 board/freescale/t4rdb/spl.c                   |  2 +-
 board/nokia/rx51/rx51.c                       |  4 +-
 drivers/serial/Kconfig                        |  2 +-
 drivers/serial/ns16550.c                      |  8 +--
 drivers/serial/serial_mtk.c                   | 40 ++++++------
 drivers/serial/serial_ns16550.c               | 64 +++++++++----------
 drivers/serial/serial_omap.c                  |  6 +-
 include/configs/MPC837XERDB.h                 |  6 +-
 include/configs/MPC8548CDS.h                  |  6 +-
 include/configs/P1010RDB.h                    |  6 +-
 include/configs/P2041RDB.h                    | 10 +--
 include/configs/SBx81LIFKW.h                  |  4 +-
 include/configs/SBx81LIFXCAT.h                |  4 +-
 include/configs/T102xRDB.h                    | 10 +--
 include/configs/T104xRDB.h                    | 10 +--
 include/configs/T208xQDS.h                    | 10 +--
 include/configs/T208xRDB.h                    | 10 +--
 include/configs/T4240RDB.h                    | 10 +--
 include/configs/am335x_evm.h                  | 12 ++--
 include/configs/am335x_guardian.h             | 12 ++--
 include/configs/am335x_igep003x.h             |  2 +-
 include/configs/am335x_shc.h                  | 12 ++--
 include/configs/am335x_sl50.h                 | 12 ++--
 include/configs/am43xx_evm.h                  |  4 +-
 include/configs/am57xx_evm.h                  |  6 +-
 include/configs/ap143.h                       |  2 +-
 include/configs/ap152.h                       |  2 +-
 include/configs/apalis-tk1.h                  |  2 +-
 include/configs/apalis_t30.h                  |  2 +-
 include/configs/ax25-ae350.h                  |  2 +-
 include/configs/axs10x.h                      |  2 +-
 include/configs/baltos.h                      | 12 ++--
 include/configs/bcm7260.h                     |  2 +-
 include/configs/bcm7445.h                     |  2 +-
 include/configs/bcm_ns3.h                     |  2 +-
 include/configs/bcmstb.h                      |  2 +-
 include/configs/beaver.h                      |  2 +-
 include/configs/bur_am335x_common.h           |  4 +-
 include/configs/cardhu.h                      |  2 +-
 include/configs/cei-tk1-som.h                 |  2 +-
 include/configs/chiliboard.h                  | 12 ++--
 include/configs/ci20.h                        |  2 +-
 include/configs/cm_t43.h                      |  4 +-
 include/configs/colibri_t20.h                 |  2 +-
 include/configs/colibri_t30.h                 |  2 +-
 include/configs/da850evm.h                    |  2 +-
 include/configs/dalmore.h                     |  2 +-
 include/configs/dra7xx_evm.h                  |  6 +-
 .../configs/gardena-smart-gateway-mt7688.h    |  4 +-
 include/configs/harmony.h                     |  4 +-
 include/configs/hsdk-4xd.h                    |  2 +-
 include/configs/hsdk.h                        |  2 +-
 include/configs/jetson-tk1.h                  |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  2 +-
 include/configs/kmcent2.h                     |  4 +-
 include/configs/kontron_sl28.h                |  2 +-
 include/configs/legoev3.h                     |  2 +-
 include/configs/linkit-smart-7688.h           |  4 +-
 include/configs/ls1012a_common.h              |  2 +-
 include/configs/ls1021aiot.h                  |  2 +-
 include/configs/ls1021aqds.h                  |  2 +-
 include/configs/ls1021atsn.h                  |  2 +-
 include/configs/ls1021atwr.h                  |  2 +-
 include/configs/ls1028a_common.h              |  2 +-
 include/configs/ls1043a_common.h              |  2 +-
 include/configs/ls1046a_common.h              |  2 +-
 include/configs/ls1088a_common.h              |  2 +-
 include/configs/ls2080a_common.h              |  2 +-
 include/configs/medcom-wide.h                 |  2 +-
 include/configs/mt7621.h                      |  4 +-
 include/configs/mt7628.h                      |  4 +-
 include/configs/mt8183.h                      |  4 +-
 include/configs/mt8516.h                      |  4 +-
 include/configs/mv-common.h                   |  4 +-
 include/configs/nokia_rx51.h                  |  4 +-
 include/configs/nyan-big.h                    |  2 +-
 include/configs/omap5_uevm.h                  |  2 +-
 include/configs/omapl138_lcdk.h               |  2 +-
 include/configs/p1_p2_rdb_pc.h                |  6 +-
 include/configs/paz00.h                       |  2 +-
 include/configs/pdu001.h                      | 12 ++--
 include/configs/plutux.h                      |  2 +-
 include/configs/seaboard.h                    |  2 +-
 include/configs/siemens-am33x-common.h        |  6 +-
 include/configs/sniper.h                      |  4 +-
 include/configs/socfpga_soc64_common.h        |  2 +-
 include/configs/sunxi-common.h                | 14 ++--
 include/configs/tb100.h                       |  2 +-
 include/configs/tec-ng.h                      |  2 +-
 include/configs/tec.h                         |  2 +-
 include/configs/tegra-common.h                |  2 +-
 include/configs/ti814x_evm.h                  |  4 +-
 include/configs/ti816x_evm.h                  |  4 +-
 include/configs/ti_am335x_common.h            |  2 +-
 include/configs/ti_armv7_keystone2.h          |  8 +--
 include/configs/ti_omap3_common.h             |  8 +--
 include/configs/ti_omap4_common.h             |  4 +-
 include/configs/ti_omap5_common.h             |  2 +-
 include/configs/tplink_wdr4300.h              |  2 +-
 include/configs/trimslice.h                   |  2 +-
 include/configs/vcoreiii.h                    |  2 +-
 include/configs/venice2.h                     |  2 +-
 include/configs/ventana.h                     |  2 +-
 include/configs/vocore2.h                     |  4 +-
 include/configs/x530.h                        |  4 +-
 include/configs/xtfpga.h                      |  4 +-
 134 files changed, 347 insertions(+), 347 deletions(-)
arch/arm/cpu/armv7/ls102xa/fdt.c +1 -1
index c01cebbf9859..0e7d5fa06dc6 100644
@@ -125,7 +125,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
 #ifdef CONFIG_SYS_NS16550
 	do_fixup_by_compat_u32(blob, "fsl,16550-FIFO64",
-			       "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
+			       "clock-frequency", CFG_SYS_NS16550_CLK, 1);
 #endif
 
 	sysclk_path = fdt_get_alias(blob, "sysclk");
arch/arm/cpu/armv8/fsl-layerscape/fdt.c +1 -1
index ee734577fca7..4f91db49eebf 100644
@@ -646,7 +646,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
 #ifdef CONFIG_SYS_NS16550
 	do_fixup_by_compat_u32(blob, "fsl,ns16550",
-			       "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
+			       "clock-frequency", CFG_SYS_NS16550_CLK, 1);
 #endif
 
 	do_fixup_by_path_u32(blob, "/sysclk", "clock-frequency",
arch/arm/include/asm/arch-bcmcygnus/configs.h +3 -3
index 0c7262352d53..fd8dad394ad8 100644
@@ -11,8 +11,8 @@
 /* uArchitecture specifics */
 
 /* Serial Info */
-#define CONFIG_SYS_NS16550_CLK		100000000
-#define CONFIG_SYS_NS16550_CLK_DIV	54
-#define CONFIG_SYS_NS16550_COM3		0x18023000
+#define CFG_SYS_NS16550_CLK		100000000
+#define CFG_SYS_NS16550_CLK_DIV	54
+#define CFG_SYS_NS16550_COM3		0x18023000
 
 #endif /* __ARCH_CONFIGS_H */
arch/arm/include/asm/arch-bcmnsp/configs.h +2 -2
index 44699476b08b..0d4baf3c0074 100644
@@ -11,7 +11,7 @@
 /* uArchitecture specifics */
 
 /* Serial Info */
-#define CONFIG_SYS_NS16550_CLK		0x03b9aca0
-#define CONFIG_SYS_NS16550_COM1		0x18000300
+#define CFG_SYS_NS16550_CLK		0x03b9aca0
+#define CFG_SYS_NS16550_COM1		0x18000300
 
 #endif /* __ARCH_CONFIGS_H */
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +4 -4
index e8bd8d27136c..aef615873343 100644
@@ -26,10 +26,10 @@
 #define CFG_SYS_FSL_QMAN_ADDR		(CONFIG_SYS_IMMR + 0x00880000)
 #define CFG_SYS_FSL_SERDES_ADDR		(CONFIG_SYS_IMMR + 0x00ea0000)
 #define CFG_SYS_FSL_CLK_ADDR			(CONFIG_SYS_IMMR + 0x00ee1000)
-#define CONFIG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011c0500)
-#define CONFIG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011c0600)
-#define CONFIG_SYS_NS16550_COM3			(CONFIG_SYS_IMMR + 0x011d0500)
-#define CONFIG_SYS_NS16550_COM4			(CONFIG_SYS_IMMR + 0x011d0600)
+#define CFG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011c0500)
+#define CFG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011c0600)
+#define CFG_SYS_NS16550_COM3			(CONFIG_SYS_IMMR + 0x011d0500)
+#define CFG_SYS_NS16550_COM4			(CONFIG_SYS_IMMR + 0x011d0600)
 #define CONFIG_SYS_XHCI_USB1_ADDR		(CONFIG_SYS_IMMR + 0x01f00000)
 #define CONFIG_SYS_XHCI_USB2_ADDR		(CONFIG_SYS_IMMR + 0x02000000)
 #define CONFIG_SYS_XHCI_USB3_ADDR		(CONFIG_SYS_IMMR + 0x02100000)
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +2 -2
index f1ffb2327d63..bad18d778aa0 100644
@@ -35,8 +35,8 @@
 #ifndef CONFIG_NXP_LSCH3_2
 #define CONFIG_SYS_IFC_ADDR			(CONFIG_SYS_IMMR + 0x01240000)
 #endif
-#define CONFIG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011C0500)
-#define CONFIG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011C0600)
+#define CFG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011C0500)
+#define CFG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011C0600)
 #define SYS_FSL_LS2080A_LS2085A_TIMER_ADDR	0x023d0000
 #define CFG_SYS_FSL_TIMER_ADDR		0x023e0000
 #define CFG_SYS_FSL_PMU_CLTBENR		(CFG_SYS_FSL_PMU_ADDR + \
arch/arm/include/asm/arch-lpc32xx/config.h +2 -2
index 5dd90b47f939..6de431f6bbbc 100644
@@ -19,8 +19,8 @@
 #endif
 #endif
 
-#if !defined(CONFIG_SYS_NS16550_CLK)
-#define CONFIG_SYS_NS16550_CLK		13000000
+#if !defined(CFG_SYS_NS16550_CLK)
+#define CFG_SYS_NS16550_CLK		13000000
 #endif
 
 #define CONFIG_SYS_BAUDRATE_TABLE	\
arch/arm/include/asm/arch-ls102xa/config.h +2 -2
index e85918eb7ec5..033341dbfb63 100644
@@ -30,8 +30,8 @@
 #define CFG_SYS_FSL_GUTS_ADDR		(CONFIG_SYS_IMMR + 0x00ee0000)
 #define CFG_SYS_FSL_LS1_CLK_ADDR		(CONFIG_SYS_IMMR + 0x00ee1000)
 #define CFG_SYS_FSL_RCPM_ADDR		(CONFIG_SYS_IMMR + 0x00ee2000)
-#define CONFIG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011c0500)
-#define CONFIG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011d0500)
+#define CFG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011c0500)
+#define CFG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011d0500)
 #define CONFIG_SYS_XHCI_USB1_ADDR		(CONFIG_SYS_IMMR + 0x02100000)
 
 #define CFG_SYS_FSL_SEC_OFFSET		0x00700000
arch/arm/mach-davinci/da850_lowlevel.c +3 -3
index 759c93747c75..2319ac6d5631 100644
@@ -290,8 +290,8 @@ int arch_cpu_init(void)
 	board_gpio_init();
 
 #if !CONFIG_IS_ENABLED(DM_SERIAL)
-	ns16550_init((struct ns16550 *)(CONFIG_SYS_NS16550_COM1),
-		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
+	ns16550_init((struct ns16550 *)(CFG_SYS_NS16550_COM1),
+		     CFG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
 #endif
 	/*
 	 * Fix Power and Emulation Management Register
@@ -299,7 +299,7 @@ int arch_cpu_init(void)
 	 */
 	writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST |
 		DAVINCI_UART_PWREMU_MGMT_UTRST),
-#if (CONFIG_SYS_NS16550_COM1 == DAVINCI_UART0_BASE)
+#if (CFG_SYS_NS16550_COM1 == DAVINCI_UART0_BASE)
 	       &davinci_uart0_ctrl_regs->pwremu_mgmt);
 #else
 	       &davinci_uart2_ctrl_regs->pwremu_mgmt);
arch/arm/mach-davinci/spl.c +2 -2
index 54aff78894a5..5f5b9ebbf97a 100644
@@ -27,9 +27,9 @@ void puts(const char *str)
 void putc(char c)
 {
 	if (c == '\n')
-		ns16550_putc((struct ns16550 *)(CONFIG_SYS_NS16550_COM1), '\r');
+		ns16550_putc((struct ns16550 *)(CFG_SYS_NS16550_COM1), '\r');
 
-	ns16550_putc((struct ns16550 *)(CONFIG_SYS_NS16550_COM1), c);
+	ns16550_putc((struct ns16550 *)(CFG_SYS_NS16550_COM1), c);
 }
 #endif /* CONFIG_SPL_LIBCOMMON_SUPPORT */
 
arch/arm/mach-keystone/init.c +2 -2
index 5b95f6050019..1954e69e9f0d 100644
@@ -185,8 +185,8 @@ int arch_cpu_init(void)
 	 * driver doesn't handle this.
 	 */
 #ifndef CONFIG_DM_SERIAL
-	ns16550_init((struct ns16550 *)(CONFIG_SYS_NS16550_COM2),
-		     CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
+	ns16550_init((struct ns16550 *)(CFG_SYS_NS16550_COM2),
+		     CFG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
 #endif
 
 	return 0;
arch/arm/mach-lpc32xx/devices.c +4 -4
index 0a4fef295a36..3fcf8facb411 100644
@@ -44,13 +44,13 @@ void lpc32xx_uart_init(unsigned int uart_id)
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 static const struct ns16550_plat lpc32xx_uart[] = {
 	{ .base = UART3_BASE, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 	{ .base = UART4_BASE, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 	{ .base = UART5_BASE, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 	{ .base = UART6_BASE, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 };
 
 #if defined(CONFIG_LPC32XX_HSUART)
arch/arm/mach-omap2/am33xx/board.c +16 -16
index f393ff91441f..44d5214a3df1 100644
@@ -87,29 +87,29 @@ int dram_init_banksize(void)
 
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 static const struct ns16550_plat am33xx_serial[] = {
-	{ .base = CONFIG_SYS_NS16550_COM1, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-# ifdef CONFIG_SYS_NS16550_COM2
-	{ .base = CONFIG_SYS_NS16550_COM2, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-#  ifdef CONFIG_SYS_NS16550_COM3
-	{ .base = CONFIG_SYS_NS16550_COM3, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-	{ .base = CONFIG_SYS_NS16550_COM4, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-	{ .base = CONFIG_SYS_NS16550_COM5, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
-	{ .base = CONFIG_SYS_NS16550_COM6, .reg_shift = 2,
-	  .clock = CONFIG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	{ .base = CFG_SYS_NS16550_COM1, .reg_shift = 2,
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+# ifdef CFG_SYS_NS16550_COM2
+	{ .base = CFG_SYS_NS16550_COM2, .reg_shift = 2,
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+#  ifdef CFG_SYS_NS16550_COM3
+	{ .base = CFG_SYS_NS16550_COM3, .reg_shift = 2,
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	{ .base = CFG_SYS_NS16550_COM4, .reg_shift = 2,
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	{ .base = CFG_SYS_NS16550_COM5, .reg_shift = 2,
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
+	{ .base = CFG_SYS_NS16550_COM6, .reg_shift = 2,
+	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 #  endif
 # endif
 };
 
 U_BOOT_DRVINFOS(am33xx_uarts) = {
 	{ "ns16550_serial", &am33xx_serial[0] },
-#  ifdef CONFIG_SYS_NS16550_COM2
+#  ifdef CFG_SYS_NS16550_COM2
 	{ "ns16550_serial", &am33xx_serial[1] },
-#   ifdef CONFIG_SYS_NS16550_COM3
+#   ifdef CFG_SYS_NS16550_COM3
 	{ "ns16550_serial", &am33xx_serial[2] },
 	{ "ns16550_serial", &am33xx_serial[3] },
 	{ "ns16550_serial", &am33xx_serial[4] },
arch/arm/mach-tegra/board.c +2 -2
index 95d6555a0d25..f8b61a2b3e3b 100644
@@ -259,9 +259,9 @@ void board_init_uart_f(void)
 
 #if !CONFIG_IS_ENABLED(OF_CONTROL)
 static struct ns16550_plat ns16550_com1_pdata = {
-	.base = CONFIG_SYS_NS16550_COM1,
+	.base = CFG_SYS_NS16550_COM1,
 	.reg_shift = 2,
-	.clock = CONFIG_SYS_NS16550_CLK,
+	.clock = CFG_SYS_NS16550_CLK,
 	.fcr = UART_FCR_DEFVAL,
 };
 
arch/powerpc/cpu/mpc85xx/fdt.c +6 -6
index 1161938d304f..6dd61caf1c47 100644
@@ -649,7 +649,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
 #ifdef CONFIG_SYS_NS16550
 	do_fixup_by_compat_u32(blob, "ns16550",
-		"clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
+		"clock-frequency", CFG_SYS_NS16550_CLK, 1);
 #endif
 
 #ifdef CONFIG_FSL_CORENET
@@ -751,7 +751,7 @@ static void msg(const char *name, uint64_t uaddr, uint64_t daddr)
  * This function compares several CONFIG_xxx macros that contain physical
  * addresses with the corresponding nodes in the device tree, to see if
  * the physical addresses are all correct.  For example, if
- * CONFIG_SYS_NS16550_COM1 is defined, then it contains the virtual address
+ * CFG_SYS_NS16550_COM1 is defined, then it contains the virtual address
  * of the first UART.  We convert this to a physical address and compare
  * that with the physical address of the first ns16550-compatible node
  * in the device tree.  If they don't match, then we display a warning.
@@ -796,15 +796,15 @@ int ft_verify_fdt(void *fdt)
 	 */
 	aliases = fdt_path_offset(fdt, "/aliases");
 	if (aliases > 0) {
-#ifdef CONFIG_SYS_NS16550_COM1
+#ifdef CFG_SYS_NS16550_COM1
 		if (!fdt_verify_alias_address(fdt, aliases, "serial0",
-			CCSR_VIRT_TO_PHYS(CONFIG_SYS_NS16550_COM1)))
+			CCSR_VIRT_TO_PHYS(CFG_SYS_NS16550_COM1)))
 			return 0;
 #endif
 
-#ifdef CONFIG_SYS_NS16550_COM2
+#ifdef CFG_SYS_NS16550_COM2
 		if (!fdt_verify_alias_address(fdt, aliases, "serial1",
-			CCSR_VIRT_TO_PHYS(CONFIG_SYS_NS16550_COM2)))
+			CCSR_VIRT_TO_PHYS(CFG_SYS_NS16550_COM2)))
 			return 0;
 #endif
 	}
arch/powerpc/include/asm/config.h +1 -1
index 79fe567b5875..b0ad7d7aa728 100644
@@ -52,7 +52,7 @@
  * TODO: Convert this to a clock driver exists that can give us the UART
  * clock here.
  */
-#define CONFIG_SYS_NS16550_CLK		get_serial_clock()
+#define CFG_SYS_NS16550_CLK		get_serial_clock()
 #endif
 
 #endif /* _ASM_CONFIG_H_ */
board/Synology/ds109/ds109.c +5 -5
index 9e7f6ac6c792..5c3f46e23f46 100644
@@ -101,17 +101,17 @@ int board_init(void)
 #include <ns16550.h>
 #define SOFTWARE_SHUTDOWN   0x31
 #define SOFTWARE_REBOOT     0x43
-#define CONFIG_SYS_NS16550_COM2		KW_UART1_BASE
+#define CFG_SYS_NS16550_COM2		KW_UART1_BASE
 void reset_misc(void)
 {
 	int b_d;
 	printf("Synology reset...");
 	udelay(50000);
 
-	b_d = ns16550_calc_divisor((struct ns16550 *)CONFIG_SYS_NS16550_COM2,
-				   CONFIG_SYS_NS16550_CLK, 9600);
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM2, b_d);
-	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM2,
+	b_d = ns16550_calc_divisor((struct ns16550 *)CFG_SYS_NS16550_COM2,
+				   CFG_SYS_NS16550_CLK, 9600);
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM2, b_d);
+	ns16550_putc((struct ns16550 *)CFG_SYS_NS16550_COM2,
 		     SOFTWARE_REBOOT);
 }
 
board/eets/pdu001/mux.c +6 -6
index f0f9e262ebdb..886fef60b0af 100644
@@ -92,22 +92,22 @@ void enable_uart5_pin_mux(void)
 void enable_uart_pin_mux(u32 addr)
 {
 	switch (addr) {
-	case CONFIG_SYS_NS16550_COM1:
+	case CFG_SYS_NS16550_COM1:
 		enable_uart0_pin_mux();
 		break;
-	case CONFIG_SYS_NS16550_COM2:
+	case CFG_SYS_NS16550_COM2:
 		enable_uart1_pin_mux();
 		break;
-	case CONFIG_SYS_NS16550_COM3:
+	case CFG_SYS_NS16550_COM3:
 		enable_uart2_pin_mux();
 		break;
-	case CONFIG_SYS_NS16550_COM4:
+	case CFG_SYS_NS16550_COM4:
 		enable_uart3_pin_mux();
 		break;
-	case CONFIG_SYS_NS16550_COM5:
+	case CFG_SYS_NS16550_COM5:
 		enable_uart4_pin_mux();
 		break;
-	case CONFIG_SYS_NS16550_COM6:
+	case CFG_SYS_NS16550_COM6:
 		enable_uart5_pin_mux();
 		break;
 	}
board/emulation/qemu-ppce500/qemu-ppce500.c +1 -1
index 99edaa3b4215..a4254250bbf3 100644
@@ -343,7 +343,7 @@ void *board_fdt_blob_setup(int *err)
 	return get_fdt_virt();
 }
 
-/* See CONFIG_SYS_NS16550_CLK in arch/powerpc/include/asm/config.h */
+/* See CFG_SYS_NS16550_CLK in arch/powerpc/include/asm/config.h */
 int get_serial_clock(void)
 {
 	return get_bus_freq(0);
board/freescale/p1010rdb/p1010rdb.c +1 -1
index c39df462e3bb..ab3b2e3e69b5 100644
@@ -587,7 +587,7 @@ void fdt_disable_uart1(void *blob)
 	int nodeoff;
 
 	nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,ns16550",
-					CONFIG_SYS_NS16550_COM2);
+					CFG_SYS_NS16550_COM2);
 
 	if (nodeoff > 0) {
 		fdt_status_disabled(blob, nodeoff);
board/freescale/p1010rdb/spl.c +1 -1
index 0db11f4c5f79..9bf948cb5c96 100644
@@ -45,7 +45,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio >>= 1;
 	gd->bus_clk = get_board_sys_clk() * plat_ratio;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
 
 #ifdef CONFIG_SPL_MMC_BOOT
board/freescale/p1010rdb/spl_minimal.c +3 -3
index 9cd46c966410..8f0dec4c0ab7 100644
@@ -32,7 +32,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio >>= 1;
 	gd->bus_clk = get_board_sys_clk() * plat_ratio;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
 
 	puts("\nNAND boot... ");
@@ -54,9 +54,9 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 void putc(char c)
 {
 	if (c == '\n')
-		ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
+		ns16550_putc((struct ns16550 *)CFG_SYS_NS16550_COM1, '\r');
 
-	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
+	ns16550_putc((struct ns16550 *)CFG_SYS_NS16550_COM1, c);
 }
 
 void puts(const char *str)
board/freescale/p1_p2_rdb_pc/spl.c +1 -1
index e7d4428d7c22..6c3f82849e3a 100644
@@ -57,7 +57,7 @@ void board_init_f(ulong bootflag)
 	bus_clk = get_board_sys_clk() * plat_ratio;
 	gd->bus_clk = bus_clk;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     bus_clk / 16 / CONFIG_BAUDRATE);
 #ifdef CONFIG_SPL_MMC_BOOT
 	puts("\nSD boot...\n");
board/freescale/p1_p2_rdb_pc/spl_minimal.c +3 -3
index 2fd8a2874333..f9e0b5b25ab7 100644
@@ -31,7 +31,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio >>= 1;
 	gd->bus_clk = get_board_sys_clk() * plat_ratio;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     gd->bus_clk / 16 / CONFIG_BAUDRATE);
 
 	puts("\nNAND boot... ");
@@ -52,9 +52,9 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 void putc(char c)
 {
 	if (c == '\n')
-		ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, '\r');
+		ns16550_putc((struct ns16550 *)CFG_SYS_NS16550_COM1, '\r');
 
-	ns16550_putc((struct ns16550 *)CONFIG_SYS_NS16550_COM1, c);
+	ns16550_putc((struct ns16550 *)CFG_SYS_NS16550_COM1, c);
 }
 
 void puts(const char *str)
board/freescale/t102xrdb/spl.c +1 -1
index 3ba94fecaa24..9faf259af74d 100644
@@ -73,7 +73,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
 	ccb_clk = sys_clk * plat_ratio / 2;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     ccb_clk / 16 / CONFIG_BAUDRATE);
 
 #if defined(CONFIG_SPL_MMC_BOOT)
board/freescale/t104xrdb/spl.c +1 -1
index c7fb4272c63b..66a142b3ad03 100644
@@ -72,7 +72,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
 	uart_clk = sys_clk * plat_ratio / 2;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     uart_clk / 16 / CONFIG_BAUDRATE);
 
 	relocate_code(CONFIG_SPL_RELOC_STACK, (gd_t *)CONFIG_SPL_GD_ADDR, 0x0);
board/freescale/t208xqds/spl.c +1 -1
index 8b68329b9864..8866be54a661 100644
@@ -82,7 +82,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
 	ccb_clk = sys_clk * plat_ratio / 2;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     ccb_clk / 16 / CONFIG_BAUDRATE);
 
 #if defined(CONFIG_SPL_MMC_BOOT)
board/freescale/t208xrdb/spl.c +1 -1
index 3f9b1faa853e..130cb8847c0f 100644
@@ -42,7 +42,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
 	ccb_clk = sys_clk * plat_ratio / 2;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     ccb_clk / 16 / CONFIG_BAUDRATE);
 
 #if defined(CONFIG_SPL_MMC_BOOT)
board/freescale/t4rdb/spl.c +1 -1
index 72d3b80b19b2..779457d29640 100644
@@ -51,7 +51,7 @@ void board_init_f(ulong bootflag)
 	plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f;
 	ccb_clk = sys_clk * plat_ratio / 2;
 
-	ns16550_init((struct ns16550 *)CONFIG_SYS_NS16550_COM1,
+	ns16550_init((struct ns16550 *)CFG_SYS_NS16550_COM1,
 		     ccb_clk / 16 / CONFIG_BAUDRATE);
 
 	puts("\nSD boot...\n");
board/nokia/rx51/rx51.c +2 -2
index c1b4b91b6070..fa95886fa3b6 100644
@@ -795,9 +795,9 @@ U_BOOT_DRVINFOS(rx51_kp) = {
 };
 
 static const struct ns16550_plat rx51_serial = {
-	.base = CONFIG_SYS_NS16550_COM3,
+	.base = CFG_SYS_NS16550_COM3,
 	.reg_shift = 2,
-	.clock = CONFIG_SYS_NS16550_CLK,
+	.clock = CFG_SYS_NS16550_CLK,
 	.fcr = UART_FCR_DEFVAL,
 };
 
drivers/serial/Kconfig +1 -1
index 45a34495dfb9..12dbb3d35fd7 100644
@@ -730,7 +730,7 @@ config SYS_NS16550
 	  Support NS16550 UART or compatible. This can be enabled in the
 	  device tree with the correct input clock frequency. If the input
 	  clock frequency is not defined in the device tree, the macro
-	  CONFIG_SYS_NS16550_CLK defined in a legacy board header file will
+	  CFG_SYS_NS16550_CLK defined in a legacy board header file will
 	  be used. It can be a constant or a function to get clock, eg,
 	  get_serial_clock().
 
drivers/serial/ns16550.c +4 -4
index 5a693d2f02ae..772dd6fef8f3 100644
@@ -92,8 +92,8 @@ static inline int serial_in_shift(void *addr, int shift)
 
 #if CONFIG_IS_ENABLED(DM_SERIAL)
 
-#ifndef CONFIG_SYS_NS16550_CLK
-#define CONFIG_SYS_NS16550_CLK  0
+#ifndef CFG_SYS_NS16550_CLK
+#define CFG_SYS_NS16550_CLK  0
 #endif
 
 /*
@@ -567,9 +567,9 @@ int ns16550_serial_of_to_plat(struct udevice *dev)
 
 	if (!plat->clock)
 		plat->clock = dev_read_u32_default(dev, "clock-frequency",
-						   CONFIG_SYS_NS16550_CLK);
+						   CFG_SYS_NS16550_CLK);
 	if (!plat->clock)
-		plat->clock = CONFIG_SYS_NS16550_CLK;
+		plat->clock = CFG_SYS_NS16550_CLK;
 	if (!plat->clock) {
 		debug("ns16550 clock not defined\n");
 		return -EINVAL;
drivers/serial/serial_mtk.c +20 -20
index 03b9e86bfc20..6fb4cb65c29f 100644
@@ -284,8 +284,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define DECLARE_HSUART_PRIV(port) \
 	static struct mtk_serial_priv mtk_hsuart##port = { \
-	.regs = (struct mtk_serial_regs *)CONFIG_SYS_NS16550_COM##port, \
-	.fixed_clk_rate = CONFIG_SYS_NS16550_CLK \
+	.regs = (struct mtk_serial_regs *)CFG_SYS_NS16550_COM##port, \
+	.fixed_clk_rate = CFG_SYS_NS16550_CLK \
 };
 
 #define DECLARE_HSUART_FUNCTIONS(port) \
@@ -356,36 +356,36 @@ DECLARE_GLOBAL_DATA_PTR;
 #error	"Invalid console index value."
 #endif
 
-#if CONFIG_CONS_INDEX == 1 && !defined(CONFIG_SYS_NS16550_COM1)
+#if CONFIG_CONS_INDEX == 1 && !defined(CFG_SYS_NS16550_COM1)
 #error	"Console port 1 defined but not configured."
-#elif CONFIG_CONS_INDEX == 2 && !defined(CONFIG_SYS_NS16550_COM2)
+#elif CONFIG_CONS_INDEX == 2 && !defined(CFG_SYS_NS16550_COM2)
 #error	"Console port 2 defined but not configured."
-#elif CONFIG_CONS_INDEX == 3 && !defined(CONFIG_SYS_NS16550_COM3)
+#elif CONFIG_CONS_INDEX == 3 && !defined(CFG_SYS_NS16550_COM3)
 #error	"Console port 3 defined but not configured."
-#elif CONFIG_CONS_INDEX == 4 && !defined(CONFIG_SYS_NS16550_COM4)
+#elif CONFIG_CONS_INDEX == 4 && !defined(CFG_SYS_NS16550_COM4)
 #error	"Console port 4 defined but not configured."
-#elif CONFIG_CONS_INDEX == 5 && !defined(CONFIG_SYS_NS16550_COM5)
+#elif CONFIG_CONS_INDEX == 5 && !defined(CFG_SYS_NS16550_COM5)
 #error	"Console port 5 defined but not configured."
-#elif CONFIG_CONS_INDEX == 6 && !defined(CONFIG_SYS_NS16550_COM6)
+#elif CONFIG_CONS_INDEX == 6 && !defined(CFG_SYS_NS16550_COM6)
 #error	"Console port 6 defined but not configured."
 #endif
 
-#if defined(CONFIG_SYS_NS16550_COM1)
+#if defined(CFG_SYS_NS16550_COM1)
 DECLARE_HSUART(1, "mtk-hsuart0");
 #endif
-#if defined(CONFIG_SYS_NS16550_COM2)
+#if defined(CFG_SYS_NS16550_COM2)
 DECLARE_HSUART(2, "mtk-hsuart1");
 #endif
-#if defined(CONFIG_SYS_NS16550_COM3)
+#if defined(CFG_SYS_NS16550_COM3)
 DECLARE_HSUART(3, "mtk-hsuart2");
 #endif
-#if defined(CONFIG_SYS_NS16550_COM4)
+#if defined(CFG_SYS_NS16550_COM4)
 DECLARE_HSUART(4, "mtk-hsuart3");
 #endif
-#if defined(CONFIG_SYS_NS16550_COM5)
+#if defined(CFG_SYS_NS16550_COM5)
 DECLARE_HSUART(5, "mtk-hsuart4");
 #endif
-#if defined(CONFIG_SYS_NS16550_COM6)
+#if defined(CFG_SYS_NS16550_COM6)
 DECLARE_HSUART(6, "mtk-hsuart5");
 #endif
 
@@ -410,22 +410,22 @@ __weak struct serial_device *default_serial_console(void)
 
 void mtk_serial_initialize(void)
 {
-#if defined(CONFIG_SYS_NS16550_COM1)
+#if defined(CFG_SYS_NS16550_COM1)
 	serial_register(&mtk_hsuart1_device);
 #endif
-#if defined(CONFIG_SYS_NS16550_COM2)
+#if defined(CFG_SYS_NS16550_COM2)
 	serial_register(&mtk_hsuart2_device);
 #endif
-#if defined(CONFIG_SYS_NS16550_COM3)
+#if defined(CFG_SYS_NS16550_COM3)
 	serial_register(&mtk_hsuart3_device);
 #endif
-#if defined(CONFIG_SYS_NS16550_COM4)
+#if defined(CFG_SYS_NS16550_COM4)
 	serial_register(&mtk_hsuart4_device);
 #endif
-#if defined(CONFIG_SYS_NS16550_COM5)
+#if defined(CFG_SYS_NS16550_COM5)
 	serial_register(&mtk_hsuart5_device);
 #endif
-#if defined(CONFIG_SYS_NS16550_COM6)
+#if defined(CFG_SYS_NS16550_COM6)
 	serial_register(&mtk_hsuart6_device);
 #endif
 }
drivers/serial/serial_ns16550.c +32 -32

150 lines not on this page · raw message

drivers/serial/serial_omap.c +3 -3
index e9ff61a0bac5..904f7d21bf03 100644
@@ -15,8 +15,8 @@
 #include <clk.h>
 #include <linux/err.h>
 
-#ifndef CONFIG_SYS_NS16550_CLK
-#define CONFIG_SYS_NS16550_CLK  0
+#ifndef CFG_SYS_NS16550_CLK
+#define CFG_SYS_NS16550_CLK  0
 #endif
 
 #ifdef CONFIG_DEBUG_UART_OMAP
@@ -128,7 +128,7 @@ static int omap_serial_of_to_plat(struct udevice *dev)
 
 	if (!plat->clock)
 		plat->clock = dev_read_u32_default(dev, "clock-frequency",
-						   CONFIG_SYS_NS16550_CLK);
+						   CFG_SYS_NS16550_CLK);
 	if (!plat->clock) {
 		debug("omap serial clock not defined\n");
 		return -EINVAL;
include/configs/MPC837XERDB.h +3 -3
index b8cbdc36754b..059885ecb54f 100644
@@ -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
include/configs/MPC8548CDS.h +3 -3
index dba15dae749b..bde8fa8df4dd 100644
@@ -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
include/configs/P1010RDB.h +3 -3
index fd721f30b3aa..05c097759f62 100644
@@ -322,13 +322,13 @@ extern unsigned long get_sdram_size(void);
 
 /* 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
include/configs/P2041RDB.h +5 -5
index 173f6205e08f..132786a42368 100644
@@ -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 */
 
include/configs/SBx81LIFKW.h +2 -2
index c99e6ba781a4..824190a41234 100644
@@ -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
include/configs/SBx81LIFXCAT.h +2 -2
index 8b43fe0c9939..e67da1fe1dc2 100644
@@ -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
include/configs/T102xRDB.h +5 -5
index 7cb10b205db1..b8f3d70e5953 100644
@@ -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 */
 
include/configs/T104xRDB.h +5 -5
index 3fa2d01dcc2a..777a64eceee0 100644
@@ -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
include/configs/T208xQDS.h +5 -5
index c5a28fadb004..710f105cfad9 100644
@@ -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
include/configs/T208xRDB.h +5 -5
index 795120c02a87..4c60364f7e78 100644
@@ -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
include/configs/T4240RDB.h +5 -5
index e3cbc649fa19..ba4a989fc5f7 100644
@@ -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 */
 
include/configs/am335x_evm.h +6 -6
index 13b1ff3bce6e..25d9c96e164f 100644
@@ -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
include/configs/am335x_guardian.h +6 -6
index cb649b598fed..7c5e7ce475ef 100644
@@ -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, \
include/configs/am335x_igep003x.h +1 -1
index b7b1cb0cfe19..abd868c14538 100644
@@ -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 */
 
include/configs/am335x_shc.h +6 -6
index 08bae9b886f2..452887d6995c 100644
@@ -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 */
include/configs/am335x_sl50.h +6 -6
index 7df5f1405512..4af9edafca8f 100644
@@ -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
include/configs/am43xx_evm.h +2 -2
index b61c8005c33f..4ff8528cf8ad 100644
@@ -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 */
include/configs/am57xx_evm.h +3 -3
index d8b0531673f1..c3b6a3fbda2c 100644
@@ -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
 
include/configs/ap143.h +1 -1
index 0eed8db23bd9..3114cf0c4fba 100644
@@ -14,7 +14,7 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_CLK          25000000
+#define CFG_SYS_NS16550_CLK          25000000
 
 /* Miscellaneous configurable options */
 
include/configs/ap152.h +1 -1
index 712471111909..f0674456fd0c 100644
@@ -14,7 +14,7 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_CLK          25000000
+#define CFG_SYS_NS16550_CLK          25000000
 
 /* Miscellaneous configurable options */
 
include/configs/apalis-tk1.h +1 -1
index 6a4092a83e2e..f0a02ae17953 100644
@@ -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"
include/configs/apalis_t30.h +1 -1
index 84bd88f835ae..4f00b3bad3f4 100644
@@ -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" \
include/configs/ax25-ae350.h +1 -1
index 7224bd8d1f49..e3b6956eb5a2 100644
@@ -33,7 +33,7 @@
 /*
  * Serial console configuration
  */
-#define CONFIG_SYS_NS16550_CLK		19660800
+#define CFG_SYS_NS16550_CLK		19660800
 
 /* Init Stack Pointer */
 
include/configs/axs10x.h +1 -1
index c0429ae15c4c..1932713f453a 100644
@@ -26,7 +26,7 @@
 /*
  * UART configuration
  */
-#define CONFIG_SYS_NS16550_CLK		33333333
+#define CFG_SYS_NS16550_CLK		33333333
 
 /*
  * Ethernet PHY configuration
include/configs/baltos.h +6 -6
index 31f107a465c1..f29729d09bac 100644
@@ -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
include/configs/bcm7260.h +1 -1
index 1bae49e15f35..cba109b74a9f 100644
@@ -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
 
include/configs/bcm7445.h +1 -1
index 4b41dc220b15..a07f1b7ad0f1 100644
@@ -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
 
include/configs/bcm_ns3.h +1 -1
index 795de469384c..76189a4d31f7 100644
@@ -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
include/configs/bcmstb.h +1 -1
index 481baff11d9a..9f51b9ca59d2 100644
@@ -97,7 +97,7 @@ extern phys_addr_t prior_stage_fdt_address;
  */
 #define V_NS16550_CLK			81000000
 
-#define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
+#define CFG_SYS_NS16550_CLK		V_NS16550_CLK
 
 /*
  * Serial console configuration.
include/configs/beaver.h +1 -1
index 1d51bb4e4c48..6b5f650811b8 100644
@@ -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
include/configs/bur_am335x_common.h +2 -2
index 773ce3f6a6f8..1bf6baf75c23 100644
@@ -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 */
 
include/configs/cardhu.h +1 -1
index f3416b534b23..35c5a4f12261 100644
@@ -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
include/configs/cei-tk1-som.h +1 -1
index 0672b7dbbe93..55e2d744c4a0 100644
@@ -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)
include/configs/chiliboard.h +6 -6
index bfa076b5cc98..1e5154af0a15 100644
@@ -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 */
 
include/configs/ci20.h +1 -1
index 63dac1d4a79d..b7511adc09ad 100644
@@ -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
include/configs/cm_t43.h +2 -2
index 0641d5c0a238..8f058213e9e7 100644
@@ -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
include/configs/colibri_t20.h +1 -1
index b758086b86d5..2ba3c3bc87db 100644
@@ -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 */
 
include/configs/colibri_t30.h +1 -1
index c9d384e2bdbe..ffed71a2e828 100644
@@ -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" \
include/configs/da850evm.h +1 -1
index f8ba4e828194..4f0188dd19ed 100644
@@ -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)
 
include/configs/dalmore.h +1 -1
index e03a24adca4a..24cf554649ba 100644
@@ -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" */
 
include/configs/dra7xx_evm.h +3 -3
index 93201be485d6..e1d18a778306 100644
@@ -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
 
include/configs/gardena-smart-gateway-mt7688.h +2 -2
index 0d61724db8c4..a1400eba1ada 100644
@@ -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 */
include/configs/harmony.h +2 -2
index fe4b02c0ce2c..211dab4d2337 100644
@@ -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 */
include/configs/hsdk-4xd.h +1 -1
index bfc0fa5c442c..1d7b171da75a 100644
@@ -28,7 +28,7 @@
 /*
  * UART configuration
  */
-#define CONFIG_SYS_NS16550_CLK		33330000
+#define CFG_SYS_NS16550_CLK		33330000
 
 /*
  * Ethernet PHY configuration
include/configs/hsdk.h +1 -1
index ce3cb20732db..9e092e16ea04 100644
@@ -27,7 +27,7 @@
 /*
  * UART configuration
  */
-#define CONFIG_SYS_NS16550_CLK		33330000
+#define CFG_SYS_NS16550_CLK		33330000
 
 /*
  * Ethernet PHY configuration
include/configs/jetson-tk1.h +1 -1
index 69aa55f86c5f..b846889541c7 100644
@@ -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" */
 
include/configs/km/pg-wcom-ls102xa.h +1 -1
index 7acdb0fa038e..57b0fc906979 100644
@@ -148,7 +148,7 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_CLK		get_serial_clock()
+#define CFG_SYS_NS16550_CLK		get_serial_clock()
 
 /*
  * I2C
include/configs/kmcent2.h +2 -2
index 30ba6065253e..e6e54fba898b 100644
@@ -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__
include/configs/kontron_sl28.h +1 -1
index 38860bfd5ca8..7ed1f153c232 100644
@@ -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 */
 
include/configs/legoev3.h +1 -1
index 5434c4f7679f..1f642fbecc3c 100644
@@ -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)
 
include/configs/linkit-smart-7688.h +2 -2
index b9c853d7dfef..28372d41590a 100644
@@ -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
 
include/configs/ls1012a_common.h +1 -1
index 148598fab465..b57eb52d1488 100644
@@ -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
include/configs/ls1021aiot.h +1 -1
index 3f2dfa640c9c..3579f9c8437b 100644
@@ -47,7 +47,7 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_CLK		get_serial_clock()
+#define CFG_SYS_NS16550_CLK		get_serial_clock()
 
 /*
  * I2C
include/configs/ls1021aqds.h +1 -1
index bd2f74c1262a..45665115f662 100644
@@ -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
 
 /*
include/configs/ls1021atsn.h +1 -1
index 8c43f652ab65..1e2db12a83f2 100644
@@ -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 */
 
include/configs/ls1021atwr.h +1 -1
index 06830f401a31..323feb6e3333 100644
@@ -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
 
 /*
include/configs/ls1028a_common.h +1 -1
index 7dd5649005b7..587f23be587f 100644
@@ -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 */
 
include/configs/ls1043a_common.h +1 -1
index 2fc06c1dd2dc..6fc509af232c 100644
@@ -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
include/configs/ls1046a_common.h +1 -1
index 40b4cb964d11..8a3c87c6abdb 100644
@@ -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
include/configs/ls1088a_common.h +1 -1
index 5668e07d1354..2117b0811686 100644
@@ -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.
include/configs/ls2080a_common.h +1 -1
index 895c566fea2f..c79a50795b8c 100644
@@ -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.
include/configs/medcom-wide.h +1 -1
index b90a84da8ad7..a8d8d8b09e02 100644
@@ -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 */
 
include/configs/mt7621.h +2 -2
index 1f733d112dd7..e09e9c82eb8d 100644
@@ -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 */
include/configs/mt7628.h +2 -2
index da16e3b21a4b..bb12ebfe4fd0 100644
@@ -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 */
include/configs/mt8183.h +2 -2
index eaffe0bf4c95..3da7619d78d7 100644
@@ -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>
include/configs/mt8516.h +2 -2
index 347598868bb5..0f7981a56611 100644
@@ -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>
include/configs/mv-common.h +2 -2
index 4f1067c23bbc..e870fc810cb1 100644
@@ -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)
include/configs/nokia_rx51.h +2 -2
index 6f16e336d146..cc4784232f9b 100644
@@ -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 }
 
include/configs/nyan-big.h +1 -1
index c59e10324395..baa452156ecd 100644
@@ -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)
include/configs/omap5_uevm.h +1 -1
index cce5556fe266..883cc0b99c9e 100644
@@ -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 */
 
include/configs/omapl138_lcdk.h +1 -1
index 81ca68de9bcc..2b47d4ca3768 100644
@@ -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)
include/configs/p1_p2_rdb_pc.h +3 -3
index 065820689caf..9fc22f0a6cbc 100644
@@ -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)
include/configs/paz00.h +1 -1
index c12f4d0937d5..a945f4e9b289 100644
@@ -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" */
 
include/configs/pdu001.h +6 -6
index ed3201aa3c42..71807837673f 100644
@@ -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 */
include/configs/plutux.h +1 -1
index 09f0ed9b9a1b..99db59c489e0 100644
@@ -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 */
 
include/configs/seaboard.h +1 -1
index c7f03a1e7543..4887747968f2 100644
@@ -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" */
 
include/configs/siemens-am33x-common.h +3 -3
index 5765f2ccb5e7..c9dd7509cb2a 100644
@@ -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 */
include/configs/sniper.h +2 -2
index c29bc448eed6..6054fa42c1a2 100644
@@ -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 }
include/configs/socfpga_soc64_common.h +1 -1
index 029f898b64ff..2b2d78b8c8e0 100644
@@ -75,7 +75,7 @@
 /*
  * Serial / UART configurations
  */
-#define CONFIG_SYS_NS16550_CLK		100000000
+#define CFG_SYS_NS16550_CLK		100000000
 
 /*
  * SDMMC configurations
include/configs/sunxi-common.h +7 -7
index 1ed0a262bc61..cd2a74fb52d7 100644
@@ -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 */
include/configs/tb100.h +1 -1
index 38a43b726f03..92ee920346bb 100644
@@ -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
include/configs/tec-ng.h +1 -1
index f8e741ab6fc1..098796637010 100644
@@ -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" */
 
include/configs/tec.h +1 -1
index 2377b47e0541..ddf753da4a9f 100644
@@ -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 */
 
include/configs/tegra-common.h +1 -1
index 2915db7f8bf7..92df457e8189 100644
@@ -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"
include/configs/ti814x_evm.h +2 -2
index 60632c58c67d..9614fe686f6b 100644
@@ -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 */
 
include/configs/ti816x_evm.h +2 -2
index f2dbe3544a5d..1bd2a1874b86 100644
@@ -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 */
 
include/configs/ti_am335x_common.h +1 -1
index fb017771688e..00eb329faa83 100644
@@ -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
include/configs/ti_armv7_keystone2.h +4 -4
index aaeea77281b6..119b4c0410c7 100644
@@ -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 */
include/configs/ti_omap3_common.h +4 -4
index 80d2a011f0fe..d282c3956e0c 100644
@@ -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 */
include/configs/ti_omap4_common.h +2 -2
index eb930341c3a8..ce50e35d8d4b 100644
@@ -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 */
include/configs/ti_omap5_common.h +1 -1
index a1efb57f1b09..c49c177390b3 100644
@@ -29,7 +29,7 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_SYS_NS16550_CLK		48000000
+#define CFG_SYS_NS16550_CLK		48000000
 
 /*
  * Environment setup
include/configs/tplink_wdr4300.h +1 -1
index b14726ad234f..22d783c325b2 100644
@@ -14,7 +14,7 @@
 /*
  * Serial Port
  */
-#define CONFIG_SYS_NS16550_CLK		40000000
+#define CFG_SYS_NS16550_CLK		40000000
 
 /*
  * Command
include/configs/trimslice.h +1 -1
index b562d44a13ba..e4cbc7da843e 100644
@@ -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 */
 
include/configs/vcoreiii.h +1 -1
index 02ddc6fb6e0b..338d8af8fb36 100644
@@ -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)
include/configs/venice2.h +1 -1
index 03aa7adcc0d3..b2dc04a975ad 100644
@@ -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" */
 
include/configs/ventana.h +1 -1
index 0bd5a1e85228..f7a507768ec1 100644
@@ -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" */
 
include/configs/vocore2.h +2 -2
index 84e5ba39f148..2107bec6587a 100644
@@ -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 */
 
include/configs/x530.h +2 -2
index 318e3680a6e1..a0162cab2190 100644
@@ -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
 
 /*
include/configs/xtfpga.h +2 -2
index 7090fcef6804..b93451cbe07a 100644
@@ -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 */
Signature · 1 line
2.25.1
Reviewed-by on v1 4/17
#11 lore raw

Re: [PATCH 04/17] global: Move remaining CONFIG_SYS_NS16550_* to CFG_SYS_NS16550_*

Quoted 135 lines · Tom Rini

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.

---
 arch/arm/cpu/armv7/ls102xa/fdt.c              |  2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c       |  2 +-
 arch/arm/include/asm/arch-bcmcygnus/configs.h |  6 +-
 arch/arm/include/asm/arch-bcmnsp/configs.h    |  4 +-
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  8 +--
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  4 +-
 arch/arm/include/asm/arch-lpc32xx/config.h    |  4 +-
 arch/arm/include/asm/arch-ls102xa/config.h    |  4 +-
 arch/arm/mach-davinci/da850_lowlevel.c        |  6 +-
 arch/arm/mach-davinci/spl.c                   |  4 +-
 arch/arm/mach-keystone/init.c                 |  4 +-
 arch/arm/mach-lpc32xx/devices.c               |  8 +--
 arch/arm/mach-omap2/am33xx/board.c            | 32 +++++-----
 arch/arm/mach-tegra/board.c                   |  4 +-
 arch/powerpc/cpu/mpc85xx/fdt.c                | 12 ++--
 arch/powerpc/include/asm/config.h             |  2 +-
 board/Synology/ds109/ds109.c                  | 10 +--
 board/eets/pdu001/mux.c                       | 12 ++--
 board/emulation/qemu-ppce500/qemu-ppce500.c   |  2 +-
 board/freescale/p1010rdb/p1010rdb.c           |  2 +-
 board/freescale/p1010rdb/spl.c                |  2 +-
 board/freescale/p1010rdb/spl_minimal.c        |  6 +-
 board/freescale/p1_p2_rdb_pc/spl.c            |  2 +-
 board/freescale/p1_p2_rdb_pc/spl_minimal.c    |  6 +-
 board/freescale/t102xrdb/spl.c                |  2 +-
 board/freescale/t104xrdb/spl.c                |  2 +-
 board/freescale/t208xqds/spl.c                |  2 +-
 board/freescale/t208xrdb/spl.c                |  2 +-
 board/freescale/t4rdb/spl.c                   |  2 +-
 board/nokia/rx51/rx51.c                       |  4 +-
 drivers/serial/Kconfig                        |  2 +-
 drivers/serial/ns16550.c                      |  8 +--
 drivers/serial/serial_mtk.c                   | 40 ++++++------
 drivers/serial/serial_ns16550.c               | 64 +++++++++----------
 drivers/serial/serial_omap.c                  |  6 +-
 include/configs/MPC837XERDB.h                 |  6 +-
 include/configs/MPC8548CDS.h                  |  6 +-
 include/configs/P1010RDB.h                    |  6 +-
 include/configs/P2041RDB.h                    | 10 +--
 include/configs/SBx81LIFKW.h                  |  4 +-
 include/configs/SBx81LIFXCAT.h                |  4 +-
 include/configs/T102xRDB.h                    | 10 +--
 include/configs/T104xRDB.h                    | 10 +--
 include/configs/T208xQDS.h                    | 10 +--
 include/configs/T208xRDB.h                    | 10 +--
 include/configs/T4240RDB.h                    | 10 +--
 include/configs/am335x_evm.h                  | 12 ++--
 include/configs/am335x_guardian.h             | 12 ++--
 include/configs/am335x_igep003x.h             |  2 +-
 include/configs/am335x_shc.h                  | 12 ++--
 include/configs/am335x_sl50.h                 | 12 ++--
 include/configs/am43xx_evm.h                  |  4 +-
 include/configs/am57xx_evm.h                  |  6 +-
 include/configs/ap143.h                       |  2 +-
 include/configs/ap152.h                       |  2 +-
 include/configs/apalis-tk1.h                  |  2 +-
 include/configs/apalis_t30.h                  |  2 +-
 include/configs/ax25-ae350.h                  |  2 +-
 include/configs/axs10x.h                      |  2 +-
 include/configs/baltos.h                      | 12 ++--
 include/configs/bcm7260.h                     |  2 +-
 include/configs/bcm7445.h                     |  2 +-
 include/configs/bcm_ns3.h                     |  2 +-
 include/configs/bcmstb.h                      |  2 +-
 include/configs/beaver.h                      |  2 +-
 include/configs/bur_am335x_common.h           |  4 +-
 include/configs/cardhu.h                      |  2 +-
 include/configs/cei-tk1-som.h                 |  2 +-
 include/configs/chiliboard.h                  | 12 ++--
 include/configs/ci20.h                        |  2 +-
 include/configs/cm_t43.h                      |  4 +-
 include/configs/colibri_t20.h                 |  2 +-
 include/configs/colibri_t30.h                 |  2 +-
 include/configs/da850evm.h                    |  2 +-
 include/configs/dalmore.h                     |  2 +-
 include/configs/dra7xx_evm.h                  |  6 +-
 .../configs/gardena-smart-gateway-mt7688.h    |  4 +-
 include/configs/harmony.h                     |  4 +-
 include/configs/hsdk-4xd.h                    |  2 +-
 include/configs/hsdk.h                        |  2 +-
 include/configs/jetson-tk1.h                  |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  2 +-
 include/configs/kmcent2.h                     |  4 +-
 include/configs/kontron_sl28.h                |  2 +-
 include/configs/legoev3.h                     |  2 +-
 include/configs/linkit-smart-7688.h           |  4 +-
 include/configs/ls1012a_common.h              |  2 +-
 include/configs/ls1021aiot.h                  |  2 +-
 include/configs/ls1021aqds.h                  |  2 +-
 include/configs/ls1021atsn.h                  |  2 +-
 include/configs/ls1021atwr.h                  |  2 +-
 include/configs/ls1028a_common.h              |  2 +-
 include/configs/ls1043a_common.h              |  2 +-
 include/configs/ls1046a_common.h              |  2 +-
 include/configs/ls1088a_common.h              |  2 +-
 include/configs/ls2080a_common.h              |  2 +-
 include/configs/medcom-wide.h                 |  2 +-
 include/configs/mt7621.h                      |  4 +-
 include/configs/mt7628.h                      |  4 +-
 include/configs/mt8183.h                      |  4 +-
 include/configs/mt8516.h                      |  4 +-
 include/configs/mv-common.h                   |  4 +-
 include/configs/nokia_rx51.h                  |  4 +-
 include/configs/nyan-big.h                    |  2 +-
 include/configs/omap5_uevm.h                  |  2 +-
 include/configs/omapl138_lcdk.h               |  2 +-
 include/configs/p1_p2_rdb_pc.h                |  6 +-
 include/configs/paz00.h                       |  2 +-
 include/configs/pdu001.h                      | 12 ++--
 include/configs/plutux.h                      |  2 +-
 include/configs/seaboard.h                    |  2 +-
 include/configs/siemens-am33x-common.h        |  6 +-
 include/configs/sniper.h                      |  4 +-
 include/configs/socfpga_soc64_common.h        |  2 +-
 include/configs/sunxi-common.h                | 14 ++--
 include/configs/tb100.h                       |  2 +-
 include/configs/tec-ng.h                      |  2 +-
 include/configs/tec.h                         |  2 +-
 include/configs/tegra-common.h                |  2 +-
 include/configs/ti814x_evm.h                  |  4 +-
 include/configs/ti816x_evm.h                  |  4 +-
 include/configs/ti_am335x_common.h            |  2 +-
 include/configs/ti_armv7_keystone2.h          |  8 +--
 include/configs/ti_omap3_common.h             |  8 +--
 include/configs/ti_omap4_common.h             |  4 +-
 include/configs/ti_omap5_common.h             |  2 +-
 include/configs/tplink_wdr4300.h              |  2 +-
Quoted 8 lines
 include/configs/trimslice.h                   |  2 +-
 include/configs/vcoreiii.h                    |  2 +-
 include/configs/venice2.h                     |  2 +-
 include/configs/ventana.h                     |  2 +-
 include/configs/vocore2.h                     |  4 +-
 include/configs/x530.h                        |  4 +-
 include/configs/xtfpga.h                      |  4 +-
 134 files changed, 347 insertions(+), 347 deletions(-)
author
#12 lore raw

PATCH 5/17 global: Move remaining CONFIG_SYS_NUM_* to CFG_SYS_NUM_*

In reply to Tom Rini

The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NUM 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.

---
 README                                        |  4 +-
 .../include/asm/arch-fsl-layerscape/config.h  | 12 +--
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  2 +-
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu_init.c           |  6 +-
 arch/powerpc/cpu/mpc85xx/fdt.c                |  4 +-
 arch/powerpc/cpu/mpc85xx/liodn.c              |  6 +-
 arch/powerpc/cpu/mpc85xx/p2041_ids.c          |  2 +-
 arch/powerpc/cpu/mpc85xx/p4080_ids.c          |  4 +-
 arch/powerpc/cpu/mpc85xx/p5040_ids.c          |  4 +-
 arch/powerpc/cpu/mpc85xx/speed.c              |  6 +-
 arch/powerpc/cpu/mpc85xx/t4240_ids.c          |  4 +-
 arch/powerpc/include/asm/config_mpc85xx.h     | 80 +++++++++----------
 arch/powerpc/include/asm/fsl_portals.h        |  2 +-
 board/freescale/ls1043aqds/eth.c              |  2 +-
 board/freescale/ls1043ardb/eth.c              |  2 +-
 board/freescale/ls1046aqds/eth.c              |  2 +-
 board/freescale/ls1046ardb/eth.c              |  2 +-
 board/freescale/p2041rdb/eth.c                |  2 +-
 board/freescale/t102xrdb/eth_t102xrdb.c       |  4 +-
 board/freescale/t104xrdb/eth.c                |  2 +-
 board/freescale/t208xqds/eth_t208xqds.c       |  4 +-
 board/freescale/t4rdb/eth.c                   | 12 +--
 board/freescale/t4rdb/t4rdb.h                 |  8 +-
 cmd/i2c.c                                     |  6 +-
 drivers/i2c/i2c_core.c                        |  6 +-
 drivers/misc/fsl_portals.c                    |  2 +-
 drivers/net/fm/fm.c                           |  2 +-
 drivers/net/fm/fm.h                           |  4 +-
 drivers/net/fm/init.c                         | 48 +++++------
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/T102xRDB.h                    |  2 +-
 include/configs/T104xRDB.h                    |  2 +-
 include/configs/T208xQDS.h                    |  2 +-
 include/configs/T208xRDB.h                    |  2 +-
 include/configs/T4240RDB.h                    |  2 +-
 include/configs/km/km-mpc83xx.h               |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  2 +-
 include/configs/kmcent2.h                     |  2 +-
 include/e500.h                                |  2 +-
 include/fm_eth.h                              |  6 +-
 include/i2c.h                                 |  2 +-
 43 files changed, 138 insertions(+), 138 deletions(-)
README +2 -2
index 9086207954ea..efb1d37df9a6 100644
@@ -923,7 +923,7 @@ The following options need to be configured:
 		with a list of GPIO LEDs that have inverted polarity.
 
 - I2C Support:
-		CONFIG_SYS_NUM_I2C_BUSES
+		CFG_SYS_NUM_I2C_BUSES
 		Hold the number of i2c buses you want to use.
 
 		CONFIG_SYS_I2C_DIRECT_BUS
@@ -940,7 +940,7 @@ The following options need to be configured:
 		hold a list of buses you want to use, only used if
 		CONFIG_SYS_I2C_DIRECT_BUS is not defined, for example
 		a board with CONFIG_SYS_I2C_MAX_HOPS = 1 and
-		CONFIG_SYS_NUM_I2C_BUSES = 9:
+		CFG_SYS_NUM_I2C_BUSES = 9:
 
 		 CONFIG_SYS_I2C_BUSES	{{0, {I2C_NULL_HOP}}, \
 					{0, {{I2C_MUX_PCA9547, 0x70, 1}}}, \
arch/arm/include/asm/arch-fsl-layerscape/config.h +6 -6
index ff752c21b14d..0669222fed7f 100644
@@ -209,9 +209,9 @@
 
 /* SoC related */
 #ifdef CONFIG_ARCH_LS1043A
-#define CONFIG_SYS_NUM_FMAN			1
-#define CONFIG_SYS_NUM_FM1_DTSEC		7
-#define CONFIG_SYS_NUM_FM1_10GEC		1
+#define CFG_SYS_NUM_FMAN			1
+#define CFG_SYS_NUM_FM1_DTSEC		7
+#define CFG_SYS_NUM_FM1_10GEC		1
 #define CONFIG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
 #define CONFIG_MAX_MEM_MAPPED			CONFIG_SYS_DDR_BLOCK1_SIZE
 
@@ -255,9 +255,9 @@
 #define CONFIG_MAX_MEM_MAPPED		CONFIG_SYS_DDR_BLOCK1_SIZE
 
 #elif defined(CONFIG_ARCH_LS1046A)
-#define CONFIG_SYS_NUM_FMAN			1
-#define CONFIG_SYS_NUM_FM1_DTSEC		8
-#define CONFIG_SYS_NUM_FM1_10GEC		2
+#define CFG_SYS_NUM_FMAN			1
+#define CFG_SYS_NUM_FM1_DTSEC		8
+#define CFG_SYS_NUM_FM1_10GEC		2
 #define CONFIG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
 #define CONFIG_MAX_MEM_MAPPED           CONFIG_SYS_DDR_BLOCK1_SIZE
 
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +1 -1
index aef615873343..c11018d73294 100644
@@ -160,7 +160,7 @@ struct sys_info {
 	unsigned long freq_localbus;
 	unsigned long freq_cga_m2;
 #ifdef CONFIG_SYS_DPAA_FMAN
-	unsigned long freq_fman[CONFIG_SYS_NUM_FMAN];
+	unsigned long freq_fman[CFG_SYS_NUM_FMAN];
 #endif
 	unsigned long freq_qman;
 };
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +1 -1
index bad18d778aa0..a4e971ebbd70 100644
@@ -306,7 +306,7 @@ struct sys_info {
 	unsigned long freq_localbus;
 	unsigned long freq_qe;
 #ifdef CONFIG_SYS_DPAA_FMAN
-	unsigned long freq_fman[CONFIG_SYS_NUM_FMAN];
+	unsigned long freq_fman[CFG_SYS_NUM_FMAN];
 #endif
 #ifdef CONFIG_SYS_DPAA_QBMAN
 	unsigned long freq_qman;
arch/powerpc/cpu/mpc85xx/cpu.c +1 -1
index 49a1aac42b53..b0363c9c1028 100644
@@ -264,7 +264,7 @@ int checkcpu (void)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-	for (i = 0; i < CONFIG_SYS_NUM_FMAN; i++) {
+	for (i = 0; i < CFG_SYS_NUM_FMAN; i++) {
 		printf("       FMAN%d: %s MHz\n", i + 1,
 			strmhz(buf1, sysinfo.freq_fman[i]));
 	}
arch/powerpc/cpu/mpc85xx/cpu_init.c +3 -3
index 47bea512c928..2c320b202ea2 100644
@@ -162,7 +162,7 @@ void disable_cpc_sram(void)
 
 	cpc_corenet_t *cpc = (cpc_corenet_t *)CFG_SYS_FSL_CPC_ADDR;
 
-	for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+	for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
 		if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) {
 			/* find and disable LAW of SRAM */
 			struct law_entry law = find_law(CONFIG_SYS_INIT_L3_ADDR);
@@ -232,7 +232,7 @@ void enable_cpc(void)
 			have_hwconfig = true;
 	}
 
-	for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+	for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
 		if (have_hwconfig) {
 			sprintf(cpc_subarg, "cpc%u", i + 1);
 			cpc_args = hwconfig_sub_f("en_cpc", cpc_subarg, buffer);
@@ -273,7 +273,7 @@ static void invalidate_cpc(void)
 	int i;
 	cpc_corenet_t *cpc = (cpc_corenet_t *)CFG_SYS_FSL_CPC_ADDR;
 
-	for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
+	for (i = 0; i < CFG_SYS_NUM_CPC; i++, cpc++) {
 		/* skip CPC when it used as all SRAM */
 		if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN)
 			continue;
arch/powerpc/cpu/mpc85xx/fdt.c +2 -2
index 6dd61caf1c47..32348b4e147f 100644
@@ -167,7 +167,7 @@ static inline void ft_fixup_l3cache(void *blob, int off)
 	cpc_corenet_t *cpc = (void *)CFG_SYS_FSL_CPC_ADDR;
 	u32 cfg0 = in_be32(&cpc->cpccfg0);
 
-	size = CPC_CFG0_SZ_K(cfg0) * 1024 * CONFIG_SYS_NUM_CPC;
+	size = CPC_CFG0_SZ_K(cfg0) * 1024 * CFG_SYS_NUM_CPC;
 	num_ways = CPC_CFG0_NUM_WAYS(cfg0);
 	line_size = CPC_CFG0_LINE_SZ(cfg0);
 	num_sets = size / (line_size * num_ways);
@@ -469,7 +469,7 @@ static void ft_fixup_dpaa_clks(void *blob)
 	ft_fixup_clks(blob, "fsl,fman", CFG_SYS_FSL_FM1_OFFSET,
 			sysinfo.freq_fman[0]);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	ft_fixup_clks(blob, "fsl,fman", CFG_SYS_FSL_FM2_OFFSET,
 			sysinfo.freq_fman[1]);
 #endif
arch/powerpc/cpu/mpc85xx/liodn.c +3 -3
index 9ad48d440f92..abc14fae4ec0 100644
@@ -104,7 +104,7 @@ static void setup_fman_liodn_base(enum fsl_dpaa_dev dev,
 		fm = (void *)CFG_SYS_FSL_FM1_ADDR;
 		break;
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	case FSL_HW_PORTAL_FMAN2:
 		fm = (void *)CFG_SYS_FSL_FM2_ADDR;
 		break;
@@ -201,7 +201,7 @@ void set_liodns(void)
 	setup_fman_liodn_base(FSL_HW_PORTAL_FMAN1, fman1_liodn_tbl,
 				fman1_liodn_tbl_sz);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	set_fman_liodn(fman2_liodn_tbl, fman2_liodn_tbl_sz);
 	setup_fman_liodn_base(FSL_HW_PORTAL_FMAN2, fman2_liodn_tbl,
 				fman2_liodn_tbl_sz);
@@ -373,7 +373,7 @@ void fdt_fixup_liodn(void *blob)
 	fdt_fixup_liodn_tbl(blob, liodn_tbl, liodn_tbl_sz);
 #ifdef CONFIG_SYS_DPAA_FMAN
 	fdt_fixup_liodn_tbl_fman(blob, fman1_liodn_tbl, fman1_liodn_tbl_sz);
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	fdt_fixup_liodn_tbl_fman(blob, fman2_liodn_tbl, fman2_liodn_tbl_sz);
 #endif
 #endif
arch/powerpc/cpu/mpc85xx/p2041_ids.c +1 -1
index 8a8334667824..2b790868e126 100644
@@ -66,7 +66,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
 	SET_FMAN_RX_1G_LIODN(1, 2, 12),
 	SET_FMAN_RX_1G_LIODN(1, 3, 13),
 	SET_FMAN_RX_1G_LIODN(1, 4, 14),
-#if (CONFIG_SYS_NUM_FM1_10GEC == 1)
+#if (CFG_SYS_NUM_FM1_10GEC == 1)
 	SET_FMAN_RX_10G_LIODN(1, 0, 15),
 #endif
 };
arch/powerpc/cpu/mpc85xx/p4080_ids.c +2 -2
index 5b766f1d5171..ba54b0310a7b 100644
@@ -62,7 +62,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 struct fman_liodn_id_table fman2_liodn_tbl[] = {
 	SET_FMAN_RX_1G_LIODN(2, 0, 16),
 	SET_FMAN_RX_1G_LIODN(2, 1, 17),
@@ -101,7 +101,7 @@ struct liodn_id_table liodn_bases[] = {
 	[FSL_HW_PORTAL_SEC]  = SET_LIODN_BASE_2(96, 106),
 #ifdef CONFIG_SYS_DPAA_FMAN
 	[FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(32),
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	[FSL_HW_PORTAL_FMAN2] = SET_LIODN_BASE_1(64),
 #endif
 #endif
arch/powerpc/cpu/mpc85xx/p5040_ids.c +2 -2
index e3d163af9eb9..6f11c81aba5d 100644
@@ -57,7 +57,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 struct fman_liodn_id_table fman2_liodn_tbl[] = {
 	SET_FMAN_RX_1G_LIODN(2, 0, 17),
 	SET_FMAN_RX_1G_LIODN(2, 1, 18),
@@ -101,7 +101,7 @@ struct liodn_id_table liodn_bases[] = {
 #ifdef CONFIG_SYS_DPAA_FMAN
 	[FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(32),
 #endif
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	[FSL_HW_PORTAL_FMAN2] = SET_LIODN_BASE_1(160),
 #endif
 #ifdef CONFIG_SYS_FSL_RAID_ENGINE
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
index 31d048192767..e2bdc2f9f112 100644
@@ -406,7 +406,7 @@ void get_sys_info(sys_info_t *sys_info)
 		sys_info->freq_fman[0] = sys_info->freq_systembus / 2;
 		break;
 	}
-#if (CONFIG_SYS_NUM_FMAN) == 2
+#if (CFG_SYS_NUM_FMAN) == 2
 #ifdef CONFIG_SYS_FM2_CLK
 #define FM2_CLK_SEL	0x00000038
 #define FM2_CLK_SHIFT	3
@@ -440,7 +440,7 @@ void get_sys_info(sys_info_t *sys_info)
 		break;
 	}
 #endif
-#endif	/* CONFIG_SYS_NUM_FMAN == 2 */
+#endif	/* CFG_SYS_NUM_FMAN == 2 */
 #else
 	sys_info->freq_fman[0] = sys_info->freq_systembus / CONFIG_SYS_FM1_CLK;
 #endif
@@ -491,7 +491,7 @@ void get_sys_info(sys_info_t *sys_info)
 	} else {
 		sys_info->freq_fman[0] = sys_info->freq_systembus / 2;
 	}
-#if (CONFIG_SYS_NUM_FMAN) == 2
+#if (CFG_SYS_NUM_FMAN) == 2
 	if (rcw_tmp & FM2_CLK_SEL) {
 		if (rcw_tmp & HWA_ASYNC_DIV)
 			sys_info->freq_fman[1] = freq_c_pll[HWA_CC_PLL] / 4;
arch/powerpc/cpu/mpc85xx/t4240_ids.c +2 -2
index 172dbdbe4649..8fe4e96a1140 100644
@@ -122,7 +122,7 @@ struct fman_liodn_id_table fman1_liodn_tbl[] = {
 	SET_FMAN_RX_10G_LIODN(1, 1, 95),
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 struct fman_liodn_id_table fman2_liodn_tbl[] = {
 	SET_FMAN_RX_1G_LIODN(2, 0, 88),
 	SET_FMAN_RX_1G_LIODN(2, 1, 89),
@@ -175,7 +175,7 @@ struct liodn_id_table liodn_bases[] = {
 	[FSL_HW_PORTAL_SEC]  = SET_LIODN_BASE_2(462, 558),
 #ifdef CONFIG_SYS_DPAA_FMAN
 	[FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(973),
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	[FSL_HW_PORTAL_FMAN2] = SET_LIODN_BASE_1(1069),
 #endif
 #endif
arch/powerpc/include/asm/config_mpc85xx.h +40 -40

160 lines not on this page · raw message

arch/powerpc/include/asm/fsl_portals.h +1 -1
index b1fd6bd5cef6..54ef4fb62954 100644
@@ -11,7 +11,7 @@ enum fsl_dpaa_dev {
 	FSL_HW_PORTAL_SEC,
 #ifdef CONFIG_SYS_DPAA_FMAN
 	FSL_HW_PORTAL_FMAN1,
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	FSL_HW_PORTAL_FMAN2,
 #endif
 #endif
board/freescale/ls1043aqds/eth.c +1 -1
index 6783ebebb59e..645c56c73d53 100644
@@ -427,7 +427,7 @@ int board_eth_init(struct bd_info *bis)
 		break;
 	}
 
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		idx = i - FM1_DTSEC1;
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
board/freescale/ls1043ardb/eth.c +1 -1
index 00ff6028e69f..3cae2a08677c 100644
@@ -62,7 +62,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 
 	dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++)
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++)
 		fm_info_set_mdio(i, dev);
 
 	/* 10GBase-R on lane A, MAC 9 */
board/freescale/ls1046aqds/eth.c +1 -1
index 88265a399487..926bd74ddc67 100644
@@ -349,7 +349,7 @@ int board_eth_init(struct bd_info *bis)
 		/* SGMII on slot 4, MAC 2 */
 		fm_info_set_phy_address(FM1_DTSEC2, SGMII_CARD_PORT1_PHY_ADDR);
 
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		idx = i - FM1_DTSEC1;
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
board/freescale/ls1046ardb/eth.c +1 -1
index 04fa57f81b29..af70d1077344 100644
@@ -64,7 +64,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 
 	dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++)
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++)
 		fm_info_set_mdio(i, dev);
 
 	/* 10GBase-R on lane A, MAC 9 */
board/freescale/p2041rdb/eth.c +1 -1
index 23fd619ceed3..23ec32b7f975 100644
@@ -162,7 +162,7 @@ int board_eth_init(struct bd_info *bis)
 	fm_info_set_phy_address(FM1_DTSEC2, CONFIG_SYS_FM1_DTSEC2_PHY_ADDR);
 	fm_info_set_phy_address(FM1_DTSEC3, CONFIG_SYS_FM1_DTSEC3_PHY_ADDR);
 
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		int idx = i - FM1_DTSEC1;
 
 		switch (fm_info_get_enet_if(i)) {
board/freescale/t102xrdb/eth_t102xrdb.c +2 -2
index be42efa5c764..ed6b36339f74 100644
@@ -85,7 +85,7 @@ int board_eth_init(struct bd_info *bis)
 		break;
 	}
 
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
 		case PHY_INTERFACE_MODE_RGMII:
@@ -112,7 +112,7 @@ int board_eth_init(struct bd_info *bis)
 		}
 	}
 
-	for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+	for (i = FM1_10GEC1; i < FM1_10GEC1 + CFG_SYS_NUM_FM1_10GEC; i++) {
 		switch (fm_info_get_enet_if(i)) {
 		case PHY_INTERFACE_MODE_XGMII:
 			dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
board/freescale/t104xrdb/eth.c +1 -1
index bb6641b88a99..5ce24b40964f 100644
@@ -39,7 +39,7 @@ int board_eth_init(struct bd_info *bis)
 	/*
 	 * Program on board RGMII, SGMII PHY addresses.
 	 */
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		int idx = i - FM1_DTSEC1;
 
 		switch (fm_info_get_enet_if(i)) {
board/freescale/t208xqds/eth_t208xqds.c +2 -2
index 555985b6f251..62261f50ea94 100644
@@ -625,7 +625,7 @@ int board_eth_init(struct bd_info *bis)
 		break;
 	}
 
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		idx = i - FM1_DTSEC1;
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
@@ -673,7 +673,7 @@ int board_eth_init(struct bd_info *bis)
 		}
 	}
 
-	for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+	for (i = FM1_10GEC1; i < FM1_10GEC1 + CFG_SYS_NUM_FM1_10GEC; i++) {
 		idx = i - FM1_10GEC1;
 		switch (fm_info_get_enet_if(i)) {
 		case PHY_INTERFACE_MODE_XGMII:
board/freescale/t4rdb/eth.c +6 -6
index 4041b3d9ac4c..241ee5a4a253 100644
@@ -81,7 +81,7 @@ int board_eth_init(struct bd_info *bis)
 	fm_disable_port(FM1_DTSEC5);
 	fm_disable_port(FM1_DTSEC6);
 
-	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
+	for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CFG_SYS_NUM_FM1_DTSEC; i++) {
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
 		case PHY_INTERFACE_MODE_SGMII:
@@ -93,7 +93,7 @@ int board_eth_init(struct bd_info *bis)
 		}
 	}
 
-	for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
+	for (i = FM1_10GEC1; i < FM1_10GEC1 + CFG_SYS_NUM_FM1_10GEC; i++) {
 		switch (fm_info_get_enet_if(i)) {
 		case PHY_INTERFACE_MODE_XGMII:
 			dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
@@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis)
 		}
 	}
 
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 	if ((srds_prtcl_s2 == 56) || (srds_prtcl_s2 == 55)) {
 		/* SGMII && 10GBase-R */
 		fm_info_set_phy_address(FM2_DTSEC1, SGMII_PHY_ADDR5);
@@ -121,7 +121,7 @@ int board_eth_init(struct bd_info *bis)
 
 	fm_disable_port(FM2_DTSEC5);
 	fm_disable_port(FM2_DTSEC6);
-	for (i = FM2_DTSEC1; i < FM2_DTSEC1 + CONFIG_SYS_NUM_FM2_DTSEC; i++) {
+	for (i = FM2_DTSEC1; i < FM2_DTSEC1 + CFG_SYS_NUM_FM2_DTSEC; i++) {
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
 		case PHY_INTERFACE_MODE_SGMII:
@@ -133,7 +133,7 @@ int board_eth_init(struct bd_info *bis)
 		}
 	}
 
-	for (i = FM2_10GEC1; i < FM2_10GEC1 + CONFIG_SYS_NUM_FM2_10GEC; i++) {
+	for (i = FM2_10GEC1; i < FM2_10GEC1 + CFG_SYS_NUM_FM2_10GEC; i++) {
 		switch (fm_info_get_enet_if(i)) {
 		case PHY_INTERFACE_MODE_XGMII:
 			dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
@@ -143,7 +143,7 @@ int board_eth_init(struct bd_info *bis)
 			break;
 		}
 	}
-#endif /* CONFIG_SYS_NUM_FMAN */
+#endif /* CFG_SYS_NUM_FMAN */
 
 	cpu_eth_init(bis);
 #endif /* CONFIG_FMAN_ENET */
board/freescale/t4rdb/t4rdb.h +4 -4
index 06779f552fac..bb3ce216d7d7 100644
@@ -6,10 +6,10 @@
 #ifndef __T4RDB_H__
 #define __T4RDB_H__
 
-#undef CONFIG_SYS_NUM_FM1_DTSEC
-#undef CONFIG_SYS_NUM_FM2_DTSEC
-#define CONFIG_SYS_NUM_FM1_DTSEC	4
-#define CONFIG_SYS_NUM_FM2_DTSEC	4
+#undef CFG_SYS_NUM_FM1_DTSEC
+#undef CFG_SYS_NUM_FM2_DTSEC
+#define CFG_SYS_NUM_FM1_DTSEC	4
+#define CFG_SYS_NUM_FM2_DTSEC	4
 
 #define CORTINA_FW_ADDR_IFCNOR				0xefe00000
 #define CORTINA_FW_ADDR_IFCNOR_ALTBANK		0xebf00000
cmd/i2c.c +3 -3
index e196a73efa69..7b84378f7cd2 100644
@@ -1697,7 +1697,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 #else
 		int i;
 
-		for (i = 0; i < CONFIG_SYS_NUM_I2C_BUSES; i++) {
+		for (i = 0; i < CFG_SYS_NUM_I2C_BUSES; i++) {
 			printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
 #ifndef CONFIG_SYS_I2C_DIRECT_BUS
 			int j;
@@ -1730,7 +1730,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 		}
 		show_bus(bus);
 #else
-		if (i >= CONFIG_SYS_NUM_I2C_BUSES) {
+		if (i >= CFG_SYS_NUM_I2C_BUSES) {
 			printf("Invalid bus %d\n", i);
 			return -1;
 		}
@@ -1788,7 +1788,7 @@ static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
 	} else {
 		bus_no = dectoul(argv[1], NULL);
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
-		if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES) {
+		if (bus_no >= CFG_SYS_NUM_I2C_BUSES) {
 			printf("Invalid bus %d\n", bus_no);
 			return -1;
 		}
drivers/i2c/i2c_core.c +3 -3
index 09f91e674d44..c3f6a1251f15 100644
@@ -34,7 +34,7 @@ struct i2c_adapter *i2c_get_adapter(int index)
 }
 
 #if !defined(CONFIG_SYS_I2C_DIRECT_BUS)
-struct i2c_bus_hose i2c_bus[CONFIG_SYS_NUM_I2C_BUSES] =
+struct i2c_bus_hose i2c_bus[CFG_SYS_NUM_I2C_BUSES] =
 			CONFIG_SYS_I2C_BUSES;
 #endif
 
@@ -173,7 +173,7 @@ static int i2c_mux_disconnect_all(void)
  */
 static void i2c_init_bus(unsigned int bus_no, int speed, int slaveaddr)
 {
-	if (bus_no >= CONFIG_SYS_NUM_I2C_BUSES)
+	if (bus_no >= CFG_SYS_NUM_I2C_BUSES)
 		return;
 
 	I2C_ADAP->init(I2C_ADAP, speed, slaveaddr);
@@ -238,7 +238,7 @@ int i2c_set_bus_num(unsigned int bus)
 		return 0;
 
 #ifndef CONFIG_SYS_I2C_DIRECT_BUS
-	if (bus >= CONFIG_SYS_NUM_I2C_BUSES)
+	if (bus >= CFG_SYS_NUM_I2C_BUSES)
 		return -1;
 #endif
 
drivers/misc/fsl_portals.c +1 -1
index 30a9409e5ab2..9c4b4d7e46dd 100644
@@ -257,7 +257,7 @@ defined(CONFIG_ARCH_LS1046A)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-		for (j = 0; j < CONFIG_SYS_NUM_FMAN; j++) {
+		for (j = 0; j < CFG_SYS_NUM_FMAN; j++) {
 			char name[] = "fman@0";
 
 			name[sizeof(name) - 2] = '0' + j;
drivers/net/fm/fm.c +1 -1
index 9b6dbe2882fd..1d3b7aa05836 100644
@@ -26,7 +26,7 @@
 #include <asm/arch/cpu.h>
 #endif
 
-struct fm_muram muram[CONFIG_SYS_NUM_FMAN];
+struct fm_muram muram[CFG_SYS_NUM_FMAN];
 
 void *fm_muram_base(int fm_idx)
 {
drivers/net/fm/fm.h +2 -2
index 2379b3a11cab..3d9cc5ca069d 100644
@@ -15,11 +15,11 @@
 #define OH_PORT_ID_BASE		0x01
 #define MAX_NUM_OH_PORT		7
 #define RX_PORT_1G_BASE		0x08
-#define MAX_NUM_RX_PORT_1G	CONFIG_SYS_NUM_FM1_DTSEC
+#define MAX_NUM_RX_PORT_1G	CFG_SYS_NUM_FM1_DTSEC
 #define RX_PORT_10G_BASE	0x10
 #define RX_PORT_10G_BASE2	0x08
 #define TX_PORT_1G_BASE		0x28
-#define MAX_NUM_TX_PORT_1G	CONFIG_SYS_NUM_FM1_DTSEC
+#define MAX_NUM_TX_PORT_1G	CFG_SYS_NUM_FM1_DTSEC
 #define TX_PORT_10G_BASE	0x30
 #define TX_PORT_10G_BASE2	0x28
 #define MIIM_TIMEOUT    0xFFFF
drivers/net/fm/init.c +24 -24

108 lines not on this page · raw message

include/configs/P2041RDB.h +1 -1
index 132786a42368..6b83b021f77e 100644
@@ -30,7 +30,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 #define CONFIG_SYS_SRIO
 #define CONFIG_SRIO1			/* SRIO port 1 */
include/configs/T102xRDB.h +1 -1
index b8f3d70e5953..c4fed68273b5 100644
@@ -15,7 +15,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define RESET_VECTOR_OFFSET		0x27FFC
include/configs/T104xRDB.h +1 -1
index 777a64eceee0..1eec94542100 100644
@@ -58,7 +58,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
  * These can be toggled for performance analysis, otherwise use default.
include/configs/T208xQDS.h +1 -1
index 710f105cfad9..42a0926329e9 100644
@@ -22,7 +22,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define RESET_VECTOR_OFFSET		0x27FFC
include/configs/T208xRDB.h +1 -1
index 4c60364f7e78..941efdc243f8 100644
@@ -17,7 +17,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define RESET_VECTOR_OFFSET		0x27FFC
include/configs/T4240RDB.h +1 -1
index ba4a989fc5f7..5969854796ec 100644
@@ -39,7 +39,7 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
  * These can be toggled for performance analysis, otherwise use default.
include/configs/km/km-mpc83xx.h +1 -1
index a658cbc07c20..ab0d0a721af1 100644
@@ -50,7 +50,7 @@
 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
 
 /* I2C */
-#define CONFIG_SYS_NUM_I2C_BUSES	4
+#define CFG_SYS_NUM_I2C_BUSES	4
 #define CONFIG_SYS_I2C_MAX_HOPS		1
 #define CONFIG_SYS_I2C_BUSES	{{0, {I2C_NULL_HOP} }, \
 		{0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \
include/configs/km/pg-wcom-ls102xa.h +1 -1
index 57b0fc906979..ad9853ab6b3b 100644
@@ -156,7 +156,7 @@
 
 #define CONFIG_I2C_MULTI_BUS
 #define CONFIG_SYS_I2C_MAX_HOPS		1
-#define CONFIG_SYS_NUM_I2C_BUSES	3
+#define CFG_SYS_NUM_I2C_BUSES	3
 #define I2C_MUX_PCA_ADDR		0x70
 #define I2C_MUX_CH_DEFAULT		0x0
 #define CONFIG_SYS_I2C_BUSES	{	{0, {I2C_NULL_HOP} }, \
include/configs/kmcent2.h +1 -1
index e6e54fba898b..7af65737ff01 100644
@@ -136,7 +136,7 @@
 
 #define CONFIG_RESET_VECTOR_ADDRESS	0xebfffffc
 
-#define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
+#define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /* Environment in parallel NOR-Flash */
 #define CONFIG_ENV_TOTAL_SIZE		0x040000
include/e500.h +1 -1
index 255f46bf1e54..9f68a834c2f0 100644
@@ -19,7 +19,7 @@ typedef struct
 	unsigned long freq_localbus;
 	unsigned long freq_qe;
 #ifdef CONFIG_SYS_DPAA_FMAN
-	unsigned long freq_fman[CONFIG_SYS_NUM_FMAN];
+	unsigned long freq_fman[CFG_SYS_NUM_FMAN];
 #endif
 #ifdef CONFIG_SYS_DPAA_QBMAN
 	unsigned long freq_qman;
include/fm_eth.h +3 -3
index 7475b5150738..aeb640925ee2 100644
@@ -56,7 +56,7 @@ enum fm_eth_type {
 #define CONFIG_SYS_FM1_DTSEC_MDIO_ADDR	(CFG_SYS_FSL_FM1_ADDR + 0xfc000)
 #endif
 #define CONFIG_SYS_FM1_TGEC_MDIO_ADDR	(CFG_SYS_FSL_FM1_ADDR + 0xfd000)
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 #define CONFIG_SYS_FM2_DTSEC_MDIO_ADDR	(CFG_SYS_FSL_FM2_ADDR + 0xfc000)
 #define CONFIG_SYS_FM2_TGEC_MDIO_ADDR	(CFG_SYS_FSL_FM2_ADDR + 0xfd000)
 #endif
@@ -102,7 +102,7 @@ enum fm_eth_type {
 				 offsetof(struct ccsr_fman, memac[n-1]),\
 }
 #else
-#if (CONFIG_SYS_NUM_FMAN == 2)
+#if (CFG_SYS_NUM_FMAN == 2)
 #define FM_TGEC_INFO_INITIALIZER(idx, n) \
 {									\
 	FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM2_TGEC_MDIO_ADDR)	\
@@ -131,7 +131,7 @@ enum fm_eth_type {
 #endif
 #endif
 
-#if (CONFIG_SYS_NUM_FM1_10GEC >= 3)
+#if (CFG_SYS_NUM_FM1_10GEC >= 3)
 #define FM_TGEC_INFO_INITIALIZER2(idx, n) \
 {									\
 	FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR)	\
include/i2c.h +1 -1
index e0ee94e55046..c07e60b04bd0 100644
@@ -637,7 +637,7 @@ void i2c_early_init_f(void);
 /* no muxes used bus = i2c adapters */
 #define CONFIG_SYS_I2C_DIRECT_BUS	1
 #define CONFIG_SYS_I2C_MAX_HOPS		0
-#define CONFIG_SYS_NUM_I2C_BUSES	ll_entry_count(struct i2c_adapter, i2c)
+#define CFG_SYS_NUM_I2C_BUSES	ll_entry_count(struct i2c_adapter, i2c)
 #else
 /* we use i2c muxes */
 #undef CONFIG_SYS_I2C_DIRECT_BUS
Signature · 1 line
2.25.1
Reviewed-by on v1 5/17
#13 lore raw

Re: [PATCH 05/17] global: Move remaining CONFIG_SYS_NUM_* to CFG_SYS_NUM_*

Quoted 44 lines · Tom Rini

The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NUM 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.

---
 README                                        |  4 +-
 .../include/asm/arch-fsl-layerscape/config.h  | 12 +--
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  2 +-
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu_init.c           |  6 +-
 arch/powerpc/cpu/mpc85xx/fdt.c                |  4 +-
 arch/powerpc/cpu/mpc85xx/liodn.c              |  6 +-
 arch/powerpc/cpu/mpc85xx/p2041_ids.c          |  2 +-
 arch/powerpc/cpu/mpc85xx/p4080_ids.c          |  4 +-
 arch/powerpc/cpu/mpc85xx/p5040_ids.c          |  4 +-
 arch/powerpc/cpu/mpc85xx/speed.c              |  6 +-
 arch/powerpc/cpu/mpc85xx/t4240_ids.c          |  4 +-
 arch/powerpc/include/asm/config_mpc85xx.h     | 80 +++++++++----------
 arch/powerpc/include/asm/fsl_portals.h        |  2 +-
 board/freescale/ls1043aqds/eth.c              |  2 +-
 board/freescale/ls1043ardb/eth.c              |  2 +-
 board/freescale/ls1046aqds/eth.c              |  2 +-
 board/freescale/ls1046ardb/eth.c              |  2 +-
 board/freescale/p2041rdb/eth.c                |  2 +-
 board/freescale/t102xrdb/eth_t102xrdb.c       |  4 +-
 board/freescale/t104xrdb/eth.c                |  2 +-
 board/freescale/t208xqds/eth_t208xqds.c       |  4 +-
 board/freescale/t4rdb/eth.c                   | 12 +--
 board/freescale/t4rdb/t4rdb.h                 |  8 +-
 cmd/i2c.c                                     |  6 +-
 drivers/i2c/i2c_core.c                        |  6 +-
 drivers/misc/fsl_portals.c                    |  2 +-
 drivers/net/fm/fm.c                           |  2 +-
 drivers/net/fm/fm.h                           |  4 +-
 drivers/net/fm/init.c                         | 48 +++++------
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/T102xRDB.h                    |  2 +-
 include/configs/T104xRDB.h                    |  2 +-
 include/configs/T208xQDS.h                    |  2 +-
 include/configs/T208xRDB.h                    |  2 +-
Quoted 8 lines
 include/configs/T4240RDB.h                    |  2 +-
 include/configs/km/km-mpc83xx.h               |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  2 +-
 include/configs/kmcent2.h                     |  2 +-
 include/e500.h                                |  2 +-
 include/fm_eth.h                              |  6 +-
 include/i2c.h                                 |  2 +-
 43 files changed, 138 insertions(+), 138 deletions(-)
author
#14 lore raw

PATCH 6/17 rtc: Remove unused drivers

In reply to Tom Rini

These RTC drivers are currently unused and reference other unused CONFIG variables, so remove them.

---
 README               |   1 -
 drivers/rtc/Makefile |   3 -
 drivers/rtc/ds1556.c | 179 -------------------------------------------
 drivers/rtc/ds164x.c | 171 -----------------------------------------
 drivers/rtc/ds174x.c | 172 -----------------------------------------
 5 files changed, 526 deletions(-)
 delete mode 100644 drivers/rtc/ds1556.c
 delete mode 100644 drivers/rtc/ds164x.c
 delete mode 100644 drivers/rtc/ds174x.c
README +0 -1
index efb1d37df9a6..5ab042a2defb 100644
@@ -473,7 +473,6 @@ The following options need to be configured:
 		CONFIG_RTC_DS1337	- use Maxim, Inc. DS1337 RTC
 		CONFIG_RTC_DS1338	- use Maxim, Inc. DS1338 RTC
 		CONFIG_RTC_DS1339	- use Maxim, Inc. DS1339 RTC
-		CONFIG_RTC_DS164x	- use Dallas DS164x RTC
 		CONFIG_RTC_ISL1208	- use Intersil ISL1208 RTC
 		CONFIG_RTC_MAX6900	- use Maxim, Inc. MAX6900 RTC
 		CONFIG_RTC_DS1337_NOOSC	- Turn off the OSC output for DS1337
drivers/rtc/Makefile +0 -3
index 009dd9d28c95..2089086551d1 100644
@@ -17,9 +17,6 @@ obj-$(CONFIG_RTC_DS1339) += ds1307.o
 obj-$(CONFIG_RTC_DS1337) += ds1337.o
 obj-$(CONFIG_RTC_DS1374) += ds1374.o
 obj-$(CONFIG_RTC_DS1388) += ds1337.o
-obj-$(CONFIG_RTC_DS1556) += ds1556.o
-obj-$(CONFIG_RTC_DS164x) += ds164x.o
-obj-$(CONFIG_RTC_DS174x) += ds174x.o
 obj-$(CONFIG_RTC_DS3231) += ds3231.o
 obj-$(CONFIG_RTC_DS3232) += ds3232.o
 obj-$(CONFIG_RTC_EMULATION) += emul_rtc.o
drivers/rtc/ds1556.c deleted +0 -179

179 lines not on this page · raw message

drivers/rtc/ds164x.c deleted +0 -171

171 lines not on this page · raw message

drivers/rtc/ds174x.c deleted +0 -172

172 lines not on this page · raw message

Signature · 1 line
2.25.1
Reviewed-by on v1 6/17
#15 lore raw

Re: [PATCH 06/17] rtc: Remove unused drivers

Quoted 5 lines · Tom Rini

These RTC drivers are currently unused and reference other unused CONFIG variables, so remove them.

Quoted 10 lines
---
 README               |   1 -
 drivers/rtc/Makefile |   3 -
 drivers/rtc/ds1556.c | 179 -------------------------------------------
 drivers/rtc/ds164x.c | 171 -----------------------------------------
 drivers/rtc/ds174x.c | 172 -----------------------------------------
 5 files changed, 526 deletions(-)
 delete mode 100644 drivers/rtc/ds1556.c
 delete mode 100644 drivers/rtc/ds164x.c
 delete mode 100644 drivers/rtc/ds174x.c
author
#16 lore raw

PATCH 7/17 Remove unused symbols

In reply to Tom Rini

This commit removes the following unused symbols:
CONFIG_SYS_NVRAM_BASE_ADDR
CONFIG_SYS_NVRAM_SIZE
CONFIG_SYS_PAXE_BASE
CONFIG_SYS_PCCNT
CONFIG_SYS_PCDAT
CONFIG_SYS_PCDDR
CONFIG_SYS_PCI1_ADDR
CONFIG_SYS_PCI2_ADDR
CONFIG_SYS_PCI1_IO_BUS
CONFIG_SYS_PCI1_IO_SIZE
CONFIG_SYS_PCI1_MEM_BUS
CONFIG_SYS_PCI1_MEM_SIZE
CONFIG_SYS_PCIE3_ADDR
CONFIG_SYS_PCIE4_ADDR
CONFIG_SYS_PCIE3_IO_PHYS
CONFIG_SYS_PCIE3_IO_VIRT
CONFIG_SYS_PCIE4_IO_PHYS
CONFIG_SYS_PCIE4_IO_VIRT
CONFIG_SYS_PLL_SETTLING_TIME
CONFIG_SYS_QMAN_CENA_BASE
CONFIG_SYS_QMAN_SP_CENA_SIZE
CONFIG_SYS_RCAR_I2C0_BASE
CONFIG_SYS_RCAR_I2C1_BASE
CONFIG_SYS_RCAR_I2C2_BASE
CONFIG_SYS_RCAR_I2C3_BASE
CONFIG_SYS_SATA
CONFIG_SYS_SDRAM_BASE2
CONFIG_SYS_SGMII_REFCLK_MHZ
CONFIG_SYS_SGMII_LINERATE_MHZ
CONFIG_SYS_SGMII_RATESCALE
CONFIG_SYS_SH_SDHI0_BASE
CONFIG_SYS_SH_SDHI0_BASE
CONFIG_SYS_SH_SDHI1_BASE
CONFIG_SYS_SH_SDHI2_BASE
CONFIG_SYS_SH_SDHI3_BASE
CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
CONFIG_SYS_SPI_U_BOOT_SIZE
CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT
CONFIG_SYS_VCXK_BASE
CONFIG_SYS_VCXK_DEFAULT_LINEALIGN
CONFIG_SYS_VCXK_DOUBLEBUFFERED
CONFIG_SYS_VCXK_ENABLE_DDR
CONFIG_SYS_VCXK_ENABLE_PIN
CONFIG_SYS_VCXK_ENABLE_PORT
CONFIG_SYS_VCXK_INVERT_DDR
CONFIG_SYS_VCXK_INVERT_PIN
CONFIG_SYS_VCXK_INVERT_PORT
CONFIG_SYS_VCXK_REQUEST_DDR
CONFIG_SYS_VCXK_REQUEST_PIN
CONFIG_SYS_VCXK_REQUEST_PORT
CONFIG_SYS_VSC7385_BR_PRELIM
CONFIG_SYS_VSC7385_OR_PRELIM

---
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  3 --
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  2 --
 arch/arm/mach-rmobile/include/mach/r8a7790.h  |  3 --
 arch/arm/mach-rmobile/include/mach/r8a7791.h  |  2 --
 arch/arm/mach-rmobile/include/mach/r8a7793.h  |  2 --
 arch/arm/mach-rmobile/include/mach/r8a7794.h  |  2 --
 .../arm/mach-rmobile/include/mach/rcar-base.h |  9 ------
 arch/powerpc/include/asm/immap_85xx.h         |  8 -----
 include/configs/M5282EVB.h                    |  6 ----
 include/configs/MPC8548CDS.h                  |  5 ----
 include/configs/P2041RDB.h                    |  4 ---
 include/configs/T102xRDB.h                    |  4 ---
 include/configs/T104xRDB.h                    |  6 ----
 include/configs/T208xQDS.h                    |  5 ----
 include/configs/T208xRDB.h                    |  5 ----
 include/configs/T4240RDB.h                    |  5 ----
 include/configs/aristainetos2.h               |  2 --
 include/configs/eb_cpu5282.h                  | 30 -------------------
 include/configs/highbank.h                    |  5 ----
 include/configs/km/km-mpc8360.h               |  1 -
 include/configs/km/km-mpc83xx.h               |  1 -
 include/configs/ls1012a2g5rdb.h               |  4 ---
 include/configs/ls1012a_common.h              |  4 ---
 include/configs/ls1043aqds.h                  |  4 ---
 include/configs/ls1046a_common.h              |  5 ----
 include/configs/p1_p2_rdb_pc.h                |  6 ----
 include/configs/phycore_am335x_r2.h           |  6 ----
 include/configs/r2dplus.h                     |  5 ----
 include/configs/socrates.h                    |  8 ++---
 include/configs/ti814x_evm.h                  |  2 --
 include/configs/ti_armv7_keystone2.h          |  5 ----
 31 files changed, 2 insertions(+), 157 deletions(-)
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +0 -3
index c11018d73294..85ac5eb28138 100644
@@ -35,7 +35,6 @@
 #define CONFIG_SYS_XHCI_USB3_ADDR		(CONFIG_SYS_IMMR + 0x02100000)
 #define CONFIG_SYS_PCIE1_ADDR			(CONFIG_SYS_IMMR + 0x2400000)
 #define CONFIG_SYS_PCIE2_ADDR			(CONFIG_SYS_IMMR + 0x2500000)
-#define CONFIG_SYS_PCIE3_ADDR			(CONFIG_SYS_IMMR + 0x2600000)
 #define CONFIG_SYS_SEC_MON_ADDR			(CONFIG_SYS_IMMR + 0xe90000)
 #define CONFIG_SYS_SFP_ADDR			(CONFIG_SYS_IMMR + 0xe80200)
 
@@ -56,9 +55,7 @@
 #define CONFIG_SYS_QMAN_MEM_BASE	0x500000000
 #define CONFIG_SYS_QMAN_MEM_PHYS	CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x08000000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x10000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x10000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +0 -2
index a4e971ebbd70..59488a04e409 100644
@@ -194,8 +194,6 @@
 /* PCIe */
 #define CONFIG_SYS_PCIE1_ADDR			(CONFIG_SYS_IMMR + 0x2400000)
 #define CONFIG_SYS_PCIE2_ADDR			(CONFIG_SYS_IMMR + 0x2500000)
-#define CONFIG_SYS_PCIE3_ADDR			(CONFIG_SYS_IMMR + 0x2600000)
-#define CONFIG_SYS_PCIE4_ADDR			(CONFIG_SYS_IMMR + 0x2700000)
 #if defined(CONFIG_ARCH_LX2160A) || defined(CONFIG_ARCH_LX2162A)
 #define SYS_PCIE5_ADDR				(CONFIG_SYS_IMMR + 0x2800000)
 #define SYS_PCIE6_ADDR				(CONFIG_SYS_IMMR + 0x2900000)
arch/arm/mach-rmobile/include/mach/r8a7790.h +0 -3
index ef74d59fed44..28669e3c7717 100644
@@ -24,9 +24,6 @@
 #define MSTP11_BITS	0x00000000
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI1_BASE 0xEE120000
-#define CONFIG_SYS_SH_SDHI2_BASE 0xEE140000
-#define CONFIG_SYS_SH_SDHI3_BASE 0xEE160000
 #define CONFIG_SYS_SH_SDHI_NR_CHANNEL 4
 
 #define R8A7790_CUT_ES2X	2
arch/arm/mach-rmobile/include/mach/r8a7791.h +0 -2
index 681d1ea524b3..37d134c5bf29 100644
@@ -14,8 +14,6 @@
  */
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI1_BASE 0xEE140000
-#define CONFIG_SYS_SH_SDHI2_BASE 0xEE160000
 #define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
 
 #define DBSC3_1_QOS_R0_BASE	0xE67A1000
arch/arm/mach-rmobile/include/mach/r8a7793.h +0 -2
index 31433c369300..85f59d977125 100644
@@ -15,8 +15,6 @@
  */
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI1_BASE 0xEE140000
-#define CONFIG_SYS_SH_SDHI2_BASE 0xEE160000
 #define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
 
 #define DBSC3_1_QOS_R0_BASE	0xE67A1000
arch/arm/mach-rmobile/include/mach/r8a7794.h +0 -2
index 3baa4237c262..2bd6e469c815 100644
@@ -24,8 +24,6 @@
 #define MSTP11_BITS	0x000001C0
 
 /* SDHI */
-#define CONFIG_SYS_SH_SDHI1_BASE 0xEE140000
-#define CONFIG_SYS_SH_SDHI2_BASE 0xEE160000
 #define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
 
 #define R8A7794_CUT_ES2		2
arch/arm/mach-rmobile/include/mach/rcar-base.h +0 -9
index 4c98dffa073c..e422e9100a8b 100644
@@ -70,15 +70,6 @@
 #define SMSTPCR10		0xE6150998
 #define SMSTPCR11		0xE615099C
 
-/* RCAR-I2C */
-#define CONFIG_SYS_RCAR_I2C0_BASE	0xE6508000
-#define CONFIG_SYS_RCAR_I2C1_BASE	0xE6518000
-#define CONFIG_SYS_RCAR_I2C2_BASE	0xE6530000
-#define CONFIG_SYS_RCAR_I2C3_BASE	0xE6540000
-
-/* SDHI */
-#define CONFIG_SYS_SH_SDHI0_BASE	0xEE100000
-
 #define S3C_BASE		0xE6784000
 #define S3C_INT_BASE		0xE6784A00
 #define S3C_MEDIA_BASE		0xE6784B00
arch/powerpc/include/asm/immap_85xx.h +0 -8
index c9ced5474c2c..78c0d0549655 100644
@@ -2662,18 +2662,10 @@ struct ccsr_pman {
 #define CONFIG_SYS_PAMU_ADDR \
 	(CONFIG_SYS_IMMR + CFG_SYS_FSL_PAMU_OFFSET)
 
-#define CONFIG_SYS_PCI1_ADDR \
-	(CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCI1_OFFSET)
-#define CONFIG_SYS_PCI2_ADDR \
-	(CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCI2_OFFSET)
 #define CONFIG_SYS_PCIE1_ADDR \
 	(CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCIE1_OFFSET)
 #define CONFIG_SYS_PCIE2_ADDR \
 	(CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCIE2_OFFSET)
-#define CONFIG_SYS_PCIE3_ADDR \
-	(CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCIE3_OFFSET)
-#define CONFIG_SYS_PCIE4_ADDR \
-	(CONFIG_SYS_IMMR + CFG_SYS_MPC85xx_PCIE4_OFFSET)
 
 #define CONFIG_SYS_SFP_ADDR  \
 	(CONFIG_SYS_IMMR + CONFIG_SYS_SFP_OFFSET)
include/configs/M5282EVB.h +0 -6
index e191dc615bc2..925d26eaf10d 100644
@@ -130,13 +130,7 @@
 #define CONFIG_SYS_PBDDR		0x0000000
 #define CONFIG_SYS_PBDAT		0x0000000
 
-#define CONFIG_SYS_PCCNT		0x0000000	/* Port C D[15:08] */
-#define CONFIG_SYS_PCDDR		0x0000000
-#define CONFIG_SYS_PCDAT		0x0000000
-
 #define CONFIG_SYS_PDCNT		0x0000000	/* Port D D[07:00] */
-#define CONFIG_SYS_PCDDR		0x0000000
-#define CONFIG_SYS_PCDAT		0x0000000
 
 #define CONFIG_SYS_PEHLPAR		0xC0
 #define CONFIG_SYS_PUAPAR		0x0F	/* UA0..UA3 = Uart 0 +1 */
include/configs/MPC8548CDS.h +0 -5
index bde8fa8df4dd..c29e63c54ed8 100644
@@ -256,21 +256,16 @@
  */
 #define CONFIG_SYS_PCI1_MEM_VIRT	0x80000000
 #ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_PCI1_MEM_BUS		0xe0000000
 #define CONFIG_SYS_PCI1_MEM_PHYS	0xc00000000ull
 #else
-#define CONFIG_SYS_PCI1_MEM_BUS	0x80000000
 #define CONFIG_SYS_PCI1_MEM_PHYS	0x80000000
 #endif
-#define CONFIG_SYS_PCI1_MEM_SIZE	0x20000000	/* 512M */
 #define CONFIG_SYS_PCI1_IO_VIRT	0xe2000000
-#define CONFIG_SYS_PCI1_IO_BUS	0x00000000
 #ifdef CONFIG_PHYS_64BIT
 #define CONFIG_SYS_PCI1_IO_PHYS 0xfe2000000ull
 #else
 #define CONFIG_SYS_PCI1_IO_PHYS	0xe2000000
 #endif
-#define CONFIG_SYS_PCI1_IO_SIZE	0x00100000	/* 1M */
 
 #ifdef CONFIG_PCIE1
 #define CONFIG_SYS_PCIE1_MEM_VIRT	0xa0000000
include/configs/P2041RDB.h +0 -4
index 6b83b021f77e..c83298107869 100644
@@ -248,8 +248,6 @@
 /* controller 3, Slot 1, tgtid 1, Base address 202000 */
 #define CONFIG_SYS_PCIE3_MEM_VIRT	0xc0000000
 #define CONFIG_SYS_PCIE3_MEM_PHYS	0xc40000000ull
-#define CONFIG_SYS_PCIE3_IO_VIRT	0xf8020000
-#define CONFIG_SYS_PCIE3_IO_PHYS	0xff8020000ull
 
 /* Qman/Bman */
 #define CONFIG_SYS_BMAN_NUM_PORTALS	10
@@ -276,9 +274,7 @@
 #define CONFIG_SYS_QMAN_MEM_PHYS	CONFIG_SYS_QMAN_MEM_BASE
 #endif
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x00200000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x4000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
include/configs/T102xRDB.h +0 -4
index c4fed68273b5..e21639a6951b 100644
@@ -349,8 +349,6 @@
 #ifdef CONFIG_PCIE3
 #define CONFIG_SYS_PCIE3_MEM_VIRT	0xa0000000
 #define CONFIG_SYS_PCIE3_MEM_PHYS	0xc20000000ull
-#define CONFIG_SYS_PCIE3_IO_VIRT	0xf8020000
-#define CONFIG_SYS_PCIE3_IO_PHYS	0xff8020000ull
 #endif
 #endif	/* CONFIG_PCI */
 
@@ -391,9 +389,7 @@
 #define CONFIG_SYS_QMAN_MEM_PHYS	CONFIG_SYS_QMAN_MEM_BASE
 #endif
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x02000000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x4000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
include/configs/T104xRDB.h +0 -6
index 1eec94542100..a3d04882f0d6 100644
@@ -325,16 +325,12 @@
 #ifdef CONFIG_PCIE3
 #define CONFIG_SYS_PCIE3_MEM_VIRT	0xa0000000
 #define CONFIG_SYS_PCIE3_MEM_PHYS	0xc20000000ull
-#define CONFIG_SYS_PCIE3_IO_VIRT	0xf8020000
-#define CONFIG_SYS_PCIE3_IO_PHYS	0xff8020000ull
 #endif
 
 /* controller 4, Base address 203000 */
 #ifdef CONFIG_PCIE4
 #define CONFIG_SYS_PCIE4_MEM_VIRT	0xb0000000
 #define CONFIG_SYS_PCIE4_MEM_PHYS	0xc30000000ull
-#define CONFIG_SYS_PCIE4_IO_VIRT	0xf8030000
-#define CONFIG_SYS_PCIE4_IO_PHYS	0xff8030000ull
 #endif
 #endif	/* CONFIG_PCI */
 
@@ -364,9 +360,7 @@
 #define CONFIG_SYS_QMAN_MEM_BASE	0xf6000000
 #define CONFIG_SYS_QMAN_MEM_PHYS	0xff6000000ull
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x02000000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x4000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
include/configs/T208xQDS.h +0 -5
index 42a0926329e9..72052be78a92 100644
@@ -359,13 +359,10 @@
 /* controller 3, Slot 1, tgtid 1, Base address 202000 */
 #define CONFIG_SYS_PCIE3_MEM_VIRT	0xb0000000
 #define CONFIG_SYS_PCIE3_MEM_PHYS	0xc30000000ull
-#define CONFIG_SYS_PCIE3_IO_VIRT	0xf8020000
-#define CONFIG_SYS_PCIE3_IO_PHYS	0xff8020000ull
 
 /* controller 4, Base address 203000 */
 #define CONFIG_SYS_PCIE4_MEM_VIRT       0xc0000000
 #define CONFIG_SYS_PCIE4_MEM_PHYS	0xc40000000ull
-#define CONFIG_SYS_PCIE4_IO_PHYS	0xff8030000ull
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
@@ -385,9 +382,7 @@
 #define CONFIG_SYS_QMAN_MEM_BASE	0xf6000000
 #define CONFIG_SYS_QMAN_MEM_PHYS	0xff6000000ull
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x02000000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x4000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
include/configs/T208xRDB.h +0 -5
index 941efdc243f8..c798e4487a4d 100644
@@ -313,13 +313,10 @@
 /* controller 3, Slot 1, tgtid 1, Base address 202000 */
 #define CONFIG_SYS_PCIE3_MEM_VIRT	0xb0000000
 #define CONFIG_SYS_PCIE3_MEM_PHYS	0xc30000000ull
-#define CONFIG_SYS_PCIE3_IO_VIRT	0xf8020000
-#define CONFIG_SYS_PCIE3_IO_PHYS	0xff8020000ull
 
 /* controller 4, Base address 203000 */
 #define CONFIG_SYS_PCIE4_MEM_VIRT       0xc0000000
 #define CONFIG_SYS_PCIE4_MEM_PHYS	0xc40000000ull
-#define CONFIG_SYS_PCIE4_IO_PHYS	0xff8030000ull
 
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
@@ -339,9 +336,7 @@
 #define CONFIG_SYS_QMAN_MEM_BASE	0xf6000000
 #define CONFIG_SYS_QMAN_MEM_PHYS	0xff6000000ull
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x02000000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x4000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
include/configs/T4240RDB.h +0 -5
index 5969854796ec..5777df8e5076 100644
@@ -121,13 +121,10 @@
 /* controller 3, Slot 1, tgtid 1, Base address 202000 */
 #define CONFIG_SYS_PCIE3_MEM_VIRT	0xc0000000
 #define CONFIG_SYS_PCIE3_MEM_PHYS	0xc40000000ull
-#define CONFIG_SYS_PCIE3_IO_VIRT	0xf8020000
-#define CONFIG_SYS_PCIE3_IO_PHYS	0xff8020000ull
 
 /* controller 4, Base address 203000 */
 #define CONFIG_SYS_PCIE4_MEM_BUS	0xe0000000
 #define CONFIG_SYS_PCIE4_MEM_PHYS	0xc60000000ull
-#define CONFIG_SYS_PCIE4_IO_PHYS	0xff8030000ull
 
 /*
  * Miscellaneous configurable options
@@ -337,9 +334,7 @@
 #define CONFIG_SYS_QMAN_MEM_BASE	0xf6000000
 #define CONFIG_SYS_QMAN_MEM_PHYS	0xff6000000ull
 #define CONFIG_SYS_QMAN_MEM_SIZE	0x02000000
-#define CONFIG_SYS_QMAN_SP_CENA_SIZE    0x4000
 #define CONFIG_SYS_QMAN_SP_CINH_SIZE    0x1000
-#define CONFIG_SYS_QMAN_CENA_BASE       CONFIG_SYS_QMAN_MEM_BASE
 #define CONFIG_SYS_QMAN_CENA_SIZE       (CONFIG_SYS_QMAN_MEM_SIZE >> 1)
 #define CONFIG_SYS_QMAN_CINH_BASE       (CONFIG_SYS_QMAN_MEM_BASE + \
 					CONFIG_SYS_QMAN_CENA_SIZE)
include/configs/aristainetos2.h +0 -2
index 1f2b3b58ca69..35e8840a92a0 100644
@@ -30,8 +30,6 @@
 
 #define CONFIG_FEC_MXC_PHYADDR		0
 
-#define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
-
 #ifdef CONFIG_IMX_HAB
 #define HAB_EXTRA_SETTINGS \
 	"hab_check_addr=" \
include/configs/eb_cpu5282.h +0 -30
index aaa2ef039d94..80a820c913b7 100644
@@ -137,13 +137,7 @@
 #define CONFIG_SYS_PBDDR		0x0000000
 #define CONFIG_SYS_PBDAT		0x0000000
 
-#define CONFIG_SYS_PCCNT		0x0000000	/* Port C D[15:08] */
-#define CONFIG_SYS_PCDDR		0x0000000
-#define CONFIG_SYS_PCDAT		0x0000000
-
 #define CONFIG_SYS_PDCNT		0x0000000	/* Port D D[07:00] */
-#define CONFIG_SYS_PCDDR		0x0000000
-#define CONFIG_SYS_PCDAT		0x0000000
 
 #define CONFIG_SYS_PASPAR		0x0F0F
 #define CONFIG_SYS_PEHLPAR		0xC0
@@ -160,29 +154,5 @@
 #define CONFIG_I2C_RTC_ADDR		0x68
 #endif
 
-/*-----------------------------------------------------------------------
- * VIDEO configuration
- */
-
-#define CONFIG_SYS_VCXK_DEFAULT_LINEALIGN	2
-#define	CONFIG_SYS_VCXK_DOUBLEBUFFERED		1
-#define CONFIG_SYS_VCXK_BASE			CONFIG_SYS_CS2_BASE
-
-#define CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT	MCFGPTB_GPTPORT
-#define CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR		MCFGPTB_GPTDDR
-#define CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN		0x0001
-
-#define CONFIG_SYS_VCXK_ENABLE_PORT		MCFGPTB_GPTPORT
-#define CONFIG_SYS_VCXK_ENABLE_DDR		MCFGPTB_GPTDDR
-#define CONFIG_SYS_VCXK_ENABLE_PIN		0x0002
-
-#define CONFIG_SYS_VCXK_REQUEST_PORT		MCFGPTB_GPTPORT
-#define CONFIG_SYS_VCXK_REQUEST_DDR		MCFGPTB_GPTDDR
-#define CONFIG_SYS_VCXK_REQUEST_PIN		0x0004
-
-#define CONFIG_SYS_VCXK_INVERT_PORT		MCFGPIO_PORTE
-#define CONFIG_SYS_VCXK_INVERT_DDR		MCFGPIO_DDRE
-#define CONFIG_SYS_VCXK_INVERT_PIN		MCFGPIO_PORT2
-
 #endif	/* _CONFIG_M5282EVB_H */
 /*---------------------------------------------------------------------*/
include/configs/highbank.h +0 -5
index 5e2b50bbac10..a7d21a76dba5 100644
@@ -14,11 +14,6 @@
  * Miscellaneous configurable options
  */
 
-/* Environment data setup
-*/
-#define CONFIG_SYS_NVRAM_BASE_ADDR	0xfff88000	/* NVRAM base address */
-#define CONFIG_SYS_NVRAM_SIZE		0x8000		/* NVRAM size */
-
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS				\
include/configs/km/km-mpc8360.h +0 -1
index 92e046d02d72..fb43fb81bc07 100644
@@ -72,4 +72,3 @@
  * PAXE on the local bus CS3
  */
 #define CONFIG_SYS_PAXE_BASE		0xA0000000
-#define CONFIG_SYS_PAXE_SIZE		256
include/configs/km/km-mpc83xx.h +0 -1
index ab0d0a721af1..7d36a25dc232 100644
@@ -8,7 +8,6 @@
  * DDR Setup
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000 /* DDR is system memory */
-#define CONFIG_SYS_SDRAM_BASE2	(CONFIG_SYS_SDRAM_BASE + 0x10000000) /* +256M */
 
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL	(DDR_SDRAM_CLK_CNTL_SS_EN | \
 					DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05)
include/configs/ls1012a2g5rdb.h +0 -4
index f0248e646462..196e024b57e0 100644
@@ -11,10 +11,6 @@
 /* DDR */
 #define CONFIG_SYS_SDRAM_SIZE		0x40000000
 
-/* SATA */
-
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
include/configs/ls1012a_common.h +0 -4
index b57eb52d1488..809f9ae8c8dc 100644
@@ -18,10 +18,6 @@
 /*SPI device */
 #define CFG_SYS_FSL_QSPI_BASE	0x40000000
 
-/* SATA */
-
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
 /* I2C */
 
 /* GPIO */
include/configs/ls1043aqds.h +0 -4
index 3b51cb8f174a..87751f786c8b 100644
@@ -35,10 +35,6 @@
 #define QSGMII_CARD_PORT4_PHY_ADDR_S2 0xB
 #endif
 
-/* SATA */
-
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-
 /*
  * IFC Definitions
  */
include/configs/ls1046a_common.h +0 -5
index 8a3c87c6abdb..3934fbbb41d1 100644
@@ -65,11 +65,6 @@
 
 /* I2C */
 
-/* SATA */
-#ifndef SPL_NO_SATA
-#define CONFIG_SYS_SATA				AHCI_BASE_ADDR
-#endif
-
 /* FMan ucode */
 #ifndef SPL_NO_FMAN
 #define CONFIG_SYS_DPAA_FMAN
include/configs/p1_p2_rdb_pc.h +0 -6
index 9fc22f0a6cbc..44e608536fe8 100644
@@ -279,12 +279,6 @@
 #define CONFIG_SYS_VSC7385_BASE_PHYS	CONFIG_SYS_VSC7385_BASE
 #endif
 
-#define CONFIG_SYS_VSC7385_BR_PRELIM	\
-	(BR_PHYS_ADDR(CONFIG_SYS_VSC7385_BASE_PHYS) | BR_PS_8 | BR_V)
-#define CONFIG_SYS_VSC7385_OR_PRELIM	(OR_AM_128KB | OR_GPCM_CSNT | \
-			OR_GPCM_XACS |  OR_GPCM_SCY_15 | OR_GPCM_SETA | \
-			OR_GPCM_TRLX |  OR_GPCM_EHTR | OR_GPCM_EAD)
-
 /* The size of the VSC7385 firmware image */
 #define CONFIG_VSC7385_IMAGE_SIZE	8192
 #endif
include/configs/phycore_am335x_r2.h +0 -6
index c5817b010f8a..43a60825b575 100644
@@ -97,10 +97,4 @@
 
 #endif /* !CONFIG_MTD_RAW_NAND */
 
-/* CPU */
-
-#ifdef CONFIG_SPI_BOOT
-#define CONFIG_SYS_SPI_U_BOOT_SIZE	0x40000
-#endif
-
 #endif	/* ! __CONFIG_PHYCORE_AM335x_R2_H */
include/configs/r2dplus.h +0 -5
index ac39e11a99e1..406ee6282c5f 100644
@@ -18,9 +18,4 @@
 #define CONFIG_SYS_FLASH_BASE		(0xA0000000)
 #define CONFIG_SYS_FLASH_BANKS_LIST	{ CONFIG_SYS_FLASH_BASE }
 
-/*
- * SuperH Clock setting
- */
-#define	CONFIG_SYS_PLL_SETTLING_TIME	100/* in us */
-
 #endif /* __CONFIG_H */
include/configs/socrates.h +2 -6
index 388a4e42efb9..9b106fc1c97e 100644
@@ -109,12 +109,8 @@
  * Memory space is mapped 1-1.
  */
 
-#define CONFIG_SYS_PCI1_MEM_BASE	0x80000000
-#define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BASE
-#define CONFIG_SYS_PCI1_MEM_SIZE	0x20000000	/* 512M			*/
-#define CONFIG_SYS_PCI1_IO_BASE	0xE2000000
-#define CONFIG_SYS_PCI1_IO_PHYS	CONFIG_SYS_PCI1_IO_BASE
-#define CONFIG_SYS_PCI1_IO_SIZE	0x01000000	/* 16M			*/
+#define CONFIG_SYS_PCI1_MEM_PHYS	0x80000000
+#define CONFIG_SYS_PCI1_IO_PHYS	0xE2000000
 
 #define CONFIG_TSEC1	1
 #define CONFIG_TSEC1_NAME	"TSEC0"
include/configs/ti814x_evm.h +0 -2
index 9614fe686f6b..fc78077014b5 100644
@@ -84,8 +84,6 @@
 
 /* Defines for SPL */
 
-#define CONFIG_SYS_SPI_U_BOOT_SIZE	0x40000
-
 /*
  * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
  * 64 bytes before this address should be set aside for u-boot.img's
include/configs/ti_armv7_keystone2.h +0 -5
index 119b4c0410c7..65abb187d96d 100644
@@ -46,11 +46,6 @@
 /* SPI Configuration */
 #define CONFIG_SYS_SPI_CLK		ks_clk_get_rate(KS2_CLK1_6)
 
-/* Network Configuration */
-#define CONFIG_SYS_SGMII_REFCLK_MHZ	312
-#define CONFIG_SYS_SGMII_LINERATE_MHZ	1250
-#define CONFIG_SYS_SGMII_RATESCALE	2
-
 /* Keystone net */
 #define CONFIG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CONFIG_KSNET_NETCP_BASE			KS2_NETCP_BASE
Signature · 1 line
2.25.1
Reviewed-by on v1 7/17
#17 lore raw

Re: [PATCH 07/17] Remove unused symbols

Quoted 83 lines · Tom Rini

This commit removes the following unused symbols:

   CONFIG_SYS_NVRAM_BASE_ADDR
   CONFIG_SYS_NVRAM_SIZE
   CONFIG_SYS_PAXE_BASE
   CONFIG_SYS_PCCNT
   CONFIG_SYS_PCDAT
   CONFIG_SYS_PCDDR
   CONFIG_SYS_PCI1_ADDR
   CONFIG_SYS_PCI2_ADDR
   CONFIG_SYS_PCI1_IO_BUS
   CONFIG_SYS_PCI1_IO_SIZE
   CONFIG_SYS_PCI1_MEM_BUS
   CONFIG_SYS_PCI1_MEM_SIZE
   CONFIG_SYS_PCIE3_ADDR
   CONFIG_SYS_PCIE4_ADDR
   CONFIG_SYS_PCIE3_IO_PHYS
   CONFIG_SYS_PCIE3_IO_VIRT
   CONFIG_SYS_PCIE4_IO_PHYS
   CONFIG_SYS_PCIE4_IO_VIRT
   CONFIG_SYS_PLL_SETTLING_TIME
   CONFIG_SYS_QMAN_CENA_BASE
   CONFIG_SYS_QMAN_SP_CENA_SIZE
   CONFIG_SYS_RCAR_I2C0_BASE
   CONFIG_SYS_RCAR_I2C1_BASE
   CONFIG_SYS_RCAR_I2C2_BASE
   CONFIG_SYS_RCAR_I2C3_BASE
   CONFIG_SYS_SATA
   CONFIG_SYS_SDRAM_BASE2
   CONFIG_SYS_SGMII_REFCLK_MHZ
   CONFIG_SYS_SGMII_LINERATE_MHZ
   CONFIG_SYS_SGMII_RATESCALE
   CONFIG_SYS_SH_SDHI0_BASE
   CONFIG_SYS_SH_SDHI0_BASE
   CONFIG_SYS_SH_SDHI1_BASE
   CONFIG_SYS_SH_SDHI2_BASE
   CONFIG_SYS_SH_SDHI3_BASE
   CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
   CONFIG_SYS_SPI_U_BOOT_SIZE
   CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
   CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
   CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT
   CONFIG_SYS_VCXK_BASE
   CONFIG_SYS_VCXK_DEFAULT_LINEALIGN
   CONFIG_SYS_VCXK_DOUBLEBUFFERED
   CONFIG_SYS_VCXK_ENABLE_DDR
   CONFIG_SYS_VCXK_ENABLE_PIN
   CONFIG_SYS_VCXK_ENABLE_PORT
   CONFIG_SYS_VCXK_INVERT_DDR
   CONFIG_SYS_VCXK_INVERT_PIN
   CONFIG_SYS_VCXK_INVERT_PORT
   CONFIG_SYS_VCXK_REQUEST_DDR
   CONFIG_SYS_VCXK_REQUEST_PIN
   CONFIG_SYS_VCXK_REQUEST_PORT
   CONFIG_SYS_VSC7385_BR_PRELIM
   CONFIG_SYS_VSC7385_OR_PRELIM
---
 .../asm/arch-fsl-layerscape/immap_lsch2.h     |  3 --
 .../asm/arch-fsl-layerscape/immap_lsch3.h     |  2 --
 arch/arm/mach-rmobile/include/mach/r8a7790.h  |  3 --
 arch/arm/mach-rmobile/include/mach/r8a7791.h  |  2 --
 arch/arm/mach-rmobile/include/mach/r8a7793.h  |  2 --
 arch/arm/mach-rmobile/include/mach/r8a7794.h  |  2 --
 .../arm/mach-rmobile/include/mach/rcar-base.h |  9 ------
 arch/powerpc/include/asm/immap_85xx.h         |  8 -----
 include/configs/M5282EVB.h                    |  6 ----
 include/configs/MPC8548CDS.h                  |  5 ----
 include/configs/P2041RDB.h                    |  4 ---
 include/configs/T102xRDB.h                    |  4 ---
 include/configs/T104xRDB.h                    |  6 ----
 include/configs/T208xQDS.h                    |  5 ----
 include/configs/T208xRDB.h                    |  5 ----
 include/configs/T4240RDB.h                    |  5 ----
 include/configs/aristainetos2.h               |  2 --
 include/configs/eb_cpu5282.h                  | 30 -------------------
 include/configs/highbank.h                    |  5 ----
 include/configs/km/km-mpc8360.h               |  1 -
 include/configs/km/km-mpc83xx.h               |  1 -
 include/configs/ls1012a2g5rdb.h               |  4 ---
 include/configs/ls1012a_common.h              |  4 ---
 include/configs/ls1043aqds.h                  |  4 ---
Quoted 8 lines
 include/configs/ls1046a_common.h              |  5 ----
 include/configs/p1_p2_rdb_pc.h                |  6 ----
 include/configs/phycore_am335x_r2.h           |  6 ----
 include/configs/r2dplus.h                     |  5 ----
 include/configs/socrates.h                    |  8 ++---
 include/configs/ti814x_evm.h                  |  2 --
 include/configs/ti_armv7_keystone2.h          |  5 ----
 31 files changed, 2 insertions(+), 157 deletions(-)
author
#18 lore raw

PATCH 8/17 Convert CONFIG_SYS_OMAP_ABE_SYSCK to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_OMAP_ABE_SYSCK

---
 arch/arm/mach-omap2/Kconfig       | 3 +++
 arch/arm/mach-omap2/omap5/Kconfig | 1 +
 include/configs/am57xx_evm.h      | 2 --
 include/configs/dra7xx_evm.h      | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/Kconfig +3 -0
index 78317e474dbf..3bf972052260 100644
@@ -144,6 +144,9 @@ config SYS_MPUCLK
 	help
 	  Defines the MPU clock speed (in MHz).
 
+config SYS_OMAP_ABE_SYSCK
+	bool
+
 config TI_SECURE_EMIF_REGION_START
 	hex "Reserved EMIF region start address"
 	depends on TI_SECURE_DEVICE
arch/arm/mach-omap2/omap5/Kconfig +1 -0
index 4c2f990b2878..18a66764224d 100644
@@ -2,6 +2,7 @@ if OMAP54XX
 
 config DRA7XX
 	bool
+	select SYS_OMAP_ABE_SYSCK
 	help
 	  DRA7xx is an OMAP based SOC with Dual Core A-15s.
 
include/configs/am57xx_evm.h +0 -2
index c3b6a3fbda2c..84555f3b13dc 100644
@@ -20,8 +20,6 @@
 #define CFG_SYS_NS16550_COM2		UART2_BASE	/* UART2 */
 #define CFG_SYS_NS16550_COM3		UART3_BASE	/* UART3 */
 
-#define CONFIG_SYS_OMAP_ABE_SYSCK
-
 #ifndef CONFIG_SPL_BUILD
 #define DFUARGS \
 	"dfu_bufsiz=0x10000\0" \
include/configs/dra7xx_evm.h +0 -2
index e1d18a778306..bb335a0a473c 100644
@@ -31,8 +31,6 @@
 #define CFG_SYS_NS16550_COM2		UART2_BASE	/* UART2 */
 #define CFG_SYS_NS16550_COM3		UART3_BASE	/* UART3 */
 
-#define CONFIG_SYS_OMAP_ABE_SYSCK
-
 #ifndef CONFIG_SPL_BUILD
 #define DFUARGS \
 	"dfu_bufsiz=0x10000\0" \
Signature · 1 line
2.25.1
Reviewed-by on v1 8/17
#19 lore raw

Re: [PATCH 08/17] Convert CONFIG_SYS_OMAP_ABE_SYSCK to Kconfig

Quoted 11 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_OMAP_ABE_SYSCK

---
 arch/arm/mach-omap2/Kconfig       | 3 +++
 arch/arm/mach-omap2/omap5/Kconfig | 1 +
 include/configs/am57xx_evm.h      | 2 --
 include/configs/dra7xx_evm.h      | 2 --
 4 files changed, 4 insertions(+), 4 deletions(-)