[PATCH 01/38] power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

[PATCH 01/38] power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

[Tom Rini]

As we have more legacy PMIC drivers to move to Kconfig, guard them all
with POWER_LEGACY or SPL_POWER_LEGACY. Do the same kind of check for
building the drivers too. This also means that we need to resort the
list slightly in the Makefile.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/pmic/Kconfig  |  5 ++++-
 drivers/power/pmic/Makefile | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig
index 628d3a94bcba..d30bb4d4e9cc 100644
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@ -393,10 +393,13 @@ config PMIC_TPS65217
 	only, and you can enable the regulator/charger drivers separately if
 	required.
 
+if POWER_LEGACY || SPL_POWER_LEGACY
+
 config POWER_MC34VR500
 	bool "Enable driver for Freescale MC34VR500 PMIC"
-	depends on !DM_PMIC
 	---help---
 	The MC34VR500 is used in conjunction with the FSL T1 and LS1 series
 	SoC. It provides 4 buck DC-DC convertors and 5 LDOs, and it is accessed
 	via an I2C interface.
+
+endif
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 58c6507c58c3..e78dc1e20535 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -30,17 +30,19 @@ obj-$(CONFIG_$(SPL_)PMIC_PALMAS) += palmas.o
 obj-$(CONFIG_$(SPL_)PMIC_LP873X) += lp873x.o
 obj-$(CONFIG_$(SPL_)PMIC_LP87565) += lp87565.o
 obj-$(CONFIG_PMIC_STPMIC1) += stpmic1.o
+obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o
+obj-$(CONFIG_PMIC_TPS65219) += tps65219.o
+obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
 
+ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y)
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
-obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o
-obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o
+obj-$(CONFIG_POWER_TPS62362) += pmic_tps62362.o
 obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
 obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o
 obj-$(CONFIG_POWER_HI6553) += pmic_hi6553.o
 obj-$(CONFIG_POWER_MC34VR500) += pmic_mc34vr500.o
-obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
-obj-$(CONFIG_PMIC_TPS65219) += tps65219.o
+endif
-- 
2.25.1

[PATCH 02/38] Convert CONFIG_FSL_CADMUS to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FSL_CADMUS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc8548cds/Kconfig | 3 +++
 include/configs/MPC8548CDS.h       | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/board/freescale/mpc8548cds/Kconfig b/board/freescale/mpc8548cds/Kconfig
index bd9153bc0d74..723ead51e5ce 100644
--- a/board/freescale/mpc8548cds/Kconfig
+++ b/board/freescale/mpc8548cds/Kconfig
@@ -3,6 +3,9 @@ if TARGET_MPC8548CDS
 config PCI1
 	def_bool y
 
+config FSL_CADMUS
+	def_bool y
+
 config SYS_BOARD
 	default "mpc8548cds"
 
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index ff02c2cd8472..e41b8e0843a7 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -217,8 +217,6 @@
  * 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7
  */
 
-#define CONFIG_FSL_CADMUS
-
 #define CADMUS_BASE_ADDR 0xf8000000
 #ifdef CONFIG_PHYS_64BIT
 #define CADMUS_BASE_ADDR_PHYS	0xff8000000ull
-- 
2.25.1

[PATCH 03/38] Convert CONFIG_FSL_DEVICE_DISABLE to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FSL_DEVICE_DISABLE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/ls102xa/Kconfig   | 4 ++++
 include/configs/km/pg-wcom-ls102xa.h | 1 -
 include/configs/ls1021aiot.h         | 2 --
 include/configs/ls1021aqds.h         | 2 --
 include/configs/ls1021atsn.h         | 2 --
 include/configs/ls1021atwr.h         | 2 --
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index e75a895e0086..369e68b8193b 100644
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -1,5 +1,6 @@
 config ARCH_LS1021A
 	bool
+	select FSL_DEVICE_DISABLE
 	select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI
 	select SYS_FSL_DDR_BE if SYS_FSL_DDR
 	select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR
@@ -30,6 +31,9 @@ config ARCH_LS1021A
 menu "LS102xA architecture"
 	depends on ARCH_LS1021A
 
+config FSL_DEVICE_DISABLE
+	bool
+
 config LS1_DEEP_SLEEP
 	bool "Deep sleep"
 
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 7307c495c38e..6ccb4f07e3be 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -168,7 +168,6 @@
 
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
-#define CONFIG_FSL_DEVICE_DISABLE
 
 /*
  * Miscellaneous configurable options
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index b058308ecdbe..3063635592e2 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -95,8 +95,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 "initrd_high=0xffffffff\0"
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 5494b71e2b21..137d459c291e 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -279,8 +279,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #ifdef CONFIG_LPUART
 #define CONFIG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index bc9eac700e98..052a15658d71 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -70,8 +70,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0) \
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index f1ccb5fc0840..f39c7c088446 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -160,8 +160,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_FSL_DEVICE_DISABLE
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0) \
-- 
2.25.1

[PATCH 04/38] Convert CONFIG_FSL_IIM to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FSL_IIM

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/m53menlo_defconfig  | 1 +
 configs/mx51evk_defconfig   | 1 +
 configs/mx53ppd_defconfig   | 1 +
 configs/usbarmory_defconfig | 1 +
 doc/README.fsl_iim          | 2 +-
 drivers/misc/Kconfig        | 4 ++++
 include/configs/m53menlo.h  | 3 ---
 include/configs/mx51evk.h   | 1 -
 include/configs/mx53ppd.h   | 2 --
 include/configs/usbarmory.h | 3 ---
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index b4ada56a36b7..a5760242be51 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -80,6 +80,7 @@ CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_IIM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 89597c05748c..d76ebe8fd229 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC0"
 CONFIG_ARP_TIMEOUT=200
+CONFIG_FSL_IIM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 328f546c5b3f..ed4ebbbe3c27 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_MXC=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
+CONFIG_FSL_IIM=y
 CONFIG_I2C_EEPROM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index 510e215bff3a..ed2bcc69fc50 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_IIM=y
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_PINCTRL=y
diff --git a/doc/README.fsl_iim b/doc/README.fsl_iim
index e087f5e0e4ff..78d3cb8b3efe 100644
--- a/doc/README.fsl_iim
+++ b/doc/README.fsl_iim
@@ -45,4 +45,4 @@ Fuse operations:
 Configuration:
 
    CONFIG_FSL_IIM
-      Define this to enable the fsl_iim driver.
+      Enable this to enable the fsl_iim driver.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a6da6e215dec..fb3bbb3b919f 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -267,6 +267,10 @@ config DS4510
 	  and a configurable timer for the supervisor function. The device is
 	  connected over I2C.
 
+config FSL_IIM
+	bool "Enable FSL IC Identification Module (IIM) driver"
+	depends on ARCH_MX31 || ARCH_MX5
+
 config FSL_SEC_MON
 	bool "Enable FSL SEC_MON Driver"
 	help
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index f87bbf7ccf32..eca86a94519a 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -80,9 +80,6 @@
 #define CFG_SYS_LDB_CLOCK			33260000
 #define CONFIG_IMX_VIDEO_SKIP
 
-/* IIM Fuses */
-#define CONFIG_FSL_IIM
-
 /* Watchdog */
 
 /*
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3c99b70a2bb1..6d9b954587ef 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -17,7 +17,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_FSL_IIM
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 7160654eb30c..913bc1996d40 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -102,8 +102,6 @@
 
 /* FLASH and environment organization */
 
-#define CONFIG_FSL_IIM
-
 /* Backlight Control */
 #define CONFIG_IMX6_PWM_PER_CLK 66666000
 
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index da68d7a0da99..a2bc3cd23a5b 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -27,9 +27,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 
-/* Fuse */
-#define CONFIG_FSL_IIM
-
 /* Linux boot */
 #define CONFIG_HOSTNAME		"usbarmory"
 
-- 
2.25.1

[PATCH 05/38] Convert CONFIG_FSL_LBC to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FSL_LBC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/Kconfig              | 4 ++++
 arch/powerpc/include/asm/config.h | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cf93a7b1dad0..0fc4ceda000d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -34,6 +34,10 @@ config MPC8xx
 
 endchoice
 
+config FSL_LBC
+	def_bool y
+	depends on (MPC85xx || MPC83xx) && !FSL_IFC
+
 config HIGH_BATS
 	bool "Enable high BAT registers"
 	help
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index b0ad7d7aa728..983c6f70cfee 100644
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -32,14 +32,6 @@
 #define BPTR_VIRT_ADDR	0xfffff000
 #endif
 
-/* Since so many PPC SOCs have a semi-common LBC, define this here */
-#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) || \
-	defined(CONFIG_MPC83xx)
-#if !defined(CONFIG_FSL_IFC)
-#define CONFIG_FSL_LBC
-#endif
-#endif
-
 /* The TSEC driver uses the PHYLIB infrastructure */
 #if defined(CONFIG_TSEC_ENET) && defined(CONFIG_PHYLIB)
 #include <config_phylib_all_drivers.h>
-- 
2.25.1

[PATCH 06/38] Convert CONFIG_FSL_SERDES to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FSL_SERDES

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/Kconfig  | 4 ++++
 arch/powerpc/cpu/mpc83xx/serdes.c | 4 ----
 configs/MPC837XERDB_defconfig     | 1 +
 include/configs/MPC837XERDB.h     | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index ec3405e9678f..563f52c5fdb3 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -196,6 +196,10 @@ config 83XX_PCICLK
 config FSL_ELBC
 	bool
 
+config FSL_SERDES
+	bool "SerDes initialization"
+	depends on !MPC83XX_SERDES
+
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
diff --git a/arch/powerpc/cpu/mpc83xx/serdes.c b/arch/powerpc/cpu/mpc83xx/serdes.c
index bb963ee5e2f4..d4848b2ec4d5 100644
--- a/arch/powerpc/cpu/mpc83xx/serdes.c
+++ b/arch/powerpc/cpu/mpc83xx/serdes.c
@@ -8,8 +8,6 @@
  * Author: Li Yang <leoli@freescale.com>
  */
 
-#ifndef CONFIG_MPC83XX_SERDES
-
 #include <config.h>
 #include <common.h>
 #include <asm/io.h>
@@ -151,5 +149,3 @@ void fsl_setup_serdes(u32 offset, char proto, u32 rfcks, char vdd)
 	tmp |= FSL_SRDSRSTCTL_RST;
 	out_be32(regs + FSL_SRDSRSTCTL_OFFS, tmp);
 }
-
-#endif /* !CONFIG_MPC83XX_SERDES */
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 675b2de151c7..d97fa5aec521 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -147,6 +147,7 @@ CONFIG_ACR_RPTCNT_4=y
 CONFIG_SPCR_TSECEP_3=y
 CONFIG_LCRR_DBYP_PLL_BYPASSED=y
 CONFIG_LCRR_CLKDIV_8=y
+CONFIG_FSL_SERDES=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 85c080cf27a5..717320c34aeb 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -160,7 +160,6 @@
 #define CFG_SYS_NS16550_COM2	(CONFIG_SYS_IMMR+0x4600)
 
 /* SERDES */
-#define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1	0xe3000
 #define CONFIG_FSL_SERDES2	0xe3100
 
-- 
2.25.1

[PATCH 07/38] Convert CONFIG_HIKEY_GPIO et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_HIKEY_GPIO
   CONFIG_TCA642X

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/hikey_defconfig      | 1 +
 configs/omap5_uevm_defconfig | 2 +-
 drivers/gpio/Kconfig         | 9 +++++++++
 include/configs/hikey.h      | 2 --
 include/configs/omap5_uevm.h | 1 -
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index 9eec9281849c..d023653815cd 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_HIKEY_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
 CONFIG_POWER_LEGACY=y
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index bd0ede759cb9..502990b0a8b9 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -47,7 +47,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
-CONFIG_CMD_TCA642X=y
+CONFIG_TCA642X=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index ff87fbfb397e..e007b38fac71 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -169,6 +169,10 @@ config FXL6408_GPIO
 	  This driver supports the Fairchild FXL6408 device. FXL6408 is a
 	  fully configurable 8-bit I2C-controlled GPIO expander.
 
+config HIKEY_GPIO
+	bool "HI6220 GPIO driver"
+	depends on DM_GPIO
+
 config INTEL_BROADWELL_GPIO
 	bool "Intel Broadwell GPIO driver"
 	depends on DM
@@ -374,8 +378,13 @@ config XILINX_GPIO
 	help
 	  This config enable the Xilinx GPIO driver for Microblaze.
 
+config TCA642X
+	bool "TCA642x legacy GPIO driver"
+
 config CMD_TCA642X
 	bool "tca642x - Command to access tca642x state"
+	depends on TCA642X
+	default y
 	help
 	  DEPRECATED - This needs conversion to driver model
 
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index c5ef2f99b0f4..eefdbd6ed11b 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -32,8 +32,6 @@
 #define GICD_BASE			0xf6801000
 #define GICC_BASE			0xf6802000
 
-#define CONFIG_HIKEY_GPIO
-
 /* Initial environment variables */
 
 /*
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 1634db860640..d7fa2d43914a 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -36,7 +36,6 @@
 #define CONFIG_HSMMC2_8BIT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
-#define CONFIG_TCA642X
 #define CFG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CFG_SYS_I2C_TCA642X_ADDR 0x22
 
-- 
2.25.1

[PATCH 08/38] Convert CONFIG_POWER_LTC3676 et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_POWER_FSL
   CONFIG_POWER_FSL_MC13892
   CONFIG_POWER_HI6553
   CONFIG_POWER_LTC3676
   CONFIG_POWER_PFUZE100
   CONFIG_POWER_PFUZE3000
   CONFIG_POWER_SPI
   CONFIG_POWER_TPS65090_EC
   CONFIG_POWER_TPS65218
   CONFIG_POWER_TPS65910

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/Makefile           |  2 ++
 configs/am335x_baltos_defconfig           |  1 +
 configs/am335x_boneblack_vboot_defconfig  |  1 +
 configs/am335x_evm_defconfig              |  1 +
 configs/am335x_evm_spiboot_defconfig      |  1 +
 configs/am335x_hs_evm_defconfig           |  1 +
 configs/am335x_hs_evm_uart_defconfig      |  1 +
 configs/am335x_sl50_defconfig             |  1 +
 configs/am43xx_evm_defconfig              |  2 ++
 configs/am43xx_evm_qspiboot_defconfig     |  2 ++
 configs/am43xx_evm_rtconly_defconfig      |  2 ++
 configs/am43xx_evm_usbhost_boot_defconfig |  2 ++
 configs/am43xx_hs_evm_defconfig           |  2 ++
 configs/am43xx_hs_evm_qspi_defconfig      |  2 ++
 configs/cl-som-imx7_defconfig             |  1 +
 configs/cm_t43_defconfig                  |  1 +
 configs/gwventana_emmc_defconfig          |  2 ++
 configs/gwventana_gw5904_defconfig        |  2 ++
 configs/gwventana_nand_defconfig          |  2 ++
 configs/hikey_defconfig                   |  1 +
 configs/imx8mq_evk_defconfig              |  1 +
 configs/kontron_pitx_imx8m_defconfig      |  1 +
 configs/mx51evk_defconfig                 |  2 ++
 configs/mx53loco_defconfig                |  1 +
 configs/mx6sabreauto_defconfig            |  1 +
 configs/mx6sabresd_defconfig              |  1 +
 configs/novena_defconfig                  |  1 +
 configs/pcm051_rev3_defconfig             |  1 +
 configs/phycore-am335x-r2-regor_defconfig |  1 +
 configs/phycore-am335x-r2-wega_defconfig  |  1 +
 configs/pico-dwarf-imx7d_defconfig        |  1 +
 configs/pico-hobbit-imx7d_defconfig       |  1 +
 configs/pico-imx7d_bl33_defconfig         |  1 +
 configs/pico-imx7d_defconfig              |  1 +
 configs/pico-nymph-imx7d_defconfig        |  1 +
 configs/pico-pi-imx7d_defconfig           |  1 +
 configs/udoo_neo_defconfig                |  1 +
 configs/vining_2000_defconfig             |  1 +
 drivers/power/Kconfig                     | 21 ++++++++++++++++++
 drivers/power/pmic/Kconfig                | 27 +++++++++++++++++++++++
 drivers/power/pmic/Makefile               |  7 +++---
 drivers/power/power_fsl.c                 |  2 --
 include/configs/am335x_evm.h              |  3 ---
 include/configs/am335x_sl50.h             |  7 ------
 include/configs/am43xx_evm.h              |  8 -------
 include/configs/baltos.h                  |  3 ---
 include/configs/cl-som-imx7.h             |  1 -
 include/configs/cm_t43.h                  |  3 ---
 include/configs/el6x_common.h             |  1 -
 include/configs/gw_ventana.h              |  2 --
 include/configs/hikey.h                   |  2 --
 include/configs/imx8mq_evk.h              |  1 -
 include/configs/kontron_pitx_imx8m.h      |  1 -
 include/configs/mx51evk.h                 |  2 --
 include/configs/mx53loco.h                |  2 --
 include/configs/mx6sabreauto.h            |  1 -
 include/configs/mx6sabresd.h              |  1 -
 include/configs/novena.h                  |  1 -
 include/configs/peach-pi.h                |  2 --
 include/configs/phycore_am335x_r2.h       |  2 --
 include/configs/pico-imx7d.h              |  1 -
 include/configs/tqma6.h                   |  1 -
 include/configs/udoo_neo.h                |  1 -
 include/configs/vining_2000.h             |  1 -
 64 files changed, 101 insertions(+), 52 deletions(-)

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 377c6aa077dc..cc1371867d86 100644
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -61,7 +61,9 @@ obj-$(CONFIG_TARGET_P4080DS)		+= ics307_clk.o
 obj-$(CONFIG_TARGET_P5040DS)		+= ics307_clk.o
 obj-$(CONFIG_VSC_CROSSBAR)    += vsc3316_3308.o
 obj-$(CONFIG_ZM7300)		+= zm7300.o
+ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y)
 obj-$(CONFIG_POWER_PFUZE100)	+= pfuze.o
+endif
 obj-$(CONFIG_DM_PMIC_PFUZE100)	+= pfuze.o
 obj-$(CONFIG_POWER_MC34VR500)	+= mc34vr500.o
 ifneq (,$(filter $(SOC), imx8ulp imx9))
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index bd23b71b096e..9976cee81fcc 100644
--- a/configs/am335x_baltos_defconfig
+++ b/configs/am335x_baltos_defconfig
@@ -79,6 +79,7 @@ CONFIG_PHY_SMSC=y
 CONFIG_DM_MDIO=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 66b7fb6e06d8..442783a9d02b 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -76,6 +76,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index f0fbe475b394..cee31676d440 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -101,6 +101,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 3d04e6fa934a..ae4a7018d39c 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -88,6 +88,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index 8d3a4548d9a0..5dc9ba98fdea 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -80,6 +80,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig
index 7080b14c4671..68513c1b6a92 100644
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -81,6 +81,7 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index 65b20550c0c6..673824cfecf4 100644
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -75,6 +75,7 @@ CONFIG_PHY_SMSC=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index 2dfd936057f0..2faf1322f9ea 100644
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -88,6 +88,8 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PHY=y
 CONFIG_SPL_PHY=y
 CONFIG_OMAP_USB2_PHY=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index 0b759c8c2c40..20e1a469aaa1 100644
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -53,6 +53,8 @@ CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index 357da192b83b..4241070930f7 100644
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -72,6 +72,8 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHY_GIGE=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 0e58221c8203..91270d032bff 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -91,6 +91,8 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PHY=y
 CONFIG_SPL_PHY=y
 CONFIG_OMAP_USB2_PHY=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index 2b5a7fb2599b..b6b74af735e7 100644
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -86,6 +86,8 @@ CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PHY=y
 CONFIG_SPL_PHY=y
 CONFIG_OMAP_USB2_PHY=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
diff --git a/configs/am43xx_hs_evm_qspi_defconfig b/configs/am43xx_hs_evm_qspi_defconfig
index 68a96518878b..3d3530d967c6 100644
--- a/configs/am43xx_hs_evm_qspi_defconfig
+++ b/configs/am43xx_hs_evm_qspi_defconfig
@@ -55,6 +55,8 @@ CONFIG_SF_DEFAULT_SPEED=48000000
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_POWER_TPS65218=y
+CONFIG_POWER_TPS62362=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_TI_QSPI=y
diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index f3ee559d21fc..3571dba6d2ae 100644
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -95,6 +95,7 @@ CONFIG_PHY_ATHEROS=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_DM_REGULATOR=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 0a5ce2046f1c..867ca3032058 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -95,6 +95,7 @@ CONFIG_PHY_ATHEROS=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_TPS65218=y
 CONFIG_POWER_I2C=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index cabe09e6d389..ce81b558ee21 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -119,6 +119,8 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_LTC3676=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index f58abd9c5e57..3ef909a1ce30 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -123,6 +123,8 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_LTC3676=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index a41b3c4c97ef..d3d4876658a0 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -129,6 +129,8 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_LTC3676=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index d023653815cd..152459ece8dc 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -34,6 +34,7 @@ CONFIG_HIKEY_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_HI6553=y
 CONFIG_CONS_INDEX=4
 CONFIG_USB=y
 CONFIG_USB_DWC2=y
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig
index 274cdb948d7c..79a27dedb371 100644
--- a/configs/imx8mq_evk_defconfig
+++ b/configs/imx8mq_evk_defconfig
@@ -88,6 +88,7 @@ CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_IMX8M_POWER_DOMAIN=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig
index d2726b1c2002..898a0b45e85a 100644
--- a/configs/kontron_pitx_imx8m_defconfig
+++ b/configs/kontron_pitx_imx8m_defconfig
@@ -95,6 +95,7 @@ CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_IMX8M_POWER_DOMAIN=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index d76ebe8fd229..774523bc84b8 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -54,6 +54,8 @@ CONFIG_POWER_LEGACY=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_POWER_FSL=y
+CONFIG_POWER_SPI=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 193120f71a46..08bcd35f0734 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -58,6 +58,7 @@ CONFIG_POWER_LEGACY=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_POWER_FSL=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_USB=y
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 2aa15ce8c651..634473f30743 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -95,6 +95,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index 766ce0edc459..4f7d3704203e 100644
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -102,6 +102,7 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_POWER_I2C=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index f6690b4ac85f..5f761799a21f 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -79,6 +79,7 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_DM_THERMAL=y
diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 373c609d2141..3ed55916d23d 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -56,6 +56,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/phycore-am335x-r2-regor_defconfig b/configs/phycore-am335x-r2-regor_defconfig
index b6b5274f03ee..1b3167656852 100644
--- a/configs/phycore-am335x-r2-regor_defconfig
+++ b/configs/phycore-am335x-r2-regor_defconfig
@@ -83,6 +83,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
 CONFIG_DM_SPI_FLASH=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/phycore-am335x-r2-wega_defconfig b/configs/phycore-am335x-r2-wega_defconfig
index 5012049fed98..c5ffb4127470 100644
--- a/configs/phycore-am335x-r2-wega_defconfig
+++ b/configs/phycore-am335x-r2-wega_defconfig
@@ -84,6 +84,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND=0x100000
 CONFIG_DM_SPI_FLASH=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_SPL_POWER_TPS65910=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
index 821357827a79..46777e04fdb9 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index 759866ce1195..fb354d1cdee7 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
index 8631f81f3333..35e6f1d5493e 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -77,6 +77,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_CONS_INDEX=4
 CONFIG_MXC_UART=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index a84954d22fd5..13cc97bb73cc 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig
index 821357827a79..46777e04fdb9 100644
--- a/configs/pico-nymph-imx7d_defconfig
+++ b/configs/pico-nymph-imx7d_defconfig
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index dec428097472..6e92366beff0 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -81,6 +81,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_POWER_I2C=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
index 95428e199359..f62a585b1c39 100644
--- a/configs/udoo_neo_defconfig
+++ b/configs/udoo_neo_defconfig
@@ -57,6 +57,7 @@ CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE3000=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_ANATOP=y
diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index 3b5658ddc890..7f84209b6555 100644
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -89,6 +89,7 @@ CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y
+CONFIG_POWER_PFUZE100=y
 CONFIG_POWER_I2C=y
 CONFIG_PWM_IMX=y
 CONFIG_DM_SERIAL=y
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index bc47cf144dd0..5dbcde333ba5 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -430,6 +430,10 @@ config PALMAS_POWER
 	bool "Palmas power support"
 	depends on OMAP54XX
 
+config POWER_FSL
+	bool "Power control (legacy) for Freescale / NXP platforms"
+	depends on POWER_LEGACY
+
 config POWER_I2C
 	bool "I2C-based power control for legacy power"
 	depends on POWER_LEGACY
@@ -440,6 +444,10 @@ config POWER_I2C
 	  Not to be used for new designs and existing ones should be moved to
 	  the new PMIC interface based on driver model.
 
+config POWER_SPI
+	bool "SPI-based power control for legacy power_fsl driver"
+	depends on POWER_FSL && !POWER_I2C
+
 config SPL_POWER_I2C
 	bool "I2C-based power control for legacy power"
 	depends on SPL_POWER_LEGACY
@@ -451,4 +459,17 @@ config SPL_POWER_I2C
 	  Not to be used for new designs and existing ones should be moved to
 	  the new PMIC interface based on driver model.
 
+choice
+	prompt "PMIC chip"
+	default POWER_FSL_MC13892
+	depends on POWER_FSL && POWER_I2C
+
+config POWER_FSL_MC13892
+	bool "MC13892"
+
+config POWER_FSL_MC34704
+	bool "MC34704"
+
+endchoice
+
 endif
diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig
index d30bb4d4e9cc..d94048db5f7e 100644
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@ -393,8 +393,35 @@ config PMIC_TPS65217
 	only, and you can enable the regulator/charger drivers separately if
 	required.
 
+config POWER_TPS65218
+	bool "Enable legacy driver for TPS65218 PMIC"
+
+config POWER_TPS62362
+	bool "Enable legacy driver for TPS62362 PMIC"
+
+config SPL_POWER_TPS62362
+	bool "Enable legacy driver for TPS62362 PMIC in SPL"
+	default y if POWER_TPS62362
+	depends on SPL
+
+config SPL_POWER_TPS65910
+	bool "Enable legacy driver for TPS65910 PMIC in SPL"
+	depends on SPL
+
 if POWER_LEGACY || SPL_POWER_LEGACY
 
+config POWER_HI6553
+	bool "Enable legacy driver for HI6553 PMIC"
+
+config POWER_LTC3676
+	bool "Enable legacy driver for LTC3676 PMIC"
+
+config POWER_PFUZE100
+	bool "Enable legacy driver for PFUZE100 PMIC"
+
+config POWER_PFUZE3000
+	bool "Enable legacy driver for PFUZE3000 PMIC"
+
 config POWER_MC34VR500
 	bool "Enable driver for Freescale MC34VR500 PMIC"
 	---help---
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index e78dc1e20535..c3180c582085 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_PMIC_STPMIC1) += stpmic1.o
 obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o
 obj-$(CONFIG_PMIC_TPS65219) += tps65219.o
 obj-$(CONFIG_PMIC_TPS65941) += tps65941.o
+obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
 
 ifeq ($(CONFIG_$(SPL_)POWER_LEGACY),y)
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
@@ -40,9 +41,9 @@ obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
-obj-$(CONFIG_POWER_TPS62362) += pmic_tps62362.o
-obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o
-obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o
 obj-$(CONFIG_POWER_HI6553) += pmic_hi6553.o
 obj-$(CONFIG_POWER_MC34VR500) += pmic_mc34vr500.o
 endif
+
+obj-$(CONFIG_$(SPL_)POWER_TPS62362) += pmic_tps62362.o
+obj-$(CONFIG_SPL_POWER_TPS65910) += pmic_tps65910.o
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 7180b5127a5b..9bb7e39f2cc2 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -49,8 +49,6 @@ int pmic_init(unsigned char bus)
 	p->interface = PMIC_I2C;
 	p->hw.i2c.addr = CFG_SYS_FSL_PMIC_I2C_ADDR;
 	p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
-#else
-#error "You must select CONFIG_POWER_SPI or CONFIG_POWER_I2C"
 #endif
 
 	return 0;
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 69b8b048ce39..755f7fae3e4f 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -165,9 +165,6 @@
 #define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 4af9edafca8f..342a068c855f 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -43,11 +43,4 @@
 #define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
-/* SPL */
-
-/* Network. */
-
 #endif	/* ! __CONFIG_AM335X_SL50_H */
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index bcdff2e98acd..7659c1cc0619 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -16,14 +16,6 @@
 /* NS16550 Configuration */
 #define CFG_SYS_NS16550_CLK		48000000
 
-/* I2C Configuration */
-
-/* Power */
-#define CONFIG_POWER_TPS65218
-#define CONFIG_POWER_TPS62362
-
-/* SPL defines. */
-
 /* Enabling L2 Cache */
 #define CFG_SYS_PL310_BASE	0x48242000
 
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index f29729d09bac..6f6552e6dc34 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -188,9 +188,6 @@
 #define CFG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CFG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65910
-
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b1f9470d9ca4..4aaa52f26980 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -19,7 +19,6 @@
 #define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 
 #define CONFIG_PCA953X
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 8ad1cfb5ded3..fcc17fc6b7ce 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -28,9 +28,6 @@
 					 42, 43, 44, 45, 46, 47, 48, 49, \
 					 50, 51, 52, 53, 54, 55, 56, 57, }
 
-/* Power */
-#define CONFIG_POWER_TPS65218
-
 /* Enabling L2 Cache */
 #define CFG_SYS_PL310_BASE		0x48242000
 
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 141f9913e639..89e071c0df66 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -17,7 +17,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Commands */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index b855bbc25fb8..65283afd2a06 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -30,9 +30,7 @@
 /*
  * PMIC
  */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
-#define CONFIG_POWER_LTC3676
 #define CONFIG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index eefdbd6ed11b..d4280decc9f0 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -13,8 +13,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_POWER_HI6553
-
 /* Physical Memory Map */
 
 /* CONFIG_TEXT_BASE needs to align with where ATF loads bl33.bin */
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index aa29e7884f9e..688c0bf70080 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -18,7 +18,6 @@
 #define CONFIG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 #endif
 
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 2abcb849a281..17c63d834107 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -20,7 +20,6 @@
 /* For RAW image gives a error info not panic */
 
 
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR  0x08
 #endif
 
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 6d9b954587ef..d9d76d7c08da 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -21,8 +21,6 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
-#define CONFIG_POWER_SPI
-#define CONFIG_POWER_FSL
 #define CONFIG_FSL_PMIC_BUS	0
 #define CONFIG_FSL_PMIC_CS	0
 #define CONFIG_FSL_PMIC_CLK	2500000
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index b52e70c95a04..d0107fcc8cb1 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -22,8 +22,6 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
-#define CONFIG_POWER_FSL
-#define CONFIG_POWER_FSL_MC13892
 #define CFG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
 #define CFG_SYS_FSL_PMIC_I2C_ADDR	0x8
 
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 1a2160cce594..f5f95a1bd1ce 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -37,7 +37,6 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 #endif                         /* __MX6SABREAUTO_CONFIG_H */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 0d06b6dc4671..78a554d0ccba 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -25,7 +25,6 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* USB Configs */
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 6f588f99c34b..16a89b97b06c 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -50,7 +50,6 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* UART */
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index bfc0011fbf96..fb6eb572cfad 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -22,8 +22,6 @@
 
 #define CFG_SYS_SDRAM_BASE	0x20000000
 
-#define CONFIG_POWER_TPS65090_EC
-
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
 
diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index 43a60825b575..f922491637d9 100644
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -79,8 +79,6 @@
 #define V_OSCK				25000000  /* Clock output from T2 */
 #define V_SCLK				V_OSCK
 
-#define CONFIG_POWER_TPS65910
-
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 7028264d7220..83907b06ebb4 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -98,7 +98,6 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 
 /* FLASH and environment organization */
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 9c3454add463..7a1ad9544a30 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -31,7 +31,6 @@
 #define CONFIG_I2C_MULTI_BUS
 
 #if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 #define TQMA6_PFUZE100_I2C_BUS		2
 #endif
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 0e0d5b5b3e4c..d4c92233acaa 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -62,7 +62,6 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 #define PFUZE3000_I2C_BUS	0
 
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index ab5cd5cf6365..1a71b300fc55 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -31,7 +31,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC4_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Network */
-- 
2.25.1

[PATCH 09/38] Convert CONFIG_HWCONFIG to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_HWCONFIG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 common/Kconfig                        | 4 ++++
 configs/MCR3000_defconfig             | 1 +
 configs/da850evm_defconfig            | 1 +
 configs/da850evm_direct_nor_defconfig | 1 +
 configs/da850evm_nand_defconfig       | 1 +
 configs/gazerbeam_defconfig           | 1 +
 configs/gwventana_emmc_defconfig      | 1 +
 configs/gwventana_gw5904_defconfig    | 1 +
 configs/gwventana_nand_defconfig      | 1 +
 configs/kmcoge5ne_defconfig           | 1 +
 configs/kmeter1_defconfig             | 1 +
 configs/kmopti2_defconfig             | 1 +
 configs/kmsupx5_defconfig             | 1 +
 configs/kmtepr2_defconfig             | 1 +
 configs/kontron_sl28_defconfig        | 1 +
 configs/legoev3_defconfig             | 1 +
 configs/socrates_defconfig            | 1 +
 configs/tuge1_defconfig               | 1 +
 configs/tuxx1_defconfig               | 1 +
 doc/README.hwconfig                   | 3 ---
 include/configs/MPC837XERDB.h         | 2 --
 include/configs/MPC8548CDS.h          | 2 --
 include/configs/P1010RDB.h            | 1 -
 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/da850evm.h            | 1 -
 include/configs/gw_ventana.h          | 1 -
 include/configs/km/pg-wcom-ls102xa.h  | 1 -
 include/configs/kmcent2.h             | 2 --
 include/configs/legoev3.h             | 1 -
 include/configs/ls1012a_common.h      | 1 -
 include/configs/ls1021aiot.h          | 1 -
 include/configs/ls1021aqds.h          | 1 -
 include/configs/ls1021atsn.h          | 1 -
 include/configs/ls1021atwr.h          | 1 -
 include/configs/ls1028a_common.h      | 1 -
 include/configs/ls1043a_common.h      | 1 -
 include/configs/ls1046a_common.h      | 1 -
 include/configs/ls1088a_common.h      | 1 -
 include/configs/ls2080a_common.h      | 1 -
 include/configs/lx2160a_common.h      | 1 -
 include/configs/p1_p2_rdb_pc.h        | 1 -
 include/configs/qemu-ppce500.h        | 2 --
 47 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index 21434c5cf16a..053e93eb1ab4 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -676,6 +676,10 @@ config CLOCKS
 	bool "Call set_cpu_clk_info"
 	depends on ARM
 
+config HWCONFIG
+	bool "hwconfig infrastructure"
+	default y if PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+
 config SYS_FSL_CLK
 	bool
 	depends on ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3 || \
diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index 6c41d7c88d1e..d8d6417d21e6 100644
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_DELAY_STR="root"
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run flashboot"
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_AUTO_COMPLETE is not set
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index ec80edf293a6..9b1b61981789 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -35,6 +35,7 @@ CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_SPL_PAD_TO=0x8000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 01cdc4f7843f..9332c8cb3ff5 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -29,6 +29,7 @@ CONFIG_BOOTCOMMAND="run envboot; run mmcboot; "
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=1050
diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig
index 2e0f27b2cb19..a947dce4f5f6 100644
--- a/configs/da850evm_nand_defconfig
+++ b/configs/da850evm_nand_defconfig
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_SPL_PAD_TO=0x8000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 CONFIG_SPL_BSS_START_ADDR=0xc0000000
diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig
index 3974e3d2bd32..d2946971b482 100644
--- a/configs/gazerbeam_defconfig
+++ b/configs/gazerbeam_defconfig
@@ -131,6 +131,7 @@ CONFIG_DISPLAY_CPUINFO=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=1024
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index ce81b558ee21..b275247d25d4 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 3ef909a1ce30..6169042c7e6a 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index d3d4876658a0..6d57ad49a13c 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
 CONFIG_MISC_INIT_R=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 298ff16b7eb4..71d196533f7e 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -167,6 +167,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 9386f2c51216..66ec936cce4a 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -137,6 +137,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 173306668fb2..3ba334c2401c 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -150,6 +150,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index c281611dd4c5..4a02e5e88fc1 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -130,6 +130,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index e099f74de1c2..55158864ea33 100644
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -150,6 +150,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/kontron_sl28_defconfig b/configs/kontron_sl28_defconfig
index f044334e80e6..9b90ed478cc4 100644
--- a/configs/kontron_sl28_defconfig
+++ b/configs/kontron_sl28_defconfig
@@ -39,6 +39,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOARD_LATE_INIT=y
+# CONFIG_HWCONFIG is not set
 CONFIG_PCI_INIT_R=y
 CONFIG_SPL_MAX_SIZE=0x20000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig
index 98e37f18b4f2..90c1b94b0214 100644
--- a/configs/legoev3_defconfig
+++ b/configs/legoev3_defconfig
@@ -23,6 +23,7 @@ CONFIG_BOOTCOMMAND="if mmc rescan; then if run loadbootscr; then run bootscript;
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index b89c348e5a52..ab52ea26a089 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -23,6 +23,7 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_REGINFO=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 3b8560f3e061..894a79df59e9 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -130,6 +130,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 04ce0b3afecc..6e66e6ce3052 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -152,6 +152,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
diff --git a/doc/README.hwconfig b/doc/README.hwconfig
index b6ddb438cfa7..5408a22bb6a4 100644
--- a/doc/README.hwconfig
+++ b/doc/README.hwconfig
@@ -1,6 +1,3 @@
-To enable this feature just define CONFIG_HWCONFIG in your board
-config file.
-
 This implements a simple hwconfig infrastructure: an
 interface for software knobs to control hardware.
 
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 717320c34aeb..2796adbdcd8f 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -14,8 +14,6 @@
  * High Level Configuration Options
  */
 
-#define CONFIG_HWCONFIG
-
 /*
  * On-board devices
  */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index e41b8e0843a7..75ac26957078 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -122,8 +122,6 @@
 #define CFG_SYS_FLASH_BANKS_LIST \
 	{CFG_SYS_FLASH_BASE_PHYS + 0x800000, CFG_SYS_FLASH_BASE_PHYS}
 
-#define CONFIG_HWCONFIG			/* enable hwconfig */
-
 /*
  * SDRAM on the Local Bus
  */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index a8af0a101c84..0a1b932e94e8 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -96,7 +96,6 @@
 #endif
 #endif
 
-#define CONFIG_HWCONFIG
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 1e02855fefd8..acbd43419f2e 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -132,8 +132,6 @@
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xffd00000	/* Initial L1 address */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index b5fb0a9b529e..e394237daf08 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -270,8 +270,6 @@
 #define CFG_SYS_CS1_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index bee4b704a24f..f681a2182298 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -248,8 +248,6 @@
 #define CFG_SYS_CS1_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index be8c30db26a7..a93e05dd4d2d 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -246,8 +246,6 @@
 #define CFG_SYS_CS2_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 795873f42336..cf65a0da1883 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -211,8 +211,6 @@
 #define CFG_SYS_CS1_FTIM3		CFG_SYS_NAND_FTIM3
 #endif
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index ffd56454939e..b51762264ade 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -70,8 +70,6 @@
 #define CFG_SYS_FLASH_BASE	0xe0000000
 #define CFG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | CFG_SYS_FLASH_BASE)
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 578277fc75c1..a818a4b39f83 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -137,7 +137,6 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_HWCONFIG		/* enable hwconfig */
 
 #define DEFAULT_LINUX_BOOT_ENV \
 	"loadaddr=0xc0700000\0" \
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 65283afd2a06..6c5ca0a52057 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -45,7 +45,6 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* Miscellaneous configurable options */
-#define CONFIG_HWCONFIG
 
 /* Memory configuration */
 
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 6ccb4f07e3be..bbd2b36c45af 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -166,7 +166,6 @@
 
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 /*
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index e152714b1169..89c5a24ee901 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -309,8 +309,6 @@
 #define CFG_SYS_CS2_FTIM2	SYS_QRIO_FTIM2
 #define CFG_SYS_CS2_FTIM3	SYS_QRIO_FTIM3
 
-#define CONFIG_HWCONFIG
-
 /* define to use L1 as initial stack */
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 2664982715f1..abe470fe890b 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -48,7 +48,6 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_HWCONFIG		/* enable hwconfig */
 #define CONFIG_SETUP_INITRD_TAG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 7598e54ed2b1..9e4f949016ef 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -24,7 +24,6 @@
 
 #define CFG_SYS_NS16550_CLK          (get_serial_clock())
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 3063635592e2..a9680149807c 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -92,7 +92,6 @@
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #define CONFIG_EXTRA_ENV_SETTINGS	\
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 137d459c291e..34d4c2fdeccc 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -276,7 +276,6 @@
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #ifdef CONFIG_LPUART
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 052a15658d71..a5b7364435dd 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -67,7 +67,6 @@
 /* PCIe */
 #define FSL_PCIE_COMPAT			"fsl,ls1021a-pcie"
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index f39c7c088446..059941e713a1 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -157,7 +157,6 @@
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		256
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index bdd3951e85f4..b190bfe9c8e0 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -34,7 +34,6 @@
 
 /* Physical Memory Map */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index b4048744b1ea..a3fa92d1ff47 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -110,7 +110,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #ifndef SPL_NO_MISC
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index cac30e4679eb..4ed5481c3e74 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -74,7 +74,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index bacc84f629ae..57429d4bbe32 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -114,7 +114,6 @@ unsigned long long get_qixis_addr(void);
 
 /* Physical Memory Map */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 #ifndef SPL_NO_ENV
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 18defd5e5a63..e82456fd8148 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -107,7 +107,6 @@ unsigned long long get_qixis_addr(void);
 /* Physical Memory Map */
 /* fixme: these need to be checked against the board */
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index bbee9df404a1..ff85d966e661 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -84,7 +84,6 @@
 
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk() / 4)
 
-#define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index e8b752785b4d..eda2d43d0c1f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -112,7 +112,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_HWCONFIG
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index aa9cae017d9a..d1b20da24a86 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -33,8 +33,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
-#define CONFIG_HWCONFIG
-
 #define CFG_SYS_INIT_RAM_ADDR		0x00100000
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0x0
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0x00100000
-- 
2.25.1

[PATCH 10/38] arm920t: Remove unused imx code

[Tom Rini]

This code is currently unused, remove it.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/arm920t/imx/Makefile  |   8 ---
 arch/arm/cpu/arm920t/imx/generic.c |  76 ----------------------
 arch/arm/cpu/arm920t/imx/speed.c   |  86 -------------------------
 arch/arm/cpu/arm920t/imx/timer.c   | 100 -----------------------------
 4 files changed, 270 deletions(-)
 delete mode 100644 arch/arm/cpu/arm920t/imx/Makefile
 delete mode 100644 arch/arm/cpu/arm920t/imx/generic.c
 delete mode 100644 arch/arm/cpu/arm920t/imx/speed.c
 delete mode 100644 arch/arm/cpu/arm920t/imx/timer.c

diff --git a/arch/arm/cpu/arm920t/imx/Makefile b/arch/arm/cpu/arm920t/imx/Makefile
deleted file mode 100644
index 04bc1295929c..000000000000
--- a/arch/arm/cpu/arm920t/imx/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-
-obj-y	+= generic.o
-obj-y	+= speed.o
-obj-y	+= timer.o
diff --git a/arch/arm/cpu/arm920t/imx/generic.c b/arch/arm/cpu/arm920t/imx/generic.c
deleted file mode 100644
index dbb908ecdcb2..000000000000
--- a/arch/arm/cpu/arm920t/imx/generic.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  arch/arm/mach-imx/generic.c
- *
- *  author: Sascha Hauer
- *  Created: april 20th, 2004
- *  Copyright: Synertronixx GmbH
- *
- *  Common code for i.MX machines
- */
-
-#include <common.h>
-
-#ifdef CONFIG_IMX
-
-#include <asm/arch/imx-regs.h>
-
-void imx_gpio_mode(int gpio_mode)
-{
-	unsigned int pin = gpio_mode & GPIO_PIN_MASK;
-	unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> 5;
-	unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> 10;
-	unsigned int tmp;
-
-	/* Pullup enable */
-	if(gpio_mode & GPIO_PUEN)
-		PUEN(port) |= (1<<pin);
-	else
-		PUEN(port) &= ~(1<<pin);
-
-	/* Data direction */
-	if(gpio_mode & GPIO_OUT)
-		DDIR(port) |= 1<<pin;
-	else
-		DDIR(port) &= ~(1<<pin);
-
-	/* Primary / alternate function */
-	if(gpio_mode & GPIO_AF)
-		GPR(port) |= (1<<pin);
-	else
-		GPR(port) &= ~(1<<pin);
-
-	/* use as gpio? */
-	if( ocr == 3 )
-		GIUS(port) |= (1<<pin);
-	else
-		GIUS(port) &= ~(1<<pin);
-
-	/* Output / input configuration */
-	/* FIXME: I'm not very sure about OCR and ICONF, someone
-	 * should have a look over it
-	 */
-	if(pin<16) {
-		tmp = OCR1(port);
-		tmp &= ~( 3<<(pin*2));
-		tmp |= (ocr << (pin*2));
-		OCR1(port) = tmp;
-
-		if( gpio_mode &	GPIO_AOUT )
-			ICONFA1(port) &= ~( 3<<(pin*2));
-		if( gpio_mode &	GPIO_BOUT )
-			ICONFB1(port) &= ~( 3<<(pin*2));
-	} else {
-		tmp = OCR2(port);
-		tmp &= ~( 3<<((pin-16)*2));
-		tmp |= (ocr << ((pin-16)*2));
-		OCR2(port) = tmp;
-
-		if( gpio_mode &	GPIO_AOUT )
-			ICONFA2(port) &= ~( 3<<((pin-16)*2));
-		if( gpio_mode &	GPIO_BOUT )
-			ICONFB2(port) &= ~( 3<<((pin-16)*2));
-	}
-}
-
-#endif /* CONFIG_IMX */
diff --git a/arch/arm/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c
deleted file mode 100644
index c19206ac39a7..000000000000
--- a/arch/arm/cpu/arm920t/imx/speed.c
+++ /dev/null
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *
- * (c) 2004 Sascha Hauer <sascha@saschahauer.de>
- */
-
-
-#include <common.h>
-#if defined (CONFIG_IMX)
-#include <clock_legacy.h>
-
-#include <asm/arch/imx-regs.h>
-
-/* ------------------------------------------------------------------------- */
-/* NOTE: This describes the proper use of this file.
- *
- * get_board_sys_clk() should be defined as the input frequency of the PLL.
- * SH FIXME: 16780000 in our case
- * get_FCLK(), get_HCLK(), get_PCLK() and get_UCLK() return the clock of
- * the specified bus in HZ.
- */
-/* ------------------------------------------------------------------------- */
-
-ulong get_systemPLLCLK(void)
-{
-	/* FIXME: We assume System_SEL = 0 here */
-	u32 spctl0 = SPCTL0;
-	u32 mfi = (spctl0 >> 10) & 0xf;
-	u32 mfn = spctl0 & 0x3f;
-	u32 mfd = (spctl0 >> 16) & 0x3f;
-	u32 pd =  (spctl0 >> 26) & 0xf;
-
-	mfi = mfi<=5 ? 5 : mfi;
-
-	return (2*(CONFIG_SYSPLL_CLK_FREQ>>10)*( (mfi<<10) + (mfn<<10)/(mfd+1)))/(pd+1);
-}
-
-ulong get_mcuPLLCLK(void)
-{
-	/* FIXME: We assume System_SEL = 0 here */
-	u32 mpctl0 = MPCTL0;
-	u32 mfi = (mpctl0 >> 10) & 0xf;
-	u32 mfn = mpctl0 & 0x3f;
-	u32 mfd = (mpctl0 >> 16) & 0x3f;
-	u32 pd =  (mpctl0 >> 26) & 0xf;
-
-	mfi = mfi<=5 ? 5 : mfi;
-
-	return (2*(get_board_sys_clk()>>10)*( (mfi<<10) + (mfn<<10)/(mfd+1)))/(pd+1);
-}
-
-ulong get_FCLK(void)
-{
-	return (( CSCR>>15)&1) ? get_mcuPLLCLK()>>1 : get_mcuPLLCLK();
-}
-
-/* return HCLK frequency */
-ulong get_HCLK(void)
-{
-	u32 bclkdiv = (( CSCR >> 10 ) & 0xf) + 1;
-	printf("bclkdiv: %d\n", bclkdiv);
-	return get_systemPLLCLK() / bclkdiv;
-}
-
-/* return BCLK frequency */
-ulong get_BCLK(void)
-{
-	return get_HCLK();
-}
-
-ulong get_PERCLK1(void)
-{
-	return get_systemPLLCLK() / (((PCDR) & 0xf)+1);
-}
-
-ulong get_PERCLK2(void)
-{
-	return get_systemPLLCLK() / (((PCDR>>4) & 0xf)+1);
-}
-
-ulong get_PERCLK3(void)
-{
-	return get_systemPLLCLK() / (((PCDR>>16) & 0x7f)+1);
-}
-
-#endif /* defined (CONFIG_IMX) */
diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
deleted file mode 100644
index 0cd3a039810b..000000000000
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Alex Zuepke <azu@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <time.h>
-#if defined (CONFIG_IMX)
-
-#include <asm/arch/imx-regs.h>
-#include <linux/delay.h>
-
-int timer_init (void)
-{
-	int i;
-	/* setup GP Timer 1 */
-	TCTL1 = TCTL_SWR;
-	for ( i=0; i<100; i++) TCTL1 = 0; /* We have no udelay by now */
-	TPRER1 = get_PERCLK1() / 1000000; /* 1 MHz */
-	TCTL1 |= TCTL_FRR | (1<<1); /* Freerun Mode, PERCLK1 input */
-
-	/* Reset the timer */
-	TCTL1 &= ~TCTL_TEN;
-	TCTL1 |= TCTL_TEN; /* Enable timer */
-
-	return (0);
-}
-
-/*
- * timer without interrupts
- */
-static ulong get_timer_masked (void)
-{
-	return TCN1;
-}
-
-ulong get_timer (ulong base)
-{
-	return get_timer_masked() - base;
-}
-
-void __udelay(unsigned long usec)
-{
-	ulong endtime = get_timer_masked() + usec;
-	signed long diff;
-
-	do {
-		ulong now = get_timer_masked ();
-		diff = endtime - now;
-	} while (diff >= 0);
-}
-
-/*
- * This function is derived from PowerPC code (read timebase as long long).
- * On ARM it just returns the timer value.
- */
-unsigned long long get_ticks(void)
-{
-	return get_timer(0);
-}
-
-/*
- * This function is derived from PowerPC code (timebase clock frequency).
- * On ARM it returns the number of timer ticks per second.
- */
-ulong get_tbclk(void)
-{
-	return CONFIG_SYS_HZ;
-}
-
-/*
- * Reset the cpu by setting up the watchdog timer and let him time out
- */
-void reset_cpu(void)
-{
-	/* Disable watchdog and set Time-Out field to 0 */
-	WCR = 0x00000000;
-
-	/* Write Service Sequence */
-	WSR = 0x00005555;
-	WSR = 0x0000AAAA;
-
-	/* Enable watchdog */
-	WCR = 0x00000001;
-
-	while (1);
-	/*NOTREACHED*/
-}
-
-#endif /* defined (CONFIG_IMX) */
-- 
2.25.1

[PATCH 11/38] pwm: imx: Remove unused references to CONFIG_IMX6_PWM_PER_CLK

[Tom Rini]

On platforms that use DM_PWM, we do not need to define this value
anymore, so remove it from config files.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
For the record, vining_2000 does not use DM_PWM and requires
board-specific updates as well to switch, so we're going this path for
the moment.
---
 include/configs/aristainetos2.h | 2 --
 include/configs/ge_b1x5v2.h     | 3 ---
 include/configs/ge_bx50v3.h     | 2 --
 include/configs/mx53ppd.h       | 3 ---
 4 files changed, 10 deletions(-)

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index c1eec5d06ccb..b1ec8ef269c6 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -424,8 +424,6 @@
 /* check this console not needed, after test remove it */
 #define CONFIG_IMX_VIDEO_SKIP
 
-#define CONFIG_IMX6_PWM_PER_CLK	66000000
-
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 97fe76cfa8ec..a8a6229f526f 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -12,9 +12,6 @@
 
 #include "mx6_common.h"
 
-/* PWM */
-#define CONFIG_IMX6_PWM_PER_CLK		66000000
-
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART3_BASE
 
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index cbaf03c2a226..705cb763a66d 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -106,6 +106,4 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-#define CONFIG_IMX6_PWM_PER_CLK	66000000
-
 #endif	/* __GE_BX50V3_CONFIG_H */
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 913bc1996d40..963dd92dd709 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -102,9 +102,6 @@
 
 /* FLASH and environment organization */
 
-/* Backlight Control */
-#define CONFIG_IMX6_PWM_PER_CLK 66666000
-
 #define CONFIG_IMX_VIDEO_SKIP
 
 #endif				/* __CONFIG_H */
-- 
2.25.1

[PATCH 12/38] Convert CONFIG_IMX_VIDEO_SKIP et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_IMX_VIDEO_SKIP
   CONFIG_IMX_HDMI

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/aristainetos2c_defconfig     |  1 +
 configs/aristainetos2ccslb_defconfig |  1 +
 configs/cm_fx6_defconfig             |  1 +
 configs/ge_b1x5v2_defconfig          |  1 +
 configs/ge_bx50v3_defconfig          |  2 ++
 configs/gwventana_emmc_defconfig     |  2 ++
 configs/gwventana_gw5904_defconfig   |  2 ++
 configs/gwventana_nand_defconfig     |  2 ++
 configs/imx6dl_icore_nand_defconfig  |  1 +
 configs/imx6q_icore_nand_defconfig   |  1 +
 configs/imx6qdl_icore_mmc_defconfig  |  1 +
 configs/imx6qdl_icore_nand_defconfig |  1 +
 configs/m53menlo_defconfig           |  1 +
 configs/marsboard_defconfig          |  2 ++
 configs/mx53cx9020_defconfig         |  1 +
 configs/mx53ppd_defconfig            |  1 +
 configs/mx6cuboxi_defconfig          |  2 ++
 configs/mx6qsabrelite_defconfig      |  2 ++
 configs/mx6sabreauto_defconfig       |  2 ++
 configs/mx6sabresd_defconfig         |  2 ++
 configs/nitrogen6dl2g_defconfig      |  2 ++
 configs/nitrogen6dl_defconfig        |  2 ++
 configs/nitrogen6q2g_defconfig       |  2 ++
 configs/nitrogen6q_defconfig         |  2 ++
 configs/nitrogen6s1g_defconfig       |  2 ++
 configs/nitrogen6s_defconfig         |  2 ++
 configs/novena_defconfig             |  2 ++
 configs/pico-imx6_defconfig          |  2 ++
 configs/riotboard_defconfig          |  2 ++
 configs/tbs2910_defconfig            |  2 ++
 configs/wandboard_defconfig          |  2 ++
 drivers/video/imx/Kconfig            |  7 +++++++
 include/configs/apalis_imx6.h        |  2 --
 include/configs/aristainetos2.h      |  4 ----
 include/configs/cm_fx6.h             |  3 ---
 include/configs/colibri_imx6.h       |  4 ----
 include/configs/embestmx6boards.h    |  4 ----
 include/configs/ge_b1x5v2.h          |  3 ---
 include/configs/ge_bx50v3.h          |  4 ----
 include/configs/gw_ventana.h         |  4 ----
 include/configs/imx6-engicam.h       | 10 ----------
 include/configs/m53menlo.h           |  1 -
 include/configs/mx53cx9020.h         |  3 ---
 include/configs/mx53ppd.h            |  2 --
 include/configs/mx6cuboxi.h          |  4 ----
 include/configs/mx6sabre_common.h    |  4 ----
 include/configs/nitrogen6x.h         |  4 ----
 include/configs/novena.h             |  4 ----
 include/configs/pico-imx6.h          |  4 ----
 include/configs/tbs2910.h            |  4 ----
 include/configs/wandboard.h          |  4 ----
 51 files changed, 58 insertions(+), 72 deletions(-)

diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig
index 5ff29548b0d7..4c7ded9d22fd 100644
--- a/configs/aristainetos2c_defconfig
+++ b/configs/aristainetos2c_defconfig
@@ -118,6 +118,7 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig
index 0a208543dfe4..a23c77af8973 100644
--- a/configs/aristainetos2ccslb_defconfig
+++ b/configs/aristainetos2ccslb_defconfig
@@ -118,6 +118,7 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index ea7596611c5e..217752cbd4dc 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -116,6 +116,7 @@ CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_VIDEO=y
 CONFIG_VIDEO_LOGO=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SOURCE=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/ge_b1x5v2_defconfig b/configs/ge_b1x5v2_defconfig
index 180a6a8568e9..353942dd787b 100644
--- a/configs/ge_b1x5v2_defconfig
+++ b/configs/ge_b1x5v2_defconfig
@@ -133,6 +133,7 @@ CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_BCH=y
diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index d9fbdbd64018..e35788fd850a 100644
--- a/configs/ge_bx50v3_defconfig
+++ b/configs/ge_bx50v3_defconfig
@@ -98,6 +98,8 @@ CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_BCH=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index b275247d25d4..f999b4477553 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -163,6 +163,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_HIDE_LOGO_VERSION=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 6169042c7e6a..4c6291f0c51a 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -167,6 +167,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_HIDE_LOGO_VERSION=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 6d57ad49a13c..4e062e477e8c 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -173,6 +173,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_HIDE_LOGO_VERSION=y
diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index fe4866e2f512..759bbf9b34e5 100644
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -74,6 +74,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 2cb995e7ae1d..c7d31d502ba2 100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -75,6 +75,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
index 9f6d29a268b4..f5a7e9697863 100644
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -98,6 +98,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
index 2cb995e7ae1d..c7d31d502ba2 100644
--- a/configs/imx6qdl_icore_nand_defconfig
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -75,6 +75,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index a5760242be51..e332de2aa9e0 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -122,6 +122,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index a6cffa2db65f..27c5ebe000f4 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -67,6 +67,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index b34f2e7e6b4c..c20c6a40a1d7 100644
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -40,3 +40,4 @@ CONFIG_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index ed4ebbbe3c27..d8cb654a59fd 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -81,6 +81,7 @@ CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
 CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
 CONFIG_IMX_WATCHDOG=y
 CONFIG_BCH=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 0904bd11013c..a9957aba7c2a 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -84,6 +84,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index becf36e01c6b..6869b903b7f1 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -89,6 +89,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 634473f30743..8e94a84409df 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -120,6 +120,8 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index 4f7d3704203e..9472e032c814 100644
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -125,6 +125,8 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 3ec4df14a864..87ca8487fbd1 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 6a6510e12e23..1bdd2f02e9d0 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index e2acce8757e5..dc010b02a91f 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -97,6 +97,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index ceb843f15e07..fe3291d22b7f 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -97,6 +97,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index bb0d6f5439fe..b31652495f23 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 0232d0c9d767..eb11959e4ae4 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 5f761799a21f..3999ae1c829d 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -99,5 +99,7 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig
index 9b3f76d8e5d8..a6ed013f8b6b 100644
--- a/configs/pico-imx6_defconfig
+++ b/configs/pico-imx6_defconfig
@@ -99,6 +99,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 1bf40270e833..9f8fbc85c8ab 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -84,6 +84,8 @@ CONFIG_VIDEO_LOGO=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 4c5b98bc656b..0df8a6890021 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -114,6 +114,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_I2C_EDID=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_VIDEO_BMP_RLE8=y
 # CONFIG_GZIP is not set
 CONFIG_OF_LIBFDT_ASSUME_MASK=0xff
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 525f55ee00c6..a6baff1e24c9 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -83,6 +83,8 @@ CONFIG_VIDEO_LOGO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
 CONFIG_SPLASH_SCREEN=y
 CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_BMP_16BPP=y
diff --git a/drivers/video/imx/Kconfig b/drivers/video/imx/Kconfig
index afe950b6df76..34e8b640595b 100644
--- a/drivers/video/imx/Kconfig
+++ b/drivers/video/imx/Kconfig
@@ -6,3 +6,10 @@ config VIDEO_IPUV3
 	  This enables framebuffer driver for i.MX processors working
 	  on the IPUv3(Image Processing Unit) internal graphic processor.
 
+config IMX_VIDEO_SKIP
+	bool "Enable calling board_video_skip function"
+	depends on VIDEO_IPUV3
+
+config IMX_HDMI
+	bool "Enable HDMI support in IPUv3"
+	depends on VIDEO_IPUV3
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c9375b4d162a..a3c86545f077 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -32,8 +32,6 @@
 #define CONFIG_USBD_HS
 
 /* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
 
 /* Command definition */
 
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index b1ec8ef269c6..6faf544d21b6 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -420,10 +420,6 @@
 
 /* UBI support */
 
-/* Framebuffer */
-/* check this console not needed, after test remove it */
-#define CONFIG_IMX_VIDEO_SKIP
-
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index d5c039579759..9df8baa8a969 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -143,9 +143,6 @@
 
 /* misc */
 
-/* Display */
-#define CONFIG_IMX_HDMI
-
 /* EEPROM */
 
 #endif	/* __CONFIG_CM_FX6_H */
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index c6a79debd6ba..60a3862a4d12 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -28,10 +28,6 @@
 /* Client */
 #define CONFIG_USBD_HS
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Command definition */
 
 #undef CONFIG_IPADDR
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 29b7748e7865..22e0fa5aabfd 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -43,10 +43,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #include "mx6_common.h"
 
 /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index a8a6229f526f..1458b187de28 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -28,9 +28,6 @@
 #define CONFIG_MXC_USB_FLAGS		0
 #define CONFIG_USBD_HS
 
-/* Video */
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Memory */
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
 
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 705cb763a66d..f62b8f175e1f 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -102,8 +102,4 @@
 
 #define CFG_SYS_FSL_USDHC_NUM	3
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif	/* __GE_BX50V3_CONFIG_H */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 6c5ca0a52057..4d0a78c6269c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -40,10 +40,6 @@
 #define CONFIG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Miscellaneous configurable options */
 
 /* Memory configuration */
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 1f30798550c6..36b6b95b84de 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -132,14 +132,4 @@
 /* MTD device */
 #endif
 
-/* Falcon Mode */
-#ifdef CONFIG_SPL_OS_BOOT
-/* MMC support: args@1MB kernel@2MB */
-#endif
-
-/* Framebuffer */
-#ifdef CONFIG_VIDEO_IPUV3
-# define CONFIG_IMX_VIDEO_SKIP
-#endif
-
 #endif /* __IMX6_ENGICAM_CONFIG_H */
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index eca86a94519a..66591390d903 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -78,7 +78,6 @@
 
 /* LVDS display */
 #define CFG_SYS_LDB_CLOCK			33260000
-#define CONFIG_IMX_VIDEO_SKIP
 
 /* Watchdog */
 
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 2bc462cc37ef..cd806cb698e9 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -66,7 +66,4 @@
 
 /* environment organization */
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif /* __CONFIG_H */
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 963dd92dd709..9464d6e44aea 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -102,6 +102,4 @@
 
 /* FLASH and environment organization */
 
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif				/* __CONFIG_H */
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 12741c08de58..f7f209c20b59 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -14,10 +14,6 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 5e95e430c49f..6294fd1e2c42 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -145,10 +145,6 @@
 
 /* Environment organization */
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #define CONFIG_USBD_HS
 
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index dd7f9513199c..5020b3bb71db 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -26,10 +26,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 
-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
 #else
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 16a89b97b06c..4e46dfc526ce 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -63,10 +63,6 @@
 #define CONFIG_USBD_HS
 #endif
 
-/* Video output */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* Extra U-Boot environment. */
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"fdt_high=0xffffffff\0"						\
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 9e6c210c40b4..6d7873daa0ad 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -100,8 +100,4 @@
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC_PHYADDR		1
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #endif			       /* __CONFIG_H * */
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index f6544f6226c7..fcc967494220 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -20,10 +20,6 @@
 
 #define CFG_SYS_BOOTMAPSZ		0x10000000
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 /* PCI */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 23027b1d3d9e..6923009d4598 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -20,10 +20,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
 	"splashpos=m,m\0" \
-- 
2.25.1

[PATCH 13/38] mpc8548cds: Migrate CONFIG_INTERRUPTS to Kconfig

[Tom Rini]

Only this platform sets this option, define it in the board Kconfig
file.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc8548cds/Kconfig | 3 +++
 include/configs/MPC8548CDS.h       | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/board/freescale/mpc8548cds/Kconfig b/board/freescale/mpc8548cds/Kconfig
index 723ead51e5ce..bb0a0758964c 100644
--- a/board/freescale/mpc8548cds/Kconfig
+++ b/board/freescale/mpc8548cds/Kconfig
@@ -6,6 +6,9 @@ config PCI1
 config FSL_CADMUS
 	def_bool y
 
+config INTERRUPTS
+	def_bool y
+
 config SYS_BOARD
 	default "mpc8548cds"
 
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 75ac26957078..83eb18c3b7ac 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -13,8 +13,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_INTERRUPTS		/* enable pci, srio, ddr interrupts */
-
 #ifndef __ASSEMBLY__
 #include <linux/stringify.h>
 #endif
-- 
2.25.1

[PATCH 14/38] Convert CONFIG_IODELAY_RECALIBRATION to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_IODELAY_RECALIBRATION

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-omap2/omap5/Kconfig | 4 ++++
 include/configs/am57xx_evm.h      | 2 --
 include/configs/dra7xx_evm.h      | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/omap5/Kconfig b/arch/arm/mach-omap2/omap5/Kconfig
index 18a66764224d..0787d192b696 100644
--- a/arch/arm/mach-omap2/omap5/Kconfig
+++ b/arch/arm/mach-omap2/omap5/Kconfig
@@ -1,7 +1,11 @@
 if OMAP54XX
 
+config IODELAY_RECALIBRATION
+	bool
+
 config DRA7XX
 	bool
+	select IODELAY_RECALIBRATION
 	select SYS_OMAP_ABE_SYSCK
 	help
 	  DRA7xx is an OMAP based SOC with Dual Core A-15s.
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 340a8ce6dc88..dacfd41ccedf 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -14,8 +14,6 @@
 #include <environment/ti/dfu.h>
 #include <linux/sizes.h>
 
-#define CONFIG_IODELAY_RECALIBRATION
-
 #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 */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 8217712e3904..ac3fcacc68ed 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -13,8 +13,6 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_IODELAY_RECALIBRATION
-
 #define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED		0x80000000
 
-- 
2.25.1

[PATCH 15/38] Convert CONFIG_IOMUX_SHARE_CONF_REG et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_IOMUX_LPSR
   CONFIG_IOMUX_SHARE_CONF_REG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig                           | 1 +
 arch/arm/include/asm/arch-vf610/imx-regs.h | 3 ---
 arch/arm/mach-imx/Kconfig                  | 6 ++++++
 arch/arm/mach-imx/mx6/Kconfig              | 3 +++
 arch/arm/mach-imx/mx7/Kconfig              | 1 +
 include/configs/colibri-imx6ull.h          | 1 -
 include/configs/mx6sllevk.h                | 2 --
 include/configs/mx6ullevk.h                | 2 --
 include/configs/mx7_common.h               | 3 ---
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7866e8f3c4d9..11dddba9a36b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1245,6 +1245,7 @@ config ARCH_VF610
 	bool "Freescale Vybrid"
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select IOMUX_SHARE_CONF_REG
 	select MACH_IMX
 	select SYS_FSL_ERRATUM_ESDHC111
 	imply CMD_MTDPARTS
diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h
index 97211f4b12af..fa3a97824faa 100644
--- a/arch/arm/include/asm/arch-vf610/imx-regs.h
+++ b/arch/arm/include/asm/arch-vf610/imx-regs.h
@@ -103,9 +103,6 @@
 
 #define QSPI0_AMBA_BASE		0x20000000
 
-/* MUX mode and PAD ctrl are in one register */
-#define CONFIG_IOMUX_SHARE_CONF_REG
-
 #define FEC_QUIRK_ENET_MAC
 #define I2C_QUIRK_REG
 
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index b72b6af4340a..ee5f1996a830 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -195,3 +195,9 @@ config IMX_CONTAINER_CFG
 	help
 	  This is to specific the cfg file for generating container
 	  image which will be loaded by SPL.
+
+config IOMUX_LPSR
+	bool
+
+config IOMUX_SHARE_CONF_REG
+	bool
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 752c57f52db0..e6b0ee757933 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -168,6 +168,7 @@ config TARGET_COLIBRI_IMX6ULL
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select IOMUX_LPSR
 
 config TARGET_DART_6UL
 	bool "Variscite imx6ULL dart(DART-SOM-6ULL)"
@@ -396,6 +397,7 @@ config TARGET_MX6SLLEVK
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select IOMUX_LPSR
 	imply CMD_DM
 
 config TARGET_MX6SXSABRESD
@@ -464,6 +466,7 @@ config TARGET_MX6ULL_14X14_EVK
 	select BOARD_LATE_INIT
 	select DM
 	select DM_THERMAL
+	select IOMUX_LPSR
 	imply CMD_DM
 
 config TARGET_MX6ULZ_SMM_M2
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 3c388183bc28..0bb18f652009 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -6,6 +6,7 @@ config MX7
 	select ARCH_SUPPORT_PSCI
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
+	select IOMUX_LPSR
 	select ROM_UNIFIED_SECTIONS
 	select SYSCOUNTER_TIMER
 	imply CMD_FUSE
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 12dc946fc782..c0c3b4e0359a 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -11,7 +11,6 @@
 #define __COLIBRI_IMX6ULL_CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_IOMUX_LPSR
 
 #define PHYS_SDRAM_SIZE			SZ_1G
 
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 6632e4ea29ce..8731f6a3e4ad 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -92,8 +92,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 #define CFG_SYS_FSL_USDHC_NUM	3
 
-#define CONFIG_IOMUX_LPSR
-
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 4154d328dedf..0e986093f35a 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -108,8 +108,6 @@
 
 /* environment organization */
 
-#define CONFIG_IOMUX_LPSR
-
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_ENET_DEV		1
 #endif
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 4704276a74de..d5af6990107d 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -17,9 +17,6 @@
 #define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
-/* Enable iomux-lpsr support */
-#define CONFIG_IOMUX_LPSR
-
 /* Miscellaneous configurable options */
 
 /* UART */
-- 
2.25.1

[PATCH 16/38] sandbox: Move CONFIG_IO_TRACE to Kconfig

[Tom Rini]

This is only used on sandbox, so select it there.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/Kconfig              | 1 +
 common/Kconfig            | 3 +++
 include/configs/sandbox.h | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index ae397166979b..51d46a45fef1 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -146,6 +146,7 @@ config SANDBOX
 	select DM_SPI
 	select DM_SPI_FLASH
 	select GZIP_COMPRESSED
+	select IO_TRACE
 	select LZO
 	select OF_BOARD_SETUP
 	select PCI_ENDPOINT
diff --git a/common/Kconfig b/common/Kconfig
index 053e93eb1ab4..8c71d3c972bf 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1086,3 +1086,6 @@ config FDT_SIMPLEFB
 	  These functions can be used by board to indicate to the OS
 	  the presence of the simple frame buffer with associated reserved
 	  memory
+
+config IO_TRACE
+	bool
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index f69fd0ed39c3..3a5af4b3b609 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -6,8 +6,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_IO_TRACE
-
 #define CONFIG_MALLOC_F_ADDR		0x0010000
 
 /* GUIDs for capsule updatable firmware images */
-- 
2.25.1

[PATCH 17/38] arm: lpc32xx: Remove unused hsuart driver

[Tom Rini]

This driver is not enabled in any config currently, remove it.

Cc: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
I ran in to this as CONFIG_LPC32XX_HSUART is not in Kconfig, so doing
that migration would be another path forward here.
---
 arch/arm/include/asm/arch-lpc32xx/config.h |   8 --
 arch/arm/mach-lpc32xx/devices.c            |  16 ---
 drivers/serial/Makefile                    |   1 -
 drivers/serial/lpc32xx_hsuart.c            | 112 ---------------------
 include/dm/platform_data/lpc32xx_hsuart.h  |  18 ----
 5 files changed, 155 deletions(-)
 delete mode 100644 drivers/serial/lpc32xx_hsuart.c
 delete mode 100644 include/dm/platform_data/lpc32xx_hsuart.h

diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h
index 3ad78cb1e645..41160384a4dc 100644
--- a/arch/arm/include/asm/arch-lpc32xx/config.h
+++ b/arch/arm/include/asm/arch-lpc32xx/config.h
@@ -11,14 +11,6 @@
 
 /* Basic CPU architecture */
 
-/* UART configuration */
-#if	(CONFIG_CONS_INDEX == 1) || (CONFIG_CONS_INDEX == 2) || \
-	(CONFIG_CONS_INDEX == 7)
-#if !defined(CONFIG_LPC32XX_HSUART)
-#define CONFIG_LPC32XX_HSUART
-#endif
-#endif
-
 #if !defined(CFG_SYS_NS16550_CLK)
 #define CFG_SYS_NS16550_CLK		13000000
 #endif
diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c
index 3fcf8facb411..6a67a3591aa6 100644
--- a/arch/arm/mach-lpc32xx/devices.c
+++ b/arch/arm/mach-lpc32xx/devices.c
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <ns16550.h>
-#include <dm/platform_data/lpc32xx_hsuart.h>
 
 #include <asm/arch/clk.h>
 #include <asm/arch/uart.h>
@@ -53,26 +52,11 @@ static const struct ns16550_plat lpc32xx_uart[] = {
 	  .clock = CFG_SYS_NS16550_CLK, .fcr = UART_FCR_DEFVAL, },
 };
 
-#if defined(CONFIG_LPC32XX_HSUART)
-static const struct lpc32xx_hsuart_plat lpc32xx_hsuart[] = {
-	{ HS_UART1_BASE, },
-	{ HS_UART2_BASE, },
-	{ HS_UART7_BASE, },
-};
-#endif
-
 U_BOOT_DRVINFOS(lpc32xx_uarts) = {
-#if defined(CONFIG_LPC32XX_HSUART)
-	{ "lpc32xx_hsuart", &lpc32xx_hsuart[0], },
-	{ "lpc32xx_hsuart", &lpc32xx_hsuart[1], },
-#endif
 	{ "ns16550_serial", &lpc32xx_uart[0], },
 	{ "ns16550_serial", &lpc32xx_uart[1], },
 	{ "ns16550_serial", &lpc32xx_uart[2], },
 	{ "ns16550_serial", &lpc32xx_uart[3], },
-#if defined(CONFIG_LPC32XX_HSUART)
-	{ "lpc32xx_hsuart", &lpc32xx_hsuart[2], },
-#endif
 };
 #endif
 
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index eb7b8f23ee90..a26eb16634a0 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -38,7 +38,6 @@ obj-$(CONFIG_COREBOOT_SERIAL) += serial_coreboot.o
 obj-$(CONFIG_CORTINA_UART) += serial_cortina.o
 obj-$(CONFIG_DEBUG_SBI_CONSOLE) += serial_sbi.o
 obj-$(CONFIG_EFI_APP) += serial_efi.o
-obj-$(CONFIG_LPC32XX_HSUART) += lpc32xx_hsuart.o
 obj-$(CONFIG_MCFUART) += serial_mcf.o
 obj-$(CONFIG_SYS_NS16550) += ns16550.o
 obj-$(CONFIG_S5P_SERIAL) += serial_s5p.o
diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
deleted file mode 100644
index d39a3c0494ea..000000000000
--- a/drivers/serial/lpc32xx_hsuart.c
+++ /dev/null
@@ -1,112 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2011-2015 Vladimir Zapolskiy <vz@mleia.com>
- */
-
-#include <common.h>
-#include <clock_legacy.h>
-#include <dm.h>
-#include <serial.h>
-#include <dm/platform_data/lpc32xx_hsuart.h>
-
-#include <asm/arch/uart.h>
-#include <linux/compiler.h>
-
-struct lpc32xx_hsuart_priv {
-	struct hsuart_regs *hsuart;
-};
-
-static int lpc32xx_serial_setbrg(struct udevice *dev, int baudrate)
-{
-	struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
-	struct hsuart_regs *hsuart = priv->hsuart;
-	u32 div;
-
-	/* UART rate = PERIPH_CLK / ((HSU_RATE + 1) x 14) */
-	div = (get_serial_clock() / 14 + baudrate / 2) / baudrate - 1;
-	if (div > 255)
-		div = 255;
-
-	writel(div, &hsuart->rate);
-
-	return 0;
-}
-
-static int lpc32xx_serial_getc(struct udevice *dev)
-{
-	struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
-	struct hsuart_regs *hsuart = priv->hsuart;
-
-	if (!(readl(&hsuart->level) & HSUART_LEVEL_RX))
-		return -EAGAIN;
-
-	return readl(&hsuart->rx) & HSUART_RX_DATA;
-}
-
-static int lpc32xx_serial_putc(struct udevice *dev, const char c)
-{
-	struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
-	struct hsuart_regs *hsuart = priv->hsuart;
-
-	/* Wait for empty FIFO */
-	if (readl(&hsuart->level) & HSUART_LEVEL_TX)
-		return -EAGAIN;
-
-	writel(c, &hsuart->tx);
-
-	return 0;
-}
-
-static int lpc32xx_serial_pending(struct udevice *dev, bool input)
-{
-	struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
-	struct hsuart_regs *hsuart = priv->hsuart;
-
-	if (input) {
-		if (readl(&hsuart->level) & HSUART_LEVEL_RX)
-			return 1;
-	} else {
-		if (readl(&hsuart->level) & HSUART_LEVEL_TX)
-			return 1;
-	}
-
-	return 0;
-}
-
-static int lpc32xx_serial_init(struct hsuart_regs *hsuart)
-{
-	/* Disable hardware RTS and CTS flow control, set up RX and TX FIFO */
-	writel(HSUART_CTRL_TMO_16 | HSUART_CTRL_HSU_OFFSET(20) |
-	       HSUART_CTRL_HSU_RX_TRIG_32 | HSUART_CTRL_HSU_TX_TRIG_0,
-	       &hsuart->ctrl);
-
-	return 0;
-}
-
-static int lpc32xx_hsuart_probe(struct udevice *dev)
-{
-	struct lpc32xx_hsuart_plat *plat = dev_get_plat(dev);
-	struct lpc32xx_hsuart_priv *priv = dev_get_priv(dev);
-
-	priv->hsuart = (struct hsuart_regs *)plat->base;
-
-	lpc32xx_serial_init(priv->hsuart);
-
-	return 0;
-}
-
-static const struct dm_serial_ops lpc32xx_hsuart_ops = {
-	.setbrg	= lpc32xx_serial_setbrg,
-	.getc	= lpc32xx_serial_getc,
-	.putc	= lpc32xx_serial_putc,
-	.pending = lpc32xx_serial_pending,
-};
-
-U_BOOT_DRIVER(lpc32xx_hsuart) = {
-	.name	= "lpc32xx_hsuart",
-	.id	= UCLASS_SERIAL,
-	.probe	= lpc32xx_hsuart_probe,
-	.ops	= &lpc32xx_hsuart_ops,
-	.priv_auto	= sizeof(struct lpc32xx_hsuart_priv),
-	.flags	= DM_FLAG_PRE_RELOC,
-};
diff --git a/include/dm/platform_data/lpc32xx_hsuart.h b/include/dm/platform_data/lpc32xx_hsuart.h
deleted file mode 100644
index 6f41e0e734a5..000000000000
--- a/include/dm/platform_data/lpc32xx_hsuart.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2015 Vladimir Zapolskiy <vz@mleia.com>
- */
-
-#ifndef _LPC32XX_HSUART_PLAT_H
-#define _LPC32XX_HSUART_PLAT_H
-
-/**
- * struct lpc32xx_hsuart_plat - NXP LPC32xx HSUART platform data
- *
- * @base:               Base register address
- */
-struct lpc32xx_hsuart_plat {
-	unsigned long base;
-};
-
-#endif
-- 
2.25.1

[PATCH 18/38] arm: ls102xa: Migrate LS102XA_STREAM_ID

[Tom Rini]

This symbol appears to be globally used in the architecture, select it.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/ls102xa/Kconfig   | 4 ++++
 include/configs/km/pg-wcom-ls102xa.h | 6 ------
 include/configs/ls1021aiot.h         | 2 --
 include/configs/ls1021aqds.h         | 2 --
 include/configs/ls1021atsn.h         | 2 --
 include/configs/ls1021atwr.h         | 2 --
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index 369e68b8193b..7e138e0cc5be 100644
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -2,6 +2,7 @@ config ARCH_LS1021A
 	bool
 	select FSL_DEVICE_DISABLE
 	select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI
+	select LS102XA_STREAM_ID
 	select SYS_FSL_DDR_BE if SYS_FSL_DDR
 	select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR
 	select SYS_FSL_IFC_BE
@@ -37,6 +38,9 @@ config FSL_DEVICE_DISABLE
 config LS1_DEEP_SLEEP
 	bool "Deep sleep"
 
+config LS102XA_STREAM_ID
+	bool
+
 config MAX_CPUS
 	int "Maximum number of CPUs permitted for LS102xA"
 	default 2
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index bbd2b36c45af..c1174b87ab7a 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -168,12 +168,6 @@
 
 #define HWCONFIG_BUFFER_SIZE		256
 
-/*
- * Miscellaneous configurable options
- */
-
-#define CONFIG_LS102XA_STREAM_ID
-
 /*
  * Environment
  */
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index a9680149807c..024a71852753 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -103,8 +103,6 @@
  */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 #include <asm/fsl_secure_boot.h>
 
 #endif
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 34d4c2fdeccc..5a91cc3efec0 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -295,8 +295,6 @@
  */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 /*
  * Environment
  */
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index a5b7364435dd..5612c60ae904 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -140,8 +140,6 @@
 /* Miscellaneous configurable options */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 /* Environment */
 
 #endif
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 059941e713a1..3c4c207edd06 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -297,8 +297,6 @@
  */
 #define CFG_SYS_BOOTMAPSZ		(256 << 20)
 
-#define CONFIG_LS102XA_STREAM_ID
-
 /*
  * Environment
  */
-- 
2.25.1

[PATCH 19/38] arm: samsung: Move CONFIG_MISC_COMMON to Kconfig

[Tom Rini]

This option controls using board/samsung/common/misc.c, so add a Kconfig
file there as well and select it from the boards which use this
functionality.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig                    | 1 +
 arch/arm/mach-exynos/Kconfig        | 5 +++++
 arch/arm/mach-s5pc1xx/Kconfig       | 1 +
 board/samsung/common/Kconfig        | 2 ++
 include/configs/odroid.h            | 6 ------
 include/configs/odroid_xu3.h        | 1 -
 include/configs/s5p_goni.h          | 2 --
 include/configs/s5pc210_universal.h | 3 ---
 include/configs/trats.h             | 3 ---
 include/configs/trats2.h            | 3 ---
 10 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 board/samsung/common/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 11dddba9a36b..1268bff5c54b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2342,6 +2342,7 @@ source "board/hisilicon/poplar/Kconfig"
 source "board/isee/igep003x/Kconfig"
 source "board/kontron/sl28/Kconfig"
 source "board/myir/mys_6ulx/Kconfig"
+source "board/samsung/common/Kconfig"
 source "board/siemens/common/Kconfig"
 source "board/seeed/npi_imx6ull/Kconfig"
 source "board/socionext/developerbox/Kconfig"
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 84102908561e..29e35e443c6a 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -67,10 +67,12 @@ config TARGET_SMDKV310
 	select SUPPORT_SPL
 
 config TARGET_TRATS
+	select MISC_COMMON
 	bool "Exynos4210 Trats board"
 
 config TARGET_S5PC210_UNIVERSAL
 	bool "EXYNOS4210 Universal C210 board"
+	select MISC_COMMON
 
 config TARGET_ORIGEN
 	bool "Exynos4412 Origen board"
@@ -79,9 +81,11 @@ config TARGET_ORIGEN
 
 config TARGET_TRATS2
 	bool "Exynos4412 Trat2 board"
+	select MISC_COMMON
 
 config TARGET_ODROID
 	bool "Exynos4412 Odroid board"
+	select MISC_COMMON
 
 endchoice
 endif
@@ -113,6 +117,7 @@ config TARGET_ODROID_XU3
 	bool "Exynos5422 Odroid board"
 	select EXYNOS5_DT
 	select EXYNOS5420
+	select MISC_COMMON
 	select OF_CONTROL
 
 config TARGET_ARNDALE
diff --git a/arch/arm/mach-s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig
index 8cffced5512b..b6a4b0b653fb 100644
--- a/arch/arm/mach-s5pc1xx/Kconfig
+++ b/arch/arm/mach-s5pc1xx/Kconfig
@@ -9,6 +9,7 @@ config TARGET_S5P_GONI
 	select OF_CONTROL
 	select BLK
 	select DM_MMC
+	select MISC_COMMON
 
 config TARGET_SMDKC100
 	bool "Support smdkc100 board"
diff --git a/board/samsung/common/Kconfig b/board/samsung/common/Kconfig
new file mode 100644
index 000000000000..849aeff61344
--- /dev/null
+++ b/board/samsung/common/Kconfig
@@ -0,0 +1,2 @@
+config MISC_COMMON
+	bool
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 8b00a2792150..f252b349437c 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -143,10 +143,4 @@
 	"kernel_addr_r=0x41000000\0" \
 	BOOTENV
 
-/*
- * Supported Odroid boards: X3, U3
- * TODO: Add Odroid X support
- */
-#define CONFIG_MISC_COMMON
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index d2d7fca54450..5bbe7aadcb25 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -57,7 +57,6 @@
 	"params.bin raw 0x1880 0x20\0"
 
 /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */
-#define CONFIG_MISC_COMMON
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 3d49d52b381c..fdade1ee66fa 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -61,8 +61,6 @@
 
 #define COMMON_BOOT	"${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_MISC_COMMON
-
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 06be9c0f6528..80d3fc9258cc 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -95,9 +95,6 @@ void universal_spi_sda(int bit);
 int universal_spi_read(void);
 #endif
 
-/* Common misc for Samsung */
-#define CONFIG_MISC_COMMON
-
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
 
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 5bd0ca2a9645..ec18842bbe8c 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -125,9 +125,6 @@
 
 /* GPT */
 
-/* Common misc for Samsung */
-#define CONFIG_MISC_COMMON
-
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
 
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index cef563696bde..0aa331e39359 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -115,9 +115,6 @@
 
 /* GPT */
 
-/* Common misc for Samsung */
-#define CONFIG_MISC_COMMON
-
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
 
-- 
2.25.1

[PATCH 20/38] arm: Remove unused mx27 code

[Tom Rini]

We no longer have any i.MX27 platforms, remove the remaining support
code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/arm926ejs/Makefile        |   1 -
 arch/arm/cpu/arm926ejs/mx27/Makefile   |   7 -
 arch/arm/cpu/arm926ejs/mx27/generic.c  | 378 -------------------------
 arch/arm/cpu/arm926ejs/mx27/relocate.S |  50 ----
 arch/arm/cpu/arm926ejs/mx27/reset.c    |  41 ---
 arch/arm/cpu/arm926ejs/mx27/timer.c    | 166 -----------
 arch/arm/lib/asm-offsets.c             |  29 +-
 drivers/gpio/mxc_gpio.c                |  12 +-
 drivers/mtd/nand/raw/mxc_nand.c        |   3 +-
 drivers/mtd/nand/raw/mxc_nand.h        |   2 +-
 drivers/net/fec_mxc.c                  |   3 -
 drivers/spi/mxc_spi.c                  |   8 -
 include/configs/imx27lite-common.h     | 134 ---------
 13 files changed, 9 insertions(+), 825 deletions(-)
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/Makefile
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/generic.c
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/relocate.S
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/reset.c
 delete mode 100644 arch/arm/cpu/arm926ejs/mx27/timer.c
 delete mode 100644 include/configs/imx27lite-common.h

diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index 7f1436d76e1c..7e7ad4f35d7e 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -12,7 +12,6 @@ extra-y	:=
 endif
 endif
 
-obj-$(CONFIG_MX27) += mx27/
 obj-$(if $(filter mxs,$(SOC)),y) += mxs/
 obj-$(if $(filter spear,$(SOC)),y) += spear/
 obj-$(CONFIG_ARCH_SUNXI) += sunxi/
diff --git a/arch/arm/cpu/arm926ejs/mx27/Makefile b/arch/arm/cpu/arm926ejs/mx27/Makefile
deleted file mode 100644
index ac5ebaf5ef8c..000000000000
--- a/arch/arm/cpu/arm926ejs/mx27/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-
-obj-y	+= generic.o timer.o reset.o relocate.o
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c
deleted file mode 100644
index 8b9d3a272af1..000000000000
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ /dev/null
@@ -1,378 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  Copyright (c) 2008 Eric Jarrige <eric.jarrige@armadeus.org>
- *  Copyright (c) 2009 Ilya Yanok <yanok@emcraft.com>
- */
-
-#include <common.h>
-#include <div64.h>
-#include <net.h>
-#include <netdev.h>
-#include <vsprintf.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/gpio.h>
-#include <asm/mach-imx/sys_proto.h>
-#ifdef CONFIG_MMC_MXC
-#include <asm/arch/mxcmmc.h>
-#endif
-
-/*
- *  get the system pll clock in Hz
- *
- *                  mfi + mfn / (mfd +1)
- *  f = 2 * f_ref * --------------------
- *                        pd + 1
- */
-static unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref)
-{
-	unsigned int mfi = (pll >> 10) & 0xf;
-	unsigned int mfn = pll & 0x3ff;
-	unsigned int mfd = (pll >> 16) & 0x3ff;
-	unsigned int pd =  (pll >> 26) & 0xf;
-
-	mfi = mfi <= 5 ? 5 : mfi;
-
-	return lldiv(2 * (u64)f_ref * (mfi * (mfd + 1) + mfn),
-			(mfd + 1) * (pd + 1));
-}
-
-static ulong clk_in_32k(void)
-{
-	return 1024 * CONFIG_MX27_CLK32;
-}
-
-static ulong clk_in_26m(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	if (readl(&pll->cscr) & CSCR_OSC26M_DIV1P5) {
-		/* divide by 1.5 */
-		return 26000000 * 2 / 3;
-	} else {
-		return 26000000;
-	}
-}
-
-static ulong imx_get_mpllclk(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-	ulong cscr = readl(&pll->cscr);
-	ulong fref;
-
-	if (cscr & CSCR_MCU_SEL)
-		fref = clk_in_26m();
-	else
-		fref = clk_in_32k();
-
-	return imx_decode_pll(readl(&pll->mpctl0), fref);
-}
-
-static ulong imx_get_armclk(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-	ulong cscr = readl(&pll->cscr);
-	ulong fref = imx_get_mpllclk();
-	ulong div;
-
-	if (!(cscr & CSCR_ARM_SRC_MPLL))
-		fref = lldiv((fref * 2), 3);
-
-	div = ((cscr >> 12) & 0x3) + 1;
-
-	return lldiv(fref, div);
-}
-
-static ulong imx_get_ahbclk(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-	ulong cscr = readl(&pll->cscr);
-	ulong fref = imx_get_mpllclk();
-	ulong div;
-
-	div = ((cscr >> 8) & 0x3) + 1;
-
-	return lldiv(fref * 2, 3 * div);
-}
-
-static __attribute__((unused)) ulong imx_get_spllclk(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-	ulong cscr = readl(&pll->cscr);
-	ulong fref;
-
-	if (cscr & CSCR_SP_SEL)
-		fref = clk_in_26m();
-	else
-		fref = clk_in_32k();
-
-	return imx_decode_pll(readl(&pll->spctl0), fref);
-}
-
-static ulong imx_decode_perclk(ulong div)
-{
-	return lldiv((imx_get_mpllclk() * 2), (div * 3));
-}
-
-static ulong imx_get_perclk1(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	return imx_decode_perclk((readl(&pll->pcdr1) & 0x3f) + 1);
-}
-
-static ulong imx_get_perclk2(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	return imx_decode_perclk(((readl(&pll->pcdr1) >> 8) & 0x3f) + 1);
-}
-
-static __attribute__((unused)) ulong imx_get_perclk3(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	return imx_decode_perclk(((readl(&pll->pcdr1) >> 16) & 0x3f) + 1);
-}
-
-static __attribute__((unused)) ulong imx_get_perclk4(void)
-{
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	return imx_decode_perclk(((readl(&pll->pcdr1) >> 24) & 0x3f) + 1);
-}
-
-unsigned int mxc_get_clock(enum mxc_clock clk)
-{
-	switch (clk) {
-	case MXC_ARM_CLK:
-		return imx_get_armclk();
-	case MXC_I2C_CLK:
-		return imx_get_ahbclk()/2;
-	case MXC_UART_CLK:
-		return imx_get_perclk1();
-	case MXC_FEC_CLK:
-		return imx_get_ahbclk();
-	case MXC_ESDHC_CLK:
-		return imx_get_perclk2();
-	}
-	return -1;
-}
-
-
-u32 get_cpu_rev(void)
-{
-	return MXC_CPU_MX27 << 12;
-}
-
-#if defined(CONFIG_DISPLAY_CPUINFO)
-int print_cpuinfo (void)
-{
-	char buf[32];
-
-	printf("CPU:   Freescale i.MX27 at %s MHz\n\n",
-			strmhz(buf, imx_get_mpllclk()));
-	return 0;
-}
-#endif
-
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_FEC_MXC)
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	/* enable FEC clock */
-	writel(readl(&pll->pccr1) | PCCR1_HCLK_FEC, &pll->pccr1);
-	writel(readl(&pll->pccr0) | PCCR0_FEC_EN, &pll->pccr0);
-	return fecmxc_initialize(bis);
-#else
-	return 0;
-#endif
-}
-
-/*
- * Initializes on-chip MMC controllers.
- * to override, implement board_mmc_init()
- */
-int cpu_mmc_init(struct bd_info *bis)
-{
-#ifdef CONFIG_MMC_MXC
-	return mxc_mmc_init(bis);
-#else
-	return 0;
-#endif
-}
-
-void imx_gpio_mode(int gpio_mode)
-{
-	struct gpio_port_regs *regs = (struct gpio_port_regs *)IMX_GPIO_BASE;
-	unsigned int pin = gpio_mode & GPIO_PIN_MASK;
-	unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-	unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;
-	unsigned int aout = (gpio_mode & GPIO_AOUT_MASK) >> GPIO_AOUT_SHIFT;
-	unsigned int bout = (gpio_mode & GPIO_BOUT_MASK) >> GPIO_BOUT_SHIFT;
-	unsigned int tmp;
-
-	/* Pullup enable */
-	if (gpio_mode & GPIO_PUEN) {
-		writel(readl(&regs->port[port].puen) | (1 << pin),
-				&regs->port[port].puen);
-	} else {
-		writel(readl(&regs->port[port].puen) & ~(1 << pin),
-				&regs->port[port].puen);
-	}
-
-	/* Data direction */
-	if (gpio_mode & GPIO_OUT) {
-		writel(readl(&regs->port[port].gpio_dir) | 1 << pin,
-				&regs->port[port].gpio_dir);
-	} else {
-		writel(readl(&regs->port[port].gpio_dir) & ~(1 << pin),
-				&regs->port[port].gpio_dir);
-	}
-
-	/* Primary / alternate function */
-	if (gpio_mode & GPIO_AF) {
-		writel(readl(&regs->port[port].gpr) | (1 << pin),
-				&regs->port[port].gpr);
-	} else {
-		writel(readl(&regs->port[port].gpr) & ~(1 << pin),
-				&regs->port[port].gpr);
-	}
-
-	/* use as gpio? */
-	if (!(gpio_mode & (GPIO_PF | GPIO_AF))) {
-		writel(readl(&regs->port[port].gius) | (1 << pin),
-				&regs->port[port].gius);
-	} else {
-		writel(readl(&regs->port[port].gius) & ~(1 << pin),
-				&regs->port[port].gius);
-	}
-
-	/* Output / input configuration */
-	if (pin < 16) {
-		tmp = readl(&regs->port[port].ocr1);
-		tmp &= ~(3 << (pin * 2));
-		tmp |= (ocr << (pin * 2));
-		writel(tmp, &regs->port[port].ocr1);
-
-		writel(readl(&regs->port[port].iconfa1) & ~(3 << (pin * 2)),
-				&regs->port[port].iconfa1);
-		writel(readl(&regs->port[port].iconfa1) | aout << (pin * 2),
-				&regs->port[port].iconfa1);
-		writel(readl(&regs->port[port].iconfb1) & ~(3 << (pin * 2)),
-				&regs->port[port].iconfb1);
-		writel(readl(&regs->port[port].iconfb1) | bout << (pin * 2),
-				&regs->port[port].iconfb1);
-	} else {
-		pin -= 16;
-
-		tmp = readl(&regs->port[port].ocr2);
-		tmp &= ~(3 << (pin * 2));
-		tmp |= (ocr << (pin * 2));
-		writel(tmp, &regs->port[port].ocr2);
-
-		writel(readl(&regs->port[port].iconfa2) & ~(3 << (pin * 2)),
-				&regs->port[port].iconfa2);
-		writel(readl(&regs->port[port].iconfa2) | aout << (pin * 2),
-				&regs->port[port].iconfa2);
-		writel(readl(&regs->port[port].iconfb2) & ~(3 << (pin * 2)),
-				&regs->port[port].iconfb2);
-		writel(readl(&regs->port[port].iconfb2) | bout << (pin * 2),
-				&regs->port[port].iconfb2);
-	}
-}
-
-#ifdef CONFIG_MXC_UART
-void mx27_uart1_init_pins(void)
-{
-	int i;
-	unsigned int mode[] = {
-		PE12_PF_UART1_TXD,
-		PE13_PF_UART1_RXD,
-	};
-
-	for (i = 0; i < ARRAY_SIZE(mode); i++)
-		imx_gpio_mode(mode[i]);
-
-}
-#endif /* CONFIG_MXC_UART */
-
-#ifdef CONFIG_FEC_MXC
-void mx27_fec_init_pins(void)
-{
-	int i;
-	unsigned int mode[] = {
-		PD0_AIN_FEC_TXD0,
-		PD1_AIN_FEC_TXD1,
-		PD2_AIN_FEC_TXD2,
-		PD3_AIN_FEC_TXD3,
-		PD4_AOUT_FEC_RX_ER,
-		PD5_AOUT_FEC_RXD1,
-		PD6_AOUT_FEC_RXD2,
-		PD7_AOUT_FEC_RXD3,
-		PD8_AF_FEC_MDIO,
-		PD9_AIN_FEC_MDC | GPIO_PUEN,
-		PD10_AOUT_FEC_CRS,
-		PD11_AOUT_FEC_TX_CLK,
-		PD12_AOUT_FEC_RXD0,
-		PD13_AOUT_FEC_RX_DV,
-		PD14_AOUT_FEC_CLR,
-		PD15_AOUT_FEC_COL,
-		PD16_AIN_FEC_TX_ER,
-		PF23_AIN_FEC_TX_EN,
-	};
-
-	for (i = 0; i < ARRAY_SIZE(mode); i++)
-		imx_gpio_mode(mode[i]);
-}
-
-void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
-{
-	int i;
-	struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
-	struct fuse_bank *bank = &iim->bank[0];
-	struct fuse_bank0_regs *fuse =
-			(struct fuse_bank0_regs *)bank->fuse_regs;
-
-	for (i = 0; i < 6; i++)
-		mac[6 - 1 - i] = readl(&fuse->mac_addr[i]) & 0xff;
-}
-#endif /* CONFIG_FEC_MXC */
-
-#ifdef CONFIG_MMC_MXC
-void mx27_sd1_init_pins(void)
-{
-	int i;
-	unsigned int mode[] = {
-		PE18_PF_SD1_D0,
-		PE19_PF_SD1_D1,
-		PE20_PF_SD1_D2,
-		PE21_PF_SD1_D3,
-		PE22_PF_SD1_CMD,
-		PE23_PF_SD1_CLK,
-	};
-
-	for (i = 0; i < ARRAY_SIZE(mode); i++)
-		imx_gpio_mode(mode[i]);
-
-}
-
-void mx27_sd2_init_pins(void)
-{
-	int i;
-	unsigned int mode[] = {
-		PB4_PF_SD2_D0,
-		PB5_PF_SD2_D1,
-		PB6_PF_SD2_D2,
-		PB7_PF_SD2_D3,
-		PB8_PF_SD2_CMD,
-		PB9_PF_SD2_CLK,
-	};
-
-	for (i = 0; i < ARRAY_SIZE(mode); i++)
-		imx_gpio_mode(mode[i]);
-
-}
-#endif /* CONFIG_MMC_MXC */
diff --git a/arch/arm/cpu/arm926ejs/mx27/relocate.S b/arch/arm/cpu/arm926ejs/mx27/relocate.S
deleted file mode 100644
index 5dfa272be248..000000000000
--- a/arch/arm/cpu/arm926ejs/mx27/relocate.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  relocate - i.MX27-specific vector relocation
- *
- *  Copyright (c) 2013  Albert ARIBAUD <albert.u.boot@aribaud.net>
- */
-
-#include <asm-offsets.h>
-#include <config.h>
-#include <linux/linkage.h>
-
-/*
- * The i.MX27 SoC is very specific with respect to exceptions: it
- * does not provide RAM at the high vectors address (0xFFFF0000),
- * thus only the low address (0x00000000) is useable; but that is
- * in ROM. Therefore, vectors cannot be changed at all.
- *
- * However, these ROM-based vectors actually just perform indirect
- * calls through pointers located in RAM at SoC-specific addresses,
- * as follows:
- *
- * Offset      Exception              Use by ROM code
- * 0x00000000  reset                  indirect branch to [0x00000014]
- * 0x00000004  undefined instruction  indirect branch to [0xfffffef0]
- * 0x00000008  software interrupt     indirect branch to [0xfffffef4]
- * 0x0000000c  prefetch abort         indirect branch to [0xfffffef8]
- * 0x00000010  data abort             indirect branch to [0xfffffefc]
- * 0x00000014  (reserved in ARMv5)    vector to ROM reset: 0xc0000000
- * 0x00000018  IRQ                    indirect branch to [0xffffff00]
- * 0x0000001c  FIQ                    indirect branch to [0xffffff04]
- *
- * In order to initialize exceptions on i.MX27, we must copy U-Boot's
- * indirect (not exception!) vector table into 0xfffffef0..0xffffff04
- * taking care not to copy vectors number 5 (reserved exception).
- */
-
-	.section	.text.relocate_vectors,"ax",%progbits
-
-ENTRY(relocate_vectors)
-
-	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
-	ldr	r1, =32			/* size of vector table */
-	add	r0, r0, r1		/* skip to indirect table */
-	ldr	r1, =0xFFFFFEF0		/* i.MX27 indirect table */
-	ldmia	r0!, {r2-r8}		/* load indirect vectors 1..7 */
-	stmia	r1!, {r2-r5, r7,r8}	/* write all but vector 5 */
-
-	bx	lr
-
-ENDPROC(relocate_vectors)
diff --git a/arch/arm/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c
deleted file mode 100644
index 496fb30817db..000000000000
--- a/arch/arm/cpu/arm926ejs/mx27/reset.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Alex Zuepke <azu@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
- *
- * (C) Copyright 2009
- * Ilya Yanok, Emcraft Systems Ltd, <yanok@emcraft.com>
- */
-
-#include <common.h>
-#include <cpu_func.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-
-/*
- * Reset the cpu by setting up the watchdog timer and let it time out
- */
-void reset_cpu(void)
-{
-	struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
-	/* Disable watchdog and set Time-Out field to 0 */
-	writew(0x0000, &regs->wcr);
-
-	/* Write Service Sequence */
-	writew(0x5555, &regs->wsr);
-	writew(0xAAAA, &regs->wsr);
-
-	/* Enable watchdog */
-	writew(WCR_WDE, &regs->wcr);
-
-	while (1);
-	/*NOTREACHED*/
-}
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
deleted file mode 100644
index 4fd6a8059685..000000000000
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ /dev/null
@@ -1,166 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Alex Zuepke <azu@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
- *
- * (C) Copyright 2009
- * Ilya Yanok, Emcraft Systems Ltd, <yanok@emcraft.com>
- */
-
-#include <common.h>
-#include <div64.h>
-#include <init.h>
-#include <time.h>
-#include <asm/global_data.h>
-#include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/ptrace.h>
-#include <linux/delay.h>
-
-/* General purpose timers bitfields */
-#define GPTCR_SWR		(1 << 15)	/* Software reset	*/
-#define GPTCR_FRR		(1 << 8)	/* Freerun / restart	*/
-#define GPTCR_CLKSOURCE_32	(4 << 1)	/* Clock source		*/
-#define GPTCR_TEN		1		/* Timer enable		*/
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define timestamp	(gd->arch.tbl)
-#define lastinc		(gd->arch.lastinc)
-
-/*
- * "time" is measured in 1 / CONFIG_SYS_HZ seconds,
- * "tick" is internal timer period
- */
-#ifdef CONFIG_MX27_TIMER_HIGH_PRECISION
-/* ~0.4% error - measured with stop-watch on 100s boot-delay */
-static inline unsigned long long tick_to_time(unsigned long long tick)
-{
-	tick *= CONFIG_SYS_HZ;
-	do_div(tick, CONFIG_MX27_CLK32);
-	return tick;
-}
-
-static inline unsigned long long time_to_tick(unsigned long long time)
-{
-	time *= CONFIG_MX27_CLK32;
-	do_div(time, CONFIG_SYS_HZ);
-	return time;
-}
-
-static inline unsigned long long us_to_tick(unsigned long long us)
-{
-	us = us * CONFIG_MX27_CLK32 + 999999;
-	do_div(us, 1000000);
-	return us;
-}
-#else
-/* ~2% error */
-#define TICK_PER_TIME	((CONFIG_MX27_CLK32 + CONFIG_SYS_HZ / 2) / \
-		CONFIG_SYS_HZ)
-#define US_PER_TICK	(1000000 / CONFIG_MX27_CLK32)
-
-static inline unsigned long long tick_to_time(unsigned long long tick)
-{
-	do_div(tick, TICK_PER_TIME);
-	return tick;
-}
-
-static inline unsigned long long time_to_tick(unsigned long long time)
-{
-	return time * TICK_PER_TIME;
-}
-
-static inline unsigned long long us_to_tick(unsigned long long us)
-{
-	us += US_PER_TICK - 1;
-	do_div(us, US_PER_TICK);
-	return us;
-}
-#endif
-
-/* nothing really to do with interrupts, just starts up a counter. */
-/* The 32768Hz 32-bit timer overruns in 131072 seconds */
-int timer_init(void)
-{
-	int i;
-	struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
-	struct pll_regs *pll = (struct pll_regs *)IMX_PLL_BASE;
-
-	/* setup GP Timer 1 */
-	writel(GPTCR_SWR, &regs->gpt_tctl);
-
-	writel(readl(&pll->pccr0) | PCCR0_GPT1_EN, &pll->pccr0);
-	writel(readl(&pll->pccr1) | PCCR1_PERCLK1_EN, &pll->pccr1);
-
-	for (i = 0; i < 100; i++)
-		writel(0, &regs->gpt_tctl); /* We have no udelay by now */
-	writel(0, &regs->gpt_tprer); /* 32Khz */
-	/* Freerun Mode, PERCLK1 input */
-	writel(readl(&regs->gpt_tctl) | GPTCR_CLKSOURCE_32 | GPTCR_FRR,
-			&regs->gpt_tctl);
-	writel(readl(&regs->gpt_tctl) | GPTCR_TEN, &regs->gpt_tctl);
-
-	return 0;
-}
-
-unsigned long long get_ticks(void)
-{
-	struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
-	ulong now = readl(&regs->gpt_tcn); /* current tick value */
-
-	if (now >= lastinc) {
-		/*
-		 * normal mode (non roll)
-		 * move stamp forward with absolut diff ticks
-		 */
-		timestamp += (now - lastinc);
-	} else {
-		/* we have rollover of incrementer */
-		timestamp += (0xFFFFFFFF - lastinc) + now;
-	}
-	lastinc = now;
-	return timestamp;
-}
-
-static ulong get_timer_masked(void)
-{
-	/*
-	 * get_ticks() returns a long long (64 bit), it wraps in
-	 * 2^64 / CONFIG_MX27_CLK32 = 2^64 / 2^15 = 2^49 ~ 5 * 10^14 (s) ~
-	 * 5 * 10^9 days... and get_ticks() * CONFIG_SYS_HZ wraps in
-	 * 5 * 10^6 days - long enough.
-	 */
-	return tick_to_time(get_ticks());
-}
-
-ulong get_timer(ulong base)
-{
-	return get_timer_masked() - base;
-}
-
-/* delay x useconds AND preserve advance timstamp value */
-void __udelay(unsigned long usec)
-{
-	unsigned long long tmp;
-	ulong tmo;
-
-	tmo = us_to_tick(usec);
-	tmp = get_ticks() + tmo;	/* get current timestamp */
-
-	while (get_ticks() < tmp)	/* loop till event */
-		 /*NOP*/;
-}
-
-ulong get_tbclk(void)
-{
-	return CONFIG_MX27_CLK32;
-}
diff --git a/arch/arm/lib/asm-offsets.c b/arch/arm/lib/asm-offsets.c
index 22fd541f9a28..6de0ce915245 100644
--- a/arch/arm/lib/asm-offsets.c
+++ b/arch/arm/lib/asm-offsets.c
@@ -15,8 +15,7 @@
 #include <linux/kbuild.h>
 #include <linux/arm-smccc.h>
 
-#if defined(CONFIG_MX27) \
-	|| defined(CONFIG_MX51) || defined(CONFIG_MX53)
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
 
@@ -35,32 +34,6 @@ int main(void)
 	 * code. Is it better to define the macros directly in headers?
 	 */
 
-#if defined(CONFIG_MX27)
-	DEFINE(AIPI1_PSR0, IMX_AIPI1_BASE + offsetof(struct aipi_regs, psr0));
-	DEFINE(AIPI1_PSR1, IMX_AIPI1_BASE + offsetof(struct aipi_regs, psr1));
-	DEFINE(AIPI2_PSR0, IMX_AIPI2_BASE + offsetof(struct aipi_regs, psr0));
-	DEFINE(AIPI2_PSR1, IMX_AIPI2_BASE + offsetof(struct aipi_regs, psr1));
-
-	DEFINE(CSCR, IMX_PLL_BASE + offsetof(struct pll_regs, cscr));
-	DEFINE(MPCTL0, IMX_PLL_BASE + offsetof(struct pll_regs, mpctl0));
-	DEFINE(SPCTL0, IMX_PLL_BASE + offsetof(struct pll_regs, spctl0));
-	DEFINE(PCDR0, IMX_PLL_BASE + offsetof(struct pll_regs, pcdr0));
-	DEFINE(PCDR1, IMX_PLL_BASE + offsetof(struct pll_regs, pcdr1));
-	DEFINE(PCCR0, IMX_PLL_BASE + offsetof(struct pll_regs, pccr0));
-	DEFINE(PCCR1, IMX_PLL_BASE + offsetof(struct pll_regs, pccr1));
-
-	DEFINE(ESDCTL0_ROF, offsetof(struct esdramc_regs, esdctl0));
-	DEFINE(ESDCFG0_ROF, offsetof(struct esdramc_regs, esdcfg0));
-	DEFINE(ESDCTL1_ROF, offsetof(struct esdramc_regs, esdctl1));
-	DEFINE(ESDCFG1_ROF, offsetof(struct esdramc_regs, esdcfg1));
-	DEFINE(ESDMISC_ROF, offsetof(struct esdramc_regs, esdmisc));
-
-	DEFINE(GPCR, IMX_SYSTEM_CTL_BASE +
-		offsetof(struct system_control_regs, gpcr));
-	DEFINE(FMCR, IMX_SYSTEM_CTL_BASE +
-		offsetof(struct system_control_regs, fmcr));
-#endif
-
 #if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 	/* Round up to make sure size gives nice stack alignment */
 	DEFINE(CLKCTL_CCMR, offsetof(struct clkctl, ccr));
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 03471db9e80e..1dec4e35e0a7 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -44,13 +44,13 @@ static unsigned long gpio_ports[] = {
 	[0] = GPIO1_BASE_ADDR,
 	[1] = GPIO2_BASE_ADDR,
 	[2] = GPIO3_BASE_ADDR,
-#if defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+#if defined(CONFIG_MX51) || \
 		defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \
 		defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050)
 	[3] = GPIO4_BASE_ADDR,
 #endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || \
 		defined(CONFIG_ARCH_IMX8) || defined(CONFIG_IMXRT1050)
 	[4] = GPIO5_BASE_ADDR,
@@ -352,12 +352,12 @@ static const struct mxc_gpio_plat mxc_plat[] = {
 	{ 0, (struct gpio_regs *)GPIO1_BASE_ADDR },
 	{ 1, (struct gpio_regs *)GPIO2_BASE_ADDR },
 	{ 2, (struct gpio_regs *)GPIO3_BASE_ADDR },
-#if defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+#if defined(CONFIG_MX51) || \
 		defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ 3, (struct gpio_regs *)GPIO4_BASE_ADDR },
 #endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ 4, (struct gpio_regs *)GPIO5_BASE_ADDR },
 #ifndef CONFIG_IMX8M
@@ -376,12 +376,12 @@ U_BOOT_DRVINFOS(mxc_gpios) = {
 	{ "gpio_mxc", &mxc_plat[0] },
 	{ "gpio_mxc", &mxc_plat[1] },
 	{ "gpio_mxc", &mxc_plat[2] },
-#if defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
+#if defined(CONFIG_MX51) || \
 		defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ "gpio_mxc", &mxc_plat[3] },
 #endif
-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6) || \
 		defined(CONFIG_IMX8M) || defined(CONFIG_ARCH_IMX8)
 	{ "gpio_mxc", &mxc_plat[4] },
 #ifndef CONFIG_IMX8M
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index fa903e324c59..8aa5f7342131 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -12,8 +12,7 @@
 #include <linux/err.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
-#if defined(CONFIG_MX27) || \
-	defined(CONFIG_MX51) || defined(CONFIG_MX53)
+#if defined(CONFIG_MX51) || defined(CONFIG_MX53)
 #include <asm/arch/imx-regs.h>
 #endif
 #include "mxc_nand.h"
diff --git a/drivers/mtd/nand/raw/mxc_nand.h b/drivers/mtd/nand/raw/mxc_nand.h
index 771f61e24919..084fac705a12 100644
--- a/drivers/mtd/nand/raw/mxc_nand.h
+++ b/drivers/mtd/nand/raw/mxc_nand.h
@@ -24,7 +24,7 @@
  *	Reading or writing a 2K or 4K page requires only 1 FDI/FDO cycle.
  *	Also some of registers are moved and/or changed meaning as seen below.
  */
-#if defined(CONFIG_MX27) || defined(CONFIG_MX31)
+#if defined(CONFIG_MX31)
 #define MXC_NFC_V1
 #define is_mxc_nfc_1()		1
 #define is_mxc_nfc_21()		0
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index bbc4434ddb9e..a61a1fc75738 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -251,9 +251,6 @@ static int miiphy_restart_aneg(struct eth_device *dev)
 	 * Wake up from sleep if necessary
 	 * Reset PHY, then delay 300ns
 	 */
-#ifdef CONFIG_MX27
-	fec_mdio_write(eth, fec->phy_id, MII_DCOUNTER, 0x00FF);
-#endif
 	fec_mdio_write(eth, fec->phy_id, MII_BMCR, BMCR_RESET);
 	udelay(1000);
 
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 5adfdf8b5fc6..ea9cc3d1f983 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -91,14 +91,6 @@ struct cspi_regs {
 #define MXC_CSPICON_CTL		20 /* inactive state of SCLK */
 #endif
 
-#ifdef CONFIG_MX27
-/* i.MX27 has a completely wrong register layout and register definitions in the
- * datasheet, the correct one is in the Freescale's Linux driver */
-
-#error "i.MX27 CSPI not supported due to drastic differences in register definitions" \
-"See linux mxc_spi driver from Freescale for details."
-#endif
-
 __weak int board_spi_cs_gpio(unsigned bus, unsigned cs)
 {
 	return -1;
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
deleted file mode 100644
index b0abd5488262..000000000000
--- a/include/configs/imx27lite-common.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2010 Heiko Schocher <hs@denx.de>
- *
- * based on:
- * Copyright (C) 2009 Ilya Yanok <yanok@emcraft.com>
- */
-
-#ifndef __IMX27LITE_COMMON_CONFIG_H
-#define __IMX27LITE_COMMON_CONFIG_H
-
-/*
- * SoC Configuration
- */
-#define CONFIG_MX27
-#define CONFIG_MX27_CLK32	32768		/* OSC32K frequency */
-
-/*
- * Lowlevel configuration
- */
-#define SDRAM_ESDCFG_REGISTER_VAL(cas)	\
-		(ESDCFG_TRC(10) |	\
-		ESDCFG_TRCD(3) |	\
-		ESDCFG_TCAS(cas) |	\
-		ESDCFG_TRRD(1) |	\
-		ESDCFG_TRAS(5) |	\
-		ESDCFG_TWR |		\
-		ESDCFG_TMRD(2) |	\
-		ESDCFG_TRP(2) |		\
-		ESDCFG_TXP(3))
-
-#define SDRAM_ESDCTL_REGISTER_VAL	\
-		(ESDCTL_PRCT(0) |	\
-		 ESDCTL_BL |		\
-		 ESDCTL_PWDT(0) |	\
-		 ESDCTL_SREFR(3) |	\
-		 ESDCTL_DSIZ_32 |	\
-		 ESDCTL_COL10 |		\
-		 ESDCTL_ROW13 |		\
-		 ESDCTL_SDE)
-
-#define SDRAM_ALL_VAL		0xf00
-
-#define SDRAM_MODE_REGISTER_VAL	0x33	/* BL: 8, CAS: 3 */
-#define SDRAM_EXT_MODE_REGISTER_VAL	0x1000000
-
-#define MPCTL0_VAL	0x1ef15d5
-
-#define SPCTL0_VAL	0x043a1c09
-
-#define CSCR_VAL	0x33f08107
-
-#define PCDR0_VAL	0x120470c3
-#define PCDR1_VAL	0x03030303
-#define PCCR0_VAL	0xffffffff
-#define PCCR1_VAL	0xfffffffc
-
-#define AIPI1_PSR0_VAL	0x20040304
-#define AIPI1_PSR1_VAL	0xdffbfcfb
-#define AIPI2_PSR0_VAL	0x07ffc200
-#define AIPI2_PSR1_VAL	0xffffffff
-
-/*
- * Memory Info
- */
-/* memtest start address */
-#define PHYS_SDRAM_1		0xA0000000	/* DDR Start */
-#define PHYS_SDRAM_1_SIZE	0x08000000	/* DDR size 128MB */
-
-/*
- * Serial Driver info
- */
-#define CONFIG_MXC_UART_BASE	UART_BASE_ADDR(1)
-
-/*
- * Flash & Environment
- */
-/* Use buffered writes (~10x faster) */
-/* Use hardware sector protection */
-/* CS2 Base address */
-#define PHYS_FLASH_1			0xc0000000
-/* Flash Base for U-Boot */
-#define CFG_SYS_FLASH_BASE		PHYS_FLASH_1
-/* Address and size of Redundant Environment Sector	*/
-
-/*
- * Ethernet
- */
-#define CONFIG_FEC_MXC_PHYADDR		0x1f
-
-/*
- * MTD
- */
-
-/*
- * NAND
- */
-#define CONFIG_MXC_NAND_REGS_BASE	0xd8000000
-#define CFG_SYS_NAND_BASE		0xd8000000
-#define CONFIG_MXC_NAND_HWECC
-
-/*
- * U-Boot general configuration
- */
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
-	"netdev=eth0\0"							\
-	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
-		"nfsroot=${serverip}:${rootpath}\0"			\
-	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
-	"addip=setenv bootargs ${bootargs} "				\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
-		":${hostname}:${netdev}:off panic=1\0"			\
-	"addtty=setenv bootargs ${bootargs}"				\
-		" console=ttymxc0,${baudrate}\0"			\
-	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"		\
-	"addmisc=setenv bootargs ${bootargs}\0"				\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"		\
-	"kernel_addr_r=a0800000\0"					\
-	"bootfile=" CONFIG_HOSTNAME "/uImage\0"		\
-	"rootpath=/opt/eldk-4.2-arm/arm\0"				\
-	"net_nfs=tftp ${kernel_addr_r} ${bootfile};"			\
-		"run nfsargs addip addtty addmtd addmisc;"		\
-		"bootm\0"						\
-	"bootcmd=run net_nfs\0"						\
-	"load=tftp ${loadaddr} ${u-boot}\0"				\
-	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
-		" +${filesize};era " __stringify(CONFIG_SYS_MONITOR_BASE)\
-		" +${filesize};cp.b ${fileaddr} "			\
-		__stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0"	\
-	"upd=run load update\0"						\
-
-/* additions for new relocation code, must be added to all boards */
-#define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#endif /* __IMX27LITE_COMMON_CONFIG_H */
-- 
2.25.1

[PATCH 21/38] Convert CONFIG_MXS_OCOTP to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_MXS_OCOTP

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/misc/Kconfig  | 8 ++++++++
 include/configs/mxs.h | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fb3bbb3b919f..122d605a537d 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -330,6 +330,14 @@ config MXC_OCOTP
 	  Programmable memory pages that are stored on the some
 	  Freescale i.MX processors.
 
+config MXS_OCOTP
+	bool "Enable MXS OCOTP Driver"
+	depends on ARCH_MX23 || ARCH_MX28
+	help
+	  If you say Y here, you will get support for the One Time
+	  Programmable memory pages that are stored on the
+	  Freescale i.MXS family of processors.
+
 config NPCM_HOST
 	bool "Enable support espi or LPC for Host"
 	depends on REGMAP && SYSCON
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 5df080ade4a2..30f27e7f0c19 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -86,11 +86,6 @@
 #define CFG_SYS_NAND_BASE		0x60000000
 #endif
 
-/* OCOTP */
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXS_OCOTP
-#endif
-
 /* SPI */
 #ifdef CONFIG_CMD_SPI
 #define CONFIG_SPI_HALF_DUPLEX
-- 
2.25.1

[PATCH 22/38] Convert CONFIG_NAND_KMETER1 et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_NAND_ECC_BCH
   CONFIG_NAND_KIRKWOOD
   CONFIG_NAND_KMETER1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-kirkwood/include/mach/config.h |  1 -
 configs/kmcoge5ne_defconfig                  |  1 +
 drivers/mtd/nand/raw/Kconfig                 | 13 +++++++++++++
 include/configs/km/km-mpc83xx.h              |  1 -
 include/configs/kmcoge5ne.h                  |  2 --
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index a2781e25a23b..a6de7676294b 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -34,7 +34,6 @@
  * NAND configuration
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_KIRKWOOD
 #define CFG_SYS_NAND_BASE		0xD8000000	/* MV_DEFADR_NANDF */
 #define NAND_ALLOW_ERASE_ALL		1
 #endif
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 71d196533f7e..c2a17c6212f1 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -235,6 +235,7 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_KMETER1=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_QE_UEC=y
 # CONFIG_PCI is not set
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index eb37b6275998..338a3562a4ac 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -225,6 +225,19 @@ config NAND_FSL_IFC
 	help
 	  Enable the Freescale Integrated Flash Controller NAND driver.
 
+config NAND_KIRKWOOD
+	bool "Support for Kirkwood NAND controller"
+	depends on ARCH_KIRKWOOD
+	default y
+
+config NAND_ECC_BCH
+	bool
+
+config NAND_KMETER1
+	bool "Support KMETER1 NAND controller"
+	depends on VENDOR_KM
+	select NAND_ECC_BCH
+
 config NAND_LPC32XX_MLC
 	bool "Support LPC32XX_MLC controller"
 	select SYS_NAND_SELF_INIT
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index e6a3613b7a24..840a4d5401f5 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -57,7 +57,6 @@
 		{1, {I2C_NULL_HOP} } }
 
 #if defined(CONFIG_CMD_NAND)
-#define CONFIG_NAND_KMETER1
 #define CFG_SYS_NAND_BASE		CFG_SYS_KMBEC_FPGA_BASE
 #endif
 
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 2be996aaaf08..c24d6ad8bc2d 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -9,8 +9,6 @@
 #define __CONFIG_H
 
 #define CONFIG_HOSTNAME		"kmcoge5ne"
-#define CONFIG_NAND_ECC_BCH
-#define CONFIG_NAND_KMETER1
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
-- 
2.25.1

[PATCH 23/38] Convert CONFIG_PCA953X to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_PCA953X

Cc: Uri Mashiach <uri.mashiach@compulab.co.il>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
The only user of the non-DM GPIO driver here is the cl-som-imx7, and in
turn also the "pca953x" command. I think with a dts resync the DM GPIO
driver should just work however?
---
 README                         | 2 --
 configs/cl-som-imx7_defconfig  | 1 +
 drivers/gpio/Kconfig           | 4 ++++
 include/configs/cl-som-imx7.h  | 1 -
 include/configs/imx8qxp_mek.h  | 4 ----
 include/configs/mx6sabreauto.h | 1 -
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 0a7635d1a24d..eb76c73ac3d0 100644
--- a/README
+++ b/README
@@ -483,8 +483,6 @@ The following options need to be configured:
 		must also be configured. See I2C Support, below.
 
 - GPIO Support:
-		CONFIG_PCA953X		- use NXP's PCA953X series I2C GPIO
-
 		The CFG_SYS_I2C_PCA953X_WIDTH option specifies a list of
 		chip-ngpio pairs that tell the PCA953X driver the number of
 		pins supported by a particular chip.
diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index 3571dba6d2ae..d1a044e3f7ba 100644
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -74,6 +74,7 @@ CONFIG_ETHPRIME="FEC"
 CONFIG_SPL_DM=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_CMD_PCA953X=y
+CONFIG_PCA953X=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e007b38fac71..1e4b50ef72b5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -520,6 +520,10 @@ config SPL_DM_PCA953X
 	  Now, max 24 bits chips and PCA953X compatible chips are
 	  supported
 
+config PCA953X
+	bool "NXP's PCA953X series I2C GPIO (legacy driver)"
+	depends on !DM_PCA953X
+
 config MPC8XXX_GPIO
 	bool "Freescale MPC8XXX GPIO driver"
 	depends on DM_GPIO
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 4aaa52f26980..5c9004cbd93a 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -21,7 +21,6 @@
 /* PMIC */
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
 
-#define CONFIG_PCA953X
 #define CFG_SYS_I2C_PCA953X_ADDR	0x20
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x20, 16} }
 
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 19f1dba04706..d75b8bf0c18f 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -110,10 +110,6 @@
 /* LPDDR4 board total DDR is 3GB */
 #define PHYS_SDRAM_2_SIZE		0x40000000	/* 1 GB */
 
-#ifndef CONFIG_DM_PCA953X
-#define CONFIG_PCA953X
-#endif
-
 /* Misc configuration */
 
 #endif /* __IMX8QXP_MEK_H */
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index f5f95a1bd1ce..888da7ce365f 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -15,7 +15,6 @@
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS	0
 
-#define CONFIG_PCA953X
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
 #include "mx6sabre_common.h"
-- 
2.25.1

[PATCH 24/38] Convert CONFIG_RTC_DS1337 et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_RTC_DS1337
   CONFIG_RTC_DS1337_NOOSC
   CONFIG_RTC_DS1338
   CONFIG_RTC_DS1374
   CONFIG_RTC_DS3231
   CONFIG_RTC_MC13XXX
   CONFIG_RTC_MXS
   CONFIG_RTC_PT7C4338

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                        | 22 ----------
 configs/MPC837XERDB_defconfig                 |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig       |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig    |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1010RDB-PA_NAND_defconfig            |  1 +
 configs/P1010RDB-PA_NOR_defconfig             |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig          |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig        |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig       |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig    |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1010RDB-PB_NAND_defconfig            |  1 +
 configs/P1010RDB-PB_NOR_defconfig             |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig          |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P1020RDB-PC_36BIT_defconfig           |  1 +
 configs/P1020RDB-PC_NAND_defconfig            |  1 +
 configs/P1020RDB-PC_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PC_defconfig                 |  1 +
 configs/P1020RDB-PD_NAND_defconfig            |  1 +
 configs/P1020RDB-PD_SDCARD_defconfig          |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig        |  1 +
 configs/P1020RDB-PD_defconfig                 |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig    |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig  |  1 +
 configs/P2020RDB-PC_36BIT_defconfig           |  1 +
 configs/P2020RDB-PC_NAND_defconfig            |  1 +
 configs/P2020RDB-PC_SDCARD_defconfig          |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig        |  1 +
 configs/P2020RDB-PC_defconfig                 |  1 +
 configs/T1024RDB_NAND_defconfig               |  1 +
 configs/T1024RDB_SDCARD_defconfig             |  1 +
 configs/T1024RDB_SPIFLASH_defconfig           |  1 +
 configs/T1024RDB_defconfig                    |  1 +
 configs/T1042D4RDB_NAND_defconfig             |  1 +
 configs/T1042D4RDB_SDCARD_defconfig           |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig         |  1 +
 configs/T1042D4RDB_defconfig                  |  1 +
 configs/eb_cpu5282_defconfig                  |  1 +
 configs/eb_cpu5282_internal_defconfig         |  1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080aqds_defconfig                  |  1 +
 configs/ls2080aqds_nand_defconfig             |  1 +
 configs/ls2080aqds_qspi_defconfig             |  1 +
 configs/ls2080aqds_sdcard_defconfig           |  1 +
 configs/ls2080ardb_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080ardb_defconfig                  |  1 +
 configs/ls2080ardb_nand_defconfig             |  1 +
 configs/ls2088aqds_tfa_defconfig              |  1 +
 configs/ls2088ardb_qspi_SECURE_BOOT_defconfig |  1 +
 configs/ls2088ardb_qspi_defconfig             |  1 +
 configs/ls2088ardb_tfa_SECURE_BOOT_defconfig  |  1 +
 configs/ls2088ardb_tfa_defconfig              |  1 +
 configs/mx28evk_defconfig                     |  1 +
 configs/mx51evk_defconfig                     |  1 +
 configs/qemu-ppce500_defconfig                |  1 +
 configs/work_92105_defconfig                  |  1 +
 drivers/rtc/Kconfig                           | 42 ++++++++++++++++++-
 include/configs/MPC837XERDB.h                 |  1 -
 include/configs/P1010RDB.h                    |  1 -
 include/configs/T102xRDB.h                    |  2 -
 include/configs/T104xRDB.h                    |  2 -
 include/configs/eb_cpu5282.h                  |  1 -
 include/configs/ls1012aqds.h                  |  1 -
 include/configs/ls1046afrwy.h                 |  1 -
 include/configs/ls1088aqds.h                  |  1 -
 include/configs/ls1088ardb.h                  |  3 --
 include/configs/ls2080aqds.h                  |  2 -
 include/configs/ls2080ardb.h                  |  2 -
 include/configs/lx2160a_common.h              |  1 -
 include/configs/mx28evk.h                     |  5 ---
 include/configs/mx51evk.h                     |  1 -
 include/configs/p1_p2_rdb_pc.h                |  1 -
 include/configs/qemu-ppce500.h                |  3 --
 include/configs/tqma6_wru4.h                  |  2 -
 include/configs/work_92105.h                  |  2 -
 84 files changed, 105 insertions(+), 55 deletions(-)

diff --git a/README b/README
index eb76c73ac3d0..dd43a0c08d4a 100644
--- a/README
+++ b/README
@@ -460,28 +460,6 @@ The following options need to be configured:
 		to 0 disables calling WATCHDOG_RESET() from the timer
 		interrupt.
 
-- Real-Time Clock:
-
-		When CONFIG_CMD_DATE is selected, the type of the RTC
-		has to be selected, too. Define exactly one of the
-		following options:
-
-		CONFIG_RTC_PCF8563	- use Philips PCF8563 RTC
-		CONFIG_RTC_MC13XXX	- use MC13783 or MC13892 RTC
-		CONFIG_RTC_MC146818	- use MC146818 RTC
-		CONFIG_RTC_DS1307	- use Maxim, Inc. DS1307 RTC
-		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_ISL1208	- use Intersil ISL1208 RTC
-		CONFIG_RTC_MAX6900	- use Maxim, Inc. MAX6900 RTC
-		CONFIG_RTC_DS1337_NOOSC	- Turn off the OSC output for DS1337
-		CONFIG_SYS_RV3029_TCR	- enable trickle charger on
-					  RV3029 RTC.
-
-		Note that if the RTC uses I2C, then the I2C interface
-		must also be configured. See I2C Support, below.
-
 - GPIO Support:
 		The CFG_SYS_I2C_PCA953X_WIDTH option specifies a list of
 		chip-ngpio pairs that tell the PCA953X driver the number of
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index d97fa5aec521..b6263ec03ff6 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -207,6 +207,7 @@ CONFIG_DM_ETH_PHY=y
 CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_TSEC_ENET=y
+CONFIG_RTC_DS1374=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 0690582cdfee..874451900e7e 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -129,6 +129,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index dcf74f5d6af5..34639e5091ab 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -93,6 +93,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index 230c6d02831c..08c185c5f5fe 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -114,6 +114,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index 982420db74c4..dcf4c0d103e5 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -116,6 +116,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index 785f2d86f189..78c159a3093a 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -128,6 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index 537d8bf576b0..0b2c38512278 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -92,6 +92,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index dd9120970bab..012e8f69626e 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -113,6 +113,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index ff7cfa246159..b21372458ba3 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -115,6 +115,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index 696cb7e77fbe..ab7c4d3e9758 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -132,6 +132,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index 92a7e0966936..f878af0b360d 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -95,6 +95,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index 84e2d3c587a4..38bdbda7481a 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -116,6 +116,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index b883b81e0cd8..956274358ad7 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -118,6 +118,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index ee8c2bebd4b2..46f53983801b 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -131,6 +131,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index 3e16470608e5..7239747d7e38 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -94,6 +94,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index e985f8cd75d0..529e54c221ac 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -115,6 +115,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 9f4ae14e0b23..e066a9db747d 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -117,6 +117,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index f2eb7ed737b7..46816999e7a6 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -142,6 +142,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 3b3cf1ee7a5e..4ce423ea739c 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -124,6 +124,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index aba5b9cedd43..d7b2d3780907 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -126,6 +126,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index ce0ba0e37574..d67b31aafcda 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -104,6 +104,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index 1f12338bc35d..6d1193e051d2 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -141,6 +141,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index 25eb5d5da74a..25c04754acba 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -123,6 +123,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index 054320f356cd..d865102dc6f2 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -125,6 +125,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index aae886b75c4e..28bc16c97e43 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -103,6 +103,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 4682677471ad..20384bb054d6 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -144,6 +144,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index dc82da81b816..bffecea2634e 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -126,6 +126,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 7b80edeeeb92..a87afd3bb08c 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -128,6 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index 5fecb6684735..c0111b4acd05 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -106,6 +106,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index d917c5470b1b..169e54cd1b7e 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -147,6 +147,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index fd143b610b98..ff3388b68bd2 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -129,6 +129,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index edb8b9958eae..234bc80a3aff 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -131,6 +131,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index b1dbca6e7ea3..0691cbcc217b 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -109,6 +109,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 89d366c96a43..bfaa79af6abd 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -146,6 +146,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPL_NS16550_MIN_FUNCTIONS=y
 CONFIG_SPI=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index b5394d05b7ff..2d00717e538a 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -128,6 +128,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 431ca31302c9..9edbb04b3802 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -130,6 +130,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index 1ee46f9fbe9f..2c7dd633e556 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -108,6 +108,7 @@ CONFIG_MII=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 2aada043e83a..8f5d603974df 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -129,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index e5661b0b6052..3fb54800d967 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -123,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 320f22e348ea..ee8667e49c85 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -126,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index 1f571b6e6fa0..f8144f07bfde 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -98,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index 4088d40de30d..8a9094b56118 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -129,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 5a6f9a8d248f..25d18b71bcf3 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -123,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index 2d03b4eb1424..8189abb4c5e6 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -126,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 8f283fa8fd26..9e68b434687b 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -98,6 +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_RTC_DS1337=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index f904bb313bb5..a831c1c5d2aa 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -52,4 +52,5 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
 CONFIG_MCFFEC=y
 CONFIG_MII=y
+CONFIG_RTC_DS1338=y
 CONFIG_MCFUART=y
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 2ce6ff91403e..6a673c918110 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -50,4 +50,5 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
 CONFIG_MCFFEC=y
 CONFIG_MII=y
+CONFIG_RTC_DS1338=y
 CONFIG_MCFUART=y
diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig
index 817ae8d728b3..5649ebb49586 100644
--- a/configs/ls2080aqds_SECURE_BOOT_defconfig
+++ b/configs/ls2080aqds_SECURE_BOOT_defconfig
@@ -95,6 +95,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig
index b3e75847cca3..936c5ede5177 100644
--- a/configs/ls2080aqds_defconfig
+++ b/configs/ls2080aqds_defconfig
@@ -98,6 +98,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig
index effcd33629b8..4479256bd57a 100644
--- a/configs/ls2080aqds_nand_defconfig
+++ b/configs/ls2080aqds_nand_defconfig
@@ -111,6 +111,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig
index eb57948414df..4c0113978e08 100644
--- a/configs/ls2080aqds_qspi_defconfig
+++ b/configs/ls2080aqds_qspi_defconfig
@@ -91,6 +91,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
diff --git a/configs/ls2080aqds_sdcard_defconfig b/configs/ls2080aqds_sdcard_defconfig
index e5702b815923..2b31cf4dec5d 100644
--- a/configs/ls2080aqds_sdcard_defconfig
+++ b/configs/ls2080aqds_sdcard_defconfig
@@ -105,6 +105,7 @@ CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig
index face1e05320a..a8a66b966c7b 100644
--- a/configs/ls2080ardb_SECURE_BOOT_defconfig
+++ b/configs/ls2080ardb_SECURE_BOOT_defconfig
@@ -92,6 +92,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig
index ba6f5090d471..97428bcd821a 100644
--- a/configs/ls2080ardb_defconfig
+++ b/configs/ls2080ardb_defconfig
@@ -95,6 +95,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig
index 500029003031..20f686b016ea 100644
--- a/configs/ls2080ardb_nand_defconfig
+++ b/configs/ls2080ardb_nand_defconfig
@@ -114,6 +114,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig
index 9c6012460b37..ce42840255a3 100644
--- a/configs/ls2088aqds_tfa_defconfig
+++ b/configs/ls2088aqds_tfa_defconfig
@@ -111,6 +111,7 @@ CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_ENABLE_32KHZ_OUTPUT=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
diff --git a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
index 6e1fe901ff4a..eb74e76eff6b 100644
--- a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
@@ -80,6 +80,7 @@ CONFIG_MII=y
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig
index 8441814f13f5..4cd2ef0f01ff 100644
--- a/configs/ls2088ardb_qspi_defconfig
+++ b/configs/ls2088ardb_qspi_defconfig
@@ -87,6 +87,7 @@ CONFIG_MII=y
 CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
index dc9a47463f49..db93759b25de 100644
--- a/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/ls2088ardb_tfa_SECURE_BOOT_defconfig
@@ -98,6 +98,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig
index 361098568097..bb620cd0eb3a 100644
--- a/configs/ls2088ardb_tfa_defconfig
+++ b/configs/ls2088ardb_tfa_defconfig
@@ -106,6 +106,7 @@ CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_PCIE_LAYERSCAPE_RC=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_DS3231=y
 CONFIG_DM_SCSI=y
 CONFIG_CONS_INDEX=2
 CONFIG_SYS_NS16550=y
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig
index 996dd5c97071..dad8839a6c10 100644
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@@ -61,6 +61,7 @@ CONFIG_PINCTRL_MXS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_RTC_MXS=y
 CONFIG_CONS_INDEX=0
 CONFIG_SPI=y
 CONFIG_USB=y
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 774523bc84b8..b173648c8ebc 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -56,6 +56,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_POWER_FSL=y
 CONFIG_POWER_SPI=y
+CONFIG_RTC_MC13XXX=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index d6ff4ac2c299..cdad1b099500 100644
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -52,6 +52,7 @@ CONFIG_E1000=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCI_MPC85XX=y
 CONFIG_DM_RTC=y
+CONFIG_RTC_PT7C4338=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYSRESET=y
diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
index 127bbf715fce..167a07860fda 100644
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -72,6 +72,7 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x40000
 CONFIG_PHYLIB=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_SMSC=y
+CONFIG_RTC_DS1374=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_CONS_INDEX=5
 CONFIG_SYS_NS16550=y
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 23963271928a..b69872256983 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -68,9 +68,38 @@ config RTC_DS1307
 	bool "Enable DS1307 driver"
 	depends on DM_RTC
 	help
-	  Support for Dallas Semiconductor (now Maxim) DS1307 and DS1338/9 and
+	  Support for Dallas Semiconductor (now Maxim) DS1307 and DS1339 and
 	  compatible Real Time Clock devices.
 
+config RTC_DS1337
+	bool "Enable DS1337 driver"
+	help
+	  Support for Dallas Semiconductor (now Maxim) DS1337/8/9 compatible
+	  Real Time Clock devices.
+
+config RTC_DS1337_NOOSC
+	bool "Enable support for no oscillator output in DS1337 driver"
+	depends on RTC_DS1337
+
+config RTC_DS1338
+	bool "Enable DS1338 driver"
+	help
+	  Support for Dallas Semiconductor (now Maxim) DS1338 and compatible
+	  Real Time Clock devices.
+
+config RTC_DS1374
+	bool "Enable DS1374 driver"
+	depends on !DM_RTC
+	help
+	  Support for Dallas Semiconductor (now Maxim) DS1374 and compatible
+	  Real Time Clock devices.
+
+config RTC_DS3231
+	bool "Enable DS3231 driver"
+	help
+	  Support for Dallas Semiconductor (now Maxim) DS3231 compatible
+	  Real Time Clock devices.
+
 config RTC_DS3232
 	bool "Enable DS3232 driver"
 	depends on DM_RTC
@@ -111,6 +140,9 @@ config RTC_PCF8563
 	  If you say yes here you get support for the Philips PCF8563 RTC
 	  and compatible chips.
 
+config RTC_PT7C4338
+	bool "Enable Pericom Technology PT7C4338 RTC driver"
+
 config RTC_RV3028
 	bool "Enable RV3028 driver"
 	depends on DM_RTC
@@ -169,6 +201,10 @@ config RTC_S35392A
 	help
 	  Enable s35392a driver which provides rtc get and set function.
 
+config RTC_MC13XXX
+	bool "Enable MC13XXX RTC driver"
+	depends on !DM_RTC
+
 config RTC_MC146818
 	bool "Enable MC146818 driver"
 	help
@@ -185,6 +221,10 @@ config SYS_MCFRTC_BASE
 	hex "Base address for RTC in immap.h"
 	depends on MCFRTC
 
+config RTC_MXS
+	bool "Enable i.MXS RTC driver"
+	depends on ARCH_MX23 || ARCH_MX28
+
 config RTC_M41T62
 	bool "Enable M41T62 driver"
 	help
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2796adbdcd8f..de63a0f1993f 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -167,7 +167,6 @@
 /*
  * Config on-board RTC
  */
-#define CONFIG_RTC_DS1374	/* use ds1374 rtc via i2c */
 #define CFG_SYS_I2C_RTC_ADDR	0x68 /* at address 0x68 */
 
 /*
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 0a1b932e94e8..c0805f979be7 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -341,7 +341,6 @@ extern unsigned long get_sdram_size(void);
 /* enable read and write access to EEPROM */
 
 /* RTC */
-#define CONFIG_RTC_PT7C4338
 #define CFG_SYS_I2C_RTC_ADDR	0x68
 
 /*
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index e394237daf08..623d4cf5562d 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -311,8 +311,6 @@
 /*
  * RTC configuration
  */
-#define RTC
-#define CONFIG_RTC_DS1337	1
 #define CFG_SYS_I2C_RTC_ADDR	0x68
 
 /*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index f681a2182298..d3fd10526bd9 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -285,8 +285,6 @@
 /*
  * RTC configuration
  */
-#define RTC
-#define CONFIG_RTC_DS1337               1
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /*DVI encoder*/
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 426155dbdbf1..21eab9b3a479 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -150,7 +150,6 @@
  */
 
 #ifdef CONFIG_CMD_DATE
-#define CONFIG_RTC_DS1338
 #define CONFIG_I2C_RTC_ADDR		0x68
 #endif
 
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index e772c019077d..495bb3911b3a 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -46,7 +46,6 @@
 /*
 * RTC configuration
 */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 
diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 58ae0fb0a6c1..1759d25f3a39 100644
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -66,7 +66,6 @@
 #define I2C_MUX_CH_RTC				0x1 /* Channel 0*/
 
 /* RTC */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR		0x51  /* Channel 0 I2C bus 0*/
 #define CFG_SYS_RTC_BUS_NUM			0
 
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index d84622f32259..a35045d640ff 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -280,7 +280,6 @@
 /*
 * RTC configuration
 */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 #ifdef CONFIG_FSL_DSPI
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 187b3072f02e..7bc4fc6a6652 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -186,13 +186,10 @@
 #define I2C_MUX_CH_DEFAULT		0x8
 #define I2C_MUX_CH5			0xD
 
-#ifndef SPL_NO_RTC
 /*
 * RTC configuration
 */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
-#endif
 
 #ifndef SPL_NO_ENV
 /* Initial environment variables */
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 067587b53c5d..924d4057d936 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -227,8 +227,6 @@
 /*
  * RTC configuration
  */
-#define RTC
-#define CONFIG_RTC_DS3231               1
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Initial environment variables */
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 32a119487234..c50b6030680c 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -210,11 +210,9 @@
 /*
  * RTC configuration
  */
-#define RTC
 #ifdef CONFIG_TARGET_LS2081ARDB
 #define CFG_SYS_I2C_RTC_ADDR         0x51
 #else
-#define CONFIG_RTC_DS3231               1
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 #endif
 
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index ff85d966e661..a469c83fa4eb 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -74,7 +74,6 @@
 #define I2C_MUX_CH_DEFAULT		0x8
 
 /* RTC */
-#define RTC
 #define CFG_SYS_I2C_RTC_ADDR		0x51  /* Channel 3*/
 
 /* Qixis */
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index bc8c89337043..c740d8533274 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -17,11 +17,6 @@
 
 /* UBI and NAND partitioning */
 
-/* RTC */
-#ifdef	CONFIG_CMD_DATE
-#define	CONFIG_RTC_MXS
-#endif
-
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"ubifs_file=filesystem.ubifs\0" \
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index d9d76d7c08da..ddd37b3936ff 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -26,7 +26,6 @@
 #define CONFIG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CONFIG_FSL_PMIC_BITLEN	32
-#define CONFIG_RTC_MC13XXX
 
 /*
  * MMC Configs
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index eda2d43d0c1f..c8acce8b06b7 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -329,7 +329,6 @@
  * I2C2 EEPROM
  */
 
-#define CONFIG_RTC_PT7C4338
 #define CFG_SYS_I2C_RTC_ADDR		0x68
 #define CFG_SYS_I2C_PCA9557_ADDR	0x18
 
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index d1b20da24a86..30a9eae8523b 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -44,9 +44,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 
 #define CFG_SYS_INIT_SP_OFFSET	(CFG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
-/* RTC */
-#define CONFIG_RTC_PT7C4338
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index ce897fcd9325..4d8839b6e60d 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -16,11 +16,9 @@
 /* Watchdog */
 
 /* Config on-board RTC */
-#define CONFIG_RTC_DS1337
 #define CFG_SYS_RTC_BUS_NUM		2
 #define CFG_SYS_I2C_RTC_ADDR		0x68
 /* Turn off RTC square-wave output to save battery */
-#define CONFIG_RTC_DS1337_NOOSC
 
 /* LED */
 
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 065006f912c8..010da1531ff9 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -19,8 +19,6 @@
 #define CFG_SYS_SDRAM_BASE		EMC_DYCS0_BASE
 #define CFG_SYS_SDRAM_SIZE		SZ_128M
 
-#define CONFIG_RTC_DS1374
-
 /*
  * U-Boot General Configurations
  */
-- 
2.25.1

[PATCH 25/38] Convert CONFIG_SH_GPIO_PFC et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_SH_GPIO_PFC
   CONFIG_TMU_TIMER

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-rmobile/Kconfig.32   | 4 ++++
 drivers/gpio/Kconfig               | 5 +++++
 include/configs/rcar-gen2-common.h | 5 -----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index a07eff71dfe7..31badc5a47dd 100644
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -8,6 +8,7 @@ config RCAR_GEN2
 	bool "Renesas RCar Gen2"
 	select PHY
 	select PHY_RCAR_GEN2
+	select TMU_TIMER
 
 config R8A7740
 	bool "Renesas SoC R8A7740"
@@ -121,6 +122,9 @@ config TARGET_STOUT
 
 endchoice
 
+config TMU_TIMER
+	bool
+
 config SYS_SOC
 	default "rmobile"
 
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 1e4b50ef72b5..365615a53f7e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -596,6 +596,11 @@ config ZYNQMP_GPIO_MODEPIN
 	  are accessed using xilinx firmware. In modepin register, [3:0] bits
 	  set direction, [7:4] bits read IO, [11:8] bits set/clear IO.
 
+config SH_GPIO_PFC
+	bool "Pinmuxed GPIO support for SuperH"
+	depends on RCAR_GEN2 && !PINCTRL_PFC
+	default y
+
 config SL28CPLD_GPIO
 	bool "Kontron sl28cpld GPIO driver"
 	depends on DM_GPIO && SL28CPLD
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index a86180ead576..291c2a43d4d9 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -10,10 +10,6 @@
 
 #include <asm/arch/rmobile.h>
 
-#ifndef CONFIG_PINCTRL_PFC
-#define CONFIG_SH_GPIO_PFC
-#endif
-
 /* console */
 #define CFG_SYS_BAUDRATE_TABLE	{ 38400, 115200 }
 
@@ -21,7 +17,6 @@
 #define CFG_SYS_SDRAM_SIZE		(RCAR_GEN2_UBOOT_SDRAM_SIZE)
 
 /* Timer */
-#define CONFIG_TMU_TIMER
 #define CFG_SYS_TIMER_COUNTER	(TMU_BASE + 0xc)	/* TCNT0 */
 #define CFG_SYS_TIMER_RATE		(get_board_sys_clk() / 8)
 
-- 
2.25.1

[PATCH 26/38] Convert CONFIG_SMSC_LPC47M et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_SMSC_LPC47M
   CONFIG_SMSC_SIO1007

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/cougarcanyon2_defconfig | 1 +
 configs/crownbay_defconfig      | 1 +
 drivers/misc/Kconfig            | 6 ++++++
 include/configs/cougarcanyon2.h | 2 --
 include/configs/crownbay.h      | 2 --
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index 203eff8e165a..8b47f2d89f87 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -52,6 +52,7 @@ CONFIG_SYSCON=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
+CONFIG_SMSC_SIO1007=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SPI=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index cb0f0d7c8d02..038cbbe5b993 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYSCON=y
 CONFIG_LBA48=y
 CONFIG_SYS_64BIT_LBA=y
 CONFIG_CPU=y
+CONFIG_SMSC_LPC47M=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550_PORT_MAPPED=y
 CONFIG_SOUND=y
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 122d605a537d..b07261d3db5a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -112,6 +112,12 @@ config SIFIVE_OTP
 	  Enable support for reading and writing the eMemory OTP on the
 	  SiFive SoCs.
 
+config SMSC_LPC47M
+	bool "LPC47M SMSC driver"
+
+config SMSC_SIO1007
+	bool "SIO1007 SMSC driver"
+
 config VEXPRESS_CONFIG
 	bool "Enable support for Arm Versatile Express config bus"
 	depends on MISC
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index efd0b7784350..b64c7df1b25f 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -8,8 +8,6 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_SMSC_SIO1007
-
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vga\0" \
 					"stderr=serial,vga\0"
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index e8a8af7e6492..ff74deb3d400 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -12,8 +12,6 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_SMSC_LPC47M
-
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
-- 
2.25.1

[PATCH 27/38] Convert CONFIG_SPD_EEPROM to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_SPD_EEPROM

Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Note that this increases the size of SPL on db-mv784mp-gp as now the
SPD_EEPROM code is being included, where it wasn't before seemingly.
---
 README                              | 7 -------
 configs/MPC8548CDS_36BIT_defconfig  | 1 +
 configs/MPC8548CDS_defconfig        | 1 +
 configs/MPC8548CDS_legacy_defconfig | 1 +
 configs/socrates_defconfig          | 1 +
 drivers/ddr/Kconfig                 | 8 ++++++++
 include/configs/MPC8548CDS.h        | 1 -
 include/configs/db-mv784mp-gp.h     | 3 ---
 include/configs/socrates.h          | 1 -
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README b/README
index dd43a0c08d4a..0acc0b410917 100644
--- a/README
+++ b/README
@@ -1683,13 +1683,6 @@ Low Level (hardware related) configuration options:
 		Sets the EBC0_CFG register for the NDFC. If not defined
 		a default value will be used.
 
-- CONFIG_SPD_EEPROM
-		Get DDR timing information from an I2C EEPROM. Common
-		with pluggable memory modules such as SODIMMs
-
-  SPD_EEPROM_ADDRESS
-		I2C address of the SPD EEPROM
-
 - CONFIG_SYS_SPD_BUS_NUM
 		If SPD EEPROM is on an I2C bus other than the first
 		one, specify here. Note that the value must resolve
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 98a2c4f85fc5..8d2a0785a8af 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -45,6 +45,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index b47dbb533cee..5faba03e136d 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index af2c6a25eb9c..dbabf665cbf4 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index ab52ea26a089..f45f570764cd 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -57,6 +57,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xFFF20000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="TSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xFE001001
diff --git a/drivers/ddr/Kconfig b/drivers/ddr/Kconfig
index 738b7884012f..fa873cc48750 100644
--- a/drivers/ddr/Kconfig
+++ b/drivers/ddr/Kconfig
@@ -37,3 +37,11 @@ config SYS_SPD_BUS_NUM
 
 source "drivers/ddr/altera/Kconfig"
 source "drivers/ddr/imx/Kconfig"
+
+config SPD_EEPROM
+	bool "DDR controller makes use of an SPD EEPROM for JEDEC information"
+	depends on SYS_FSL_DDR || SYS_FSL_MMDC || CONFIG_ARMADA_XP
+	help
+	  Get DDR timing information from an I2C EEPROM. Common with pluggable
+	  memory modules such as SODIMMs. You must define SPD_EEPROM_ADDRESS
+	  to the I2C address of the SPD EEPROM.
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 83eb18c3b7ac..780ee5ae865a 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -30,7 +30,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup*/
 
 #define CONFIG_MEM_INIT_VALUE	0xDeadBeef
 
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 7b305955c962..bf8b35102ad7 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -45,7 +45,4 @@
 /* SPL */
 /* Defines for SPL */
 
-/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
-#define CONFIG_SPD_EEPROM		0x4e
-
 #endif /* _CONFIG_DB_MV7846MP_GP_H */
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 0a2d5815170b..95393d3ab25e 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -50,7 +50,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for DDR setup */
 
 #define CONFIG_MEM_INIT_VALUE	0xDeadBeef
 
-- 
2.25.1

[PATCH 28/38] Convert CONFIG_TPS6586X_POWER et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_TPS6586X_POWER
   CONFIG_TWL6030_POWER

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/omap4_panda_defconfig     | 1 +
 configs/omap4_sdp4430_defconfig   | 1 +
 configs/seaboard_defconfig        | 1 +
 drivers/power/Kconfig             | 7 +++++++
 include/configs/seaboard.h        | 1 -
 include/configs/ti_omap4_common.h | 3 ---
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index 2c4e26c290a7..3eb8b8ae2db5 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -45,6 +45,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_TWL6030_POWER=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index 2315a84285ec..8b77509d14ee 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -42,6 +42,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_TWL6030_POWER=y
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 686a3c062b1d..2375040a9ec5 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -50,6 +50,7 @@ CONFIG_SYS_NAND_ONFI_DETECTION=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_TPS6586X_POWER=y
 CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 5dbcde333ba5..7f3b990d2315 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -411,6 +411,9 @@ config SY8106A_VOUT1_VOLT
 	is typically used to power the VDD-CPU and should be 1200mV.
 	Values can range from 680mV till 1950mV.
 
+config TPS6586X_POWER
+	bool "Enable legacy driver for TI TPS6586x power management chip"
+
 config TWL4030_POWER
 	depends on OMAP34XX
 	bool "Enable driver for TI TWL4030 power management chip"
@@ -419,6 +422,10 @@ config TWL4030_POWER
 	The TWL4030 in a combination audio CODEC/power management with
 	GPIO and it is commonly used with the OMAP3 family of processors
 
+config TWL6030_POWER
+	depends on OMAP44XX
+	bool "Enable driver for TI TWL6030 power management chip"
+
 config POWER_MT6323
 	bool "Poweroff driver for mediatek mt6323"
 	select CMD_POWEROFF
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 4887747968f2..73b738bd0993 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -12,7 +12,6 @@
 /* LP0 suspend / resume */
 #define CONFIG_TEGRA_LP0
 #define CONFIG_TEGRA_PMU
-#define CONFIG_TPS6586X_POWER
 #define CONFIG_TEGRA_CLOCK_SCALING
 
 #include "tegra20-common.h"
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 9a068e261402..64ec59d78eb6 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -32,9 +32,6 @@
 #define CFG_SYS_NS16550_COM3		UART3_BASE
 #endif
 
-/* TWL6030 */
-#define CONFIG_TWL6030_POWER		1
-
 /*
  * Environment setup
  */
-- 
2.25.1

[PATCH 29/38] Convert CONFIG_TEGRA_CLOCK_SCALING et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_TEGRA_CLOCK_SCALING
   CONFIG_TEGRA_LP0
   CONFIG_TEGRA_PMU

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/tegra20/Kconfig    | 12 ++++++++++++
 arch/arm/mach-tegra/tegra20/warmboot.c |  4 ----
 include/configs/seaboard.h             |  5 -----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
index 5c4d35b5673d..345563fc789e 100644
--- a/arch/arm/mach-tegra/tegra20/Kconfig
+++ b/arch/arm/mach-tegra/tegra20/Kconfig
@@ -1,5 +1,15 @@
 if TEGRA20
 
+config TEGRA_LP0
+	bool
+	select TEGRA_CLOCK_SCALING
+
+config TEGRA_PMU
+	bool
+
+config TEGRA_CLOCK_SCALING
+	bool
+
 choice
 	prompt "Tegra20 board select"
 	optional
@@ -23,6 +33,8 @@ config TARGET_PLUTUX
 config TARGET_SEABOARD
 	bool "NVIDIA Seaboard"
 	select BOARD_LATE_INIT
+	select TEGRA_LP0
+	select TEGRA_PMU
 
 config TARGET_TEC
 	bool "Avionic Design Tamonten Evaluation Carrier"
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 3d3758f6e6f4..5e3a9ebaceb3 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -23,10 +23,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_TEGRA_CLOCK_SCALING
-#error "You must enable CONFIG_TEGRA_CLOCK_SCALING to use CONFIG_TEGRA_LP0"
-#endif
-
 /*
  * This is the place in SRAM where the SDRAM parameters are stored. There
  * are 4 blocks, one for each RAM code
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 73b738bd0993..f272fe9bf8f1 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -9,11 +9,6 @@
 
 #include <linux/sizes.h>
 
-/* LP0 suspend / resume */
-#define CONFIG_TEGRA_LP0
-#define CONFIG_TEGRA_PMU
-#define CONFIG_TEGRA_CLOCK_SCALING
-
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-- 
2.25.1

[PATCH 30/38] Nokia RX-51: Migrate legacy USB device options to Kconfig

[Tom Rini]

Move a number of legacy USB UDC options to Kconfig, over from the config
header.

Cc: Pali Rohár <pali@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       |  7 -------
 board/nokia/rx51/Kconfig     | 30 ++++++++++++++++++++++++++++++
 include/configs/nokia_rx51.h |  9 ---------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 0acc0b410917..103562bbbe8d 100644
--- a/README
+++ b/README
@@ -629,13 +629,6 @@ The following options need to be configured:
 		variable usbtty to be cdc_acm should suffice. The following
 		might be defined in YourBoardName.h
 
-			CONFIG_USB_DEVICE
-			Define this to build a UDC device
-
-			CONFIG_USB_TTY
-			Define this to have a tty type of device available to
-			talk to the UDC device
-
 			CONFIG_USBD_HS
 			Define this to enable the high speed support for usb
 			device and usbtty. If this feature is enabled, a routine
diff --git a/board/nokia/rx51/Kconfig b/board/nokia/rx51/Kconfig
index 7cf05077dad1..c884543a3d84 100644
--- a/board/nokia/rx51/Kconfig
+++ b/board/nokia/rx51/Kconfig
@@ -1,5 +1,35 @@
 if TARGET_NOKIA_RX51
 
+config USB_DEVICE
+	def_bool y
+	help
+	  Legacy UDC device support
+
+config USB_TTY
+	def_bool y
+	help
+	  Legacy tty type of device available to talk to the UDC device
+
+config USBD_VENDORID
+	hex
+	default 0x0421
+
+config USBD_PRODUCTID_CDCACM
+	hex
+	default 0x01c8
+
+config USBD_PRODUCTID_GSERIAL
+	hex
+	default 0x01c8
+
+config USBD_MANUFACTURER
+	string
+	default "Nokia"
+
+config USBD_PRODUCT_NAME
+	string
+	default "N900 (U-Boot)"
+
 config NR_DRAM_BANKS
 	default 2
 
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 5701732b9aeb..04bff3ca4f67 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -49,15 +49,6 @@
 
 #define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
-/* USB device configuration */
-#define CONFIG_USB_DEVICE
-#define CONFIG_USB_TTY
-#define CONFIG_USBD_VENDORID		0x0421
-#define CONFIG_USBD_PRODUCTID_CDCACM	0x01c8
-#define CONFIG_USBD_PRODUCTID_GSERIAL	0x01c8
-#define CONFIG_USBD_MANUFACTURER	"Nokia"
-#define CONFIG_USBD_PRODUCT_NAME	"N900 (U-Boot)"
-
 #define GPIO_SLIDE			71
 
 /*
-- 
2.25.1

[PATCH 31/38] Convert CONFIG_USB_GADGET_AT91 to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_USB_GADGET_AT91

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/smartweb_defconfig | 1 +
 configs/taurus_defconfig   | 1 +
 drivers/usb/gadget/Kconfig | 4 ++++
 include/configs/smartweb.h | 4 ----
 include/configs/taurus.h   | 4 ----
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 601353c67a66..ed0ed2c7bb13 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -97,6 +97,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0908
 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
+CONFIG_USB_GADGET_AT91=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_WDT=y
 CONFIG_WDT_AT91=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index ef9e444a670b..9a1dac78f127 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -115,6 +115,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0908
 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
+CONFIG_USB_GADGET_AT91=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_WDT=y
 CONFIG_WDT_AT91=y
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index e8da73c78869..e120efeb0073 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -82,6 +82,10 @@ config USB_GADGET_BCM_UDC_OTG_PHY
 	help
 	  Enable the Broadcom UDC OTG physical device interface.
 
+config USB_GADGET_AT91
+	bool "Atmel AT91 USB Gadget Controller"
+	depends on ARCH_AT91
+
 config USB_GADGET_DWC2_OTG
 	bool "DesignWare USB2.0 HS OTG controller (gadget mode)"
 	select USB_GADGET_DUALSPEED
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 794475942a23..b988b96e58d8 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -64,10 +64,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
-/* USB DFU support */
-
-#define CONFIG_USB_GADGET_AT91
-
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index baaf94e2dd54..30f842558207 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -62,10 +62,6 @@
 #endif
 
 #if defined(CONFIG_BOARD_TAURUS)
-/* USB DFU support */
-
-#define CONFIG_USB_GADGET_AT91
-
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 #endif
-- 
2.25.1

[PATCH 32/38] Convert CONFIG_VSC7385_ENET et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_VSC7385_ENET
   CONFIG_VSC9953

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/MPC837XERDB_defconfig                | 1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig     | 1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig   | 1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1020RDB-PC_36BIT_defconfig          | 1 +
 configs/P1020RDB-PC_NAND_defconfig           | 1 +
 configs/P1020RDB-PC_SDCARD_defconfig         | 1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PC_defconfig                | 1 +
 configs/P1020RDB-PD_NAND_defconfig           | 1 +
 configs/P1020RDB-PD_SDCARD_defconfig         | 1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PD_defconfig                | 1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig     | 1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig   | 1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P2020RDB-PC_36BIT_defconfig          | 1 +
 configs/P2020RDB-PC_NAND_defconfig           | 1 +
 configs/P2020RDB-PC_SDCARD_defconfig         | 1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P2020RDB-PC_defconfig                | 1 +
 drivers/net/Kconfig                          | 6 ++++++
 include/configs/MPC837XERDB.h                | 5 -----
 include/configs/T104xRDB.h                   | 1 -
 include/configs/p1_p2_rdb_pc.h               | 3 ---
 25 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index b6263ec03ff6..6372a72bc3e3 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -206,6 +206,7 @@ CONFIG_DM_MDIO=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_RGMII=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_RTC_DS1374=y
 CONFIG_SYS_NS16550=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index 46816999e7a6..b2bd220cf021 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -139,6 +139,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 4ce423ea739c..e93f01f65068 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -121,6 +121,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index d7b2d3780907..59bacba39df2 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -123,6 +123,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index d67b31aafcda..17fc9dddad16 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -101,6 +101,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index 6d1193e051d2..b0f770b11efd 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -138,6 +138,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index 25c04754acba..2a8637f254f9 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -120,6 +120,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index d865102dc6f2..b1c30754bb76 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -122,6 +122,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index 28bc16c97e43..09493a84ac37 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -100,6 +100,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 20384bb054d6..ccb94cbc955a 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -141,6 +141,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index bffecea2634e..3b813b22bd74 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -123,6 +123,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index a87afd3bb08c..225eca2d9763 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -125,6 +125,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index c0111b4acd05..b8d3b123928a 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -103,6 +103,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index 169e54cd1b7e..b935d18879c1 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -144,6 +144,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index ff3388b68bd2..247c96183e09 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -126,6 +126,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 234bc80a3aff..733aa5ad5e9c 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -128,6 +128,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index 0691cbcc217b..69d25c5f78f5 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -106,6 +106,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index bfaa79af6abd..4b19800d2097 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -143,6 +143,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index 2d00717e538a..85b38a0897c6 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -125,6 +125,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 9edbb04b3802..fe763f5e60e9 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -127,6 +127,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index 2c7dd633e556..788e8f8abc0d 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -105,6 +105,7 @@ CONFIG_DM_MDIO=y
 CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_MII=y
+CONFIG_VSC7385_ENET=y
 CONFIG_TSEC_ENET=y
 CONFIG_PCIE_FSL=y
 CONFIG_DM_RTC=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8df3dce6dff5..32404972bb37 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -671,6 +671,12 @@ config XILINX_AXIMRMAC
 	  rates from 10GE to 100GE. This could be present in some of the Xilinx
 	  Versal designs.
 
+config VSC7385_ENET
+	bool "Vitesse 7385 Switch Firmware Upload driver"
+
+config VSC9953
+	bool "Vitesse VSC9953 L2 Switch driver"
+
 config XILINX_EMACLITE
 	select PHYLIB
 	select MII
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index de63a0f1993f..95a90199a429 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -14,11 +14,6 @@
  * High Level Configuration Options
  */
 
-/*
- * On-board devices
- */
-#define CONFIG_VSC7385_ENET
-
 /* System performance - define the value i.e. CONFIG_SYS_XXX
 */
 
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index d3fd10526bd9..b6938056bbe1 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -385,7 +385,6 @@
 
 /* Enable VSC9953 L2 Switch driver on T1040 SoC */
 #if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB)
-#define CONFIG_VSC9953
 #ifdef CONFIG_TARGET_T1040RDB
 #define CFG_SYS_FM1_QSGMII11_PHY_ADDR	0x04
 #define CFG_SYS_FM1_QSGMII21_PHY_ADDR	0x08
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c8acce8b06b7..9738e9fa9cb7 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -13,7 +13,6 @@
 #include <linux/stringify.h>
 
 #if defined(CONFIG_TARGET_P1020RDB_PC)
-#define CONFIG_VSC7385_ENET
 #define CONFIG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x5c
@@ -43,7 +42,6 @@
  * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off
  */
 #if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_VSC7385_ENET
 #define CONFIG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x64
@@ -63,7 +61,6 @@
 #endif
 
 #if defined(CONFIG_TARGET_P2020RDB)
-#define CONFIG_VSC7385_ENET
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0xc8
 #define __SW_BOOT_SPI		0x28
-- 
2.25.1

[PATCH 33/38] net: ftmac100: Remove non-DM_ETH code

[Tom Rini]

At this point all users of this driver enable DM_ETH, so remove the
legacy code paths.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ftmac100.c | 91 +-----------------------------------------
 1 file changed, 2 insertions(+), 89 deletions(-)

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index c30ace96bb13..f710c271c64b 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -17,10 +17,10 @@
 #include <linux/io.h>
 
 #include "ftmac100.h"
-#ifdef CONFIG_DM_ETH
 #include <dm.h>
+
 DECLARE_GLOBAL_DATA_PTR;
-#endif
+
 #define ETH_ZLEN	60
 
 struct ftmac100_data {
@@ -231,92 +231,6 @@ static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * disable transmitter, receiver
- */
-static void ftmac100_halt(struct eth_device *dev)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_halt(priv);
-}
-
-static int ftmac100_init(struct eth_device *dev, struct bd_info *bd)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_init(priv , dev->enetaddr);
-}
-
-static int _ftmac100_recv(struct ftmac100_data *priv)
-{
-	struct ftmac100_rxdes *curr_des;
-	unsigned short len;
-	curr_des = &priv->rxdes[priv->rx_index];
-	len = __ftmac100_recv(priv);
-	if (len) {
-		/* pass the packet up to the protocol layers. */
-		net_process_received_packet((void *)curr_des->rxdes2, len);
-		_ftmac100_free_pkt(priv);
-	}
-	return len ? 1 : 0;
-}
-
-/*
- * Get a data block via Ethernet
- */
-static int ftmac100_recv(struct eth_device *dev)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_recv(priv);
-}
-
-/*
- * Send a data block via Ethernet
- */
-static int ftmac100_send(struct eth_device *dev, void *packet, int length)
-{
-	struct ftmac100_data *priv = dev->priv;
-	return _ftmac100_send(priv , packet , length);
-}
-
-int ftmac100_initialize (struct bd_info *bd)
-{
-	struct eth_device *dev;
-	struct ftmac100_data *priv;
-	dev = malloc (sizeof *dev);
-	if (!dev) {
-		printf ("%s(): failed to allocate dev\n", __func__);
-		goto out;
-	}
-	/* Transmit and receive descriptors should align to 16 bytes */
-	priv = memalign (16, sizeof (struct ftmac100_data));
-	if (!priv) {
-		printf ("%s(): failed to allocate priv\n", __func__);
-		goto free_dev;
-	}
-	memset (dev, 0, sizeof (*dev));
-	memset (priv, 0, sizeof (*priv));
-
-	strcpy(dev->name, "FTMAC100");
-	dev->iobase	= CONFIG_FTMAC100_BASE;
-	dev->init	= ftmac100_init;
-	dev->halt	= ftmac100_halt;
-	dev->send	= ftmac100_send;
-	dev->recv	= ftmac100_recv;
-	dev->priv	= priv;
-	priv->iobase	= dev->iobase;
-	eth_register (dev);
-
-	return 1;
-
-free_dev:
-	free (dev);
-out:
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int ftmac100_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -445,4 +359,3 @@ U_BOOT_DRIVER(ftmac100) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
-- 
2.25.1

[PATCH 34/38] configs: Resync with savedefconfig

[Tom Rini]

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 scripts/config_whitelist.txt | 65 ------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8832597d33a2..8b5b1e6f4553 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -37,21 +37,16 @@ CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
-CONFIG_FSL_CADMUS
 CONFIG_FSL_CPLD
-CONFIG_FSL_DEVICE_DISABLE
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_LBC
 CONFIG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
-CONFIG_FSL_SERDES
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_FTMAC100_BASE
@@ -64,10 +59,8 @@ CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HIKEY_GPIO
 CONFIG_HOSTNAME
 CONFIG_HSMMC2_8BIT
-CONFIG_HWCONFIG
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
@@ -77,15 +70,7 @@ CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
 CONFIG_I2C_RTC_ADDR
 CONFIG_ICS307_REFCLK_HZ
-CONFIG_IMX
 CONFIG_IMX6_PWM_PER_CLK
-CONFIG_IMX_HDMI
-CONFIG_IMX_VIDEO_SKIP
-CONFIG_INTERRUPTS
-CONFIG_IODELAY_RECALIBRATION
-CONFIG_IOMUX_LPSR
-CONFIG_IOMUX_SHARE_CONF_REG
-CONFIG_IO_TRACE
 CONFIG_IPADDR
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
@@ -122,7 +107,6 @@ CONFIG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
-CONFIG_LPC32XX_HSUART
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
@@ -138,7 +122,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_LS102XA_STREAM_ID
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
@@ -149,7 +132,6 @@ CONFIG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
-CONFIG_MISC_COMMON
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
@@ -161,8 +143,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MTD_PARTITION
 CONFIG_MVGBE_PORTS
 CONFIG_MVS
-CONFIG_MX27
-CONFIG_MX27_CLK32
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
@@ -172,12 +152,8 @@ CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
 CONFIG_MXS
-CONFIG_MXS_OCOTP
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
-CONFIG_NAND_ECC_BCH
-CONFIG_NAND_KIRKWOOD
-CONFIG_NAND_KMETER1
 CONFIG_NAND_OMAP_GPMC_WSCFG
 CONFIG_NAND_SECBOOT
 CONFIG_NAND_SPL
@@ -189,7 +165,6 @@ CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
-CONFIG_PCA953X
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
@@ -206,20 +181,9 @@ CONFIG_POST
 CONFIG_POSTBOOTMENU
 CONFIG_POST_EXTERNAL_WORD_FUNCS
 CONFIG_POST_SKIP_ENV_FLAGS
-CONFIG_POWER_FSL
-CONFIG_POWER_FSL_MC13892
-CONFIG_POWER_HI6553
-CONFIG_POWER_LTC3676
 CONFIG_POWER_LTC3676_I2C_ADDR
-CONFIG_POWER_PFUZE100
 CONFIG_POWER_PFUZE100_I2C_ADDR
-CONFIG_POWER_PFUZE3000
 CONFIG_POWER_PFUZE3000_I2C_ADDR
-CONFIG_POWER_SPI
-CONFIG_POWER_TPS62362
-CONFIG_POWER_TPS65090_EC
-CONFIG_POWER_TPS65218
-CONFIG_POWER_TPS65910
 CONFIG_PPC_SPINTABLE_COMPATIBLE
 CONFIG_PRAM
 CONFIG_PSRAM_SCFG
@@ -231,14 +195,6 @@ CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROOTPATH
-CONFIG_RTC_DS1337
-CONFIG_RTC_DS1337_NOOSC
-CONFIG_RTC_DS1338
-CONFIG_RTC_DS1374
-CONFIG_RTC_DS3231
-CONFIG_RTC_MC13XXX
-CONFIG_RTC_MXS
-CONFIG_RTC_PT7C4338
 CONFIG_SANDBOX_ARCH
 CONFIG_SANDBOX_SDL
 CONFIG_SANDBOX_SPI_MAX_BUS
@@ -260,16 +216,12 @@ CONFIG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
 CONFIG_SH_ETHER_SH7734_MII
 CONFIG_SH_ETHER_USE_PORT
-CONFIG_SH_GPIO_PFC
 CONFIG_SH_QSPI_BASE
 CONFIG_SLIC
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
-CONFIG_SMSC_LPC47M
-CONFIG_SMSC_SIO1007
 CONFIG_SOCRATES
 CONFIG_SOFT_I2C_READ_REPEATED_START
-CONFIG_SPD_EEPROM
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
@@ -279,13 +231,9 @@ CONFIG_SPI_N25Q256A_RESET
 CONFIG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
 CONFIG_STD_DEVICES_SETTINGS
-CONFIG_TCA642X
 CONFIG_TEGRA_BOARD_STRING
-CONFIG_TEGRA_CLOCK_SCALING
 CONFIG_TEGRA_ENABLE_UARTA
 CONFIG_TEGRA_ENABLE_UARTD
-CONFIG_TEGRA_LP0
-CONFIG_TEGRA_PMU
 CONFIG_TEGRA_SLINK_CTRLS
 CONFIG_TEGRA_SPI
 CONFIG_TEGRA_UARTA_GPU
@@ -295,9 +243,7 @@ CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
-CONFIG_TMU_TIMER
 CONFIG_TPM_TIS_BASE_ADDRESS
-CONFIG_TPS6586X_POWER
 CONFIG_TSEC
 CONFIG_TSEC1
 CONFIG_TSEC1_NAME
@@ -310,7 +256,6 @@ CONFIG_TSEC4_NAME
 CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBICR_SETTINGS
-CONFIG_TWL6030_POWER
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBOOTPATH
@@ -321,25 +266,15 @@ CONFIG_UEC_ETH2
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
-CONFIG_USBD_MANUFACTURER
-CONFIG_USBD_PRODUCTID_CDCACM
-CONFIG_USBD_PRODUCTID_GSERIAL
-CONFIG_USBD_PRODUCT_NAME
-CONFIG_USBD_VENDORID
 CONFIG_USB_BOOTING
-CONFIG_USB_DEVICE
 CONFIG_USB_EXT2_BOOT
 CONFIG_USB_FAT_BOOT
-CONFIG_USB_GADGET_AT91
 CONFIG_USB_ISP1301_I2C_ADDR
-CONFIG_USB_TTY
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
-CONFIG_VSC7385_ENET
 CONFIG_VSC7385_IMAGE
 CONFIG_VSC7385_IMAGE_SIZE
-CONFIG_VSC9953
 CONFIG_WATCHDOG_PRESC
 CONFIG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
-- 
2.25.1

[PATCH 35/38] scripts/config_whitelist.txt: Remove more referenced symbols

[Tom Rini]

Perform some deeper investigation on the remaining symbols listed in
this file and remove more.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/P1010RDB.h   |  2 --
 scripts/config_whitelist.txt | 22 ----------------------
 2 files changed, 24 deletions(-)

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index c0805f979be7..b1d6b15811dd 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -173,8 +173,6 @@ extern unsigned long get_sdram_size(void);
 #define CFG_SYS_NAND_BASE_PHYS	CFG_SYS_NAND_BASE
 #endif
 
-#define CONFIG_MTD_PARTITION
-
 #define CFG_SYS_NAND_CSPR	(CSPR_PHYS_ADDR(CFG_SYS_NAND_BASE_PHYS) \
 				| CSPR_PORT_SIZE_8	\
 				| CSPR_MSEL_NAND	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8b5b1e6f4553..39e1071236bd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,5 +1,4 @@
 CONFIG_ARM_GIC_BASE_ADDRESS
-CONFIG_AUTO_ZRELADDR
 CONFIG_BOARDDIR
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
@@ -8,7 +7,6 @@ CONFIG_DFU_ALT_SYSTEM
 CONFIG_DFU_ENV_SETTINGS
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
-CONFIG_DM9000_DEBUG
 CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
@@ -49,9 +47,6 @@ CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
-CONFIG_FTMAC100_BASE
-CONFIG_FTRTC010_EXTCLK
-CONFIG_FTRTC010_PCLK
 CONFIG_GATEWAYIP
 CONFIG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
@@ -65,7 +60,6 @@ CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
-CONFIG_I2C_MVTWSI_BASE
 CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
 CONFIG_I2C_RTC_ADDR
@@ -137,12 +131,8 @@ CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
-CONFIG_MPC85XX_FEC
-CONFIG_MPC85XX_FEC_NAME
 CONFIG_MTD_NAND_VERIFY_WRITE
-CONFIG_MTD_PARTITION
 CONFIG_MVGBE_PORTS
-CONFIG_MVS
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
@@ -151,15 +141,10 @@ CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
-CONFIG_MXS
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
-CONFIG_NAND_OMAP_GPMC_WSCFG
-CONFIG_NAND_SECBOOT
-CONFIG_NAND_SPL
 CONFIG_NETDEV
 CONFIG_NETMASK
-CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NORBOOT
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
@@ -175,12 +160,10 @@ CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
 CONFIG_PL01x_PORTS
-CONFIG_PM
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_POST
 CONFIG_POSTBOOTMENU
 CONFIG_POST_EXTERNAL_WORD_FUNCS
-CONFIG_POST_SKIP_ENV_FLAGS
 CONFIG_POWER_LTC3676_I2C_ADDR
 CONFIG_POWER_PFUZE100_I2C_ADDR
 CONFIG_POWER_PFUZE3000_I2C_ADDR
@@ -205,7 +188,6 @@ CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
-CONFIG_SERIAL_SOFTWARE_FIFO
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
 CONFIG_SET_DFU_ALT_BUF_LEN
@@ -214,14 +196,12 @@ CONFIG_SH_ETHER_CACHE_INVALIDATE
 CONFIG_SH_ETHER_CACHE_WRITEBACK
 CONFIG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
-CONFIG_SH_ETHER_SH7734_MII
 CONFIG_SH_ETHER_USE_PORT
 CONFIG_SH_QSPI_BASE
 CONFIG_SLIC
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
 CONFIG_SOCRATES
-CONFIG_SOFT_I2C_READ_REPEATED_START
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
@@ -244,7 +224,6 @@ CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
 CONFIG_TPM_TIS_BASE_ADDRESS
-CONFIG_TSEC
 CONFIG_TSEC1
 CONFIG_TSEC1_NAME
 CONFIG_TSEC2
@@ -262,7 +241,6 @@ CONFIG_UBOOTPATH
 CONFIG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
 CONFIG_UEC_ETH
-CONFIG_UEC_ETH2
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
-- 
2.25.1

[PATCH 36/38] sandbox: Rework how SDL is enabled / disabled

[Tom Rini]

Given that we can use Kconfig logic directly to see if we have a program
available on the host or not, change from passing NO_SDL to instead
controlling CONFIG_SANDBOX_SDL in Kconfig directly. Introduce
CONFIG_HOST_HAS_SDL as the way to test for sdl2-config and default
CONFIG_SANDBOX_SDL on if we have that, or not.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 .azure-pipelines.yml         | 4 ++--
 arch/sandbox/Kconfig         | 7 +++++++
 arch/sandbox/config.mk       | 4 +---
 doc/arch/sandbox/sandbox.rst | 9 +++------
 doc/build/tools.rst          | 2 +-
 drivers/video/Kconfig        | 2 +-
 include/configs/sandbox.h    | 4 ----
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index bda762451fd0..a767fb1008c2 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -30,7 +30,7 @@ stages:
           %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"
         displayName: 'Install Toolchain'
       - script: |
-          echo make tools-only_defconfig tools-only NO_SDL=1 > build-tools.sh
+          echo make tools-only_defconfig tools-only > build-tools.sh
           %CD:~0,2%\msys64\usr\bin\bash -lc "bash build-tools.sh"
         displayName: 'Build Host Tools'
         env:
@@ -47,7 +47,7 @@ stages:
       - script: brew install make ossp-uuid
         displayName: Brew install dependencies
       - script: |
-          gmake tools-only_config tools-only NO_SDL=1 \
+          gmake tools-only_config tools-only \
             HOSTCFLAGS="-I/usr/local/opt/openssl@1.1/include" \
             HOSTLDFLAGS="-L/usr/local/opt/openssl@1.1/lib" \
             -j$(sysctl -n hw.logicalcpu)
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 96b3402b47c1..0ce77de2fcb4 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -47,6 +47,13 @@ config HOST_32BIT
 config HOST_64BIT
 	def_bool $(cc-define,_LP64)
 
+config HOST_HAS_SDL
+	def_bool $(success,sdl2-config --version)
+
+config SANDBOX_SDL
+	bool "Enable SDL2 support in sandbox"
+	default HOST_HAS_SDL
+
 config SANDBOX_CRASH_RESET
 	bool "Reset on crash"
 	help
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index 3e2c7f9ebe55..1284ef390b51 100644
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -8,9 +8,7 @@ SDL_CONFIG ?= sdl2-config
 
 # Define this to avoid linking with SDL, which requires SDL libraries
 # This can solve 'sdl-config: Command not found' errors
-ifneq ($(NO_SDL),)
-PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
-else
+ifeq ($(CONFIG_SANDBOX_SDL),y)
 PLATFORM_LIBS += $(shell $(SDL_CONFIG) --libs)
 PLATFORM_CPPFLAGS += $(shell $(SDL_CONFIG) --cflags)
 endif
diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst
index 34c4e06d9b8d..e6d840365166 100644
--- a/doc/arch/sandbox/sandbox.rst
+++ b/doc/arch/sandbox/sandbox.rst
@@ -56,11 +56,8 @@ To run sandbox U-Boot use something like::
 
 Note: If you get errors about 'sdl-config: Command not found' you may need to
 install libsdl2.0-dev or similar to get SDL support. Alternatively you can
-build sandbox without SDL (i.e. no display/keyboard support) by removing
-the CONFIG_SANDBOX_SDL line in include/configs/sandbox.h or using::
-
-   make sandbox_defconfig all NO_SDL=1
-   ./u-boot
+build sandbox without SDL (i.e. no display/keyboard support) by disabling
+CONFIG_SANDBOX_SDL in the .config file.
 
 U-Boot will start on your computer, showing a sandbox emulation of the serial
 console::
@@ -84,7 +81,7 @@ To exit, type 'poweroff' or press Ctrl-C.
 Console / LCD support
 ---------------------
 
-Assuming that CONFIG_SANDBOX_SDL is defined when building, you can run the
+Assuming that CONFIG_SANDBOX_SDL is enabled when building, you can run the
 sandbox with LCD and keyboard emulation, using something like::
 
    ./u-boot -d u-boot.dtb -l
diff --git a/doc/build/tools.rst b/doc/build/tools.rst
index c06f91527417..ec0172292585 100644
--- a/doc/build/tools.rst
+++ b/doc/build/tools.rst
@@ -44,4 +44,4 @@ applications using a linux toolchain (gcc, bash, etc), targeting respectively
 Launch the MSYS2 shell of the MSYS2 environment, and do the following::
 
    $ make tools-only_defconfig
-   $ make tools-only NO_SDL=1
+   $ make tools-only
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index c841b99bb30d..f539977d9b73 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -622,7 +622,7 @@ config VIDEO_ARM_MALIDP
 
 config VIDEO_SANDBOX_SDL
 	bool "Enable sandbox video console using SDL"
-	depends on SANDBOX
+	depends on SANDBOX_SDL
 	help
 	  When using sandbox you can enable an emulated LCD display which
 	  appears as an SDL (Simple DirectMedia Layer) window. This is a
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 3a5af4b3b609..c9e57da0160a 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -31,8 +31,4 @@
 #define CFG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
 
-#ifndef SANDBOX_NO_SDL
-#define CONFIG_SANDBOX_SDL
-#endif
-
 #endif
-- 
2.25.1

[PATCH 37/38] post: Migrate to Kconfig

[Tom Rini]

We move the existing CONFIG_POST_* functionality over to CFG_POST and
then introduce CONFIG_POST to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
 configs/P2041RDB_NAND_defconfig               |  1 +
 configs/P2041RDB_SDCARD_defconfig             |  1 +
 configs/P2041RDB_SPIFLASH_defconfig           |  1 +
 configs/P2041RDB_defconfig                    |  1 +
 configs/kmcent2_defconfig                     |  1 +
 configs/kmcoge5ne_defconfig                   |  1 +
 configs/pg_wcom_expu1_defconfig               |  1 +
 configs/pg_wcom_expu1_update_defconfig        |  1 +
 configs/pg_wcom_seli8_defconfig               |  1 +
 configs/pg_wcom_seli8_update_defconfig        |  1 +
 doc/README.POST                               |  6 +-
 doc/README.fsl-ddr                            |  2 +-
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial.c                       |  2 +-
 include/configs/P2041RDB.h                    |  2 +-
 include/configs/km/pg-wcom-ls102xa.h          |  4 +-
 include/configs/kmcent2.h                     |  2 +-
 include/configs/kmcoge5ne.h                   |  4 +-
 include/post.h                                |  4 +-
 include/serial.h                              |  4 +-
 post/cpu/mpc83xx/ecc.c                        |  2 +-
 post/drivers/flash.c                          |  2 +-
 post/drivers/i2c.c                            |  4 +-
 post/drivers/memory.c                         |  4 +-
 post/drivers/rtc.c                            |  4 +-
 post/lib_powerpc/andi.c                       |  2 +-
 post/lib_powerpc/asm.S                        |  2 +-
 post/lib_powerpc/b.c                          |  2 +-
 post/lib_powerpc/cmp.c                        |  2 +-
 post/lib_powerpc/cmpi.c                       |  2 +-
 post/lib_powerpc/complex.c                    |  2 +-
 post/lib_powerpc/cpu.c                        |  4 +-
 post/lib_powerpc/cr.c                         |  2 +-
 post/lib_powerpc/fpu/20001122-1.c             |  4 +-
 post/lib_powerpc/fpu/20010114-2.c             |  4 +-
 post/lib_powerpc/fpu/20010226-1.c             |  4 +-
 post/lib_powerpc/fpu/980619-1.c               |  4 +-
 post/lib_powerpc/fpu/acc1.c                   |  4 +-
 post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
 post/lib_powerpc/fpu/fpu.c                    |  4 +-
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
 post/lib_powerpc/load.c                       |  2 +-
 post/lib_powerpc/multi.c                      |  2 +-
 post/lib_powerpc/rlwimi.c                     |  2 +-
 post/lib_powerpc/rlwinm.c                     |  2 +-
 post/lib_powerpc/rlwnm.c                      |  2 +-
 post/lib_powerpc/srawi.c                      |  2 +-
 post/lib_powerpc/store.c                      |  2 +-
 post/lib_powerpc/string.c                     |  2 +-
 post/lib_powerpc/three.c                      |  2 +-
 post/lib_powerpc/threei.c                     |  2 +-
 post/lib_powerpc/threex.c                     |  2 +-
 post/lib_powerpc/two.c                        |  2 +-
 post/lib_powerpc/twox.c                       |  2 +-
 post/post.c                                   |  4 +-
 post/tests.c                                  | 68 +++++++++----------
 test/Kconfig                                  |  5 ++
 58 files changed, 114 insertions(+), 99 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 74ad7483dc10..be85c54e4801 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -486,7 +486,7 @@ int dram_init(void)
 #endif /* CONFIG_SYS_RAMBOOT */
 #endif
 
-#if CONFIG_POST & CFG_SYS_POST_MEMORY
+#if CFG_POST & CFG_SYS_POST_MEMORY
 
 /* Board-specific functions defined in each board's ddr.c */
 void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd,
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index aa80f79fd7f7..38ab9af13b34 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -112,3 +112,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index bd223c18988d..39f5f8ce6910 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -107,3 +107,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index dbd5845789cc..b06e6142c4ee 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -109,3 +109,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
index c17318c7cc15..0eb837321aeb 100644
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -104,3 +104,4 @@ CONFIG_USB_MAX_CONTROLLER_COUNT=2
 CONFIG_USB_STORAGE=y
 CONFIG_ADDR_MAP=y
 CONFIG_SYS_NUM_ADDR_MAP=64
+CONFIG_POST=y
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig
index 48ac85b699be..41b26287d567 100644
--- a/configs/kmcent2_defconfig
+++ b/configs/kmcent2_defconfig
@@ -110,3 +110,4 @@ CONFIG_FS_CRAMFS=y
 CONFIG_BCH=y
 CONFIG_PANIC_HANG=y
 CONFIG_LZO=y
+CONFIG_POST=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index c2a17c6212f1..013277c9bf12 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -243,3 +243,4 @@ CONFIG_QE_UEC=y
 CONFIG_QE=y
 CONFIG_SYS_NS16550=y
 CONFIG_BCH=y
+CONFIG_POST=y
diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig
index ed55f7bfd0aa..d21e180d1fc3 100644
--- a/configs/pg_wcom_expu1_defconfig
+++ b/configs/pg_wcom_expu1_defconfig
@@ -100,3 +100,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig
index 64ddaf8aa61c..54773b06339a 100644
--- a/configs/pg_wcom_expu1_update_defconfig
+++ b/configs/pg_wcom_expu1_update_defconfig
@@ -98,3 +98,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig
index ad08e3582e36..8311b3a3a00f 100644
--- a/configs/pg_wcom_seli8_defconfig
+++ b/configs/pg_wcom_seli8_defconfig
@@ -100,3 +100,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig
index 01a6198d727e..d6f4a0547907 100644
--- a/configs/pg_wcom_seli8_update_defconfig
+++ b/configs/pg_wcom_seli8_update_defconfig
@@ -98,3 +98,4 @@ CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
+CONFIG_POST=y
diff --git a/doc/README.POST b/doc/README.POST
index 1d1c25bdf9e1..5d92f3fe6e91 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -242,11 +242,11 @@ storage server and etc.
 
 All POST-related code will be #ifdef'ed with the CONFIG_POST macro.
 This macro will be defined in the config_<board>.h file for those
-boards that need POST. The CONFIG_POST macro will contain the list of
+boards that need POST. The CFG_POST macro will contain the list of
 POST tests for the board. The macro will have the format of array
 composed of post_test structures:
 
-#define CONFIG_POST \
+#define CFG_POST \
 	{
 		"On-board peripherals test", "board", \
 		"  This test performs full check-up of the " \
@@ -257,7 +257,7 @@ composed of post_test structures:
 
 A new file, post.h, will be created in the include/ directory. This
 file will contain common POST declarations and will define a set of
-macros that will be reused for defining CONFIG_POST. As an example,
+macros that will be reused for defining CFG_POST. As an example,
 the following macro may be defined:
 
 #define POST_CACHE \
diff --git a/doc/README.fsl-ddr b/doc/README.fsl-ddr
index cec5d94df4a8..10e63f3be1d3 100644
--- a/doc/README.fsl-ddr
+++ b/doc/README.fsl-ddr
@@ -137,7 +137,7 @@ Memory testing options for mpc85xx
 2. Memory test can be done with Power-On-Self-Test function, activated at
    compile time.
 
-   In order to enable the POST memory test, CONFIG_POST needs to be
+   In order to enable the POST memory test, CFG_POST needs to be
    defined in board configuraiton header file. By default, POST memory test
    performs a fast test. A slow test can be enabled by changing the flag at
    compiling time. To test memory bigger than 2GB, 36BIT support is needed.
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 8a489a2e3f95..c02106747a08 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -526,7 +526,7 @@ static int serial_post_probe(struct udevice *dev)
 		ops->getconfig += gd->reloc_off;
 	if (ops->setconfig)
 		ops->setconfig += gd->reloc_off;
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 	if (ops->loop)
 		ops->loop += gd->reloc_off;
 #endif
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 4d5496509481..369a8e38e3e2 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -458,7 +458,7 @@ void default_serial_puts(const char *s)
 		dev->putc(*s++);
 }
 
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 static const int bauds[] = CFG_SYS_BAUDRATE_TABLE;
 
 /**
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index acbd43419f2e..8b901ca47a0c 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -41,7 +41,7 @@
  */
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
 
-#define CONFIG_POST CFG_SYS_POST_MEMORY	/* test POST memory test */
+#define CFG_POST CFG_SYS_POST_MEMORY	/* test POST memory test */
 
 /*
  *  Config the L3 Cache as L3 SRAM
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index c1174b87ab7a..dfa81c037f48 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -25,8 +25,8 @@
 #define SPD_EEPROM_ADDRESS		0x54
 
 /* POST memory regions test */
-#define CONFIG_POST			(CFG_SYS_POST_MEM_REGIONS)
-#define CONFIG_POST_EXTERNAL_WORD_FUNCS
+#define CFG_POST			(CFG_SYS_POST_MEM_REGIONS)
+#define CFG_POST_EXTERNAL_WORD_FUNCS
 
 /*
  * IFC Definitions
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 89c5a24ee901..527f0383bc65 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -148,7 +148,7 @@
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
 
 /* POST memory regions test */
-#define CONFIG_POST CFG_SYS_POST_MEM_REGIONS
+#define CFG_POST CFG_SYS_POST_MEM_REGIONS
 
 /*
  *  Config the L3 Cache as L3 SRAM
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index c24d6ad8bc2d..6b30fb4b617e 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -33,8 +33,8 @@
 	CSCONFIG_COL_BIT_10)
 
 /* enable POST tests */
-#define CONFIG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
-#define CONFIG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
+#define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
+#define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CONFIG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
diff --git a/include/post.h b/include/post.h
index 867a66f3007a..e68d5c89020c 100644
--- a/include/post.h
+++ b/include/post.h
@@ -16,7 +16,7 @@
 
 #if defined(CONFIG_POST)
 
-#ifndef CONFIG_POST_EXTERNAL_WORD_FUNCS
+#ifndef CFG_POST_EXTERNAL_WORD_FUNCS
 #ifdef CONFIG_SYS_POST_WORD_ADDR
 #define _POST_WORD_ADDR	CONFIG_SYS_POST_WORD_ADDR
 #else
@@ -51,7 +51,7 @@ static inline void post_word_store (ulong value)
 extern ulong post_word_load(void);
 extern void post_word_store(ulong value);
 
-#endif /* CONFIG_POST_EXTERNAL_WORD_FUNCS */
+#endif /* CFG_POST_EXTERNAL_WORD_FUNCS */
 #endif /* defined (CONFIG_POST) */
 #endif /* __ASSEMBLY__ */
 
diff --git a/include/serial.h b/include/serial.h
index fe01bcfadb9b..f4d7dc58a9e1 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -14,7 +14,7 @@ struct serial_device {
 	int	(*tstc)(void);
 	void	(*putc)(const char c);
 	void	(*puts)(const char *s);
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 	void	(*loop)(int);
 #endif
 	struct serial_device	*next;
@@ -242,7 +242,7 @@ struct dm_serial_ops {
 	 * @return 0 if OK, -ve on error
 	 */
 	int (*clear)(struct udevice *dev);
-#if CONFIG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CONFIG_SYS_POST_UART
 	/**
 	 * loop() - Control serial device loopback mode
 	 *
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index edd74115672b..45263e6b44ca 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <post.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_ECC
+#if CFG_POST & CONFIG_SYS_POST_ECC
 /*
  * We use the RAW I/O accessors where possible in order to
  * achieve performance goal, since the test's execution time
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index 7d65f46d9fea..e157d3691100 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -6,7 +6,7 @@
  * Licensed under the GPL-2 or later.
  */
 
-#if CONFIG_POST & CONFIG_SYS_POST_FLASH
+#if CFG_POST & CONFIG_SYS_POST_FLASH
 #include <common.h>
 #include <malloc.h>
 #include <post.h>
diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c
index 3b378921fafc..057454ffd8f5 100644
--- a/post/drivers/i2c.c
+++ b/post/drivers/i2c.c
@@ -26,7 +26,7 @@
 #include <post.h>
 #include <i2c.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_I2C
+#if CFG_POST & CONFIG_SYS_POST_I2C
 
 static int i2c_ignore_device(unsigned int chip)
 {
@@ -94,4 +94,4 @@ int i2c_post_test (int flags)
 #endif
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_I2C */
+#endif /* CFG_POST & CONFIG_SYS_POST_I2C */
diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 71dad7b8c026..1be2b41df45d 100644
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.c
@@ -138,7 +138,7 @@
 #include <post.h>
 #include <watchdog.h>
 
-#if CONFIG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
+#if CFG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS)
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -535,4 +535,4 @@ int memory_post_test(int flags)
 	return ret;
 }
 
-#endif /* CONFIG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */
+#endif /* CFG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index c603f0e6728c..cfed56b680cd 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -26,7 +26,7 @@
 #include <post.h>
 #include <rtc.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_RTC
+#if CFG_POST & CONFIG_SYS_POST_RTC
 
 static int rtc_post_skip (ulong * diff)
 {
@@ -189,4 +189,4 @@ int rtc_post_test (int flags)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_RTC */
+#endif /* CFG_POST & CONFIG_SYS_POST_RTC */
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index d4f60aa73880..d69d61396bcb 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/asm.S b/post/lib_powerpc/asm.S
index 91b599932ffd..13302d796898 100644
--- a/post/lib_powerpc/asm.S
+++ b/post/lib_powerpc/asm.S
@@ -10,7 +10,7 @@
 #include <ppc_defs.h>
 #include <asm/cache.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 /* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */
 	.global	cpu_post_exec_02
diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c
index 0b02e9169e2b..eb9371fa6b20 100644
--- a/post/lib_powerpc/b.c
+++ b/post/lib_powerpc/b.c
@@ -24,7 +24,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 extern void cpu_post_exec_31 (ulong *code, ulong *ctr, ulong *lr, ulong *jump,
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index e70869774ceb..e4d0931fc9a4 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -23,7 +23,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_12 (ulong *code, ulong *res, ulong op1, ulong op2);
 
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index 85a9b0ad36b2..983892d00635 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -23,7 +23,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 
diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c
index bb29e9170127..d2ec21b0cbea 100644
--- a/post/lib_powerpc/complex.c
+++ b/post/lib_powerpc/complex.c
@@ -18,7 +18,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern int cpu_post_complex_1_asm (int a1, int a2, int a3, int a4, int n);
 extern int cpu_post_complex_2_asm (int x, int n);
diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c
index 1d4710734291..77c25381729b 100644
--- a/post/lib_powerpc/cpu.c
+++ b/post/lib_powerpc/cpu.c
@@ -20,7 +20,7 @@
 #include <post.h>
 #include <asm/mmu.h>
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern int cpu_post_test_cmp (void);
 extern int cpu_post_test_cmpi (void);
@@ -118,4 +118,4 @@ int cpu_post_test (int flags)
 	return ret;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_CPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_CPU */
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 56ed355dde71..077fb0f2da3a 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -33,7 +33,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 extern void cpu_post_exec_21x (ulong *code, ulong *op1, ulong *op2, ulong op3);
diff --git a/post/lib_powerpc/fpu/20001122-1.c b/post/lib_powerpc/fpu/20001122-1.c
index 4b452dc083d4..eddd3f915eed 100644
--- a/post/lib_powerpc/fpu/20001122-1.c
+++ b/post/lib_powerpc/fpu/20001122-1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 int fpu_post_test_math1 (void)
 {
@@ -40,4 +40,4 @@ int fpu_post_test_math1 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/20010114-2.c b/post/lib_powerpc/fpu/20010114-2.c
index 4aadd1e0482d..9e3e54661f99 100644
--- a/post/lib_powerpc/fpu/20010114-2.c
+++ b/post/lib_powerpc/fpu/20010114-2.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 static float rintf (float x)
 {
@@ -45,4 +45,4 @@ int fpu_post_test_math2 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/20010226-1.c b/post/lib_powerpc/fpu/20010226-1.c
index b09a25c2118c..5bb386090035 100644
--- a/post/lib_powerpc/fpu/20010226-1.c
+++ b/post/lib_powerpc/fpu/20010226-1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 int fpu_post_test_math3 (void)
 {
@@ -33,4 +33,4 @@ int fpu_post_test_math3 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/980619-1.c b/post/lib_powerpc/fpu/980619-1.c
index 2fea708306cc..415cd50c85d2 100644
--- a/post/lib_powerpc/fpu/980619-1.c
+++ b/post/lib_powerpc/fpu/980619-1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 int fpu_post_test_math4 (void)
 {
@@ -39,4 +39,4 @@ int fpu_post_test_math4 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/acc1.c b/post/lib_powerpc/fpu/acc1.c
index 9e5783b25792..4cf3b7cef757 100644
--- a/post/lib_powerpc/fpu/acc1.c
+++ b/post/lib_powerpc/fpu/acc1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 static double func (const double *array)
 {
@@ -36,4 +36,4 @@ int fpu_post_test_math5 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/compare-fp-1.c b/post/lib_powerpc/fpu/compare-fp-1.c
index d46a13adcdfe..029600fd2b74 100644
--- a/post/lib_powerpc/fpu/compare-fp-1.c
+++ b/post/lib_powerpc/fpu/compare-fp-1.c
@@ -15,7 +15,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 static int failed;
 
@@ -204,4 +204,4 @@ int fpu_post_test_math6 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/fpu.c b/post/lib_powerpc/fpu/fpu.c
index bd65f623d500..8993b36e801d 100644
--- a/post/lib_powerpc/fpu/fpu.c
+++ b/post/lib_powerpc/fpu/fpu.c
@@ -21,7 +21,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 #include <watchdog.h>
 
@@ -71,4 +71,4 @@ int fpu_post_test (int flags)
 	return ret;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
index cb61c9114d7b..87b882c6b22f 100644
--- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c
+++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
@@ -15,7 +15,7 @@
 
 GNU_FPOST_ATTR
 
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
 
 union uf
 {
@@ -82,4 +82,4 @@ int fpu_post_test_math7 (void)
 	return 0;
 }
 
-#endif /* CONFIG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index 5269563b1e17..ece0b2756e00 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -28,7 +28,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22w (ulong *code, ulong *op1, ulong op2, ulong *op3);
 extern void cpu_post_exec_21w (ulong *code, ulong *op1, ulong *op2);
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index f082e4c546cc..0e9ee88eb5d5 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -21,7 +21,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_02(ulong *code, ulong op1, ulong op2);
 
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index 7b4dc79fb17d..d24a3f665c7c 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 8a03e9b9bcb6..9f4a3edb3ea7 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index e2beb4e41713..224e6bdd45e9 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index d4a8fabc4257..713d4f2276b3 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index 8e278fee885a..2dbcccf098a5 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -28,7 +28,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_12w (ulong *code, ulong *op1, ulong op2, ulong op3);
 extern void cpu_post_exec_11w (ulong *code, ulong *op1, ulong op2);
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index 0d8d280b271c..9b54847632a3 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -20,7 +20,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2);
 extern void cpu_post_exec_04 (ulong *code, ulong op1, ulong op2, ulong op3,
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index fc6f1f5674ad..55f0ff8a8825 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index f49c85e6b9da..ec52d238e699 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -21,7 +21,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index 6bc5a54706b4..6f5f0b8eb760 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index fa376c76b1bb..b44dd4e20845 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index 5c36012a9b79..320cc0a64e7c 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/post.c b/post/post.c
index b81425d8cf81..9964b4108041 100644
--- a/post/post.c
+++ b/post/post.c
@@ -168,7 +168,7 @@ static void post_bootmode_test_off(void)
 	post_word_store(word);
 }
 
-#ifndef CONFIG_POST_SKIP_ENV_FLAGS
+#ifndef CFG_POST_SKIP_ENV_FLAGS
 static void post_get_env_flags(int *test_flags)
 {
 	int  flag[] = {  POST_POWERON,   POST_NORMAL,   POST_SLOWTEST,
@@ -227,7 +227,7 @@ static void post_get_flags(int *test_flags)
 	for (j = 0; j < post_list_size; j++)
 		test_flags[j] = post_list[j].flags;
 
-#ifndef CONFIG_POST_SKIP_ENV_FLAGS
+#ifndef CFG_POST_SKIP_ENV_FLAGS
 	post_get_env_flags(test_flags);
 #endif
 
diff --git a/post/tests.c b/post/tests.c
index fc36e738f731..d61ea74d512e 100644
--- a/post/tests.c
+++ b/post/tests.c
@@ -45,7 +45,7 @@ extern void sysmon_reloc (void);
 
 struct post_test post_list[] =
 {
-#if CONFIG_POST & CONFIG_SYS_POST_OCM
+#if CFG_POST & CONFIG_SYS_POST_OCM
     {
 	"OCM test",
 	"ocm",
@@ -57,7 +57,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_OCM
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_CACHE
+#if CFG_POST & CONFIG_SYS_POST_CACHE
     {
 	"Cache test",
 	"cache",
@@ -69,9 +69,9 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_CACHE
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG
-#if defined(CONFIG_POST_WATCHDOG)
-	CONFIG_POST_WATCHDOG,
+#if CFG_POST & CONFIG_SYS_POST_WATCHDOG
+#if defined(CFG_POST_WATCHDOG)
+	CFG_POST_WATCHDOG,
 #else
     {
 	"Watchdog timer test",
@@ -85,7 +85,7 @@ struct post_test post_list[] =
     },
 #endif
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_I2C
+#if CFG_POST & CONFIG_SYS_POST_I2C
     {
 	"I2C test",
 	"i2c",
@@ -97,7 +97,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_I2C
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_RTC
+#if CFG_POST & CONFIG_SYS_POST_RTC
     {
 	"RTC test",
 	"rtc",
@@ -109,7 +109,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_RTC
     },
 #endif
-#if CONFIG_POST & CFG_SYS_POST_MEMORY
+#if CFG_POST & CFG_SYS_POST_MEMORY
     {
 	"Memory test",
 	"memory",
@@ -121,7 +121,7 @@ struct post_test post_list[] =
 	CFG_SYS_POST_MEMORY
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CONFIG_SYS_POST_CPU
     {
 	"CPU test",
 	"cpu",
@@ -134,7 +134,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_CPU
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CONFIG_SYS_POST_FPU
     {
 	"FPU test",
 	"fpu",
@@ -147,9 +147,9 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_FPU
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_UART
-#if defined(CONFIG_POST_UART)
-	CONFIG_POST_UART,
+#if CFG_POST & CONFIG_SYS_POST_UART
+#if defined(CFG_POST_UART)
+	CFG_POST_UART,
 #else
     {
 	"UART test",
@@ -161,9 +161,9 @@ struct post_test post_list[] =
 	NULL,
 	CONFIG_SYS_POST_UART
     },
-#endif /* CONFIG_POST_UART */
+#endif /* CFG_POST_UART */
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_ETHER
+#if CFG_POST & CONFIG_SYS_POST_ETHER
     {
 	"ETHERNET test",
 	"ethernet",
@@ -175,7 +175,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_ETHER
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_USB
+#if CFG_POST & CONFIG_SYS_POST_USB
     {
 	"USB test",
 	"usb",
@@ -187,7 +187,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_USB
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_SPR
+#if CFG_POST & CONFIG_SYS_POST_SPR
     {
 	"SPR test",
 	"spr",
@@ -199,7 +199,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_SPR
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_SYSMON
+#if CFG_POST & CONFIG_SYS_POST_SYSMON
     {
 	"SYSMON test",
 	"sysmon",
@@ -211,7 +211,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_SYSMON
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_DSP
+#if CFG_POST & CONFIG_SYS_POST_DSP
     {
 	"DSP test",
 	"dsp",
@@ -223,7 +223,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_DSP
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_CODEC
+#if CFG_POST & CONFIG_SYS_POST_CODEC
     {
 	"CODEC test",
 	"codec",
@@ -235,7 +235,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_CODEC
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_ECC
+#if CFG_POST & CONFIG_SYS_POST_ECC
     {
 	"ECC test",
 	"ecc",
@@ -247,22 +247,22 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_ECC
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_BSPEC1
-	CONFIG_POST_BSPEC1,
+#if CFG_POST & CONFIG_SYS_POST_BSPEC1
+	CFG_POST_BSPEC1,
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_BSPEC2
-	CONFIG_POST_BSPEC2,
+#if CFG_POST & CONFIG_SYS_POST_BSPEC2
+	CFG_POST_BSPEC2,
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_BSPEC3
-	CONFIG_POST_BSPEC3,
+#if CFG_POST & CONFIG_SYS_POST_BSPEC3
+	CFG_POST_BSPEC3,
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_BSPEC4
-	CONFIG_POST_BSPEC4,
+#if CFG_POST & CONFIG_SYS_POST_BSPEC4
+	CFG_POST_BSPEC4,
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_BSPEC5
-	CONFIG_POST_BSPEC5,
+#if CFG_POST & CONFIG_SYS_POST_BSPEC5
+	CFG_POST_BSPEC5,
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_COPROC
+#if CFG_POST & CONFIG_SYS_POST_COPROC
     {
 	"Coprocessors communication test",
 	"coproc_com",
@@ -274,7 +274,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_COPROC
     },
 #endif
-#if CONFIG_POST & CONFIG_SYS_POST_FLASH
+#if CFG_POST & CONFIG_SYS_POST_FLASH
     {
 	"Parallel NOR flash test",
 	"flash",
@@ -286,7 +286,7 @@ struct post_test post_list[] =
 	CONFIG_SYS_POST_FLASH
     },
 #endif
-#if CONFIG_POST & CFG_SYS_POST_MEM_REGIONS
+#if CFG_POST & CFG_SYS_POST_MEM_REGIONS
     {
 	"Memory regions test",
 	"mem_regions",
diff --git a/test/Kconfig b/test/Kconfig
index a6b463e4d06c..9f4641ae6bc5 100644
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -1,3 +1,8 @@
+config POST
+	bool "Power On Self Test support"
+	help
+	  See doc/README.POST for more details
+
 menuconfig UNIT_TEST
 	bool "Unit tests"
 	help
-- 
2.25.1

[PATCH 38/38] m68k: Rename CONFIG_WATCHDOG_TIMEOUT to CONFIG_WATCHDOG_TIMEOUT_MSECS

[Tom Rini]

In practice, it is clear that the usage in m68k of
CONFIG_WATCHDOG_TIMEOUT is setting a value in milliseconds. Rename this
to the existing symbol and move to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/m68k/cpu/mcf523x/cpu.c        |  2 +-
 arch/m68k/cpu/mcf52x2/cpu.c        |  6 +++---
 arch/m68k/cpu/mcf532x/cpu.c        |  2 +-
 configs/M5208EVBE_defconfig        |  1 +
 configs/M5235EVB_Flash32_defconfig |  1 +
 configs/M5235EVB_defconfig         |  1 +
 configs/M5272C3_defconfig          |  1 +
 configs/M53017EVB_defconfig        |  1 +
 configs/M5329AFEE_defconfig        |  1 +
 configs/M5329BFEE_defconfig        |  1 +
 configs/M5373EVB_defconfig         |  1 +
 configs/astro_mcf5373l_defconfig   |  1 +
 include/configs/M5208EVBE.h        |  2 --
 include/configs/M5235EVB.h         |  2 --
 include/configs/M5272C3.h          |  2 --
 include/configs/M53017EVB.h        |  2 --
 include/configs/M5329EVB.h         |  2 --
 include/configs/M5373EVB.h         |  2 --
 include/configs/astro_mcf5373l.h   | 10 ----------
 include/configs/cobra5272.h        | 12 ------------
 20 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 6d87908965d2..838b71a2ea48 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -92,7 +92,7 @@ int watchdog_init(void)
 	u32 wdog_module = 0;
 
 	/* set timeout and enable watchdog */
-	wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT);
+	wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT_MSEC);
 	wdog_module |= (wdog_module / 8192);
 	out_be16(&wdp->mr, wdog_module);
 
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index d21d82fef758..25fc56c5276f 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -87,7 +87,7 @@ int watchdog_init(void)
 
 	/* set timeout and enable watchdog */
 	out_be16(&wdt->mr,
-		(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
+		(CONFIG_WATCHDOG_TIMEOUT_MSEC * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
 
 	/* reset watchdog counter */
 	out_be16(&wdt->sr, 0x5555);
@@ -253,7 +253,7 @@ int watchdog_init(void)
 
 	/* set timeout and enable watchdog */
 	out_be16(&wdt->wdog_wrrr,
-		(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
+		(CONFIG_WATCHDOG_TIMEOUT_MSEC * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
 
 	/* reset watchdog counter */
 	out_be16(&wdt->wdog_wcr, 0);
@@ -323,7 +323,7 @@ int watchdog_init(void)
 
 	/* set timeout and enable watchdog */
 	out_be16(&wdt->wmr,
-		(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
+		(CONFIG_WATCHDOG_TIMEOUT_MSEC * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
 
 	/* reset watchdog counter */
 	out_be16(&wdt->wsr, 0x5555);
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 8a48d73475c8..014fbc43cb65 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -131,7 +131,7 @@ int watchdog_init(void)
 	u32 wdog_module = 0;
 
 	/* set timeout and enable watchdog */
-	wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
+	wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT_MSEC);
 #ifdef CONFIG_M5329
 	out_be16(&wdp->mr, wdog_module / 8192);
 #else
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index fd219cbaebc5..680c2d43671b 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -43,3 +43,4 @@ CONFIG_SYS_MAX_FLASH_SECT=254
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index 1b7b1568003e..c0087aa67f95 100644
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index fffcdddd4912..b099e986067b 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 5e7d40144f96..a321b1c5c244 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -62,3 +62,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=10000
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 6586f0468b20..32d195808801 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -49,3 +49,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index bf1d70f832cc..9f0b4196392b 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -48,3 +48,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index b83b542f8f83..05388796fb11 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -50,3 +50,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 181f79b1e906..90d83216489a 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -50,3 +50,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=3360
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index afbcb86c034b..9e5665a12b84 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -50,3 +50,4 @@ CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=3355
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 246437a51e2f..b360238b332a 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -15,8 +15,6 @@
  */
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT		5000
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 128ef50b476f..ed45eccb62c9 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
-
 /* I2C */
 #define CFG_SYS_I2C_PINMUX_REG	(gpio->par_qspi)
 #define CFG_SYS_I2C_PINMUX_CLR	~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 847b4c2593d8..a9339e505257 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -19,8 +19,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT 10000	/* timeout in milliseconds */
-
 #undef CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
 /* Configuration for environment
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 0e9ba4c3ada8..42b74aeb9b5d 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT		5000
-
 #ifdef CONFIG_MCFFEC
 #	define CFG_SYS_TX_ETH_BUFFER	8
 #	define CFG_SYS_FEC_BUF_USE_SRAM
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 8f83810f165e..72f0c63a1e21 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 43c642edeb18..4e8b54e01f4e 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -22,8 +22,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index f5922fc416eb..62aa99342a0e 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -69,16 +69,6 @@
 #define CFG_SYS_UART_PORT		(2)
 #define CFG_SYS_UART2_ALT3_GPIO
 
-/*
- * Watchdog configuration; Watchdog is disabled for running from RAM
- * and set to highest possible value else. Beware there is no check
- * in the watchdog code to validate the timeout value set here!
- */
-
-#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_WATCHDOG_TIMEOUT 3355	/* timeout in milliseconds */
-#endif
-
 /*
  * Configuration for environment
  * Environment is located in the last sector of the flash
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 01828ea2011c..6d6e2fc69620 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -42,18 +42,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-/* ---
- * set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change
- * timeout acc. to your needs
- * #define CONFIG_WATCHDOG_TIMEOUT x , x is timeout in milliseconds, e. g. 10000
- * for 10 sec
- * ---
- */
-
-#if 0
-#define CONFIG_WATCHDOG_TIMEOUT 10000	/* timeout in milliseconds */
-#endif
-
 /* ---
  * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different
  * bootloader residing in flash ('chainloading'); if you want to use
-- 
2.25.1

[000/241] Finish migration to Kconfig or CFG namespace

[Tom Rini]

Hey all,

The intention of this series isn't to apply it just yet. This was a very
quick scripted migration and so there's cases where we do more than one
symbol, or we can see there's define but unused symbols. But it also
shows that with the last few series I've posted, we're nearly done. With
this series applied, everything builds still, and the resulting binaries
seem to be the same (I'm doing a build where I keep before/after so I
can check checksums now).

-- 
Tom

[PoC 001/241] global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
 arch/arm/cpu/armv7/virt-v7.c     | 4 ++--
 include/configs/arndale.h        | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 39aeeb423f08..b6d144f065d2 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry)
 ENDPROC(_do_nonsec_entry)
 
 .macro get_cbar_addr	addr
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
-	ldr	\addr, =CONFIG_ARM_GIC_BASE_ADDRESS
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+	ldr	\addr, =CFG_ARM_GIC_BASE_ADDRESS
 #else
 	mrc	p15, 4, \addr, c15, c0, 0	@ read CBAR
 	bfc	\addr, #0, #15			@ clear reserved bits
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 5ffeca13d913..c82b215b6f9c 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)
 
 static unsigned long get_gicd_base_address(void)
 {
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
-	return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+	return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
 #else
 	unsigned periphbase;
 
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 7a244769e30a..8acc525b11c9 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -19,6 +19,6 @@
 #define CONFIG_SMP_PEN_ADDR	0x02020000
 
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
-#define CONFIG_ARM_GIC_BASE_ADDRESS	0x10480000
+#define CFG_ARM_GIC_BASE_ADDRESS	0x10480000
 
 #endif	/* __CONFIG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 39e1071236bd..0d2cbddeed40 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,4 +1,4 @@
-CONFIG_ARM_GIC_BASE_ADDRESS
+CFG_ARM_GIC_BASE_ADDRESS
 CONFIG_BOARDDIR
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
-- 
2.25.1

[PoC 002/241] global: Migrate CONFIG_BOARDDIR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sh/cpu/u-boot.lds       | 2 +-
 doc/README.kwbimage          | 2 +-
 scripts/Makefile.autoconf    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
index d360eea7eba3..c31deecec659 100644
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -35,7 +35,7 @@ SECTIONS
 	.text :
 	{
 		KEEP(*/start.o		(.text))
-		KEEP(CONFIG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
+		KEEP(CFG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
 		KEEP(*(.spiboot2.text))
 		. = ALIGN(8192);
 #ifdef CONFIG_ENV_IS_IN_FLASH
diff --git a/doc/README.kwbimage b/doc/README.kwbimage
index 762b2e3acb71..a1d247c32dd1 100644
--- a/doc/README.kwbimage
+++ b/doc/README.kwbimage
@@ -42,7 +42,7 @@ Board specific configuration file specifications:
 	kwbimage.cfg.  The name can be set as part of the full path
 	to the file using CONFIG_SYS_KWD_CONFIG (probably in
 	include/configs/<yourboard>.h).   The path should look like:
-	$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg
+	$(CFG_BOARDDIR)/<yourkwbimagename>.cfg
 2. This file can have empty lines and lines starting with "#" as first
 	character to put comments
 3. This file can have configuration command lines as mentioned below,
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 5a4a14895538..f5f5e4a4d540 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
-	echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
+	echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0d2cbddeed40..14863642e4d3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,5 +1,5 @@
 CFG_ARM_GIC_BASE_ADDRESS
-CONFIG_BOARDDIR
+CFG_BOARDDIR
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
 CONFIG_DFU_ALT_BOOT_SD
-- 
2.25.1

[PoC 003/241] global: Migrate CONFIG_DFU_ALT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/exynos5-dt.c | 4 ++--
 board/samsung/odroid/odroid.c     | 4 ++--
 include/configs/odroid.h          | 8 ++++----
 include/configs/odroid_xu3.h      | 8 ++++----
 include/configs/s5p_goni.h        | 4 ++--
 include/configs/trats.h           | 4 ++--
 include/configs/trats2.h          | 4 ++--
 scripts/config_whitelist.txt      | 8 ++++----
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 0d77a57f8082..cde77d79a0f6 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
 		return NULL;
 
 	if (IS_SD(mmc))
-		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
+		alt_boot = CFG_DFU_ALT_BOOT_SD;
 	else
-		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
+		alt_boot = CFG_DFU_ALT_BOOT_EMMC;
 
 	return alt_boot;
 }
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 35e4cee74f44..39a60e4ad295 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
 	if (mmc_init(mmc))
 		return NULL;
 
-	alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
-				CONFIG_DFU_ALT_BOOT_EMMC;
+	alt_boot = IS_SD(mmc) ? CFG_DFU_ALT_BOOT_SD :
+				CFG_DFU_ALT_BOOT_EMMC;
 
 	return alt_boot;
 }
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index f252b349437c..e2331e45cdfe 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -27,7 +27,7 @@
 #define PARTS_BOOT		"boot"
 #define PARTS_ROOT		"platform"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"uImage fat 0 1;" \
 	"zImage fat 0 1;" \
 	"Image.itb fat 0 1;" \
@@ -39,13 +39,13 @@
 
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
-#define CONFIG_DFU_ALT_BOOT_EMMC \
+#define CFG_DFU_ALT_BOOT_EMMC \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
 	"bl1 raw 0x0 0x1e mmcpart 1;" \
 	"bl2 raw 0x1e 0x1d mmcpart 1;" \
 	"tzsw raw 0x83e 0x138 mmcpart 1\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD \
+#define CFG_DFU_ALT_BOOT_SD \
 	"u-boot raw 0x3f 0x800;" \
 	"bl1 raw 0x1 0x1e;" \
 	"bl2 raw 0x1f 0x1d;" \
@@ -132,7 +132,7 @@
 	"mmcbootpart=1\0" \
 	"mmcrootdev=0\0" \
 	"mmcrootpart=2\0" \
-	"dfu_alt_system="CONFIG_DFU_ALT \
+	"dfu_alt_system="CFG_DFU_ALT \
 	"dfu_alt_info=Please reset the board\0" \
 	"consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
 	"consoleoff=set console console=ram; save; reset\0" \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 5bbe7aadcb25..7a81585494a9 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -28,7 +28,7 @@
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 
-#define CONFIG_DFU_ALT_SYSTEM               \
+#define CFG_DFU_ALT_SYSTEM               \
 	"uImage fat 0 1;"                   \
 	"zImage fat 0 1;"                   \
 	"Image.itb fat 0 1;"                \
@@ -42,14 +42,14 @@
 	"boot part 0 1;"                    \
 	"root part 0 2\0"
 
-#define CONFIG_DFU_ALT_BOOT_EMMC           \
+#define CFG_DFU_ALT_BOOT_EMMC           \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
 	"bl1 raw 0x0 0x1e mmcpart 1;"      \
 	"bl2 raw 0x1e 0x1d mmcpart 1;"     \
 	"tzsw raw 0x83e 0x200 mmcpart 1;"  \
 	"params.bin raw 0x1880 0x20\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD   \
+#define CFG_DFU_ALT_BOOT_SD   \
 	"u-boot raw 0x3f 0x800;" \
 	"bl1 raw 0x1 0x1e;"      \
 	"bl2 raw 0x1f 0x1d;"     \
@@ -83,7 +83,7 @@
 	"mmcrootdev=0\0" \
 	"mmcbootpart=1\0" \
 	"mmcrootpart=2\0" \
-	"dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \
+	"dfu_alt_system="CFG_DFU_ALT_SYSTEM \
 	"dfu_alt_info=Autoset by THOR/DFU command run.\0"
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index fdade1ee66fa..b7a91af008c7 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -42,7 +42,7 @@
 #define PARTS_CSC			"csc"
 #define PARTS_UMS			"ums"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x400;" \
 	"uImage ext4 0 2;" \
 	"exynos3-goni.dtb ext4 0 2;" \
@@ -109,7 +109,7 @@
 	"ubiblock=8\0" \
 	"ubi=enabled\0" \
 	"opts=always_resume=1\0" \
-	"dfu_alt_info=" CONFIG_DFU_ALT "\0"
+	"dfu_alt_info=" CFG_DFU_ALT "\0"
 
 /* Goni has 3 banks of DRAM, but swap the bank */
 #define PHYS_SDRAM_1		CFG_SYS_SDRAM_BASE	/* OneDRAM Bank #0 */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index ec18842bbe8c..3eac66539dfe 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -39,7 +39,7 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x400;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
@@ -98,7 +98,7 @@
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
 	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"dfu_alt_info=" CFG_DFU_ALT \
 	"spladdr=0x40000100\0" \
 	"splsize=0x200\0" \
 	"splfile=falcon.bin\0" \
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 0aa331e39359..125d3e776a3f 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -40,7 +40,7 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x800;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
@@ -86,7 +86,7 @@
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
 	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"dfu_alt_info=" CFG_DFU_ALT \
 	"uartpath=ap\0" \
 	"usbpath=ap\0" \
 	"consoleon=set console console=ttySAC2,115200n8; save; reset\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 14863642e4d3..880e963e1d0f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,9 +1,9 @@
 CFG_ARM_GIC_BASE_ADDRESS
 CFG_BOARDDIR
-CONFIG_DFU_ALT
-CONFIG_DFU_ALT_BOOT_EMMC
-CONFIG_DFU_ALT_BOOT_SD
-CONFIG_DFU_ALT_SYSTEM
+CFG_DFU_ALT
+CFG_DFU_ALT_BOOT_EMMC
+CFG_DFU_ALT_BOOT_SD
+CFG_DFU_ALT_SYSTEM
 CONFIG_DFU_ENV_SETTINGS
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
-- 
2.25.1

[PoC 004/241] global: Migrate CONFIG_DFU_ENV_SETTINGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/mx7dsabresd.h | 4 ++--
 include/configs/pico-imx6.h   | 4 ++--
 include/configs/pico-imx6ul.h | 4 ++--
 include/configs/pico-imx7d.h  | 4 ++--
 include/configs/warp7.h       | 4 ++--
 scripts/config_whitelist.txt  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 6c165521f7a0..377e4d9c4b27 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -44,7 +44,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=image raw 0 0x800000;"\
 		"u-boot raw 0 0x4000;"\
 		"bootimg part 0 1;"\
@@ -53,7 +53,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 6d7873daa0ad..719b70144051 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -21,7 +21,7 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x1000;" \
@@ -47,7 +47,7 @@
 	"fdt_addr_r=0x18000000\0" \
 	"fdt_addr=0x18000000\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"finduuid=part uuid mmc 0:1 uuid\0" \
 	"findfdt="\
 		"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 8af8883fad64..5dfd737cf7a4 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -30,7 +30,7 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x400;" \
@@ -65,7 +65,7 @@
 	"ramdiskaddr=0x83000000\0" \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"mmcautodetect=yes\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"findfdt=" \
 		"if test $fdtfile = ask ; then " \
 			"bootmenu -1; fi;" \
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 83907b06ebb4..581921510426 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -15,7 +15,7 @@
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x1000;" \
@@ -67,7 +67,7 @@
 	"ramdisk_addr_r=0x83000000\0" \
 	"ramdiskaddr=0x83000000\0" \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"findfdt=" \
 		"if test $fdtfile = ask ; then " \
 			"bootmenu -1; fi;" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 56c90aa1032e..3cdf4a1ffc67 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -16,7 +16,7 @@
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
 
 /* When booting with FIT specify the node entry containing boot.scr */
@@ -27,7 +27,7 @@
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"bootscr_fitimage_name=bootscr\0" \
 	"script_signed=boot.scr.imx-signed\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 880e963e1d0f..414f0078e4d7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4,7 +4,7 @@ CFG_DFU_ALT
 CFG_DFU_ALT_BOOT_EMMC
 CFG_DFU_ALT_BOOT_SD
 CFG_DFU_ALT_SYSTEM
-CONFIG_DFU_ENV_SETTINGS
+CFG_DFU_ENV_SETTINGS
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_NO_SROM
-- 
2.25.1

[PoC 005/241] global: Migrate CONFIG_DM9000_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/timll/devkit8000/devkit8000.c | 4 ++--
 include/configs/M5253DEMO.h         | 6 +++---
 include/configs/at91sam9261ek.h     | 6 +++---
 include/configs/ci20.h              | 6 +++---
 include/configs/devkit8000.h        | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 0808ca1a54c0..39103de02ed4 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -79,7 +79,7 @@ int board_init(void)
 static void gpmc_dm9000_config(void)
 {
 	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
-		CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+		CFG_DM9000_BASE, GPMC_SIZE_16M);
 }
 
 /*
@@ -102,7 +102,7 @@ int misc_init_r(void)
 #ifdef CONFIG_DRIVER_DM9000
 	/* Configure GPMC registers for DM9000 */
 	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
-			CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+			CFG_DM9000_BASE, GPMC_SIZE_16M);
 
 	/* Use OMAP DIE_ID as MAC address */
 	if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 7e37c6d11997..223a843fc695 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -20,9 +20,9 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#	define CONFIG_DM9000_BASE	(CFG_SYS_CS1_BASE | 0x300)
-#	define DM9000_IO		CONFIG_DM9000_BASE
-#	define DM9000_DATA		(CONFIG_DM9000_BASE + 4)
+#	define CFG_DM9000_BASE	(CFG_SYS_CS1_BASE | 0x300)
+#	define DM9000_IO		CFG_DM9000_BASE
+#	define DM9000_DATA		(CFG_DM9000_BASE + 4)
 #	undef CONFIG_DM9000_DEBUG
 #	define CONFIG_DM9000_BYTE_SWAPPED
 
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 56247e390bf6..d58c0f4bbe24 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -35,9 +35,9 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_DM9000_BASE		0x30000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 4)
+#define CFG_DM9000_BASE		0x30000000
+#define DM9000_IO			CFG_DM9000_BASE
+#define DM9000_DATA			(CFG_DM9000_BASE + 4)
 #define CONFIG_DM9000_USE_16BIT
 #define CONFIG_DM9000_NO_SROM
 
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 3329c24fa68c..bc8b699b84f8 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -18,9 +18,9 @@
 #define CFG_SYS_NS16550_CLK		48000000
 
 /* Ethernet: davicom DM9000 */
-#define CONFIG_DM9000_BASE		0xb6000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 2)
+#define CFG_DM9000_BASE		0xb6000000
+#define DM9000_IO			CFG_DM9000_BASE
+#define DM9000_DATA			(CFG_DM9000_BASE + 2)
 
 /* Miscellaneous configuration options */
 
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 46410595c2bc..824e0e448eea 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -18,9 +18,9 @@
 
 /* Hardware drivers */
 /* DM9000 */
-#define	CONFIG_DM9000_BASE		0x2c000000
-#define	DM9000_IO			CONFIG_DM9000_BASE
-#define	DM9000_DATA			(CONFIG_DM9000_BASE + 0x400)
+#define	CFG_DM9000_BASE		0x2c000000
+#define	DM9000_IO			CFG_DM9000_BASE
+#define	DM9000_DATA			(CFG_DM9000_BASE + 0x400)
 #define	CONFIG_DM9000_USE_16BIT		1
 #define CONFIG_DM9000_NO_SROM		1
 #undef	CONFIG_DM9000_DEBUG
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 414f0078e4d7..7c6fc0a07bf7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -5,7 +5,7 @@ CFG_DFU_ALT_BOOT_EMMC
 CFG_DFU_ALT_BOOT_SD
 CFG_DFU_ALT_SYSTEM
 CFG_DFU_ENV_SETTINGS
-CONFIG_DM9000_BASE
+CFG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
-- 
2.25.1

[PoC 006/241] global: Migrate CONFIG_DM9000_BYTE_SWAPPED to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/dm9000x.c        | 2 +-
 include/configs/M5253DEMO.h  | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 07733df533e2..6bf316263d59 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -83,7 +83,7 @@ struct dm9000_priv {
 };
 
 /* DM9000 network board routine ---------------------------- */
-#ifndef CONFIG_DM9000_BYTE_SWAPPED
+#ifndef CFG_DM9000_BYTE_SWAPPED
 #define dm9000_outb(d, r) writeb((d), (r))
 #define dm9000_outw(d, r) writew((d), (r))
 #define dm9000_outl(d, r) writel((d), (r))
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 223a843fc695..4be4d0f84512 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -24,7 +24,7 @@
 #	define DM9000_IO		CFG_DM9000_BASE
 #	define DM9000_DATA		(CFG_DM9000_BASE + 4)
 #	undef CONFIG_DM9000_DEBUG
-#	define CONFIG_DM9000_BYTE_SWAPPED
+#	define CFG_DM9000_BYTE_SWAPPED
 
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7c6fc0a07bf7..005b893b317c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -6,7 +6,7 @@ CFG_DFU_ALT_BOOT_SD
 CFG_DFU_ALT_SYSTEM
 CFG_DFU_ENV_SETTINGS
 CFG_DM9000_BASE
-CONFIG_DM9000_BYTE_SWAPPED
+CFG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
-- 
2.25.1

[PoC 007/241] global: Migrate CONFIG_DM9000_NO_SROM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/dm9000x.c           | 2 +-
 include/configs/at91sam9261ek.h | 2 +-
 include/configs/devkit8000.h    | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 6bf316263d59..514b8db2ce1e 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -550,7 +550,7 @@ static int dm9000_recv_common(struct dm9000_priv *db, uchar *rdptr)
 /*
  * Read a word data from SROM
  */
-#if !defined(CONFIG_DM9000_NO_SROM)
+#if !defined(CFG_DM9000_NO_SROM)
 static void dm9000_read_srom_word(struct dm9000_priv *db, int offset, u8 *to)
 {
 	dm9000_iow(db, DM9000_EPAR, offset);
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index d58c0f4bbe24..a9bbbd39484a 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -39,7 +39,7 @@
 #define DM9000_IO			CFG_DM9000_BASE
 #define DM9000_DATA			(CFG_DM9000_BASE + 4)
 #define CONFIG_DM9000_USE_16BIT
-#define CONFIG_DM9000_NO_SROM
+#define CFG_DM9000_NO_SROM
 
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9261_UHP_BASE */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 824e0e448eea..1694bf1cd3e1 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -22,7 +22,7 @@
 #define	DM9000_IO			CFG_DM9000_BASE
 #define	DM9000_DATA			(CFG_DM9000_BASE + 0x400)
 #define	CONFIG_DM9000_USE_16BIT		1
-#define CONFIG_DM9000_NO_SROM		1
+#define CFG_DM9000_NO_SROM		1
 #undef	CONFIG_DM9000_DEBUG
 
 /* TWL4030 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 005b893b317c..85adbafa58fe 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -7,7 +7,7 @@ CFG_DFU_ALT_SYSTEM
 CFG_DFU_ENV_SETTINGS
 CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
-CONFIG_DM9000_NO_SROM
+CFG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
-- 
2.25.1

[PoC 008/241] global: Migrate CONFIG_DM9000_USE_16BIT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/at91sam9261ek.h | 2 +-
 include/configs/devkit8000.h    | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index a9bbbd39484a..9a3928f3fa87 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -38,7 +38,7 @@
 #define CFG_DM9000_BASE		0x30000000
 #define DM9000_IO			CFG_DM9000_BASE
 #define DM9000_DATA			(CFG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT
+#define CFG_DM9000_USE_16BIT
 #define CFG_DM9000_NO_SROM
 
 /* USB */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 1694bf1cd3e1..c8b176542d95 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -21,7 +21,7 @@
 #define	CFG_DM9000_BASE		0x2c000000
 #define	DM9000_IO			CFG_DM9000_BASE
 #define	DM9000_DATA			(CFG_DM9000_BASE + 0x400)
-#define	CONFIG_DM9000_USE_16BIT		1
+#define	CFG_DM9000_USE_16BIT		1
 #define CFG_DM9000_NO_SROM		1
 #undef	CONFIG_DM9000_DEBUG
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 85adbafa58fe..43234d822457 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8,7 +8,7 @@ CFG_DFU_ENV_SETTINGS
 CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
-CONFIG_DM9000_USE_16BIT
+CFG_DM9000_USE_16BIT
 CONFIG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
-- 
2.25.1

[PoC 009/241] global: Migrate CONFIG_DW_WDT_CLOCK_KHZ to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/watchdog/designware_wdt.c      | 2 +-
 include/configs/socfpga_common.h       | 2 +-
 include/configs/socfpga_soc64_common.h | 4 ++--
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index cad756aeaf20..0eeb2efee2f5 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev)
 		goto err;
 	}
 #else
-	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
+	priv->clk_khz = CFG_DW_WDT_CLOCK_KHZ;
 #endif
 
 	if (CONFIG_IS_ENABLED(DM_RESET)) {
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index bbbdea6664ca..807bff43e00a 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -64,7 +64,7 @@
 /*
  * L4 Watchdog
  */
-#define CONFIG_DW_WDT_CLOCK_KHZ		25000
+#define CFG_DW_WDT_CLOCK_KHZ		25000
 
 /*
  * NAND Support
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 47089f312d2c..df3927297bbe 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -90,10 +90,10 @@
 #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
 #ifndef __ASSEMBLY__
 unsigned int cm_get_l4_sys_free_clk_hz(void);
-#define CONFIG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
+#define CFG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
 #endif
 #else
-#define CONFIG_DW_WDT_CLOCK_KHZ		100000
+#define CFG_DW_WDT_CLOCK_KHZ		100000
 #endif
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43234d822457..97ad18677f1d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -9,7 +9,7 @@ CFG_DM9000_BASE
 CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
-CONFIG_DW_WDT_CLOCK_KHZ
+CFG_DW_WDT_CLOCK_KHZ
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
-- 
2.25.1

[PoC 010/241] global: Migrate CONFIG_ENV_FLAGS_LIST_STATIC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                            | 6 +++---
 include/configs/aristainetos2.h   | 2 +-
 include/configs/imx6q-bosch-acc.h | 2 +-
 include/env_flags.h               | 6 +++---
 scripts/config_whitelist.txt      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 103562bbbe8d..71767e32d11b 100644
--- a/README
+++ b/README
@@ -1132,7 +1132,7 @@ The following options need to be configured:
 		The same can be accomplished in a more flexible way
 		for any variable by configuring the type of access
 		to allow for those variables in the ".flags" variable
-		or define CONFIG_ENV_FLAGS_LIST_STATIC.
+		or define CFG_ENV_FLAGS_LIST_STATIC.
 
 - Protected RAM:
 		CONFIG_PRAM
@@ -1496,7 +1496,7 @@ Configuration Settings:
 		this option if you really know what you are doing.
 
 - CONFIG_ENV_FLAGS_LIST_DEFAULT
-- CONFIG_ENV_FLAGS_LIST_STATIC
+- CFG_ENV_FLAGS_LIST_STATIC
 	Enable validation of the values given to environment variables when
 	calling env set.  Variables can be restricted to only decimal,
 	hexadecimal, or boolean.  If CONFIG_CMD_NET is also defined,
@@ -1527,7 +1527,7 @@ Configuration Settings:
 		Define this to a list (string) to define the ".flags"
 		environment variable in the default or embedded environment.
 
-	- CONFIG_ENV_FLAGS_LIST_STATIC
+	- CFG_ENV_FLAGS_LIST_STATIC
 		Define this to a list (string) to define validation that
 		should be done if an entry is not found in the ".flags"
 		environment variable.  To override a setting in the static
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 6faf544d21b6..e80166b3c467 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -420,7 +420,7 @@
 
 /* UBI support */
 
-#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
+#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
 #endif                         /* __ARISTAINETOS2_CONFIG_H */
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 99da081cdae8..392f97050a65 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -45,7 +45,7 @@
 	"save_env=env save; env save\0" \
 	"altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0"
 
-#define CONFIG_ENV_FLAGS_LIST_STATIC \
+#define CFG_ENV_FLAGS_LIST_STATIC \
 	"bootset:bw," \
 	"clone_pending:bw," \
 	"endurance_test:bw," \
diff --git a/include/env_flags.h b/include/env_flags.h
index 313cb8c49a6d..e4e40169aed0 100644
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -35,8 +35,8 @@ enum env_flags_varaccess {
 #define ENV_FLAGS_VARTYPE_LOC 0
 #define ENV_FLAGS_VARACCESS_LOC 1
 
-#ifndef CONFIG_ENV_FLAGS_LIST_STATIC
-#define CONFIG_ENV_FLAGS_LIST_STATIC ""
+#ifndef CFG_ENV_FLAGS_LIST_STATIC
+#define CFG_ENV_FLAGS_LIST_STATIC ""
 #endif
 
 #ifdef CONFIG_NET
@@ -77,7 +77,7 @@ enum env_flags_varaccess {
 	ETHADDR_FLAGS \
 	NET_FLAGS \
 	SERIAL_FLAGS \
-	CONFIG_ENV_FLAGS_LIST_STATIC
+	CFG_ENV_FLAGS_LIST_STATIC
 
 #ifdef CONFIG_CMD_ENV_FLAGS
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 97ad18677f1d..8d9496e6edba 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -10,7 +10,7 @@ CFG_DM9000_BYTE_SWAPPED
 CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
-CONFIG_ENV_FLAGS_LIST_STATIC
+CFG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
-- 
2.25.1

[PoC 011/241] global: Migrate CONFIG_ENV_IS_EMBEDDED to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 env/Makefile                 |  2 +-
 include/env_internal.h       | 12 ++++++------
 scripts/config_whitelist.txt |  2 +-
 tools/Makefile               |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/env/Makefile b/env/Makefile
index c4ad65432865..78e82173507f 100644
--- a/env/Makefile
+++ b/env/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o
 ifndef CONFIG_SPL_BUILD
 obj-y += callback.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
-extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o
+extra-$(CFG_ENV_IS_EMBEDDED) += embedded.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o
 extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o
 obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o
diff --git a/include/env_internal.h b/include/env_internal.h
index f30fd6159d87..690e6da81078 100644
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -41,8 +41,8 @@
 	(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #  define ENV_IS_EMBEDDED
 # endif
-# ifdef CONFIG_ENV_IS_EMBEDDED
-#  error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
+# ifdef CFG_ENV_IS_EMBEDDED
+#  error "do not define CFG_ENV_IS_EMBEDDED in your board config"
 #  error "it is calculated automatically for you"
 # endif
 #endif	/* CONFIG_ENV_IS_IN_FLASH */
@@ -61,15 +61,15 @@ extern unsigned long nand_env_oob_offset;
  * For the flash types where embedded env is supported, but it cannot be
  * calculated automatically (i.e. NAND), take the board opt-in.
  */
-#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
+#if defined(CFG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
 # define ENV_IS_EMBEDDED
 #endif
 
 /* The build system likes to know if the env is embedded */
 #ifdef DO_DEPS_ONLY
 # ifdef ENV_IS_EMBEDDED
-#  ifndef CONFIG_ENV_IS_EMBEDDED
-#   define CONFIG_ENV_IS_EMBEDDED
+#  ifndef CFG_ENV_IS_EMBEDDED
+#   define CFG_ENV_IS_EMBEDDED
 #  endif
 # endif
 #endif
@@ -88,7 +88,7 @@ extern unsigned long nand_env_oob_offset;
  * If the environment is in RAM, allocate extra space for it in the malloc
  * region.
  */
-#if defined(CONFIG_ENV_IS_EMBEDDED)
+#if defined(CFG_ENV_IS_EMBEDDED)
 #define TOTAL_MALLOC_LEN	CONFIG_SYS_MALLOC_LEN
 #elif (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE < CONFIG_SYS_MONITOR_BASE) || \
       (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) || \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8d9496e6edba..040b0c89049a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -11,7 +11,7 @@ CFG_DM9000_NO_SROM
 CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
-CONFIG_ENV_IS_EMBEDDED
+CFG_ENV_IS_EMBEDDED
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
diff --git a/tools/Makefile b/tools/Makefile
index 26be0a7ba2ea..b76876307a74 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -36,7 +36,7 @@ endif
 subdir-$(HOST_TOOLS_ALL) += gdb
 
 # Merge all the different vars for envcrc into one
-ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
+ENVCRC-$(CFG_ENV_IS_EMBEDDED) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
-- 
2.25.1

[PoC 012/241] global: Migrate CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/draco.h      | 4 ++--
 include/configs/etamin.h     | 4 ++--
 include/configs/pxm2.h       | 4 ++--
 include/configs/rastaban.h   | 4 ++--
 include/configs/thuban.h     | 4 ++--
 scripts/config_whitelist.txt | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 4869008da440..d1c7abe1b392 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -34,7 +34,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 6647148c96f4..d6c313d18e2a 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -56,7 +56,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -144,7 +144,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 586a7edcbb52..eafa6ae9a9a0 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -18,7 +18,7 @@
 #define DDR_IOCTRL_VAL		0x18b
 #define DDR_PLL_FREQ		266
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=59\0" \
 	"led0=117,0,1\0" \
 
@@ -34,7 +34,7 @@
 	"nand_img_size=0x500000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
 	CONFIG_ENV_SETTINGS_NAND_V1 \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 49cd11c17b44..2e002faf2e60 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -21,7 +21,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -44,7 +44,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 696306e46592..25c5a8ccd20e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -37,7 +37,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 040b0c89049a..cb880dc317fc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -12,7 +12,7 @@ CFG_DM9000_USE_16BIT
 CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
-CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
+CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CONFIG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
-- 
2.25.1

[PoC 013/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/pxm2.h                 | 2 +-
 include/configs/rut.h                  | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index eafa6ae9a9a0..c6a01270a54d 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -37,7 +37,7 @@
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
-	CONFIG_ENV_SETTINGS_NAND_V1 \
+	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
 	"mmc_root_fs_type=ext4 rootwait\0" \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index ac48372b6c0b..f51771f9ca46 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -34,7 +34,7 @@
 	"splashpos=m,m\0" \
 	"optargs=fixrtc --no-log consoleblank=0 \0" \
 	CONFIG_ENV_SETTINGS_V1 \
-	CONFIG_ENV_SETTINGS_NAND_V1 \
+	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
 	"mmc_root_fs_type=ext4 rootwait\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5a001716fb01..20efa468ac3d 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -201,7 +201,7 @@
 	"kernel_b part 0 8;" \
 	"rootfs partubi 0 10"
 
-#define CONFIG_ENV_SETTINGS_NAND_V1 \
+#define CFG_ENV_SETTINGS_NAND_V1 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"nand_active_ubi_vol_A=rootfs_a\0" \
 	"nand_active_ubi_vol_B=rootfs_b\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cb880dc317fc..25bfb7ee89e7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -13,7 +13,7 @@ CFG_DW_WDT_CLOCK_KHZ
 CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
-CONFIG_ENV_SETTINGS_NAND_V1
+CFG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
-- 
2.25.1

[PoC 014/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 6 +++---
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index d1c7abe1b392..5b0daec11a6a 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -36,6 +36,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index d6c313d18e2a..fea69c7eafae 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -93,8 +93,8 @@
 	"u-boot.env1 mtddev;" \
 	"rootfs mtddevubi" \
 
-#undef CONFIG_ENV_SETTINGS_NAND_V2
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#undef CFG_ENV_SETTINGS_NAND_V2
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
@@ -146,6 +146,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
 #endif	/* ! __CONFIG_ETAMIN_H */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 2e002faf2e60..f3435b2b8c6c 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -46,6 +46,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 20efa468ac3d..b1cd614316d4 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -278,7 +278,7 @@
 	"u-boot.env1 part 0 7;" \
 	"rootfs partubi 0 9" \
 
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 25c5a8ccd20e..960b42dffd0e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -39,6 +39,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 25bfb7ee89e7..e55368c5453c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -14,7 +14,7 @@ CFG_ENV_FLAGS_LIST_STATIC
 CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
-CONFIG_ENV_SETTINGS_NAND_V2
+CFG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
-- 
2.25.1

[PoC 015/241] global: Migrate CONFIG_ENV_SETTINGS_V1 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/pxm2.h                 | 2 +-
 include/configs/rut.h                  | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index c6a01270a54d..48f49906b84e 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -36,7 +36,7 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
-	CONFIG_ENV_SETTINGS_V1 \
+	CFG_ENV_SETTINGS_V1 \
 	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index f51771f9ca46..b07d0c50604d 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -33,7 +33,7 @@
 	"nand_img_size=0x500000\0" \
 	"splashpos=m,m\0" \
 	"optargs=fixrtc --no-log consoleblank=0 \0" \
-	CONFIG_ENV_SETTINGS_V1 \
+	CFG_ENV_SETTINGS_V1 \
 	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index b1cd614316d4..c54b02c5919a 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -234,7 +234,7 @@
 		"${nand_img_size}; bootm ${kloadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#define CONFIG_ENV_SETTINGS_V1 \
+#define CFG_ENV_SETTINGS_V1 \
 		COMMON_ENV_SETTINGS \
 	"net_args=run bootargs_defaults;" \
 		"mtdparts default;" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e55368c5453c..26821890137d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -15,7 +15,7 @@ CFG_ENV_IS_EMBEDDED
 CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
 CFG_ENV_SETTINGS_NAND_V2
-CONFIG_ENV_SETTINGS_V1
+CFG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
-- 
2.25.1

[PoC 016/241] global: Migrate CONFIG_ENV_SETTINGS_V2 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 2 +-
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 scripts/config_whitelist.txt           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 5b0daec11a6a..ab3cf10d7793 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -35,7 +35,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index fea69c7eafae..9011940abe4b 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -145,7 +145,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 #endif	/* CONFIG_SPL_BUILD */
 #endif	/* ! __CONFIG_ETAMIN_H */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index f3435b2b8c6c..59d56d666242 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -45,7 +45,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index c54b02c5919a..2a63b36a536a 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -311,7 +311,7 @@
 		"bootm ${kloadaddr} - ${loadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#define CONFIG_ENV_SETTINGS_V2 \
+#define CFG_ENV_SETTINGS_V2 \
 		COMMON_ENV_SETTINGS \
 	"net_args=run bootargs_defaults;" \
 		"mtdparts default;" \
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 960b42dffd0e..c8b27263e85e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -38,7 +38,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 26821890137d..831f8a99ea5c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -16,7 +16,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
 CFG_ENV_SETTINGS_NAND_V1
 CFG_ENV_SETTINGS_NAND_V2
 CFG_ENV_SETTINGS_V1
-CONFIG_ENV_SETTINGS_V2
+CFG_ENV_SETTINGS_V2
 CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ET1100_BASE
-- 
2.25.1

[PoC 017/241] global: Migrate CONFIG_ENV_SROM_BANK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/smdkc100/smdkc100.c | 6 +++---
 board/samsung/smdkv310/smdkv310.c | 6 +++---
 include/configs/exynos5-common.h  | 2 +-
 include/configs/smdkc100.h        | 2 +-
 include/configs/smdkv310.h        | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index b944e44c1ac4..4f46911b0b4d 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -25,16 +25,16 @@ static void smc9115_pre_init(void)
 	u32 smc_bw_conf, smc_bc_conf;
 
 	/* gpio configuration GPK0CON */
-	gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
+	gpio_cfg_pin(S5PC100_GPIO_K00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
 	/* Ethernet needs bus width of 16 bits */
-	smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
+	smc_bw_conf = SMC_DATA16_WIDTH(CFG_ENV_SROM_BANK);
 	smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe)
 			| SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4)
 			| SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0);
 
 	/* Select and configure the SROMC bank */
-	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index bb61ba1f81c6..47483a26a622 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -24,17 +24,17 @@ static void smc9115_pre_init(void)
 	u32 smc_bw_conf, smc_bc_conf;
 
 	/* gpio configuration GPK0CON */
-	gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
+	gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
 	/* Ethernet needs bus width of 16 bits */
-	smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
+	smc_bw_conf = SROMC_DATA16_WIDTH(CFG_ENV_SROM_BANK);
 	smc_bc_conf = SROMC_BC_TACS(0x0F) | SROMC_BC_TCOS(0x0F)
 			| SROMC_BC_TACC(0x0F) | SROMC_BC_TCOH(0x0F)
 			| SROMC_BC_TAH(0x0F)  | SROMC_BC_TACP(0x0F)
 			| SROMC_BC_PMC(0x0F);
 
 	/* Select and configure the SROMC bank */
-	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index dd322c2b3a79..0490c2dad53e 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -50,7 +50,7 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK		1
+#define CFG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
 /* Enable Time Command */
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index ffa1a1fcb0ef..ccb7ec38d033 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -94,7 +94,7 @@
  * Ethernet Contoller driver
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
+#define CFG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
 #endif /* CONFIG_CMD_NET */
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index af0c8200fc23..1f137dba90f7 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -42,7 +42,7 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK		1
+#define CFG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
 #endif	/* __CONFIG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 831f8a99ea5c..5de121b41ca0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -17,7 +17,7 @@ CFG_ENV_SETTINGS_NAND_V1
 CFG_ENV_SETTINGS_NAND_V2
 CFG_ENV_SETTINGS_V1
 CFG_ENV_SETTINGS_V2
-CONFIG_ENV_SROM_BANK
+CFG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ET1100_BASE
 CONFIG_ETHBASE
-- 
2.25.1

[PoC 018/241] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h | 8 ++++----
 include/configs/kmcent2.h            | 8 ++++----
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index dfa81c037f48..05cdcbfba193 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -172,7 +172,7 @@
  * Environment
  */
 
-#define CONFIG_ENV_TOTAL_SIZE		0x40000
+#define CFG_ENV_TOTAL_SIZE		0x40000
 #define ENV_DEL_ADDR		CONFIG_ENV_ADDR_REDUND  /* direct for newenv */
 
 #ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
@@ -211,11 +211,11 @@
 
 #define CONFIG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"protect on " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 #define CONFIG_HW_ENV_SETTINGS						\
 	"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi,"	\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 527f0383bc65..17eb9a7c2ea0 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -139,7 +139,7 @@
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /* Environment in parallel NOR-Flash */
-#define CONFIG_ENV_TOTAL_SIZE		0x040000
+#define CFG_ENV_TOTAL_SIZE		0x040000
 #define ENV_DEL_ADDR		0xebf00000	/*direct for newenv*/
 
 /*
@@ -430,11 +430,11 @@ int get_scl(void);
 
 #define CONFIG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"protect on " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
 #ifndef CONFIG_KM_DEF_ARCH
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5de121b41ca0..27923ec86bf5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -18,7 +18,7 @@ CFG_ENV_SETTINGS_NAND_V2
 CFG_ENV_SETTINGS_V1
 CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
-CONFIG_ENV_TOTAL_SIZE
+CFG_ENV_TOTAL_SIZE
 CONFIG_ET1100_BASE
 CONFIG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
-- 
2.25.1

[PoC 019/241] global: Migrate CONFIG_ET1100_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/esd/meesc/meesc.c      | 2 +-
 include/configs/meesc.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 21f4ba98b531..9e3621042241 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -163,7 +163,7 @@ int checkboard(void)
 	u_char hw_type;	/* hardware type */
 
 	/* read the "Type" register of the ET1100 controller */
-	hw_type = readb(CONFIG_ET1100_BASE);
+	hw_type = readb(CFG_ET1100_BASE);
 
 	switch (hw_type) {
 	case 0x11:
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index d190e4b50392..38da55c70bfe 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -60,6 +60,6 @@
 #endif
 
 /* hw-controller addresses */
-#define CONFIG_ET1100_BASE		0x70000000
+#define CFG_ET1100_BASE		0x70000000
 
 #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 27923ec86bf5..81353fa94e7c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -19,7 +19,7 @@ CFG_ENV_SETTINGS_V1
 CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
 CFG_ENV_TOTAL_SIZE
-CONFIG_ET1100_BASE
+CFG_ET1100_BASE
 CONFIG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
 CONFIG_FB_ADDR
-- 
2.25.1

[PoC 020/241] global: Migrate CONFIG_ETHBASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/cadence/xtfpga/xtfpga.c | 2 +-
 include/configs/xtfpga.h      | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index f38f5564a06c..8e4081b4c6dd 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -89,7 +89,7 @@ int misc_init_r(void)
 	char *s = env_get("ethaddr");
 	if (s == 0) {
 		unsigned int x;
-		char s[] = __stringify(CONFIG_ETHBASE);
+		char s[] = __stringify(CFG_ETHBASE);
 		x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW)
 			& FPGAREG_MAC_MASK;
 		sprintf(&s[15], "%02x", x);
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 9201dac7abce..6c5a9f566bee 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -136,7 +136,7 @@
 /* Ethernet Driver Info */
 /*======================*/
 
-#define CONFIG_ETHBASE			00:50:C2:13:6f:00
+#define CFG_ETHBASE			00:50:C2:13:6f:00
 #define CFG_SYS_ETHOC_BASE		IOADDR(0x0d030000)
 #define CFG_SYS_ETHOC_BUFFER_ADDR	IOADDR(0x0D800000)
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 81353fa94e7c..99b3796584d0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -20,7 +20,7 @@ CFG_ENV_SETTINGS_V2
 CFG_ENV_SROM_BANK
 CFG_ENV_TOTAL_SIZE
 CFG_ET1100_BASE
-CONFIG_ETHBASE
+CFG_ETHBASE
 CONFIG_EXTRA_ENV_SETTINGS
 CONFIG_FB_ADDR
 CONFIG_FDTADDR
-- 
2.25.1

[PoC 021/241] global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                      |  4 ++--
 doc/README.fsl-ddr                          |  4 ++--
 doc/README.link-local                       |  2 +-
 doc/arch/x86.rst                            |  4 ++--
 doc/develop/devicetree/control.rst          |  2 +-
 doc/develop/distro.rst                      |  2 +-
 doc/usage/environment.rst                   |  2 +-
 env/Kconfig                                 |  4 ++--
 include/configs/M5208EVBE.h                 |  2 +-
 include/configs/M5235EVB.h                  |  2 +-
 include/configs/M5253DEMO.h                 |  2 +-
 include/configs/M5272C3.h                   |  2 +-
 include/configs/M5275EVB.h                  |  2 +-
 include/configs/M5282EVB.h                  |  2 +-
 include/configs/M53017EVB.h                 |  2 +-
 include/configs/M5329EVB.h                  |  2 +-
 include/configs/M5373EVB.h                  |  2 +-
 include/configs/MCR3000.h                   |  2 +-
 include/configs/MPC837XERDB.h               |  2 +-
 include/configs/MPC8548CDS.h                |  2 +-
 include/configs/P1010RDB.h                  |  2 +-
 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/alt.h                       |  2 +-
 include/configs/am335x_evm.h                |  2 +-
 include/configs/am335x_guardian.h           |  2 +-
 include/configs/am335x_igep003x.h           |  2 +-
 include/configs/am335x_shc.h                |  2 +-
 include/configs/am335x_sl50.h               |  2 +-
 include/configs/am3517_evm.h                |  2 +-
 include/configs/am43xx_evm.h                |  2 +-
 include/configs/am62x_evm.h                 |  2 +-
 include/configs/am64x_evm.h                 |  2 +-
 include/configs/am65x_evm.h                 |  2 +-
 include/configs/amcore.h                    |  2 +-
 include/configs/apalis-imx8.h               |  2 +-
 include/configs/apalis_imx6.h               |  2 +-
 include/configs/apple.h                     |  2 +-
 include/configs/arbel.h                     |  2 +-
 include/configs/aristainetos2.h             |  2 +-
 include/configs/astro_mcf5373l.h            |  2 +-
 include/configs/at91sam9263ek.h             |  2 +-
 include/configs/at91sam9n12ek.h             |  2 +-
 include/configs/ax25-ae350.h                |  2 +-
 include/configs/axs10x.h                    |  2 +-
 include/configs/baltos.h                    |  2 +-
 include/configs/bcm_ns3.h                   |  2 +-
 include/configs/bcmstb.h                    |  2 +-
 include/configs/beacon-rzg2m.h              |  4 ++--
 include/configs/bitmain_antminer_s9.h       |  2 +-
 include/configs/bk4r1.h                     |  2 +-
 include/configs/brppt1.h                    |  2 +-
 include/configs/brppt2.h                    |  2 +-
 include/configs/brsmarc1.h                  |  2 +-
 include/configs/brxre1.h                    |  2 +-
 include/configs/capricorn-common.h          |  2 +-
 include/configs/cgtqmx8.h                   |  2 +-
 include/configs/chiliboard.h                |  2 +-
 include/configs/cl-som-imx7.h               |  4 ++--
 include/configs/clearfog.h                  |  2 +-
 include/configs/cm_fx6.h                    |  2 +-
 include/configs/cm_t43.h                    |  2 +-
 include/configs/colibri-imx6ull.h           |  2 +-
 include/configs/colibri-imx8x.h             |  2 +-
 include/configs/colibri_imx6.h              |  2 +-
 include/configs/colibri_imx7.h              |  2 +-
 include/configs/colibri_vf.h                |  2 +-
 include/configs/conga-qeval20-qa3-e3845.h   |  4 ++--
 include/configs/controlcenterdc.h           |  2 +-
 include/configs/crs3xx-98dx3236.h           |  2 +-
 include/configs/da850evm.h                  |  2 +-
 include/configs/dart_6ul.h                  |  2 +-
 include/configs/db-88f6820-amc.h            |  2 +-
 include/configs/db-88f6820-gp.h             |  2 +-
 include/configs/db-xc3-24g4xg.h             |  2 +-
 include/configs/devkit3250.h                |  2 +-
 include/configs/devkit8000.h                |  2 +-
 include/configs/dfi-bt700.h                 |  4 ++--
 include/configs/dh_imx6.h                   |  2 +-
 include/configs/display5.h                  |  2 +-
 include/configs/dns325.h                    |  2 +-
 include/configs/dockstar.h                  |  2 +-
 include/configs/draco.h                     |  2 +-
 include/configs/dragonboard410c.h           |  2 +-
 include/configs/dragonboard820c.h           |  2 +-
 include/configs/dragonboard845c.h           |  2 +-
 include/configs/dreamplug.h                 |  2 +-
 include/configs/ds109.h                     |  2 +-
 include/configs/ds414.h                     |  2 +-
 include/configs/durian.h                    |  2 +-
 include/configs/el6x_common.h               |  2 +-
 include/configs/embestmx6boards.h           |  2 +-
 include/configs/emsdp.h                     |  2 +-
 include/configs/etamin.h                    |  2 +-
 include/configs/evb_ast2500.h               |  2 +-
 include/configs/evb_ast2600.h               |  2 +-
 include/configs/evb_rv1108.h                |  4 ++--
 include/configs/exynos5-common.h            |  2 +-
 include/configs/exynos7420-common.h         |  2 +-
 include/configs/exynos78x0-common.h         |  2 +-
 include/configs/gazerbeam.h                 |  2 +-
 include/configs/ge_b1x5v2.h                 |  2 +-
 include/configs/ge_bx50v3.h                 |  2 +-
 include/configs/goflexhome.h                |  2 +-
 include/configs/gose.h                      |  2 +-
 include/configs/guruplug.h                  |  2 +-
 include/configs/helios4.h                   |  2 +-
 include/configs/highbank.h                  |  2 +-
 include/configs/hikey.h                     |  2 +-
 include/configs/hikey960.h                  |  2 +-
 include/configs/hsdk-4xd.h                  |  2 +-
 include/configs/hsdk.h                      |  2 +-
 include/configs/ib62x0.h                    |  2 +-
 include/configs/iconnect.h                  |  2 +-
 include/configs/imx6-engicam.h              |  2 +-
 include/configs/imx6_logic.h                |  2 +-
 include/configs/imx6dl-mamoj.h              |  2 +-
 include/configs/imx6q-bosch-acc.h           |  2 +-
 include/configs/imx6ulz_smm_m2.h            |  2 +-
 include/configs/imx7-cm.h                   |  4 ++--
 include/configs/imx8mm-cl-iot-gate.h        |  2 +-
 include/configs/imx8mm-mx8menlo.h           |  4 ++--
 include/configs/imx8mm_beacon.h             |  2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h |  2 +-
 include/configs/imx8mm_evk.h                |  2 +-
 include/configs/imx8mm_icore_mx8mm.h        |  2 +-
 include/configs/imx8mm_venice.h             |  2 +-
 include/configs/imx8mn_beacon.h             |  2 +-
 include/configs/imx8mn_bsh_smm_s2.h         |  2 +-
 include/configs/imx8mn_bsh_smm_s2pro.h      |  2 +-
 include/configs/imx8mn_evk.h                |  2 +-
 include/configs/imx8mn_var_som.h            |  2 +-
 include/configs/imx8mn_venice.h             |  2 +-
 include/configs/imx8mp_dhcom_pdk2.h         |  2 +-
 include/configs/imx8mp_evk.h                |  2 +-
 include/configs/imx8mp_icore_mx8mp.h        |  2 +-
 include/configs/imx8mp_rsb3720.h            |  2 +-
 include/configs/imx8mp_venice.h             |  2 +-
 include/configs/imx8mq_cm.h                 |  2 +-
 include/configs/imx8mq_evk.h                |  2 +-
 include/configs/imx8mq_phanbell.h           |  2 +-
 include/configs/imx8qm_mek.h                |  2 +-
 include/configs/imx8qm_rom7720.h            |  2 +-
 include/configs/imx8qxp_mek.h               |  2 +-
 include/configs/imx8ulp_evk.h               |  2 +-
 include/configs/imx93_evk.h                 |  2 +-
 include/configs/imxrt1050-evk.h             |  2 +-
 include/configs/iot2050.h                   |  2 +-
 include/configs/j721e_evm.h                 |  2 +-
 include/configs/j721s2_evm.h                |  2 +-
 include/configs/km/km-mpc83xx.h             |  2 +-
 include/configs/km/pg-wcom-ls102xa.h        |  2 +-
 include/configs/kmcent2.h                   |  2 +-
 include/configs/koelsch.h                   |  2 +-
 include/configs/kontron-sl-mx6ul.h          |  2 +-
 include/configs/kontron-sl-mx8mm.h          |  2 +-
 include/configs/kontron_pitx_imx8m.h        |  2 +-
 include/configs/kontron_sl28.h              |  2 +-
 include/configs/kp_imx53.h                  |  2 +-
 include/configs/kp_imx6q_tpc.h              |  2 +-
 include/configs/lacie_kw.h                  |  2 +-
 include/configs/lager.h                     |  2 +-
 include/configs/legoev3.h                   |  2 +-
 include/configs/librem5.h                   |  2 +-
 include/configs/liteboard.h                 |  2 +-
 include/configs/ls1012a2g5rdb.h             |  4 ++--
 include/configs/ls1012a_common.h            |  2 +-
 include/configs/ls1012afrdm.h               |  4 ++--
 include/configs/ls1012afrwy.h               |  4 ++--
 include/configs/ls1012aqds.h                |  4 ++--
 include/configs/ls1012ardb.h                |  4 ++--
 include/configs/ls1021aiot.h                |  2 +-
 include/configs/ls1021aqds.h                |  4 ++--
 include/configs/ls1021atsn.h                |  2 +-
 include/configs/ls1021atwr.h                |  4 ++--
 include/configs/ls1028aqds.h                |  4 ++--
 include/configs/ls1028ardb.h                |  4 ++--
 include/configs/ls1043a_common.h            |  2 +-
 include/configs/ls1046a_common.h            |  2 +-
 include/configs/ls1088a_common.h            |  2 +-
 include/configs/ls1088aqds.h                | 20 ++++++++++----------
 include/configs/ls1088ardb.h                |  6 +++---
 include/configs/ls2080a_common.h            |  2 +-
 include/configs/ls2080aqds.h                | 10 +++++-----
 include/configs/ls2080ardb.h                |  6 +++---
 include/configs/lsxl.h                      |  2 +-
 include/configs/lx2160aqds.h                |  2 +-
 include/configs/lx2160ardb.h                |  2 +-
 include/configs/lx2162aqds.h                |  2 +-
 include/configs/m53menlo.h                  |  2 +-
 include/configs/mccmon6.h                   |  2 +-
 include/configs/meson64.h                   |  4 ++--
 include/configs/meson64_android.h           |  2 +-
 include/configs/microblaze-generic.h        |  4 ++--
 include/configs/microchip_mpfs_icicle.h     |  2 +-
 include/configs/msc_sm2s_imx8mp.h           |  2 +-
 include/configs/mt7623.h                    |  2 +-
 include/configs/mt8183.h                    |  2 +-
 include/configs/mt8512.h                    |  2 +-
 include/configs/mt8516.h                    |  2 +-
 include/configs/mt8518.h                    |  2 +-
 include/configs/mvebu_alleycat-5.h          |  2 +-
 include/configs/mvebu_armada-37xx.h         |  2 +-
 include/configs/mvebu_armada-8k.h           |  2 +-
 include/configs/mx23_olinuxino.h            |  2 +-
 include/configs/mx23evk.h                   |  2 +-
 include/configs/mx28evk.h                   |  2 +-
 include/configs/mx51evk.h                   |  2 +-
 include/configs/mx53cx9020.h                |  2 +-
 include/configs/mx53loco.h                  |  2 +-
 include/configs/mx53ppd.h                   |  2 +-
 include/configs/mx6cuboxi.h                 |  2 +-
 include/configs/mx6sabre_common.h           |  2 +-
 include/configs/mx6slevk.h                  |  2 +-
 include/configs/mx6sllevk.h                 |  2 +-
 include/configs/mx6sxsabreauto.h            |  2 +-
 include/configs/mx6sxsabresd.h              |  2 +-
 include/configs/mx6ul_14x14_evk.h           |  2 +-
 include/configs/mx6ullevk.h                 |  2 +-
 include/configs/mx7dsabresd.h               |  2 +-
 include/configs/mx7ulp_com.h                |  2 +-
 include/configs/mx7ulp_evk.h                |  2 +-
 include/configs/mys_6ulx.h                  |  2 +-
 include/configs/nas220.h                    |  2 +-
 include/configs/nitrogen6x.h                |  2 +-
 include/configs/nokia_rx51.h                |  2 +-
 include/configs/novena.h                    |  2 +-
 include/configs/npi_imx6ull.h               |  2 +-
 include/configs/nsa310s.h                   |  2 +-
 include/configs/o4-imx6ull-nano.h           |  2 +-
 include/configs/octeontx2_common.h          |  2 +-
 include/configs/octeontx_common.h           |  4 ++--
 include/configs/odroid.h                    |  2 +-
 include/configs/odroid_xu3.h                |  4 ++--
 include/configs/omap3_beagle.h              |  2 +-
 include/configs/omap3_evm.h                 |  2 +-
 include/configs/omap3_igep00x0.h            |  2 +-
 include/configs/omap3_logic.h               |  2 +-
 include/configs/omapl138_lcdk.h             |  2 +-
 include/configs/openpiton-riscv64.h         |  2 +-
 include/configs/openrd.h                    |  2 +-
 include/configs/origen.h                    |  2 +-
 include/configs/p1_p2_rdb_pc.h              |  2 +-
 include/configs/pcl063.h                    |  2 +-
 include/configs/pcl063_ull.h                |  2 +-
 include/configs/pcm052.h                    |  2 +-
 include/configs/pcm058.h                    |  2 +-
 include/configs/pdu001.h                    |  2 +-
 include/configs/phycore_am335x_r2.h         |  2 +-
 include/configs/phycore_imx8mm.h            |  2 +-
 include/configs/phycore_imx8mp.h            |  2 +-
 include/configs/pic32mzdask.h               |  2 +-
 include/configs/pico-imx6.h                 |  2 +-
 include/configs/pico-imx6ul.h               |  2 +-
 include/configs/pico-imx7d.h                |  2 +-
 include/configs/pico-imx8mq.h               |  2 +-
 include/configs/pm9261.h                    |  2 +-
 include/configs/pm9263.h                    |  2 +-
 include/configs/pogo_e02.h                  |  2 +-
 include/configs/pogo_v4.h                   |  2 +-
 include/configs/poleg.h                     |  2 +-
 include/configs/pomelo.h                    |  2 +-
 include/configs/poplar.h                    |  2 +-
 include/configs/porter.h                    |  2 +-
 include/configs/presidio_asic.h             |  2 +-
 include/configs/px30_common.h               |  2 +-
 include/configs/pxm2.h                      |  2 +-
 include/configs/qcs404-evb.h                |  2 +-
 include/configs/qemu-arm.h                  |  2 +-
 include/configs/qemu-riscv.h                |  2 +-
 include/configs/rastaban.h                  |  2 +-
 include/configs/rcar-gen3-common.h          |  2 +-
 include/configs/rk3036_common.h             |  2 +-
 include/configs/rk3066_common.h             |  2 +-
 include/configs/rk3128_common.h             |  2 +-
 include/configs/rk3188_common.h             |  2 +-
 include/configs/rk322x_common.h             |  2 +-
 include/configs/rk3288_common.h             |  2 +-
 include/configs/rk3308_common.h             |  2 +-
 include/configs/rk3328_common.h             |  2 +-
 include/configs/rk3368_common.h             |  2 +-
 include/configs/rk3399_common.h             |  2 +-
 include/configs/rk3568_common.h             |  2 +-
 include/configs/rpi.h                       |  2 +-
 include/configs/rut.h                       |  2 +-
 include/configs/rv1108_common.h             |  2 +-
 include/configs/s5p4418_nanopi2.h           |  2 +-
 include/configs/s5p_goni.h                  |  2 +-
 include/configs/s5pc210_universal.h         |  2 +-
 include/configs/sdm845.h                    |  2 +-
 include/configs/sheevaplug.h                |  2 +-
 include/configs/sifive-unleashed.h          |  2 +-
 include/configs/sifive-unmatched.h          |  2 +-
 include/configs/silk.h                      |  2 +-
 include/configs/sipeed-maix.h               |  4 ++--
 include/configs/slimbootloader.h            |  6 +++---
 include/configs/smartweb.h                  |  2 +-
 include/configs/smdkc100.h                  |  2 +-
 include/configs/smegw01.h                   |  2 +-
 include/configs/snapper9g45.h               |  2 +-
 include/configs/sniper.h                    |  2 +-
 include/configs/socfpga_arria5_secu1.h      |  2 +-
 include/configs/socfpga_chameleonv3.h       |  2 +-
 include/configs/socfpga_common.h            |  4 ++--
 include/configs/socfpga_dbm_soc1.h          |  2 +-
 include/configs/socfpga_mcvevk.h            |  2 +-
 include/configs/socfpga_n5x_socdk.h         |  4 ++--
 include/configs/socfpga_soc64_common.h      |  2 +-
 include/configs/socfpga_vining_fpga.h       |  2 +-
 include/configs/socrates.h                  |  2 +-
 include/configs/somlabs_visionsom_6ull.h    |  2 +-
 include/configs/stemmy.h                    |  2 +-
 include/configs/stih410-b2260.h             |  2 +-
 include/configs/stm32f429-discovery.h       |  2 +-
 include/configs/stm32f429-evaluation.h      |  2 +-
 include/configs/stm32f469-discovery.h       |  2 +-
 include/configs/stm32f746-disco.h           |  2 +-
 include/configs/stm32h743-disco.h           |  2 +-
 include/configs/stm32h743-eval.h            |  2 +-
 include/configs/stm32h750-art-pi.h          |  2 +-
 include/configs/stm32mp13_common.h          |  2 +-
 include/configs/stm32mp15_common.h          |  2 +-
 include/configs/stm32mp15_dh_dhsom.h        |  2 +-
 include/configs/stm32mp15_st_common.h       |  6 +++---
 include/configs/stmark2.h                   |  2 +-
 include/configs/stout.h                     |  2 +-
 include/configs/sunxi-common.h              |  2 +-
 include/configs/synquacer.h                 |  2 +-
 include/configs/syzygy_hub.h                |  2 +-
 include/configs/taurus.h                    |  2 +-
 include/configs/tbs2910.h                   |  2 +-
 include/configs/tegra-common-post.h         |  2 +-
 include/configs/ten64.h                     |  4 ++--
 include/configs/theadorable-x86-common.h    |  4 ++--
 include/configs/theadorable.h               |  2 +-
 include/configs/thuban.h                    |  2 +-
 include/configs/thunderx_88xx.h             |  2 +-
 include/configs/ti814x_evm.h                |  2 +-
 include/configs/ti816x_evm.h                |  2 +-
 include/configs/ti_armv7_keystone2.h        |  2 +-
 include/configs/ti_omap4_common.h           |  2 +-
 include/configs/ti_omap5_common.h           |  2 +-
 include/configs/topic_miami.h               |  4 ++--
 include/configs/total_compute.h             |  2 +-
 include/configs/tqma6.h                     |  2 +-
 include/configs/trats.h                     |  2 +-
 include/configs/trats2.h                    |  2 +-
 include/configs/turris_mox.h                |  2 +-
 include/configs/turris_omnia.h              |  2 +-
 include/configs/udoo.h                      |  2 +-
 include/configs/udoo_neo.h                  |  2 +-
 include/configs/uniphier.h                  |  2 +-
 include/configs/usb_a9263.h                 |  2 +-
 include/configs/usbarmory.h                 |  2 +-
 include/configs/vcoreiii.h                  |  2 +-
 include/configs/verdin-imx8mm.h             |  2 +-
 include/configs/verdin-imx8mp.h             |  2 +-
 include/configs/vexpress_aemv8.h            |  2 +-
 include/configs/vexpress_common.h           |  2 +-
 include/configs/vf610twr.h                  |  2 +-
 include/configs/vinco.h                     |  2 +-
 include/configs/wandboard.h                 |  2 +-
 include/configs/warp7.h                     |  2 +-
 include/configs/x530.h                      |  2 +-
 include/configs/x86-common.h                |  2 +-
 include/configs/xea.h                       |  2 +-
 include/configs/xenguest_arm64.h            |  6 +++---
 include/configs/xilinx_versal.h             |  4 ++--
 include/configs/xilinx_versal_mini.h        |  4 ++--
 include/configs/xilinx_versal_net.h         |  4 ++--
 include/configs/xilinx_versal_net_mini.h    |  4 ++--
 include/configs/xilinx_zynqmp.h             |  8 ++++----
 include/configs/xilinx_zynqmp_mini.h        |  4 ++--
 include/configs/xilinx_zynqmp_r5.h          |  2 +-
 include/configs/xpress.h                    |  2 +-
 include/configs/zynq-common.h               |  4 ++--
 include/configs/zynq_cse.h                  |  2 +-
 include/env_default.h                       |  4 ++--
 scripts/config_whitelist.txt                |  2 +-
 383 files changed, 446 insertions(+), 446 deletions(-)

diff --git a/README b/README
index 71767e32d11b..52545b78a19b 100644
--- a/README
+++ b/README
@@ -1190,7 +1190,7 @@ The following options need to be configured:
 		symbols.
 
 - Default Environment:
-		CONFIG_EXTRA_ENV_SETTINGS
+		CFG_EXTRA_ENV_SETTINGS
 
 		Define this to contain any number of null terminated
 		strings (variable = value pairs) that will be part of
@@ -1199,7 +1199,7 @@ The following options need to be configured:
 		For example, place something like this in your
 		board's config file:
 
-		#define CONFIG_EXTRA_ENV_SETTINGS \
+		#define CFG_EXTRA_ENV_SETTINGS \
 			"myvar1=value1\0" \
 			"myvar2=value2\0"
 
diff --git a/doc/README.fsl-ddr b/doc/README.fsl-ddr
index 10e63f3be1d3..f44bb2aa25d4 100644
--- a/doc/README.fsl-ddr
+++ b/doc/README.fsl-ddr
@@ -56,8 +56,8 @@ Table of 2-way interleaving modes supported in cpu/8xxx/ddr/
 The ways to configure the ddr interleaving mode
 ==============================================
 1. In board header file(e.g.MPC8572DS.h), add default interleaving setting
-   under "CONFIG_EXTRA_ENV_SETTINGS", like:
-	#define CONFIG_EXTRA_ENV_SETTINGS				\
+   under "CFG_EXTRA_ENV_SETTINGS", like:
+	#define CFG_EXTRA_ENV_SETTINGS				\
 	 "hwconfig=fsl_ddr:ctlr_intlv=bank"			\
 	 ......
 
diff --git a/doc/README.link-local b/doc/README.link-local
index 148b4987f27c..ec2ef940e4c8 100644
--- a/doc/README.link-local
+++ b/doc/README.link-local
@@ -51,7 +51,7 @@ by env variables.  It depends on CONFIG_CMD_LINK_LOCAL, CONFIG_CMD_DHCP,
 and CONFIG_BOOTP_MAY_FAIL.
 If both fail or are disabled, static settings are used.
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"ipconfigcmd=if test \\\"$dhcpenabled\\\" -ne 0;"		\
 		"then "							\
 			"dhcpfail=0;dhcp || dhcpfail=1;"		\
diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst
index 634387ac095c..725a1ae58639 100644
--- a/doc/arch/x86.rst
+++ b/doc/arch/x86.rst
@@ -355,8 +355,8 @@ environment variables if you add this to minnowmax.h:
 		"ext2load scsi 0:2 04000000 /boot/initrd.img-3.13.0-58-generic; " \
 		"run boot"
 
-	#undef CONFIG_EXTRA_ENV_SETTINGS
-	#define CONFIG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"
+	#undef CFG_EXTRA_ENV_SETTINGS
+	#define CFG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"
 
 and change CONFIG_BOOTARGS value in configs/minnowmax_defconfig to::
 
diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst
index c71570d64b47..0b3b32be1bb6 100644
--- a/doc/develop/devicetree/control.rst
+++ b/doc/develop/devicetree/control.rst
@@ -135,7 +135,7 @@ control the boot process of Linux with bootm/bootz commands.
 
 To use this, put something like this in your board header file::
 
-   #define CONFIG_EXTRA_ENV_SETTINGS	"fdtcontroladdr=10000\0"
+   #define CFG_EXTRA_ENV_SETTINGS	"fdtcontroladdr=10000\0"
 
 Build:
 
diff --git a/doc/develop/distro.rst b/doc/develop/distro.rst
index bc72aa951ef7..8016acad098a 100644
--- a/doc/develop/distro.rst
+++ b/doc/develop/distro.rst
@@ -214,7 +214,7 @@ Required Environment Variables
 
 The U-Boot "syslinux" and "pxe boot" commands require a number of environment
 variables be set. Default values for these variables are often hard-coded into
-CONFIG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that
+CFG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that
 the user doesn't have to configure them.
 
 fdt_addr:
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst
index 83f210d2d058..2c44e5da6aa0 100644
--- a/doc/usage/environment.rst
+++ b/doc/usage/environment.rst
@@ -89,7 +89,7 @@ Old-style C environment
 
 Traditionally, the default environment is created in `include/env_default.h`,
 and can be augmented by various `CONFIG` defines. See that file for details. In
-particular you can define `CONFIG_EXTRA_ENV_SETTINGS` in your board file
+particular you can define `CFG_EXTRA_ENV_SETTINGS` in your board file
 to add environment variables.
 
 Board maintainers are encouraged to migrate to the text-based environment as it
diff --git a/env/Kconfig b/env/Kconfig
index 4e506ae262b5..5a7e2f299b06 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -19,7 +19,7 @@ config ENV_SOURCE_FILE
 	  If this CONFIG is empty, U-Boot uses CONFIG SYS_BOARD as a default, if
 	  the file board/<vendor>/<board>/<SYS_BOARD>.env exists. Otherwise the
 	  environment is assumed to come from the ad-hoc
-	  CONFIG_EXTRA_ENV_SETTINGS #define
+	  CFG_EXTRA_ENV_SETTINGS #define
 
 config SAVEENV
 	def_bool y if CMD_SAVEENV
@@ -655,7 +655,7 @@ config USE_DEFAULT_ENV_FILE
 	help
 	  Normally, the default environment is automatically generated
 	  based on the settings of various CONFIG_* options, as well
-	  as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option,
+	  as the CFG_EXTRA_ENV_SETTINGS. By selecting this option,
 	  you can instead define the entire default environment in an
 	  external file.
 
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index b360238b332a..ef3837e137c7 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -25,7 +25,7 @@
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5208EVBe"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index ed45eccb62c9..a31d44177362 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -34,7 +34,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5235EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 4be4d0f84512..a1cb1a8a7022 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -28,7 +28,7 @@
 
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 
-#	define CONFIG_EXTRA_ENV_SETTINGS		\
+#	define CFG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
 		"inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0"	\
 		"loadaddr=10000\0"			\
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index a9339e505257..501785ac82e0 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -37,7 +37,7 @@
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5272C3"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index ff9f85358963..951209fbd750 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -42,7 +42,7 @@
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 #endif				/* FEC_ENET */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"uboot=u-boot.bin\0"			\
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index bde9e770e52a..3912aae750d4 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -37,7 +37,7 @@
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5282EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 42b74aeb9b5d..ad27766cf0f4 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -38,7 +38,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M53017"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 72f0c63a1e21..f8aabe4944a4 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -30,7 +30,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5329EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
 	"u-boot=u-boot.bin\0"	\
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 4e8b54e01f4e..228fcde98dc3 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -32,7 +32,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5373EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
 	"u-boot=u-boot.bin\0"	\
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 232cf9e99845..6e7b6e81208f 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -9,7 +9,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"sdram_type=SDRAM\0"						\
 	"flash_type=AM29LV160DB\0"					\
 	"loadaddr=0x400000\0"						\
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 95a90199a429..2a71e0ad4dce 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -231,7 +231,7 @@
 #define CONFIG_UBOOTPATH	"u-boot.bin"
 #define CONFIG_FDTFILE		"mpc8379_rdb.dtb"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"netdev=" CONFIG_NETDEV "\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 780ee5ae865a..515e88cf8206 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -335,7 +335,7 @@
 #define CONFIG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK	 255.255.255.0
 
-#define	CONFIG_EXTRA_ENV_SETTINGS		\
+#define	CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
 	"netdev=eth0\0"				\
 	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b1d6b15811dd..bc24be79366c 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -415,7 +415,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"	\
 	"netdev=eth0\0"						\
 	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 8b901ca47a0c..834400f1d601 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -313,7 +313,7 @@
 
 #define __USB_PHY_TYPE	utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"bank_intlv=cs0_cs1\0"					\
 	"netdev=eth0\0"						\
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 623d4cf5562d..f666683bcc4b 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -439,7 +439,7 @@
 	"fdtfile=t1023rdb/t1023rdb.dtb\0"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	ARCH_EXTRA_ENV_SETTINGS					\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"  \
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index b6938056bbe1..53bd8e85a627 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -431,7 +431,7 @@
 #define FDTFILE		"t1042rdb/t1042d4rdb.dtb"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:bank_intlv=cs0_cs1;"			\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
 	"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index a93e05dd4d2d..5244c9d076f0 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -426,7 +426,7 @@
 
 #define __USB_PHY_TYPE		utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index cf65a0da1883..022d483da763 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -392,7 +392,7 @@
 
 #define __USB_PHY_TYPE		utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index b51762264ade..6cf8b75c86c2 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -382,7 +382,7 @@
 #define CTRL_INTLV_PREFERED cacheline
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
diff --git a/include/configs/alt.h b/include/configs/alt.h
index fe303fda78a0..6d530f6d24bc 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -33,7 +33,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"	\
 	"usb_pgood_delay=2000\0"
 
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 755f7fae3e4f..1f473b5a1500 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -78,7 +78,7 @@
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=undefined\0" \
 	"finduuid=part uuid mmc 0:2 uuid\0" \
diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 7c5e7ce475ef..1de78e5a55dd 100644
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -45,7 +45,7 @@
 	"main_pcba_aux_3=0\0" \
 	"main_pcba_aux_4=0\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AM335XX_BOARD_FDTFILE \
 	MEM_LAYOUT_ENV_SETTINGS \
 	BOOTENV \
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index abd868c14538..e2beaf271859 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -20,7 +20,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"bootdir=/boot\0" \
 	"bootfile=zImage\0" \
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 452887d6995c..c66650c8e8d1 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -23,7 +23,7 @@
 #define CONFIG_HSMMC2_8BIT
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"kloadaddr=0x84000000\0" \
 	"fdtaddr=0x85000000\0" \
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 342a068c855f..f3d3d18c0551 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -30,7 +30,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AM335XX_BOARD_FDTFILE \
 	MEM_LAYOUT_ENV_SETTINGS \
 	BOOTENV
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index c57a0ddc21dd..b75c64838831 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -38,7 +38,7 @@
 #endif /* CONFIG_MTD_RAW_NAND */
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyS2,115200n8\0" \
 	"fdtfile=am3517-evm.dtb\0" \
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 7659c1cc0619..3a6ffd9de0bb 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -66,7 +66,7 @@
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=undefined\0" \
 	"finduuid=part uuid mmc 0:2 uuid\0" \
diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
index 57f3f37908df..809d89119c42 100644
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -55,7 +55,7 @@
 	"partitions=" PARTS_DEFAULT
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	EXTRA_ENV_AM625_BOARD_SETTINGS					\
diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
index 25c71f00a20f..26a7f2521ecc 100644
--- a/include/configs/am64x_evm.h
+++ b/include/configs/am64x_evm.h
@@ -95,7 +95,7 @@
 	DFU_ALT_INFO_OSPI
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	EXTRA_ENV_AM642_BOARD_SETTINGS					\
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 0307426e4aba..33dd6cfdfa45 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -88,7 +88,7 @@
 #endif
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index ee0be972d243..78060d432a86 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -12,7 +12,7 @@
 
 #define CFG_SYS_UART_PORT		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"upgrade_uboot=loady; "					\
 		"protect off 0xffc00000 0xffc1ffff; "		\
 		"erase 0xffc00000 0xffc1ffff; "			\
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index cf23837863be..15bedc0afc29 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -34,7 +34,7 @@
 #define BOOTENV_RUN_NET_USB_START ""
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index a3c86545f077..4899dfb4dee1 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -70,7 +70,7 @@
 	"ramdisk_addr_r=0x18400000\0" \
 	"scriptaddr=0x18280000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
diff --git a/include/configs/apple.h b/include/configs/apple.h
index b06660add4fa..fe7d11bcdb38 100644
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -27,7 +27,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_DEVICE_SETTINGS \
 	BOOTENV
 
diff --git a/include/configs/arbel.h b/include/configs/arbel.h
index 60758b0ca02a..8e27fb52a1c3 100644
--- a/include/configs/arbel.h
+++ b/include/configs/arbel.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	0x8000
 
 /* Default environemnt variables */
-#define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
+#define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
 		"stderr=serial\0"    \
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index e80166b3c467..b09e06ad4d85 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -96,7 +96,7 @@
 	"done\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"disable_giga=yes\0" \
 	"usb_pgood_delay=2000\0" \
 	"nor_bootdelay=-2\0" \
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 62aa99342a0e..8f4419f402f7 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -96,7 +96,7 @@
  * u-boot: 'set' command
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS			\
+#define CFG_EXTRA_ENV_SETTINGS			\
 	"loaderversion=11\0"				\
 	"card_id="__stringify(ASTRO_ID)"\0"			\
 	"alterafile=0\0"				\
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index afdb74785f8a..4101440ff5d5 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -36,7 +36,7 @@
 
 /* Address and size of Primary Environment Sector */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"monitor_base=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
 	"update=" \
 		"protect off ${monitor_base} +${filesize};" \
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 0f9e2cfb582d..c59d4bb38ca8 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_NAND_READY_PIN	GPIO_PIN_PD(5)
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                       \
+#define CFG_EXTRA_ENV_SETTINGS                                       \
 	"console=console=ttyS0,115200\0"                                \
 	"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
 	"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 03e04e6e6805..b743066ea7c3 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -85,7 +85,7 @@
 	func(RAM, ram, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"kernel_addr_r=0x00080000\0" \
 				"pxefile_addr_r=0x01f00000\0" \
 				"scriptaddr=0x01f00000\0" \
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 04dc50b1cb22..a82dfc902948 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -39,7 +39,7 @@
 /*
  * Environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade=if mmc rescan && " \
 		"fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \
 		"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 6f6552e6dc34..e7946389eff3 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -49,7 +49,7 @@
 #define NANDARGS ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"boot_fdt=try\0" \
 	"bootpart=0:2\0" \
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index b5469880fe2f..70dd2802686f 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -795,7 +795,7 @@
 	QSPI_FLASH \
 	FLASH_IMAGES
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ARCH_ENV_SETTINGS
 
 #endif /* __BCM_NS3_H */
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 57360b60ca9c..d1de3561af63 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -131,7 +131,7 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Enable in-place RFS with this initrd_high setting.
  */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"fdtsaveaddr=" __stringify(CONFIG_SYS_FDT_SAVE_ADDRESS) "\0"	\
 	"initrd_high=0xffffffff\0"					\
 	"fdt_high=0xffffffff\0"
diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h
index 2713b158438e..65c01835cc6e 100644
--- a/include/configs/beacon-rzg2m.h
+++ b/include/configs/beacon-rzg2m.h
@@ -8,9 +8,9 @@
 
 #include "rcar-gen3-common.h"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"usb_pgood_delay=2000\0"	\
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h
index 556bfa08ebba..3662668c6a6b 100644
--- a/include/configs/bitmain_antminer_s9.h
+++ b/include/configs/bitmain_antminer_s9.h
@@ -9,7 +9,7 @@
 #define CFG_SYS_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_SIZE	0x40000000
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"pxefile_addr_r=0x2000000\0" \
 	"scriptaddr=0x3000000\0" \
 	"kernel_addr_r=0x2000000\0" \
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 0842a4a8f543..5df8d03c7065 100644
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -57,7 +57,7 @@
 /* boot command, including the target-defined one if any */
 
 /* Extra env settings (including the target-defined ones if any) */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BK4_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 2c5236aa58bb..236d720a55a8 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -67,7 +67,7 @@ MMC_TGTS \
 
 #define LOAD_OFFSET(x)			0x8##x
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
 "verify=no\0" \
 "scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index d35c7c4a591e..7e4e8ee262bf 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -26,7 +26,7 @@
 
 /* Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
 "cfgaddr=0x106F0000\0" \
 "scraddr=0x10700000\0" \
diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h
index f9908352b0dc..ffb4cd3027a1 100644
--- a/include/configs/brsmarc1.h
+++ b/include/configs/brsmarc1.h
@@ -24,7 +24,7 @@
 #define V_SCLK				(V_OSCK)
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 BUR_COMMON_ENV \
 "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 "cfgscr=mw ${dtbaddr} 0;" \
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 410b3e641c5c..9ca6d6f863d1 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -20,7 +20,7 @@
 #define V_SCLK				(V_OSCK)
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 BUR_COMMON_ENV \
 "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 "bootaddr=0x80001100\0" \
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 474ad69d996c..a8273a7fcd8d 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -67,7 +67,7 @@
 	"emmc_dev=0\0"
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	AHAB_ENV \
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 6f3396bad4c8..263981860e86 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -55,7 +55,7 @@
 	"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 1e5154af0a15..850eb892db79 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -25,7 +25,7 @@
 		"nand read ${loadaddr} NAND.kernel; " \
 		"bootz ${loadaddr} - ${fdt_addr}\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"fdt_addr=0x87800000\0" \
 	"boot_fdt=try\0" \
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 5c9004cbd93a..2d56d37f06f8 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -24,9 +24,9 @@
 #define CFG_SYS_I2C_PCA953X_ADDR	0x20
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x20, 16} }
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0" \
 	"loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0" \
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 9c9e9506dc64..062d3d870269 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -110,7 +110,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"console=ttyS0,115200\0" \
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9df8baa8a969..c66cf721870c 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -30,7 +30,7 @@
 
 /* Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr_r=0x18000000\0" \
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index fcc17fc6b7ce..06de4dbeb6d5 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -43,7 +43,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x81200000\0" \
 	"bootm_size=0x8000000\0" \
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index c0c3b4e0359a..a748d4f3169f 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -83,7 +83,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 6002d8d5c9f0..e4bb71d47d62 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -60,7 +60,7 @@
 		"${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AHAB_ENV \
 	BOOTENV \
 	CONFIG_MFG_ENV_SETTINGS \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 60a3862a4d12..0486db6b51ed 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -64,7 +64,7 @@
 	"ramdisk_addr_r=0x18400000\0" \
 	"scriptaddr=0x18280000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 32a79b025545..99ed8183ef21 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -123,7 +123,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MODULE_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index fa778ec9e2b7..122b599a6f21 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -55,7 +55,7 @@
 
 #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 823d37fc38ca..31cfd2b12923 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -19,8 +19,8 @@
 #define VIDEO_IO_OFFSET				0
 #define CONFIG_X86EMU_RAW_IO
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kernel-ver=4.4.0-22\0"					\
 	"boot=zboot 03000000 0 04000000 ${filesize}\0"		\
 	"upd_uboot=tftp 100000 conga/u-boot.rom;"		\
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 5da2778b67be..8b31e14df31a 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -24,7 +24,7 @@
 #define CONFIG_HOSTNAME		"ccdc"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
-#define CONFIG_EXTRA_ENV_SETTINGS						\
+#define CFG_EXTRA_ENV_SETTINGS						\
 	"netdev=eth1\0"						\
 	"consoledev=ttyS1\0"							\
 	"u-boot=u-boot.bin\0"							\
diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h
index 25bcc2a6841c..6535730731a6 100644
--- a/include/configs/crs3xx-98dx3236.h
+++ b/include/configs/crs3xx-98dx3236.h
@@ -13,7 +13,7 @@
 /* Environment in SPI NOR flash */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index a818a4b39f83..cfc8330e35ae 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -145,7 +145,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	"bootpart=0:2\0" \
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 4b31bbf4e11a..323703ac5c90 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -68,7 +68,7 @@
 	"mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"console=ttymxc0,115200n8\0" \
 	"addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index b9d03d253d99..c4ae397e3e68 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -17,7 +17,7 @@
 /* NAND */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index bba2b607aa86..6dbf582d733b 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -18,7 +18,7 @@
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h
index 84ea1baa9979..0ee914e91d08 100644
--- a/include/configs/db-xc3-24g4xg.h
+++ b/include/configs/db-xc3-24g4xg.h
@@ -11,7 +11,7 @@
 /* NAND */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 66aa6d5c3c45..ab10101f20a9 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -67,7 +67,7 @@
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"ethaddr=00:01:90:00:C0:81\0"		\
 	"dtbaddr=0x81000000\0"			\
 	"nfsroot=/opt/projects/images/vladimir/oe/devkit3250/rootfs\0"	\
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index c8b176542d95..7993aa8af176 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -33,7 +33,7 @@
 	DEFAULT_LINUX_BOOT_ENV
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"console=ttyO2,115200n8\0" \
 	"mmcdev=0\0" \
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 52f2d50118a4..1510f8df4378 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -23,8 +23,8 @@
 #define VIDEO_IO_OFFSET				0
 #define CONFIG_X86EMU_RAW_IO
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kernel-ver=4.4.0-24\0"					\
 	"boot=zboot 03000000 0 04000000 ${filesize}\0"		\
 	"upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;"	\
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index f9b3d19480ed..56bb856a6dc2 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -45,7 +45,7 @@
 #endif
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"console=ttymxc0,115200\0"	\
 	"fdt_addr=0x18000000\0"		\
 	"fdt_high=0xffffffff\0"		\
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 7636d2869a9f..f95c1602e676 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -167,7 +167,7 @@
 		"sf write ${loadaddr} 0x0 ${filesize};" \
 	"fi\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS	  \
+#define CFG_EXTRA_ENV_SETTINGS	  \
 	PARTS_DEFAULT \
 	"gpio_recovery=93\0" \
 	"check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 015bc78648f3..2a70db5e9382 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -35,7 +35,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"stdin=serial\0" \
 	"stdout=serial\0" \
 	"stderr=serial\0" \
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 33ae7d654b0b..07cec38b50d0 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -22,7 +22,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0" \
 	"kernel=/boot/uImage\0" \
 	"initrd=/boot/uInitrd\0" \
diff --git a/include/configs/draco.h b/include/configs/draco.h
index ab3cf10d7793..b56ba9132af2 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -28,7 +28,7 @@
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=draco\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index daf7ecd7975b..73aec348458a 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -28,6 +28,6 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index 31cd8536de4b..499708371113 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -26,7 +26,7 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x95000000\0" \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
diff --git a/include/configs/dragonboard845c.h b/include/configs/dragonboard845c.h
index bd88c42a3ba5..c1e590fae2a5 100644
--- a/include/configs/dragonboard845c.h
+++ b/include/configs/dragonboard845c.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x5000000\0"	\
 	"bootm_low=0x80000000\0"	\
 	"bootcmd=bootm $prevbl_initrd_start_addr\0"
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index fbd83d629c02..733020d3e261 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -17,7 +17,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"x_bootcmd_ethernet=ping 192.168.2.1\0"	\
 	"x_bootcmd_usb=usb start\0"	\
 	"x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 8553ea0b95f2..ede21a4e2c57 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -26,7 +26,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"x_bootcmd_ethernet=ping 192.168.1.2\0"	\
 	"x_bootcmd_usb=usb start\0"	\
 	"x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 76d1713fdc68..e69883ba73bc 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -43,7 +43,7 @@
 
 /* Default Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"initrd_high=0xffffffff\0"				\
 	"ramdisk_addr_r=0x8000000\0"				\
 	"usb0Mode=host\0usb1Mode=host\0usb2Mode=device\0"	\
diff --git a/include/configs/durian.h b/include/configs/durian.h
index 001596c00a45..9f11e18d34ad 100644
--- a/include/configs/durian.h
+++ b/include/configs/durian.h
@@ -15,7 +15,7 @@
 
 /* BOOT */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"load_kernel=ext4load scsi 0:1 0x90100000 uImage-2004\0"	\
 	"load_fdt=ext4load scsi 0:1 0x95000000 ft2004-pci-64.dtb\0"\
 	"boot_fdt=bootm 0x90100000 -:- 0x95000000\0"	\
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 89e071c0df66..a5e2dc063a74 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -23,7 +23,7 @@
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                               \
+#define CFG_EXTRA_ENV_SETTINGS                                               \
 	"board=EL6Q\0"								\
 	"cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
 	"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 22e0fa5aabfd..4a929937b416 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -76,7 +76,7 @@
 	CONSOLE_STDIN_SETTINGS \
 	CONSOLE_STDOUT_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdtfile=" CONFIG_FDTFILE "\0" \
diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h
index c2b921e7cb8b..83aaa09cdbb0 100644
--- a/include/configs/emsdp.h
+++ b/include/configs/emsdp.h
@@ -15,7 +15,7 @@
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade_image=u-boot.bin\0" \
 	"upgrade=emsdp rom unlock && " \
 		"fatload mmc 0 ${loadaddr} ${upgrade_image} && " \
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 9011940abe4b..32b45b1e5b8d 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -138,7 +138,7 @@
 #define ETAMIN_NAND_GPMC_CONFIG6	0x16000f80
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=etamin\0" \
 	"ubi_off=4096\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h
index bec1660cf485..f304929263e9 100644
--- a/include/configs/evb_ast2500.h
+++ b/include/configs/evb_ast2500.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_UBOOT_BASE		CONFIG_TEXT_BASE
 
 /* Misc */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	""
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
index c9c988b93740..e1cce58fa933 100644
--- a/include/configs/evb_ast2600.h
+++ b/include/configs/evb_ast2600.h
@@ -14,7 +14,7 @@
 #define STR_HELPER(s)	#s
 #define STR(s)		STR_HELPER(s)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=" STR(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"bootspi=fdt addr 20100000 && fdt header get fitsize totalsize && " \
 	"cp.b 20100000 ${loadaddr} ${fitsize} && bootm; " \
diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h
index 13e3cb2ffeb1..e7d866551a5f 100644
--- a/include/configs/evb_rv1108.h
+++ b/include/configs/evb_rv1108.h
@@ -11,8 +11,8 @@
 /*
  * Default environment settings
  */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS                                       \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS                                       \
 	"netdev=eth0\0"                                                 \
 	"ipaddr=172.16.12.50\0"                                         \
 	"serverip=172.16.12.69\0"					\
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 0490c2dad53e..860fd1601a66 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -94,7 +94,7 @@
 #define EXYNOS_FDTFILE_SETTING
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index cff910c1bd5b..c8408eb39200 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -67,7 +67,7 @@
 #define EXYNOS_FDTFILE_SETTING
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS
diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h
index 8672b9e95270..92c84cd8ce05 100644
--- a/include/configs/exynos78x0-common.h
+++ b/include/configs/exynos78x0-common.h
@@ -74,7 +74,7 @@
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXTRA_ENV_SETTINGS
 
 #endif	/* __CONFIG_EXYNOS78x0_COMMON_H */
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 36dcee87c5fb..7ab504f35531 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -59,7 +59,7 @@
 #define CONFIG_HOSTNAME		"gazerbeam"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consoledev=ttyS1\0"						\
 	"u-boot=u-boot.bin\0"						\
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 1458b187de28..9dc1d7394afd 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -36,7 +36,7 @@
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Command definition */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=/boot/fitImage\0" \
 	"fdt_addr_r=0x18000000\0" \
 	"splash_addr_r=0x20000000\0" \
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index f62b8f175e1f..32960fb93256 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -41,7 +41,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	NETWORKBOOT \
 	"image=/boot/fitImage\0" \
 	"dev=mmc\0" \
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 66eed9e14f81..bc517286b113 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -31,7 +31,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0" \
 	"kernel=/boot/uImage\0" \
 	"bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
diff --git a/include/configs/gose.h b/include/configs/gose.h
index d1fe375a2c1f..45f0ec6f6a0e 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -29,7 +29,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __GOSE_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 4954c5ca0800..c4f53e6e4004 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -23,7 +23,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"				\
 	"mtdids=nand0=orion_nand\0"					\
 	"kernel=/boot/zImage\0"						\
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index fc32487e1c7b..7d81d1cf1e4c 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -110,7 +110,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 4aef0b4abd12..76e6054b0cc1 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -16,7 +16,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x00000000
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_high=0x20000000\0"					\
 	"initrd_high=0x20000000\0"
 
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index d4280decc9f0..36bf22b1870e 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -42,7 +42,7 @@
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"kernel_name=Image\0"	\
 				"kernel_addr_r=0x00080000\0" \
 				"fdtfile=hi6220-hikey.dtb\0" \
diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h
index fad1f980481e..40d5e653c3f1 100644
--- a/include/configs/hikey960.h
+++ b/include/configs/hikey960.h
@@ -28,7 +28,7 @@
 	func(MMC, mmc, 0)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"image=Image\0"	\
 				"fdtfile=hi3660-hikey960.dtb\0" \
 				"fdt_addr_r=0x10000000\0" \
diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h
index 59ea8960071a..f59da4177316 100644
--- a/include/configs/hsdk-4xd.h
+++ b/include/configs/hsdk-4xd.h
@@ -37,7 +37,7 @@
 /*
  * Environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade=if mmc rescan && " \
 		"fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \
 		"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index fbfcded47123..2177fafcdc06 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -36,7 +36,7 @@
 /*
  * Environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade=if mmc rescan && " \
 		"fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \
 		"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 05192218d225..242f92e6fd72 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -18,7 +18,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"				\
 	"kernel=/boot/zImage\0"						\
 	"fdt=/boot/ib62x0.dtb\0"					\
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index f2e3608d3a3f..f719ecb5fe0b 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -11,7 +11,7 @@
 
 #include "mv-common.h"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"	\
 	"kernel=/boot/uImage\0"			\
 	"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 36b6b95b84de..4208ba95915e 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -24,7 +24,7 @@
 #endif
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 4e23f1a2dc5d..0df61916b7d2 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -21,7 +21,7 @@
 /* Ethernet Configs */
 #define CONFIG_FEC_MXC_PHYADDR         0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"bootm_size=0x10000000\0" \
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 402f83c18eae..b6006c021d5c 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -20,7 +20,7 @@
 /* Environment in MMC */
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x14000000\0"	\
 	"fdt_addr_r=0x13000000\0"	\
 	"kernel_addr_r=0x10008000\0"	\
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 392f97050a65..e28185f24dd3 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -72,7 +72,7 @@
 #endif
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootconf=conf-imx6q-bosch-acc.dtb\0"\
 	"mmcfit_name=fitImage\0" \
 	"mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \
diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h
index 2d9d3c34b0db..c95038eaa537 100644
--- a/include/configs/imx6ulz_smm_m2.h
+++ b/include/configs/imx6ulz_smm_m2.h
@@ -54,7 +54,7 @@
 	#devtypel #instance " "
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	NANDARGS \
 	BOOTENV
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 76771fd66ce9..438e79df3cc1 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -12,7 +12,7 @@
 
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 /*
  * Use:
@@ -22,7 +22,7 @@
  */
 #define MY_CONFIG_BOOT_MODE	"boot-mode=sd\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MY_CONFIG_BOOT_MODE \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index c228cf7f37ba..00ce7fb62a93 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -63,7 +63,7 @@
 	BOOT_TARGET_DHCP(func)
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h
index 938c5406b821..a86bd76a3c72 100644
--- a/include/configs/imx8mm-mx8menlo.h
+++ b/include/configs/imx8mm-mx8menlo.h
@@ -9,8 +9,8 @@
 #include <configs/verdin-imx8mm.h>
 
 /* Custom initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS					\
 	BOOTENV								\
 	MEM_LAYOUT_ENV_SETTINGS						\
 	"devtype=mmc\0"							\
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 03325e6c3a7a..ee524f0e63f2 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -20,7 +20,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"console=ttymxc1,115200\0" \
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 80321cf2d8d3..44d74bb1a788 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -34,7 +34,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"altbootcmd=setenv devpart 2 && run bootcmd ; reset\0"		\
 	"bootlimit=3\0"							\
 	"devtype=mmc\0"							\
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 8a694c88a53a..d28f3f1972b9 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -37,7 +37,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 41ab9307793f..e718daa07c3e 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -30,7 +30,7 @@
 	"ramdisk_addr_r=0x46400000\0" \
 	"scriptaddr=0x46000000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"console=ttymxc1,115200\0" \
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 28ce834769c3..c490e3829f9a 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -25,7 +25,7 @@
 	func(USB, usb, 1) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"splblk=0x42\0" \
 	BOOTENV
 
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 85fd5e2371f9..bb3dfe3fa0d2 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -13,7 +13,7 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"ramdiskimage=rootfs.cpio.uboot\0" \
diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h
index a768ff355109..e97b8e871d22 100644
--- a/include/configs/imx8mn_bsh_smm_s2.h
+++ b/include/configs/imx8mn_bsh_smm_s2.h
@@ -35,7 +35,7 @@
 	#devtypel #instance " "
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	NANDARGS \
 	BOOTENV
diff --git a/include/configs/imx8mn_bsh_smm_s2pro.h b/include/configs/imx8mn_bsh_smm_s2pro.h
index 035e5c7bd90f..8619fdde7fdb 100644
--- a/include/configs/imx8mn_bsh_smm_s2pro.h
+++ b/include/configs/imx8mn_bsh_smm_s2pro.h
@@ -22,7 +22,7 @@
 	"emmc_ack=1\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	EMMCARGS \
 	BOOTENV
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 024b86c7f1d0..b759b834b808 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -32,7 +32,7 @@
 	"scriptaddr=0x40000000\0" \
 	"pxefile_addr_r=0x40100000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"image=Image\0" \
 	BOOTENV \
 	"console=ttymxc1,115200\0" \
diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
index 4633843d1bbb..205337948cfc 100644
--- a/include/configs/imx8mn_var_som.h
+++ b/include/configs/imx8mn_var_som.h
@@ -37,7 +37,7 @@
 	"pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	BOOTENV
 
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index a585cbf87e44..80c2df9f30ff 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -19,7 +19,7 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"splblk=0x40\0" \
 	BOOTENV
 
diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h
index 5443022b04c7..b8fdedefa21f 100644
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"altbootcmd=run bootcmd ; reset\0"				\
 	"bootlimit=3\0"							\
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"		\
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 738677ff37cd..63ea25d9788b 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -34,7 +34,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h
index d67bad8971dd..8fac898403f1 100644
--- a/include/configs/imx8mp_icore_mx8mp.h
+++ b/include/configs/imx8mp_icore_mx8mp.h
@@ -36,7 +36,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 58f7dc6518c1..ed4da0e69b5b 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -71,7 +71,7 @@
 	BOOT_TARGET_DHCP(func)
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h
index e79aa5707537..4b32d5a77ef6 100644
--- a/include/configs/imx8mp_venice.h
+++ b/include/configs/imx8mp_venice.h
@@ -19,7 +19,7 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"splblk=0x40\0" \
 	BOOTENV
 
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 4df98e3f3735..f6f356d27ba2 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -30,7 +30,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=0x43500000\0" \
 	"kernel_addr_r=0x40880000\0" \
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 688c0bf70080..c40448715f8a 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -35,7 +35,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 3b4cd6562235..8fed3e31964c 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -29,7 +29,7 @@
 	"initrd_high=0xffffffff\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index f1f907f3e5a4..7772e71013ef 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -23,7 +23,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	AHAB_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 2e2e5ed43cde..5692e3d00007 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -47,7 +47,7 @@
 	"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index d75b8bf0c18f..669da591fa2b 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -23,7 +23,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	AHAB_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index d313bdc2a448..30dd5af03b00 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -34,7 +34,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h
index 895c50f60253..5cd6492dd503 100644
--- a/include/configs/imx93_evk.h
+++ b/include/configs/imx93_evk.h
@@ -28,7 +28,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=0x83500000\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h
index 84228676c7fd..7688464841eb 100644
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@@ -19,7 +19,7 @@
 					 DMAMEM_SZ_ALL)
 
 #ifdef CONFIG_VIDEO
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 		"stdin=serial\0" \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h
index 0f6150fc9c7e..7d087413362c 100644
--- a/include/configs/iot2050.h
+++ b/include/configs/iot2050.h
@@ -40,7 +40,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	BOOTENV								\
 	EXTRA_ENV_IOT2050_BOARD_SETTINGS
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index e66f994a375f..a7210b5cf3ae 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -170,7 +170,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
index ab204c62b7d6..54dfea6952e9 100644
--- a/include/configs/j721s2_evm.h
+++ b/include/configs/j721s2_evm.h
@@ -127,7 +127,7 @@
 	DFU_ALT_INFO_OSPI
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 840a4d5401f5..227c45f0634a 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -82,7 +82,7 @@
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONFIG_KM_DEF_ENV						 \
 	CONFIG_KM_DEF_ARCH						 \
 	"newenv="							 \
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 05cdcbfba193..a67301b9ecd6 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -222,7 +222,7 @@
 			"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6,"	\
 			"asrc,spdif,lpuart1,ftm1\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_HW_ENV_SETTINGS						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 17eb9a7c2ea0..639f2075e69f 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -441,7 +441,7 @@ int get_scl(void);
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 736865ad80af..61ff80d2c983 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -29,7 +29,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 6fcacdb0c664..81ca83fdbfab 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -46,6 +46,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX6UL_CONFIG_H */
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 80a32304606a..2e21aacd1893 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -50,6 +50,6 @@
 #define CONFIG_MALLOC_F_ADDR		0x930000
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 17c63d834107..d909bbbbcfda 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -50,7 +50,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"image=Image\0" \
 	"console=ttymxc2,115200\0" \
 	"boot_fdt=try\0" \
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 9c3174d0e02c..218e9d9b3013 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -65,7 +65,7 @@
 	func(PXE, pxe, 0)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"env_addr=0x203e0004\0" \
 	"envload=env import -d -b ${env_addr}\0" \
 	"install_rcw=source 20200000\0" \
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index c551585a2062..da8a67b4ab63 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -16,7 +16,7 @@
 
 /* Command definition */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1,115200\0"	\
 	"fdt_addr=0x75000000\0"		\
 	"fdt_high=0xffffffff\0"		\
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 136e228682a6..99321b320f5f 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -22,7 +22,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"console=ttymxc0,115200\0"	\
 	"fdt_addr=0x18000000\0"		\
 	"fdt_high=0xffffffff\0"		\
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 828f91096344..db45585ba313 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -51,7 +51,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"stdin=serial\0"					\
 	"stdout=serial\0"					\
 	"stderr=serial\0"					\
diff --git a/include/configs/lager.h b/include/configs/lager.h
index f3feaa539fcc..777d5b94d1cd 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -30,7 +30,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index abe470fe890b..b9ec7f379354 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -49,7 +49,7 @@
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
 #define CONFIG_SETUP_INITRD_TAG
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
 	"fdtfile=da850-lego-ev3.dtb\0" \
 	"memsize=64M\0" \
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 11b3fa6c857d..1818a57e49c5 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -64,7 +64,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"scriptaddr=0x80000000\0" \
 	"pxefile_addr_r=0x80100000\0" \
 	"kernel_addr_r=0x80800000\0" \
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 721da818633a..938ab5ade9a7 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index f0a9e9ab3155..d1e0ed5817e9 100644
--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -11,8 +11,8 @@
 /* DDR */
 #define CFG_SYS_SDRAM_SIZE		0x40000000
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"initrd_high=0xffffffffffffffff\0"	\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 9e4f949016ef..a5f680db2d37 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -34,7 +34,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index c19ed2f43ecf..4243a21f1f18 100644
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -16,8 +16,8 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(USB, usb, 0)
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index 1b417c72e704..872296749c0a 100644
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -25,8 +25,8 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"initrd_high=0xffffffffffffffff\0"	\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 495bb3911b3a..35e8ff057986 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -55,8 +55,8 @@
 #define I2C_VOL_MONITOR_BUS_V_OVF      0x1
 #define I2C_VOL_MONITOR_BUS_V_SHIFT    3
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"kernel_addr=0x01000000\0"		\
 	"kernelheader_addr=0x600000\0"		\
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index d74936d1281d..1e843f896c7e 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -36,8 +36,8 @@
 #define __PHY_ETH2_MASK		0xFB
 #define __PHY_ETH1_MASK		0xFD
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"initrd_high=0xffffffffffffffff\0"	\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 024a71852753..0a08619384b6 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -94,7 +94,7 @@
 
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 "initrd_high=0xffffffff\0"
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 5a91cc3efec0..3bfb014adf11 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -279,12 +279,12 @@
 #define HWCONFIG_BUFFER_SIZE		256
 
 #ifdef CONFIG_LPUART
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
 	"initrd_high=0xffffffff\0"      \
 	"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 	"initrd_high=0xffffffff\0"      \
 	"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 5612c60ae904..d4855819bd7f 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -75,7 +75,7 @@
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0"		\
 	"initrd_high=0xffffffff\0"					\
 	"kernel_addr=0x61000000\0"					\
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 3c4c207edd06..8a36620bf3ab 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -166,7 +166,7 @@
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_LPUART
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200 "	\
 		"cma=64M@0x0-0xb0000000\0" \
 	"initrd_high=0xffffffff\0"      \
@@ -222,7 +222,7 @@
 		"cp.b $kernel_addr $load_addr "		\
 		"$kernel_size && bootm $load_addr#$board\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200 "	\
 		"cma=64M@0x0-0xb0000000\0" \
 	"initrd_high=0xffffffff\0"      \
diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h
index 228fb122f5f3..769ece901c19 100644
--- a/include/configs/ls1028aqds.h
+++ b/include/configs/ls1028aqds.h
@@ -61,8 +61,8 @@
 /* SATA */
 
 #ifndef SPL_NO_ENV
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"board=ls1028aqds\0" \
 	"hwconfig=fsl_ddr:bank_intlv=auto\0" \
 	"ramdisk_addr=0x800000\0" \
diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 5c134612576c..8c53636beac3 100644
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -56,8 +56,8 @@
 
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"board=ls1028ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index a3fa92d1ff47..e259cf810c0a 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -120,7 +120,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"initrd_high=0xffffffffffffffff\0"	\
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 4ed5481c3e74..e566ad4eed33 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -98,7 +98,7 @@
 #endif
 #ifndef SPL_NO_MISC
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 57429d4bbe32..e229ba2eea64 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -118,7 +118,7 @@ unsigned long long get_qixis_addr(void);
 
 #ifndef SPL_NO_ENV
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index a35045d640ff..a34a71f649f6 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -297,8 +297,8 @@
 
 /* Initial environment variables */
 #ifdef CONFIG_NXP_ESBC
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -329,8 +329,8 @@
 #define IFC_MC_INIT_CMD				\
 	"fsl_mc start mc 0x580A00000 0x580E00000\0"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -391,8 +391,8 @@
 		"$kernel_size && bootm $kernel_load#$BOARD\0"
 #else
 #if defined(CONFIG_QSPI_BOOT)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -409,8 +409,8 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"	\
 	"mcmemsize=0x70000000 \0"
 #elif defined(CONFIG_SD_BOOT)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS               \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS               \
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x90100000\0"                 \
@@ -427,8 +427,8 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else	/* NOR BOOT */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 7bc4fc6a6652..bd543a37e879 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -238,9 +238,9 @@
 #endif
 #endif /* CONFIG_TFABOOT */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
@@ -308,7 +308,7 @@
 		" && esbc_validate ${kernelheader_addr_r};"	\
 		"bootm $load_addr#$BOARD\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index e82456fd8148..631392cb8dd2 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -110,7 +110,7 @@ unsigned long long get_qixis_addr(void);
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 924d4057d936..12b5af1b4f2f 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -230,9 +230,9 @@
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
@@ -257,7 +257,7 @@
 #define IFC_MC_INIT_CMD				\
 	"fsl_mc start mc 0x580a00000" \
 	" 0x580e00000 \0"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x80100000\0"                 \
 	"loadaddr_sd=0x90100000\0"                 \
@@ -313,7 +313,7 @@
 	"$kernel_addr_sd $kernel_size_sd && "	\
 	"bootm $load_addr#$BOARD\0"
 #elif defined(CONFIG_SD_BOOT)
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x90100000\0"                 \
 	"kernel_addr=0x800\0"                \
@@ -329,7 +329,7 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index c50b6030680c..1259df8f3a9a 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -279,9 +279,9 @@
 #endif
 
 /* Initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
@@ -343,7 +343,7 @@
 		"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\
 		"bootm $load_addr#$board\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index c82eb8b04bf8..47d7ec57b80a 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -22,7 +22,7 @@
 /*
  * Default environment variables
  */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootsource=legacy\0"						\
 	"hdpart=0:1\0"							\
 	"kernel_addr_r=0x00800000\0"					\
diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h
index 9f891064bd5d..3a316e73308f 100644
--- a/include/configs/lx2160aqds.h
+++ b/include/configs/lx2160aqds.h
@@ -14,7 +14,7 @@
 /* MAC/PHY configuration */
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	EXTRA_ENV_SETTINGS			\
 	"boot_scripts=lx2160aqds_boot.scr\0"	\
 	"boot_script_hdr=hdr_lx2160aqds_bs.out\0"	\
diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h
index 58c0ff36571e..8cc4e0db03f0 100644
--- a/include/configs/lx2160ardb.h
+++ b/include/configs/lx2160ardb.h
@@ -18,7 +18,7 @@
 #define I2C_EMC2305_PWM		0x80
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	EXTRA_ENV_SETTINGS			\
 	"boot_scripts=lx2160ardb_boot.scr\0"	\
 	"boot_script_hdr=hdr_lx2160ardb_bs.out\0"	\
diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h
index 157688ef7d7a..54d7cea4c599 100644
--- a/include/configs/lx2162aqds.h
+++ b/include/configs/lx2162aqds.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_RTC_BUS_NUM		0
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	EXTRA_ENV_SETTINGS			\
 	"boot_scripts=lx2162aqds_boot.scr\0"	\
 	"boot_script_hdr=hdr_lx2162aqds_bs.out\0"	\
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 66591390d903..9c37212463e1 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -86,7 +86,7 @@
  */
 #define CONFIG_HOSTNAME		"m53menlo"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 7c401a2cfd6c..7ea682049261 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -34,7 +34,7 @@
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC_PHYADDR		1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200 quiet\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index f06fe73485fb..e2800df87869 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -76,8 +76,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"stdin=" STDIN_CFG "\0" \
 	"stdout=" STDOUT_CFG "\0" \
 	"stderr=" STDOUT_CFG "\0" \
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 1266851196d2..c0e977abb01f 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -279,7 +279,7 @@
 		"fi;" \
 	"fi;"
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                     \
+#define CFG_EXTRA_ENV_SETTINGS                                     \
 	EXTRA_ANDROID_ENV_SETTINGS                                    \
 	"partitions=" PARTS_DEFAULT "\0"                              \
 	"mmcdev=2\0"                                                  \
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index edd2466caa98..ede4ffd53f4e 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -78,8 +78,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"unlock=yes\0"\
 	"nor0=flash-0\0"\
 	"mtdparts=mtdparts=flash-0:"\
diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index 3def93d61e8a..0350f7a62da7 100644
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -21,7 +21,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"kernel_addr_r=0x84000000\0" \
 	"fdt_addr_r=0x88000000\0" \
diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index cfe926c0a141..ef2111cd20ab 100644
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -30,7 +30,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 39a7ba76633b..031c1aea0c00 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -44,7 +44,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	ENV_MEM_LAYOUT_SETTINGS		\
 	BOOTENV
 
diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h
index 3da7619d78d7..1f973829bba4 100644
--- a/include/configs/mt8183.h
+++ b/include/configs/mt8183.h
@@ -21,7 +21,7 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"scriptaddr=0x40000000\0" \
 	BOOTENV
 
diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h
index 3a35527da10d..c0fc8688ca67 100644
--- a/include/configs/mt8512.h
+++ b/include/configs/mt8512.h
@@ -26,7 +26,7 @@
 #define ENV_BOOT_CMD \
 	"mtk_boot=run boot_rd_img;bootm;\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x6c000000\0" \
 	ENV_DEVICE_SETTINGS \
 	ENV_BOOT_READ_IMAGE \
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h
index 0f7981a56611..73776e3705b7 100644
--- a/include/configs/mt8516.h
+++ b/include/configs/mt8516.h
@@ -21,7 +21,7 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"scriptaddr=0x40000000\0" \
 	BOOTENV
 
diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 8a8bc85ca70e..d6bd1a103866 100644
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -33,7 +33,7 @@
 	"serial#=1234567890ABCDEF\0" \
 	"board=mt8518\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x6c000000\0" \
 	ENV_DEVICE_SETTINGS \
 	ENV_BOOT_READ_IMAGE \
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 5c9620371e3c..c8c0fc671ab0 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -27,7 +27,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS   \
+#define CFG_EXTRA_ENV_SETTINGS   \
 	BOOTENV \
 	"kernel_addr_r=0x202000000\0" \
 	"fdt_addr_r=0x201000000\0"    \
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 9bfc48c52d90..76e148f55ebf 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -89,7 +89,7 @@
 	""
 
 /* fdt_addr and kernel_addr are needed for existing distribution boot scripts */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x6d00000\0"	\
 	"pxefile_addr_r=0x6e00000\0"	\
 	"fdt_addr=0x6f00000\0"		\
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index beac3ae6496d..239a09763ae1 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -41,7 +41,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x6d00000\0"	\
 	"pxefile_addr_r=0x6e00000\0"	\
 	"fdt_addr_r=0x6f00000\0"	\
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index aa3d7a1a3fc8..e769ba2e8377 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -19,7 +19,7 @@
 /* Ethernet */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"update_sd_firmware_filename=u-boot.sd\0" \
 	"update_sd_firmware="		/* Update the SD firmware partition */ \
 		"if mmc rescan ; then "	\
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index f597cdb30563..5ceba8b15fa4 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Extra Environments */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"update_sd_firmware_filename=u-boot.sd\0" \
 	"update_sd_firmware="		/* Update the SD firmware partition */ \
 		"if mmc rescan ; then "	\
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index c740d8533274..f9f65f6968e1 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -18,7 +18,7 @@
 /* UBI and NAND partitioning */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"ubifs_file=filesystem.ubifs\0" \
 	"update_nand_full_filename=u-boot.nand\0" \
 	"update_nand_firmware_filename=u-boot.sb\0"	\
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ddd37b3936ff..8ab1ee79a79c 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -39,7 +39,7 @@
 
 /* Framebuffer and LCD */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"fdt_file=imx51-babbage.dtb\0" \
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index cd806cb698e9..baffe65c3697 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -37,7 +37,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_addr_r=0x75000000\0" \
 	"pxefile_addr_r=0x73000000\0" \
 	"scriptaddr=0x74000000\0" \
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d0107fcc8cb1..0ac93d6e0432 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -27,7 +27,7 @@
 
 /* Command definition */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"fdt_addr=0x71000000\0" \
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 9464d6e44aea..94d2191af91d 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -35,7 +35,7 @@
 	"nfs=run choose_ip setargs bootargs_nfs; ${getcmd} ${loadaddr} " \
 		"${nfsserver}:${image}; bootm ${loadaddr}\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	PPD_CONFIG_NFS \
 	"image=/boot/fitImage\0" \
 	"dev=mmc\0" \
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index f7f209c20b59..d4af96b51ea4 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"som_rev=undefined\0" \
 	"has_emmc=undefined\0" \
 	"fdtfile=undefined\0" \
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 6294fd1e2c42..e1cdedf27680 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -35,7 +35,7 @@
 #define EMMC_ENV ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"fdtfile=undefined\0" \
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 358d9f47c0f3..4fbd06783a6d 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -15,7 +15,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 8731f6a3e4ad..cf4871cbae39 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -12,7 +12,7 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"epdc_waveform=epdc_splash.bin\0" \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 0dd40563c29b..9d8737c19425 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -12,7 +12,7 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 6f5dffe4fbb8..8372f979dc86 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -34,7 +34,7 @@
 #define UPDATE_M4_ENV ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index cb1019bd56a7..90c788468710 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -30,7 +30,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 0e986093f35a..4a27fd22902b 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -24,7 +24,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 377e4d9c4b27..183e67857ca1 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -50,7 +50,7 @@
 		"bootimg part 0 1;"\
 		"rootfs part 0 2\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 85922fa436cb..5ee5129801d2 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -28,7 +28,7 @@
 #define PHYS_SDRAM			0x60000000
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"console=ttyLP0\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 99e01896c71b..5f4cd9306231 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -28,7 +28,7 @@
 #define PHYS_SDRAM_SIZE			SZ_1G
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttyLP0\0" \
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index a32fcd57f8fc..43261824d3cf 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -33,7 +33,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"fdt_addr_r=0x82000000\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 1b7eb3433483..9676ccc982f5 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -35,7 +35,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootargs=console=ttyS0,115200\0" \
 	"autostart=no\0"
 
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 5020b3bb71db..e1689679e5f6 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -66,7 +66,7 @@
 #include <config_distro_bootcmd.h>
 #include <linux/stringify.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 04bff3ca4f67..96c23b5b5af7 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -58,7 +58,7 @@
 #define CFG_SYS_ONENAND_BASE		ONENAND_MAP
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"usbtty=cdc_acm\0" \
 	"stdin=usbtty,serial,keyboard\0" \
 	"stdout=usbtty,serial,vidconsole\0" \
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 4e46dfc526ce..19b40070be92 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -64,7 +64,7 @@
 #endif
 
 /* Extra U-Boot environment. */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"fdt_high=0xffffffff\0"						\
 	"initrd_high=0xffffffff\0"					\
 	"consdev=ttymxc1\0"						\
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 09c4ddb6646b..07580f409492 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -40,7 +40,7 @@
 
 #define CONFIG_FEC_ENET_DEV		1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"image=zImage\0" \
 	"fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 62f07011809c..76c4aed6fd91 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -36,7 +36,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0" \
 	"kernel=/boot/zImage\0" \
 	"fdt=/boot/nsa310s.dtb\0" \
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index ea1edab9fc12..0e1083a2130c 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -15,7 +15,7 @@
 #	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
 	"mmcargs=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcpart} console=ttymxc0,${baudrate} panic=30\0" \
diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index 03d1a8e7b5fc..c4db38562d83 100644
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -15,7 +15,7 @@
 /** Stack starting address */
 
 /** Extra environment settings */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 					"loadaddr=20080000\0"	\
 					"ethrotate=yes\0"
 
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 58275ccffa01..0be26ef3287f 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -17,7 +17,7 @@
 
 #include <config_distro_bootcmd.h>
 /* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"loadaddr=0x20080000\0"		\
 	"kernel_addr_r=0x02000000\0"	\
 	"ramdisk_addr_r=0x03000000\0"	\
@@ -27,7 +27,7 @@
 #else
 
 /** Extra environment settings */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"loadaddr=20080000\0"		\
 	"autoload=0\0"
 
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index e2331e45cdfe..3ac13a65d63f 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -71,7 +71,7 @@
  * 1.  BOOT:  100MiB 2MiB
  * 2.  ROOT:  -
 */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
 		"boot.scr\0" \
 	"loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} " \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 7a81585494a9..a1542f3f8025 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -68,8 +68,8 @@
  */
 
 /* Define new extra env settings, including DFU settings */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index f4e23bbb0f30..efeb7bf10078 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -73,7 +73,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 8bb8521f1c1c..adb25a62970c 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -69,7 +69,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index a6b5e55b5415..93d36353ffb0 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -59,7 +59,7 @@
 		"if test ${fdtfile} = ''; then " \
 			"echo WARNING: Could not determine device tree to use; fi; \0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_FINDFDT \
 	ENV_DEVICE_SETTINGS \
 	MEM_LAYOUT_SETTINGS \
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 389553775100..957f1c369e6d 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -30,7 +30,7 @@
 
 /* Environment information */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"mmcdev=0\0" \
 	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 788a1113868b..02b88da28efa 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -138,7 +138,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	"bootpart=0:2\0" \
diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h
index 5b097e9fef29..5adfc6719585 100644
--- a/include/configs/openpiton-riscv64.h
+++ b/include/configs/openpiton-riscv64.h
@@ -20,7 +20,7 @@
  * Board boot configuration
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_addr_r=0x86000000\0" \
 	"kernel_addr_r=0x80200000\0" \
 	"image=boot/Image\0" \
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 006f06e6af5c..ec3a0e0676d7 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -27,7 +27,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console=ttyS0,115200 " \
+#define CFG_EXTRA_ENV_SETTINGS	"x_bootargs=console=ttyS0,115200 " \
 	CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0"	\
 	"x_bootcmd_usb=usb start\0"					\
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 6633d541a31b..d4ba599d72a4 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -23,7 +23,7 @@
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x40007000\0" \
 	"rdaddr=0x48000000\0" \
 	"kerneladdr=0x40007000\0" \
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 9738e9fa9cb7..88182fde972b 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -424,7 +424,7 @@
 
 #include "p1_p2_bootsrc.h"
 
-#define	CONFIG_EXTRA_ENV_SETTINGS	\
+#define	CFG_EXTRA_ENV_SETTINGS	\
 "netdev=eth0\0"	\
 "uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
 "loadaddr=1000000\0"	\
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 2a1660bf188d..146f87e9ce33 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -45,7 +45,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"fdt_addr_r=0x82000000\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 4421e740d9ea..0890c115700c 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -65,7 +65,7 @@
 	"mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"console=ttymxc0,115200n8\0" \
 	"addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 5c2ff5d02ee7..34994016c54c 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -29,7 +29,7 @@
 /* boot command, including the target-defined one if any */
 
 /* Extra env settings (including the target-defined ones if any) */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	PCM052_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 3674e4cddaed..2991076c50a1 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -39,7 +39,7 @@
 	"nandloadfit=ubi part rootfs;ubi readvol ${loadaddr} fit\0" \
 	"nandboot=run nandloadfit;run nandargs;bootm ${loadaddr}\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x30000000\0" \
 	"optargs=rw rootwait\0" \
 	ENV_MMC \
diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h
index 71807837673f..80b14b002a92 100644
--- a/include/configs/pdu001.h
+++ b/include/configs/pdu001.h
@@ -32,7 +32,7 @@
 	#define CONSOLE_DEV "ttyO5"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=am335x-pdu001.dtb\0" \
 	"bootfile=zImage\0" \
diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index f922491637d9..4e6dc79f41b2 100644
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -62,7 +62,7 @@
 #include <environment/ti/dfu.h>
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"bootfile=zImage\0" \
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 7f73117ac1c8..9160c78c0464 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -20,7 +20,7 @@
 /* For RAW image gives a error info not panic */
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=Image\0" \
 	"console=ttymxc2,115200\0" \
 	"fdt_addr=0x48000000\0" \
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 11a833bb1276..16505529afc7 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -19,7 +19,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
 	"fdt_addr=0x48000000\0" \
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 3cc2a693ceee..60c747327588 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -69,7 +69,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	MEM_LAYOUT_ENV_SETTINGS		\
 	CONFIG_LEGACY_BOOTCMD_ENV	\
 	BOOTENV
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 719b70144051..66258a3ab73b 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -38,7 +38,7 @@
 	"bootmenu_3=Boot using PICO-Nymph baseboard=" \
 		"setenv baseboard nymph; saveenv; run base_boot\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	BOOTMENU_ENV \
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 5dfd737cf7a4..a4b97451cfdc 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -47,7 +47,7 @@
 	"bootmenu_2=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx6ul-pico-pi.dtb\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"splashpos=m,m\0" \
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 581921510426..7fc6211ff732 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -51,7 +51,7 @@
 	BOOTENV
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index f9301a5524b9..ac25991703f2 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -25,7 +25,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"script=boot.scr\0"						\
 	"image=Image\0"							\
 	"console=ttymxc0,115200\0"					\
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index a233fb8ed746..f4a34f261a6e 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -144,7 +144,7 @@
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00500000
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
 	"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "		\
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 9fd897958a4f..4994d7367fe8 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -168,7 +168,7 @@
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
 	"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "		\
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 085732214e50..af750e86ee98 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -18,7 +18,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootargs_console=console=ttyS0,115200\0" \
 	"bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
 	"ext2load usb 0:1 0x01100000 /uInitrd\0"
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index b5ce2dd13d08..016da6d04b0b 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -61,7 +61,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index 518d7a3639c5..7998ef7347fb 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -17,7 +17,7 @@
 #define CONFIG_SERVERIP                 192.168.0.1
 #define CONFIG_IPADDR                   192.168.0.2
 #define CONFIG_NETMASK                  255.255.255.0
-#define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
+#define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
 		"stderr=serial\0"    \
diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h
index 1c11685f49e4..8e74dc488875 100644
--- a/include/configs/pomelo.h
+++ b/include/configs/pomelo.h
@@ -21,7 +21,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"image=Image\0" \
 	BOOTENV \
 	"scriptaddr=0x90100000\0" \
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index c58105597e47..6e8adf91877c 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -31,7 +31,7 @@
 					func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 			"loader_mmc_blknum=0x0\0"			\
 			"loader_mmc_nblks=0x780\0"			\
 			"env_mmc_blknum=0xf80\0"			\
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 88fa65e0ffc1..969e175883bb 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -34,7 +34,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h
index 2b25c31b1d8d..df07df6a5a72 100644
--- a/include/configs/presidio_asic.h
+++ b/include/configs/presidio_asic.h
@@ -54,7 +54,7 @@
 #define GLOBAL_IO_DRIVE_CONTROL_OFFSET          0x4c
 
 /* max command args */
-#define CONFIG_EXTRA_ENV_SETTINGS	"silent=y\0"
+#define CFG_EXTRA_ENV_SETTINGS	"silent=y\0"
 
 /* nand driver parameters */
 #ifdef CONFIG_TARGET_PRESIDIO_ASIC
diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index 99376155b491..003686930a4b 100644
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -27,7 +27,7 @@
 	"ramdisk_addr_r=0x0a200000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 48f49906b84e..10eaeb49de62 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -28,7 +28,7 @@
 /* Use common default */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=pxm2\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x500000\0" \
diff --git a/include/configs/qcs404-evb.h b/include/configs/qcs404-evb.h
index c41bb341d82e..8ea59aa21ca6 100644
--- a/include/configs/qcs404-evb.h
+++ b/include/configs/qcs404-evb.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x5000000\0"	\
 	"bootm_low=0x80000000\0"	\
 	"bootcmd=bootm $prevbl_initrd_start_addr\0"
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index a67af73fd56f..45bd94ee5c76 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -76,7 +76,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr=0x40000000\0" \
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 72f35cc05420..11c795787887 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -36,7 +36,7 @@
 #define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \
 	"qemu "
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 59d56d666242..777df4c11259 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -38,7 +38,7 @@
 #define EEPROM_ADDR_CHIP 0x120
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=rastaban\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index e9cbd2538240..54844fe69662 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -33,7 +33,7 @@
 
 /* ENV setting */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __RCAR_GEN3_COMMON_H */
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index a4cae697181d..ea6073f29446 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -25,7 +25,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x7fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
index 99c86edeaa40..c4758e148ba7 100644
--- a/include/configs/rk3066_common.h
+++ b/include/configs/rk3066_common.h
@@ -24,7 +24,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x6fffffff\0" \
 	"initrd_high=0x6fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 302546630ac6..5b0ec3700040 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -27,7 +27,7 @@
 	"ramdisk_addr_r=0x64000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 334fb3affa5e..58f491c2f320 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -31,7 +31,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 256M on a Rock board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x6fffffff\0" \
 	"initrd_high=0x6fffffff\0" \
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 58ad62afe165..b95268df87c2 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -27,7 +27,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x7fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 6b55c57dd770..d3b8a5150f6b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -30,7 +30,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 256M on a Rock 2 board, so
  * limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x0fffffff\0" \
 	"initrd_high=0x0fffffff\0" \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 4b510b139910..bc03e113fef0 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -22,7 +22,7 @@
 	"ramdisk_addr_r=0x04000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"partitions=" PARTS_DEFAULT \
 	ROCKCHIP_DEVICE_SETTINGS \
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 132b7d0fe9bc..85d2186f23e0 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -22,7 +22,7 @@
 	"ramdisk_addr_r=0x06000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 92cdc1a51fbd..17636250510b 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -25,7 +25,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
 	ENV_MEM_LAYOUT_SETTINGS	\
 	BOOTENV
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 78f624d31ca2..43066933d02f 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -44,7 +44,7 @@
 
 #include <config_distro_bootcmd.h>
 #include <environment/distro/sf.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index d43dc2580e46..750f16d03999 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -21,7 +21,7 @@
 	"ramdisk_addr_r=0x0a200000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	ENV_MEM_LAYOUT_SETTINGS			\
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT		\
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index e3549275138b..c3f8e7bf85cd 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -157,7 +157,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \
 	ENV_DEVICE_SETTINGS \
 	ENV_DFU_SETTINGS \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index b07d0c50604d..99799f8494e0 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -27,7 +27,7 @@
 /* Use common default */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=rut\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x500000\0" \
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 84a5ae6965dd..6e17b23b624c 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -26,7 +26,7 @@
 	"ramdisk_addr_r=0x64000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index e071d4da5e86..02c469049adb 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -142,7 +142,7 @@
 	#define EXTRA_ENV_BOOT_LOGO  EXTRA_ENV_DTB_RESERVE
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_high=0xffffffff\0"					\
 	"initrd_high=0xffffffff\0"				\
 	"rootdev=" __stringify(CONFIG_ROOT_DEV) "\0"		\
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index b7a91af008c7..f898d2d9ee52 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -61,7 +61,7 @@
 
 #define COMMON_BOOT	"${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
 		"onenand write 0x32008000 0x0 0x100000\0" \
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 80d3fc9258cc..bf2d04a169b3 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -29,7 +29,7 @@
 				",100M(swap)"\
 				",-(UMS)\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
 		"onenand write 0x42008000 0x0 0x100000\0" \
diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h
index f7cdd5a19568..9a4fe530a20b 100644
--- a/include/configs/sdm845.h
+++ b/include/configs/sdm845.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x4000000\0"	\
 	"bootm_low=0x80000000\0"	\
 	"stdout=vidconsole\0"	\
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 19701ccce22e..a228dac2ee92 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -15,7 +15,7 @@
 /*
  *  Environment variables configurations
  */
-#define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
+#define CFG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
 	"=ttyS0,115200 mtdparts=" CONFIG_MTDPARTS_DEFAULT	\
 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
 	"x_bootcmd_usb=usb start\0" \
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 5ad2124bddab..59e40710de48 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -39,7 +39,7 @@
 	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index f4b1a16019ec..3cf300a2e459 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -36,7 +36,7 @@
 	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x84000000\0" \
 	"kernel_comp_addr_r=0x88000000\0" \
 	"kernel_comp_size=0x4000000\0" \
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 58613effaf47..025d56671122 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -34,7 +34,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h
index 974531ea0d82..760a0a5b9135 100644
--- a/include/configs/sipeed-maix.h
+++ b/include/configs/sipeed-maix.h
@@ -11,8 +11,8 @@
 #define CFG_SYS_SDRAM_BASE 0x80000000
 #define CFG_SYS_SDRAM_SIZE SZ_8M
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80060000\0" \
 	"fdt_addr_r=0x80400000\0" \
 	"scriptaddr=0x80020000\0" \
diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h
index ff0ed180e92e..748a423b0833 100644
--- a/include/configs/slimbootloader.h
+++ b/include/configs/slimbootloader.h
@@ -14,10 +14,10 @@
 	"stderr=serial\0"
 
 /*
- * Override CONFIG_EXTRA_ENV_SETTINGS in x86-common.h
+ * Override CFG_EXTRA_ENV_SETTINGS in x86-common.h
  */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_STD_DEVICES_SETTINGS		\
 	"netdev=eth0\0"				\
 	"consoledev=ttyS0\0"			\
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index b988b96e58d8..762f61470b15 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -73,7 +73,7 @@
  * Predefined environment variables.
  * Usefull to define some easy to use boot commands.
  */
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define	CFG_EXTRA_ENV_SETTINGS					\
 									\
 	"basicargs=console=ttyS0,115200\0"				\
 									\
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index ccb7ec38d033..c148757915a2 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -28,7 +28,7 @@
 				" mem=128M " \
 				" " CONFIG_MTDPARTS_DEFAULT
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x40000;" \
 		"onenand write 0x32008000 0x0 0x40000\0" \
diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 14f9cf560286..11031744bef8 100644
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -17,7 +17,7 @@
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
 	"fdtfile=imx7d-smegw01.dtb\0" \
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index b7aa49ce435e..df8ed451a43a 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -41,7 +41,7 @@
 
 /* Environment settings */
 
-#define	CONFIG_EXTRA_ENV_SETTINGS	\
+#define	CFG_EXTRA_ENV_SETTINGS	\
 	"ethaddr=00:00:00:00:00:00\0" \
 	"serial=0\0" \
 	"stdout=serial_atmel\0" \
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index afca7e18e9be..eaee8dd37396 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -62,7 +62,7 @@
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x82000000\0" \
 	"loadaddr=0x82000000\0" \
 	"fdt_addr_r=0x88000000\0" \
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 29b4b22b3988..f12163ccc990 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -52,7 +52,7 @@
 	"develop=" \
 		"tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
 	CONFIG_KM_DEF_ENV_BOOTTARGETS \
 	CONFIG_KM_NEW_ENV \
diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h
index aa13878177ef..2ce7011529a4 100644
--- a/include/configs/socfpga_chameleonv3.h
+++ b/include/configs/socfpga_chameleonv3.h
@@ -19,7 +19,7 @@
  */
 #define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"autoload=no\0" \
 	"bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \
 	"distro_bootcmd=bridge enable; run bootcmd_mmc\0" \
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 807bff43e00a..3603bb9f4a0b 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -148,8 +148,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"bootm_size=0xa000000\0" \
 	"kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \
diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h
index 8f1c2de998ea..565a661258fd 100644
--- a/include/configs/socfpga_dbm_soc1.h
+++ b/include/configs/socfpga_dbm_soc1.h
@@ -13,7 +13,7 @@
 /* Environment is in MMC */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index e76438e228d5..ac70d91e2081 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -13,7 +13,7 @@
 /* Environment is in MMC */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
diff --git a/include/configs/socfpga_n5x_socdk.h b/include/configs/socfpga_n5x_socdk.h
index c295e91e3d3e..fe5286e12cd1 100644
--- a/include/configs/socfpga_n5x_socdk.h
+++ b/include/configs/socfpga_n5x_socdk.h
@@ -9,8 +9,8 @@
 
 #include <configs/socfpga_soc64_common.h>
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"bootfile=" CONFIG_BOOTFILE "\0" \
 	"fdt_addr=1100000\0" \
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index df3927297bbe..66ecb168a0a0 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -36,7 +36,7 @@
 /*
  * Environment variable
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"bootfile=" CONFIG_BOOTFILE "\0" \
 	"fdt_addr=8000000\0" \
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 70d9f3607a67..cd48650dd554 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -28,7 +28,7 @@
  *                            Linux system after 5 seconds
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 95393d3ab25e..fb2b76eb829a 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -139,7 +139,7 @@
 #define CFG_SYS_BOOTMAPSZ	(8 << 20)	/* Initial Memory map for Linux	*/
 
 
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define	CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consdev=ttyS0\0"						\
 	"uboot_file=/home/tftp/syscon3/u-boot.bin\0"			\
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index de0f48b79a15..e13280563513 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 #endif /* CONFIG_FSL_USDHC */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"console=ttymxc0\0" \
 	"initrd_addr=0x86800000\0" \
diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h
index a5987c5e17a1..e58ddd752cd3 100644
--- a/include/configs/stemmy.h
+++ b/include/configs/stemmy.h
@@ -38,7 +38,7 @@
 #define BOOTCMD_ENV \
 	"fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOT_ENV \
 	CONSOLE_ENV \
 	FASTBOOT_ENV \
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 9294d57ca84e..b3fce5031687 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -29,7 +29,7 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0x40000000\0"		\
 			"fdtfile=stih410-b2260.dtb\0"		\
 			"fdt_addr_r=0x47000000\0"		\
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index afd7d50428bf..de5019a364a0 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -15,7 +15,7 @@
 
 #define CFG_SYS_HZ_CLOCK		1000000	/* Timer is clocked at 1MHz */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
 	"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
 	"bootm 0x08044000 - 0x08042000\0"
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index c8aad47966fe..a4f3e43dc5a1 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -24,7 +24,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0x00008000\0"		\
 			"fdtfile=stm32429i-eval.dtb\0"	\
 			"fdt_addr_r=0x00408000\0"		\
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 573a6b179561..62a7e9af0c56 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -24,7 +24,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0x00008000\0"		\
 			"fdtfile=stm32f469-disco.dtb\0"	\
 			"fdt_addr_r=0x00408000\0"		\
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 14e883a35892..34856d300403 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -24,7 +24,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xC0008000\0"		\
 			"fdtfile="CONFIG_DEFAULT_DEVICE_TREE".dtb\0"	\
 			"fdt_addr_r=0xC0408000\0"		\
diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 67e6a3a19d21..d36cd6fdd44a 100644
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -21,7 +21,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xD0008000\0"		\
 			"fdtfile=stm32h743i-disco.dtb\0"	\
 			"fdt_addr_r=0xD0408000\0"		\
diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index 4786eb001bc1..8f242bf0ff6e 100644
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -21,7 +21,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xD0008000\0"		\
 			"fdtfile=stm32h743i-eval.dtb\0"	\
 			"fdt_addr_r=0xD0408000\0"		\
diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h
index e667fe6f6ac2..d27b6a3d1de2 100644
--- a/include/configs/stm32h750-art-pi.h
+++ b/include/configs/stm32h750-art-pi.h
@@ -21,7 +21,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xC0008000\0"		\
 			"fdtfile=stm32h750i-art-pi.dtb\0"	\
 			"fdt_addr_r=0xC0408000\0"		\
diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h
index c259a616133b..7c59c69e0bdc 100644
--- a/include/configs/stm32mp13_common.h
+++ b/include/configs/stm32mp13_common.h
@@ -81,7 +81,7 @@
 	"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
 	"ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	STM32MP_BOOTCMD \
 	BOOTENV \
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index c9cfadd9ce0b..ec8c8fba91f1 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -138,7 +138,7 @@
 	"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
 	"ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	STM32MP_BOOTCMD \
 	STM32MP_PARTS_DEFAULT \
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h
index 910d7ef107b5..919216906249 100644
--- a/include/configs/stm32mp15_dh_dhsom.h
+++ b/include/configs/stm32mp15_dh_dhsom.h
@@ -12,7 +12,7 @@
 #define PHY_ANEG_TIMEOUT		20000
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"dfu_alt_info_ram=u-boot.itb ram "				\
 			__stringify(CONFIG_SPL_LOAD_FIT_ADDRESS)	\
 			" 0x800000\0"
diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h
index 38b5aa7319cf..d0cd4130cec2 100644
--- a/include/configs/stm32mp15_st_common.h
+++ b/include/configs/stm32mp15_st_common.h
@@ -18,7 +18,7 @@
 					 230400, 460800, 921600, \
 					 1000000, 2000000 }
 
-#ifdef CONFIG_EXTRA_ENV_SETTINGS
+#ifdef CFG_EXTRA_ENV_SETTINGS
 /*
  * default bootcmd for stm32mp1 STMicroelectronics boards:
  * for serial/usb: execute the stm32prog command
@@ -42,8 +42,8 @@
 		"run distro_bootcmd;" \
 	"fi;\0"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	ST_STM32MP1_BOOTCMD \
 	STM32MP_PARTS_DEFAULT \
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index faff8d6ed6d1..be0193105b4b 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -15,7 +15,7 @@
 #define LDS_BOARD_TEXT						\
 	board/sysam/stmark2/sbf_dram_init.o (.text*)
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kern_size=0x700000\0"					\
 	"loadaddr=0x40001000\0"					\
 		"-(rootfs)\0"					\
diff --git a/include/configs/stout.h b/include/configs/stout.h
index f49e88cb17cb..5058e0a204d7 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -38,7 +38,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1677aafad03b..f3c8f7002342 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -324,7 +324,7 @@
 #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_EXTRA_SETTINGS \
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 699268900109..271080303fb6 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -92,7 +92,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define	CONFIG_EXTRA_ENV_SETTINGS		\
+#define	CFG_EXTRA_ENV_SETTINGS		\
 	"fdt_addr_r=0x9fe00000\0"		\
 	"kernel_addr_r=0x90000000\0"		\
 	"ramdisk_addr_r=0xa0000000\0"		\
diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h
index 7af7b08eb485..e8a207f54167 100644
--- a/include/configs/syzygy_hub.h
+++ b/include/configs/syzygy_hub.h
@@ -10,7 +10,7 @@
 #ifndef __CONFIG_SYZYGY_HUB_H
 #define __CONFIG_SYZYGY_HUB_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"fit_image=fit.itb\0"		\
 	"bitstream_image=download.bit\0"    \
 	"loadbit_addr=0x1000000\0"      \
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 30f842558207..855218a8901e 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -72,7 +72,7 @@
 /* bootstrap in spi flash , u-boot + env + linux in nandflash */
 
 #if defined(CONFIG_BOARD_AXM)
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
 		"${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \
 	"addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index fcc967494220..61f252cb638c 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -33,7 +33,7 @@
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #endif /* CONFIG_CMD_USB      */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
 	"bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 69acabf19fdd..31c82822a2af 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -65,7 +65,7 @@
 #define INITRD_HIGH "ffffffff"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	TEGRA_DEVICE_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdt_high=" FDT_HIGH "\0" \
diff --git a/include/configs/ten64.h b/include/configs/ten64.h
index 57724719a9d6..e86c16313293 100644
--- a/include/configs/ten64.h
+++ b/include/configs/ten64.h
@@ -34,9 +34,9 @@
 	func(PXE, pxe, 0)
 #include <config_distro_bootcmd.h>
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"BOARD=ten64\0"					\
 	"fdt_addr_r=0x90000000\0"		\
 	"fdt_high=0xa0000000\0"			\
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index af0a095dfc8c..f34063249e48 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -20,9 +20,9 @@
 
 /* Environment settings */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"tftpdir=" DEF_ENV_TFTPDIR "\0"				\
 	"eth_init=" DEF_ENV_ETH_INIT "\0"			\
 	"ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0"	\
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 76b496303f3e..9722b0db72aa 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -35,7 +35,7 @@
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index c8b27263e85e..1753fa410d18 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -31,7 +31,7 @@
 #define EEPROM_ADDR_CHIP 0x120
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=thuban\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 7becf1eb7cb4..8ba40546b2c0 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -35,7 +35,7 @@
 /* Initial environment variables */
 #define UBOOT_IMG_HEAD_SIZE		0x40
 /* C80000 - 0x40 */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 					"kernel_addr=08007ffc0\0"	\
 					"fdt_addr=0x94C00000\0"		\
 					"fdt_high=0x9fffffff\0"
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 03849adb5abe..28dba4aa95b6 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -20,7 +20,7 @@
 
 /* commands to include */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x80F80000\0" \
 	"rdaddr=0x81000000\0" \
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 7b04292d2188..2d9d2fd66e9a 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -12,7 +12,7 @@
 #include <configs/ti_armv7_omap.h>
 #include <asm/arch/omap.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	DEFAULT_LINUX_BOOT_ENV
 
 /* Clock Defines */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index ea45bba409cb..479ab46e4edd 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -106,7 +106,7 @@
 		"rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; "	\
 		"rproc start ${dev_pmmc}\0"				\
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	ENV_KS2_BOARD_SETTINGS						\
 	DFUARGS								\
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 64ec59d78eb6..49f4263e16ba 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -58,7 +58,7 @@
 #include <config_distro_bootcmd.h>
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 37ab2e446724..e9723ed5b3dd 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -247,7 +247,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 83abaeddf125..3795e6152fa9 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -44,8 +44,8 @@
 # define EXTRA_ENV_USB
 #endif
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"kernel_image=uImage\0"	\
 	"kernel_addr=0x2080000\0" \
 	"ramdisk_image=uramdisk.image.gz\0"	\
diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
index 0f28690612ab..e007be8e4564 100644
--- a/include/configs/total_compute.h
+++ b/include/configs/total_compute.h
@@ -28,7 +28,7 @@
 #define PHYS_SDRAM_2		0x8080000000
 #define PHYS_SDRAM_2_SIZE	0x180000000
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"bootm_size=0x20000000\0"	\
 				"load_addr=0xa0000000\0"	\
 				"kernel_addr_r=0x80080000\0"	\
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 7a1ad9544a30..14d7730f67bf 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -197,7 +197,7 @@
 /* set to a resonable value, changeable by user */
 #define TQMA6_CMA_SIZE                 160M
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                              \
+#define CFG_EXTRA_ENV_SETTINGS                                              \
 	"board=tqma6\0"                                                        \
 	"uimage=uImage\0"                                                      \
 	"zimage=zImage\0"                                                      \
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 3eac66539dfe..2067327918a2 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -54,7 +54,7 @@
 	"params.bin raw 0x38 0x8;" \
 	"/Image.itb ext4 0 2\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
 		"run loaduimage;" \
 		"if run loaddtb; then " \
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 125d3e776a3f..21372243bbc8 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -55,7 +55,7 @@
 	"params.bin raw 0x38 0x8;" \
 	"/Image.itb ext4 0 2\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
 		"run loaduimage;" \
 		"if run loaddtb; then " \
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index fdb420ed874e..3443c80d06ef 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -35,7 +35,7 @@
 	"lzmadec 0x5000000 0x5800000 && "				\
 	"bootm 0x5800000"
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_addr=0x4c00000\0"					\
 	"scriptaddr=0x4d00000\0"				\
 	"pxefile_addr_r=0x4e00000\0"				\
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 52de4cdc7893..47b220ff9ee7 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -80,7 +80,7 @@
 	"fi; " \
 	"bootz 0x1000000"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index fac8c1eeb4e2..f0092eff1494 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -15,7 +15,7 @@
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1,115200\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index d4c92233acaa..5d7d734daa2d 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -19,7 +19,7 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
 /* Linux only */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 8cd81f1cdddc..2fe056cfef4a 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -92,7 +92,7 @@
 		"run boot_common\0"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_addr_r_offset=0x05100000\0" \
 	"kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
 	"ramdisk_addr_r_offset=0x06000000\0" \
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 657dbadd3396..b90e047955b9 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -43,6 +43,6 @@
 #endif
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 
 #endif
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index a2bc3cd23a5b..f273533be429 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -41,7 +41,7 @@
 	"pxefile_addr_r=0x70800000\0"		\
 	"ramdisk_addr_r=0x73000000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	MEM_LAYOUT_ENV_SETTINGS					\
 	"bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0"	\
 	"fdtfile=imx53-usbarmory.dtb\0"				\
diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index b03159805c15..2e150276e7a4 100644
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -25,7 +25,7 @@
 #error Unknown DDR size - please add!
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"loadaddr=0x81000000\0"						\
 	"spi_image_off=0x00100000\0"					\
 	"console=ttyS0,115200\0"					\
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 18ac6b2b0895..7f3fa795afdc 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -34,7 +34,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"bootcmd_mfg=fastboot 0\0" \
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 88839a6e561a..3ce2714e196e 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -46,7 +46,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"bootcmd_mfg=fastboot 0\0" \
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 30c1f5025b05..87b8c5d57ee7 100644
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -244,7 +244,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Default load addresses and names for the different payloads. */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 		"kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0"	       \
 		"ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0"      \
 		"pxefile_addr_r=" __stringify(VEXPRESS_PXEFILE_ADDR) "\0"      \
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index e8b6acf8b8fe..705a941e3603 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -145,7 +145,7 @@
         func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
                 "kernel_addr_r=0x60100000\0" \
                 "fdt_addr_r=0x60000000\0" \
                 "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 14e6b2bac91c..0e0b3a7b594d 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -44,7 +44,7 @@
 	"rdaddr=0x84080000\0" \
 	"ramdisk_addr_r=0x84080000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 9f72bdde8167..74ee61f09238 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -48,7 +48,7 @@
 
 /* Update the bootcommand according to our mapping for the VInCo platform */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_start=0x20000\0" \
 	"kernel_size=0x800000\0" \
 	"mmcblksize=0x200\0" \
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 6923009d4598..1e765439fabe 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -20,7 +20,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 3cdf4a1ffc67..709bb046d018 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -26,7 +26,7 @@
 #define BOOT_SCR_STRING "source ${bootscriptaddr}\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"bootscr_fitimage_name=bootscr\0" \
diff --git a/include/configs/x530.h b/include/configs/x530.h
index dee87cb77325..f20a85cfa19a 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -49,7 +49,7 @@
 #include <asm/arch/config.h>
 
 /* Keep device tree and initrd in low memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 3e17b53dde2d..7705d31a313a 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -60,7 +60,7 @@
 #define SPLASH_SETTINGS
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS			\
+#define CFG_EXTRA_ENV_SETTINGS			\
 	DISTRO_BOOTENV					\
 	CONFIG_STD_DEVICES_SETTINGS			\
 	SPLASH_SETTINGS					\
diff --git a/include/configs/xea.h b/include/configs/xea.h
index b432ab2dc8ef..50b96f31e163 100644
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -28,7 +28,7 @@
 /* Extra Environment */
 #define CONFIG_HOSTNAME		"xea"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootmode=update\0"						\
 	"bootpri=mmc_mmc\0"						\
 	"bootsec=sf_swu\0"						\
diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h
index 612436aeb48f..bc268d25dc3a 100644
--- a/include/configs/xenguest_arm64.h
+++ b/include/configs/xenguest_arm64.h
@@ -9,12 +9,12 @@
 #include <linux/types.h>
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #undef CFG_SYS_SDRAM_BASE
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \
 	"pvblockboot=run loadimage;" \
 		"booti 0x90000000 - 0x88000000;\0"
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index ee3130ed3277..836a6506b1ad 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -127,8 +127,8 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 #endif
diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h
index e1f95de3c34f..23655a475221 100644
--- a/include/configs/xilinx_versal_mini.h
+++ b/include/configs/xilinx_versal_mini.h
@@ -10,11 +10,11 @@
 #ifndef __CONFIG_VERSAL_MINI_H
 #define __CONFIG_VERSAL_MINI_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #include <configs/xilinx_versal.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #endif /* __CONFIG_VERSAL_MINI_H */
diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index 7d77189693e2..b8d2685246f3 100644
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -124,8 +124,8 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV \
 	DFU_ALT_INFO
diff --git a/include/configs/xilinx_versal_net_mini.h b/include/configs/xilinx_versal_net_mini.h
index 1939832a848e..50bacc39ac58 100644
--- a/include/configs/xilinx_versal_net_mini.h
+++ b/include/configs/xilinx_versal_net_mini.h
@@ -11,11 +11,11 @@
 #ifndef __CONFIG_VERSAL_NET_MINI_H
 #define __CONFIG_VERSAL_NET_MINI_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #include <configs/xilinx_versal_net.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #endif /* __CONFIG_VERSAL_NET_MINI_H */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index efe241df97eb..f07e7d3f0ac3 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -174,16 +174,16 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 #endif
 
 /* SPL can't handle all huge variables - define just DFU */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-# define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+# define CFG_EXTRA_ENV_SETTINGS \
 	"dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \
 			  "atf-uboot.ub ram 0x10000000 0x1000000;" \
 			  "Image ram 0x80000 0x3f80000;" \
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 1c0ab25c6440..9af05456640b 100644
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -10,11 +10,11 @@
 #ifndef __CONFIG_ZYNQMP_MINI_H
 #define __CONFIG_ZYNQMP_MINI_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #include <configs/xilinx_zynqmp.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #endif /* __CONFIG_ZYNQMP_MINI_H */
diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h
index 3a7b7e03d6af..918aa3d7402a 100644
--- a/include/configs/xilinx_zynqmp_r5.h
+++ b/include/configs/xilinx_zynqmp_r5.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_ZYNQMP_R5_H
 #define __CONFIG_ZYNQMP_R5_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 /* Serial drivers */
 /* The following table includes the supported baudrates */
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 3e604894ad48..a480bb720b58 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -37,7 +37,7 @@
 #define CONFIG_UBOOT_SECTOR_START	0x2
 #define CONFIG_UBOOT_SECTOR_COUNT	0x3fe
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc6\0" \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index b8c142fed37b..7f739d9ada0e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -174,8 +174,8 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* Default environment */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x20000\0"	\
 	"script_size_f=0x40000\0"	\
 	"fdt_addr_r=0x1f00000\0"        \
diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index ac6e8c4ff867..a9bb5bb90ad1 100644
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -12,7 +12,7 @@
 #include <configs/zynq-common.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #undef CFG_SYS_INIT_RAM_ADDR
 #undef CFG_SYS_INIT_RAM_SIZE
diff --git a/include/env_default.h b/include/env_default.h
index 4e461c815a79..1621815f257a 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -118,8 +118,8 @@ const char default_environment[] = {
 	/* This is created in the Makefile */
 	CONFIG_EXTRA_ENV_TEXT
 #endif
-#ifdef	CONFIG_EXTRA_ENV_SETTINGS
-	CONFIG_EXTRA_ENV_SETTINGS
+#ifdef	CFG_EXTRA_ENV_SETTINGS
+	CFG_EXTRA_ENV_SETTINGS
 #endif
 	"\0"
 #else /* CONFIG_USE_DEFAULT_ENV_FILE */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 99b3796584d0..62bb86b56fd6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -21,7 +21,7 @@ CFG_ENV_SROM_BANK
 CFG_ENV_TOTAL_SIZE
 CFG_ET1100_BASE
 CFG_ETHBASE
-CONFIG_EXTRA_ENV_SETTINGS
+CFG_EXTRA_ENV_SETTINGS
 CONFIG_FB_ADDR
 CONFIG_FDTADDR
 CONFIG_FDTFILE
-- 
2.25.1

[PoC 022/241] global: Migrate CONFIG_FB_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/video/nexell_display.c | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 5595796a678b..af2698ffca84 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -560,7 +560,7 @@ static int nx_display_bind(struct udevice *dev)
 	/* Datasheet S5p4418:
 	 *   Resolution up to 2048 x 1280, up to 12 Bit per color (HDMI)
 	 * Actual (max.) size is 0x1000000 because in U-Boot nanopi2-2016.01
-	 * "#define CONFIG_FB_ADDR  0x77000000" and next address is
+	 * "#define CFG_FB_ADDR  0x77000000" and next address is
 	 * "#define BMP_LOAD_ADDR  0x78000000"
 	 */
 	plat->size = 0x1000000;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 62bb86b56fd6..66728d47db38 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -22,7 +22,7 @@ CFG_ENV_TOTAL_SIZE
 CFG_ET1100_BASE
 CFG_ETHBASE
 CFG_EXTRA_ENV_SETTINGS
-CONFIG_FB_ADDR
+CFG_FB_ADDR
 CONFIG_FDTADDR
 CONFIG_FDTFILE
 CONFIG_FEC_ENET_DEV
-- 
2.25.1

[PoC 023/241] global: Migrate CONFIG_FDTADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/colibri_vf.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 122b599a6f21..ef49969598c9 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -20,7 +20,7 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1
 
-#define CONFIG_FDTADDR			0x84000000
+#define CFG_FDTADDR			0x84000000
 
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 66728d47db38..e436bf55d94d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -23,7 +23,7 @@ CFG_ET1100_BASE
 CFG_ETHBASE
 CFG_EXTRA_ENV_SETTINGS
 CFG_FB_ADDR
-CONFIG_FDTADDR
+CFG_FDTADDR
 CONFIG_FDTFILE
 CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
-- 
2.25.1

[PoC 024/241] global: Migrate CONFIG_FDTFILE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/MPC837XERDB.h     | 4 ++--
 include/configs/embestmx6boards.h | 6 +++---
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2a71e0ad4dce..2eea26d7bee7 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -229,7 +229,7 @@
 #define CONFIG_ROOTPATH		"/nfsroot"
 				/* U-Boot image on TFTP server */
 #define CONFIG_UBOOTPATH	"u-boot.bin"
-#define CONFIG_FDTFILE		"mpc8379_rdb.dtb"
+#define CFG_FDTFILE		"mpc8379_rdb.dtb"
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"netdev=" CONFIG_NETDEV "\0"				\
@@ -246,7 +246,7 @@
 		"cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE)	\
 			" $filesize\0"	\
 	"fdtaddr=780000\0"						\
-	"fdtfile=" CONFIG_FDTFILE "\0"					\
+	"fdtfile=" CFG_FDTFILE "\0"					\
 	"ramdiskaddr=1000000\0"						\
 	"ramdiskfile=rootfs.ext2.gz.uboot\0"				\
 	"console=ttyS0\0"						\
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 4a929937b416..8f03c2ff3c0d 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -35,11 +35,11 @@
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* RiOTboard */
-#define CONFIG_FDTFILE	"imx6dl-riotboard.dtb"
+#define CFG_FDTFILE	"imx6dl-riotboard.dtb"
 #define CFG_SYS_FSL_USDHC_NUM	3
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
-#define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
+#define CFG_FDTFILE	"imx6q-marsboard.dtb"
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
@@ -79,7 +79,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
-	"fdtfile=" CONFIG_FDTFILE "\0" \
+	"fdtfile=" CFG_FDTFILE "\0" \
 	"finduuid=part uuid mmc 0:1 uuid\0" \
 	BOOTENV
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e436bf55d94d..6a20473cd6ea 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -24,7 +24,7 @@ CFG_ETHBASE
 CFG_EXTRA_ENV_SETTINGS
 CFG_FB_ADDR
 CFG_FDTADDR
-CONFIG_FDTFILE
+CFG_FDTFILE
 CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
-- 
2.25.1

[PoC 025/241] global: Migrate CONFIG_FEC_ENET_DEV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +-
 board/freescale/mx6ullevk/mx6ullevk.c             | 2 +-
 board/seeed/npi_imx6ull/npi_imx6ull.c             | 2 +-
 board/variscite/dart_6ul/dart_6ul.c               | 2 +-
 include/configs/capricorn-common.h                | 2 +-
 include/configs/dart_6ul.h                        | 2 +-
 include/configs/liteboard.h                       | 2 +-
 include/configs/mx6ul_14x14_evk.h                 | 6 +++---
 include/configs/mx6ullevk.h                       | 2 +-
 include/configs/npi_imx6ull.h                     | 2 +-
 include/configs/xpress.h                          | 2 +-
 scripts/config_whitelist.txt                      | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 1eec048a66fa..570b5014dbb1 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -281,7 +281,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef	CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 #ifdef CONFIG_USB_EHCI_MX6
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 86c11c7bd3a5..e24738064757 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -110,7 +110,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef	CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 	return 0;
diff --git a/board/seeed/npi_imx6ull/npi_imx6ull.c b/board/seeed/npi_imx6ull/npi_imx6ull.c
index eb9ee555c854..c610d2c30696 100644
--- a/board/seeed/npi_imx6ull/npi_imx6ull.c
+++ b/board/seeed/npi_imx6ull/npi_imx6ull.c
@@ -100,7 +100,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 	return 0;
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 7326daa1798d..98d8d1c31205 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -147,7 +147,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 #ifdef CONFIG_NAND_MXS
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index a8273a7fcd8d..63afa6e18969 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -19,7 +19,7 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* ENET1 connects to base board and MUX with ESAI */
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 #define CONFIG_FEC_MXC_PHYADDR		0x0
 
 /* EEPROM */
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 323703ac5c90..c2ed9c7c56af 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -18,7 +18,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 #endif
 
 /* Environment settings */
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 938ab5ade9a7..7200c69bd9e6 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -100,7 +100,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 
 #define CONFIG_FEC_MXC_PHYADDR		0x0
 #endif
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 90c788468710..efc599f37a6d 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -121,11 +121,11 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 
-#if (CONFIG_FEC_ENET_DEV == 0)
+#if (CFG_FEC_ENET_DEV == 0)
 #define CONFIG_FEC_MXC_PHYADDR          0x2
-#elif (CONFIG_FEC_ENET_DEV == 1)
+#elif (CFG_FEC_ENET_DEV == 1)
 #define CONFIG_FEC_MXC_PHYADDR		0x1
 #endif
 #endif
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 4a27fd22902b..58d1a744ae99 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -109,7 +109,7 @@
 /* environment organization */
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 #endif
 
 #endif
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 07580f409492..8f052c5ae38f 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -38,7 +38,7 @@
 #define CONFIG_FEC_MXC_PHYADDR		0x1
 #endif
 
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index a480bb720b58..d095e63182ee 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -31,7 +31,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_UBOOT_SECTOR_START	0x2
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6a20473cd6ea..0a60216b8050 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -25,7 +25,7 @@ CFG_EXTRA_ENV_SETTINGS
 CFG_FB_ADDR
 CFG_FDTADDR
 CFG_FDTFILE
-CONFIG_FEC_ENET_DEV
+CFG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
 CONFIG_FLASH_BR_PRELIM
-- 
2.25.1

[PoC 026/241] global: Migrate CONFIG_FEC_FIXED_SPEED to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 doc/README.fec_mxc           | 2 +-
 drivers/net/fec_mxc.c        | 8 ++++----
 include/configs/brppt2.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index d17dfb676f79..d27276b8783e 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -22,7 +22,7 @@ CONFIG_FEC_MXC_PHYADDR
 	Optional, selects the exact phy address that should be connected
 	and function fecmxc_initialize will try to initialize it.
 
-CONFIG_FEC_FIXED_SPEED
+CFG_FEC_FIXED_SPEED
 	Optional, selects a fixed speed on the MAC interface without asking some
 	phy. This is usefull if there is a direct MAC <-> MAC connection, for
 	example if the CPU is connected directly via the RGMII interface to a
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index a61a1fc75738..659625a29d39 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -268,7 +268,7 @@ static int miiphy_restart_aneg(struct eth_device *dev)
 	return ret;
 }
 
-#ifndef CONFIG_FEC_FIXED_SPEED
+#ifndef CFG_FEC_FIXED_SPEED
 static int miiphy_wait_aneg(struct eth_device *dev)
 {
 	uint32_t start;
@@ -294,7 +294,7 @@ static int miiphy_wait_aneg(struct eth_device *dev)
 
 	return 0;
 }
-#endif /* CONFIG_FEC_FIXED_SPEED */
+#endif /* CFG_FEC_FIXED_SPEED */
 #endif
 
 static int fec_rx_task_enable(struct fec_priv *fec)
@@ -536,8 +536,8 @@ static int fec_open(struct udevice *dev)
 		}
 		speed = fec->phydev->speed;
 	}
-#elif CONFIG_FEC_FIXED_SPEED
-	speed = CONFIG_FEC_FIXED_SPEED;
+#elif CFG_FEC_FIXED_SPEED
+	speed = CFG_FEC_FIXED_SPEED;
 #else
 	miiphy_wait_aneg(edev);
 	speed = miiphy_speed(edev->name, fec->phy_id);
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 7e4e8ee262bf..92f34407b401 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -81,7 +81,7 @@ BUR_COMMON_ENV \
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* Ethernet */
-#define CONFIG_FEC_FIXED_SPEED		_1000BASET
+#define CFG_FEC_FIXED_SPEED		_1000BASET
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0a60216b8050..1917a8d090b2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -26,7 +26,7 @@ CFG_FB_ADDR
 CFG_FDTADDR
 CFG_FDTFILE
 CFG_FEC_ENET_DEV
-CONFIG_FEC_FIXED_SPEED
+CFG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_OR_PRELIM
-- 
2.25.1

[PoC 027/241] global: Migrate CONFIG_FEC_MXC_PHYADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/compulab/cl-som-imx7/cl-som-imx7.c        | 2 +-
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +-
 doc/README.fec_mxc                              | 2 +-
 drivers/net/fec_mxc.c                           | 4 ++--
 include/configs/aristainetos2.h                 | 2 +-
 include/configs/capricorn-common.h              | 2 +-
 include/configs/cgtqmx8.h                       | 2 +-
 include/configs/cl-som-imx7.h                   | 2 +-
 include/configs/cm_fx6.h                        | 2 +-
 include/configs/imx6_logic.h                    | 2 +-
 include/configs/imx6dl-mamoj.h                  | 2 +-
 include/configs/imx8mm-cl-iot-gate.h            | 2 +-
 include/configs/imx8mm_evk.h                    | 2 +-
 include/configs/imx8mp_evk.h                    | 2 +-
 include/configs/imx8mp_icore_mx8mp.h            | 2 +-
 include/configs/imx8mp_rsb3720.h                | 2 +-
 include/configs/imx8mq_evk.h                    | 2 +-
 include/configs/imx8mq_phanbell.h               | 2 +-
 include/configs/imx8ulp_evk.h                   | 2 +-
 include/configs/kontron_pitx_imx8m.h            | 2 +-
 include/configs/liteboard.h                     | 2 +-
 include/configs/m53menlo.h                      | 2 +-
 include/configs/mccmon6.h                       | 2 +-
 include/configs/msc_sm2s_imx8mp.h               | 2 +-
 include/configs/mx6sxsabreauto.h                | 2 +-
 include/configs/mx6sxsabresd.h                  | 2 +-
 include/configs/mx6ul_14x14_evk.h               | 4 ++--
 include/configs/nitrogen6x.h                    | 2 +-
 include/configs/npi_imx6ull.h                   | 2 +-
 include/configs/pico-imx6.h                     | 2 +-
 include/configs/pico-imx6ul.h                   | 2 +-
 include/configs/pico-imx8mq.h                   | 2 +-
 include/configs/somlabs_visionsom_6ull.h        | 2 +-
 include/configs/tqma6_mba6.h                    | 2 +-
 include/configs/tqma6_wru4.h                    | 2 +-
 include/configs/vf610twr.h                      | 2 +-
 include/configs/vining_2000.h                   | 2 +-
 include/configs/xpress.h                        | 2 +-
 scripts/config_whitelist.txt                    | 2 +-
 39 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 9733a33ee2c2..1b08a2c5abf2 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -214,7 +214,7 @@ int board_eth_init(struct bd_info *bis)
 	gpio_set_value(CL_SOM_IMX7_ETH1_PHY_NRST, 1);
 	/* MAC initialization */
 	return fecmxc_initialize_multi(bis, CL_SOM_IMX7_FEC_DEV_ID_PRI,
-				       CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+				       CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
 }
 
 /*
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 7340a3440231..9205d5ef6ddb 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis)
 	setup_fec();
 
 	ret = fecmxc_initialize_multi(bis, 1,
-		CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+		CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
 	if (ret)
 		printf("FEC%d MXC: %s:failed\n", 1, __func__);
 
diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index d27276b8783e..7aadea222f85 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -18,7 +18,7 @@ CONFIG_PHYLIB
 CONFIG_FEC_MXC_NO_ANEG
 	Relevant only if PHYLIB not used. Skips auto-negotiation restart.
 
-CONFIG_FEC_MXC_PHYADDR
+CFG_FEC_MXC_PHYADDR
 	Optional, selects the exact phy address that should be connected
 	and function fecmxc_initialize will try to initialize it.
 
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 659625a29d39..8c231ec80066 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1090,8 +1090,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
 	int addr;
 
 	addr = device_get_phy_addr(priv, dev);
-#ifdef CONFIG_FEC_MXC_PHYADDR
-	addr = CONFIG_FEC_MXC_PHYADDR;
+#ifdef CFG_FEC_MXC_PHYADDR
+	addr = CFG_FEC_MXC_PHYADDR;
 #endif
 
 	phydev = phy_connect(priv->bus, addr, dev, priv->interface);
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index b09e06ad4d85..9b11934546c1 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -28,7 +28,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 #ifdef CONFIG_IMX_HAB
 #define HAB_EXTRA_SETTINGS \
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 63afa6e18969..19c7fca03b29 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -20,7 +20,7 @@
 
 /* ENET1 connects to base board and MUX with ESAI */
 #define CFG_FEC_ENET_DEV		1
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 
 /* EEPROM */
 #define  EEPROM_I2C_BUS		0 /* I2C0 */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 263981860e86..caa1498acead 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -118,6 +118,6 @@
 #define PHYS_SDRAM_2_SIZE		0x100000000	/* 4 GB */
 
 /* Networking */
-#define CONFIG_FEC_MXC_PHYADDR		-1
+#define CFG_FEC_MXC_PHYADDR		-1
 
 #endif /* __CGTQMX8_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 2d56d37f06f8..cde7d3c891ab 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -13,7 +13,7 @@
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 /* ENET1 */
 #define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index c66cf721870c..47b76c9371e8 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -132,7 +132,7 @@
 /* APBH DMA is required for NAND support */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 0df61916b7d2..121b34ae96db 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -19,7 +19,7 @@
 
 
 /* Ethernet Configs */
-#define CONFIG_FEC_MXC_PHYADDR         0
+#define CFG_FEC_MXC_PHYADDR         0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index b6006c021d5c..162b0b8a69bb 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -40,7 +40,7 @@
 /* MMC */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 00ce7fb62a93..7785bdc7cbe6 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -136,7 +136,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index d28f3f1972b9..c364e06dc450 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -61,6 +61,6 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0x80000000 /* 2GB DDR */
 
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 #endif
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 63ea25d9788b..cba59dbfd938 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -21,7 +21,7 @@
 #endif
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define PHY_ANEG_TIMEOUT 20000
 
diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h
index 8fac898403f1..03dbeefb7a86 100644
--- a/include/configs/imx8mp_icore_mx8mp.h
+++ b/include/configs/imx8mp_icore_mx8mp.h
@@ -21,7 +21,7 @@
 #endif
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define DWC_NET_PHYADDR			1
 
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index ed4da0e69b5b..38ae5f137022 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -39,7 +39,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          4
+#define CFG_FEC_MXC_PHYADDR          4
 
 #define PHY_ANEG_TIMEOUT 20000
 
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index c40448715f8a..d9ce5d5d0f1a 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -24,7 +24,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 8fed3e31964c..eb7059f0648c 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -21,7 +21,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 #endif
 
 #define CONFIG_MFG_ENV_SETTINGS \
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 30dd5af03b00..b7397f6038fd 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -21,7 +21,7 @@
 #if defined(CONFIG_FEC_MXC)
 #define PHY_ANEG_TIMEOUT		20000
 
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index d909bbbbcfda..4dd51c7f1d7f 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -25,7 +25,7 @@
 
 /* ENET1 Config */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 #define PHY_ANEG_TIMEOUT		20000
 
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 7200c69bd9e6..0b8781d7bf34 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -102,7 +102,7 @@
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_ENET_DEV		0
 
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 #endif
 
 #endif
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 9c37212463e1..4123964256bd 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -55,7 +55,7 @@
  * Ethernet on SOC (FEC)
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 #endif
 
 #define CFG_SYS_RTC_BUS_NUM		1 /* I2C2 */
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 7ea682049261..4be47e78d676 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -32,7 +32,7 @@
 #define CFG_SYS_FLASH_BANKS_SIZES	{ (32 * SZ_1M) }
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200 quiet\0" \
diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index ef2111cd20ab..1cd0b3cf7374 100644
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 #define PHY_ANEG_TIMEOUT 20000
 #endif
 
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 9d8737c19425..3399cdd16fa8 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -93,7 +93,7 @@
 /* Network */
 
 #define IMX_FEC_BASE			ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8372f979dc86..c99d99abc179 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -115,7 +115,7 @@
 
 /* Network */
 
-#define CONFIG_FEC_MXC_PHYADDR          0x1
+#define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index efc599f37a6d..5e3695ecc971 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -124,9 +124,9 @@
 #define CFG_FEC_ENET_DEV		1
 
 #if (CFG_FEC_ENET_DEV == 0)
-#define CONFIG_FEC_MXC_PHYADDR          0x2
+#define CFG_FEC_MXC_PHYADDR          0x2
 #elif (CFG_FEC_ENET_DEV == 1)
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 #endif
 
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index e1689679e5f6..811688ae82af 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM       2
 
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR		6
+#define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 8f052c5ae38f..664d4f11c867 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -35,7 +35,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 
 #define CFG_FEC_ENET_DEV		1
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 66258a3ab73b..e1f7b7003194 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -98,6 +98,6 @@
 /* Environment organization */
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 #endif			       /* __CONFIG_H * */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index a4b97451cfdc..6148a343117d 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -15,7 +15,7 @@
 
 /* Network support */
 
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 
 #define CONFIG_MXC_UART_BASE		UART6_BASE_ADDR
 
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index ac25991703f2..1d8709180c83 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -21,7 +21,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 #endif
 
 /* Initial environment variables */
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index e13280563513..3418d4e2b559 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -66,7 +66,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 
 #endif
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 899c218727f3..a5f14dc42679 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_TQMA6_MBA6_H
 #define __CONFIG_TQMA6_MBA6_H
 
-#define CONFIG_FEC_MXC_PHYADDR		0x03
+#define CFG_FEC_MXC_PHYADDR		0x03
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 4d8839b6e60d..34c9b6a2f97c 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -7,7 +7,7 @@
 #define __CONFIG_TQMA6_WRU4_H
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		0x01
+#define CFG_FEC_MXC_PHYADDR		0x01
 
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 0e0b3a7b594d..d10b88f15754 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -21,7 +21,7 @@
 
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 /* I2C Configs */
 
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 1a71b300fc55..c84353ebea66 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -34,7 +34,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Network */
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index d095e63182ee..ce6ca175363b 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -32,7 +32,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_UBOOT_SECTOR_START	0x2
 #define CONFIG_UBOOT_SECTOR_COUNT	0x3fe
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1917a8d090b2..901914ac043c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -27,7 +27,7 @@ CFG_FDTADDR
 CFG_FDTFILE
 CFG_FEC_ENET_DEV
 CFG_FEC_FIXED_SPEED
-CONFIG_FEC_MXC_PHYADDR
+CFG_FEC_MXC_PHYADDR
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_OR_PRELIM
 CONFIG_FLASH_SECTOR_SIZE
-- 
2.25.1

[PoC 028/241] global: Migrate CONFIG_FLASH_BR_PRELIM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 88182fde972b..54687d3ada4e 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -193,7 +193,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS	CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
+#define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
 	| BR_PS_16 | BR_V)
 
 #define CONFIG_FLASH_OR_PRELIM	0xfc000ff7
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 901914ac043c..0767c66a79ff 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -28,7 +28,7 @@ CFG_FDTFILE
 CFG_FEC_ENET_DEV
 CFG_FEC_FIXED_SPEED
 CFG_FEC_MXC_PHYADDR
-CONFIG_FLASH_BR_PRELIM
+CFG_FLASH_BR_PRELIM
 CONFIG_FLASH_OR_PRELIM
 CONFIG_FLASH_SECTOR_SIZE
 CONFIG_FLASH_SHOW_PROGRESS
-- 
2.25.1

[PoC 029/241] global: Migrate CONFIG_FLASH_OR_PRELIM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 54687d3ada4e..de7c0d61c05f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -196,7 +196,7 @@
 #define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
 	| BR_PS_16 | BR_V)
 
-#define CONFIG_FLASH_OR_PRELIM	0xfc000ff7
+#define CFG_FLASH_OR_PRELIM	0xfc000ff7
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 #define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0767c66a79ff..ae4cb04023ad 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -29,7 +29,7 @@ CFG_FEC_ENET_DEV
 CFG_FEC_FIXED_SPEED
 CFG_FEC_MXC_PHYADDR
 CFG_FLASH_BR_PRELIM
-CONFIG_FLASH_OR_PRELIM
+CFG_FLASH_OR_PRELIM
 CONFIG_FLASH_SECTOR_SIZE
 CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
-- 
2.25.1

[PoC 030/241] global: Migrate CONFIG_FLASH_SECTOR_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/ax25-ae350.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index b743066ea7c3..6661f2d173ce 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -50,7 +50,7 @@
 #define CFG_SYS_FLASH_BANKS_SIZES {0x4000000}
 
 /* max number of sectors on one chip */
-#define CONFIG_FLASH_SECTOR_SIZE	(0x10000*2)
+#define CFG_FLASH_SECTOR_SIZE	(0x10000*2)
 
 /* environments */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ae4cb04023ad..89f47538d4c7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -30,7 +30,7 @@ CFG_FEC_FIXED_SPEED
 CFG_FEC_MXC_PHYADDR
 CFG_FLASH_BR_PRELIM
 CFG_FLASH_OR_PRELIM
-CONFIG_FLASH_SECTOR_SIZE
+CFG_FLASH_SECTOR_SIZE
 CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
-- 
2.25.1

[PoC 031/241] global: Migrate CONFIG_FLASH_SHOW_PROGRESS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                               |  2 +-
 drivers/mtd/cfi_flash.c              | 14 +++++++-------
 include/configs/P1010RDB.h           |  2 +-
 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/blanche.h            |  2 +-
 include/configs/draak.h              |  2 +-
 include/configs/eb_cpu5282.h         |  2 +-
 include/configs/ebisu.h              |  2 +-
 include/configs/km/pg-wcom-ls102xa.h |  2 +-
 include/configs/ls1021aqds.h         |  2 +-
 include/configs/ls1021atwr.h         |  2 +-
 include/configs/ls1043a_common.h     |  2 +-
 include/configs/ls1046aqds.h         |  2 +-
 include/configs/ls1088aqds.h         |  2 +-
 include/configs/ls1088ardb.h         |  2 +-
 include/configs/ls2080aqds.h         |  2 +-
 include/configs/ls2080ardb.h         |  2 +-
 include/configs/p1_p2_rdb_pc.h       |  2 +-
 include/configs/salvator-x.h         |  2 +-
 include/configs/ulcb.h               |  2 +-
 include/configs/zynq-common.h        |  2 +-
 scripts/config_whitelist.txt         |  2 +-
 27 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/README b/README
index 52545b78a19b..ea5f4cc10659 100644
--- a/README
+++ b/README
@@ -1481,7 +1481,7 @@ Configuration Settings:
 		s29ws-n MirrorBit flash has non-standard addresses for buffered
 		write commands.
 
-- CONFIG_FLASH_SHOW_PROGRESS
+- CFG_FLASH_SHOW_PROGRESS
 		If defined (must be an integer), print out countdown
 		digits and dots.  Recommended value: 45 (9..1) for 80
 		column displays, 15 (3..1) for 40 column displays.
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c1cdd2cbc3e2..75765d76ea29 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1292,7 +1292,7 @@ void flash_print_info(flash_info_t *info)
  * effect updates to digit and dots.  Repeated code is nasty too, so
  * we define it once here.
  */
-#ifdef CONFIG_FLASH_SHOW_PROGRESS
+#ifdef CFG_FLASH_SHOW_PROGRESS
 #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \
 	if (flash_verbose) { \
 		dots -= dots_sub; \
@@ -1325,17 +1325,17 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 	int buffered_size;
 #endif
-#ifdef CONFIG_FLASH_SHOW_PROGRESS
-	int digit = CONFIG_FLASH_SHOW_PROGRESS;
+#ifdef CFG_FLASH_SHOW_PROGRESS
+	int digit = CFG_FLASH_SHOW_PROGRESS;
 	int scale = 0;
 	int dots  = 0;
 
 	/*
-	 * Suppress if there are fewer than CONFIG_FLASH_SHOW_PROGRESS writes.
+	 * Suppress if there are fewer than CFG_FLASH_SHOW_PROGRESS writes.
 	 */
-	if (cnt >= CONFIG_FLASH_SHOW_PROGRESS) {
-		scale = (int)((cnt + CONFIG_FLASH_SHOW_PROGRESS - 1) /
-			CONFIG_FLASH_SHOW_PROGRESS);
+	if (cnt >= CFG_FLASH_SHOW_PROGRESS) {
+		scale = (int)((cnt + CFG_FLASH_SHOW_PROGRESS - 1) /
+			CFG_FLASH_SHOW_PROGRESS);
 	}
 #endif
 
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index bc24be79366c..67ee74ba6232 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -161,7 +161,7 @@ extern unsigned long get_sdram_size(void);
 #define CFG_SYS_NOR_FTIM3	0x0
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 /* CFI for NOR Flash */
 
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 834400f1d601..b05601489d85 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -101,7 +101,7 @@
 #define PIXIS_LBMAP_SHIFT	4
 #define PIXIS_LBMAP_ALTBANK	0x40
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index f666683bcc4b..09087a70895d 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -158,7 +158,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 53bd8e85a627..e6a9dccd752b 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -126,7 +126,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 5244c9d076f0..0d245940dc0e 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -119,7 +119,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS \
 					+ 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 022d483da763..28c59b4e66f8 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -114,7 +114,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS }
 
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 6cf8b75c86c2..640c12d91ab5 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -184,7 +184,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS \
 					+ 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index cb28ae28dd3e..dc74ed3e79d6 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -25,7 +25,7 @@
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SH_QSPI_BASE	0xE6B10000
 #else
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BASE		0x00000000
 #define CFG_SYS_FLASH_SIZE		0x04000000	/* 64 MB */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
diff --git a/include/configs/draak.h b/include/configs/draak.h
index 8140bc469c52..03972d44789b 100644
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -13,7 +13,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 21eab9b3a479..5ef51c94dab8 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -84,7 +84,7 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 
 #define CFG_SYS_FLASH_BASE		CFG_SYS_CS0_BASE
 #define	CFG_SYS_INT_FLASH_BASE	0xF0000000
diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index d1882a9646be..ced71856b434 100644
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -15,7 +15,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index a67301b9ecd6..64fb706a1ce6 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -61,7 +61,7 @@
 					FTIM2_NOR_TWP(0xb))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE_PHYS }
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 3bfb014adf11..69f9bacad97c 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -60,7 +60,7 @@
 					FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS, \
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 8a36620bf3ab..da1e409e5c77 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -92,7 +92,7 @@
 					FTIM2_NOR_TWPH(0x0e))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE_PHYS }
 
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e259cf810c0a..c79e113db4e4 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -92,7 +92,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS_EARLY	0x00000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 #endif
 #endif
 #endif
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 553ae841caba..e67ded55da6b 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -43,7 +43,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS_EARLY	0x00000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 #endif
 #endif
 
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index a34a71f649f6..0582a4568dc7 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -62,7 +62,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index bd543a37e879..ee796facc06c 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -47,7 +47,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE }
 #endif
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 12b5af1b4f2f..d029d841d51e 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -64,7 +64,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 1259df8f3a9a..73477978be46 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -61,7 +61,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index de7c0d61c05f..93909eda55dd 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -199,7 +199,7 @@
 #define CFG_FLASH_OR_PRELIM	0xfc000ff7
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 2e422cd241e9..cb48538e62b4 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -13,7 +13,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index ab199bc726a6..aadcb30d0432 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -13,7 +13,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 7f739d9ada0e..1edd49a784d4 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -36,7 +36,7 @@
 
 /* NOR */
 #ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_FLASH_SHOW_PROGRESS	10
+# define CFG_FLASH_SHOW_PROGRESS	10
 #endif
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 89f47538d4c7..c510c45d8795 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -31,7 +31,7 @@ CFG_FEC_MXC_PHYADDR
 CFG_FLASH_BR_PRELIM
 CFG_FLASH_OR_PRELIM
 CFG_FLASH_SECTOR_SIZE
-CONFIG_FLASH_SHOW_PROGRESS
+CFG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
-- 
2.25.1

[PoC 032/241] global: Migrate CONFIG_FLASH_SPANSION_S29WS_N to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 2 +-
 drivers/mtd/cfi_flash.c      | 2 +-
 include/configs/M53017EVB.h  | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index ea5f4cc10659..0c8932425cad 100644
--- a/README
+++ b/README
@@ -1477,7 +1477,7 @@ Configuration Settings:
 - CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 		Use buffered writes to flash.
 
-- CONFIG_FLASH_SPANSION_S29WS_N
+- CFG_FLASH_SPANSION_S29WS_N
 		s29ws-n MirrorBit flash has non-standard addresses for buffered
 		write commands.
 
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 75765d76ea29..f3abe7842b69 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -991,7 +991,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp,
 	case CFI_CMDSET_AMD_EXTENDED:
 		flash_unlock_seq(info, sector);
 
-#ifdef CONFIG_FLASH_SPANSION_S29WS_N
+#ifdef CFG_FLASH_SPANSION_S29WS_N
 		offset = ((unsigned long)dst - info->start[sector]) >> shift;
 #endif
 		flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER);
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index ad27766cf0f4..6d97e6ca84ab 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -93,7 +93,7 @@
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#	define CONFIG_FLASH_SPANSION_S29WS_N	1
+#	define CFG_FLASH_SPANSION_S29WS_N	1
 #	define CFG_SYS_FLASH_SIZE		0x1000000	/* Max size that the board might have */
 #endif
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c510c45d8795..16467a0bb8c9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -32,7 +32,7 @@ CFG_FLASH_BR_PRELIM
 CFG_FLASH_OR_PRELIM
 CFG_FLASH_SECTOR_SIZE
 CFG_FLASH_SHOW_PROGRESS
-CONFIG_FLASH_SPANSION_S29WS_N
+CFG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
 CONFIG_FSL_CPLD
-- 
2.25.1

[PoC 033/241] global: Migrate CONFIG_FLASH_VERIFY to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 2 +-
 common/flash.c               | 2 +-
 include/configs/mccmon6.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 0c8932425cad..02ae72e009ef 100644
--- a/README
+++ b/README
@@ -1486,7 +1486,7 @@ Configuration Settings:
 		digits and dots.  Recommended value: 45 (9..1) for 80
 		column displays, 15 (3..1) for 40 column displays.
 
-- CONFIG_FLASH_VERIFY
+- CFG_FLASH_VERIFY
 		If defined, the content of the flash (destination) is compared
 		against the source after the write operation. An error message
 		will be printed when the contents are not identical.
diff --git a/common/flash.c b/common/flash.c
index 848f44e59dfd..5ca715efad2b 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -166,7 +166,7 @@ flash_write(char *src, ulong addr, ulong cnt)
 		src  += len;
 	}
 
-#if defined(CONFIG_FLASH_VERIFY)
+#if defined(CFG_FLASH_VERIFY)
 	if (memcmp(src_orig, addr_orig, cnt_orig)) {
 		printf("\nVerify failed!\n");
 		return ERR_PROG_ERROR;
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 4be47e78d676..9b2777339a10 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -25,7 +25,7 @@
 
 /* NOR 16-bit mode */
 #define CFG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
-#define CONFIG_FLASH_VERIFY
+#define CFG_FLASH_VERIFY
 
 /* NOR Flash MTD */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 16467a0bb8c9..8f68c6e736f6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -33,7 +33,7 @@ CFG_FLASH_OR_PRELIM
 CFG_FLASH_SECTOR_SIZE
 CFG_FLASH_SHOW_PROGRESS
 CFG_FLASH_SPANSION_S29WS_N
-CONFIG_FLASH_VERIFY
+CFG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
 CONFIG_FSL_CPLD
 CONFIG_FSL_ESDHC_PIN_MUX
-- 
2.25.1

[PoC 034/241] global: Migrate CONFIG_FM_PLAT_CLK_DIV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 4 ++--
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index a6e352ceabb1..eec071022e59 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info)
 		[14] = 4,	/* CC4 PPL / 4 */
 	};
 	uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
-#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
 	uint rcw_tmp;
 #endif
 	uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
 #define FM1_CLK_SEL	0x1c000000
 #define FM1_CLK_SHIFT	26
 #endif
-#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
 #if defined(CONFIG_ARCH_T1024)
 	rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
 #else
@@ -377,7 +377,7 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_FM_PLAT_CLK_DIV
+#ifndef CFG_FM_PLAT_CLK_DIV
 	switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) {
 	case 1:
 		sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK];
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index d9e5a7d62170..29b08d56ee52 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -175,8 +175,8 @@
 #define CONFIG_PME_PLAT_CLK_DIV		2
 #define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
-#define CONFIG_FM_PLAT_CLK_DIV	1
-#define CFG_SYS_FM1_CLK		CONFIG_FM_PLAT_CLK_DIV
+#define CFG_FM_PLAT_CLK_DIV	1
+#define CFG_SYS_FM1_CLK		CFG_FM_PLAT_CLK_DIV
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE			0x6000UL
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8f68c6e736f6..09e520c3f9d8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -34,7 +34,7 @@ CFG_FLASH_SECTOR_SIZE
 CFG_FLASH_SHOW_PROGRESS
 CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
-CONFIG_FM_PLAT_CLK_DIV
+CFG_FM_PLAT_CLK_DIV
 CONFIG_FSL_CPLD
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-- 
2.25.1

[PoC 035/241] global: Migrate CONFIG_FSL_CPLD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/P2041RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index b05601489d85..f2179db6b9b4 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -88,7 +88,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS	CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_FSL_CPLD
+#define CFG_FSL_CPLD
 #define CPLD_BASE		0xffdf0000	/* CPLD registers */
 #ifdef CONFIG_PHYS_64BIT
 #define CPLD_BASE_PHYS		0xfffdf0000ull
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 09e520c3f9d8..43d331938d51 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -35,7 +35,7 @@ CFG_FLASH_SHOW_PROGRESS
 CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
-CONFIG_FSL_CPLD
+CFG_FSL_CPLD
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
-- 
2.25.1

[PoC 036/241] global: Migrate CONFIG_FSL_ESDHC_PIN_MUX to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mmc/fsl_esdhc.c       | 2 +-
 include/configs/MPC837XERDB.h | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index d5066666698c..46f0a8b813e9 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -842,7 +842,7 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv,
 #ifdef CONFIG_OF_LIBFDT
 __weak int esdhc_status_fixup(void *blob, const char *compat)
 {
-	if (IS_ENABLED(CONFIG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
+	if (IS_ENABLED(CFG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
 		do_fixup_by_compat(blob, compat, "status", "disabled",
 				sizeof("disabled"), 1);
 		return 1;
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2eea26d7bee7..9af76e830dc0 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -204,7 +204,7 @@
 #endif
 
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC_PIN_MUX
+#define CFG_FSL_ESDHC_PIN_MUX
 #define CFG_SYS_FSL_ESDHC_ADDR	CFG_SYS_MPC83xx_ESDHC_ADDR
 #endif
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43d331938d51..278fc032799a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -36,7 +36,7 @@ CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
-CONFIG_FSL_ESDHC_PIN_MUX
+CFG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
-- 
2.25.1

[PoC 037/241] global: Migrate CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 arch/powerpc/include/asm/immap_85xx.h     | 2 +-
 doc/README.fsl-dpaa                       | 4 ++--
 drivers/net/fm/eth.c                      | 2 +-
 drivers/net/fm/init.c                     | 2 +-
 include/fm_eth.h                          | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 29b08d56ee52..410ae34e9504 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -189,7 +189,7 @@
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	1
-#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#define CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
 #define CONFIG_QBMAN_CLK_DIV		1
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 283fdf3b458a..05b83952f231 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -1303,7 +1303,7 @@ typedef struct ccsr_gur {
 #define FSL_CORENET_DEVDISR2_DTSEC1_6	0x04000000
 #define FSL_CORENET_DEVDISR2_DTSEC1_9	0x00800000
 #define FSL_CORENET_DEVDISR2_DTSEC1_10	0x00400000
-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define FSL_CORENET_DEVDISR2_10GEC1_1   0x80000000
 #define FSL_CORENET_DEVDISR2_10GEC1_2   0x40000000
 #else
diff --git a/doc/README.fsl-dpaa b/doc/README.fsl-dpaa
index 3ef5eeb32e11..91c14ad12227 100644
--- a/doc/README.fsl-dpaa
+++ b/doc/README.fsl-dpaa
@@ -1,10 +1,10 @@
 This file documents Freescale DPAA-specific options.
 
 FMan (Frame Manager)
-  - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+  - CFG_FSL_FM_10GEC_REGULAR_NOTATION
 	on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below:
 		10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2
 	on SoCs T1024, etc, the notation between 10GEC and MAC as below:
 		10GEC1->MAC1, 10GEC2->MAC2
-	so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
+	so we introduce CFG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
 	which 10GEC enumeration is consistent with MAC enumeration.
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index c8381cc7133c..c84d1c0a713e 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -738,7 +738,7 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg)
 	num = fm_eth->num;
 
 #ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 	if (fm_eth->type == FM_ETH_10G_E) {
 		/* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240.
 		 * 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080.
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 618c1bccbe3f..23a25056f822 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -261,7 +261,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
 	}
 
 #ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 	/*
 	 * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same
 	 * dual-role MAC, when FM1_10GEC1 is enabled and  FM1_DTSEC9
diff --git a/include/fm_eth.h b/include/fm_eth.h
index aeb640925ee2..4f130a8d04a5 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -88,7 +88,7 @@ enum fm_eth_type {
 				offsetof(struct ccsr_fman, memac[n-1]),\
 }
 
-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define FM_TGEC_INFO_INITIALIZER(idx, n) \
 {									\
 	FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR)	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 278fc032799a..14823f42e61e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -37,7 +37,7 @@ CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
 CFG_FSL_ESDHC_PIN_MUX
-CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
-- 
2.25.1

[PoC 038/241] global: Migrate CONFIG_FSL_ISBC_KEY_EXT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/fsl_secure_boot.h     |  2 +-
 arch/powerpc/include/asm/fsl_secure_boot.h |  2 +-
 board/freescale/common/fsl_validate.c      | 18 +++++++++---------
 include/fsl_validate.h                     |  8 ++++----
 scripts/config_whitelist.txt               |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index a4f4961fc877..39265f3e7be4 100644
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -20,7 +20,7 @@
  * is copied to XIP memory
  * Also, for LS, ISBC doesn't verify this table.
  */
-#define CONFIG_FSL_ISBC_KEY_EXT
+#define CFG_FSL_ISBC_KEY_EXT
 
 #endif
 
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index e8b26802062b..033308a4ab39 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -51,7 +51,7 @@
  * The feature is only applicable in case of NOR boot and is
  * not applicable in case of RAMBOOT (NAND, SD, SPI).
  */
-#define CONFIG_FSL_ISBC_KEY_EXT
+#define CFG_FSL_ISBC_KEY_EXT
 #endif
 #endif /* #ifdef CONFIG_NXP_ESBC */
 
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 285ed9afcc9a..947c8b74c02b 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -29,7 +29,7 @@
 #define CHECK_KEY_LEN(key_len)	(((key_len) == 2 * KEY_SIZE_BYTES / 4) || \
 				 ((key_len) == 2 * KEY_SIZE_BYTES / 2) || \
 				 ((key_len) == 2 * KEY_SIZE_BYTES))
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 /* Global data structure */
 static struct fsl_secboot_glb glb;
 #endif
@@ -63,7 +63,7 @@ self:
 	goto self;
 }
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 static u32 check_ie(struct fsl_secboot_img_priv *img)
 {
 	if (img->hdr.ie_flag & IE_FLAG_MASK)
@@ -188,7 +188,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img)
 {
 #ifdef CONFIG_ESBC_HDR_LS
 	/* In LS, No SRK Flag as SRK is always present if IE not present*/
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	return !check_ie(img);
 #endif
 	return 1;
@@ -278,7 +278,7 @@ static u32 read_validate_single_key(struct fsl_secboot_img_priv *img)
 }
 #endif /* CONFIG_ESBC_HDR_LS */
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 
 static void install_ie_tbl(uintptr_t ie_tbl_addr,
 		struct fsl_secboot_img_priv *img)
@@ -434,7 +434,7 @@ void fsl_secboot_handle_error(int error)
 	case ERROR_ESBC_CLIENT_HEADER_INVALID_KEY_NUM:
 	case ERROR_ESBC_CLIENT_HEADER_INV_SRK_ENTRY_KEYLEN:
 #endif
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	/*@fallthrough@*/
 	case ERROR_ESBC_CLIENT_HEADER_IE_KEY_REVOKED:
 	case ERROR_ESBC_CLIENT_HEADER_INVALID_IE_NUM_ENTRY:
@@ -571,7 +571,7 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img)
 		key_hash = 1;
 	}
 #endif
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (!key_hash && check_ie(img))
 		key_hash = 1;
 #endif
@@ -705,7 +705,7 @@ static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img)
 	}
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (!key_found && check_ie(img)) {
 		ret = read_validate_ie_tbl(img);
 		if (ret != 0)
@@ -851,7 +851,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr)
 		return -ENOMEM;
 	memset(img, 0, sizeof(struct fsl_secboot_img_priv));
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (glb.ie_addr)
 		img->ie_addr = glb.ie_addr;
 #endif
@@ -952,7 +952,7 @@ int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
 	else
 		ret = memcmp(srk_hash, img->img_key_hash, SHA256_BYTES);
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (!hash_cmd && check_ie(img))
 		ret = 0;
 #endif
diff --git a/include/fsl_validate.h b/include/fsl_validate.h
index 252d499e7b1a..7798a6e657bc 100644
--- a/include/fsl_validate.h
+++ b/include/fsl_validate.h
@@ -69,7 +69,7 @@ struct fsl_secboot_img_hdr {
 #define MAX_KEY_ENTRIES 8
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 #define IE_FLAG_MASK 0x1
 #define SCRATCH_IE_LOW_ADR 13
 #define SCRATCH_IE_HIGH_ADR 14
@@ -155,14 +155,14 @@ struct fsl_secboot_img_hdr {
 #define MAX_KEY_ENTRIES 4
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 #define IE_FLAG_MASK 0xFFFFFFFF
 #endif
 
 #endif /* CONFIG_ESBC_HDR_LS */
 
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 struct ie_key_table {
 	u32 key_len;
 	u8 pkey[2 * KEY_SIZE_BYTES];
@@ -217,7 +217,7 @@ struct fsl_secboot_sg_table {
  * IE Table
  */
 struct fsl_secboot_glb {
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	uintptr_t ie_addr;
 	struct ie_key_info ie_tbl;
 #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 14823f42e61e..0a0be8f05f00 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -38,7 +38,7 @@ CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
 CFG_FSL_ESDHC_PIN_MUX
 CFG_FSL_FM_10GEC_REGULAR_NOTATION
-CONFIG_FSL_ISBC_KEY_EXT
+CFG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
-- 
2.25.1

[PoC 039/241] global: Migrate CONFIG_FSL_PMIC_BITLEN to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 9bb7e39f2cc2..eace4dd7e433 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -42,7 +42,7 @@ int pmic_init(unsigned char bus)
 	p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
 	p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
 	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
-	p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
+	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
 	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
 	p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
 #elif defined(CONFIG_POWER_I2C)
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 8ab1ee79a79c..d4cca8d516a6 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -25,7 +25,7 @@
 #define CONFIG_FSL_PMIC_CS	0
 #define CONFIG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
-#define CONFIG_FSL_PMIC_BITLEN	32
+#define CFG_FSL_PMIC_BITLEN	32
 
 /*
  * MMC Configs
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0a0be8f05f00..b5f3eb1236a1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -39,7 +39,7 @@ CFG_FSL_CPLD
 CFG_FSL_ESDHC_PIN_MUX
 CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CFG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_PMIC_BITLEN
+CFG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
-- 
2.25.1

[PoC 040/241] global: Migrate CONFIG_FSL_PMIC_BUS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mx51evk/mx51evk.c | 2 +-
 include/configs/mx51evk.h         | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 86364acf8ca0..95edb3599443 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -86,7 +86,7 @@ static void power_init(void)
 	struct pmic *p;
 	int ret;
 
-	ret = pmic_init(CONFIG_FSL_PMIC_BUS);
+	ret = pmic_init(CFG_FSL_PMIC_BUS);
 	if (ret)
 		return;
 
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index d4cca8d516a6..1aaa76240deb 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -21,7 +21,7 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
-#define CONFIG_FSL_PMIC_BUS	0
+#define CFG_FSL_PMIC_BUS	0
 #define CONFIG_FSL_PMIC_CS	0
 #define CONFIG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b5f3eb1236a1..3b9ec9d59f61 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -40,7 +40,7 @@ CFG_FSL_ESDHC_PIN_MUX
 CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CFG_FSL_ISBC_KEY_EXT
 CFG_FSL_PMIC_BITLEN
-CONFIG_FSL_PMIC_BUS
+CFG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
-- 
2.25.1

[PoC 041/241] global: Migrate CONFIG_FSL_PMIC_CLK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index eace4dd7e433..a576d1570b11 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -40,7 +40,7 @@ int pmic_init(unsigned char bus)
 #if defined(CONFIG_POWER_SPI)
 	p->interface = PMIC_SPI;
 	p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
-	p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
+	p->hw.spi.clk = CFG_FSL_PMIC_CLK;
 	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
 	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
 	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 1aaa76240deb..ee0782ebfebf 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -23,7 +23,7 @@
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
 #define CONFIG_FSL_PMIC_CS	0
-#define CONFIG_FSL_PMIC_CLK	2500000
+#define CFG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CFG_FSL_PMIC_BITLEN	32
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3b9ec9d59f61..d006554e3d2b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -41,7 +41,7 @@ CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CFG_FSL_ISBC_KEY_EXT
 CFG_FSL_PMIC_BITLEN
 CFG_FSL_PMIC_BUS
-CONFIG_FSL_PMIC_CLK
+CFG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
-- 
2.25.1

[PoC 042/241] global: Migrate CONFIG_FSL_PMIC_CS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index a576d1570b11..9ead212f380e 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -39,7 +39,7 @@ int pmic_init(unsigned char bus)
 
 #if defined(CONFIG_POWER_SPI)
 	p->interface = PMIC_SPI;
-	p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
+	p->hw.spi.cs = CFG_FSL_PMIC_CS;
 	p->hw.spi.clk = CFG_FSL_PMIC_CLK;
 	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
 	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ee0782ebfebf..15bc4c706fdd 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -22,7 +22,7 @@
 
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
-#define CONFIG_FSL_PMIC_CS	0
+#define CFG_FSL_PMIC_CS	0
 #define CFG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CFG_FSL_PMIC_BITLEN	32
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d006554e3d2b..a6598b01bb61 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -42,7 +42,7 @@ CFG_FSL_ISBC_KEY_EXT
 CFG_FSL_PMIC_BITLEN
 CFG_FSL_PMIC_BUS
 CFG_FSL_PMIC_CLK
-CONFIG_FSL_PMIC_CS
+CFG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
-- 
2.25.1

[PoC 043/241] global: Migrate CONFIG_FSL_PMIC_MODE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 9ead212f380e..9dc930fb305a 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -41,7 +41,7 @@ int pmic_init(unsigned char bus)
 	p->interface = PMIC_SPI;
 	p->hw.spi.cs = CFG_FSL_PMIC_CS;
 	p->hw.spi.clk = CFG_FSL_PMIC_CLK;
-	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
+	p->hw.spi.mode = CFG_FSL_PMIC_MODE;
 	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
 	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
 	p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 15bc4c706fdd..740e357e00e9 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -24,7 +24,7 @@
 #define CFG_FSL_PMIC_BUS	0
 #define CFG_FSL_PMIC_CS	0
 #define CFG_FSL_PMIC_CLK	2500000
-#define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
+#define CFG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CFG_FSL_PMIC_BITLEN	32
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a6598b01bb61..8ba453991703 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -43,7 +43,7 @@ CFG_FSL_PMIC_BITLEN
 CFG_FSL_PMIC_BUS
 CFG_FSL_PMIC_CLK
 CFG_FSL_PMIC_CS
-CONFIG_FSL_PMIC_MODE
+CFG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
-- 
2.25.1

[PoC 044/241] global: Migrate CONFIG_FSL_SDHC_V2_3 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++----
 include/fsl_esdhc.h                       | 2 +-
 include/fsl_esdhc_imx.h                   | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 410ae34e9504..d6b2b9b469a3 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM	2
 
 #elif defined(CONFIG_ARCH_P1010)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 
@@ -107,12 +107,12 @@
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
 #elif defined(CONFIG_ARCH_BSC9131)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_BSC9132)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
@@ -220,7 +220,7 @@
 
 
 #elif defined(CONFIG_ARCH_C29X)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2_1
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FSL_SEC_IDX_OFFSET	0x20000
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index 7ab1460abc6e..b2c238461a1b 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -140,7 +140,7 @@
 
 #define WML		0x2e044
 #define WML_WRITE	0x00010000
-#ifdef CONFIG_FSL_SDHC_V2_3
+#ifdef CFG_FSL_SDHC_V2_3
 #define WML_RD_WML_MAX		0x80
 #define WML_WR_WML_MAX		0x80
 #define WML_RD_WML_MAX_VAL	0x0
diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h
index b8efd2a1664c..dc789c0ba653 100644
--- a/include/fsl_esdhc_imx.h
+++ b/include/fsl_esdhc_imx.h
@@ -143,7 +143,7 @@
 
 #define WML		0x2e044
 #define WML_WRITE	0x00010000
-#ifdef CONFIG_FSL_SDHC_V2_3
+#ifdef CFG_FSL_SDHC_V2_3
 #define WML_RD_WML_MAX		0x80
 #define WML_WR_WML_MAX		0x80
 #define WML_RD_WML_MAX_VAL	0x0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8ba453991703..1093721dca5c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -44,7 +44,7 @@ CFG_FSL_PMIC_BUS
 CFG_FSL_PMIC_CLK
 CFG_FSL_PMIC_CS
 CFG_FSL_PMIC_MODE
-CONFIG_FSL_SDHC_V2_3
+CFG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_GATEWAYIP
-- 
2.25.1

[PoC 045/241] global: Migrate CONFIG_FSL_SERDES1 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc837xerdb/mpc837xerdb.c | 4 ++--
 include/configs/MPC837XERDB.h             | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 4a1455402650..9c08a2bfef02 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -146,7 +146,7 @@ int board_early_init_f(void)
 	/* we check only part num, and don't look for CPU revisions */
 	switch (PARTID_NO_E(spridr)) {
 	case SPR_8377:
-		fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
+		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
@@ -156,7 +156,7 @@ int board_early_init_f(void)
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	case SPR_8379:
-		fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
+		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 9af76e830dc0..4a3db8dec0ed 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -153,7 +153,7 @@
 #define CFG_SYS_NS16550_COM2	(CONFIG_SYS_IMMR+0x4600)
 
 /* SERDES */
-#define CONFIG_FSL_SERDES1	0xe3000
+#define CFG_FSL_SERDES1	0xe3000
 #define CONFIG_FSL_SERDES2	0xe3100
 
 /* I2C */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1093721dca5c..29d5b933b9df 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -45,7 +45,7 @@ CFG_FSL_PMIC_CLK
 CFG_FSL_PMIC_CS
 CFG_FSL_PMIC_MODE
 CFG_FSL_SDHC_V2_3
-CONFIG_FSL_SERDES1
+CFG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_GATEWAYIP
 CONFIG_GMII
-- 
2.25.1

[PoC 046/241] global: Migrate CONFIG_FSL_SERDES2 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++---
 include/configs/MPC837XERDB.h             | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 9c08a2bfef02..8b1bfe0a9f91 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -148,17 +148,17 @@ int board_early_init_f(void)
 	case SPR_8377:
 		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
-		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
+		fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	case SPR_8378:
-		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
+		fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	case SPR_8379:
 		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
-		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA,
+		fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	default:
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 4a3db8dec0ed..2e1264978908 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -154,7 +154,7 @@
 
 /* SERDES */
 #define CFG_FSL_SERDES1	0xe3000
-#define CONFIG_FSL_SERDES2	0xe3100
+#define CFG_FSL_SERDES2	0xe3100
 
 /* I2C */
 #define CFG_SYS_I2C_NOPROBES		{ {0, 0x51} }
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 29d5b933b9df..ea7eaef5d15f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -46,7 +46,7 @@ CFG_FSL_PMIC_CS
 CFG_FSL_PMIC_MODE
 CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
-CONFIG_FSL_SERDES2
+CFG_FSL_SERDES2
 CONFIG_GATEWAYIP
 CONFIG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
-- 
2.25.1

[PoC 047/241] global: Migrate CONFIG_GATEWAYIP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                             | 2 +-
 include/configs/M5208EVBE.h        | 2 +-
 include/configs/M5235EVB.h         | 2 +-
 include/configs/M5272C3.h          | 2 +-
 include/configs/M5282EVB.h         | 2 +-
 include/configs/M53017EVB.h        | 2 +-
 include/configs/M5329EVB.h         | 2 +-
 include/configs/M5373EVB.h         | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/mvebu_alleycat-5.h | 2 +-
 include/configs/uniphier.h         | 2 +-
 include/env_default.h              | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 02ae72e009ef..d76058e1ab41 100644
--- a/README
+++ b/README
@@ -750,7 +750,7 @@ The following options need to be configured:
 		(Environment variable "serverip")
 
 - Gateway IP address:
-		CONFIG_GATEWAYIP
+		CFG_GATEWAYIP
 
 		Defines a default value for the IP address of the
 		default router where packets to other networks are
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index ef3837e137c7..83ffe7ce76d9 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -21,7 +21,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5208EVBe"
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index a31d44177362..fc56834bd9be 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -30,7 +30,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5235EVB"
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 501785ac82e0..78eeca342c82 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -33,7 +33,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5272C3"
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 3912aae750d4..afc19de8ce73 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -33,7 +33,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5282EVB"
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 6d97e6ca84ab..1fcc34184928 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -34,7 +34,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M53017"
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index f8aabe4944a4..a49cf6dacb81 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -26,7 +26,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5329EVB"
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 228fcde98dc3..53434881f4c7 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -28,7 +28,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5373EVB"
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 515e88cf8206..e93b3cb97517 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -332,7 +332,7 @@
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
 #define CONFIG_SERVERIP	 192.168.1.1
-#define CONFIG_GATEWAYIP 192.168.1.1
+#define CFG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK	 255.255.255.0
 
 #define	CFG_EXTRA_ENV_SETTINGS		\
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index c8c0fc671ab0..204a9b0b5458 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -18,7 +18,7 @@
 #define CONFIG_IPADDR           0.0.0.0 /* In order to cause an error */
 #define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
 #define CONFIG_NETMASK          255.255.255.0
-#define CONFIG_GATEWAYIP        0.0.0.0
+#define CFG_GATEWAYIP        0.0.0.0
 #define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 2fe056cfef4a..874f75404712 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -48,7 +48,7 @@
  */
 #define CONFIG_SERVERIP			192.168.11.1
 #define CONFIG_IPADDR			192.168.11.10
-#define CONFIG_GATEWAYIP		192.168.11.1
+#define CFG_GATEWAYIP		192.168.11.1
 #define CONFIG_NETMASK			255.255.255.0
 
 #if defined(CONFIG_ARM64)
diff --git a/include/env_default.h b/include/env_default.h
index 1621815f257a..7d0af83a5913 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -68,8 +68,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_ROOTPATH
 	"rootpath="	CONFIG_ROOTPATH			"\0"
 #endif
-#ifdef	CONFIG_GATEWAYIP
-	"gatewayip="	__stringify(CONFIG_GATEWAYIP)	"\0"
+#ifdef	CFG_GATEWAYIP
+	"gatewayip="	__stringify(CFG_GATEWAYIP)	"\0"
 #endif
 #ifdef	CONFIG_NETMASK
 	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ea7eaef5d15f..e634d868a090 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -47,7 +47,7 @@ CFG_FSL_PMIC_MODE
 CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
 CFG_FSL_SERDES2
-CONFIG_GATEWAYIP
+CFG_GATEWAYIP
 CONFIG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
-- 
2.25.1

[PoC 048/241] global: Migrate CONFIG_GMII to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/mvneta.c          |  6 +++---
 drivers/net/mvpp2.c           | 12 ++++++------
 include/configs/MPC837XERDB.h |  2 +-
 scripts/config_whitelist.txt  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 0fbfad11d458..7bf744b483a7 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -192,7 +192,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define      MVNETA_GMAC_FORCE_LINK_PASS         BIT(1)
 #define      MVNETA_GMAC_IB_BYPASS_AN_EN         BIT(3)
 #define      MVNETA_GMAC_CONFIG_MII_SPEED        BIT(5)
-#define      MVNETA_GMAC_CONFIG_GMII_SPEED       BIT(6)
+#define      MVNETA_GMAC_CFG_GMII_SPEED       BIT(6)
 #define      MVNETA_GMAC_AN_SPEED_EN             BIT(7)
 #define      MVNETA_GMAC_SET_FC_EN               BIT(8)
 #define      MVNETA_GMAC_ADVERT_FC_EN            BIT(9)
@@ -1163,7 +1163,7 @@ static void mvneta_adjust_link(struct udevice *dev)
 
 		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
 		val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED |
-			 MVNETA_GMAC_CONFIG_GMII_SPEED |
+			 MVNETA_GMAC_CFG_GMII_SPEED |
 			 MVNETA_GMAC_CONFIG_FULL_DUPLEX |
 			 MVNETA_GMAC_AN_SPEED_EN |
 			 MVNETA_GMAC_AN_DUPLEX_EN);
@@ -1187,7 +1187,7 @@ static void mvneta_adjust_link(struct udevice *dev)
 			val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;
 
 		if (phydev->speed == SPEED_1000)
-			val |= MVNETA_GMAC_CONFIG_GMII_SPEED;
+			val |= MVNETA_GMAC_CFG_GMII_SPEED;
 		else if (pp->speed == SPEED_100)
 			val |= MVNETA_GMAC_CONFIG_MII_SPEED;
 
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 8c9afdf79aba..d9bdf2adad11 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -379,7 +379,7 @@ do {									\
 #define      MVPP2_GMAC_EN_PCS_AN		BIT(2)
 #define      MVPP2_GMAC_AN_BYPASS_EN		BIT(3)
 #define      MVPP2_GMAC_CONFIG_MII_SPEED	BIT(5)
-#define      MVPP2_GMAC_CONFIG_GMII_SPEED	BIT(6)
+#define      MVPP2_GMAC_CFG_GMII_SPEED	BIT(6)
 #define      MVPP2_GMAC_AN_SPEED_EN		BIT(7)
 #define      MVPP2_GMAC_FC_ADV_EN		BIT(9)
 #define      MVPP2_GMAC_EN_FC_AN		BIT(11)
@@ -3064,7 +3064,7 @@ static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port)
 	val = MVPP2_GMAC_EN_PCS_AN |
 		MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_CONFIG_MII_SPEED  |
-		MVPP2_GMAC_CONFIG_GMII_SPEED     |
+		MVPP2_GMAC_CFG_GMII_SPEED     |
 		MVPP2_GMAC_FC_ADV_EN    |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
@@ -3147,7 +3147,7 @@ static void gop_gmac_2500basex_cfg(struct mvpp2_port *port)
 	 */
 	val = MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_EN_PCS_AN |
-		MVPP2_GMAC_CONFIG_GMII_SPEED  |
+		MVPP2_GMAC_CFG_GMII_SPEED  |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
 	writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
@@ -3188,7 +3188,7 @@ static void gop_gmac_1000basex_cfg(struct mvpp2_port *port)
 	 */
 	val = MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_EN_PCS_AN |
-		MVPP2_GMAC_CONFIG_GMII_SPEED  |
+		MVPP2_GMAC_CFG_GMII_SPEED  |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
 	writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
@@ -4441,7 +4441,7 @@ static void mvpp2_link_event(struct mvpp2_port *port)
 
 			val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG);
 			val &= ~(MVPP2_GMAC_CONFIG_MII_SPEED |
-				 MVPP2_GMAC_CONFIG_GMII_SPEED |
+				 MVPP2_GMAC_CFG_GMII_SPEED |
 				 MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 				 MVPP2_GMAC_AN_SPEED_EN |
 				 MVPP2_GMAC_AN_DUPLEX_EN);
@@ -4451,7 +4451,7 @@ static void mvpp2_link_event(struct mvpp2_port *port)
 
 			if (phydev->speed == SPEED_1000 ||
 			    phydev->speed == 2500)
-				val |= MVPP2_GMAC_CONFIG_GMII_SPEED;
+				val |= MVPP2_GMAC_CFG_GMII_SPEED;
 			else if (phydev->speed == SPEED_100)
 				val |= MVPP2_GMAC_CONFIG_MII_SPEED;
 
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2e1264978908..dc7fe06ceb4b 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -183,7 +183,7 @@
  */
 #ifdef CONFIG_TSEC_ENET
 
-#define CONFIG_GMII			/* MII PHY management */
+#define CFG_GMII			/* MII PHY management */
 
 #define CONFIG_TSEC1
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e634d868a090..8203c5ccee12 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -48,7 +48,7 @@ CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
 CFG_FSL_SERDES2
 CFG_GATEWAYIP
-CONFIG_GMII
+CFG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
-- 
2.25.1

[PoC 049/241] global: Migrate CONFIG_G_DNL_THOR_PRODUCT_NUM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6d783e61e0d3..38d8773f9083 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -11,7 +11,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	if (!strcmp(name, "usb_dnl_thor")) {
 		put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
+		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
 		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 81f450cde6c4..b29d9b0d5bac 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -17,7 +17,7 @@
 
 /* USB Samsung's IDs */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index a1542f3f8025..c6f6246d76ce 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -22,7 +22,7 @@
 
 /* THOR */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM	0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index f898d2d9ee52..5567505c8182 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -27,7 +27,7 @@
 /* USB Samsung's IDs */
 
 #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8203c5ccee12..f2304c23b80f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -49,7 +49,7 @@ CFG_FSL_SERDES1
 CFG_FSL_SERDES2
 CFG_GATEWAYIP
 CFG_GMII
-CONFIG_G_DNL_THOR_PRODUCT_NUM
+CFG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
-- 
2.25.1

[PoC 050/241] global: Migrate CONFIG_G_DNL_THOR_VENDOR_NUM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 38d8773f9083..f883c95f9643 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -10,7 +10,7 @@
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	if (!strcmp(name, "usb_dnl_thor")) {
-		put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
+		put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
 		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index b29d9b0d5bac..defbe4bf335c 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -16,7 +16,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 /* USB Samsung's IDs */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
+#define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index c6f6246d76ce..967ba83d4510 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -21,7 +21,7 @@
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
 /* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
+#define CFG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
 #define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 5567505c8182..67d01e816f9a 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -26,7 +26,7 @@
 
 /* USB Samsung's IDs */
 
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
+#define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f2304c23b80f..f04275b6b1d4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -50,7 +50,7 @@ CFG_FSL_SERDES2
 CFG_GATEWAYIP
 CFG_GMII
 CFG_G_DNL_THOR_PRODUCT_NUM
-CONFIG_G_DNL_THOR_VENDOR_NUM
+CFG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
-- 
2.25.1

[PoC 051/241] global: Migrate CONFIG_G_DNL_UMS_PRODUCT_NUM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/dh_imx6.h        | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 include/configs/socfpga_common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index f883c95f9643..71d361548434 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -14,7 +14,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
 		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
+		put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
 	} else {
 		put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 56bb856a6dc2..a53846b762c1 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -41,7 +41,7 @@
 
 /* USB IDs */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 #endif
 
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index defbe4bf335c..f3db02d78d8b 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -19,7 +19,7 @@
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Common environment variables */
 #define ENV_ITB \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 967ba83d4510..bd8d455375dd 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -26,7 +26,7 @@
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 
 #define CFG_DFU_ALT_SYSTEM               \
 	"uImage fat 0 1;"                   \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 67d01e816f9a..d1c3f495c253 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -29,7 +29,7 @@
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 3603bb9f4a0b..dbb84ab9ad08 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -86,7 +86,7 @@
 
 /* USB IDs */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f04275b6b1d4..5da8953712a5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -51,7 +51,7 @@ CFG_GATEWAYIP
 CFG_GMII
 CFG_G_DNL_THOR_PRODUCT_NUM
 CFG_G_DNL_THOR_VENDOR_NUM
-CONFIG_G_DNL_UMS_PRODUCT_NUM
+CFG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HOSTNAME
-- 
2.25.1

[PoC 052/241] global: Migrate CONFIG_G_DNL_UMS_VENDOR_NUM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/dh_imx6.h        | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 include/configs/socfpga_common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 71d361548434..0fe20be48556 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -13,7 +13,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 		put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
-		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
+		put_unaligned(CFG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
 	} else {
 		put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index a53846b762c1..1fbdebb64511 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -40,7 +40,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
 /* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 #endif
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index f3db02d78d8b..63e26687dbce 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -18,7 +18,7 @@
 /* USB Samsung's IDs */
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Common environment variables */
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index bd8d455375dd..50213a383528 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -25,7 +25,7 @@
 #define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 
 #define CFG_DFU_ALT_SYSTEM               \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index d1c3f495c253..1e211eccee7b 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -28,7 +28,7 @@
 
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index dbb84ab9ad08..d6809f8118d7 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -85,7 +85,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
 /* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5da8953712a5..3473e7c4560b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -52,7 +52,7 @@ CFG_GMII
 CFG_G_DNL_THOR_PRODUCT_NUM
 CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
-CONFIG_G_DNL_UMS_VENDOR_NUM
+CFG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HOSTNAME
 CONFIG_HSMMC2_8BIT
-- 
2.25.1

[PoC 053/241] global: Migrate CONFIG_HDMI_ENCODER_I2C_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/T104xRDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index e6a9dccd752b..4b7b53094446 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -288,7 +288,7 @@
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /*DVI encoder*/
-#define CONFIG_HDMI_ENCODER_I2C_ADDR  0x75
+#define CFG_HDMI_ENCODER_I2C_ADDR  0x75
 #endif
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3473e7c4560b..9079fbb2e3f6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -53,7 +53,7 @@ CFG_G_DNL_THOR_PRODUCT_NUM
 CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
-CONFIG_HDMI_ENCODER_I2C_ADDR
+CFG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HOSTNAME
 CONFIG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
-- 
2.25.1

[PoC 054/241] global: Migrate CONFIG_HOSTNAME to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/M5208EVBE.h           | 2 +-
 include/configs/M5235EVB.h            | 2 +-
 include/configs/M5253DEMO.h           | 2 +-
 include/configs/M5272C3.h             | 2 +-
 include/configs/M5282EVB.h            | 2 +-
 include/configs/M53017EVB.h           | 2 +-
 include/configs/M5329EVB.h            | 2 +-
 include/configs/M5373EVB.h            | 2 +-
 include/configs/MPC837XERDB.h         | 2 +-
 include/configs/MPC8548CDS.h          | 2 +-
 include/configs/amcore.h              | 2 +-
 include/configs/aristainetos2.h       | 2 +-
 include/configs/bcm_ns3.h             | 2 +-
 include/configs/controlcenterdc.h     | 2 +-
 include/configs/gazerbeam.h           | 2 +-
 include/configs/km/km-powerpc.h       | 2 +-
 include/configs/km/pg-wcom-ls102xa.h  | 2 +-
 include/configs/kmcent2.h             | 6 +++---
 include/configs/kmcoge5ne.h           | 2 +-
 include/configs/kmeter1.h             | 2 +-
 include/configs/kmopti2.h             | 2 +-
 include/configs/kmsupx5.h             | 2 +-
 include/configs/kmtepr2.h             | 2 +-
 include/configs/kontron-sl-mx6ul.h    | 2 +-
 include/configs/kontron-sl-mx8mm.h    | 2 +-
 include/configs/m53menlo.h            | 2 +-
 include/configs/microblaze-generic.h  | 2 +-
 include/configs/novena.h              | 2 +-
 include/configs/p1_p2_rdb_pc.h        | 2 +-
 include/configs/pg-wcom-expu1.h       | 2 +-
 include/configs/pg-wcom-seli8.h       | 2 +-
 include/configs/socfpga_vining_fpga.h | 2 +-
 include/configs/stmark2.h             | 2 +-
 include/configs/tuge1.h               | 2 +-
 include/configs/tuxx1.h               | 2 +-
 include/configs/usbarmory.h           | 2 +-
 include/configs/x86-common.h          | 2 +-
 include/configs/xea.h                 | 2 +-
 include/env_default.h                 | 4 ++--
 scripts/config_whitelist.txt          | 2 +-
 40 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 83ffe7ce76d9..ce75c4cbcaf0 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -24,7 +24,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5208EVBe"
+#define CFG_HOSTNAME		"M5208EVBe"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index fc56834bd9be..8cebf099f1db 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -33,7 +33,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5235EVB"
+#define CFG_HOSTNAME		"M5235EVB"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index a1cb1a8a7022..bf31d203e664 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -42,7 +42,7 @@
 		""
 #endif
 
-#define CONFIG_HOSTNAME		"M5253DEMO"
+#define CFG_HOSTNAME		"M5253DEMO"
 
 /* I2C */
 #define CFG_SYS_I2C_PINMUX_REG	(*(u32 *) (CFG_SYS_MBAR+0x19C))
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 78eeca342c82..10bfb01a2e03 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -36,7 +36,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5272C3"
+#define CFG_HOSTNAME		"M5272C3"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index afc19de8ce73..b69e452b9e50 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -36,7 +36,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5282EVB"
+#define CFG_HOSTNAME		"M5282EVB"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 1fcc34184928..ce38b823436d 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -37,7 +37,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M53017"
+#define CFG_HOSTNAME		"M53017"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index a49cf6dacb81..2dc22a0b5af8 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -29,7 +29,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5329EVB"
+#define CFG_HOSTNAME		"M5329EVB"
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 53434881f4c7..bce4a8470f91 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -31,7 +31,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5373EVB"
+#define CFG_HOSTNAME		"M5373EVB"
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index dc7fe06ceb4b..4c3acd5b013b 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -225,7 +225,7 @@
 
 #define CONFIG_NETDEV		"eth1"
 
-#define CONFIG_HOSTNAME		"mpc837x_rdb"
+#define CFG_HOSTNAME		"mpc837x_rdb"
 #define CONFIG_ROOTPATH		"/nfsroot"
 				/* U-Boot image on TFTP server */
 #define CONFIG_UBOOTPATH	"u-boot.bin"
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index e93b3cb97517..2ce8597c0c52 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -327,7 +327,7 @@
 
 #define CONFIG_IPADDR	 192.168.1.253
 
-#define CONFIG_HOSTNAME	 "unknown"
+#define CFG_HOSTNAME	 "unknown"
 #define CONFIG_ROOTPATH	 "/nfsroot"
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 78060d432a86..18244d1be4c2 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -8,7 +8,7 @@
 #ifndef __AMCORE_CONFIG_H
 #define __AMCORE_CONFIG_H
 
-#define CONFIG_HOSTNAME			"AMCORE"
+#define CFG_HOSTNAME			"AMCORE"
 
 #define CFG_SYS_UART_PORT		0
 
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 9b11934546c1..271d15dc5e50 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -11,7 +11,7 @@
 #ifndef __ARISTAINETOS2_CONFIG_H
 #define __ARISTAINETOS2_CONFIG_H
 
-#define CONFIG_HOSTNAME		"aristainetos2"
+#define CFG_HOSTNAME		"aristainetos2"
 
 #if (CONFIG_SYS_BOARD_VERSION == 5)
 #define CONSOLE_DEV	"ttymxc1"
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 70dd2802686f..84a72bff24f0 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -9,7 +9,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_HOSTNAME			"NS3"
+#define CFG_HOSTNAME			"NS3"
 
 /* Physical Memory Map */
 #define V2M_BASE			0x80000000
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 8b31e14df31a..9cb194643492 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -21,7 +21,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_HOSTNAME		"ccdc"
+#define CFG_HOSTNAME		"ccdc"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
 #define CFG_EXTRA_ENV_SETTINGS						\
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 7ab504f35531..f86eb4c40354 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -56,7 +56,7 @@
  */
 
 /* TODO: Turn into string option and migrate to Kconfig */
-#define CONFIG_HOSTNAME		"gazerbeam"
+#define CFG_HOSTNAME		"gazerbeam"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 424caa0df977..f6c21e1666d1 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -31,7 +31,7 @@
 #define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
-	"u-boot="CONFIG_HOSTNAME "/u-boot.bin\0"		\
+	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update="							\
 		"protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
 		"erase " __stringify(BOOTFLASH_START) "  +${filesize} && "\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 64fb706a1ce6..ddeabc0f79ce 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -188,7 +188,7 @@
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
 		"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"		\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"			\
+	"u-boot=" CFG_HOSTNAME "/u-boot.bin\0"			\
 	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
 		" +${filesize} && "					\
 		"erase " __stringify(CONFIG_SYS_MONITOR_BASE)		\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 639f2075e69f..729278ebb246 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -8,8 +8,8 @@
 #ifndef __KMCENT2_H
 #define __KMCENT2_H
 
-#define CONFIG_HOSTNAME		"kmcent2"
-#define KM_BOARD_NAME	CONFIG_HOSTNAME
+#define CFG_HOSTNAME		"kmcent2"
+#define KM_BOARD_NAME	CFG_HOSTNAME
 
 /*
  * The Linux fsl_fman driver needs to be able to process frames with more
@@ -401,7 +401,7 @@ int get_scl(void);
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
 		"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"		\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"		\
+	"u-boot=" CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
 		" +${filesize} && "					\
 		"erase " __stringify(CONFIG_SYS_MONITOR_BASE)		\
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 6b30fb4b617e..8681145c309f 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmcoge5ne"
+#define CFG_HOSTNAME		"kmcoge5ne"
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 910fc1b2cb25..deffde289601 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmeter1"
+#define CFG_HOSTNAME		"kmeter1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 5050c7030390..32f5089656d9 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmopti2"
+#define CFG_HOSTNAME		"kmopti2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index e3de6c61e71c..2e666c45dc80 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmsupx5"
+#define CFG_HOSTNAME		"kmsupx5"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index a4ceb1c50d6b..e41a61f9d9d0 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME         "kmtepr2"
+#define CFG_HOSTNAME         "kmtepr2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 81ca83fdbfab..e57ae20a74ea 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -23,7 +23,7 @@
 
 /* Board and environment settings */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
-#define CONFIG_HOSTNAME			"kontron-mx6ul"
+#define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 2e21aacd1893..56d0036147c6 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	0x200000
 
 /* Board and environment settings */
-#define CONFIG_HOSTNAME			"kontron-mx8mm"
+#define CFG_HOSTNAME			"kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 4123964256bd..979fddab5e32 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -84,7 +84,7 @@
 /*
  * Extra Environments
  */
-#define CONFIG_HOSTNAME		"m53menlo"
+#define CFG_HOSTNAME		"m53menlo"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index ede4ffd53f4e..53498e1c78d8 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -16,7 +16,7 @@
 # define CFG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define	CONFIG_HOSTNAME		"microblaze-generic"
+#define	CFG_HOSTNAME		"microblaze-generic"
 
 /* architecture dependent code */
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 19b40070be92..520c4ba130f1 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -25,7 +25,7 @@
  */
 
 /* Booting Linux */
-#define CONFIG_HOSTNAME			"novena"
+#define CFG_HOSTNAME			"novena"
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 93909eda55dd..de6440a07564 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -418,7 +418,7 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_HOSTNAME		"unknown"
+#define CFG_HOSTNAME		"unknown"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 1b72739d143d..5b5637762aca 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -7,7 +7,7 @@
 #define __CONFIG_PG_WCOM_EXPU1_H
 
 #define WCOM_EXPU1
-#define CONFIG_HOSTNAME				"EXPU1"
+#define CFG_HOSTNAME				"EXPU1"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index e4bcae5bb5e1..a1c1ca993d7e 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_PG_WCOM_SELI8_H
 #define __CONFIG_PG_WCOM_SELI8_H
 
-#define CONFIG_HOSTNAME			"SELI8"
+#define CFG_HOSTNAME			"SELI8"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index cd48650dd554..31ebf34c1c68 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -13,7 +13,7 @@
 /* Booting Linux */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME			"socfpga_vining_fpga"
+#define CFG_HOSTNAME			"socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index be0193105b4b..63040adf97cb 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -8,7 +8,7 @@
 #ifndef __STMARK2_CONFIG_H
 #define __STMARK2_CONFIG_H
 
-#define CONFIG_HOSTNAME			"stmark2"
+#define CFG_HOSTNAME			"stmark2"
 
 #define CFG_SYS_UART_PORT		0
 
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index d43ccbe8dd94..7ddb44124c2f 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuge1"
+#define CFG_HOSTNAME		"tuge1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 7eed31c35f03..d18c57c4d198 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuxx1"
+#define CFG_HOSTNAME		"tuxx1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index f273533be429..b2153b441142 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -28,7 +28,7 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* Linux boot */
-#define CONFIG_HOSTNAME		"usbarmory"
+#define CFG_HOSTNAME		"usbarmory"
 
 #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7705d31a313a..fdd7dba9a6f2 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -42,7 +42,7 @@
 
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_HOSTNAME		"x86"
+#define CFG_HOSTNAME		"x86"
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS	"othbootargs=\0"
diff --git a/include/configs/xea.h b/include/configs/xea.h
index 50b96f31e163..974ed4224bc5 100644
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -26,7 +26,7 @@
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		"xea"
+#define CFG_HOSTNAME		"xea"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"bootmode=update\0"						\
diff --git a/include/env_default.h b/include/env_default.h
index 7d0af83a5913..b1fe945bae5b 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -74,8 +74,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_NETMASK
 	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
 #endif
-#ifdef	CONFIG_HOSTNAME
-	"hostname="	CONFIG_HOSTNAME	"\0"
+#ifdef	CFG_HOSTNAME
+	"hostname="	CFG_HOSTNAME	"\0"
 #endif
 #ifdef CONFIG_USE_BOOTFILE
 	"bootfile="	CONFIG_BOOTFILE			"\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9079fbb2e3f6..0fc29f456c13 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -54,7 +54,7 @@ CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HOSTNAME
+CFG_HOSTNAME
 CONFIG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
-- 
2.25.1

[PoC 055/241] global: Migrate CONFIG_HSMMC2_8BIT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mmc/omap_hsmmc.c     | 2 +-
 include/configs/am335x_shc.h | 2 +-
 include/configs/am57xx_evm.h | 2 +-
 include/configs/cm_t43.h     | 2 +-
 include/configs/dra7xx_evm.h | 2 +-
 include/configs/omap5_uevm.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index a2595d19e7f6..80dd70f087e2 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -1560,7 +1560,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
 	defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
 	defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \
-		defined(CONFIG_HSMMC2_8BIT)
+		defined(CFG_HSMMC2_8BIT)
 		/* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */
 		host_caps_val |= MMC_MODE_8BIT;
 #endif
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index c66650c8e8d1..577a622d42c9 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -20,7 +20,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 #ifndef CONFIG_SPL_BUILD
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index dacfd41ccedf..afacf70e74a9 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -36,7 +36,7 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 /* CPSW Ethernet */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at 1G */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 06de4dbeb6d5..5a795fe99171 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -36,7 +36,7 @@
  * we don't need to do it twice.
  */
 
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 #include <configs/ti_armv7_omap.h>
 
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index ac3fcacc68ed..30def6abf8f4 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -49,7 +49,7 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 /*
  * Default to using SPI for environment, etc.
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index d7fa2d43914a..8a9a6dfc4c34 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -33,7 +33,7 @@
 /* MMC ENV related defines */
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CFG_SYS_I2C_TCA642X_BUS_NUM 4
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0fc29f456c13..d7265e370d05 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -55,7 +55,7 @@ CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
 CFG_HOSTNAME
-CONFIG_HSMMC2_8BIT
+CFG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
-- 
2.25.1

[PoC 056/241] global: Migrate CONFIG_HW_ENV_SETTINGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 4 ++--
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index ddeabc0f79ce..80027f3a773a 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -217,7 +217,7 @@
 		"protect on " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
-#define CONFIG_HW_ENV_SETTINGS						\
+#define CFG_HW_ENV_SETTINGS						\
 	"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi,"	\
 			"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6,"	\
 			"asrc,spdif,lpuart1,ftm1\0"
@@ -225,7 +225,7 @@
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
 	CONFIG_KM_DEF_ENV						\
-	CONFIG_HW_ENV_SETTINGS						\
+	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	"ethrotate=no\0"						\
 	""
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 729278ebb246..d7d5bce15c59 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -423,7 +423,7 @@ int get_scl(void);
 	"fpgacfg=true\0"						\
 	""
 
-#define CONFIG_HW_ENV_SETTINGS						\
+#define CFG_HW_ENV_SETTINGS						\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline\0"			\
 	"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0"		\
 	"usb_dr_mode=host\0"
@@ -445,7 +445,7 @@ int get_scl(void);
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
-	CONFIG_HW_ENV_SETTINGS						\
+	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	""
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d7265e370d05..44956bff3940 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -56,7 +56,7 @@ CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
 CFG_HOSTNAME
 CFG_HSMMC2_8BIT
-CONFIG_HW_ENV_SETTINGS
+CFG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
-- 
2.25.1

[PoC 057/241] global: Migrate CONFIG_I2C_ENV_EEPROM_BUS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 env/Kconfig                  |  4 ++--
 env/eeprom.c                 | 18 +++++++++---------
 scripts/config_whitelist.txt |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/env/Kconfig b/env/Kconfig
index 5a7e2f299b06..1c7a414321ce 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -78,12 +78,12 @@ config ENV_IS_IN_EEPROM
 	  still be one byte because the extra address bits are hidden
 	  in the chip address.
 
-	  - CONFIG_I2C_ENV_EEPROM_BUS
+	  - CFG_I2C_ENV_EEPROM_BUS
 	  if you have an Environment on an EEPROM reached over
 	  I2C muxes, you can define here, how to reach this
 	  EEPROM. For example:
 
-	  #define CONFIG_I2C_ENV_EEPROM_BUS	  1
+	  #define CFG_I2C_ENV_EEPROM_BUS	  1
 
 	  EEPROM which holds the environment, is reached over
 	  a pca9547 i2c mux with address 0x70, channel 3.
diff --git a/env/eeprom.c b/env/eeprom.c
index f8556a47213c..192e0f3af6d0 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -15,7 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 #include <i2c.h>
 #endif
 #include <search.h>
@@ -28,16 +28,16 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
 			   uchar *buffer, unsigned cnt)
 {
 	int rcode;
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	int old_bus = i2c_get_bus_num();
 
-	if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS)
-		i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS);
+	if (old_bus != CFG_I2C_ENV_EEPROM_BUS)
+		i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS);
 #endif
 
 	rcode = eeprom_read(dev_addr, offset, buffer, cnt);
 
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	i2c_set_bus_num(old_bus);
 #endif
 
@@ -48,16 +48,16 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
 			    uchar *buffer, unsigned cnt)
 {
 	int rcode;
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	int old_bus = i2c_get_bus_num();
 
-	if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS)
-		i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS);
+	if (old_bus != CFG_I2C_ENV_EEPROM_BUS)
+		i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS);
 #endif
 
 	rcode = eeprom_write(dev_addr, offset, buffer, cnt);
 
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	i2c_set_bus_num(old_bus);
 #endif
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 44956bff3940..440bef90575d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -57,7 +57,7 @@ CFG_HDMI_ENCODER_I2C_ADDR
 CFG_HOSTNAME
 CFG_HSMMC2_8BIT
 CFG_HW_ENV_SETTINGS
-CONFIG_I2C_ENV_EEPROM_BUS
+CFG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
 CONFIG_I2C_MVTWSI_BASE0
-- 
2.25.1

[PoC 058/241] global: Migrate CONFIG_I2C_MULTI_BUS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                               |  8 ++++----
 cmd/i2c.c                            | 12 ++++++------
 drivers/i2c/mv_i2c.c                 |  4 ++--
 include/configs/display5.h           |  2 +-
 include/configs/km/pg-wcom-ls102xa.h |  2 +-
 include/configs/novena.h             |  2 +-
 include/configs/omap3_beagle.h       |  2 +-
 include/configs/sniper.h             |  2 +-
 include/configs/tqma6.h              |  2 +-
 include/i2c.h                        |  2 +-
 scripts/config_whitelist.txt         |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README b/README
index d76058e1ab41..50bfd7e4fffc 100644
--- a/README
+++ b/README
@@ -1006,7 +1006,7 @@ The following options need to be configured:
 		You should define these to the GPIO value as given directly to
 		the generic GPIO functions.
 
-		CONFIG_I2C_MULTI_BUS
+		CFG_I2C_MULTI_BUS
 
 		This option allows the use of multiple I2C buses, each of which
 		must have a controller.	 At any point in time, only one bus is
@@ -1016,17 +1016,17 @@ The following options need to be configured:
 		CFG_SYS_I2C_NOPROBES
 
 		This option specifies a list of I2C devices that will be skipped
-		when the 'i2c probe' command is issued.	 If CONFIG_I2C_MULTI_BUS
+		when the 'i2c probe' command is issued.	 If CFG_I2C_MULTI_BUS
 		is set, specify a list of bus-device pairs.  Otherwise, specify
 		a 1D array of device addresses
 
 		e.g.
-			#undef	CONFIG_I2C_MULTI_BUS
+			#undef	CFG_I2C_MULTI_BUS
 			#define CFG_SYS_I2C_NOPROBES {0x50,0x68}
 
 		will skip addresses 0x50 and 0x68 on a board with one I2C bus
 
-			#define CONFIG_I2C_MULTI_BUS
+			#define CFG_I2C_MULTI_BUS
 			#define CFG_SYS_I2C_NOPROBES	{{0,0x50},{0,0x68},{1,0x54}}
 
 		will skip addresses 0x50 and 0x68 on bus 0 and address 0x54 on bus 1
diff --git a/cmd/i2c.c b/cmd/i2c.c
index da8b4c255555..2f9acc6670a3 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -98,7 +98,7 @@ static uint	i2c_mm_last_alen;
  * pairs.  The following macros take care of this */
 
 #if defined(CFG_SYS_I2C_NOPROBES)
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS)
 static struct
 {
 	uchar	bus;
@@ -1764,7 +1764,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
  * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
  * on error.
  */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) || \
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) || \
 		CONFIG_IS_ENABLED(DM_I2C)
 static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
 			  char *const argv[])
@@ -1916,9 +1916,9 @@ static struct cmd_tbl cmd_i2c_sub[] = {
 #endif
 	U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""),
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \
-	defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
+	defined(CFG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
 	U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""),
-#endif  /* CONFIG_I2C_MULTI_BUS */
+#endif  /* CFG_I2C_MULTI_BUS */
 #if defined(CONFIG_I2C_EDID)
 	U_BOOT_CMD_MKENT(edid, 1, 1, do_edid, "", ""),
 #endif  /* CONFIG_I2C_EDID */
@@ -1993,9 +1993,9 @@ static char i2c_help_text[] =
 #endif
 	"crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \
-	defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
+	defined(CFG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
 	"i2c dev [dev] - show or set current I2C bus\n"
-#endif  /* CONFIG_I2C_MULTI_BUS */
+#endif  /* CFG_I2C_MULTI_BUS */
 #if defined(CONFIG_I2C_EDID)
 	"i2c edid chip - print EDID configuration information\n"
 #endif  /* CONFIG_I2C_EDID */
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 8ee17f0a4501..dffd551f2c29 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -374,7 +374,7 @@ static int __i2c_write(struct mv_i2c *base, uchar chip, u8 *addr, int alen,
 
 static struct mv_i2c *base_glob;
 
-#ifdef CONFIG_I2C_MULTI_BUS
+#ifdef CFG_I2C_MULTI_BUS
 static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
 static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
 static unsigned int current_bus;
@@ -407,7 +407,7 @@ void i2c_init(int speed, int slaveaddr)
 {
 	u32 val;
 
-#ifdef CONFIG_I2C_MULTI_BUS
+#ifdef CFG_I2C_MULTI_BUS
 	current_bus = 0;
 	base_glob = (struct mv_i2c *)i2c_regs[current_bus];
 #else
diff --git a/include/configs/display5.h b/include/configs/display5.h
index f95c1602e676..191c8fb8ab46 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -37,7 +37,7 @@
 #define CONFIG_MXC_UART_BASE		UART5_BASE
 
 /* I2C Configs */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 80027f3a773a..e64cf24bd5e9 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -154,7 +154,7 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 #define CFG_SYS_I2C_MAX_HOPS		1
 #define CFG_SYS_NUM_I2C_BUSES	3
 #define I2C_MUX_PCA_ADDR		0x70
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 520c4ba130f1..af99ba4f193c 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -35,7 +35,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* I2C */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* I2C EEPROM */
 
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index efeb7bf10078..af7cb3513f8f 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -29,7 +29,7 @@
 #endif /* CONFIG_MTD_RAW_NAND */
 
 /* Enable Multi Bus support for I2C */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* DSS Support */
 
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index eaee8dd37396..45a3102aeeef 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -38,7 +38,7 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /*
  * Input
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 14d7730f67bf..cb5f7fc25af9 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -28,7 +28,7 @@
 #define TQMA6_SPI_FLASH_SECTOR_SIZE	SZ_64K
 
 /* I2C Configs */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 #if !defined(CONFIG_DM_PMIC)
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
diff --git a/include/i2c.h b/include/i2c.h
index 51390f8fd84f..3811b26c08e0 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -930,7 +930,7 @@ unsigned int i2c_get_bus_speed(void);
  * only for backwardcompatibility, should go away if we switched
  * completely to new multibus support.
  */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS)
 # if !defined(CFG_SYS_MAX_I2C_BUS)
 #  define CFG_SYS_MAX_I2C_BUS		2
 # endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 440bef90575d..501e39bb4900 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -58,7 +58,7 @@ CFG_HOSTNAME
 CFG_HSMMC2_8BIT
 CFG_HW_ENV_SETTINGS
 CFG_I2C_ENV_EEPROM_BUS
-CONFIG_I2C_MULTI_BUS
+CFG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
 CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
-- 
2.25.1

[PoC 059/241] global: Migrate CONFIG_I2C_MVTWSI to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-sunxi/i2c.h        |  6 ++--
 arch/arm/mach-kirkwood/include/mach/config.h |  2 +-
 arch/arm/mach-mvebu/include/mach/config.h    |  2 +-
 drivers/i2c/mvtwsi.c                         | 38 ++++++++++----------
 include/configs/db-88f6720.h                 |  2 +-
 include/configs/db-88f6820-gp.h              |  2 +-
 include/configs/db-mv784mp-gp.h              |  2 +-
 include/configs/ds414.h                      |  2 +-
 include/configs/maxbcm.h                     |  2 +-
 include/configs/theadorable.h                |  4 +--
 scripts/config_whitelist.txt                 |  6 ++--
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h
index 241b44928a95..f0da46d863cf 100644
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -8,13 +8,13 @@
 #include <asm/arch/cpu.h>
 
 #ifdef CONFIG_I2C0_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
+#define CFG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
 #endif
 #ifdef CONFIG_I2C1_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
+#define CFG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
 #endif
 #ifdef CONFIG_R_I2C_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
+#define CFG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
 #endif
 
 /* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index a6de7676294b..fbef9c99b1d3 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -24,7 +24,7 @@
 
 #include <asm/arch/soc.h>
 
-#define CONFIG_I2C_MVTWSI_BASE0	KW_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0	KW_TWSI_BASE
 #define MV_UART_CONSOLE_BASE	KW_UART0_BASE
 #define MV_SATA_BASE		KW_SATA_BASE
 #define MV_SATA_PORT0_OFFSET	KW_SATA_PORT0_OFFSET
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 2e06f2bdaee3..19f9f083129b 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -35,7 +35,7 @@
  */
 #ifdef CONFIG_CMD_I2C
 #ifndef CONFIG_SYS_I2C_SOFT
-#define CONFIG_I2C_MVTWSI
+#define CFG_I2C_MVTWSI
 #endif
 #endif
 
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index a9c7d6e1bc26..55f9b983e884 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -25,7 +25,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /*
- * Include a file that will provide CONFIG_I2C_MVTWSI_BASE*, and possibly other
+ * Include a file that will provide CFG_I2C_MVTWSI_BASE*, and possibly other
  * settings
  */
 
@@ -197,29 +197,29 @@ inline uint calc_tick(uint speed)
 static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
 {
 	switch (adap->hwadapnr) {
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 	case 0:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 	case 1:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE2
+#ifdef CFG_I2C_MVTWSI_BASE2
 	case 2:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE2;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE2;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE3
+#ifdef CFG_I2C_MVTWSI_BASE3
 	case 3:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE3;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE3;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE4
+#ifdef CFG_I2C_MVTWSI_BASE4
 	case 4:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE4;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE4;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE5
+#ifdef CFG_I2C_MVTWSI_BASE5
 	case 5:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE5;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE5;
 #endif
 	default:
 		printf("Missing mvtwsi controller %d base\n", adap->hwadapnr);
@@ -737,41 +737,41 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
 				10000);
 }
 
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0)
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 1)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE2
+#ifdef CFG_I2C_MVTWSI_BASE2
 U_BOOT_I2C_ADAP_COMPLETE(twsi2, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 2)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE3
+#ifdef CFG_I2C_MVTWSI_BASE3
 U_BOOT_I2C_ADAP_COMPLETE(twsi3, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 3)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE4
+#ifdef CFG_I2C_MVTWSI_BASE4
 U_BOOT_I2C_ADAP_COMPLETE(twsi4, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 4)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE5
+#ifdef CFG_I2C_MVTWSI_BASE5
 U_BOOT_I2C_ADAP_COMPLETE(twsi5, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index ef9c457e1020..54de2d0d8334 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -17,7 +17,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* USB/EHCI configuration */
 
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 6dbf582d733b..2cbe4eb440b4 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -11,7 +11,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* Environment in SPI NOR flash */
 
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index bf8b35102ad7..5c6d7fa1b776 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -13,7 +13,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* USB/EHCI configuration */
 
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index e69883ba73bc..9446acba7923 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -17,7 +17,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 5ad945b55896..413597e09b26 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -19,7 +19,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* SPI NOR flash default params, used by sf commands */
 
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 9722b0db72aa..2ce92845f1c0 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -25,8 +25,8 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
 
 /* USB/EHCI configuration */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 501e39bb4900..1798a7420cd7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -59,9 +59,9 @@ CFG_HSMMC2_8BIT
 CFG_HW_ENV_SETTINGS
 CFG_I2C_ENV_EEPROM_BUS
 CFG_I2C_MULTI_BUS
-CONFIG_I2C_MVTWSI
-CONFIG_I2C_MVTWSI_BASE0
-CONFIG_I2C_MVTWSI_BASE1
+CFG_I2C_MVTWSI
+CFG_I2C_MVTWSI_BASE0
+CFG_I2C_MVTWSI_BASE1
 CONFIG_I2C_RTC_ADDR
 CONFIG_ICS307_REFCLK_HZ
 CONFIG_IMX6_PWM_PER_CLK
-- 
2.25.1

[PoC 060/241] global: Migrate CONFIG_I2C_RTC_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/eb_cpu5282.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 5ef51c94dab8..a4370ca5c7cc 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -150,7 +150,7 @@
  */
 
 #ifdef CONFIG_CMD_DATE
-#define CONFIG_I2C_RTC_ADDR		0x68
+#define CFG_I2C_RTC_ADDR		0x68
 #endif
 
 #endif	/* _CONFIG_M5282EVB_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1798a7420cd7..e507dca614f5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -62,7 +62,7 @@ CFG_I2C_MULTI_BUS
 CFG_I2C_MVTWSI
 CFG_I2C_MVTWSI_BASE0
 CFG_I2C_MVTWSI_BASE1
-CONFIG_I2C_RTC_ADDR
+CFG_I2C_RTC_ADDR
 CONFIG_ICS307_REFCLK_HZ
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IPADDR
-- 
2.25.1

[PoC 061/241] global: Migrate CONFIG_ICS307_REFCLK_HZ to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/ics307_clk.c | 4 ++--
 include/configs/T208xQDS.h          | 2 +-
 include/configs/T208xRDB.h          | 2 +-
 include/configs/T4240RDB.h          | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index 01662d36e9fb..5f95571d24cc 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -50,7 +50,7 @@ static u8 ics307_s_to_od[] = {
  */
 unsigned long ics307_sysclk_calculator(unsigned long out_freq)
 {
-	const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ;
+	const unsigned long input_freq = CFG_ICS307_REFCLK_HZ;
 	unsigned long vdw, rdw, odp, s_vdw = 0, s_rdw = 0, s_odp = 0, od;
 	unsigned long tmp_out, diff, result = 0;
 	int found = 0;
@@ -101,7 +101,7 @@ unsigned long ics307_sysclk_calculator(unsigned long out_freq)
  */
 static unsigned long ics307_clk_freq(u8 cw0, u8 cw1, u8 cw2)
 {
-	const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ;
+	const unsigned long input_freq = CFG_ICS307_REFCLK_HZ;
 	unsigned long vdw = ((cw1 << 1) & 0x1FE) + ((cw2 >> 7) & 1);
 	unsigned long rdw = cw2 & 0x7F;
 	unsigned long od = ics307_s_to_od[cw0 & 0x7];
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 0d245940dc0e..c614a539b391 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -13,7 +13,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
+#define CFG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 
 /* High Level Configuration Options */
 
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 28c59b4e66f8..2da4f5a09b14 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -13,7 +13,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
+#define CFG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 
 /* High Level Configuration Options */
 
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 640c12d91ab5..b8bfc52f07ae 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -12,7 +12,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_ICS307_REFCLK_HZ		25000000  /* ICS307 ref clk freq */
+#define CFG_ICS307_REFCLK_HZ		25000000  /* ICS307 ref clk freq */
 
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e507dca614f5..9516ba848bfc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -63,7 +63,7 @@ CFG_I2C_MVTWSI
 CFG_I2C_MVTWSI_BASE0
 CFG_I2C_MVTWSI_BASE1
 CFG_I2C_RTC_ADDR
-CONFIG_ICS307_REFCLK_HZ
+CFG_ICS307_REFCLK_HZ
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IPADDR
 CONFIG_IRAM_BASE
-- 
2.25.1

[PoC 062/241] global: Migrate CONFIG_IMX6_PWM_PER_CLK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pwm/pwm-imx.c         | 2 +-
 include/configs/vining_2000.h | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 9b8a8c189d09..8fbb40cc2767 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -76,7 +76,7 @@ int pwm_imx_get_parms(int period_ns, int duty_ns, unsigned long *period_c,
 	 * value here as a define. Replace it when we have the clock
 	 * framework.
 	 */
-	c = CONFIG_IMX6_PWM_PER_CLK;
+	c = CFG_IMX6_PWM_PER_CLK;
 	c = c * period_ns;
 	do_div(c, 1000000000);
 	*period_c = c;
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index c84353ebea66..cdd2eeef0ac9 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -43,7 +43,7 @@
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
 #endif
 
-#define CONFIG_IMX6_PWM_PER_CLK 66000000
+#define CFG_IMX6_PWM_PER_CLK 66000000
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9516ba848bfc..48de265ee7e1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -64,7 +64,7 @@ CFG_I2C_MVTWSI_BASE0
 CFG_I2C_MVTWSI_BASE1
 CFG_I2C_RTC_ADDR
 CFG_ICS307_REFCLK_HZ
-CONFIG_IMX6_PWM_PER_CLK
+CFG_IMX6_PWM_PER_CLK
 CONFIG_IPADDR
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
-- 
2.25.1

[PoC 063/241] global: Migrate CONFIG_IPADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                             | 2 +-
 doc/README.usb                     | 2 +-
 include/configs/M5208EVBE.h        | 2 +-
 include/configs/M5235EVB.h         | 2 +-
 include/configs/M5272C3.h          | 2 +-
 include/configs/M5282EVB.h         | 2 +-
 include/configs/M53017EVB.h        | 2 +-
 include/configs/M5329EVB.h         | 2 +-
 include/configs/M5373EVB.h         | 2 +-
 include/configs/MCR3000.h          | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/apalis-imx8.h      | 2 +-
 include/configs/apalis-tk1.h       | 4 ++--
 include/configs/apalis_imx6.h      | 4 ++--
 include/configs/cobra5272.h        | 2 +-
 include/configs/colibri-imx6ull.h  | 2 +-
 include/configs/colibri-imx8x.h    | 2 +-
 include/configs/colibri_imx6.h     | 4 ++--
 include/configs/colibri_imx7.h     | 2 +-
 include/configs/colibri_vf.h       | 2 +-
 include/configs/gw_ventana.h       | 2 +-
 include/configs/integratorcp.h     | 2 +-
 include/configs/mt7622.h           | 2 +-
 include/configs/mt7623.h           | 2 +-
 include/configs/mt7629.h           | 2 +-
 include/configs/mvebu_alleycat-5.h | 2 +-
 include/configs/poleg.h            | 2 +-
 include/configs/uniphier.h         | 2 +-
 include/env_default.h              | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 30 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README b/README
index 50bfd7e4fffc..d09ebd47cd83 100644
--- a/README
+++ b/README
@@ -735,7 +735,7 @@ The following options need to be configured:
 		command issued before MII status register can be read
 
 - IP address:
-		CONFIG_IPADDR
+		CFG_IPADDR
 
 		Define a default value for the IP address to use for
 		the default Ethernet interface, in case this is not
diff --git a/doc/README.usb b/doc/README.usb
index 650a6daae0a5..495b1859a771 100644
--- a/doc/README.usb
+++ b/doc/README.usb
@@ -162,7 +162,7 @@ common executable is discouraged, as it leads to potential conflicts,
 and all the parameters can either get stored in the board's external
 environment, or get obtained from the bootp server if not set.
 
-#define CONFIG_IPADDR		10.0.0.2  (replace with your value)
+#define CFG_IPADDR		10.0.0.2  (replace with your value)
 #define CONFIG_SERVERIP		10.0.0.1  (replace with your value)
 #define CONFIG_BOOTFILE		"uImage"
 
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index ce75c4cbcaf0..647e23f380b8 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -18,7 +18,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 8cebf099f1db..7bc86eb8b5f6 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -27,7 +27,7 @@
 
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 10bfb01a2e03..4b88cfc2cdd9 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -30,7 +30,7 @@
 	env/embedded.o(.text);
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index b69e452b9e50..f34985c47d4b 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -30,7 +30,7 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index ce38b823436d..5afd8383c1bd 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -31,7 +31,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 2dc22a0b5af8..9d5f0e1c0964 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -23,7 +23,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index bce4a8470f91..807d591c9f12 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -25,7 +25,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 6e7b6e81208f..d61ed82ab3bf 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -52,7 +52,7 @@
 		"${ofl_args}; "						\
 		"bootm ${loadaddr} - 0xf00000\0"
 
-#define CONFIG_IPADDR			192.168.0.3
+#define CFG_IPADDR			192.168.0.3
 #define CONFIG_SERVERIP			192.168.0.1
 #define CONFIG_NETMASK			255.0.0.0
 
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 2ce8597c0c52..d2a70aa88f88 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -325,7 +325,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_IPADDR	 192.168.1.253
+#define CFG_IPADDR	 192.168.1.253
 
 #define CFG_HOSTNAME	 "unknown"
 #define CONFIG_ROOTPATH	 "/nfsroot"
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 15bedc0afc29..0258a70d923b 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -14,7 +14,7 @@
 #define USDHC2_BASE_ADDR		0x5b020000
 
 /* Networking */
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index f0a02ae17953..4db3465cd9b7 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -33,8 +33,8 @@
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR		192.168.10.2
+#undef CFG_IPADDR
+#define CFG_IPADDR		192.168.10.2
 #define CONFIG_NETMASK		255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP		192.168.10.1
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 4899dfb4dee1..8db2909c96b2 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -35,8 +35,8 @@
 
 /* Command definition */
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR			192.168.10.2
+#undef CFG_IPADDR
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 6d6e2fc69620..1b5115f7caf1 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -91,7 +91,7 @@ enter a valid image address in flash */
 
 /* User network settings */
 
-#define CONFIG_IPADDR 192.168.100.2		/* default board IP address */
+#define CFG_IPADDR 192.168.100.2		/* default board IP address */
 #define CONFIG_SERVERIP 192.168.100.1	/* default tftp server IP address */
 
 #endif
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index a748d4f3169f..4f5287b6bcfb 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 #define CFG_SYS_FSL_USDHC_NUM	1
 
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index e4bb71d47d62..35f29da0c351 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -14,7 +14,7 @@
 #define USDHC1_BASE_ADDR		0x5b010000
 #define USDHC2_BASE_ADDR		0x5b020000
 
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 0486db6b51ed..2f30322bb4f8 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -30,8 +30,8 @@
 
 /* Command definition */
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR			192.168.10.2
+#undef CFG_IPADDR
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 99ed8183ef21..0da7553e0245 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -21,7 +21,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index ef49969598c9..808d69d0c865 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -16,7 +16,7 @@
 
 /* NAND support */
 
-#define CONFIG_IPADDR		192.168.10.2
+#define CFG_IPADDR		192.168.10.2
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4d0a78c6269c..e71f10a24fa1 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -57,7 +57,7 @@
 /* Persistent Environment Config */
 
 /* Environment */
-#define CONFIG_IPADDR             192.168.1.1
+#define CFG_IPADDR             192.168.1.1
 #define CONFIG_SERVERIP           192.168.1.146
 
 #endif			       /* __CONFIG_H */
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 25bb41ebc46c..ccf73604480b 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_HZ_CLOCK		1000000	/* Timer 1 is clocked at 1Mhz */
 
 #define CONFIG_SERVERIP 192.168.1.100
-#define CONFIG_IPADDR 192.168.1.104
+#define CFG_IPADDR 192.168.1.104
 
 /*
  * Miscellaneous configurable options
diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index 8c297266d8b1..199da46ad018 100644
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -18,7 +18,7 @@
 #define CFG_SYS_SDRAM_BASE		0x40000000
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
+#define CFG_IPADDR			192.168.1.1
 #define CONFIG_SERVERIP			192.168.1.3
 
 #endif
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 031c1aea0c00..d3cf6597a633 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -33,7 +33,7 @@
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
+#define CFG_IPADDR			192.168.1.1
 #define CONFIG_SERVERIP			192.168.1.2
 
 #ifdef CONFIG_DISTRO_DEFAULTS
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index bfa44aacc726..8c0b02b40e50 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_SDRAM_BASE		0x40000000
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
+#define CFG_IPADDR			192.168.1.1
 #define CONFIG_SERVERIP			192.168.1.2
 
 #endif
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 204a9b0b5458..0d38645c0e60 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -15,7 +15,7 @@
 				      115200, 230400, 460800, 921600 }
 
 /* Default Env vars */
-#define CONFIG_IPADDR           0.0.0.0 /* In order to cause an error */
+#define CFG_IPADDR           0.0.0.0 /* In order to cause an error */
 #define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
 #define CONFIG_NETMASK          255.255.255.0
 #define CFG_GATEWAYIP        0.0.0.0
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index 7998ef7347fb..3e4309512cc1 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -15,7 +15,7 @@
 
 /* Default environemnt variables */
 #define CONFIG_SERVERIP                 192.168.0.1
-#define CONFIG_IPADDR                   192.168.0.2
+#define CFG_IPADDR                   192.168.0.2
 #define CONFIG_NETMASK                  255.255.255.0
 #define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 874f75404712..3ec3caade49c 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -47,7 +47,7 @@
  * Network Configuration
  */
 #define CONFIG_SERVERIP			192.168.11.1
-#define CONFIG_IPADDR			192.168.11.10
+#define CFG_IPADDR			192.168.11.10
 #define CFG_GATEWAYIP		192.168.11.1
 #define CONFIG_NETMASK			255.255.255.0
 
diff --git a/include/env_default.h b/include/env_default.h
index b1fe945bae5b..5ee28a54960d 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -53,8 +53,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_ETHPRIME
 	"ethprime="	CONFIG_ETHPRIME			"\0"
 #endif
-#ifdef	CONFIG_IPADDR
-	"ipaddr="	__stringify(CONFIG_IPADDR)	"\0"
+#ifdef	CFG_IPADDR
+	"ipaddr="	__stringify(CFG_IPADDR)	"\0"
 #endif
 #ifdef	CONFIG_SERVERIP
 	"serverip="	__stringify(CONFIG_SERVERIP)	"\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 48de265ee7e1..9e927d81200a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -65,7 +65,7 @@ CFG_I2C_MVTWSI_BASE1
 CFG_I2C_RTC_ADDR
 CFG_ICS307_REFCLK_HZ
 CFG_IMX6_PWM_PER_CLK
-CONFIG_IPADDR
+CFG_IPADDR
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
-- 
2.25.1

[PoC 064/241] global: Migrate CONFIG_IRAM_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-rockchip/bootrom.h | 2 +-
 include/configs/exynos7420-common.h          | 4 ++--
 include/configs/px30_common.h                | 2 +-
 include/configs/rk3066_common.h              | 2 +-
 include/configs/rk3128_common.h              | 2 +-
 include/configs/rk3188_common.h              | 2 +-
 include/configs/rk322x_common.h              | 2 +-
 include/configs/rk3288_common.h              | 2 +-
 include/configs/rk3308_common.h              | 2 +-
 include/configs/rk3328_common.h              | 2 +-
 include/configs/rk3368_common.h              | 2 +-
 include/configs/rk3399_common.h              | 2 +-
 include/configs/rk3568_common.h              | 2 +-
 include/configs/rv1108_common.h              | 2 +-
 scripts/config_whitelist.txt                 | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h
index 0da78f30b619..4276a0f6811a 100644
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@@ -57,6 +57,6 @@ extern const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1];
 /**
  * Locations of the boot-device identifier in SRAM
  */
-#define BROM_BOOTSOURCE_ID_ADDR   (CONFIG_IRAM_BASE + 0x10)
+#define BROM_BOOTSOURCE_ID_ADDR   (CFG_IRAM_BASE + 0x10)
 
 #endif
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index c8408eb39200..937a3c8820c1 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -16,9 +16,9 @@
 /* select serial console configuration */
 
 /* IRAM Layout */
-#define CONFIG_IRAM_BASE		0x02100000
+#define CFG_IRAM_BASE		0x02100000
 #define CONFIG_IRAM_SIZE		0x58000
-#define CONFIG_IRAM_END			(CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CONFIG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index 003686930a4b..3f1595cdc95f 100644
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -9,7 +9,7 @@
 #include "rockchip-common.h"
 
 /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */
-#define CONFIG_IRAM_BASE		0xff020000
+#define CFG_IRAM_BASE		0xff020000
 
 #define GICD_BASE			0xff131000
 #define GICC_BASE			0xff132000
diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
index c4758e148ba7..1a6d3678df3e 100644
--- a/include/configs/rk3066_common.h
+++ b/include/configs/rk3066_common.h
@@ -9,7 +9,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 #define CFG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(1024UL << 20UL)
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 5b0ec3700040..8aa17bfbd364 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_HZ_CLOCK		24000000
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 /* RAW SD card / eMMC locations. */
 
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 58f491c2f320..ac9195672fb7 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -9,7 +9,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE	0x10080000
+#define CFG_IRAM_BASE	0x10080000
 
 /* spl size 32kb sram - 2kb bootrom */
 
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index b95268df87c2..fcaf9c52c4be 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_HZ_CLOCK		24000000
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 #define CFG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index d3b8a5150f6b..5f29432be10b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -11,7 +11,7 @@
 
 #define CFG_SYS_HZ_CLOCK		24000000
 
-#define CONFIG_IRAM_BASE		0xff700000
+#define CFG_IRAM_BASE		0xff700000
 
 /* RAW SD card / eMMC locations. */
 
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index bc03e113fef0..55a0dfecb21b 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xfff80000
+#define CFG_IRAM_BASE		0xfff80000
 
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 85d2186f23e0..fadcb93a5f7e 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xff090000
+#define CFG_IRAM_BASE		0xff090000
 
 /* FAT sd card locations. */
 #define CFG_SYS_SDRAM_BASE		0
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 17636250510b..9aa256b59592 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
 
-#define CONFIG_IRAM_BASE		0xff8c0000
+#define CFG_IRAM_BASE		0xff8c0000
 
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x00500000\0" \
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 43066933d02f..9512cfdcd2d5 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xff8c0000
+#define CFG_IRAM_BASE		0xff8c0000
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
 #else
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index 750f16d03999..ae360105d508 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xfdcc0000
+#define CFG_IRAM_BASE		0xfdcc0000
 
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xf0000000
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 6e17b23b624c..63551b47e200 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -8,7 +8,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 #define CFG_SYS_TIMER_RATE		(24 * 1000 * 1000)
 /* TIMER1,initialized by ddr initialize code */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9e927d81200a..ccc719a3b985 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -66,7 +66,7 @@ CFG_I2C_RTC_ADDR
 CFG_ICS307_REFCLK_HZ
 CFG_IMX6_PWM_PER_CLK
 CFG_IPADDR
-CONFIG_IRAM_BASE
+CFG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
 CONFIG_IRAM_TOP
-- 
2.25.1

[PoC 065/241] global: Migrate CONFIG_IRAM_END to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/exynos7420-common.h | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 937a3c8820c1..44843aba3c30 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -18,7 +18,7 @@
 /* IRAM Layout */
 #define CFG_IRAM_BASE		0x02100000
 #define CONFIG_IRAM_SIZE		0x58000
-#define CONFIG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CFG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ccc719a3b985..ee3bb81bb47f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -67,7 +67,7 @@ CFG_ICS307_REFCLK_HZ
 CFG_IMX6_PWM_PER_CLK
 CFG_IPADDR
 CFG_IRAM_BASE
-CONFIG_IRAM_END
+CFG_IRAM_END
 CONFIG_IRAM_SIZE
 CONFIG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
-- 
2.25.1

[PoC 066/241] global: Migrate CONFIG_IRAM_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/exynos7420-common.h | 4 ++--
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 44843aba3c30..0a522baed894 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -17,8 +17,8 @@
 
 /* IRAM Layout */
 #define CFG_IRAM_BASE		0x02100000
-#define CONFIG_IRAM_SIZE		0x58000
-#define CFG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CFG_IRAM_SIZE		0x58000
+#define CFG_IRAM_END			(CFG_IRAM_BASE + CFG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ee3bb81bb47f..249ec5090b8a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -68,7 +68,7 @@ CFG_IMX6_PWM_PER_CLK
 CFG_IPADDR
 CFG_IRAM_BASE
 CFG_IRAM_END
-CONFIG_IRAM_SIZE
+CFG_IRAM_SIZE
 CONFIG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
-- 
2.25.1

[PoC 067/241] global: Migrate CONFIG_IRAM_TOP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 arch/arm/mach-exynos/sec_boot.S      | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 1ff5fcac1b38..9225d2cc1f2a 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -51,7 +51,7 @@ enum {
 #ifdef CONFIG_EXYNOS5420
 
 /* Address for relocating helper code (Last 4 KB of IRAM) */
-#define EXYNOS_RELOCATE_CODE_BASE	(CONFIG_IRAM_TOP - 0x1000)
+#define EXYNOS_RELOCATE_CODE_BASE	(CFG_IRAM_TOP - 0x1000)
 
 /*
  * Power up secondary CPUs.
diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S
index 40c07209e475..1303544d83b6 100644
--- a/arch/arm/mach-exynos/sec_boot.S
+++ b/arch/arm/mach-exynos/sec_boot.S
@@ -21,7 +21,7 @@ relocate_wait_code:
 	.ltorg
 /*
  * Secondary core waits here until Primary wake it up.
- * Below code is copied to (CONFIG_IRAM_TOP - 0x1000)
+ * Below code is copied to (CFG_IRAM_TOP - 0x1000)
  * This is a workaround code which is supposed to act as a
  * substitute/supplement to the iROM code.
  *
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 7a9307ccc3db..d5f480de0ef7 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -10,7 +10,7 @@
 
 #define CONFIG_VAR_SIZE_SPL
 
-#define CONFIG_IRAM_TOP			0x02074000
+#define CFG_IRAM_TOP			0x02074000
 
 #define CONFIG_PHY_IRAM_BASE		0x02020000
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 249ec5090b8a..d2683e317bd6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -69,7 +69,7 @@ CFG_IPADDR
 CFG_IRAM_BASE
 CFG_IRAM_END
 CFG_IRAM_SIZE
-CONFIG_IRAM_TOP
+CFG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
-- 
2.25.1

[PoC 068/241] global: Migrate CONFIG_KM_DEF_ARCH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/km-mpc83xx.h | 6 +++---
 include/configs/kmcent2.h       | 6 +++---
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 227c45f0634a..33655d144df1 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -78,13 +78,13 @@
 #define CONFIG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
-#ifndef CONFIG_KM_DEF_ARCH
-#define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
+#ifndef CFG_KM_DEF_ARCH
+#define CFG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	CONFIG_KM_DEF_ENV						 \
-	CONFIG_KM_DEF_ARCH						 \
+	CFG_KM_DEF_ARCH						 \
 	"newenv="							 \
 		"prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \
 		"era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0"	 \
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index d7d5bce15c59..870603d461af 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -437,13 +437,13 @@ int get_scl(void);
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
-#ifndef CONFIG_KM_DEF_ARCH
-#define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
+#ifndef CFG_KM_DEF_ARCH
+#define CFG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_DEF_ENV						\
-	CONFIG_KM_DEF_ARCH						\
+	CFG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d2683e317bd6..12edc317773f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -70,7 +70,7 @@ CFG_IRAM_BASE
 CFG_IRAM_END
 CFG_IRAM_SIZE
 CFG_IRAM_TOP
-CONFIG_KM_DEF_ARCH
+CFG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
 CONFIG_KM_DEF_ENV_BOOTARGS
-- 
2.25.1

[PoC 069/241] global: Migrate CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h  | 2 +-
 include/configs/km/km-powerpc.h      | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index cc5ec219b8db..94408e6efd9a 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -98,7 +98,7 @@
 		CONFIG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
 		" " CONFIG_KM_UBI_LINUX_MTD " "				\
-		CONFIG_KM_DEF_BOOT_ARGS_CPU				\
+		CFG_KM_DEF_BOOT_ARGS_CPU				\
 		"\0"							\
 	"addpanic="							\
 		"setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0"	\
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index f6c21e1666d1..da0ee3f27e7e 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -28,7 +28,7 @@
 #define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
 /* architecture specific default bootargs */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
 	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index e64cf24bd5e9..516fa76e3209 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -179,8 +179,8 @@
 #define CONFIG_KM_DEF_ENV
 #endif
 
-#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#ifndef CFG_KM_DEF_BOOT_ARGS_CPU
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 #endif
 
 #define CONFIG_KM_DEF_ENV_CPU						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 870603d461af..3c49e174d9a0 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -16,7 +16,7 @@
  * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot
  * parameters
  */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
+#define CFG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
 
 #include "km/keymile-common.h"
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 12edc317773f..d203ede8c963 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -71,7 +71,7 @@ CFG_IRAM_END
 CFG_IRAM_SIZE
 CFG_IRAM_TOP
 CFG_KM_DEF_ARCH
-CONFIG_KM_DEF_BOOT_ARGS_CPU
+CFG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
 CONFIG_KM_DEF_ENV_BOOTARGS
 CONFIG_KM_DEF_ENV_BOOTPARAMS
-- 
2.25.1

[PoC 070/241] global: Migrate CONFIG_KM_DEF_ENV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h    | 30 +++++++++++++-------------
 include/configs/km/km-mpc83xx.h        |  6 +++---
 include/configs/km/km-powerpc.h        |  2 +-
 include/configs/km/pg-wcom-ls102xa.h   |  8 +++----
 include/configs/kmcent2.h              |  8 +++----
 include/configs/socfpga_arria5_secu1.h |  4 ++--
 scripts/config_whitelist.txt           | 14 ++++++------
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 94408e6efd9a..3d77b1770651 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -15,8 +15,8 @@
 
 #define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
-#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
-#define CONFIG_KM_DEF_ENV_BOOTPARAMS \
+#ifndef CFG_KM_DEF_ENV_BOOTPARAMS
+#define CFG_KM_DEF_ENV_BOOTPARAMS \
 	"actual_bank=0\0"
 #endif
 
@@ -65,7 +65,7 @@
  * available targets:
  * - 'release': for a standalone system		kernel/rootfs from flash
  */
-#define CONFIG_KM_DEF_ENV_BOOTTARGETS					\
+#define CFG_KM_DEF_ENV_BOOTTARGETS					\
 	"subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt "		\
 		"set_fdthigh cramfsloadkernel flashargs add_default "	\
 		"addpanic boot\0"					\
@@ -88,7 +88,7 @@
  * - 'flashargs': defaults arguments for flash base boot
  *
  */
-#define CONFIG_KM_DEF_ENV_BOOTARGS					\
+#define CFG_KM_DEF_ENV_BOOTARGS					\
 	"add_default="							\
 		"setenv bootargs ${bootargs} "				\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
@@ -120,7 +120,7 @@
  * processor specific settings
  * - 'cramfsloadfdt': copy fdt from a cramfs to ram
  */
-#define CONFIG_KM_DEF_ENV_FLASH_BOOT					\
+#define CFG_KM_DEF_ENV_FLASH_BOOT					\
 	"cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0"		\
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
@@ -133,7 +133,7 @@
  *
  * - 'default': setup default environment
  */
-#define CONFIG_KM_DEF_ENV_CONSTANTS					\
+#define CFG_KM_DEF_ENV_CONSTANTS					\
 	"backup_bank=0\0"						\
 	"release=run newenv; reset\0"					\
 	"pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0"		\
@@ -142,15 +142,15 @@
 	"env_version=1\0"						\
 	""
 
-#ifndef CONFIG_KM_DEF_ENV
-#define CONFIG_KM_DEF_ENV	\
-	CONFIG_KM_DEF_ENV_BOOTPARAMS					\
+#ifndef CFG_KM_DEF_ENV
+#define CFG_KM_DEF_ENV	\
+	CFG_KM_DEF_ENV_BOOTPARAMS					\
 	"netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0"		\
-	CONFIG_KM_DEF_ENV_CPU						\
-	CONFIG_KM_DEF_ENV_BOOTTARGETS					\
-	CONFIG_KM_DEF_ENV_BOOTARGS					\
-	CONFIG_KM_DEF_ENV_FLASH_BOOT					\
-	CONFIG_KM_DEF_ENV_CONSTANTS					\
+	CFG_KM_DEF_ENV_CPU						\
+	CFG_KM_DEF_ENV_BOOTTARGETS					\
+	CFG_KM_DEF_ENV_BOOTARGS					\
+	CFG_KM_DEF_ENV_FLASH_BOOT					\
+	CFG_KM_DEF_ENV_CONSTANTS					\
 	"altbootcmd=run bootcmd\0"					\
 	"boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"			\
 	"bootcmd=km_checkbidhwk &&  "					\
@@ -169,6 +169,6 @@
 	"load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0"		\
 	"load=tftpboot ${load_addr_r} ${u-boot}\0"			\
 	""
-#endif /* CONFIG_KM_DEF_ENV */
+#endif /* CFG_KM_DEF_ENV */
 
 #endif /* __CONFIG_KEYMILE_H */
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 33655d144df1..3192ca7742a7 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -74,8 +74,8 @@
 /*
  * Environment Configuration
  */
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV "km-common=empty\0"
+#ifndef CFG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#define CFG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
 #ifndef CFG_KM_DEF_ARCH
@@ -83,7 +83,7 @@
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS \
-	CONFIG_KM_DEF_ENV						 \
+	CFG_KM_DEF_ENV						 \
 	CFG_KM_DEF_ARCH						 \
 	"newenv="							 \
 		"prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index da0ee3f27e7e..73a224f790e1 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -30,7 +30,7 @@
 /* architecture specific default bootargs */
 #define CFG_KM_DEF_BOOT_ARGS_CPU		""
 
-#define CONFIG_KM_DEF_ENV_CPU						\
+#define CFG_KM_DEF_ENV_CPU						\
 	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update="							\
 		"protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 516fa76e3209..974486fc4c32 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -175,15 +175,15 @@
 #define CFG_ENV_TOTAL_SIZE		0x40000
 #define ENV_DEL_ADDR		CONFIG_ENV_ADDR_REDUND  /* direct for newenv */
 
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV
+#ifndef CFG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#define CFG_KM_DEF_ENV
 #endif
 
 #ifndef CFG_KM_DEF_BOOT_ARGS_CPU
 #define CFG_KM_DEF_BOOT_ARGS_CPU		""
 #endif
 
-#define CONFIG_KM_DEF_ENV_CPU						\
+#define CFG_KM_DEF_ENV_CPU						\
 	"boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"			\
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
@@ -224,7 +224,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
-	CONFIG_KM_DEF_ENV						\
+	CFG_KM_DEF_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	"ethrotate=no\0"						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 3c49e174d9a0..35ec79f7b7db 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -390,13 +390,13 @@ int get_scl(void);
 /*
  * Environment Configuration
  */
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV
+#ifndef CFG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#define CFG_KM_DEF_ENV
 #endif
 
 #define __USB_PHY_TYPE	utmi
 
-#define CONFIG_KM_DEF_ENV_CPU						\
+#define CFG_KM_DEF_ENV_CPU						\
 	"boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"			\
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
@@ -442,7 +442,7 @@ int get_scl(void);
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS					\
-	CONFIG_KM_DEF_ENV						\
+	CFG_KM_DEF_ENV						\
 	CFG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index f12163ccc990..71aa5a7ca949 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -46,7 +46,7 @@
 	"newenv=" \
 		"nand erase 0x100000 0x40000\0"
 
-#define CONFIG_KM_DEF_ENV_BOOTTARGETS \
+#define CFG_KM_DEF_ENV_BOOTTARGETS \
 	"release=" \
 		"run newenv; reset\0" \
 	"develop=" \
@@ -54,7 +54,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
-	CONFIG_KM_DEF_ENV_BOOTTARGETS \
+	CFG_KM_DEF_ENV_BOOTTARGETS \
 	CONFIG_KM_NEW_ENV \
 	"socfpga_legacy_reset_compat=1\0"	\
 	"altbootcmd=run bootcmd;\0"	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d203ede8c963..d5909de8762e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -72,13 +72,13 @@ CFG_IRAM_SIZE
 CFG_IRAM_TOP
 CFG_KM_DEF_ARCH
 CFG_KM_DEF_BOOT_ARGS_CPU
-CONFIG_KM_DEF_ENV
-CONFIG_KM_DEF_ENV_BOOTARGS
-CONFIG_KM_DEF_ENV_BOOTPARAMS
-CONFIG_KM_DEF_ENV_BOOTTARGETS
-CONFIG_KM_DEF_ENV_CONSTANTS
-CONFIG_KM_DEF_ENV_CPU
-CONFIG_KM_DEF_ENV_FLASH_BOOT
+CFG_KM_DEF_ENV
+CFG_KM_DEF_ENV_BOOTARGS
+CFG_KM_DEF_ENV_BOOTPARAMS
+CFG_KM_DEF_ENV_BOOTTARGETS
+CFG_KM_DEF_ENV_CONSTANTS
+CFG_KM_DEF_ENV_CPU
+CFG_KM_DEF_ENV_FLASH_BOOT
 CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
-- 
2.25.1

[PoC 071/241] global: Migrate CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 3d77b1770651..5e3baca75b23 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -34,7 +34,7 @@
 # define CONFIG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
@@ -44,7 +44,7 @@
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
@@ -125,7 +125,7 @@
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
 	"uimage=" CONFIG_KM_UIMAGE_NAME					\
-	CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+	CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*
  * constants
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d5909de8762e..fb702a42bd6b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -79,7 +79,7 @@ CFG_KM_DEF_ENV_BOOTTARGETS
 CFG_KM_DEF_ENV_CONSTANTS
 CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
-- 
2.25.1

[PoC 072/241] global: Migrate CONFIG_KM_ECC_MODE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 5e3baca75b23..1ae134c2ae3e 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -52,10 +52,10 @@
 
 #ifdef CONFIG_NAND_ECC_BCH
 #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
-#define CONFIG_KM_ECC_MODE    " eccmode=bch"
+#define CFG_KM_ECC_MODE    " eccmode=bch"
 #else
 #define CONFIG_KM_UIMAGE_NAME "uImage\0"
-#define CONFIG_KM_ECC_MODE
+#define CFG_KM_ECC_MODE
 #endif
 
 /*
@@ -95,7 +95,7 @@
 		":${hostname}:${netdev}:off:"				\
 		" console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}"	\
 		" mem=${kernelmem} init=${init}"			\
-		CONFIG_KM_ECC_MODE					\
+		CFG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
 		" " CONFIG_KM_UBI_LINUX_MTD " "				\
 		CFG_KM_DEF_BOOT_ARGS_CPU				\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fb702a42bd6b..11a501212b8c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -80,7 +80,7 @@ CFG_KM_DEF_ENV_CONSTANTS
 CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
-CONFIG_KM_ECC_MODE
+CFG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
-- 
2.25.1

[PoC 073/241] global: Migrate CONFIG_KM_NEW_ENV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h   | 4 ++--
 include/configs/kmcent2.h              | 4 ++--
 include/configs/socfpga_arria5_secu1.h | 4 ++--
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 974486fc4c32..856d2e909200 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -209,7 +209,7 @@
 	"checkfdt=true\0"						\
 	""
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -223,7 +223,7 @@
 			"asrc,spdif,lpuart1,ftm1\0"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_KM_DEF_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 35ec79f7b7db..97070bc77c45 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -428,7 +428,7 @@ int get_scl(void);
 	"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0"		\
 	"usb_dr_mode=host\0"
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -444,7 +444,7 @@ int get_scl(void);
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CFG_KM_DEF_ENV						\
 	CFG_KM_DEF_ARCH						\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	""
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 71aa5a7ca949..6fb7a895995b 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -42,7 +42,7 @@
 	"_fpga_loadsafe=echo Loading FPGA SAFE image..." \
 		" && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \
 
-#define CONFIG_KM_NEW_ENV \
+#define CFG_KM_NEW_ENV \
 	"newenv=" \
 		"nand erase 0x100000 0x40000\0"
 
@@ -55,7 +55,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
 	CFG_KM_DEF_ENV_BOOTTARGETS \
-	CONFIG_KM_NEW_ENV \
+	CFG_KM_NEW_ENV \
 	"socfpga_legacy_reset_compat=1\0"	\
 	"altbootcmd=run bootcmd;\0"	\
 	"bootlimit=6\0"	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 11a501212b8c..471b3243f380 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -81,7 +81,7 @@ CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
-CONFIG_KM_NEW_ENV
+CFG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
-- 
2.25.1

[PoC 074/241] global: Migrate CONFIG_KM_UBI_LINUX_MTD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 1ae134c2ae3e..7e347e5b8f4f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -31,7 +31,7 @@
 #ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-# define CONFIG_KM_UBI_LINUX_MTD					\
+# define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
@@ -40,7 +40,7 @@
 /* two flash chips called boot and app */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
 /* app:  CONFIG_KM_UBI_PARTITION_NAME_APP */
-# define CONFIG_KM_UBI_LINUX_MTD					\
+# define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
@@ -97,7 +97,7 @@
 		" mem=${kernelmem} init=${init}"			\
 		CFG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
-		" " CONFIG_KM_UBI_LINUX_MTD " "				\
+		" " CFG_KM_UBI_LINUX_MTD " "				\
 		CFG_KM_DEF_BOOT_ARGS_CPU				\
 		"\0"							\
 	"addpanic="							\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 471b3243f380..19a4fc540336 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -82,7 +82,7 @@ CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
 CFG_KM_NEW_ENV
-CONFIG_KM_UBI_LINUX_MTD
+CFG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
 CONFIG_KM_UBI_PART_BOOT_OPTS
-- 
2.25.1

[PoC 075/241] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 12 ++++++------
 include/configs/kmcoge5ne.h         |  2 +-
 include/configs/pg-wcom-expu1.h     |  2 +-
 include/configs/pg-wcom-seli8.h     |  2 +-
 scripts/config_whitelist.txt        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 7e347e5b8f4f..2e73d9d6d28f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -28,7 +28,7 @@
 #define CONFIG_KM_UBI_PART_BOOT_OPTS		""
 #endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */
 
-#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
+#ifndef CFG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
 # define CFG_KM_UBI_LINUX_MTD					\
@@ -36,19 +36,19 @@
 	CONFIG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
-#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
+#else /* CFG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-/* app:  CONFIG_KM_UBI_PARTITION_NAME_APP */
+/* app:  CFG_KM_UBI_PARTITION_NAME_APP */
 # define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
-	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
+	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
-	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */
+	"ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0"
+#endif /* CFG_KM_UBI_PARTITION_NAME_APP */
 
 #ifdef CONFIG_NAND_ECC_BCH
 #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 8681145c309f..9386daa19ccc 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 5b5637762aca..f7a598b5f9cb 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -10,7 +10,7 @@
 #define CFG_HOSTNAME				"EXPU1"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* CLIPS FPGA Definitions */
 #define CFG_SYS_CSPR3_EXT	(0x00)
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index a1c1ca993d7e..b7051e3749d0 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -9,7 +9,7 @@
 #define CFG_HOSTNAME			"SELI8"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* PAXK FPGA Definitions */
 #define CFG_SYS_CSPR3_EXT	(0x00)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 19a4fc540336..a311539ab15c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -83,7 +83,7 @@ CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
 CFG_KM_NEW_ENV
 CFG_KM_UBI_LINUX_MTD
-CONFIG_KM_UBI_PARTITION_NAME_APP
+CFG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
 CONFIG_KM_UBI_PART_BOOT_OPTS
 CONFIG_KM_UIMAGE_NAME
-- 
2.25.1

[PoC 077/241] global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 10 +++++-----
 scripts/config_whitelist.txt        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 720711ac8dde..b33bf3615e4f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -24,16 +24,16 @@
 #define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */
 
-#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS
-#define CONFIG_KM_UBI_PART_BOOT_OPTS		""
-#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */
+#ifndef CFG_KM_UBI_PART_BOOT_OPTS
+#define CFG_KM_UBI_PART_BOOT_OPTS		""
+#endif /* CFG_KM_UBI_PART_BOOT_OPTS */
 
 #ifndef CFG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
 /* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */
 # define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
-	CONFIG_KM_UBI_PART_BOOT_OPTS
+	CFG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CFG_KM_UBI_PARTITION_NAME_APP */
@@ -42,7 +42,7 @@
 /* app:  CFG_KM_UBI_PARTITION_NAME_APP */
 # define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
-	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
+	CFG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e166916e8f40..e5eeb35bfec4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -85,7 +85,7 @@ CFG_KM_NEW_ENV
 CFG_KM_UBI_LINUX_MTD
 CFG_KM_UBI_PARTITION_NAME_APP
 CFG_KM_UBI_PARTITION_NAME_BOOT
-CONFIG_KM_UBI_PART_BOOT_OPTS
+CFG_KM_UBI_PART_BOOT_OPTS
 CONFIG_KM_UIMAGE_NAME
 CONFIG_KSNET_CPSW_NUM_PORTS
 CONFIG_KSNET_MAC_ID_BASE
-- 
2.25.1

[PoC 078/241] global: Migrate CONFIG_KM_UIMAGE_NAME to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index b33bf3615e4f..ffcd44d5ef97 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -51,10 +51,10 @@
 #endif /* CFG_KM_UBI_PARTITION_NAME_APP */
 
 #ifdef CONFIG_NAND_ECC_BCH
-#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
+#define CFG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
 #define CFG_KM_ECC_MODE    " eccmode=bch"
 #else
-#define CONFIG_KM_UIMAGE_NAME "uImage\0"
+#define CFG_KM_UIMAGE_NAME "uImage\0"
 #define CFG_KM_ECC_MODE
 #endif
 
@@ -124,7 +124,7 @@
 	"cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0"		\
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
-	"uimage=" CONFIG_KM_UIMAGE_NAME					\
+	"uimage=" CFG_KM_UIMAGE_NAME					\
 	CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e5eeb35bfec4..2b4db3778e20 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -86,7 +86,7 @@ CFG_KM_UBI_LINUX_MTD
 CFG_KM_UBI_PARTITION_NAME_APP
 CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
-CONFIG_KM_UIMAGE_NAME
+CFG_KM_UIMAGE_NAME
 CONFIG_KSNET_CPSW_NUM_PORTS
 CONFIG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
-- 
2.25.1

[PoC 079/241] global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 2 +-
 include/configs/k2e_evm.h                     | 2 +-
 include/configs/k2g_evm.h                     | 2 +-
 include/configs/k2hk_evm.h                    | 2 +-
 include/configs/k2l_evm.h                     | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 0852ce80a641..21cac6ea312a 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -117,7 +117,7 @@ struct mac_sl_cfg {
 #define CPSW_CTL_VLAN_AWARE			BIT(1)
 #define CPSW_CTL_FIFO_LOOPBACK			BIT(0)
 
-#define DEVICE_CPSW_NUM_PORTS			CONFIG_KSNET_CPSW_NUM_PORTS
+#define DEVICE_CPSW_NUM_PORTS			CFG_KSNET_CPSW_NUM_PORTS
 #define DEVICE_N_GMACSL_PORTS			(DEVICE_CPSW_NUM_PORTS - 1)
 
 #ifdef CONFIG_KSNET_NETCP_V1_0
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index bbc58be511e4..026568c4dfb3 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -38,7 +38,7 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
-#define CONFIG_KSNET_CPSW_NUM_PORTS	9
+#define CFG_KSNET_CPSW_NUM_PORTS	9
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2E_EVM_H */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index bb91751d5d90..feaa43ba7f71 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -52,7 +52,7 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
-#define CONFIG_KSNET_CPSW_NUM_PORTS	2
+#define CFG_KSNET_CPSW_NUM_PORTS	2
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 68cbe98b553b..e35f080279ae 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -38,6 +38,6 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_0
-#define CONFIG_KSNET_CPSW_NUM_PORTS	5
+#define CFG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2HK_EVM_H */
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index a18158a7eb33..b60fc2a55de3 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -38,7 +38,7 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
-#define CONFIG_KSNET_CPSW_NUM_PORTS	5
+#define CFG_KSNET_CPSW_NUM_PORTS	5
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2L_EVM_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2b4db3778e20..ddcc89f508e1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -87,7 +87,7 @@ CFG_KM_UBI_PARTITION_NAME_APP
 CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
-CONFIG_KSNET_CPSW_NUM_PORTS
+CFG_KSNET_CPSW_NUM_PORTS
 CONFIG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
-- 
2.25.1

[PoC 080/241] global: Migrate CONFIG_KSNET_MAC_ID_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 2 +-
 include/configs/ti_armv7_keystone2.h          | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 21cac6ea312a..f191c909f41f 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -49,7 +49,7 @@
 
 #define KEYSTONE2_EMAC_GIG_ENABLE
 
-#define MAC_ID_BASE_ADDR		CONFIG_KSNET_MAC_ID_BASE
+#define MAC_ID_BASE_ADDR		CFG_KSNET_MAC_ID_BASE
 
 /* MDIO module input frequency */
 #ifdef CONFIG_SOC_K2G
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 479ab46e4edd..e46d635ca032 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -47,7 +47,7 @@
 #define CFG_SYS_SPI_CLK		ks_clk_get_rate(KS2_CLK1_6)
 
 /* Keystone net */
-#define CONFIG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
+#define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CONFIG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ddcc89f508e1..031e72702307 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -88,7 +88,7 @@ CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
-CONFIG_KSNET_MAC_ID_BASE
+CFG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
-- 
2.25.1

[PoC 081/241] global: Migrate CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/k2e_evm.h    | 2 +-
 include/configs/k2g_evm.h    | 2 +-
 include/configs/k2l_evm.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 026568c4dfb3..eabd06ff9b7a 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -39,6 +39,6 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	9
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2E_EVM_H */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index feaa43ba7f71..e3f4f5ed4743 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -53,7 +53,7 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	2
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
 #define SPI_MTD_PARTS	KEYSTONE_SPI1_MTD_PARTS
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index b60fc2a55de3..aa9075cfd8ef 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -39,6 +39,6 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	5
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2L_EVM_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 031e72702307..70296e18643b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -89,7 +89,7 @@ CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
-CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
-- 
2.25.1

[PoC 082/241] global: Migrate CONFIG_KSNET_NETCP_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 include/configs/ti_armv7_keystone2.h          | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index f191c909f41f..bedbcdc8bac6 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -18,7 +18,7 @@
 /* EMAC */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define GBETH_BASE			(CONFIG_KSNET_NETCP_BASE + 0x00090000)
+#define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x900)
 #define EMAC_MDIO_BASE_ADDR		(GBETH_BASE + 0x300)
 #define EMAC_SGMII_BASE_ADDR		(GBETH_BASE + 0x100)
@@ -32,7 +32,7 @@
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define GBETH_BASE			(CONFIG_KSNET_NETCP_BASE + 0x00200000)
+#define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00200000)
 #define CPGMACSL_REG_RX_PRI_MAP		0x020
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x22000)
 #define EMAC_MDIO_BASE_ADDR		(GBETH_BASE + 0x00f00)
@@ -190,14 +190,14 @@ struct mac_sl_cfg {
 /* PSS */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR	(CONFIG_KSNET_NETCP_BASE + 0x604)
+#define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x06060606
 #define hw_config_streaming_switch()\
 	writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR	(CONFIG_KSNET_NETCP_BASE + 0x500)
+#define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x500)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x0
 
 #define hw_config_streaming_switch()\
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index e46d635ca032..c21fabc36ed5 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -48,7 +48,7 @@
 
 /* Keystone net */
 #define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
-#define CONFIG_KSNET_NETCP_BASE			KS2_NETCP_BASE
+#define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
 #define CONFIG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 70296e18643b..7d609640e855 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -90,7 +90,7 @@ CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
-CONFIG_KSNET_NETCP_BASE
+CFG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
-- 
2.25.1

[PoC 083/241] global: Migrate CONFIG_KSNET_NETCP_V1_0 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 drivers/net/ti/keystone_net.c                 | 2 +-
 include/configs/k2hk_evm.h                    | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index bedbcdc8bac6..1576a0473850 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -16,7 +16,7 @@
 #endif
 
 /* EMAC */
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x900)
@@ -120,7 +120,7 @@ struct mac_sl_cfg {
 #define DEVICE_CPSW_NUM_PORTS			CFG_KSNET_CPSW_NUM_PORTS
 #define DEVICE_N_GMACSL_PORTS			(DEVICE_CPSW_NUM_PORTS - 1)
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define DEVICE_CPSW_BASE			(GBETH_BASE + 0x800)
 #define CPSW_REG_CTL				0x004
@@ -166,7 +166,7 @@ struct mac_sl_cfg {
 #define SGMII_LINK_MAC_FIBER			3
 #define SGMII_LINK_MAC_PHY_FORCED		4
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 #define SGMII_OFFSET(x)		((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100))
 #elif defined CONFIG_KSNET_NETCP_V1_5
 #define SGMII_OFFSET(x)		((x) * 0x100)
@@ -188,7 +188,7 @@ struct mac_sl_cfg {
 #define RGMII_STATUS_REG		(GBETH_BASE + 0x18)
 
 /* PSS */
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x06060606
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 1bdbd599d7b4..513c7b32521f 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -58,7 +58,7 @@ enum link_type {
 			 ((mac)[2] << 16) | ((mac)[3] << 24))
 #define mac_lo(mac)     (((mac)[4] << 0) | ((mac)[5] << 8))
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define EMAC_EMACSW_BASE_OFS		0x90800
 #define EMAC_EMACSW_PORT_BASE_OFS	(EMAC_EMACSW_BASE_OFS + 0x60)
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index e35f080279ae..600e73f11e78 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_0
+#define CFG_KSNET_NETCP_V1_0
 #define CFG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2HK_EVM_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7d609640e855..3861edb19315 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -91,7 +91,7 @@ CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
-CONFIG_KSNET_NETCP_V1_0
+CFG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
-- 
2.25.1

[PoC 084/241] global: Migrate CONFIG_KSNET_NETCP_V1_5 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 drivers/net/ti/keystone_net.c                 | 2 +-
 include/configs/k2e_evm.h                     | 2 +-
 include/configs/k2g_evm.h                     | 2 +-
 include/configs/k2l_evm.h                     | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 1576a0473850..3f3c580328bf 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -30,7 +30,7 @@
 #define CPGMACSL_REG_RESET		0x0c
 #define CPGMACSL_REG_MAXLEN		0x10
 
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 
 #define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00200000)
 #define CPGMACSL_REG_RX_PRI_MAP		0x020
@@ -130,7 +130,7 @@ struct mac_sl_cfg {
 #define CPSW_REG_ALE_PORTCTL(x)			(0x640 + (x) * 4)
 #define CPSW_REG_VAL_STAT_ENABLE_ALL		0xf
 
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 
 #define DEVICE_CPSW_BASE			(GBETH_BASE + 0x20000)
 #define CPSW_REG_CTL				0x00004
@@ -168,7 +168,7 @@ struct mac_sl_cfg {
 
 #ifdef CFG_KSNET_NETCP_V1_0
 #define SGMII_OFFSET(x)		((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100))
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 #define SGMII_OFFSET(x)		((x) * 0x100)
 #endif
 
@@ -195,7 +195,7 @@ struct mac_sl_cfg {
 #define hw_config_streaming_switch()\
 	writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
 
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 
 #define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x500)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x0
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 513c7b32521f..db942811db76 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -70,7 +70,7 @@ enum link_type {
 #define DEVICE_EMACSW_BASE(base, x)	((base) + EMAC_EMACSW_PORT_BASE_OFS +  \
 					 (x) * 0x30)
 
-#elif defined(CONFIG_KSNET_NETCP_V1_5)
+#elif defined(CFG_KSNET_NETCP_V1_5)
 
 #define EMAC_EMACSW_PORT_BASE_OFS	0x222000
 
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index eabd06ff9b7a..024563b5dd68 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
+#define CFG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	9
 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index e3f4f5ed4743..a6022cba68ad 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -51,7 +51,7 @@
 	"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
+#define CFG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	2
 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index aa9075cfd8ef..5ebc108d098c 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
+#define CFG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	5
 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3861edb19315..262995ea1f6a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -92,7 +92,7 @@ CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
 CFG_KSNET_NETCP_V1_0
-CONFIG_KSNET_NETCP_V1_5
+CFG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
-- 
2.25.1

[PoC 085/241] global: Migrate CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c        | 4 ++--
 include/configs/ti_armv7_keystone2.h | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index db942811db76..5d344d73c3bc 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -372,12 +372,12 @@ static void keystone2_net_serdes_setup(void)
 {
 	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
-			CONFIG_KSNET_SERDES_LANES_PER_SGMII);
+			CFG_KSNET_SERDES_LANES_PER_SGMII);
 
 #if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L)
 	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
-			CONFIG_KSNET_SERDES_LANES_PER_SGMII);
+			CFG_KSNET_SERDES_LANES_PER_SGMII);
 #endif
 
 	/* wait till setup */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index c21fabc36ed5..cb4ea394eb8b 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -51,7 +51,7 @@
 #define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
-#define CONFIG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
+#define CFG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
 
 /* EEPROM definitions */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 262995ea1f6a..980e6bc1d9b1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -93,7 +93,7 @@ CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
 CFG_KSNET_NETCP_V1_0
 CFG_KSNET_NETCP_V1_5
-CONFIG_KSNET_SERDES_LANES_PER_SGMII
+CFG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
-- 
2.25.1

[PoC 086/241] global: Migrate CONFIG_KSNET_SERDES_SGMII2_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c        | 2 +-
 include/configs/ti_armv7_keystone2.h | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 5d344d73c3bc..306b862e20ff 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -375,7 +375,7 @@ static void keystone2_net_serdes_setup(void)
 			CFG_KSNET_SERDES_LANES_PER_SGMII);
 
 #if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L)
-	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE,
+	ks2_serdes_init(CFG_KSNET_SERDES_SGMII2_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
 			CFG_KSNET_SERDES_LANES_PER_SGMII);
 #endif
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index cb4ea394eb8b..1429faa534e3 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -50,7 +50,7 @@
 #define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
-#define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
+#define CFG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
 #define CFG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
 
 /* EEPROM definitions */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 980e6bc1d9b1..7470e7e1d91f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -94,7 +94,7 @@ CFG_KSNET_NETCP_BASE
 CFG_KSNET_NETCP_V1_0
 CFG_KSNET_NETCP_V1_5
 CFG_KSNET_SERDES_LANES_PER_SGMII
-CONFIG_KSNET_SERDES_SGMII2_BASE
+CFG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
-- 
2.25.1

[PoC 087/241] global: Migrate CONFIG_KSNET_SERDES_SGMII_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c        | 2 +-
 include/configs/ti_armv7_keystone2.h | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 306b862e20ff..f85c057e1399 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -370,7 +370,7 @@ struct ks2_serdes ks2_serdes_sgmii_156p25mhz = {
 #ifndef CONFIG_SOC_K2G
 static void keystone2_net_serdes_setup(void)
 {
-	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE,
+	ks2_serdes_init(CFG_KSNET_SERDES_SGMII_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
 			CFG_KSNET_SERDES_LANES_PER_SGMII);
 
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 1429faa534e3..7142d30a5994 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -49,7 +49,7 @@
 /* Keystone net */
 #define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
-#define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
+#define CFG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CFG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
 #define CFG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7470e7e1d91f..bd22cbb231b8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -95,7 +95,7 @@ CFG_KSNET_NETCP_V1_0
 CFG_KSNET_NETCP_V1_5
 CFG_KSNET_SERDES_LANES_PER_SGMII
 CFG_KSNET_SERDES_SGMII2_BASE
-CONFIG_KSNET_SERDES_SGMII_BASE
+CFG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
-- 
2.25.1

[PoC 088/241] global: Migrate CONFIG_L1_INIT_RAM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 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 +-
 scripts/config_whitelist.txt | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index f2179db6b9b4..0a6fcde3913d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -133,7 +133,7 @@
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xffd00000	/* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 09087a70895d..36ae8394d5d6 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -271,7 +271,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 4b7b53094446..7a31e8bcdc0a 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -249,7 +249,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index c614a539b391..8e2566dd2175 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -247,7 +247,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 2da4f5a09b14..6a215557104f 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -212,7 +212,7 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index b8bfc52f07ae..bf0c3ac1318b 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -71,7 +71,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | CFG_SYS_FLASH_BASE)
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
+#define CFG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bd22cbb231b8..ca45b1eeb514 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -96,7 +96,7 @@ CFG_KSNET_NETCP_V1_5
 CFG_KSNET_SERDES_LANES_PER_SGMII
 CFG_KSNET_SERDES_SGMII2_BASE
 CFG_KSNET_SERDES_SGMII_BASE
-CONFIG_L1_INIT_RAM
+CFG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
-- 
2.25.1

[PoC 089/241] global: Migrate CONFIG_L2_CACHE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 ++--
 arch/powerpc/cpu/mpc85xx/fdt.c      | 4 ++--
 arch/x86/cpu/intel_common/car2.S    | 2 +-
 include/configs/MPC8548CDS.h        | 2 +-
 include/configs/P1010RDB.h          | 2 +-
 include/configs/p1_p2_rdb_pc.h      | 2 +-
 include/configs/socrates.h          | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index f07e8ab388e8..562d7074ed75 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -515,7 +515,7 @@ int enable_cluster_l2(void)
 int l2cache_init(void)
 {
 	__maybe_unused u32 svr = get_svr();
-#ifdef CONFIG_L2_CACHE
+#ifdef CFG_L2_CACHE
 	ccsr_l2cache_t *l2cache = (void __iomem *)CFG_SYS_MPC85xx_L2_ADDR;
 #elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500)
 	struct ccsr_cluster_l2 * l2cache = (void __iomem *)CFG_SYS_FSL_CLUSTER_1_L2;
@@ -523,7 +523,7 @@ int l2cache_init(void)
 
 	puts ("L2:    ");
 
-#if defined(CONFIG_L2_CACHE)
+#if defined(CFG_L2_CACHE)
 	volatile uint cache_ctl;
 	uint ver;
 	u32 l2siz_field;
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index a7e1df104d73..635eaed12152 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -185,7 +185,7 @@ static inline void ft_fixup_l3cache(void *blob, int off)
 #define ft_fixup_l3cache(x, y)
 #endif
 
-#if defined(CONFIG_L2_CACHE) || \
+#if defined(CFG_L2_CACHE) || \
 	defined(CONFIG_BACKSIDE_L2_CACHE) || \
 	defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
 static inline void ft_fixup_l2cache_compatible(void *blob, int off)
@@ -218,7 +218,7 @@ static inline void ft_fixup_l2cache_compatible(void *blob, int off)
 }
 #endif
 
-#if defined(CONFIG_L2_CACHE)
+#if defined(CFG_L2_CACHE)
 /* return size in kilobytes */
 static inline u32 l2cache_size(void)
 {
diff --git a/arch/x86/cpu/intel_common/car2.S b/arch/x86/cpu/intel_common/car2.S
index f8cf78586d02..908f2251b67a 100644
--- a/arch/x86/cpu/intel_common/car2.S
+++ b/arch/x86/cpu/intel_common/car2.S
@@ -246,7 +246,7 @@ car_cqos:
 	or	$(PREFETCH_L1_DISABLE | PREFETCH_L2_DISABLE), %eax
 	wrmsr
 
-#if (CONFIG_DCACHE_RAM_SIZE == CONFIG_L2_CACHE_SIZE)
+#if (CONFIG_DCACHE_RAM_SIZE == CFG_L2_CACHE_SIZE)
 /*
  * If CAR size is set to full L2 size, mask is calculated as all-zeros.
  * This is not supported by the CPU/uCode.
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index d2a70aa88f88..5f2fc5516d5e 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -20,7 +20,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
+#define CFG_L2_CACHE			/* toggle L2 cache */
 
 /*
  * Only possible on E500 Version 2 or newer cores.
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 67ee74ba6232..794289627fe8 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -99,7 +99,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
+#define CFG_L2_CACHE			/* toggle L2 cache */
 
 /* DDR Setup */
 #define SPD_EEPROM_ADDRESS		0x52
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index de6440a07564..c8ecd2dc0fca 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -112,7 +112,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE
+#define CFG_L2_CACHE
 
 #define CFG_SYS_CCSRBAR		0xffe00000
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index fb2b76eb829a..9eee8de41644 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -40,7 +40,7 @@
 /*
  * These can be toggled for performance analysis, otherwise use default.
  */
-#define CONFIG_L2_CACHE			/* toggle L2 cache		*/
+#define CFG_L2_CACHE			/* toggle L2 cache		*/
 
 #define CFG_SYS_INIT_DBCR DBCR_IDM		/* Enable Debug Exceptions	*/
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ca45b1eeb514..07fd8dbeab11 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -97,7 +97,7 @@ CFG_KSNET_SERDES_LANES_PER_SGMII
 CFG_KSNET_SERDES_SGMII2_BASE
 CFG_KSNET_SERDES_SGMII_BASE
 CFG_L1_INIT_RAM
-CONFIG_L2_CACHE
+CFG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
-- 
2.25.1

[PoC 090/241] global: Migrate CONFIG_LEGACY_BOOTCMD_ENV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/pic32mzdask.h | 4 ++--
 scripts/config_whitelist.txt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 60c747327588..0ae4fc55a97b 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -52,7 +52,7 @@
 	"fdt_addr_r=0x89d00000\0"				\
 	"scriptaddr=0x88300000\0"				\
 
-#define CONFIG_LEGACY_BOOTCMD_ENV					\
+#define CFG_LEGACY_BOOTCMD_ENV					\
 	"legacy_bootcmd= "						\
 		"if load mmc 0 ${scriptaddr} uEnv.txt; then "		\
 			"env import -tr ${scriptaddr} ${filesize}; "	\
@@ -71,7 +71,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS	\
 	MEM_LAYOUT_ENV_SETTINGS		\
-	CONFIG_LEGACY_BOOTCMD_ENV	\
+	CFG_LEGACY_BOOTCMD_ENV	\
 	BOOTENV
 
 #endif	/* __PIC32MZDASK_CONFIG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 07fd8dbeab11..495467153157 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -98,7 +98,7 @@ CFG_KSNET_SERDES_SGMII2_BASE
 CFG_KSNET_SERDES_SGMII_BASE
 CFG_L1_INIT_RAM
 CFG_L2_CACHE
-CONFIG_LEGACY_BOOTCMD_ENV
+CFG_LEGACY_BOOTCMD_ENV
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
-- 
2.25.1

[PoC 091/241] global: Migrate CONFIG_LOWPOWER_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 9225d2cc1f2a..02a79962af24 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -161,7 +161,7 @@ static void secondary_cores_configure(void)
 
 	/* set lowpower flag and address */
 	writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG);
-	writel((uint32_t)&low_power_start, CONFIG_LOWPOWER_ADDR);
+	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
 	writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4);
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index d5f480de0ef7..d7db17b2dc92 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -18,6 +18,6 @@
  * Low Power settings
  */
 #define CONFIG_LOWPOWER_FLAG		0x02020028
-#define CONFIG_LOWPOWER_ADDR		0x0202002C
+#define CFG_LOWPOWER_ADDR		0x0202002C
 
 #endif	/* __CONFIG_EXYNOS5420_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 495467153157..f2d7a0202c22 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -99,7 +99,7 @@ CFG_KSNET_SERDES_SGMII_BASE
 CFG_L1_INIT_RAM
 CFG_L2_CACHE
 CFG_LEGACY_BOOTCMD_ENV
-CONFIG_LOWPOWER_ADDR
+CFG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
-- 
2.25.1

[PoC 092/241] global: Migrate CONFIG_LOWPOWER_FLAG to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 4 ++--
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 02a79962af24..243b5c80c90e 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -73,7 +73,7 @@ static void low_power_start(void)
 
 	reg_val = readl(EXYNOS5420_SPARE_BASE);
 	if (reg_val != CPU_RST_FLAG_VAL) {
-		writel(0x0, CONFIG_LOWPOWER_FLAG);
+		writel(0x0, CFG_LOWPOWER_FLAG);
 		branch_bx(0x0);
 	}
 
@@ -160,7 +160,7 @@ static void secondary_cores_configure(void)
 	writel(0x0, (EXYNOS_RELOCATE_CODE_BASE + 0x1C));
 
 	/* set lowpower flag and address */
-	writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG);
+	writel(CPU_RST_FLAG_VAL, CFG_LOWPOWER_FLAG);
 	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index d7db17b2dc92..b617c062881b 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -17,7 +17,7 @@
 /*
  * Low Power settings
  */
-#define CONFIG_LOWPOWER_FLAG		0x02020028
+#define CFG_LOWPOWER_FLAG		0x02020028
 #define CFG_LOWPOWER_ADDR		0x0202002C
 
 #endif	/* __CONFIG_EXYNOS5420_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f2d7a0202c22..99942bf36472 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -100,7 +100,7 @@ CFG_L1_INIT_RAM
 CFG_L2_CACHE
 CFG_LEGACY_BOOTCMD_ENV
 CFG_LOWPOWER_ADDR
-CONFIG_LOWPOWER_FLAG
+CFG_LOWPOWER_FLAG
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
-- 
2.25.1

[PoC 093/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index a884c65d18b8..dd3f35def0fa 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -142,7 +142,7 @@ static void lpc32xx_nand_init(void)
 
 	writel(
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 010da1531ff9..a1ecd8ceef02 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -28,7 +28,7 @@
  */
 
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
-#define CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
+#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 99942bf36472..b38db2586a4f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -101,7 +101,7 @@ CFG_L2_CACHE
 CFG_LEGACY_BOOTCMD_ENV
 CFG_LOWPOWER_ADDR
 CFG_LOWPOWER_FLAG
-CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
+CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
 CONFIG_LPC32XX_NAND_MLC_RD_LOW
-- 
2.25.1

[PoC 094/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index dd3f35def0fa..cd3831b5ffeb 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -143,7 +143,7 @@ static void lpc32xx_nand_init(void)
 	writel(
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index a1ecd8ceef02..d345382545e5 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -29,7 +29,7 @@
 
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
-#define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
+#define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b38db2586a4f..bb3b1443ed5c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -102,7 +102,7 @@ CFG_LEGACY_BOOTCMD_ENV
 CFG_LOWPOWER_ADDR
 CFG_LOWPOWER_FLAG
 CFG_LPC32XX_NAND_MLC_BUSY_DELAY
-CONFIG_LPC32XX_NAND_MLC_NAND_TA
+CFG_LPC32XX_NAND_MLC_NAND_TA
 CONFIG_LPC32XX_NAND_MLC_RD_HIGH
 CONFIG_LPC32XX_NAND_MLC_RD_LOW
 CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
-- 
2.25.1

[PoC 095/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index cd3831b5ffeb..388be16e2e71 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -144,7 +144,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index d345382545e5..3959051a4ca6 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -30,7 +30,7 @@
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
-#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
+#define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bb3b1443ed5c..eda174693c08 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -103,7 +103,7 @@ CFG_LOWPOWER_ADDR
 CFG_LOWPOWER_FLAG
 CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CFG_LPC32XX_NAND_MLC_NAND_TA
-CONFIG_LPC32XX_NAND_MLC_RD_HIGH
+CFG_LPC32XX_NAND_MLC_RD_HIGH
 CONFIG_LPC32XX_NAND_MLC_RD_LOW
 CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
 CONFIG_LPC32XX_NAND_MLC_WR_HIGH
-- 
2.25.1

[PoC 096/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 388be16e2e71..e75ed1f2ae9c 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -145,7 +145,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 3959051a4ca6..1a4617c5c02b 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -31,7 +31,7 @@
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
-#define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
+#define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index eda174693c08..4c28d978ce8a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -104,7 +104,7 @@ CFG_LOWPOWER_FLAG
 CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CFG_LPC32XX_NAND_MLC_NAND_TA
 CFG_LPC32XX_NAND_MLC_RD_HIGH
-CONFIG_LPC32XX_NAND_MLC_RD_LOW
+CFG_LPC32XX_NAND_MLC_RD_LOW
 CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
 CONFIG_LPC32XX_NAND_MLC_WR_HIGH
 CONFIG_LPC32XX_NAND_MLC_WR_LOW
-- 
2.25.1

[PoC 097/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index e75ed1f2ae9c..088fdb7981da 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -141,7 +141,7 @@ static void lpc32xx_nand_init(void)
 	clk = get_hclk_clk_rate();
 
 	writel(
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 1a4617c5c02b..34af515037fe 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -27,7 +27,7 @@
  * NAND chip timings for FIXME: which one?
  */
 
-#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
+#define CFG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4c28d978ce8a..f0976db1a818 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -105,7 +105,7 @@ CFG_LPC32XX_NAND_MLC_BUSY_DELAY
 CFG_LPC32XX_NAND_MLC_NAND_TA
 CFG_LPC32XX_NAND_MLC_RD_HIGH
 CFG_LPC32XX_NAND_MLC_RD_LOW
-CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
+CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CONFIG_LPC32XX_NAND_MLC_WR_HIGH
 CONFIG_LPC32XX_NAND_MLC_WR_LOW
 CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
-- 
2.25.1

[PoC 098/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 088fdb7981da..31a9a22ba31f 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -146,7 +146,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
 }
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 34af515037fe..c67a0bb6e1a8 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -32,7 +32,7 @@
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
-#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
+#define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f0976db1a818..607056ade394 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -106,7 +106,7 @@ CFG_LPC32XX_NAND_MLC_NAND_TA
 CFG_LPC32XX_NAND_MLC_RD_HIGH
 CFG_LPC32XX_NAND_MLC_RD_LOW
 CFG_LPC32XX_NAND_MLC_TCEA_DELAY
-CONFIG_LPC32XX_NAND_MLC_WR_HIGH
+CFG_LPC32XX_NAND_MLC_WR_HIGH
 CONFIG_LPC32XX_NAND_MLC_WR_LOW
 CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_RHOLD
-- 
2.25.1

[PoC 099/241] global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 31a9a22ba31f..285411776096 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -147,7 +147,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
+		clkdiv(CFG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
 }
 
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index c67a0bb6e1a8..f1a7853a80e6 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -33,7 +33,7 @@
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
-#define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
+#define CFG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
  * NAND
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 607056ade394..6eed044d853c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -107,7 +107,7 @@ CFG_LPC32XX_NAND_MLC_RD_HIGH
 CFG_LPC32XX_NAND_MLC_RD_LOW
 CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CFG_LPC32XX_NAND_MLC_WR_HIGH
-CONFIG_LPC32XX_NAND_MLC_WR_LOW
+CFG_LPC32XX_NAND_MLC_WR_LOW
 CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_RHOLD
 CONFIG_LPC32XX_NAND_SLC_RSETUP
-- 
2.25.1

[PoC 100/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index f4f1b22f5e21..0f12201aa0e3 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -130,7 +130,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
-	       TAC_R_RDY(CONFIG_LPC32XX_NAND_SLC_RDR_CLKS) |
+	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index ab10101f20a9..e17896841355 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -45,7 +45,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
-#define CONFIG_LPC32XX_NAND_SLC_RDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6eed044d853c..8c567e45590c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -108,7 +108,7 @@ CFG_LPC32XX_NAND_MLC_RD_LOW
 CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CFG_LPC32XX_NAND_MLC_WR_HIGH
 CFG_LPC32XX_NAND_MLC_WR_LOW
-CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
+CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_RHOLD
 CONFIG_LPC32XX_NAND_SLC_RSETUP
 CONFIG_LPC32XX_NAND_SLC_RWIDTH
-- 
2.25.1

[PoC 101/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 0f12201aa0e3..1fdc80989fab 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -132,7 +132,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
-	       TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) |
+	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
 }
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index e17896841355..0b815ded7322 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -47,7 +47,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
-#define CONFIG_LPC32XX_NAND_SLC_RHOLD		200000000
+#define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8c567e45590c..7ced36635799 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -109,7 +109,7 @@ CFG_LPC32XX_NAND_MLC_TCEA_DELAY
 CFG_LPC32XX_NAND_MLC_WR_HIGH
 CFG_LPC32XX_NAND_MLC_WR_LOW
 CFG_LPC32XX_NAND_SLC_RDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_RHOLD
+CFG_LPC32XX_NAND_SLC_RHOLD
 CONFIG_LPC32XX_NAND_SLC_RSETUP
 CONFIG_LPC32XX_NAND_SLC_RWIDTH
 CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
-- 
2.25.1

[PoC 102/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 1fdc80989fab..71e8286d1c8f 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -133,7 +133,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
-	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
+	       TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
 }
 
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 0b815ded7322..72cf031e05da 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -48,7 +48,7 @@
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_RSETUP		50000000
 
 /*
  * USB
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7ced36635799..fc20b83d66d0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -110,7 +110,7 @@ CFG_LPC32XX_NAND_MLC_WR_HIGH
 CFG_LPC32XX_NAND_MLC_WR_LOW
 CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
-CONFIG_LPC32XX_NAND_SLC_RSETUP
+CFG_LPC32XX_NAND_SLC_RSETUP
 CONFIG_LPC32XX_NAND_SLC_RWIDTH
 CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
-- 
2.25.1

[PoC 103/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 71e8286d1c8f..fb1fb2d7dccf 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -131,7 +131,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
-	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
+	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 72cf031e05da..5ba8c1bb20e2 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -46,7 +46,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
-#define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
+#define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CFG_LPC32XX_NAND_SLC_RSETUP		50000000
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc20b83d66d0..fc42b693e3e1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -111,7 +111,7 @@ CFG_LPC32XX_NAND_MLC_WR_LOW
 CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
-CONFIG_LPC32XX_NAND_SLC_RWIDTH
+CFG_LPC32XX_NAND_SLC_RWIDTH
 CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
-- 
2.25.1

[PoC 104/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index fb1fb2d7dccf..7de5c840ed9b 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void)
 	       &lpc32xx_nand_slc_regs->icr);
 
 	/* Configure NAND flash timings */
-	writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) |
+	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5ba8c1bb20e2..dc16ed84c52c 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -41,7 +41,7 @@
 /*
  * NAND chip timings
  */
-#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc42b693e3e1..4f5de41ab95d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -112,7 +112,7 @@ CFG_LPC32XX_NAND_SLC_RDR_CLKS
 CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
-CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
+CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
-- 
2.25.1

[PoC 105/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 7de5c840ed9b..dee8fd24b94b 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -128,7 +128,7 @@ static void lpc32xx_nand_init(void)
 	/* Configure NAND flash timings */
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
-	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
+	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index dc16ed84c52c..24312c848e2d 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -43,7 +43,7 @@
  */
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
-#define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
+#define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4f5de41ab95d..9609ea606fd3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -113,7 +113,7 @@ CFG_LPC32XX_NAND_SLC_RHOLD
 CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_WHOLD
+CFG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
-- 
2.25.1

[PoC 106/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index dee8fd24b94b..a070df81d7cd 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void)
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
-	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
+	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 24312c848e2d..5719e422da97 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -44,7 +44,7 @@
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9609ea606fd3..1051a7b949ec 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -114,7 +114,7 @@ CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
-CONFIG_LPC32XX_NAND_SLC_WSETUP
+CFG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
-- 
2.25.1

[PoC 106/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index dee8fd24b94b..a070df81d7cd 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void)
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
-	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
+	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 24312c848e2d..5719e422da97 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -44,7 +44,7 @@
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9609ea606fd3..1051a7b949ec 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -114,7 +114,7 @@ CFG_LPC32XX_NAND_SLC_RSETUP
 CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
-CONFIG_LPC32XX_NAND_SLC_WSETUP
+CFG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
-- 
2.25.1

[PoC 107/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index a070df81d7cd..356f8d9440bb 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -127,7 +127,7 @@ static void lpc32xx_nand_init(void)
 
 	/* Configure NAND flash timings */
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
-	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
+	       TAC_W_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5719e422da97..9cfee381d4ac 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -42,7 +42,7 @@
  * NAND chip timings
  */
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
-#define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
+#define CFG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1051a7b949ec..58792f1d2b7c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -115,7 +115,7 @@ CFG_LPC32XX_NAND_SLC_RWIDTH
 CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
 CFG_LPC32XX_NAND_SLC_WSETUP
-CONFIG_LPC32XX_NAND_SLC_WWIDTH
+CFG_LPC32XX_NAND_SLC_WWIDTH
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
-- 
2.25.1

[PoC 108/241] global: Migrate CONFIG_MACB_SEARCH_PHY to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/ethernut5.h  | 2 +-
 include/configs/vinco.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 52eb0be67611..2859188e60c9 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -49,7 +49,7 @@
 
 /* Ethernet */
 #define CONFIG_PHY_ID			0
-#define CONFIG_MACB_SEARCH_PHY
+#define CFG_MACB_SEARCH_PHY
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 74ee61f09238..1e1175f00689 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -40,7 +40,7 @@
 /* USB device */
 
 /* Ethernet Hardware */
-#define CONFIG_MACB_SEARCH_PHY
+#define CFG_MACB_SEARCH_PHY
 
 #ifdef CONFIG_SPI_BOOT
 /* bootstrap + u-boot + env + linux in serial flash */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 58792f1d2b7c..316095b75e0d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -116,7 +116,7 @@ CFG_LPC32XX_NAND_SLC_WDR_CLKS
 CFG_LPC32XX_NAND_SLC_WHOLD
 CFG_LPC32XX_NAND_SLC_WSETUP
 CFG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_MACB_SEARCH_PHY
+CFG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MAX_DSP_CPUS
-- 
2.25.1

[PoC 109/241] global: Migrate CONFIG_MALLOC_F_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sandbox/cpu/start.c                    | 2 +-
 common/init/board_init.c                    | 2 +-
 common/spl/spl.c                            | 4 ++--
 doc/arch/sandbox/sandbox.rst                | 2 +-
 include/configs/capricorn-common.h          | 2 +-
 include/configs/cgtqmx8.h                   | 2 +-
 include/configs/imx8mm-cl-iot-gate.h        | 2 +-
 include/configs/imx8mm_beacon.h             | 2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h | 2 +-
 include/configs/imx8mm_evk.h                | 2 +-
 include/configs/imx8mm_icore_mx8mm.h        | 2 +-
 include/configs/imx8mm_venice.h             | 2 +-
 include/configs/imx8mp_rsb3720.h            | 2 +-
 include/configs/imx8mq_cm.h                 | 2 +-
 include/configs/imx8mq_evk.h                | 2 +-
 include/configs/imx8mq_phanbell.h           | 2 +-
 include/configs/imx8qm_mek.h                | 2 +-
 include/configs/imx8qxp_mek.h               | 2 +-
 include/configs/imx8ulp_evk.h               | 2 +-
 include/configs/imx93_evk.h                 | 2 +-
 include/configs/kontron-sl-mx8mm.h          | 2 +-
 include/configs/kontron_pitx_imx8m.h        | 2 +-
 include/configs/kontron_sl28.h              | 2 +-
 include/configs/phycore_imx8mm.h            | 2 +-
 include/configs/pico-imx8mq.h               | 2 +-
 include/configs/sandbox.h                   | 2 +-
 include/configs/verdin-imx8mm.h             | 2 +-
 include/configs/verdin-imx8mp.h             | 2 +-
 scripts/config_whitelist.txt                | 2 +-
 29 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 622df41f54cf..234652872ecc 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[])
 	}
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+	gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 #if CONFIG_IS_ENABLED(LOG)
 	gd->default_log_level = state->default_log_level;
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 6a550261778d..96ffb79a9869 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void)
 ulong board_init_f_alloc_reserve(ulong top)
 {
 	/* Reserve early malloc arena */
-#ifndef CONFIG_MALLOC_F_ADDR
+#ifndef CFG_MALLOC_F_ADDR
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	top -= CONFIG_VAL(SYS_MALLOC_F_LEN);
 #endif
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 1d2e8fda7284..4668367b680f 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc)
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	if (setup_malloc) {
-#ifdef CONFIG_MALLOC_F_ADDR
-		gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+#ifdef CFG_MALLOC_F_ADDR
+		gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 		gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
 		gd->malloc_ptr = 0;
diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst
index e6d840365166..cd7f8a2cb0dc 100644
--- a/doc/arch/sandbox/sandbox.rst
+++ b/doc/arch/sandbox/sandbox.rst
@@ -615,7 +615,7 @@ Addr      Config                     Usage
 =======   ========================   ===============================
       0   CONFIG_SYS_FDT_LOAD_ADDR   Device tree
    c000   CONFIG_BLOBLIST_ADDR       Blob list
-  10000   CONFIG_MALLOC_F_ADDR       Early memory allocation
+  10000   CFG_MALLOC_F_ADDR          Early memory allocation
   f0000   CONFIG_PRE_CON_BUF_ADDR    Pre-console buffer
  100000   CONFIG_TRACE_EARLY_ADDR    Early trace buffer (if enabled). Also used
                                      as the SPL load buffer in spl_test_load().
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 19c7fca03b29..9e7322cdb937 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -14,7 +14,7 @@
 
 /* SPL config */
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif /* CONFIG_SPL_BUILD */
 
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index caa1498acead..a63325973846 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 7785bdc7cbe6..64cdc401d039 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x912000
+#define CFG_MALLOC_F_ADDR		0x912000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index ee524f0e63f2..d85ae21e2317 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 44d74bb1a788..0723d27ab703 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 
 /* For RAW image gives a error info not panic */
 
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index c364e06dc450..d5642b96495f 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index e718daa07c3e..2158b0af74f9 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -15,7 +15,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-# define CONFIG_MALLOC_F_ADDR		0x930000
+# define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif /* CONFIG_SPL_BUILD */
 
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index c490e3829f9a..5579a05d165f 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif
 
 /* Enable Distro Boot */
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 38ae5f137022..e4e24b522fdb 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -24,7 +24,7 @@
 		 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
+#define CFG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
 						  * GD_FLG_FULL_MALLOC_INIT \
 						  * set \
 						  */
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index f6f356d27ba2..f7ae1b47d063 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d9ce5d5d0f1a..4b46321e8512 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -15,7 +15,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index eb7059f0648c..5158f2cc605a 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 7772e71013ef..a25efbb16bdb 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 669da591fa2b..4f55ae49403d 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index b7397f6038fd..d77510e1685e 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x22040000
+#define CFG_MALLOC_F_ADDR		0x22040000
 
 
 #endif
diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h
index 5cd6492dd503..7b7bef3ca755 100644
--- a/include/configs/imx93_evk.h
+++ b/include/configs/imx93_evk.h
@@ -14,7 +14,7 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x204D0000
+#define CFG_MALLOC_F_ADDR		0x204D0000
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 56d0036147c6..657124cc725d 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS BOOTENV
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 4dd51c7f1d7f..5a3c9f76a431 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE     0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 218e9d9b3013..0a1df4ad4bd0 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -32,7 +32,7 @@
 /* generic timer */
 
 /* early heap for SPL DM */
-#define CONFIG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
+#define CFG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
 
 /* serial port */
 #define CFG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 9160c78c0464..ce6dc87c69c7 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 1d8709180c83..37ade717ae99 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE	0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index c9e57da0160a..99893a7070fe 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MALLOC_F_ADDR		0x0010000
+#define CFG_MALLOC_F_ADDR		0x0010000
 
 /* GUIDs for capsule updatable firmware images */
 #define SANDBOX_UBOOT_IMAGE_GUID \
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 7f3fa795afdc..27d7efb883de 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 3ce2714e196e..d03c69cf00ae 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -16,7 +16,7 @@
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR				0x184000
+#define CFG_MALLOC_F_ADDR				0x184000
 /* For RAW image gives a error info not panic */
 
 #define CONFIG_POWER_PCA9450
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 316095b75e0d..f42481a7b3bc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -117,7 +117,7 @@ CFG_LPC32XX_NAND_SLC_WHOLD
 CFG_LPC32XX_NAND_SLC_WSETUP
 CFG_LPC32XX_NAND_SLC_WWIDTH
 CFG_MACB_SEARCH_PHY
-CONFIG_MALLOC_F_ADDR
+CFG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
-- 
2.25.1

[PoC 110/241] global: Migrate CONFIG_MALTA to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/rtc/mc146818.c       | 2 +-
 include/configs/malta.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 122691b97842..d5f9f4206566 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -13,7 +13,7 @@
 #include <dm.h>
 #include <rtc.h>
 
-#if defined(CONFIG_X86) || defined(CONFIG_MALTA)
+#if defined(CONFIG_X86) || defined(CFG_MALTA)
 #include <asm/io.h>
 #define in8(p) inb(p)
 #define out8(p, v) outb(v, p)
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 65f4b05649b2..cd4f382b18f9 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -9,7 +9,7 @@
 /*
  * System configuration
  */
-#define CONFIG_MALTA
+#define CFG_MALTA
 
 #define CONFIG_MEMSIZE_IN_BYTES
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f42481a7b3bc..c72372a11ddc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -118,7 +118,7 @@ CFG_LPC32XX_NAND_SLC_WSETUP
 CFG_LPC32XX_NAND_SLC_WWIDTH
 CFG_MACB_SEARCH_PHY
 CFG_MALLOC_F_ADDR
-CONFIG_MALTA
+CFG_MALTA
 CONFIG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
-- 
2.25.1

[PoC 111/241] global: Migrate CONFIG_MAX_DSP_CPUS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/include/asm/config_mpc85xx.h | 4 ++--
 doc/README.Heterogeneous-SoCs             | 2 +-
 include/e500.h                            | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index d6b2b9b469a3..9738c573452b 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -152,7 +152,7 @@
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
 
 #ifdef CONFIG_ARCH_B4860
-#define CONFIG_MAX_DSP_CPUS		12
+#define CFG_MAX_DSP_CPUS		12
 #define CONFIG_NUM_DSP_CPUS		6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	6
@@ -161,7 +161,7 @@
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #else
-#define CONFIG_MAX_DSP_CPUS		2
+#define CFG_MAX_DSP_CPUS		2
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	0
diff --git a/doc/README.Heterogeneous-SoCs b/doc/README.Heterogeneous-SoCs
index 9da652e459be..11f2dbc0013d 100644
--- a/doc/README.Heterogeneous-SoCs
+++ b/doc/README.Heterogeneous-SoCs
@@ -72,7 +72,7 @@ CONFIG_SYS_ETVPE_CLK		- Define PLL index for ETVPE clock
 
 DSP cores and other device's components have been added in this structure.
 
-freq_processor_dsp[CONFIG_MAX_DSP_CPUS]	- Array to contain the DSP core's frequencies
+freq_processor_dsp[CFG_MAX_DSP_CPUS]	- Array to contain the DSP core's frequencies
 freq_cpri				- To store CPRI frequency
 freq_maple				- To store MAPLE frequency
 freq_maple_ulb				- To store MAPLE-ULB frequency
diff --git a/include/e500.h b/include/e500.h
index 9f68a834c2f0..9ea90109406c 100644
--- a/include/e500.h
+++ b/include/e500.h
@@ -12,7 +12,7 @@ typedef struct
 {
 	unsigned long freq_processor[CONFIG_MAX_CPUS];
 #ifdef CONFIG_HETROGENOUS_CLUSTERS
-	unsigned long freq_processor_dsp[CONFIG_MAX_DSP_CPUS];
+	unsigned long freq_processor_dsp[CFG_MAX_DSP_CPUS];
 #endif
 	unsigned long freq_systembus;
 	unsigned long freq_ddrbus;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c72372a11ddc..31484bd13fd9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -119,7 +119,7 @@ CFG_LPC32XX_NAND_SLC_WWIDTH
 CFG_MACB_SEARCH_PHY
 CFG_MALLOC_F_ADDR
 CFG_MALTA
-CONFIG_MAX_DSP_CPUS
+CFG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
 CONFIG_MEMSIZE_IN_BYTES
-- 
2.25.1

[PoC 112/241] global: Migrate CONFIG_MAX_MEM_MAPPED to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c           |  6 +++---
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 14 +++++++-------
 arch/arm/include/asm/arch-ls102xa/config.h        |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu.c                    | 14 +++++++-------
 arch/powerpc/cpu/mpc85xx/mp.c                     |  4 ++--
 arch/powerpc/cpu/mpc85xx/tlb.c                    |  8 ++++----
 arch/powerpc/cpu/mpc8xxx/pamu_table.c             |  2 +-
 arch/powerpc/include/asm/config.h                 |  6 +++---
 arch/xtensa/include/asm/config.h                  |  2 +-
 board/ti/dra7xx/evm.c                             | 14 +++++++-------
 common/memsize.c                                  |  6 +++---
 drivers/ddr/fsl/util.c                            |  6 +++---
 drivers/ram/mpc83xx_sdram.c                       |  4 ++--
 include/configs/dra7xx_evm.h                      |  2 +-
 include/configs/mt7621.h                          |  2 +-
 include/configs/rcar-gen3-common.h                |  2 +-
 include/configs/synquacer.h                       |  2 +-
 include/configs/xtfpga.h                          |  8 ++++----
 scripts/config_whitelist.txt                      |  2 +-
 19 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 99413ef52e22..11ea2b149eab 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -1311,13 +1311,13 @@ phys_size_t get_effective_memsize(void)
 	 * allocated from first region. If the memory extends to  the second
 	 * region (or the third region if applicable), Management Complex (MC)
 	 * memory should be put into the highest region, i.e. the end of DDR
-	 * memory. CONFIG_MAX_MEM_MAPPED is set to the size of first region so
+	 * memory. CFG_MAX_MEM_MAPPED is set to the size of first region so
 	 * U-Boot doesn't relocate itself into higher address. Should DDR be
 	 * configured to skip the first region, this function needs to be
 	 * adjusted.
 	 */
-	if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
-		ea_size = CONFIG_MAX_MEM_MAPPED;
+	if (gd->ram_size > CFG_MAX_MEM_MAPPED) {
+		ea_size = CFG_MAX_MEM_MAPPED;
 		rem = gd->ram_size - ea_size;
 	} else {
 		ea_size = gd->ram_size;
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index c9c72e327172..b82aac9126d0 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -38,7 +38,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			0x06000000
@@ -123,7 +123,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* DCFG - GUR */
 #define CFG_SYS_FSL_OCRAM_BASE	0x18000000 /* initial RAM */
@@ -149,7 +149,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE				0x06000000
@@ -193,7 +193,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SEC */
 
@@ -213,7 +213,7 @@
 #define CFG_SYS_NUM_FM1_DTSEC		7
 #define CFG_SYS_NUM_FM1_10GEC		1
 #define CFG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
 
 #define QE_MURAM_SIZE		0x6000UL
 #define MAX_QE_RISC		1
@@ -252,14 +252,14 @@
 #define GICD_BASE		0x01401000
 #define GICC_BASE		0x01402000
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 #elif defined(CONFIG_ARCH_LS1046A)
 #define CFG_SYS_NUM_FMAN			1
 #define CFG_SYS_NUM_FM1_DTSEC		8
 #define CFG_SYS_NUM_FM1_10GEC		2
 #define CFG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SMMU Defintions */
 #define SMMU_BASE		0x09000000
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 6413a307d273..86bea960f1d1 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -76,7 +76,7 @@
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #ifdef CONFIG_DDR_SPD
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
+#define CFG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
 #endif
 
 #define DCU_LAYER_MAX_NUM			16
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index be85c54e4801..0abcc01b8574 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -616,12 +616,12 @@ static int reset_tlb(phys_addr_t p_addr, u32 size, phys_addr_t *phys_offset)
 /*
  * slide the testing window up to test another area
  * for 32_bit system, the maximum testable memory is limited to
- * CONFIG_MAX_MEM_MAPPED
+ * CFG_MAX_MEM_MAPPED
  */
 int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
 	phys_addr_t test_cap, p_addr;
-	phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
+	phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED);
 
 #if !defined(CONFIG_PHYS_64BIT) || \
     !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
@@ -632,7 +632,7 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 #endif
 	p_addr = (*vstart) + (*size) + (*phys_offset);
 	if (p_addr < test_cap - 1) {
-		p_size = min(test_cap - p_addr, CONFIG_MAX_MEM_MAPPED);
+		p_size = min(test_cap - p_addr, CFG_MAX_MEM_MAPPED);
 		if (reset_tlb(p_addr, p_size, phys_offset) == -1)
 			return -1;
 		*vstart = CFG_SYS_DDR_SDRAM_BASE;
@@ -649,18 +649,18 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 /* initialization for testing area */
 int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
-	phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
+	phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED);
 
 	*vstart = CFG_SYS_DDR_SDRAM_BASE;
-	*size = (u32) p_size;	/* CONFIG_MAX_MEM_MAPPED < 4G */
+	*size = (u32) p_size;	/* CFG_MAX_MEM_MAPPED < 4G */
 	*phys_offset = 0;
 
 #if !defined(CONFIG_PHYS_64BIT) || \
     !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
 	(CFG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
-		if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
+		if (gd->ram_size > CFG_MAX_MEM_MAPPED) {
 			puts("Cannot test more than ");
-			print_size(CONFIG_MAX_MEM_MAPPED,
+			print_size(CFG_MAX_MEM_MAPPED,
 				" without proper 36BIT support.\n");
 		}
 #endif
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 44f8ed8a19a3..7c47e415f05d 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -193,8 +193,8 @@ u32 determine_mp_bootpg(unsigned int *pagesize)
 
 
 	/* use last 4K of mapped memory */
-	bootpg = ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : gd->ram_size) +
+	bootpg = ((gd->ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : gd->ram_size) +
 		CFG_SYS_SDRAM_BASE - 4096;
 	if (pagesize)
 		*pagesize = 4096;
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 5d21bef58781..2a78f0fe502c 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -306,12 +306,12 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,
 	u64 memsize = (u64)memsize_in_meg << 20;
 	u64 size;
 
-	size = min(memsize, (u64)CONFIG_MAX_MEM_MAPPED);
+	size = min(memsize, (u64)CFG_MAX_MEM_MAPPED);
 	size = tlb_map_range(ram_tlb_address, p_addr, size, TLB_MAP_RAM);
 
-	if (size || memsize > CONFIG_MAX_MEM_MAPPED) {
-		print_size(memsize > CONFIG_MAX_MEM_MAPPED ?
-			   memsize - CONFIG_MAX_MEM_MAPPED + size : size,
+	if (size || memsize > CFG_MAX_MEM_MAPPED) {
+		print_size(memsize > CFG_MAX_MEM_MAPPED ?
+			   memsize - CFG_MAX_MEM_MAPPED + size : size,
 			   " of DDR memory left unmapped in U-Boot\n");
 #ifndef CONFIG_SPL_BUILD
 		puts("       ");
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index caad6670cc90..b906279226a5 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -17,7 +17,7 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries)
 
 	tbl->start_addr[i] =
 			(uint64_t)virt_to_phys((void *)CFG_SYS_SDRAM_BASE);
-	tbl->size[i] = (phys_size_t)(min(gd->ram_size, CONFIG_MAX_MEM_MAPPED));
+	tbl->size[i] = (phys_size_t)(min(gd->ram_size, CFG_MAX_MEM_MAPPED));
 	tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
 	i++;
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index 983c6f70cfee..f0702cab1431 100644
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -14,13 +14,13 @@
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
 
-#ifndef CONFIG_MAX_MEM_MAPPED
+#ifndef CFG_MAX_MEM_MAPPED
 #if	defined(CONFIG_E500)		|| \
 	defined(CONFIG_MPC86xx)		|| \
 	defined(CONFIG_E300)
-#define CONFIG_MAX_MEM_MAPPED	((phys_size_t)2 << 30)
+#define CFG_MAX_MEM_MAPPED	((phys_size_t)2 << 30)
 #else
-#define CONFIG_MAX_MEM_MAPPED	(256 << 20)
+#define CFG_MAX_MEM_MAPPED	(256 << 20)
 #endif
 #endif
 
diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h
index a1096ab1961b..aad06118cdbd 100644
--- a/arch/xtensa/include/asm/config.h
+++ b/arch/xtensa/include/asm/config.h
@@ -15,7 +15,7 @@
  */
 #if XCHAL_HAVE_PTP_MMU
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED (128 << 20)
+#define CFG_MAX_MEM_MAPPED (128 << 20)
 #endif
 
 #endif
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 1c00e253ffc8..bd7aac3656a6 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -279,13 +279,13 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
 	case DRA752_ES2_0:
 		switch (emif_nr) {
 		case 1:
-			if (ram_size > CONFIG_MAX_MEM_MAPPED)
+			if (ram_size > CFG_MAX_MEM_MAPPED)
 				*regs = &emif1_ddr3_532_mhz_1cs_2G;
 			else
 				*regs = &emif1_ddr3_532_mhz_1cs;
 			break;
 		case 2:
-			if (ram_size > CONFIG_MAX_MEM_MAPPED)
+			if (ram_size > CFG_MAX_MEM_MAPPED)
 				*regs = &emif2_ddr3_532_mhz_1cs_2G;
 			else
 				*regs = &emif2_ddr3_532_mhz_1cs;
@@ -303,7 +303,7 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
 	case DRA722_ES1_0:
 	case DRA722_ES2_0:
 	case DRA722_ES2_1:
-		if (ram_size < CONFIG_MAX_MEM_MAPPED)
+		if (ram_size < CFG_MAX_MEM_MAPPED)
 			*regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es1;
 		else
 			*regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es2;
@@ -362,7 +362,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 	case DRA752_ES1_0:
 	case DRA752_ES1_1:
 	case DRA752_ES2_0:
-		if (ram_size > CONFIG_MAX_MEM_MAPPED)
+		if (ram_size > CFG_MAX_MEM_MAPPED)
 			*dmm_lisa_regs = &lisa_map_dra7_2GB;
 		else
 			*dmm_lisa_regs = &lisa_map_dra7_1536MB;
@@ -371,7 +371,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 	case DRA722_ES2_0:
 	case DRA722_ES2_1:
 	default:
-		if (ram_size < CONFIG_MAX_MEM_MAPPED)
+		if (ram_size < CFG_MAX_MEM_MAPPED)
 			*dmm_lisa_regs = &lisa_map_2G_x_2;
 		else
 			*dmm_lisa_regs = &lisa_map_2G_x_4;
@@ -646,9 +646,9 @@ int dram_init_banksize(void)
 
 	gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
 	gd->bd->bi_dram[0].size = get_effective_memsize();
-	if (ram_size > CONFIG_MAX_MEM_MAPPED) {
+	if (ram_size > CFG_MAX_MEM_MAPPED) {
 		gd->bd->bi_dram[1].start = 0x200000000;
-		gd->bd->bi_dram[1].size = ram_size - CONFIG_MAX_MEM_MAPPED;
+		gd->bd->bi_dram[1].size = ram_size - CFG_MAX_MEM_MAPPED;
 	}
 
 	return 0;
diff --git a/common/memsize.c b/common/memsize.c
index 3c80ad2c8346..ad9ddf67ac5b 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -106,11 +106,11 @@ phys_size_t __weak get_effective_memsize(void)
 	if (gd->ram_base + ram_size < gd->ram_base)
 		ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base;
 
-#ifndef CONFIG_MAX_MEM_MAPPED
+#ifndef CFG_MAX_MEM_MAPPED
 	return ram_size;
 #else
 	/* limit stack to what we can reasonable map */
-	return ((ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : ram_size);
+	return ((ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : ram_size);
 #endif
 }
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index e49cf6e8e3db..60051392e713 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -139,10 +139,10 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params,
 	}
 
 #if !defined(CONFIG_PHYS_64BIT)
-	if (base >= CONFIG_MAX_MEM_MAPPED)
+	if (base >= CFG_MAX_MEM_MAPPED)
 		return;
-	if ((base + size) >= CONFIG_MAX_MEM_MAPPED)
-		size = CONFIG_MAX_MEM_MAPPED - base;
+	if ((base + size) >= CFG_MAX_MEM_MAPPED)
+		size = CFG_MAX_MEM_MAPPED - base;
 #endif
 	if (set_ddr_laws(base, size, law_memctl) < 0) {
 		printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num,
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index a53ff93a6b06..5d022d4993bc 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -122,8 +122,8 @@ phys_size_t get_effective_memsize(void)
 		return gd->ram_size;
 
 	/* Limit stack to what we can reasonable map */
-	return ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : gd->ram_size);
+	return ((gd->ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : gd->ram_size);
 }
 
 /**
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 30def6abf8f4..2aca6ad085e6 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -14,7 +14,7 @@
 #include <environment/ti/dfu.h>
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED		0x80000000
+#define CFG_MAX_MEM_MAPPED		0x80000000
 
 #ifndef CONFIG_QSPI_BOOT
 /* MMC ENV related defines */
diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h
index 7c8c67f44697..188f481ec1fb 100644
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -11,7 +11,7 @@
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED		0x1c000000
+#define CFG_MAX_MEM_MAPPED		0x1c000000
 
 #define CFG_SYS_INIT_SP_OFFSET	0x800000
 
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 54844fe69662..f13e9e6213bb 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -29,7 +29,7 @@
 #define CFG_SYS_SDRAM_BASE		(0x40000000 + DRAM_RSV_SIZE)
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
+#define CFG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
 /* ENV setting */
 
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 271080303fb6..fa522ce82883 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -15,7 +15,7 @@
 #define PHYS_SDRAM_SIZE			(0x7c000000)	/* Default size (2GB - Secure memory) */
 
 #define CONFIG_VERY_BIG_RAM				/* SynQuacer supports up to 64GB */
-#define CONFIG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
+#define CFG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
 
 #define SQ_DRAMINFO_BASE		(0x2e00ffc0)	/* DRAM info from TF-A */
 
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 6c5a9f566bee..105ce7c0c726 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -27,7 +27,7 @@
 #else
 #define CFG_SYS_MEMORY_BASE		0x60000000
 #define CFG_SYS_IO_BASE		0x90000000
-#define CONFIG_MAX_MEM_MAPPED		0x10000000
+#define CFG_MAX_MEM_MAPPED		0x10000000
 #endif
 
 /* Onboard RAM sizes:
@@ -69,10 +69,10 @@
 #define CONFIG_STANDALONE_LOAD_ADDR	0x60800000
 #endif
 
-#if defined(CONFIG_MAX_MEM_MAPPED) && \
-	CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
+#if defined(CFG_MAX_MEM_MAPPED) && \
+	CFG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR		\
-	(MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
+	(MEMADDR(CFG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
 #else
 #define XTENSA_SYS_TEXT_ADDR		\
 	(MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 31484bd13fd9..be26a6c456f2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -120,7 +120,7 @@ CFG_MACB_SEARCH_PHY
 CFG_MALLOC_F_ADDR
 CFG_MALTA
 CFG_MAX_DSP_CPUS
-CONFIG_MAX_MEM_MAPPED
+CFG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
 CONFIG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
-- 
2.25.1

[PoC 113/241] global: Migrate CONFIG_MAX_RAM_BANK_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-davinci/misc.c                 | 2 +-
 arch/arm/mach-omap2/am33xx/board.c           | 4 ++--
 arch/arm/mach-omap2/sec-common.c             | 2 +-
 arch/arm/mach-orion5x/dram.c                 | 4 ++--
 arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +-
 board/phytec/phycore_am335x_r2/board.c       | 2 +-
 board/ti/ks2_evm/board.c                     | 2 +-
 include/configs/am43xx_evm.h                 | 2 +-
 include/configs/bur_am335x_common.h          | 2 +-
 include/configs/cm_t43.h                     | 2 +-
 include/configs/da850evm.h                   | 2 +-
 include/configs/draco.h                      | 2 +-
 include/configs/etamin.h                     | 2 +-
 include/configs/legoev3.h                    | 2 +-
 include/configs/omapl138_lcdk.h              | 2 +-
 include/configs/pxm2.h                       | 2 +-
 include/configs/rastaban.h                   | 2 +-
 include/configs/rut.h                        | 2 +-
 include/configs/thuban.h                     | 2 +-
 include/configs/ti814x_evm.h                 | 2 +-
 include/configs/ti816x_evm.h                 | 2 +-
 include/configs/ti_am335x_common.h           | 2 +-
 include/configs/ti_armv7_keystone2.h         | 2 +-
 scripts/config_whitelist.txt                 | 2 +-
 24 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 42078b39f8ab..cfad28c43d0a 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -27,7 +27,7 @@ int dram_init(void)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(void *)CFG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	return 0;
 }
 
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 86755d6d9543..a52d04d85c8a 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -73,7 +73,7 @@ int dram_init(void)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(void *)CFG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	return 0;
 }
 
@@ -521,7 +521,7 @@ void board_init_f(ulong dummy)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(void *)CFG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 }
 #endif
 
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 0f9b915ea3dd..64560b21e3f5 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -203,7 +203,7 @@ u32 get_sec_mem_start(void)
 			omap_sdram_size()
 #else
 			get_ram_size((void *)CFG_SYS_SDRAM_BASE,
-				     CONFIG_MAX_RAM_BANK_SIZE)
+				     CFG_MAX_RAM_BANK_SIZE)
 #endif
 			- sec_mem_size));
 	return sec_mem_start;
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index c9a3750e48de..5647f847d78f 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -39,7 +39,7 @@ int dram_init (void)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(long *) orion5x_sdram_bar(0),
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	return 0;
 }
 
@@ -51,7 +51,7 @@ int dram_init_banksize(void)
 		gd->bd->bi_dram[i].start = orion5x_sdram_bar(i);
 		gd->bd->bi_dram[i].size = get_ram_size(
 			(long *) (gd->bd->bi_dram[i].start),
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	}
 
 	return 0;
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 4b1b0b0f3716..e41d07e18cc5 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -53,7 +53,7 @@
 #define MVCPU_WIN_ENABLE	ORION5X_WIN_ENABLE
 #define MVCPU_WIN_DISABLE	ORION5X_WIN_DISABLE
 
-#define CONFIG_MAX_RAM_BANK_SIZE		(64*1024*1024)
+#define CFG_MAX_RAM_BANK_SIZE		(64*1024*1024)
 
 /* include here SoC variants. 5181, 5281, 6183 should go here when
    adding support for them, and this comment should then be updated. */
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index e84dd251c254..eb573d076dd7 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -167,7 +167,7 @@ void sdram_init(void)
 
 	/* Detect memory physically present */
 	gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
-				    CONFIG_MAX_RAM_BANK_SIZE);
+				    CFG_MAX_RAM_BANK_SIZE);
 
 	/* Reconfigure memory for actual detected size */
 	switch (gd->ram_size) {
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 1683f780a33b..5dcda12105b9 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -47,7 +47,7 @@ int dram_init(void)
 	ddr3_size = ddr3_init();
 
 	gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
-				    CONFIG_MAX_RAM_BANK_SIZE);
+				    CFG_MAX_RAM_BANK_SIZE);
 #if defined(CONFIG_TI_AEMIF)
 	if (!(board_is_k2g_ice() || board_is_k2g_i1()))
 		aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs);
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 3a6ffd9de0bb..f43e00e8a2b6 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_AM43XX_EVM_H
 #define __CONFIG_AM43XX_EVM_H
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 21)	/* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 21)	/* 2GB */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
 #include <asm/arch/omap.h>
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 3e0b42507888..ab57e14392d0 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -19,7 +19,7 @@
 
 #endif /* CONFIG_DM */
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 /* Timer information */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 5a795fe99171..48ee3a50be5e 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_CM_T43_H
 #define __CONFIG_CM_T43_H
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2GB */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
 #include <asm/arch/omap.h>
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index cfc8330e35ae..736af88a0247 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -31,7 +31,7 @@
  */
 #define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
 #define PHYS_SDRAM_1_SIZE	(64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
 /* memtest start addr */
 
 /* memtest will be run on 16MB */
diff --git a/include/configs/draco.h b/include/configs/draco.h
index b56ba9132af2..4c67174572f3 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -25,7 +25,7 @@
 	"led1=64,0,1\0"
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 /* Default env settings */
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 32b45b1e5b8d..8b2745ea96e4 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -67,7 +67,7 @@
 	"led5=63,0,1\0"
 
 /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index b9ec7f379354..3a0622ab0b3b 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -27,7 +27,7 @@
  */
 #define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
 #define PHYS_SDRAM_1_SIZE	(64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
 
 /* memtest start addr */
 
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 02b88da28efa..b1fc437395dd 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -26,7 +26,7 @@
  */
 #define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
 #define PHYS_SDRAM_1_SIZE	(128 << 20) /* SDRAM size 128MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
 
 /* memtest start addr */
 
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 10eaeb49de62..b701e52076db 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -23,7 +23,7 @@
 	"led0=117,0,1\0" \
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 1GB */
 
 /* Use common default */
 
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 777df4c11259..2efb4d23cdda 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -32,7 +32,7 @@
 	"led5=63,0,1\0"
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 99799f8494e0..4002bc4b6c88 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -19,7 +19,7 @@
 #define DDR_PLL_FREQ	303
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20) /* 256 MiB */
+#define CFG_MAX_RAM_BANK_SIZE	(256 << 20) /* 256 MiB */
 
 /* Watchdog */
 #define WATCHDOG_TRIGGER_GPIO	14
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 1753fa410d18..a5913e1e7d2c 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -25,7 +25,7 @@
 	"led1=64,0,1\0"
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 28dba4aa95b6..11e1936c2562 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -67,7 +67,7 @@
  * Physical Memory Map
  */
 #define PHYS_DRAM_1_SIZE		0x20000000	/* 512MB */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1024MB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1024MB */
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 2d9d2fd66e9a..ac6d46f917b8 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -19,7 +19,7 @@
 #define V_OSCK          24000000    /* Clock output from T2 */
 #define V_SCLK          (V_OSCK >> 1)
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2048MB */
+#define CFG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2048MB */
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
 /**
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index ed17b4292096..20f8643771d8 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -11,7 +11,7 @@
 #ifndef __CONFIG_TI_AM335X_COMMON_H__
 #define __CONFIG_TI_AM335X_COMMON_H__
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
 #include <asm/arch/omap.h>
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 7142d30a5994..a47f0902a267 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -15,7 +15,7 @@
 
 /* Memory Configuration */
 #define CFG_SYS_LPAE_SDRAM_BASE	0x800000000
-#define CONFIG_MAX_RAM_BANK_SIZE	(2 << 30)       /* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE	(2 << 30)       /* 2GB */
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
 #define SPL_MALLOC_F_SIZE	CONFIG_SYS_MALLOC_F_LEN
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index be26a6c456f2..88e4db9a9f5c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -121,7 +121,7 @@ CFG_MALLOC_F_ADDR
 CFG_MALTA
 CFG_MAX_DSP_CPUS
 CFG_MAX_MEM_MAPPED
-CONFIG_MAX_RAM_BANK_SIZE
+CFG_MAX_RAM_BANK_SIZE
 CONFIG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
 CONFIG_MFG_ENV_SETTINGS
-- 
2.25.1

[PoC 114/241] global: Migrate CONFIG_MEMSIZE_IN_BYTES to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 4 ++--
 include/configs/malta.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index d09ebd47cd83..8ab897f09641 100644
--- a/README
+++ b/README
@@ -373,11 +373,11 @@ The following options need to be configured:
 		such as ARM architectural timer initialization.
 
 - Linux Kernel Interface:
-		CONFIG_MEMSIZE_IN_BYTES		[relevant for MIPS only]
+		CFG_MEMSIZE_IN_BYTES		[relevant for MIPS only]
 
 		When transferring memsize parameter to Linux, some versions
 		expect it to be in bytes, others in MB.
-		Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes.
+		Define CFG_MEMSIZE_IN_BYTES to make it in bytes.
 
 		CONFIG_OF_LIBFDT
 
diff --git a/include/configs/malta.h b/include/configs/malta.h
index cd4f382b18f9..5301afef4d58 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -11,7 +11,7 @@
  */
 #define CFG_MALTA
 
-#define CONFIG_MEMSIZE_IN_BYTES
+#define CFG_MEMSIZE_IN_BYTES
 
 /*
  * CPU Configuration
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 88e4db9a9f5c..6461fc20d698 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -122,7 +122,7 @@ CFG_MALTA
 CFG_MAX_DSP_CPUS
 CFG_MAX_MEM_MAPPED
 CFG_MAX_RAM_BANK_SIZE
-CONFIG_MEMSIZE_IN_BYTES
+CFG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
-- 
2.25.1

[PoC 115/241] global: Migrate CONFIG_MEM_INIT_VALUE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/ddr/fsl/ctrl_regs.c        | 6 +++---
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +-
 drivers/dma/fsl_dma.c              | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/P1010RDB.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/kontron_sl28.h     | 2 +-
 include/configs/ls1021aqds.h       | 2 +-
 include/configs/ls1043aqds.h       | 2 +-
 include/configs/ls1043ardb.h       | 2 +-
 include/configs/ls1046aqds.h       | 2 +-
 include/configs/ls1046ardb.h       | 2 +-
 include/configs/ls1088aqds.h       | 2 +-
 include/configs/ls1088ardb.h       | 2 +-
 include/configs/ls2080aqds.h       | 2 +-
 include/configs/ls2080ardb.h       | 2 +-
 include/configs/lx2160a_common.h   | 2 +-
 include/configs/socrates.h         | 2 +-
 scripts/config_whitelist.txt       | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index df7ec484651a..684975eebc2d 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -938,7 +938,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
 #if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
 	/* Use the DDR controller to auto initialize memory. */
 	d_init = popts->ecc_init_using_memctl;
-	ddr->ddr_data_init = CONFIG_MEM_INIT_VALUE;
+	ddr->ddr_data_init = CFG_MEM_INIT_VALUE;
 	debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init);
 #else
 	/* Memory will be initialized via DMA, or not at all. */
@@ -1847,8 +1847,8 @@ static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr)
 {
 	unsigned int init_value;	/* Initialization value */
 
-#ifdef CONFIG_MEM_INIT_VALUE
-	init_value = CONFIG_MEM_INIT_VALUE;
+#ifdef CFG_MEM_INIT_VALUE
+	init_value = CFG_MEM_INIT_VALUE;
 #else
 	init_value = 0xDEADBEEF;
 #endif
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 0f1e99eeb039..ec8c79199b29 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -73,7 +73,7 @@ ddr_enable_ecc(unsigned int dram_size)
 	struct ccsr_ddr __iomem *ddr =
 		(struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR);
 
-	dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size);
+	dma_meminit(CFG_MEM_INIT_VALUE, dram_size);
 
 	/*
 	 * Enable errors for ECC.
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index cd78e45d888a..8620c8f45d6f 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -142,7 +142,7 @@ void dma_meminit(uint val, uint size)
 		if (((uint)p & 0x1f) == 0)
 			ppcDcbz((ulong)p);
 
-		*p = (uint)CONFIG_MEM_INIT_VALUE;
+		*p = (uint)CFG_MEM_INIT_VALUE;
 
 		if (((uint)p & 0x1c) == 0x1c)
 			ppcDcbf((ulong)p);
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 5f2fc5516d5e..28315eef765d 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -31,7 +31,7 @@
 
 /* DDR Setup */
 
-#define CONFIG_MEM_INIT_VALUE	0xDeadBeef
+#define CFG_MEM_INIT_VALUE	0xDeadBeef
 
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000	/* DDR is system memory*/
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 794289627fe8..a486fb7d6bd5 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -104,7 +104,7 @@
 /* DDR Setup */
 #define SPD_EEPROM_ADDRESS		0x52
 
-#define CONFIG_MEM_INIT_VALUE		0xDeadBeef
+#define CFG_MEM_INIT_VALUE		0xDeadBeef
 
 #ifndef __ASSEMBLY__
 extern unsigned long get_sdram_size(void);
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 36ae8394d5d6..c61d086dbe57 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -95,7 +95,7 @@
  */
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7a31e8bcdc0a..bae6742928e3 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -65,7 +65,7 @@
  */
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 8e2566dd2175..d9841397fb6b 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -63,7 +63,7 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 6a215557104f..9e38d5e9f3a2 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -63,7 +63,7 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index bf0c3ac1318b..f1ee131aaa98 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -45,7 +45,7 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 0a1df4ad4bd0..0029499ea3c0 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -16,7 +16,7 @@
 #endif
 
 /* DDR */
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 
 #define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 69f9bacad97c..9d2622a7d69f 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index dab57382eddf..35662f65502f 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -13,7 +13,7 @@
 #define SPD_EEPROM_ADDRESS		0x51
 
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 12c4853ea963..80214e069cb1 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -12,7 +12,7 @@
 /* Physical Memory Map */
 
 #ifndef CONFIG_SPL
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 #endif
 
 /*
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index e67ded55da6b..c4fbef7e7f9a 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -13,7 +13,7 @@
 #define SPD_EEPROM_ADDRESS		0x51
 
 #ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index f3904e7b3f7b..1209f16619f9 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -13,7 +13,7 @@
 
 #define SPD_EEPROM_ADDRESS		0x51
 
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 
 #if defined(CONFIG_QSPI_BOOT)
 #define CFG_SYS_UBOOT_BASE		0x40100000
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 0582a4568dc7..52a6a2768384 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -14,7 +14,7 @@
 
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk()/4)
 
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
+#define CFG_MEM_INIT_VALUE           0xdeadbeef
 #define SPD_EEPROM_ADDRESS		0x51
 
 
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index ee796facc06c..542495956c32 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -15,7 +15,7 @@
 
 #define COUNTER_FREQUENCY_REAL		25000000	/* 25MHz */
 
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS	0x51
 
 
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index d029d841d51e..db7e422336fe 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk()/4)
 
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS1	0x51
 #define SPD_EEPROM_ADDRESS2	0x52
 #define SPD_EEPROM_ADDRESS3	0x53
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 73477978be46..e4c9b2c44ca6 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -21,7 +21,7 @@
 
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk()/4)
 
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS1	0x51
 #define SPD_EEPROM_ADDRESS2	0x52
 #define SPD_EEPROM_ADDRESS3	0x53
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index a469c83fa4eb..0fc32efabc7f 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -19,7 +19,7 @@
 #define CFG_SYS_DDR_BLOCK2_BASE		0x2080000000ULL
 #define CFG_SYS_SDRAM_SIZE			0x200000000UL
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CFG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS1		0x51
 #define SPD_EEPROM_ADDRESS2		0x52
 #define SPD_EEPROM_ADDRESS3		0x53
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 9eee8de41644..eb5c14fff28e 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -51,7 +51,7 @@
 
 /* DDR Setup */
 
-#define CONFIG_MEM_INIT_VALUE	0xDeadBeef
+#define CFG_MEM_INIT_VALUE	0xDeadBeef
 
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6461fc20d698..1adb99f49ec7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -123,7 +123,7 @@ CFG_MAX_DSP_CPUS
 CFG_MAX_MEM_MAPPED
 CFG_MAX_RAM_BANK_SIZE
 CFG_MEMSIZE_IN_BYTES
-CONFIG_MEM_INIT_VALUE
+CFG_MEM_INIT_VALUE
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
-- 
2.25.1

[PoC 116/241] global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/capricorn-common.h | 4 ++--
 include/configs/cgtqmx8.h          | 4 ++--
 include/configs/colibri-imx8x.h    | 4 ++--
 include/configs/imx8mq_phanbell.h  | 4 ++--
 include/configs/imx8qm_rom7720.h   | 4 ++--
 include/configs/mx7dsabresd.h      | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 9e7322cdb937..9dcacad2fc00 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -60,7 +60,7 @@
 			"${loadaddr} ${m4_0_image}\0" \
 	"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	MFG_ENV_SETTINGS_DEFAULT \
 	"initrd_addr=0x83100000\0" \
 	"initrd_high=0xffffffffffffffff\0" \
@@ -68,7 +68,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	AHAB_ENV \
 	ENV_COMMON \
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index a63325973846..91454df19720 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -42,7 +42,7 @@
 #define FEC0_RESET IMX_GPIO_NR(2, 5)
 #define FEC0_PDOMAIN "conn_enet0"
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -56,7 +56,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 35f29da0c351..0e8e24dd7bd2 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -47,7 +47,7 @@
 #undef BOOTENV_RUN_NET_USB_START
 #define BOOTENV_RUN_NET_USB_START ""
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs ${consoleargs} " \
 		"rdinit=/linuxrc g_mass_storage.stall=0 " \
 		"g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
@@ -63,7 +63,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	AHAB_ENV \
 	BOOTENV \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 5158f2cc605a..6d0c45311183 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -24,13 +24,13 @@
 #define CFG_FEC_MXC_PHYADDR          0
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"initrd_addr=0x43800000\0" \
 	"initrd_high=0xffffffff\0" \
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 5692e3d00007..df2cb8d9ced1 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -33,7 +33,7 @@
 #define MFG_NAND_PARTITION ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -48,7 +48,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 183e67857ca1..a9722967f396 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -32,7 +32,7 @@
 #define UPDATE_M4_ENV ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -52,7 +52,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1adb99f49ec7..a1b88d29cb15 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -124,7 +124,7 @@ CFG_MAX_MEM_MAPPED
 CFG_MAX_RAM_BANK_SIZE
 CFG_MEMSIZE_IN_BYTES
 CFG_MEM_INIT_VALUE
-CONFIG_MFG_ENV_SETTINGS
+CFG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
-- 
2.25.1

[PoC 117/241] global: Migrate CONFIG_MII_DEFAULT_TSEC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/P1010RDB.h   | 2 +-
 include/configs/ls1021aiot.h | 2 +-
 include/configs/ls1021aqds.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index a486fb7d6bd5..a75e1b8f7a8a 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -350,7 +350,7 @@ extern unsigned long get_sdram_size(void);
 #endif
 
 #if defined(CONFIG_TSEC_ENET)
-#define CONFIG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
+#define CFG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
 #define CONFIG_TSEC1	1
 #define CONFIG_TSEC1_NAME	"eTSEC1"
 #define CONFIG_TSEC2	1
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 0a08619384b6..7a9a89d02390 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_TSEC_ENET
-#define CONFIG_MII_DEFAULT_TSEC		1
+#define CFG_MII_DEFAULT_TSEC		1
 #define CONFIG_TSEC1			1
 #define CONFIG_TSEC1_NAME		"eTSEC1"
 #define CONFIG_TSEC2			1
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 9d2622a7d69f..be05ab9de8cb 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -252,7 +252,7 @@
  */
 
 #ifdef CONFIG_TSEC_ENET
-#define CONFIG_MII_DEFAULT_TSEC		3
+#define CFG_MII_DEFAULT_TSEC		3
 #define CONFIG_TSEC1			1
 #define CONFIG_TSEC1_NAME		"eTSEC1"
 #define CONFIG_TSEC2			1
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a1b88d29cb15..0380ebb2a6e8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -125,7 +125,7 @@ CFG_MAX_RAM_BANK_SIZE
 CFG_MEMSIZE_IN_BYTES
 CFG_MEM_INIT_VALUE
 CFG_MFG_ENV_SETTINGS
-CONFIG_MII_DEFAULT_TSEC
+CFG_MII_DEFAULT_TSEC
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
-- 
2.25.1

[PoC 118/241] global: Migrate CONFIG_MIU_2BIT_21_7_INTERLEAVED to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/origen.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/origen.h b/include/configs/origen.h
index d4ba599d72a4..a85fee4a0d84 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -39,7 +39,7 @@
                 "source ${loadaddr}\0"
 
 /* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_21_7_INTERLEAVED
+#define CFG_MIU_2BIT_21_7_INTERLEAVED
 
 #define RESERVE_BLOCK_SIZE		(512)
 #define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0380ebb2a6e8..8d6af14c3667 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -126,7 +126,7 @@ CFG_MEMSIZE_IN_BYTES
 CFG_MEM_INIT_VALUE
 CFG_MFG_ENV_SETTINGS
 CFG_MII_DEFAULT_TSEC
-CONFIG_MIU_2BIT_21_7_INTERLEAVED
+CFG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
-- 
2.25.1

[PoC 119/241] global: Migrate CONFIG_MIU_2BIT_INTERLEAVED to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/exynos4_setup.h | 2 +-
 include/configs/smdkv310.h           | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h
index fbb45eb897e3..b696206cc855 100644
--- a/arch/arm/mach-exynos/exynos4_setup.h
+++ b/arch/arm/mach-exynos/exynos4_setup.h
@@ -434,7 +434,7 @@ struct mem_timings {
 /* Interleave_bit0: 0xC*/
 #define APB_SFR_INTERLEAVE_CONF_VAL	0x0000000c
 #endif
-#ifdef CONFIG_MIU_2BIT_INTERLEAVED
+#ifdef CFG_MIU_2BIT_INTERLEAVED
 /* Interleave: 2Bit, Interleave_bit1: 0x15, Interleave_bit0: 0xc */
 #define APB_SFR_INTERLEAVE_CONF_VAL	0x2000150c
 #endif
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 1f137dba90f7..00dd929d90e6 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -35,7 +35,7 @@
 /* FLASH and environment organization */
 
 /* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_INTERLEAVED
+#define CFG_MIU_2BIT_INTERLEAVED
 
 #define RESERVE_BLOCK_SIZE		(512)
 #define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8d6af14c3667..b2686806c5c4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -127,7 +127,7 @@ CFG_MEM_INIT_VALUE
 CFG_MFG_ENV_SETTINGS
 CFG_MII_DEFAULT_TSEC
 CFG_MIU_2BIT_21_7_INTERLEAVED
-CONFIG_MIU_2BIT_INTERLEAVED
+CFG_MIU_2BIT_INTERLEAVED
 CONFIG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
-- 
2.25.1

[PoC 120/241] global: Migrate CONFIG_MMC_DEFAULT_DEV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/exynos4-common.h | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 include/configs/trats2.h         | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 63e26687dbce..6a48fe9103ff 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -11,7 +11,7 @@
 #include "exynos-common.h"
 
 /* SD/MMC configuration */
-#define CONFIG_MMC_DEFAULT_DEV	0
+#define CFG_MMC_DEFAULT_DEV	0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 1e211eccee7b..85e24caa5107 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -120,7 +120,7 @@
 #define PHYS_SDRAM_3_SIZE	(128 << 20)		/* 128 MB in Bank #2 */
 
 /* FLASH and environment organization */
-#define CONFIG_MMC_DEFAULT_DEV	0
+#define CFG_MMC_DEFAULT_DEV	0
 
 #define CFG_SYS_ONENAND_BASE		0xB0000000
 
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 21372243bbc8..d5f17e3b7802 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -81,7 +81,7 @@
 		"${kernelname}\0" \
 	"loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \
 		"${fdtfile}\0" \
-	"mmcdev=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \
+	"mmcdev=" __stringify(CFG_MMC_DEFAULT_DEV) "\0" \
 	"mmcbootpart=2\0" \
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b2686806c5c4..a31178b8b6e7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -128,7 +128,7 @@ CFG_MFG_ENV_SETTINGS
 CFG_MII_DEFAULT_TSEC
 CFG_MIU_2BIT_21_7_INTERLEAVED
 CFG_MIU_2BIT_INTERLEAVED
-CONFIG_MMC_DEFAULT_DEV
+CFG_MMC_DEFAULT_DEV
 CONFIG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MTD_NAND_VERIFY_WRITE
-- 
2.25.1

[PoC 121/241] global: Migrate CONFIG_MMC_SUNXI_SLOT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/sunxi/board.c            | 4 ++--
 include/configs/sunxi-common.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 21a2407e062f..356e5f07f688 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -526,8 +526,8 @@ static void mmc_pinmux_setup(int sdc)
 int board_mmc_init(struct bd_info *bis)
 {
 	if (!IS_ENABLED(CONFIG_UART0_PORT_F)) {
-		mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
-		if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT))
+		mmc_pinmux_setup(CFG_MMC_SUNXI_SLOT);
+		if (!sunxi_mmc_init(CFG_MMC_SUNXI_SLOT))
 			return -1;
 	}
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index f3c8f7002342..1be4cde2b70e 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -70,7 +70,7 @@
 #define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */
 
 /* mmc config */
-#define CONFIG_MMC_SUNXI_SLOT		0
+#define CFG_MMC_SUNXI_SLOT		0
 
 /*
  * Miscellaneous configurable options
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a31178b8b6e7..4185a1b9c003 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -129,7 +129,7 @@ CFG_MII_DEFAULT_TSEC
 CFG_MIU_2BIT_21_7_INTERLEAVED
 CFG_MIU_2BIT_INTERLEAVED
 CFG_MMC_DEFAULT_DEV
-CONFIG_MMC_SUNXI_SLOT
+CFG_MMC_SUNXI_SLOT
 CONFIG_MONITOR_IS_IN_RAM
 CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MVGBE_PORTS
-- 
2.25.1

[PoC 122/241] global: Migrate CONFIG_MONITOR_IS_IN_RAM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/m68k/cpu/mcf52x2/cpu_init.c | 12 ++++++------
 arch/m68k/cpu/mcf52x2/start.S    |  4 ++--
 arch/m68k/cpu/mcf530x/start.S    |  4 ++--
 arch/m68k/cpu/mcf532x/speed.c    |  4 ++--
 arch/m68k/cpu/mcf532x/start.S    |  6 +++---
 board/astro/mcf5373l/mcf5373l.c  |  2 +-
 board/cobra5272/README           |  8 ++++----
 board/freescale/m53017evb/README |  2 +-
 board/freescale/m5373evb/README  |  2 +-
 doc/arch/m68k.rst                |  2 +-
 drivers/mtd/cfi_flash.c          |  2 +-
 include/configs/10m50_devboard.h |  2 +-
 include/configs/3c120_devboard.h |  2 +-
 include/configs/M5249EVB.h       |  2 +-
 include/configs/M5272C3.h        |  2 +-
 include/configs/M5282EVB.h       |  2 +-
 include/configs/astro_mcf5373l.h | 12 +-----------
 include/configs/cobra5272.h      | 21 ---------------------
 include/configs/eb_cpu5282.h     |  2 +-
 scripts/config_whitelist.txt     |  2 +-
 20 files changed, 32 insertions(+), 63 deletions(-)

diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
index 99eb61f16758..1d6e39a2ce5e 100644
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@@ -334,7 +334,7 @@ void cpu_init_f(void)
 	/* if we come from RAM we assume the CPU is
 	 * already initialized.
 	 */
-#ifndef CONFIG_MONITOR_IS_IN_RAM
+#ifndef CFG_MONITOR_IS_IN_RAM
 	sysctrl_t *sysctrl = (sysctrl_t *) (CFG_SYS_MBAR);
 	gpio_t *gpio = (gpio_t *) (MMAP_GPIO);
 	csctrl_t *csctrl = (csctrl_t *) (MMAP_FBCS);
@@ -390,7 +390,7 @@ void cpu_init_f(void)
 	out_be32(&csctrl->cs_or7, CONFIG_SYS_OR7_PRELIM);
 #endif
 
-#endif				/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
+#endif				/* #ifndef CFG_MONITOR_IS_IN_RAM */
 
 	/* enable instruction cache now */
 	icache_enable();
@@ -460,7 +460,7 @@ void cpu_init_f(void)
 	 * already initialized.
 	 */
 
-#ifndef CONFIG_MONITOR_IS_IN_RAM
+#ifndef CFG_MONITOR_IS_IN_RAM
 	wdog_t *wdog_reg = (wdog_t *) (MMAP_WDOG);
 	gpio_t *gpio_reg = (gpio_t *) (MMAP_GPIO);
 
@@ -469,7 +469,7 @@ void cpu_init_f(void)
 
 	/* FlexBus Chipselect */
 	init_fbcs();
-#endif				/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
+#endif				/* #ifndef CFG_MONITOR_IS_IN_RAM */
 
 #ifdef CONFIG_SYS_I2C_FSL
 	CFG_SYS_I2C_PINMUX_REG &= CFG_SYS_I2C_PINMUX_CLR;
@@ -557,7 +557,7 @@ void cpu_init_f(void)
 	MCFWTM_WCR = 0;
 #endif
 
-#ifndef CONFIG_MONITOR_IS_IN_RAM
+#ifndef CFG_MONITOR_IS_IN_RAM
 	/* Set speed /PLL */
 	MCFCLOCK_SYNCR =
 	    MCFCLOCK_SYNCR_MFD(CFG_SYS_MFD) |
@@ -614,7 +614,7 @@ void cpu_init_f(void)
 	/* FlexBus Chipselect */
 	init_fbcs();
 
-#endif				/* CONFIG_MONITOR_IS_IN_RAM */
+#endif				/* CFG_MONITOR_IS_IN_RAM */
 
 	/* defer enabling cache until boot (see do_go) */
 	/* icache_enable(); */
diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S
index d48d0192eea2..47d935d3d9f0 100644
--- a/arch/m68k/cpu/mcf52x2/start.S
+++ b/arch/m68k/cpu/mcf52x2/start.S
@@ -25,7 +25,7 @@
 /* If we come from a pre-loader we don't need an initial exception
  * table.
  */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 
 .text
 
@@ -164,7 +164,7 @@ _after_flashbar_copy:
 	 * if we come from a pre-loader we have no exception table and
 	 * therefore no VBR to set
 	 */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 #if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE)
 	move.l	#CFG_SYS_INT_FLASH_BASE, %d0
 #else
diff --git a/arch/m68k/cpu/mcf530x/start.S b/arch/m68k/cpu/mcf530x/start.S
index dbe2b54e4101..4d474576457e 100644
--- a/arch/m68k/cpu/mcf530x/start.S
+++ b/arch/m68k/cpu/mcf530x/start.S
@@ -27,7 +27,7 @@
 /* If we come from a pre-loader we don't need an initial exception
  * table.
  */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 
 .text
 
@@ -109,7 +109,7 @@ _start:
 	 * if we come from a pre-loader we have no exception table and
 	 * therefore no VBR to set
 	 */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	move.l	#CFG_SYS_FLASH_BASE, %d0
 	movec	%d0, %VBR
 #endif
diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
index 32ffac08135d..f58f84f976ce 100644
--- a/arch/m68k/cpu/mcf532x/speed.c
+++ b/arch/m68k/cpu/mcf532x/speed.c
@@ -192,7 +192,7 @@ int clock_pll(int fsys, int flags)
 #endif
 
 /* must not tamper with SDRAMC if running from SDRAM */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	/*
 	 * Check to see if the SDRAM has already been initialized.
 	 * If it has then the SDRAM needs to be put into self refresh
@@ -244,7 +244,7 @@ int clock_pll(int fsys, int flags)
 
 	/* wait for DQS logic to relock */
 	for (i = 0; i < 0x200; i++) ;
-#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */
+#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */
 
 	return fout;
 }
diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S
index 72a2f99b7dd2..4e6f2b8621d7 100644
--- a/arch/m68k/cpu/mcf532x/start.S
+++ b/arch/m68k/cpu/mcf532x/start.S
@@ -24,7 +24,7 @@
 	addl	#60,%sp;		/* space for 15 regs */ \
 	rte;
 
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 
 .text
 
@@ -86,7 +86,7 @@ vector192_255:
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
-#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */
+#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */
 
 .text
 
@@ -96,7 +96,7 @@ _start:
 	nop
 	move.w	#0x2700,%sr	/* Mask off Interrupt */
 
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	/* Set vector base register at the beginning of the Flash */
 	move.l	#CFG_SYS_FLASH_BASE, %d0
 	movec	%d0, %VBR
diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 43563c412793..c6172365744a 100644
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -32,7 +32,7 @@ int checkboard(void)
 
 int dram_init(void)
 {
-#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if !defined(CFG_MONITOR_IS_IN_RAM)
 	sdram_t *sdp = (sdram_t *)(MMAP_SDRAM);
 
 	/*
diff --git a/board/cobra5272/README b/board/cobra5272/README
index ac62e557a075..770b66327ef5 100644
--- a/board/cobra5272/README
+++ b/board/cobra5272/README
@@ -79,10 +79,10 @@ please first check:
 
 	in ./include/configs/cobra5272.h
 
-		CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
+		CFG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
 
 		#if 0
-			#define CONFIG_MONITOR_IS_IN_RAM
+			#define CFG_MONITOR_IS_IN_RAM
 			/* define if monitor is started from a pre-loader */
 		#endif
 
@@ -118,10 +118,10 @@ please modify the settings:
 
 	in ./include/configs/cobra5272.h
 
-		CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
+		CFG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
 
 		#if 1
-			#define CONFIG_MONITOR_IS_IN_RAM
+			#define CFG_MONITOR_IS_IN_RAM
 			/*define if monitor is started from a pre-loader */
 		#endif
 
diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
index 34f05f3fdc72..193ba9394ac3 100644
--- a/board/freescale/m53017evb/README
+++ b/board/freescale/m53017evb/README
@@ -98,7 +98,7 @@ CONFIG_SYS_IMMR			-- define for MBAR offset
 
 CFG_SYS_MBAR			-- define MBAR offset
 
-CONFIG_MONITOR_IS_IN_RAM	-- Not support
+CFG_MONITOR_IS_IN_RAM	-- Not support
 
 CFG_SYS_INIT_RAM_ADDR	-- defines the base address of the MCF5301x internal SRAM
 
diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README
index 7240648796b5..807785cb4ff5 100644
--- a/board/freescale/m5373evb/README
+++ b/board/freescale/m5373evb/README
@@ -97,7 +97,7 @@ CONFIG_SYS_IMMR		-- define for MBAR offset
 
 CFG_SYS_MBAR		-- define MBAR offset
 
-CONFIG_MONITOR_IS_IN_RAM -- Not support
+CFG_MONITOR_IS_IN_RAM -- Not support
 
 CFG_SYS_INIT_RAM_ADDR	-- defines the base address of the MCF5373 internal SRAM
 
diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst
index 770327fea21a..dc2a41d4e990 100644
--- a/doc/arch/m68k.rst
+++ b/doc/arch/m68k.rst
@@ -93,7 +93,7 @@ Configuration to use a pre-loader
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If U-Boot should be loaded to RAM and started by a pre-loader
-CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the
+CFG_MONITOR_IS_IN_RAM must be defined. If it is defined the
 initial vector table and basic processor initialization will not
 be compiled in. The start address of U-Boot must be adjusted in
 the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index f3abe7842b69..0461aa1adbed 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -2360,7 +2360,7 @@ static void flash_protect_default(void)
 	/* Monitor protection ON by default */
 #if defined(CONFIG_SYS_MONITOR_BASE) && \
 	(CONFIG_SYS_MONITOR_BASE >= CFG_SYS_FLASH_BASE) && \
-	(!defined(CONFIG_MONITOR_IS_IN_RAM))
+	(!defined(CFG_MONITOR_IS_IN_RAM))
 	flash_protect(FLAG_PROTECT_SET,
 		      CONFIG_SYS_MONITOR_BASE,
 		      CONFIG_SYS_MONITOR_BASE + monitor_flash_len  - 1,
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 3a4fbc6eab83..cc22a4724aaa 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -32,6 +32,6 @@
  */
 #define CFG_SYS_SDRAM_BASE		0xc8000000
 #define CFG_SYS_SDRAM_SIZE		0x08000000
-#define CONFIG_MONITOR_IS_IN_RAM
+#define CFG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index ab889180eede..556f31efe59f 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -28,6 +28,6 @@
  */
 #define CFG_SYS_SDRAM_BASE		0xD0000000
 #define CFG_SYS_SDRAM_SIZE		0x08000000
-#define CONFIG_MONITOR_IS_IN_RAM
+#define CFG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 0e38eeb4a365..4a9e9ed882ac 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -20,7 +20,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM		/* no pre-loader required!!! ;-) */
+#undef CFG_MONITOR_IS_IN_RAM		/* no pre-loader required!!! ;-) */
 
 /*
  * Clock configuration: enable only one of the following options
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 4b88cfc2cdd9..99f1df087e36 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -19,7 +19,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
+#undef CFG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index f34985c47d4b..4b20da4a23eb 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -19,7 +19,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef	CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
+#undef	CFG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 8f4419f402f7..fe49b04609cf 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -45,7 +45,7 @@
  * boards.
  */
 #ifdef CONFIG_RAM
-#define CONFIG_MONITOR_IS_IN_RAM
+#define CFG_MONITOR_IS_IN_RAM
 #endif
 
 /* I2C */
@@ -74,16 +74,6 @@
  * Environment is located in the last sector of the flash
  */
 
-#ifndef CONFIG_MONITOR_IS_IN_RAM
-#else
-/*
- * environment in RAM - This is used to use a single PC-based application
- * to load an image, load U-Boot, load an environment and then start U-Boot
- * to execute the commands from the environment. Feedback is done via setting
- * and reading memory locations.
- */
-#endif
-
 /* here we put our FPGA configuration... */
 
 /* Define user parameters that have to be customized most likely */
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 1b5115f7caf1..b0acdb2e7d62 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -42,27 +42,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-/* ---
- * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different
- * bootloader residing in flash ('chainloading'); if you want to use
- * chainloading or want to compile a u-boot binary that can be loaded into
- * RAM via BDM set
- *	"#if 0" to "#if 1"
- * You will need a first stage bootloader then, e. g. colilo or a working BDM
- * cable (Background Debug Mode)
- *
- * Setting #if 0: u-boot will start from flash and relocate itself to RAM
- *
- * Please do not forget to modify the setting of CONFIG_TEXT_BASE
- * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000)
- *
- * ---
- */
-
-#if 0
-#define CONFIG_MONITOR_IS_IN_RAM /* monitor is started from a preloader */
-#endif
-
 /* ---
  * Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index a4370ca5c7cc..e8d85bdd78f2 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -14,7 +14,7 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef	CONFIG_MONITOR_IS_IN_RAM		/* starts uboot direct */
+#undef	CFG_MONITOR_IS_IN_RAM		/* starts uboot direct */
 
 /*----------------------------------------------------------------------*
  * Options								*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4185a1b9c003..01f78d11afd8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -130,7 +130,7 @@ CFG_MIU_2BIT_21_7_INTERLEAVED
 CFG_MIU_2BIT_INTERLEAVED
 CFG_MMC_DEFAULT_DEV
 CFG_MMC_SUNXI_SLOT
-CONFIG_MONITOR_IS_IN_RAM
+CFG_MONITOR_IS_IN_RAM
 CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MVGBE_PORTS
 CONFIG_MXC_GPT_HCLK
-- 
2.25.1

[PoC 123/241] global: Migrate CONFIG_MTD_NAND_VERIFY_WRITE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/ls1043aqds.h  | 2 +-
 include/configs/ls1043ardb.h  | 2 +-
 include/configs/ls1046afrwy.h | 2 +-
 include/configs/ls1046aqds.h  | 2 +-
 include/configs/ls1046ardb.h  | 2 +-
 include/configs/ls1088aqds.h  | 2 +-
 include/configs/ls1088ardb.h  | 2 +-
 include/configs/ls2080aqds.h  | 2 +-
 include/configs/ls2080ardb.h  | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 35662f65502f..477e63ce0390 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -107,7 +107,7 @@
 #define CFG_SYS_NAND_FTIM3           0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 #endif
 
 #ifdef CONFIG_NAND_BOOT
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 80214e069cb1..ec81b3ca5b36 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -82,7 +82,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #ifdef CONFIG_NAND_BOOT
 #define CFG_SYS_NAND_U_BOOT_SIZE	(1024 << 10)
diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 1759d25f3a39..c876d3ee2719 100644
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -45,7 +45,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 /* IFC Timing Params */
 #define CFG_SYS_CSPR0_EXT		CFG_SYS_NAND_CSPR_EXT
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index c4fbef7e7f9a..731fc1d35bb7 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -127,7 +127,7 @@
 #define CFG_SYS_NAND_FTIM3           0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 #endif
 
 #ifdef CONFIG_NAND_BOOT
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 1209f16619f9..13837e89d25b 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -50,7 +50,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 /*
  * CPLD
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 52a6a2768384..421965fc7974 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -99,7 +99,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_LBMAP_SWITCH		6
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 542495956c32..41d1666a3588 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -83,7 +83,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_BRDCFG4_OFFSET            0x54
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index db7e422336fe..652f0b1b7760 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -100,7 +100,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define QIXIS_LBMAP_SWITCH		0x06
 #define QIXIS_LBMAP_MASK		0x0f
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index e4c9b2c44ca6..4ca7d51c990b 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -97,7 +97,7 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_MTD_NAND_VERIFY_WRITE
 
 #define QIXIS_LBMAP_SWITCH		0x06
 #define QIXIS_LBMAP_MASK		0x0f
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 01f78d11afd8..24d09c1a4be2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -131,7 +131,7 @@ CFG_MIU_2BIT_INTERLEAVED
 CFG_MMC_DEFAULT_DEV
 CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
-CONFIG_MTD_NAND_VERIFY_WRITE
+CFG_MTD_NAND_VERIFY_WRITE
 CONFIG_MVGBE_PORTS
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
-- 
2.25.1

[PoC 124/241] global: Migrate CONFIG_MVGBE_PORTS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/mvgbe.c            | 6 +++---
 include/configs/SBx81LIFKW.h   | 2 +-
 include/configs/SBx81LIFXCAT.h | 2 +-
 include/configs/dns325.h       | 2 +-
 include/configs/dockstar.h     | 2 +-
 include/configs/dreamplug.h    | 2 +-
 include/configs/ds109.h        | 2 +-
 include/configs/goflexhome.h   | 2 +-
 include/configs/guruplug.h     | 2 +-
 include/configs/ib62x0.h       | 2 +-
 include/configs/iconnect.h     | 2 +-
 include/configs/lacie_kw.h     | 2 +-
 include/configs/nas220.h       | 2 +-
 include/configs/nsa310s.h      | 2 +-
 include/configs/openrd.h       | 4 ++--
 include/configs/pogo_e02.h     | 2 +-
 include/configs/pogo_v4.h      | 2 +-
 include/configs/sheevaplug.h   | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index a77c05743262..373bb8b0d239 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -37,8 +37,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_MVGBE_PORTS
-# define CONFIG_MVGBE_PORTS {0, 0}
+#ifndef CFG_MVGBE_PORTS
+# define CFG_MVGBE_PORTS {0, 0}
 #endif
 
 #define MV_PHY_ADR_REQUEST 0xee
@@ -832,7 +832,7 @@ int mvgbe_initialize(struct bd_info *bis)
 	struct eth_device *dev;
 	int devnum;
 	int ret;
-	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+	u8 used_ports[MAX_MVGBE_DEVS] = CFG_MVGBE_PORTS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index bad34d9771ec..861ae530336a 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -43,7 +43,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable a single port */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
 #define CONFIG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 9a9663b34ba8..418221ca72b3 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -48,7 +48,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable a single port */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
 #define CONFIG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 2a70db5e9382..8a9591ff29e1 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -20,7 +20,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
 #endif
 
 /*
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 07cec38b50d0..68afe96239e6 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -31,7 +31,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 733020d3e261..2b312e52b135 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -27,7 +27,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+#define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DREAMPLUG_H */
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index ede21a4e2c57..a5f62497a731 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -39,7 +39,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable one port */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable one port */
 #define CONFIG_PHY_BASE_ADR	8
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index bc517286b113..c10e991d6589 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -39,7 +39,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_GOFLEXHOME_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index c4f53e6e4004..b21151e312c9 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -34,7 +34,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+#define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 #define CONFIG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 242f92e6fd72..5eeaeadd4bec 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -28,7 +28,7 @@
  * Ethernet driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index f719ecb5fe0b..12f8a3c933cc 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -22,7 +22,7 @@
  * This board has PCIe Wifi card, so allow Ethernet to be disabled
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	11
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index db45585ba313..ea3a5215e8c9 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -18,7 +18,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
 #endif
 
 /*
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 9676ccc982f5..bfa132dbfe58 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -43,7 +43,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR 8
 #endif /* CONFIG_CMD_NET */
 
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 76c4aed6fd91..85cbd0bab07d 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -47,7 +47,7 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* Ethernet driver configuration */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	1
 
 #endif /* _CONFIG_NSA310S_H */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index ec3a0e0676d7..1d1915a98520 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -38,9 +38,9 @@
  */
 #ifdef CONFIG_CMD_NET
 # ifdef CONFIG_BOARD_IS_OPENRD_BASE
-#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#  define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 # else
-#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+#  define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 # endif
 # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
 #  define CONFIG_PHY_BASE_ADR	0x0
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index af750e86ee98..c48590123bd2 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -26,7 +26,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index 016da6d04b0b..5d26a45f1426 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -72,7 +72,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_V4_H */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index a228dac2ee92..d4d968285fbd 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -24,7 +24,7 @@
 /*
  * Ethernet Driver configuration
  */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+#define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_SHEEVAPLUG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 24d09c1a4be2..92dec899cad7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -132,7 +132,7 @@ CFG_MMC_DEFAULT_DEV
 CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
-CONFIG_MVGBE_PORTS
+CFG_MVGBE_PORTS
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
-- 
2.25.1

[PoC 125/241] global: Migrate CONFIG_MXC_GPT_HCLK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-imx/timer.c    | 4 ++--
 include/configs/brppt2.h     | 2 +-
 include/configs/mx6_common.h | 2 +-
 include/configs/mx7_common.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
index fcd45f09f181..792772b06473 100644
--- a/arch/arm/mach-imx/timer.c
+++ b/arch/arm/mach-imx/timer.c
@@ -54,7 +54,7 @@ static inline int gpt_has_clk_source_osc(void)
 
 static inline ulong gpt_get_clk(void)
 {
-#ifdef CONFIG_MXC_GPT_HCLK
+#ifdef CFG_MXC_GPT_HCLK
 	if (gpt_has_clk_source_osc())
 		return MXC_HCLK >> 3;
 	else
@@ -78,7 +78,7 @@ int timer_init(void)
 	i = __raw_readl(&cur_gpt->control);
 	i &= ~GPTCR_CLKSOURCE_MASK;
 
-#ifdef CONFIG_MXC_GPT_HCLK
+#ifdef CFG_MXC_GPT_HCLK
 	if (gpt_has_clk_source_osc()) {
 		i |= GPTCR_CLKSOURCE_OSC | GPTCR_TEN;
 
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 92f34407b401..47a95c0b920a 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_PL310_BASE		L2_PL310_BASE
 #endif /* !CONFIG_SYS_L2CACHE_OFF */
 
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 
 /* MMC */
 
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 245530aa640b..1e99cdc7df4d 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -16,7 +16,7 @@
 #endif
 
 #endif
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index d5af6990107d..3a5917fed4b8 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -14,7 +14,7 @@
 #include <asm/mach-imx/gpio.h>
 
 /* Timer settings */
-#define CONFIG_MXC_GPT_HCLK
+#define CFG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 92dec899cad7..8aa247c62448 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -133,7 +133,7 @@ CFG_MMC_SUNXI_SLOT
 CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
-CONFIG_MXC_GPT_HCLK
+CFG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
-- 
2.25.1

[PoC 126/241] global: Migrate CONFIG_MXC_NAND_HWECC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/mxc_nand.c | 4 ++--
 include/configs/m53menlo.h      | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 8aa5f7342131..78f5719bc6ef 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -372,7 +372,7 @@ static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on)
 #endif
 }
 
-#ifdef CONFIG_MXC_NAND_HWECC
+#ifdef CFG_MXC_NAND_HWECC
 static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode)
 {
 	/*
@@ -1179,7 +1179,7 @@ int board_nand_init(struct nand_chip *this)
 #endif
 	host->clk_act = 1;
 
-#ifdef CONFIG_MXC_NAND_HWECC
+#ifdef CFG_MXC_NAND_HWECC
 	this->ecc.calculate = mxc_nand_calculate_ecc;
 	this->ecc.hwctl = mxc_nand_enable_hwecc;
 	this->ecc.correct = mxc_nand_correct_data;
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 979fddab5e32..0684a9743a1c 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -48,7 +48,7 @@
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
-#define CONFIG_MXC_NAND_HWECC
+#define CFG_MXC_NAND_HWECC
 #endif
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8aa247c62448..2030e582de3f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -134,7 +134,7 @@ CFG_MONITOR_IS_IN_RAM
 CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
 CFG_MXC_GPT_HCLK
-CONFIG_MXC_NAND_HWECC
+CFG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
 CONFIG_MXC_UART_BASE
-- 
2.25.1

[PoC 127/241] global: Migrate CONFIG_MXC_NAND_IP_REGS_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/mxc_nand.c | 2 +-
 include/configs/m53menlo.h      | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 78f5719bc6ef..36c61c2eb8cf 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -1175,7 +1175,7 @@ int board_nand_init(struct nand_chip *this)
 	host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
 #ifdef MXC_NFC_V3_2
 	host->ip_regs =
-		(struct mxc_nand_ip_regs __iomem *)CONFIG_MXC_NAND_IP_REGS_BASE;
+		(struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE;
 #endif
 	host->clk_act = 1;
 
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 0684a9743a1c..6d0f43999681 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -46,7 +46,7 @@
 #ifdef CONFIG_CMD_NAND
 #define CFG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
-#define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
+#define CFG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
 #define CFG_MXC_NAND_HWECC
 #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2030e582de3f..c83a676a330a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -135,7 +135,7 @@ CFG_MTD_NAND_VERIFY_WRITE
 CFG_MVGBE_PORTS
 CFG_MXC_GPT_HCLK
 CFG_MXC_NAND_HWECC
-CONFIG_MXC_NAND_IP_REGS_BASE
+CFG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
 CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
-- 
2.25.1

[PoC 128/241] global: Migrate CONFIG_MXC_NAND_REGS_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/mxc_nand.c | 2 +-
 include/configs/m53menlo.h      | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 36c61c2eb8cf..3116356f6915 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -1172,7 +1172,7 @@ int board_nand_init(struct nand_chip *this)
 	this->write_buf = mxc_nand_write_buf;
 	this->read_buf = mxc_nand_read_buf;
 
-	host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
+	host->regs = (struct mxc_nand_regs __iomem *)CFG_MXC_NAND_REGS_BASE;
 #ifdef MXC_NFC_V3_2
 	host->ip_regs =
 		(struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE;
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 6d0f43999681..88be79462e66 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -45,7 +45,7 @@
  */
 #ifdef CONFIG_CMD_NAND
 #define CFG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
-#define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
+#define CFG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
 #define CFG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
 #define CFG_MXC_NAND_HWECC
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c83a676a330a..e041df9b887a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -136,7 +136,7 @@ CFG_MVGBE_PORTS
 CFG_MXC_GPT_HCLK
 CFG_MXC_NAND_HWECC
 CFG_MXC_NAND_IP_REGS_BASE
-CONFIG_MXC_NAND_REGS_BASE
+CFG_MXC_NAND_REGS_BASE
 CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
-- 
2.25.1

[PoC 129/241] global: Migrate CONFIG_MXC_UART_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/ge/b1x5v2/spl.c                       |  4 ++--
 drivers/serial/serial_mxc.c                 |  6 +++---
 include/configs/apalis_imx6.h               |  2 +-
 include/configs/cl-som-imx7.h               |  2 +-
 include/configs/cm_fx6.h                    |  2 +-
 include/configs/colibri_imx6.h              |  2 +-
 include/configs/dart_6ul.h                  |  2 +-
 include/configs/dh_imx6.h                   |  2 +-
 include/configs/display5.h                  |  2 +-
 include/configs/el6x_common.h               |  2 +-
 include/configs/embestmx6boards.h           |  2 +-
 include/configs/ge_b1x5v2.h                 |  4 ++--
 include/configs/gw_ventana.h                |  2 +-
 include/configs/imx6-engicam.h              |  4 ++--
 include/configs/imx6_logic.h                |  2 +-
 include/configs/imx6dl-mamoj.h              |  2 +-
 include/configs/imx6ulz_smm_m2.h            |  2 +-
 include/configs/imx7-cm.h                   |  2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h |  2 +-
 include/configs/imx8mp_dhcom_pdk2.h         |  2 +-
 include/configs/imx8mp_rsb3720.h            |  2 +-
 include/configs/imx8mq_cm.h                 |  2 +-
 include/configs/imx8mq_evk.h                |  2 +-
 include/configs/imx8mq_phanbell.h           |  2 +-
 include/configs/kontron-sl-mx6ul.h          |  2 +-
 include/configs/kontron_pitx_imx8m.h        |  2 +-
 include/configs/librem5.h                   | 10 +++++-----
 include/configs/liteboard.h                 |  2 +-
 include/configs/m53menlo.h                  |  2 +-
 include/configs/mccmon6.h                   |  2 +-
 include/configs/msc_sm2s_imx8mp.h           |  2 +-
 include/configs/mx51evk.h                   |  2 +-
 include/configs/mx53cx9020.h                |  2 +-
 include/configs/mx53loco.h                  |  2 +-
 include/configs/mx6cuboxi.h                 |  2 +-
 include/configs/mx6memcal.h                 |  6 +++---
 include/configs/mx6sabreauto.h              |  2 +-
 include/configs/mx6sabresd.h                |  2 +-
 include/configs/mx6slevk.h                  |  2 +-
 include/configs/mx6sllevk.h                 |  2 +-
 include/configs/mx6sxsabreauto.h            |  2 +-
 include/configs/mx6sxsabresd.h              |  2 +-
 include/configs/mx6ul_14x14_evk.h           |  2 +-
 include/configs/mx6ullevk.h                 |  2 +-
 include/configs/mys_6ulx.h                  |  2 +-
 include/configs/nitrogen6x.h                |  2 +-
 include/configs/novena.h                    |  2 +-
 include/configs/npi_imx6ull.h               |  2 +-
 include/configs/pcl063.h                    |  2 +-
 include/configs/pcl063_ull.h                |  2 +-
 include/configs/pico-imx6.h                 |  2 +-
 include/configs/pico-imx6ul.h               |  2 +-
 include/configs/pico-imx7d.h                |  2 +-
 include/configs/pico-imx8mq.h               |  2 +-
 include/configs/tqma6_mba6.h                |  2 +-
 include/configs/tqma6_wru4.h                |  2 +-
 include/configs/udoo.h                      |  2 +-
 include/configs/udoo_neo.h                  |  2 +-
 include/configs/usbarmory.h                 |  2 +-
 include/configs/vining_2000.h               |  2 +-
 include/configs/wandboard.h                 |  2 +-
 include/configs/xpress.h                    |  2 +-
 scripts/config_whitelist.txt                |  2 +-
 63 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/board/ge/b1x5v2/spl.c b/board/ge/b1x5v2/spl.c
index 52c80f792d3c..460d3be1d834 100644
--- a/board/ge/b1x5v2/spl.c
+++ b/board/ge/b1x5v2/spl.c
@@ -565,9 +565,9 @@ void board_init_f(ulong dummy)
 	timer_init();
 
 	/* iomux */
-	if (CONFIG_MXC_UART_BASE == UART2_BASE)
+	if (CFG_MXC_UART_BASE == UART2_BASE)
 		SETUP_IOMUX_PADS(uart2_pads);
-	else if (CONFIG_MXC_UART_BASE == UART3_BASE)
+	else if (CFG_MXC_UART_BASE == UART3_BASE)
 		SETUP_IOMUX_PADS(uart3_pads);
 
 	/* UART clocks enabled and gd valid - init serial console */
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 82c0d84628d5..8bcbbf2bbfcb 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
 
 #if !CONFIG_IS_ENABLED(DM_SERIAL)
 
-#ifndef CONFIG_MXC_UART_BASE
-#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
+#ifndef CFG_MXC_UART_BASE
+#error "define CFG_MXC_UART_BASE to use the MXC UART driver"
 #endif
 
-#define mxc_base	((struct mxc_uart *)CONFIG_MXC_UART_BASE)
+#define mxc_base	((struct mxc_uart *)CFG_MXC_UART_BASE)
 
 static void mxc_serial_setbrg(void)
 {
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 8db2909c96b2..b1355d637538 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index cde7d3c891ab..b7920c7b3057 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 47b76c9371e8..90ebec4a94ca 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -26,7 +26,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* Serial console */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 /* Environment */
 
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 2f30322bb4f8..5f098fab940e 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index c2ed9c7c56af..fb619105a760 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -28,7 +28,7 @@
 #define MMC_ROOTFS_PART			2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 1fbdebb64511..e9c36cdb80e9 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	3
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 191c8fb8ab46..9a6fb72377c1 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -34,7 +34,7 @@
 #define CFG_SYS_SPI_ARGS_OFFS        0x140000
 #define CFG_SYS_SPI_ARGS_SIZE        0x10000
 
-#define CONFIG_MXC_UART_BASE		UART5_BASE
+#define CFG_MXC_UART_BASE		UART5_BASE
 
 /* I2C Configs */
 #define CFG_I2C_MULTI_BUS
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index a5e2dc063a74..6913a91c4c19 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -21,7 +21,7 @@
 
 /* Commands */
 
-#define CONFIG_MXC_UART_BASE	UART2_BASE
+#define CFG_MXC_UART_BASE	UART2_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS                                               \
 	"board=EL6Q\0"								\
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 8f03c2ff3c0d..9b772d2bd367 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -12,7 +12,7 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
 
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 9dc1d7394afd..703d63bd20bc 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -13,9 +13,9 @@
 #include "mx6_common.h"
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CFG_MXC_UART_BASE		UART3_BASE
 
-#if CONFIG_MXC_UART_BASE == UART2_BASE
+#if CFG_MXC_UART_BASE == UART2_BASE
 /* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */
 #define CONSOLE_DEVICE "ttymxc1" /* System on Module debug connector */
 #else
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index e71f10a24fa1..3713ba4dbceb 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -16,7 +16,7 @@
 #include "mx6_common.h"
 
 /* Serial */
-#define CONFIG_MXC_UART_BASE	       UART2_BASE
+#define CFG_MXC_UART_BASE	       UART2_BASE
 
 /* NAND */
 
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 4208ba95915e..786b70fe064d 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -116,9 +116,9 @@
 /* UART */
 #ifdef CONFIG_MXC_UART
 # ifdef CONFIG_MX6UL
-#  define CONFIG_MXC_UART_BASE		UART1_BASE
+#  define CFG_MXC_UART_BASE		UART1_BASE
 # else
-#  define CONFIG_MXC_UART_BASE		UART4_BASE
+#  define CFG_MXC_UART_BASE		UART4_BASE
 # endif
 #endif
 
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 121b34ae96db..f9544cd430ca 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -8,7 +8,7 @@
 #ifndef __IMX6LOGIC_CONFIG_H
 #define __IMX6LOGIC_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
 #include "mx6_common.h"
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 162b0b8a69bb..db08e43f0d86 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -35,7 +35,7 @@
 #include <config_distro_bootcmd.h>
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CFG_MXC_UART_BASE		UART3_BASE
 
 /* MMC */
 
diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h
index c95038eaa537..9da98d0af277 100644
--- a/include/configs/imx6ulz_smm_m2.h
+++ b/include/configs/imx6ulz_smm_m2.h
@@ -12,7 +12,7 @@
 #include <linux/sizes.h>
 #include <linux/stringify.h>
 
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 #ifndef CONFIG_SPL_BUILD
 
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 438e79df3cc1..87262a97877e 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 #undef CFG_EXTRA_ENV_SETTINGS
 
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 0723d27ab703..f7d2b660c1f3 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -25,7 +25,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x40000000 /* Minimum 1 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h
index b8fdedefa21f..d022faaa91a4 100644
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x20000000 /* Minimum 512 MiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index e4e24b522fdb..495ca313db28 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -148,7 +148,7 @@
 #define PHYS_SDRAM_2_SIZE		0x80000000	/* 2 GB */
 #endif
 
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index f7ae1b47d063..828bd6723727 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -54,7 +54,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE					0x40000000 /* 1 GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM		2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 4b46321e8512..a7a51907f5c9 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -59,7 +59,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 6d0c45311183..bfde15e6240f 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -92,7 +92,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0x40000000 /* 1GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index e57ae20a74ea..523cb5a07fd0 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -22,7 +22,7 @@
 #define CFG_SYS_UBOOT_BASE		CONFIG_TEXT_BASE
 
 /* Board and environment settings */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 #define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 5a3c9f76a431..bf590efb4348 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -67,7 +67,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(3)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(3)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 1818a57e49c5..4725be264a9b 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -32,23 +32,23 @@
 #define CONSOLE_ON_UART1
 
 #ifdef CONSOLE_ON_UART1
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 #define CONSOLE_UART_CLK		0
 #define CONSOLE		"ttymxc0"
 #elif defined(CONSOLE_ON_UART2)
-#define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART2_BASE_ADDR
 #define CONSOLE_UART_CLK		1
 #define CONSOLE		"ttymxc1"
 #elif defined(CONSOLE_ON_UART3)
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 #define CONSOLE_UART_CLK		2
 #define CONSOLE		"ttymxc2"
 #elif defined(CONSOLE_ON_UART4)
-#define CONFIG_MXC_UART_BASE		UART4_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART4_BASE_ADDR
 #define CONSOLE_UART_CLK		3
 #define CONSOLE		"ttymxc3"
 #else
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 #define CONSOLE_UART_CLK		0
 #define CONSOLE		"ttymxc0"
 #endif
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 0b8781d7bf34..63e5dbfab775 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -13,7 +13,7 @@
 #include <linux/stringify.h>
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 88be79462e66..2ffee5b2e930 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -31,7 +31,7 @@
 /*
  * Serial Driver
  */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /*
  * MMC Driver
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 9b2777339a10..9b4a1ab7f62f 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -17,7 +17,7 @@
  * mode from SD card (SD2)
  */
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index 1cd0b3cf7374..c1c1fd5a7843 100644
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -55,7 +55,7 @@
 #define PHYS_SDRAM_2			0xc0000000
 #define PHYS_SDRAM_2_SIZE		0x0
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART2_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 740e357e00e9..123b7a533b17 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -18,7 +18,7 @@
  * Hardware drivers
  */
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index baffe65c3697..1a3ec6e0cdb8 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -14,7 +14,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE UART2_BASE
+#define CFG_MXC_UART_BASE UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 0ac93d6e0432..d87f9e942c51 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -11,7 +11,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d4af96b51ea4..871d52c343f5 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -19,7 +19,7 @@
 
 /* Command definition */
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"som_rev=undefined\0" \
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index f6d3b2eeb9cf..b664962a26a5 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -14,12 +14,12 @@
 
 #ifdef CONFIG_SERIAL_CONSOLE_UART1
 #if defined(CONFIG_MX6SL)
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
 #else
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 #endif
 #elif defined(CONFIG_SERIAL_CONSOLE_UART2)
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #else
 #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
 #endif
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 888da7ce365f..274c14bbd383 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -8,7 +8,7 @@
 #ifndef __MX6SABREAUTO_CONFIG_H
 #define __MX6SABREAUTO_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE	UART4_BASE
+#define CFG_MXC_UART_BASE	UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 78a554d0ccba..af9978e02c89 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -8,7 +8,7 @@
 #ifndef __MX6SABRESD_CONFIG_H
 #define __MX6SABRESD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
 #include "mx6sabre_common.h"
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 4fbd06783a6d..f6d9ac20821f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index cf4871cbae39..aec3e51bff87 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"epdc_waveform=epdc_splash.bin\0" \
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3399cdd16fa8..3d0f6e452d65 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index c99d99abc179..8c39e6d6cf4d 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -12,7 +12,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #ifdef CONFIG_IMX_BOOTAUX
 
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 5e3695ecc971..3f8a90b626d1 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -15,7 +15,7 @@
 
 #define is_mx6ul_9x9_evk()	CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 58d1a744ae99..2c3cd32cefa7 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -16,7 +16,7 @@
 
 #define PHYS_SDRAM_SIZE	SZ_512M
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 43261824d3cf..0c0235b42984 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 811688ae82af..fabd82d6c9c6 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -13,7 +13,7 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_MXC_UART_BASE	       UART2_BASE
+#define CFG_MXC_UART_BASE	       UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
diff --git a/include/configs/novena.h b/include/configs/novena.h
index af99ba4f193c..dd82c04440ec 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -53,7 +53,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 664d4f11c867..ae5e566d3fb0 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 146f87e9ce33..e8c48cf83652 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -22,7 +22,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 0890c115700c..bd04268a3ef3 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -22,7 +22,7 @@
 #define MMC_ROOTFS_PART		2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index e1f7b7003194..a1d0dd93c526 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 6148a343117d..4064a34f191b 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -17,7 +17,7 @@
 
 #define CFG_FEC_MXC_PHYADDR		0x1
 
-#define CONFIG_MXC_UART_BASE		UART6_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART6_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 7fc6211ff732..dbeaeea77f7d 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
 
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 37ade717ae99..4b602ea03022 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -71,7 +71,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x80000000	/* 2 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index a5f14dc42679..b5871424bc64 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -11,7 +11,7 @@
 
 #define CFG_FEC_MXC_PHYADDR		0x03
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
 
 #endif /* __CONFIG_TQMA6_MBA6_H */
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 34c9b6a2f97c..e06fc7fe1559 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -10,7 +10,7 @@
 #define CFG_FEC_MXC_PHYADDR		0x01
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
 
 /* Watchdog */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index f0092eff1494..d85cf7808c7e 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 5d7d734daa2d..842abb7b7a22 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* Command definition */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* Linux only */
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index b2153b441142..854875adc4b7 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -17,7 +17,7 @@
 /* U-Boot general configurations */
 
 /* UART */
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* SD/MMC */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index cdd2eeef0ac9..7954ed9910c7 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -50,7 +50,7 @@
 #endif
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 #endif
 
 #endif				/* __CONFIG_H */
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 1e765439fabe..8853bcd7be28 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index ce6ca175363b..602fd4595e77 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -10,7 +10,7 @@
 #include "mx6_common.h"
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		MX6UL_UART7_BASE_ADDR
+#define CFG_MXC_UART_BASE		MX6UL_UART7_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e041df9b887a..2f3241289842 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -137,7 +137,7 @@ CFG_MXC_GPT_HCLK
 CFG_MXC_NAND_HWECC
 CFG_MXC_NAND_IP_REGS_BASE
 CFG_MXC_NAND_REGS_BASE
-CONFIG_MXC_UART_BASE
+CFG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
-- 
2.25.1

[PoC 130/241] global: Migrate CONFIG_MXC_USB_FLAGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/host/ehci-mx5.c              | 2 +-
 include/configs/apalis_imx6.h            | 2 +-
 include/configs/aristainetos2.h          | 2 +-
 include/configs/cl-som-imx7.h            | 2 +-
 include/configs/cm_fx6.h                 | 2 +-
 include/configs/colibri-imx6ull.h        | 2 +-
 include/configs/colibri_imx6.h           | 2 +-
 include/configs/colibri_imx7.h           | 2 +-
 include/configs/dart_6ul.h               | 2 +-
 include/configs/dh_imx6.h                | 2 +-
 include/configs/embestmx6boards.h        | 2 +-
 include/configs/ge_b1x5v2.h              | 2 +-
 include/configs/gw_ventana.h             | 2 +-
 include/configs/imx6_logic.h             | 2 +-
 include/configs/imx6dl-mamoj.h           | 2 +-
 include/configs/imx6q-bosch-acc.h        | 2 +-
 include/configs/kontron-sl-mx6ul.h       | 2 +-
 include/configs/kontron-sl-mx8mm.h       | 2 +-
 include/configs/kp_imx53.h               | 2 +-
 include/configs/kp_imx6q_tpc.h           | 2 +-
 include/configs/liteboard.h              | 2 +-
 include/configs/m53menlo.h               | 2 +-
 include/configs/mx51evk.h                | 2 +-
 include/configs/mx53cx9020.h             | 2 +-
 include/configs/mx53loco.h               | 2 +-
 include/configs/mx53ppd.h                | 2 +-
 include/configs/mx6sabreauto.h           | 2 +-
 include/configs/mx6sabresd.h             | 2 +-
 include/configs/mx6slevk.h               | 2 +-
 include/configs/mx6sxsabreauto.h         | 2 +-
 include/configs/mx6sxsabresd.h           | 2 +-
 include/configs/mx6ul_14x14_evk.h        | 2 +-
 include/configs/mys_6ulx.h               | 2 +-
 include/configs/nitrogen6x.h             | 2 +-
 include/configs/novena.h                 | 2 +-
 include/configs/npi_imx6ull.h            | 2 +-
 include/configs/opos6uldev.h             | 2 +-
 include/configs/pcl063.h                 | 2 +-
 include/configs/pcl063_ull.h             | 2 +-
 include/configs/pico-imx6.h              | 2 +-
 include/configs/pico-imx6ul.h            | 2 +-
 include/configs/pico-imx7d.h             | 2 +-
 include/configs/somlabs_visionsom_6ull.h | 2 +-
 include/configs/usbarmory.h              | 2 +-
 include/configs/vining_2000.h            | 2 +-
 include/configs/wandboard.h              | 2 +-
 include/configs/xpress.h                 | 2 +-
 scripts/config_whitelist.txt             | 2 +-
 48 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 964a53bb7c0e..bdfc1283e4aa 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -302,7 +302,7 @@ static int ehci_usb_probe(struct udevice *dev)
 	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
-	mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS);
+	mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
 	mdelay(10);
 
 	return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index b1355d637538..fd2a0e3d82d3 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -27,7 +27,7 @@
 /* USB Configs */
 /* Host */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 271d15dc5e50..19906db5966f 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -416,7 +416,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* UBI support */
 
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b7920c7b3057..e38d2844c803 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -97,6 +97,6 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 90ebec4a94ca..479feae77240 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -136,7 +136,7 @@
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 /* Boot */
 #define CFG_SYS_BOOTMAPSZ	        (8 << 20)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 4f5287b6bcfb..92dff580f601 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -128,7 +128,7 @@
 /* USB Configs */
 
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 5f098fab940e..419c919bbecd 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -24,7 +24,7 @@
 /* USB Configs */
 /* Host */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 0da7553e0245..2b2b17f2c7b9 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -172,7 +172,7 @@
 /* USB Configs */
 
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index fb619105a760..93ee004b009c 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -48,7 +48,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index e9c36cdb80e9..90f8ce0fd57f 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -33,7 +33,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 9b772d2bd367..f73b1ec63de6 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -19,7 +19,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 703d63bd20bc..f7e9dd16b26f 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -25,7 +25,7 @@
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #define CONFIG_USBD_HS
 
 /* Memory */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 3713ba4dbceb..cc21e93a7beb 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -37,7 +37,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS      0
+#define CFG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f9544cd430ca..215ed75deaf3 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -118,7 +118,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Falcon Mode */
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index db08e43f0d86..ca89f72f8a21 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -44,7 +44,7 @@
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_FLAGS			0
 
 /* Falcon */
 
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index e28185f24dd3..4209d9d7ab28 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -111,6 +111,6 @@
 #endif
 
 #define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS             0
+#define CFG_MXC_USB_FLAGS             0
 
 #endif /* __IMX6Q_ACC_H */
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 523cb5a07fd0..3479b0b2bf4d 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Boot order for distro boot */
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 657124cc725d..89f5c6f46faf 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* GUID for capsule updatable firmware image */
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index da8a67b4ab63..baf7779026fb 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -12,7 +12,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 99321b320f5f..07497d063fb8 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -19,7 +19,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS	\
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 63e5dbfab775..75ff2d9db93c 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -96,7 +96,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 2ffee5b2e930..d7b303b6ac05 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -73,7 +73,7 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORT		1
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LVDS display */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 123b7a533b17..e82e7547a3f6 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -35,7 +35,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	PORT_PTS_ULPI
-#define CONFIG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
+#define CFG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 1a3ec6e0cdb8..5710fe90708a 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -25,7 +25,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d87f9e942c51..cd7fa7c8cd96 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -19,7 +19,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
 #define CFG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 94d2191af91d..57dffbf6e40c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -14,7 +14,7 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 274c14bbd383..1d96ecfa46cb 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -13,7 +13,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index af9978e02c89..b2266025efcf 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -30,7 +30,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #endif                         /* __MX6SABRESD_CONFIG_H */
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index f6d9ac20821f..5d5fc8f792de 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -91,7 +91,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	3
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3d0f6e452d65..ff5ef7306611 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -97,7 +97,7 @@
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8c39e6d6cf4d..82dbf0f949c5 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -119,7 +119,7 @@
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_PCI
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 3f8a90b626d1..2d26d9b045af 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -117,7 +117,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 0c0235b42984..a8a14600cc2d 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -31,7 +31,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index fabd82d6c9c6..c634cb203b36 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -24,7 +24,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
diff --git a/include/configs/novena.h b/include/configs/novena.h
index dd82c04440ec..6088b2823412 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -58,7 +58,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 /* Gadget part */
 #define CONFIG_USBD_HS
 #endif
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index ae5e566d3fb0..490328d516f2 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -32,7 +32,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_MXC_PHYADDR		0x1
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index e42a736136bc..5587237743c9 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -21,7 +21,7 @@
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LCD */
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index e8c48cf83652..c95507b25fe9 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -43,7 +43,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index bd04268a3ef3..688afe674591 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -45,7 +45,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index a1d0dd93c526..473f476aa470 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -17,7 +17,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 4064a34f191b..ba37e6765eed 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -24,7 +24,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index dbeaeea77f7d..5995ce66ec8b 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -108,6 +108,6 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_FLAGS			0
 
 #endif
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 3418d4e2b559..1e3ae0398c1a 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -62,7 +62,7 @@
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 854875adc4b7..8cea69416df2 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -25,7 +25,7 @@
 /* USB */
 #define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_FLAGS	0
 
 /* Linux boot */
 #define CFG_HOSTNAME		"usbarmory"
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 7954ed9910c7..193706e46fa5 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -37,7 +37,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 8853bcd7be28..64dbf93d05d0 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -18,7 +18,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 602fd4595e77..c17f0de7ede3 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -29,7 +29,7 @@
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
 #define CFG_FEC_MXC_PHYADDR          0x0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2f3241289842..7c3c4bca17b7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -138,7 +138,7 @@ CFG_MXC_NAND_HWECC
 CFG_MXC_NAND_IP_REGS_BASE
 CFG_MXC_NAND_REGS_BASE
 CFG_MXC_UART_BASE
-CONFIG_MXC_USB_FLAGS
+CFG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
-- 
2.25.1

[PoC 131/241] global: Migrate CONFIG_MXC_USB_PORT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/host/ehci-mx5.c              | 2 +-
 drivers/usb/host/ehci-mx6.c              | 8 ++++----
 include/configs/apalis_imx6.h            | 2 +-
 include/configs/aristainetos2.h          | 2 +-
 include/configs/brppt2.h                 | 2 +-
 include/configs/cl-som-imx7.h            | 2 +-
 include/configs/cm_fx6.h                 | 2 +-
 include/configs/colibri-imx6ull.h        | 2 +-
 include/configs/colibri_imx6.h           | 2 +-
 include/configs/colibri_imx7.h           | 2 +-
 include/configs/dart_6ul.h               | 2 +-
 include/configs/dh_imx6.h                | 2 +-
 include/configs/display5.h               | 2 +-
 include/configs/embestmx6boards.h        | 2 +-
 include/configs/ge_b1x5v2.h              | 2 +-
 include/configs/gw_ventana.h             | 2 +-
 include/configs/imx6_logic.h             | 2 +-
 include/configs/imx6dl-mamoj.h           | 2 +-
 include/configs/imx6q-bosch-acc.h        | 2 +-
 include/configs/imx7-cm.h                | 2 +-
 include/configs/imx8mm-cl-iot-gate.h     | 2 +-
 include/configs/kontron-sl-mx6ul.h       | 2 +-
 include/configs/kontron-sl-mx8mm.h       | 2 +-
 include/configs/kp_imx53.h               | 2 +-
 include/configs/kp_imx6q_tpc.h           | 2 +-
 include/configs/liteboard.h              | 2 +-
 include/configs/m53menlo.h               | 4 ++--
 include/configs/meerkat96.h              | 2 +-
 include/configs/mx51evk.h                | 4 ++--
 include/configs/mx53cx9020.h             | 4 ++--
 include/configs/mx53loco.h               | 4 ++--
 include/configs/mx53ppd.h                | 4 ++--
 include/configs/mx6cuboxi.h              | 2 +-
 include/configs/mx6memcal.h              | 2 +-
 include/configs/mx6sabreauto.h           | 2 +-
 include/configs/mx6sabresd.h             | 2 +-
 include/configs/mx6slevk.h               | 2 +-
 include/configs/mx6sllevk.h              | 2 +-
 include/configs/mx6sxsabreauto.h         | 2 +-
 include/configs/mx6sxsabresd.h           | 2 +-
 include/configs/mx6ul_14x14_evk.h        | 2 +-
 include/configs/mx7dsabresd.h            | 2 +-
 include/configs/mx7ulp_com.h             | 2 +-
 include/configs/mys_6ulx.h               | 2 +-
 include/configs/nitrogen6x.h             | 2 +-
 include/configs/novena.h                 | 2 +-
 include/configs/npi_imx6ull.h            | 2 +-
 include/configs/o4-imx6ull-nano.h        | 2 +-
 include/configs/opos6uldev.h             | 2 +-
 include/configs/pcl063.h                 | 2 +-
 include/configs/pcl063_ull.h             | 2 +-
 include/configs/pico-imx6.h              | 2 +-
 include/configs/pico-imx6ul.h            | 2 +-
 include/configs/pico-imx7d.h             | 2 +-
 include/configs/somlabs_visionsom_6ull.h | 2 +-
 include/configs/tbs2910.h                | 2 +-
 include/configs/tqma6.h                  | 2 +-
 include/configs/usbarmory.h              | 4 ++--
 include/configs/verdin-imx8mm.h          | 2 +-
 include/configs/vining_2000.h            | 2 +-
 include/configs/wandboard.h              | 2 +-
 include/configs/warp7.h                  | 2 +-
 include/configs/xpress.h                 | 2 +-
 scripts/config_whitelist.txt             | 4 ++--
 64 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index bdfc1283e4aa..c11279867c7c 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -299,7 +299,7 @@ static int ehci_usb_probe(struct udevice *dev)
 			HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
 	setbits_le32(&ehci->usbmode, CM_HOST);
 
-	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	__raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
 	mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index fa2ca2a1d912..0a12db614ff4 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define UCMD_RESET		(1 << 1) /* controller reset */
 
 /* If this is not defined, assume MX6/MX7/MX8M SoC default */
-#ifndef CONFIG_MXC_USB_PORTSC
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#ifndef CFG_MXC_USB_PORTSC
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 /* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 		return 0;
 
 	setbits_le32(&ehci->usbmode, CM_HOST);
-	writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
 	mdelay(10);
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)
 	case USBPHY_INTERFACE_MODE_HSIC:
 		return PORT_PTS_HSIC;
 	default:
-		return CONFIG_MXC_USB_PORTSC;
+		return CFG_MXC_USB_PORTSC;
 	}
 }
 
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index fd2a0e3d82d3..88505885ca85 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -26,7 +26,7 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 19906db5966f..e0f1ec7e11a7 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -415,7 +415,7 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* UBI support */
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 47a95c0b920a..50aedae8794f 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -84,6 +84,6 @@ BUR_COMMON_ENV \
 #define CFG_FEC_FIXED_SPEED		_1000BASET
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_BRPP2_IMX6_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index e38d2844c803..0a667c60b61b 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -96,7 +96,7 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 479feae77240..7d0f2b6dc13a 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -135,7 +135,7 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 /* Boot */
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 92dff580f601..7e718b48e423 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -127,7 +127,7 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 419c919bbecd..b8418373abae 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -23,7 +23,7 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Client */
 #define CONFIG_USBD_HS
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 2b2b17f2c7b9..061c445bd9db 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -171,7 +171,7 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 93ee004b009c..c5781670864b 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -47,7 +47,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 90f8ce0fd57f..db76b458a593 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,7 +32,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 /* USB Gadget (DFU, UMS) */
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 9a6fb72377c1..6900baa84545 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -293,5 +293,5 @@
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */
 #endif
 
-#define CONFIG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index f73b1ec63de6..c7a55c5c9266 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* MMC Configs */
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index f7e9dd16b26f..dd3c56c480be 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -24,7 +24,7 @@
 #endif
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index cc21e93a7beb..4741d399590c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,7 +36,7 @@
 /* Various command support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 215ed75deaf3..85c054451f35 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -117,7 +117,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index ca89f72f8a21..6c61b3f44801 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -43,7 +43,7 @@
 #define CFG_FEC_MXC_PHYADDR		1
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS			0
 
 /* Falcon */
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 4209d9d7ab28..2c998cdcfc72 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -110,7 +110,7 @@
 #endif
 #endif
 
-#define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS             0
 
 #endif /* __IMX6Q_ACC_H */
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 87262a97877e..4202c5928c2f 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -79,7 +79,7 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 64cdc401d039..2641d7bc960b 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -139,6 +139,6 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /*__IMX8MM_CL_IOT_GATE_H*/
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 3479b0b2bf4d..d0644cd1396b 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -26,7 +26,7 @@
 #define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 89f5c6f46faf..8a7709a00b60 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -26,7 +26,7 @@
 #define CFG_HOSTNAME			"kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index baf7779026fb..6e383cbe75f7 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -11,7 +11,7 @@
 #include <linux/sizes.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 07497d063fb8..1aa4b8ab5987 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -18,7 +18,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 75ff2d9db93c..5811059c8e2b 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -95,7 +95,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index d7b303b6ac05..a54ece9ac828 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -71,8 +71,8 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORT		1
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT		1
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 9e480fe0558e..6ffc1282411a 100644
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -24,6 +24,6 @@
 /* Environment configs */
 
 /* USB configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index e82e7547a3f6..dff54d04a678 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -33,8 +33,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	MMC_SDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_ULPI
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	PORT_PTS_ULPI
 #define CFG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
 
 /* Framebuffer and LCD */
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 5710fe90708a..e995776d30d5 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -23,8 +23,8 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index cd7fa7c8cd96..7398804e6b54 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -17,8 +17,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 57dffbf6e40c..df65dbeea41c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -12,8 +12,8 @@
 #include <asm/arch/imx-regs.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 871d52c343f5..f0d6405d3012 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -15,7 +15,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* Command definition */
 
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index b664962a26a5..f2edd13eb881 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -31,6 +31,6 @@
 #define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_UTMI
+#define CFG_MXC_USB_PORTSC	PORT_PTS_UTMI
 
 #endif	       /* __CONFIG_H */
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 1d96ecfa46cb..da98139d7d77 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -12,7 +12,7 @@
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index b2266025efcf..2b028e3aa2b1 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -29,7 +29,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 5d5fc8f792de..39c8ef060c7f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -90,7 +90,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index aec3e51bff87..290996b51bc7 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -94,7 +94,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 #include <linux/stringify.h>
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index ff5ef7306611..1c14a6beb0ac 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -96,7 +96,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 82dbf0f949c5..8b02c3b63101 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -118,7 +118,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 2d26d9b045af..635ae78abcb5 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -116,7 +116,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index a9722967f396..5392f38074ed 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -99,7 +99,7 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 5ee5129801d2..a310c64e7948 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -51,5 +51,5 @@
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	SZ_256K
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif	/* __CONFIG_H */
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index a8a14600cc2d..2571098d06c6 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -30,7 +30,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c634cb203b36..d35650a66e13 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -23,7 +23,7 @@
 #define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 #ifdef CONFIG_CMD_MMC
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 6088b2823412..5176c6d1c48c 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -57,7 +57,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Gadget part */
 #define CONFIG_USBD_HS
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 490328d516f2..62e74de8aea3 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -31,7 +31,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index 0e1083a2130c..9050da8738b1 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 #if IS_ENABLED(CONFIG_CMD_USB)
-#	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#	define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 5587237743c9..cfa708ff5e55 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -20,7 +20,7 @@
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 #endif
 
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index c95507b25fe9..38dcee053596 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -42,7 +42,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 688afe674591..d742201ce43b 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -44,7 +44,7 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 473f476aa470..d806d7d9c57d 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index ba37e6765eed..531e462485d8 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CONFIG_USBD_HS
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 5995ce66ec8b..fd8962e9f751 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -107,7 +107,7 @@
 #define CFG_SYS_FSL_USDHC_NUM		2
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS			0
 
 #endif
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 1e3ae0398c1a..041a83b057d4 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -61,7 +61,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 #endif
 
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 61f252cb638c..1e22ecfdc556 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -27,7 +27,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index cb5f7fc25af9..af5a474cf31e 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -39,7 +39,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 8cea69416df2..011a4610474e 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -23,8 +23,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS	0
 
 /* Linux boot */
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 27d7efb883de..8cb1f1aff353 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -67,6 +67,6 @@
 #define PHYS_SDRAM_SIZE			SZ_2G /* 2GB DDR */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /* __VERDIN_IMX8MM_H */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 193706e46fa5..6db68c1e7001 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -36,7 +36,7 @@
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 64dbf93d05d0..7b8c5cbe7a8f 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 709bb046d018..ebc5f4aa6c91 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -93,7 +93,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #define CONFIG_USBD_HS
 
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index c17f0de7ede3..f8ee40a9543b 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -28,7 +28,7 @@
 /* Environment is in stored in the eMMC boot partition */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7c3c4bca17b7..8fdece74ef1e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -139,8 +139,8 @@ CFG_MXC_NAND_IP_REGS_BASE
 CFG_MXC_NAND_REGS_BASE
 CFG_MXC_UART_BASE
 CFG_MXC_USB_FLAGS
-CONFIG_MXC_USB_PORT
-CONFIG_MXC_USB_PORTSC
+CFG_MXC_USB_PORT
+CFG_MXC_USB_PORTSC
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
 CONFIG_NETDEV
-- 
2.25.1

[PoC 132/241] global: Migrate CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/davinci_nand.c | 4 ++--
 include/configs/omapl138_lcdk.h     | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index e4e144bd7c83..25cd685555e8 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -266,7 +266,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat,
 static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 #if defined(CONFIG_SYS_NAND_PAGE_2K)
 	.eccbytes = 40,
-#ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+#ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 	.eccpos = {
 		6,   7,  8,  9, 10,	11, 12, 13, 14, 15,
 		22, 23, 24, 25, 26,	27, 28, 29, 30, 31,
@@ -287,7 +287,7 @@ static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 	.oobfree = {
 		{.offset = 2, .length = 22, },
 	},
-#endif	/* #ifdef CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */
+#endif	/* #ifdef CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC */
 #elif defined(CONFIG_SYS_NAND_PAGE_4K)
 	.eccbytes = 80,
 	.eccpos = {
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index b1fc437395dd..5384c1f470c5 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -109,7 +109,7 @@
 #define CFG_SYS_NAND_BASE		DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
 #define CFG_SYS_NAND_MASK_CLE	0x10
 #define CFG_SYS_NAND_MASK_ALE	0x8
-#define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+#define CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 #define CFG_SYS_NAND_U_BOOT_SIZE	SZ_512K
 #define CFG_SYS_NAND_U_BOOT_DST	0xc1080000
 #define CFG_SYS_NAND_U_BOOT_START	CFG_SYS_NAND_U_BOOT_DST
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8fdece74ef1e..a7409a7f4978 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -141,7 +141,7 @@ CFG_MXC_UART_BASE
 CFG_MXC_USB_FLAGS
 CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
-CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
+CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
 CONFIG_NETDEV
 CONFIG_NETMASK
-- 
2.25.1

[PoC 133/241] global: Migrate CONFIG_NAND_CS_INIT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/siemens/common/board.c | 2 +-
 board/siemens/draco/board.c  | 2 +-
 include/configs/etamin.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 2efede62aa5d..1b3c06d13e55 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -93,7 +93,7 @@ int board_init(void)
 
 	gpmc_init();
 
-#ifdef CONFIG_NAND_CS_INIT
+#ifdef CFG_NAND_CS_INIT
 	board_nand_cs_init();
 #endif
 
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index f898bba4b0ee..fb81f40abceb 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -370,7 +370,7 @@ U_BOOT_CMD(
 #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
 #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
 
-#ifdef CONFIG_NAND_CS_INIT
+#ifdef CFG_NAND_CS_INIT
 /* GPMC definitions for second nand cs1 */
 static const u32 gpmc_nand_config[] = {
 	ETAMIN_NAND_GPMC_CONFIG1,
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 8b2745ea96e4..861070866923 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -129,7 +129,7 @@
 
 #ifndef CONFIG_SPL_BUILD
 
-#define CONFIG_NAND_CS_INIT
+#define CFG_NAND_CS_INIT
 #define ETAMIN_NAND_GPMC_CONFIG1	0x00000800
 #define ETAMIN_NAND_GPMC_CONFIG2	0x001e1e00
 #define ETAMIN_NAND_GPMC_CONFIG3	0x001e1e00
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a7409a7f4978..e7d5f9ba57ca 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -142,7 +142,7 @@ CFG_MXC_USB_FLAGS
 CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
 CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
-CONFIG_NAND_CS_INIT
+CFG_NAND_CS_INIT
 CONFIG_NETDEV
 CONFIG_NETMASK
 CONFIG_NORBOOT
-- 
2.25.1

[PoC 134/241] global: Migrate CONFIG_NETDEV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/MPC837XERDB.h | 4 ++--
 scripts/config_whitelist.txt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 4c3acd5b013b..1f6efd7e098f 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -223,7 +223,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_NETDEV		"eth1"
+#define CFG_NETDEV		"eth1"
 
 #define CFG_HOSTNAME		"mpc837x_rdb"
 #define CONFIG_ROOTPATH		"/nfsroot"
@@ -232,7 +232,7 @@
 #define CFG_FDTFILE		"mpc8379_rdb.dtb"
 
 #define CFG_EXTRA_ENV_SETTINGS \
-	"netdev=" CONFIG_NETDEV "\0"				\
+	"netdev=" CFG_NETDEV "\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
 		"protect off " __stringify(CONFIG_TEXT_BASE)	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e7d5f9ba57ca..c8e0a85c124c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -143,7 +143,7 @@ CFG_MXC_USB_PORT
 CFG_MXC_USB_PORTSC
 CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CFG_NAND_CS_INIT
-CONFIG_NETDEV
+CFG_NETDEV
 CONFIG_NETMASK
 CONFIG_NORBOOT
 CONFIG_NUM_DSP_CPUS
-- 
2.25.1

[PoC 135/241] global: Migrate CONFIG_NETMASK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                             | 2 +-
 include/configs/M5208EVBE.h        | 2 +-
 include/configs/M5235EVB.h         | 2 +-
 include/configs/M5272C3.h          | 2 +-
 include/configs/M5282EVB.h         | 2 +-
 include/configs/M53017EVB.h        | 2 +-
 include/configs/M5329EVB.h         | 2 +-
 include/configs/M5373EVB.h         | 2 +-
 include/configs/MCR3000.h          | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/apalis-imx8.h      | 2 +-
 include/configs/apalis-tk1.h       | 2 +-
 include/configs/apalis_imx6.h      | 2 +-
 include/configs/colibri-imx6ull.h  | 2 +-
 include/configs/colibri-imx8x.h    | 2 +-
 include/configs/colibri_imx6.h     | 2 +-
 include/configs/colibri_imx7.h     | 2 +-
 include/configs/colibri_vf.h       | 2 +-
 include/configs/mvebu_alleycat-5.h | 2 +-
 include/configs/npi_imx6ull.h      | 2 +-
 include/configs/poleg.h            | 2 +-
 include/configs/uniphier.h         | 2 +-
 include/env_default.h              | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/README b/README
index 8ab897f09641..f5b4669b97c7 100644
--- a/README
+++ b/README
@@ -758,7 +758,7 @@ The following options need to be configured:
 		(Environment variable "gatewayip")
 
 - Subnet mask:
-		CONFIG_NETMASK
+		CFG_NETMASK
 
 		Defines a default value for the subnet mask (or
 		routing prefix) which is used to determine if an IP
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 647e23f380b8..1357d682c7f7 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -19,7 +19,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 7bc86eb8b5f6..535b5064f193 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -28,7 +28,7 @@
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 99f1df087e36..043e188189e1 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -31,7 +31,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 4b20da4a23eb..88e3d72ef67f 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -31,7 +31,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 5afd8383c1bd..014405779fee 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -32,7 +32,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 9d5f0e1c0964..364eaa448dce 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 807d591c9f12..cc67a268a8fe 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -26,7 +26,7 @@
 
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
+#	define CFG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index d61ed82ab3bf..1248b367ae62 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -54,7 +54,7 @@
 
 #define CFG_IPADDR			192.168.0.3
 #define CONFIG_SERVERIP			192.168.0.1
-#define CONFIG_NETMASK			255.0.0.0
+#define CFG_NETMASK			255.0.0.0
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 28315eef765d..f1287844486b 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -333,7 +333,7 @@
 
 #define CONFIG_SERVERIP	 192.168.1.1
 #define CFG_GATEWAYIP 192.168.1.1
-#define CONFIG_NETMASK	 255.255.255.0
+#define CFG_NETMASK	 255.255.255.0
 
 #define	CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 0258a70d923b..8f7841163936 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -15,7 +15,7 @@
 
 /* Networking */
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 4db3465cd9b7..387fb3f69c83 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -35,7 +35,7 @@
 
 #undef CFG_IPADDR
 #define CFG_IPADDR		192.168.10.2
-#define CONFIG_NETMASK		255.255.255.0
+#define CFG_NETMASK		255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP		192.168.10.1
 
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 88505885ca85..4f2addd42d8b 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -37,7 +37,7 @@
 
 #undef CFG_IPADDR
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
 
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 7e718b48e423..3cf56e98faf8 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -21,7 +21,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC)
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 0e8e24dd7bd2..0c879cc06bc7 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -15,7 +15,7 @@
 #define USDHC2_BASE_ADDR		0x5b020000
 
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index b8418373abae..c0d5e6f0aa06 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -32,7 +32,7 @@
 
 #undef CFG_IPADDR
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 061c445bd9db..fdaeb6588146 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -22,7 +22,7 @@
 #endif
 
 #define CFG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 808d69d0c865..3da98a5165e4 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -17,7 +17,7 @@
 /* NAND support */
 
 #define CFG_IPADDR		192.168.10.2
-#define CONFIG_NETMASK		255.255.255.0
+#define CFG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1
 
 #define CFG_FDTADDR			0x84000000
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 0d38645c0e60..1f923c2d4834 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -17,7 +17,7 @@
 /* Default Env vars */
 #define CFG_IPADDR           0.0.0.0 /* In order to cause an error */
 #define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
-#define CONFIG_NETMASK          255.255.255.0
+#define CFG_NETMASK          255.255.255.0
 #define CFG_GATEWAYIP        0.0.0.0
 #define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
 
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 62e74de8aea3..be295e73caa7 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -18,7 +18,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index 3e4309512cc1..e824af8273a1 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -16,7 +16,7 @@
 /* Default environemnt variables */
 #define CONFIG_SERVERIP                 192.168.0.1
 #define CFG_IPADDR                   192.168.0.2
-#define CONFIG_NETMASK                  255.255.255.0
+#define CFG_NETMASK                  255.255.255.0
 #define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 3ec3caade49c..02a091ee0369 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -49,7 +49,7 @@
 #define CONFIG_SERVERIP			192.168.11.1
 #define CFG_IPADDR			192.168.11.10
 #define CFG_GATEWAYIP		192.168.11.1
-#define CONFIG_NETMASK			255.255.255.0
+#define CFG_NETMASK			255.255.255.0
 
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
diff --git a/include/env_default.h b/include/env_default.h
index 5ee28a54960d..0a8ccaf52c3a 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -71,8 +71,8 @@ const char default_environment[] = {
 #ifdef	CFG_GATEWAYIP
 	"gatewayip="	__stringify(CFG_GATEWAYIP)	"\0"
 #endif
-#ifdef	CONFIG_NETMASK
-	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
+#ifdef	CFG_NETMASK
+	"netmask="	__stringify(CFG_NETMASK)	"\0"
 #endif
 #ifdef	CFG_HOSTNAME
 	"hostname="	CFG_HOSTNAME	"\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c8e0a85c124c..41312519749c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -144,7 +144,7 @@ CFG_MXC_USB_PORTSC
 CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CFG_NAND_CS_INIT
 CFG_NETDEV
-CONFIG_NETMASK
+CFG_NETMASK
 CONFIG_NORBOOT
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
-- 
2.25.1

[PoC 136/241] global: Migrate CONFIG_NORBOOT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c8ecd2dc0fca..1e66d609d68d 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -482,7 +482,7 @@ RST_DEF_CMD(defboot) \
 "ext2load usb 0:4 $ramdiskaddr $ramdiskfile;" \
 "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_NORBOOT	\
+#define CFG_NORBOOT	\
 "setenv bootargs root=/dev/$jffs2nor rw "	\
 "console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;"	\
 "bootm $norbootaddr - $norfdtaddr"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 41312519749c..31d50b5ab580 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -145,7 +145,7 @@ CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CFG_NAND_CS_INIT
 CFG_NETDEV
 CFG_NETMASK
-CONFIG_NORBOOT
+CFG_NORBOOT
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
-- 
2.25.1

[PoC 137/241] global: Migrate CONFIG_NUM_DSP_CPUS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 9738c573452b..24259f6470ae 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -153,7 +153,7 @@
 
 #ifdef CONFIG_ARCH_B4860
 #define CFG_MAX_DSP_CPUS		12
-#define CONFIG_NUM_DSP_CPUS		6
+#define CFG_NUM_DSP_CPUS		6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	6
 #define CFG_SYS_NUM_FM1_10GEC	2
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 31d50b5ab580..9021044470ae 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -146,7 +146,7 @@ CFG_NAND_CS_INIT
 CFG_NETDEV
 CFG_NETMASK
 CFG_NORBOOT
-CONFIG_NUM_DSP_CPUS
+CFG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
-- 
2.25.1

[PoC 138/241] global: Migrate CONFIG_ODROID_REV_AIN to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/exynos5-dt-types.c | 4 ++--
 include/configs/odroid_xu3.h            | 2 +-
 scripts/config_whitelist.txt            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index 554fc91cc1a3..9294d36ba358 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -57,7 +57,7 @@ static int odroid_get_adc_val(unsigned int *adcval)
 	unsigned int adcval_prev = 0;
 	int ret, retries = 20;
 
-	ret = adc_channel_single_shot("adc@12D10000", CONFIG_ODROID_REV_AIN,
+	ret = adc_channel_single_shot("adc@12D10000", CFG_ODROID_REV_AIN,
 				      &adcval_prev);
 	if (ret)
 		return ret;
@@ -66,7 +66,7 @@ static int odroid_get_adc_val(unsigned int *adcval)
 		mdelay(5);
 
 		ret = adc_channel_single_shot("adc@12D10000",
-					      CONFIG_ODROID_REV_AIN, adcval);
+					      CFG_ODROID_REV_AIN, adcval);
 		if (ret)
 			return ret;
 
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 50213a383528..93f88ef53eba 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -60,7 +60,7 @@
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
-#define CONFIG_ODROID_REV_AIN		9
+#define CFG_ODROID_REV_AIN		9
 
 /*
  * Need to override existing one (smdk5420) with odroid so set_board_info will
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9021044470ae..d8e9be8a82ef 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -147,7 +147,7 @@ CFG_NETDEV
 CFG_NETMASK
 CFG_NORBOOT
 CFG_NUM_DSP_CPUS
-CONFIG_ODROID_REV_AIN
+CFG_ODROID_REV_AIN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
-- 
2.25.1

[PoC 139/241] global: Migrate CONFIG_OTHBOOTARGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/x86-common.h | 6 +++---
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index fdd7dba9a6f2..df75deedf583 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -45,9 +45,9 @@
 #define CFG_HOSTNAME		"x86"
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
-#define CONFIG_OTHBOOTARGS	"othbootargs=\0"
+#define CFG_OTHBOOTARGS	"othbootargs=\0"
 #else
-#define CONFIG_OTHBOOTARGS	"othbootargs=acpi=off\0"
+#define CFG_OTHBOOTARGS	"othbootargs=acpi=off\0"
 #endif
 
 #if defined(CONFIG_DISTRO_DEFAULTS)
@@ -67,7 +67,7 @@
 	"pciconfighost=1\0"				\
 	"netdev=eth0\0"					\
 	"consoledev=ttyS0\0"				\
-	CONFIG_OTHBOOTARGS				\
+	CFG_OTHBOOTARGS				\
 	"scriptaddr=0x7000000\0"			\
 	"kernel_addr_r=0x1000000\0"			\
 	"ramdisk_addr_r=0x4000000\0"			\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d8e9be8a82ef..a5c5644e65dd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -148,7 +148,7 @@ CFG_NETMASK
 CFG_NORBOOT
 CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
-CONFIG_OTHBOOTARGS
+CFG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
-- 
2.25.1

[PoC 140/241] global: Migrate CONFIG_OVERWRITE_ETHADDR_ONCE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 2 +-
 include/configs/M5253DEMO.h  | 2 +-
 include/configs/M5275EVB.h   | 2 +-
 include/configs/eb_cpu5282.h | 2 +-
 include/env_flags.h          | 2 +-
 scripts/config_whitelist.txt | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README b/README
index f5b4669b97c7..d3659e7b54a2 100644
--- a/README
+++ b/README
@@ -1123,7 +1123,7 @@ The following options need to be configured:
 		these parameters.
 
 		Alternatively, if you define _both_ an ethaddr in the
-		default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
+		default env _and_ CFG_OVERWRITE_ETHADDR_ONCE, a default
 		Ethernet address is installed in the environment,
 		which can be changed exactly ONCE by the user. [The
 		serial# is unaffected by this, i. e. it remains
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index bf31d203e664..3bb22b8d50cd 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -26,7 +26,7 @@
 #	undef CONFIG_DM9000_DEBUG
 #	define CFG_DM9000_BYTE_SWAPPED
 
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
+#	define CFG_OVERWRITE_ETHADDR_ONCE
 
 #	define CFG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 951209fbd750..9f73237749aa 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -39,7 +39,7 @@
 #define CFG_SYS_I2C_PINMUX_SET	(0x000F)
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
+#	define CFG_OVERWRITE_ETHADDR_ONCE
 #endif				/* FEC_ENET */
 
 #define CFG_EXTRA_ENV_SETTINGS		\
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index e8d85bdd78f2..49bf6fa4a280 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -45,7 +45,7 @@
  *----------------------------------------------------------------------*/
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_OVERWRITE_ETHADDR_ONCE
+#define CFG_OVERWRITE_ETHADDR_ONCE
 #endif
 
 /*-------------------------------------------------------------------------
diff --git a/include/env_flags.h b/include/env_flags.h
index e4e40169aed0..de1cdd013cda 100644
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -48,7 +48,7 @@ enum env_flags_varaccess {
 #ifdef CONFIG_ENV_OVERWRITE
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma,"
 #else
-#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE
+#ifdef CFG_OVERWRITE_ETHADDR_ONCE
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc,"
 #else
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo,"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a5c5644e65dd..cb85e39ad2cd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -149,7 +149,7 @@ CFG_NORBOOT
 CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
-CONFIG_OVERWRITE_ETHADDR_ONCE
+CFG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
-- 
2.25.1

[PoC 141/241] global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pci/pcie_imx.c         | 12 ++++++------
 include/configs/mx6sabresd.h   |  2 +-
 include/configs/mx6sxsabresd.h |  2 +-
 include/configs/novena.h       |  2 +-
 include/configs/tbs2910.h      |  2 +-
 include/configs/vining_2000.h  |  2 +-
 scripts/config_whitelist.txt   |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 46ac01713ff7..902507aaae38 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 	 * do self-initialisation.
 	 *
 	 * In case your #PERST pin is connected to a plain GPIO pin of the
-	 * CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's
+	 * CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's
 	 * configuration file and the condition below will handle the rest
 	 * of the reset toggling.
 	 *
@@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 	 * Linux at all in the first place since it's in some non-reset
 	 * state due to being previously used in U-Boot.
 	 */
-#ifdef CONFIG_PCIE_IMX_PERST_GPIO
-	gpio_request(CONFIG_PCIE_IMX_PERST_GPIO, "pcie_reset");
-	gpio_direction_output(CONFIG_PCIE_IMX_PERST_GPIO, 0);
+#ifdef CFG_PCIE_IMX_PERST_GPIO
+	gpio_request(CFG_PCIE_IMX_PERST_GPIO, "pcie_reset");
+	gpio_direction_output(CFG_PCIE_IMX_PERST_GPIO, 0);
 	mdelay(20);
-	gpio_set_value(CONFIG_PCIE_IMX_PERST_GPIO, 1);
+	gpio_set_value(CFG_PCIE_IMX_PERST_GPIO, 1);
 	mdelay(20);
-	gpio_free(CONFIG_PCIE_IMX_PERST_GPIO);
+	gpio_free(CFG_PCIE_IMX_PERST_GPIO);
 #else
 	if (dm_gpio_is_valid(gpio)) {
 		/* Assert PERST# for 20ms then de-assert */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 2b028e3aa2b1..116a9c6abcf3 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	3
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
 #endif
 
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8b02c3b63101..85e5cfbb58db 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -123,7 +123,7 @@
 #endif
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
 #endif
 
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 5176c6d1c48c..1c695159dd8b 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -45,7 +45,7 @@
 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 1e22ecfdc556..7debc90205a8 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -22,7 +22,7 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
 /* USB */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 6db68c1e7001..7bfc22c043fe 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -40,7 +40,7 @@
 #define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
 #endif
 
 #define CFG_IMX6_PWM_PER_CLK 66000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cb85e39ad2cd..392756572f81 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -150,7 +150,7 @@ CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
 CFG_OVERWRITE_ETHADDR_ONCE
-CONFIG_PCIE_IMX_PERST_GPIO
+CFG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHY_BASE_ADR
-- 
2.25.1

[PoC 142/241] global: Migrate CONFIG_PCIE_IMX_POWER_GPIO to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pci/pcie_imx.c         | 10 +++++-----
 include/configs/mx6sabresd.h   |  2 +-
 include/configs/mx6sxsabresd.h |  2 +-
 include/configs/novena.h       |  2 +-
 scripts/config_whitelist.txt   |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 902507aaae38..da48466480cb 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -534,13 +534,13 @@ static int imx6_pcie_init_phy(void)
 
 int imx6_pcie_toggle_power(struct udevice *vpcie)
 {
-#ifdef CONFIG_PCIE_IMX_POWER_GPIO
-	gpio_request(CONFIG_PCIE_IMX_POWER_GPIO, "pcie_power");
-	gpio_direction_output(CONFIG_PCIE_IMX_POWER_GPIO, 0);
+#ifdef CFG_PCIE_IMX_POWER_GPIO
+	gpio_request(CFG_PCIE_IMX_POWER_GPIO, "pcie_power");
+	gpio_direction_output(CFG_PCIE_IMX_POWER_GPIO, 0);
 	mdelay(20);
-	gpio_set_value(CONFIG_PCIE_IMX_POWER_GPIO, 1);
+	gpio_set_value(CFG_PCIE_IMX_POWER_GPIO, 1);
 	mdelay(20);
-	gpio_free(CONFIG_PCIE_IMX_POWER_GPIO);
+	gpio_free(CFG_PCIE_IMX_POWER_GPIO);
 #endif
 
 #if CONFIG_IS_ENABLED(DM_REGULATOR)
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 116a9c6abcf3..1aa8a56cceb6 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -21,7 +21,7 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
 #endif
 
 /* PMIC */
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 85e5cfbb58db..fe0ad34ef9c1 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -124,7 +124,7 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
 #endif
 
 #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 1c695159dd8b..aecc75c050d8 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -46,7 +46,7 @@
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
 /* PMIC */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 392756572f81..adf41306e819 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -151,7 +151,7 @@ CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
 CFG_OVERWRITE_ETHADDR_ONCE
 CFG_PCIE_IMX_PERST_GPIO
-CONFIG_PCIE_IMX_POWER_GPIO
+CFG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
-- 
2.25.1

[PoC 143/241] global: Migrate CONFIG_PEN_ADDR_BIG_ENDIAN to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/nonsec_virt.S | 2 +-
 include/configs/ls1021aiot.h     | 2 +-
 include/configs/ls1021aqds.h     | 2 +-
 include/configs/ls1021atwr.h     | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index b6d144f065d2..51beda79c967 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -211,7 +211,7 @@ ENTRY(smp_waitloop)
 	wfi
 	ldr	r1, =CONFIG_SMP_PEN_ADDR	@ load start address
 	ldr	r1, [r1]
-#ifdef CONFIG_PEN_ADDR_BIG_ENDIAN
+#ifdef CFG_PEN_ADDR_BIG_ENDIAN
 	rev	r1, r1
 #endif
 	cmp	r0, r1			@ make sure we dont execute this code
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 7a9a89d02390..cc6d07b40620 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -89,7 +89,7 @@
 
 #define FSL_PCIE_COMPAT		"fsl,ls1021a-pcie"
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
+#define CFG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index be05ab9de8cb..ccbf7c2e70dc 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -273,7 +273,7 @@
 #define TSEC3_PHYIDX			0
 #endif
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
+#define CFG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index da1e409e5c77..a554ee459042 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -154,7 +154,7 @@
 
 /* GPIO */
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
+#define CFG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index adf41306e819..ca5faaeea1a3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -152,7 +152,7 @@ CFG_OTHBOOTARGS
 CFG_OVERWRITE_ETHADDR_ONCE
 CFG_PCIE_IMX_PERST_GPIO
 CFG_PCIE_IMX_POWER_GPIO
-CONFIG_PEN_ADDR_BIG_ENDIAN
+CFG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
-- 
2.25.1

[PoC 144/241] global: Migrate CONFIG_PHY_BASE_ADR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/mvgbe.h            | 4 ++--
 include/configs/SBx81LIFKW.h   | 2 +-
 include/configs/SBx81LIFXCAT.h | 2 +-
 include/configs/dockstar.h     | 2 +-
 include/configs/dreamplug.h    | 2 +-
 include/configs/ds109.h        | 2 +-
 include/configs/goflexhome.h   | 2 +-
 include/configs/guruplug.h     | 2 +-
 include/configs/ib62x0.h       | 2 +-
 include/configs/iconnect.h     | 2 +-
 include/configs/nas220.h       | 2 +-
 include/configs/nsa310s.h      | 2 +-
 include/configs/openrd.h       | 4 ++--
 include/configs/pogo_e02.h     | 2 +-
 include/configs/pogo_v4.h      | 2 +-
 include/configs/sheevaplug.h   | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 44541c0a85e3..bc0c32957204 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -12,8 +12,8 @@
 #define __MVGBE_H__
 
 /* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
+#if defined (CFG_PHY_BASE_ADR)
+#define PHY_BASE_ADR		CFG_PHY_BASE_ADR
 #else
 #define PHY_BASE_ADR		0x08	/* default phy base addr */
 #endif
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 861ae530336a..3585d5f1b021 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -44,7 +44,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
-#define CONFIG_PHY_BASE_ADR	0x01
+#define CFG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_SBX81LIFKW_H */
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 418221ca72b3..4b1c9f995fb0 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -49,7 +49,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable a single port */
-#define CONFIG_PHY_BASE_ADR	0x01
+#define CFG_PHY_BASE_ADR	0x01
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_SBX81LIFXCAT_H */
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 68afe96239e6..bef274431261 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -32,6 +32,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 2b312e52b135..c258eadd6d9b 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -28,6 +28,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_DREAMPLUG_H */
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index a5f62497a731..123ebf751f37 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -40,7 +40,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable one port */
-#define CONFIG_PHY_BASE_ADR	8
+#define CFG_PHY_BASE_ADR	8
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_DS109_H */
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index c10e991d6589..10f2715c8b2a 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -40,6 +40,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_GOFLEXHOME_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index b21151e312c9..f78981c5b4e6 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -35,7 +35,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_GURUPLUG_H */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 5eeaeadd4bec..3dab13863051 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -29,7 +29,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
 /*
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 12f8a3c933cc..bb0813053256 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -23,7 +23,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	11
+#define CFG_PHY_BASE_ADR	11
 #endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_ICONNECT_H */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index bfa132dbfe58..149a1e20af40 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -44,7 +44,7 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CFG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 8
+#define CFG_PHY_BASE_ADR 8
 #endif /* CONFIG_CMD_NET */
 
 /*
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 85cbd0bab07d..765268cba3ca 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -48,6 +48,6 @@
 
 /* Ethernet driver configuration */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	1
+#define CFG_PHY_BASE_ADR	1
 
 #endif /* _CONFIG_NSA310S_H */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 1d1915a98520..413ca37e861d 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -43,10 +43,10 @@
 #  define CFG_MVGBE_PORTS	{1, 1}	/* enable both ports */
 # endif
 # ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
-#  define CONFIG_PHY_BASE_ADR	0x0
+#  define CFG_PHY_BASE_ADR	0x0
 #  define PHY_NO		"88E1121"
 # else
-#  define CONFIG_PHY_BASE_ADR	0x8
+#  define CFG_PHY_BASE_ADR	0x8
 #  define PHY_NO		"88E1116"
 # endif
 #endif /* CONFIG_CMD_NET */
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index c48590123bd2..17fb475f56a7 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -27,6 +27,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index 5d26a45f1426..9d6064f1e631 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -73,6 +73,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_POGO_V4_H */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index d4d968285fbd..9f78e1ac9a27 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -25,6 +25,6 @@
  * Ethernet Driver configuration
  */
 #define CFG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
+#define CFG_PHY_BASE_ADR	0
 
 #endif /* _CONFIG_SHEEVAPLUG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ca5faaeea1a3..5788c297fc21 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -153,7 +153,7 @@ CFG_OVERWRITE_ETHADDR_ONCE
 CFG_PCIE_IMX_PERST_GPIO
 CFG_PCIE_IMX_POWER_GPIO
 CFG_PEN_ADDR_BIG_ENDIAN
-CONFIG_PHY_BASE_ADR
+CFG_PHY_BASE_ADR
 CONFIG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
-- 
2.25.1

[PoC 145/241] global: Migrate CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/phy/et1011c.c    | 2 +-
 include/configs/ti814x_evm.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c
index c243c5b72f81..7eff5ec7cacb 100644
--- a/drivers/net/phy/et1011c.c
+++ b/drivers/net/phy/et1011c.c
@@ -60,7 +60,7 @@ static int et1011c_parse_status(struct phy_device *phydev)
 			  mii_reg |
 			  ET1011C_GMII_INTERFACE |
 			  ET1011C_SYS_CLK_EN |
-#ifdef CONFIG_PHY_ET1011C_TX_CLK_FIX
+#ifdef CFG_PHY_ET1011C_TX_CLK_FIX
 			  ET1011C_TX_CLK_EN |
 #endif
 			  ET1011C_TX_FIFO_DEPTH_16);
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 11e1936c2562..e67f2a2287de 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -97,6 +97,6 @@
  */
 
 /* Ethernet */
-#define CONFIG_PHY_ET1011C_TX_CLK_FIX
+#define CFG_PHY_ET1011C_TX_CLK_FIX
 
 #endif	/* ! __CONFIG_TI814X_EVM_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5788c297fc21..ebbc0b068611 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -154,7 +154,7 @@ CFG_PCIE_IMX_PERST_GPIO
 CFG_PCIE_IMX_POWER_GPIO
 CFG_PEN_ADDR_BIG_ENDIAN
 CFG_PHY_BASE_ADR
-CONFIG_PHY_ET1011C_TX_CLK_FIX
+CFG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
-- 
2.25.1

[PoC 146/241] global: Migrate CONFIG_PHY_ID to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/egnite/ethernut5/ethernut5.c | 2 +-
 include/configs/ethernut5.h        | 2 +-
 scripts/config_whitelist.txt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index ceb0d2cf0aa3..9953df017e19 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -160,7 +160,7 @@ int board_eth_init(struct bd_info *bis)
 	/* Set peripheral pins. */
 	at91_macb_hw_init();
 	/* Basic EMAC initialization. */
-	if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CONFIG_PHY_ID))
+	if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CFG_PHY_ID))
 		return -1;
 	/*
 	 * Early board revisions have a pull-down at the PHY's MODE0
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 2859188e60c9..18c643478f76 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -48,7 +48,7 @@
 /* JFFS2 */
 
 /* Ethernet */
-#define CONFIG_PHY_ID			0
+#define CFG_PHY_ID			0
 #define CFG_MACB_SEARCH_PHY
 
 /* MMC */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ebbc0b068611..664b59d44050 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -155,7 +155,7 @@ CFG_PCIE_IMX_POWER_GPIO
 CFG_PEN_ADDR_BIG_ENDIAN
 CFG_PHY_BASE_ADR
 CFG_PHY_ET1011C_TX_CLK_FIX
-CONFIG_PHY_ID
+CFG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
-- 
2.25.1

[PoC 147/241] global: Migrate CONFIG_PHY_INTERFACE_MODE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/socfpga_sr1500.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 432144cb40ce..70df27241ca6 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -11,7 +11,7 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB on SR1500 */
 
 /* Ethernet on SoC (EMAC) */
-#define CONFIG_PHY_INTERFACE_MODE	PHY_INTERFACE_MODE_RGMII
+#define CFG_PHY_INTERFACE_MODE	PHY_INTERFACE_MODE_RGMII
 /* The PHY is autodetected, so no MII PHY address is needed here */
 #define PHY_ANEG_TIMEOUT	8000
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 664b59d44050..9438ee6afdd7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -156,7 +156,7 @@ CFG_PEN_ADDR_BIG_ENDIAN
 CFG_PHY_BASE_ADR
 CFG_PHY_ET1011C_TX_CLK_FIX
 CFG_PHY_ID
-CONFIG_PHY_INTERFACE_MODE
+CFG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
 CONFIG_PL01x_PORTS
-- 
2.25.1

[PoC 148/241] global: Migrate CONFIG_PHY_IRAM_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 6 +++---
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 243b5c80c90e..c57b8aee7989 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -77,10 +77,10 @@ static void low_power_start(void)
 		branch_bx(0x0);
 	}
 
-	reg_val = readl(CONFIG_PHY_IRAM_BASE + 0x4);
+	reg_val = readl(CFG_PHY_IRAM_BASE + 0x4);
 	if (reg_val != (uint32_t)&low_power_start) {
 		/* Store jump address as low_power_start if not present */
-		writel((uint32_t)&low_power_start, CONFIG_PHY_IRAM_BASE + 0x4);
+		writel((uint32_t)&low_power_start, CFG_PHY_IRAM_BASE + 0x4);
 		dsb();
 		sev();
 	}
@@ -164,7 +164,7 @@ static void secondary_cores_configure(void)
 	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
-	writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4);
+	writel((uint32_t)&power_down_core, CFG_PHY_IRAM_BASE + 0x4);
 
 	/* Need all core power down check */
 	dsb();
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index b617c062881b..791ad154242e 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -12,7 +12,7 @@
 
 #define CFG_IRAM_TOP			0x02074000
 
-#define CONFIG_PHY_IRAM_BASE		0x02020000
+#define CFG_PHY_IRAM_BASE		0x02020000
 
 /*
  * Low Power settings
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9438ee6afdd7..3e9d0d66f56d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -157,7 +157,7 @@ CFG_PHY_BASE_ADR
 CFG_PHY_ET1011C_TX_CLK_FIX
 CFG_PHY_ID
 CFG_PHY_INTERFACE_MODE
-CONFIG_PHY_IRAM_BASE
+CFG_PHY_IRAM_BASE
 CONFIG_PL011_CLOCK
 CONFIG_PL01x_PORTS
 CONFIG_PME_PLAT_CLK_DIV
-- 
2.25.1

[PoC 149/241] global: Migrate CONFIG_PL011_CLOCK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                     | 2 +-
 arch/arm/cpu/armv7/s5p4418/cpu.c           | 2 +-
 board/armltd/total_compute/total_compute.c | 2 +-
 board/armltd/vexpress64/vexpress64.c       | 2 +-
 drivers/serial/serial_pl01x.c              | 8 ++++----
 include/configs/corstone1000.h             | 2 +-
 include/configs/highbank.h                 | 2 +-
 include/configs/lx2160a_common.h           | 2 +-
 include/configs/mxs.h                      | 2 +-
 include/configs/s5p4418_nanopi2.h          | 2 +-
 include/configs/synquacer.h                | 2 +-
 include/configs/thunderx_88xx.h            | 2 +-
 include/configs/total_compute.h            | 2 +-
 include/configs/vexpress_aemv8.h           | 4 ++--
 include/configs/vexpress_common.h          | 2 +-
 scripts/config_whitelist.txt               | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README b/README
index d3659e7b54a2..1eda285312be 100644
--- a/README
+++ b/README
@@ -419,7 +419,7 @@ The following options need to be configured:
 					controller register space
 
 - Serial Ports:
-		CONFIG_PL011_CLOCK
+		CFG_PL011_CLOCK
 
 		If you have Amba PrimeCell PL011 UARTs, set this variable to
 		the clock speed of the UARTs.
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 3baa761ec7a9..7ba9c0b03236 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -64,7 +64,7 @@ static void serial_device_init(void)
 
 	/* set clock   */
 	clk_disable(clk);
-	clk_set_rate(clk, CONFIG_PL011_CLOCK);
+	clk_set_rate(clk, CFG_PL011_CLOCK);
 	clk_enable(clk);
 }
 #endif
diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c
index b7772f79a31a..53941b5f5f28 100644
--- a/board/armltd/total_compute/total_compute.c
+++ b/board/armltd/total_compute/total_compute.c
@@ -13,7 +13,7 @@
 static const struct pl01x_serial_plat serial_plat = {
 	.base = UART0_BASE,
 	.type = TYPE_PL011,
-	.clock = CONFIG_PL011_CLOCK,
+	.clock = CFG_PL011_CLOCK,
 };
 
 U_BOOT_DRVINFO(total_compute_serials) = {
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 4ca544f1017d..99fb67ecedc2 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static const struct pl01x_serial_plat serial_plat = {
 	.base = V2M_UART0,
 	.type = TYPE_PL011,
-	.clock = CONFIG_PL011_CLOCK,
+	.clock = CFG_PL011_CLOCK,
 };
 
 U_BOOT_DRVINFO(vexpress_serials) = {
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index d3c3d3e2d188..dd2881931dfd 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -193,7 +193,7 @@ static void pl01x_serial_init_baud(int baudrate)
 
 #if defined(CONFIG_PL011_SERIAL)
 	pl01x_type = TYPE_PL011;
-	clock = CONFIG_PL011_CLOCK;
+	clock = CFG_PL011_CLOCK;
 #endif
 	base_regs = (struct pl01x_regs *)port[CONFIG_CONS_INDEX];
 
@@ -343,8 +343,8 @@ static const struct udevice_id pl01x_serial_id[] ={
 	{}
 };
 
-#ifndef CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK 0
+#ifndef CFG_PL011_CLOCK
+#define CFG_PL011_CLOCK 0
 #endif
 
 int pl01x_serial_of_to_plat(struct udevice *dev)
@@ -359,7 +359,7 @@ int pl01x_serial_of_to_plat(struct udevice *dev)
 		return -EINVAL;
 
 	plat->base = addr;
-	plat->clock = dev_read_u32_default(dev, "clock", CONFIG_PL011_CLOCK);
+	plat->clock = dev_read_u32_default(dev, "clock", CFG_PL011_CLOCK);
 	ret = clk_get_by_index(dev, 0, &clk);
 	if (!ret) {
 		ret = clk_enable(&clk);
diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h
index 8aec52d508e2..3347c11792d5 100644
--- a/include/configs/corstone1000.h
+++ b/include/configs/corstone1000.h
@@ -16,7 +16,7 @@
 
 #define V2M_BASE		0x80000000
 
-#define CONFIG_PL011_CLOCK	50000000
+#define CFG_PL011_CLOCK	50000000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1		(V2M_BASE)
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 76e6054b0cc1..97bb439f7357 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -8,7 +8,7 @@
 
 #define CFG_SYS_BOOTMAPSZ		(16 << 20)
 
-#define CONFIG_PL011_CLOCK		150000000
+#define CFG_PL011_CLOCK		150000000
 
 /*
  * Miscellaneous configurable options
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 0fc32efabc7f..ea59f772064a 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -41,7 +41,7 @@
 
 
 /* Serial Port */
-#define CONFIG_PL011_CLOCK		(get_bus_freq(0) / 4)
+#define CFG_PL011_CLOCK		(get_bus_freq(0) / 4)
 #define CFG_SYS_SERIAL0		0x21c0000
 #define CFG_SYS_SERIAL1		0x21d0000
 #define CFG_SYS_SERIAL2		0x21e0000
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 30f27e7f0c19..212d2201e7cc 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -77,7 +77,7 @@
  * DUART Serial Driver.
  * Conflicts with AUART driver which can be set by board.
  */
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index 02c469049adb..c9cef6a77c62 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -78,7 +78,7 @@
 /*-----------------------------------------------------------------------
  * serial console configuration
  */
-#define CONFIG_PL011_CLOCK		50000000
+#define CFG_PL011_CLOCK		50000000
 #define CONFIG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
 					 (void *)PHY_BASEADDR_UART1, \
 					 (void *)PHY_BASEADDR_UART2, \
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index fa522ce82883..d0b56cb48f7d 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -32,7 +32,7 @@
 
 /* Serial (pl011)       */
 #define UART_CLK			(62500000)
-#define CONFIG_PL011_CLOCK		UART_CLK
+#define CFG_PL011_CLOCK		UART_CLK
 #define CONFIG_PL01x_PORTS		{(void *)(0x2a400000)}
 
 /* Support MTD */
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 8ba40546b2c0..2bca86bed939 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -17,7 +17,7 @@
 
 /* PL011 Serial Configuration */
 
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			(0x801000000000)
diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
index e007be8e4564..436bf622e174 100644
--- a/include/configs/total_compute.h
+++ b/include/configs/total_compute.h
@@ -14,7 +14,7 @@
 #define UART0_BASE		0x7ff80000
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_CLOCK	7372800
+#define CFG_PL011_CLOCK	7372800
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 87b8c5d57ee7..43f7e454d812 100644
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -86,9 +86,9 @@
 
 /* PL011 Serial Configuration */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_PL011_CLOCK		7372800
+#define CFG_PL011_CLOCK		7372800
 #else
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #endif
 
 /* Physical Memory Map */
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 705a941e3603..3fc70de57713 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -116,7 +116,7 @@
 #define CFG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					 (void *)CFG_SYS_SERIAL1}
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3e9d0d66f56d..0ea10f2edb32 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -158,7 +158,7 @@ CFG_PHY_ET1011C_TX_CLK_FIX
 CFG_PHY_ID
 CFG_PHY_INTERFACE_MODE
 CFG_PHY_IRAM_BASE
-CONFIG_PL011_CLOCK
+CFG_PL011_CLOCK
 CONFIG_PL01x_PORTS
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_POST
-- 
2.25.1

[PoC 150/241] global: Migrate CONFIG_PL01x_PORTS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                            | 2 +-
 drivers/serial/serial_pl01x.c     | 2 +-
 include/configs/lx2160a_common.h  | 2 +-
 include/configs/mxs.h             | 2 +-
 include/configs/s5p4418_nanopi2.h | 2 +-
 include/configs/synquacer.h       | 2 +-
 include/configs/vexpress_common.h | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 1eda285312be..3e5af3e204c3 100644
--- a/README
+++ b/README
@@ -424,7 +424,7 @@ The following options need to be configured:
 		If you have Amba PrimeCell PL011 UARTs, set this variable to
 		the clock speed of the UARTs.
 
-		CONFIG_PL01x_PORTS
+		CFG_PL01x_PORTS
 
 		If you have Amba PrimeCell PL010 or PL011 UARTs on your board,
 		define this to a list of base addresses for each (supported)
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index dd2881931dfd..7449e9b90430 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_DM_SERIAL
 
-static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
+static volatile unsigned char *const port[] = CFG_PL01x_PORTS;
 static enum pl01x_type pl01x_type __section(".data");
 static struct pl01x_regs *base_regs __section(".data");
 #define NUM_PORTS (sizeof(port)/sizeof(port[0]))
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index ea59f772064a..dea14f28828d 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -47,7 +47,7 @@
 #define CFG_SYS_SERIAL2		0x21e0000
 #define CFG_SYS_SERIAL3		0x21f0000
 /*below might needs to be removed*/
-#define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
+#define CFG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					(void *)CFG_SYS_SERIAL1, \
 					(void *)CFG_SYS_SERIAL2, \
 					(void *)CFG_SYS_SERIAL3 }
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 212d2201e7cc..17b4295d2d6d 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -78,7 +78,7 @@
  * Conflicts with AUART driver which can be set by board.
  */
 #define CFG_PL011_CLOCK		24000000
-#define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
+#define CFG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
 /* NAND */
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index c9cef6a77c62..c192d733c1db 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -79,7 +79,7 @@
  * serial console configuration
  */
 #define CFG_PL011_CLOCK		50000000
-#define CONFIG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
+#define CFG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
 					 (void *)PHY_BASEADDR_UART1, \
 					 (void *)PHY_BASEADDR_UART2, \
 					 (void *)PHY_BASEADDR_UART3}
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index d0b56cb48f7d..be606ce2955b 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -33,7 +33,7 @@
 /* Serial (pl011)       */
 #define UART_CLK			(62500000)
 #define CFG_PL011_CLOCK		UART_CLK
-#define CONFIG_PL01x_PORTS		{(void *)(0x2a400000)}
+#define CFG_PL01x_PORTS		{(void *)(0x2a400000)}
 
 /* Support MTD */
 #define CFG_SYS_FLASH_BASE		(0x08000000)
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 3fc70de57713..ba7731bfca6b 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -117,7 +117,7 @@
 
 /* PL011 Serial Configuration */
 #define CFG_PL011_CLOCK		24000000
-#define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
+#define CFG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					 (void *)CFG_SYS_SERIAL1}
 
 #define CFG_SYS_SERIAL0		V2M_UART0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0ea10f2edb32..390299fa0a8f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -159,7 +159,7 @@ CFG_PHY_ID
 CFG_PHY_INTERFACE_MODE
 CFG_PHY_IRAM_BASE
 CFG_PL011_CLOCK
-CONFIG_PL01x_PORTS
+CFG_PL01x_PORTS
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_POST
 CONFIG_POSTBOOTMENU
-- 
2.25.1

[PoC 151/241] global: Migrate CONFIG_PME_PLAT_CLK_DIV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++----
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index eec071022e59..c2e3e00f7ba8 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info)
 		[14] = 4,	/* CC4 PPL / 4 */
 	};
 	uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
-#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CFG_PME_PLAT_CLK_DIV)
 	uint rcw_tmp;
 #endif
 	uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
 #define FM1_CLK_SEL	0x1c000000
 #define FM1_CLK_SHIFT	26
 #endif
-#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CFG_PME_PLAT_CLK_DIV)
 #if defined(CONFIG_ARCH_T1024)
 	rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
 #else
@@ -215,7 +215,7 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_PME
-#ifndef CONFIG_PME_PLAT_CLK_DIV
+#ifndef CFG_PME_PLAT_CLK_DIV
 	switch ((rcw_tmp & PME_CLK_SEL) >> PME_CLK_SHIFT) {
 	case 1:
 		sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK];
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 24259f6470ae..4c19c50bda04 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -172,8 +172,8 @@
 #define CONFIG_SYS_FSL_SRDS_1
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	5
-#define CONFIG_PME_PLAT_CLK_DIV		2
-#define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
+#define CFG_PME_PLAT_CLK_DIV		2
+#define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_FM_PLAT_CLK_DIV	1
 #define CFG_SYS_FM1_CLK		CFG_FM_PLAT_CLK_DIV
@@ -211,8 +211,8 @@
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #endif
-#define CONFIG_PME_PLAT_CLK_DIV		1
-#define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
+#define CFG_PME_PLAT_CLK_DIV		1
+#define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CFG_SYS_FM1_CLK		0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM_MURAM_SIZE	0x28000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 390299fa0a8f..2b3e4a79a00c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -160,7 +160,7 @@ CFG_PHY_INTERFACE_MODE
 CFG_PHY_IRAM_BASE
 CFG_PL011_CLOCK
 CFG_PL01x_PORTS
-CONFIG_PME_PLAT_CLK_DIV
+CFG_PME_PLAT_CLK_DIV
 CONFIG_POST
 CONFIG_POSTBOOTMENU
 CONFIG_POST_EXTERNAL_WORD_FUNCS
-- 
2.25.1

[PoC 152/241] global: Migrate CONFIG_POSTBOOTMENU to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 cmd/bootmenu.c               | 4 ++--
 include/configs/nokia_rx51.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 3340be16325b..e5a10f5d5c4d 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -577,8 +577,8 @@ cleanup:
 		free(command);
 	}
 
-#ifdef CONFIG_POSTBOOTMENU
-	run_command(CONFIG_POSTBOOTMENU, 0);
+#ifdef CFG_POSTBOOTMENU
+	run_command(CFG_POSTBOOTMENU, 0);
 #endif
 
 	if (efi_ret != EFI_SUCCESS || cmd_ret != CMD_RET_SUCCESS)
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 96c23b5b5af7..5f4378f4c86f 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -127,7 +127,7 @@
 	"bootmenu_delay=30\0" \
 	""
 
-#define CONFIG_POSTBOOTMENU \
+#define CFG_POSTBOOTMENU \
 	"echo;" \
 	"echo Extra commands:;" \
 	"echo run sdboot - Boot from SD card slot.;" \
-- 
2.25.1

[PoC 153/241] global: Migrate CONFIG_POWER_LTC3676_I2C_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++--
 drivers/power/pmic/pmic_ltc3676.c           | 2 +-
 include/configs/gw_ventana.h                | 2 +-
 scripts/config_whitelist.txt                | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index e85a00954cee..6ad994af1c64 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -851,8 +851,8 @@ void setup_pmic(void)
 	}
 
 	/* configure LTC3676 PMIC */
-	else if (!i2c_probe(CONFIG_POWER_LTC3676_I2C_ADDR)) {
-		debug("probed LTC3676@0x%x\n", CONFIG_POWER_LTC3676_I2C_ADDR);
+	else if (!i2c_probe(CFG_POWER_LTC3676_I2C_ADDR)) {
+		debug("probed LTC3676@0x%x\n", CFG_POWER_LTC3676_I2C_ADDR);
 		power_ltc3676_init(i2c_pmic);
 		p = pmic_get("LTC3676_PMIC");
 		if (!p || pmic_probe(p))
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 00c3e201cd56..af94f37b0f10 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -23,7 +23,7 @@ int power_ltc3676_init(unsigned char bus)
 	p->name = name;
 	p->interface = PMIC_I2C;
 	p->number_of_regs = LTC3676_NUM_OF_REGS;
-	p->hw.i2c.addr = CONFIG_POWER_LTC3676_I2C_ADDR;
+	p->hw.i2c.addr = CFG_POWER_LTC3676_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->bus = bus;
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4741d399590c..577322a5987d 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -31,7 +31,7 @@
  * PMIC
  */
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
-#define CONFIG_POWER_LTC3676_I2C_ADDR  0x3c
+#define CFG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2b3e4a79a00c..52a78f10cd52 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -161,10 +161,8 @@ CFG_PHY_IRAM_BASE
 CFG_PL011_CLOCK
 CFG_PL01x_PORTS
 CFG_PME_PLAT_CLK_DIV
-CONFIG_POST
-CONFIG_POSTBOOTMENU
-CONFIG_POST_EXTERNAL_WORD_FUNCS
-CONFIG_POWER_LTC3676_I2C_ADDR
+CFG_POSTBOOTMENU
+CFG_POWER_LTC3676_I2C_ADDR
 CONFIG_POWER_PFUZE100_I2C_ADDR
 CONFIG_POWER_PFUZE3000_I2C_ADDR
 CONFIG_PPC_SPINTABLE_COMPATIBLE
-- 
2.25.1

[PoC 156/241] global: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu_init.c       | 4 ++--
 arch/powerpc/cpu/mpc85xx/release.S        | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 562d7074ed75..e5e00c5eade9 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -659,7 +659,7 @@ int cpu_init_r(void)
 #ifdef CFG_SYS_LBC_LCRR
 	fsl_lbc_t *lbc = (void __iomem *)LBC_BASE_ADDR;
 #endif
-#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
+#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
 	extern int spin_table_compat;
 	const char *spin;
 #endif
@@ -725,7 +725,7 @@ int cpu_init_r(void)
 		mtspr(SPRN_HDBCR0, (mfspr(SPRN_HDBCR0) | 0x80000000));
 #endif
 
-#if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
+#if defined(CFG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
 	spin = env_get("spin_table_compat");
 	if (spin && (*spin == 'n'))
 		spin_table_compat = 0;
diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S
index 391751ce1e71..57cc4fda816c 100644
--- a/arch/powerpc/cpu/mpc85xx/release.S
+++ b/arch/powerpc/cpu/mpc85xx/release.S
@@ -356,7 +356,7 @@ __secondary_reset_vector:
 	.align L1_CACHE_SHIFT
 	.global __second_half_boot_page
 __second_half_boot_page:
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#ifdef CFG_PPC_SPINTABLE_COMPATIBLE
 	lis	r3,(spin_table_compat - __second_half_boot_page)@h
 	ori	r3,r3,(spin_table_compat - __second_half_boot_page)@l
 	add	r3,r3,r11 /* r11 has the address of __second_half_boot_page */
@@ -404,7 +404,7 @@ __second_half_boot_page:
  * "spin_table_compat=no". After Linux is fixed, we can remove this macro
  * and related code. For now, it is enabled by default.
  */
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#ifdef CFG_PPC_SPINTABLE_COMPATIBLE
 	cmpwi   r14,0
 	beq     4f
 	dcbf    0, r10
@@ -486,7 +486,7 @@ __second_half_boot_page:
 __spin_table:
 	.space CONFIG_MAX_CPUS*ENTRY_SIZE
 
-#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+#ifdef CFG_PPC_SPINTABLE_COMPATIBLE
 	.align L1_CACHE_SHIFT
 	.global spin_table_compat
 spin_table_compat:
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 4c19c50bda04..5491a1af2813 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -12,7 +12,7 @@
  * This macro should be removed when we no longer care about backwards
  * compatibility with older operating systems.
  */
-#define CONFIG_PPC_SPINTABLE_COMPATIBLE
+#define CFG_PPC_SPINTABLE_COMPATIBLE
 
 #include <fsl_ddrc_version.h>
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6b824bb14f39..0e792dfbec9c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -165,7 +165,7 @@ CFG_POSTBOOTMENU
 CFG_POWER_LTC3676_I2C_ADDR
 CFG_POWER_PFUZE100_I2C_ADDR
 CFG_POWER_PFUZE3000_I2C_ADDR
-CONFIG_PPC_SPINTABLE_COMPATIBLE
+CFG_PPC_SPINTABLE_COMPATIBLE
 CONFIG_PRAM
 CONFIG_PSRAM_SCFG
 CONFIG_QBMAN_CLK_DIV
-- 
2.25.1

[PoC 159/241] global: Migrate CONFIG_QBMAN_CLK_DIV to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index c2e3e00f7ba8..9af40310b46f 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -249,10 +249,10 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-#ifndef CONFIG_QBMAN_CLK_DIV
-#define CONFIG_QBMAN_CLK_DIV	2
+#ifndef CFG_QBMAN_CLK_DIV
+#define CFG_QBMAN_CLK_DIV	2
 #endif
-	sys_info->freq_qman = sys_info->freq_systembus / CONFIG_QBMAN_CLK_DIV;
+	sys_info->freq_qman = sys_info->freq_systembus / CFG_QBMAN_CLK_DIV;
 #endif
 
 #if defined(CONFIG_SYS_MAPLE)
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 5491a1af2813..0a67c76b61d6 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -192,7 +192,7 @@
 #define CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
-#define CONFIG_QBMAN_CLK_DIV		1
+#define CFG_QBMAN_CLK_DIV		1
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE			0x6000UL
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3ee3720b8876..2a06cc5d3041 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -168,7 +168,7 @@ CFG_POWER_PFUZE3000_I2C_ADDR
 CFG_PPC_SPINTABLE_COMPATIBLE
 CFG_PRAM
 CFG_PSRAM_SCFG
-CONFIG_QBMAN_CLK_DIV
+CFG_QBMAN_CLK_DIV
 CONFIG_RAMBOOT_SPIFLASH
 CONFIG_RAMBOOT_TEXT_BASE
 CONFIG_RAMDISK_ADDR
-- 
2.25.1

[PoC 160/241] global: Migrate CONFIG_RAMBOOT_SPIFLASH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/P1010RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index a75e1b8f7a8a..1fa0b38ae201 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_SPIFLASH
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_RAMBOOT_SPIFLASH
+#define CFG_RAMBOOT_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(512 << 10)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2a06cc5d3041..083352a88bb8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -169,7 +169,7 @@ CFG_PPC_SPINTABLE_COMPATIBLE
 CFG_PRAM
 CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
-CONFIG_RAMBOOT_SPIFLASH
+CFG_RAMBOOT_SPIFLASH
 CONFIG_RAMBOOT_TEXT_BASE
 CONFIG_RAMDISK_ADDR
 CONFIG_RD_LVL
-- 
2.25.1

[PoC 161/241] global: Migrate CONFIG_RAMBOOT_TEXT_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/P2041RDB.h   | 6 +++---
 include/configs/T4240RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 0a6fcde3913d..f4cf43e7100d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -12,7 +12,7 @@
 #define __CONFIG_H
 
 #ifdef CONFIG_RAMBOOT_PBL
-#define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
+#define CFG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 
@@ -46,10 +46,10 @@
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CFG_SYS_INIT_L3_ADDR		CONFIG_RAMBOOT_TEXT_BASE
+#define CFG_SYS_INIT_L3_ADDR		CFG_RAMBOOT_TEXT_BASE
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_L3_ADDR_PHYS	(0xf00000000ull | \
-		CONFIG_RAMBOOT_TEXT_BASE)
+		CFG_RAMBOOT_TEXT_BASE)
 #else
 #define CFG_SYS_INIT_L3_ADDR_PHYS	CFG_SYS_INIT_L3_ADDR
 #endif
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index f1ee131aaa98..c3a04a766abd 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
-#define CONFIG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
+#define CFG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
 #define RESET_VECTOR_OFFSET		0x27FFC
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 083352a88bb8..df6a95c2572b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -170,7 +170,7 @@ CFG_PRAM
 CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
-CONFIG_RAMBOOT_TEXT_BASE
+CFG_RAMBOOT_TEXT_BASE
 CONFIG_RAMDISK_ADDR
 CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
-- 
2.25.1

[PoC 162/241] global: Migrate CONFIG_RAMDISK_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 cmd/qfw.c                    | 4 ++--
 doc/usage/cmd/qfw.rst        | 2 +-
 include/configs/x86-common.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/qfw.c b/cmd/qfw.c
index 95ddc4b79ec7..0c49c6074e16 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
 	env = env_get("ramdiskaddr");
 	initrd_addr = env ?
 		(void *)hextoul(env, NULL) :
-#ifdef CONFIG_RAMDISK_ADDR
-		(void *)CONFIG_RAMDISK_ADDR;
+#ifdef CFG_RAMDISK_ADDR
+		(void *)CFG_RAMDISK_ADDR;
 #else
 		NULL;
 #endif
diff --git a/doc/usage/cmd/qfw.rst b/doc/usage/cmd/qfw.rst
index b3704b92d6d9..cc0e27c27790 100644
--- a/doc/usage/cmd/qfw.rst
+++ b/doc/usage/cmd/qfw.rst
@@ -31,7 +31,7 @@ kernel_addr
 initrd_addr
     address to which the file specified by the -initrd parameter of QEMU shall
     be loaded. Defaults to environment variable *ramdiskaddr* and further to
-    the value of *CONFIG_RAMDISK_ADDR*.
+    the value of *CFG_RAMDISK_ADDR*.
 
 Examples
 --------
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index df75deedf583..e8bd2e507041 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -43,7 +43,7 @@
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CFG_HOSTNAME		"x86"
-#define CONFIG_RAMDISK_ADDR	0x4000000
+#define CFG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CFG_OTHBOOTARGS	"othbootargs=\0"
 #else
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index df6a95c2572b..e706fba5e8fd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -171,7 +171,7 @@ CFG_PSRAM_SCFG
 CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
-CONFIG_RAMDISK_ADDR
+CFG_RAMDISK_ADDR
 CONFIG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
-- 
2.25.1

[PoC 163/241] global: Migrate CONFIG_RD_LVL to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/exynos5-common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 860fd1601a66..e8236a9ec418 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -27,7 +27,7 @@
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 
-#define CONFIG_RD_LVL
+#define CFG_RD_LVL
 
 #define PHYS_SDRAM_1		CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE	SDRAM_BANK_SIZE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e706fba5e8fd..23d832894d3d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -172,7 +172,7 @@ CFG_QBMAN_CLK_DIV
 CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
 CFG_RAMDISK_ADDR
-CONFIG_RD_LVL
+CFG_RD_LVL
 CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROOTPATH
-- 
2.25.1

[PoC 164/241] global: Migrate CONFIG_RESET_VECTOR_ADDRESS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/Kconfig     |  2 +-
 arch/powerpc/cpu/mpc85xx/u-boot.lds  |  4 ++--
 arch/powerpc/dts/kmcent2-u-boot.dtsi |  2 +-
 arch/powerpc/dts/u-boot.dtsi         |  6 +++---
 board/freescale/p1_p2_rdb_pc/README  |  2 +-
 board/freescale/p2041rdb/README      |  2 +-
 board/freescale/t104xrdb/README      |  2 +-
 board/freescale/t208xqds/README      |  2 +-
 board/freescale/t208xrdb/README      |  2 +-
 include/configs/P1010RDB.h           |  8 ++++----
 include/configs/P2041RDB.h           |  8 ++++----
 include/configs/T102xRDB.h           | 10 +++++-----
 include/configs/T104xRDB.h           |  8 ++++----
 include/configs/T208xQDS.h           | 10 +++++-----
 include/configs/T208xRDB.h           | 10 +++++-----
 include/configs/T4240RDB.h           |  8 ++++----
 include/configs/kmcent2.h            |  2 +-
 include/configs/p1_p2_rdb_pc.h       |  4 ++--
 scripts/config_whitelist.txt         |  2 +-
 19 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index f2361560e9ad..a4891bb558f6 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -935,7 +935,7 @@ config ARCH_T4240
 	imply FSL_SATA
 
 config MPC85XX_HAVE_RESET_VECTOR
-	bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc"
+	bool "Indicate reset vector at CFG_RESET_VECTOR_ADDRESS - 0xffc"
 	depends on MPC85xx
 
 config BTB
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index fa3aa954cbb5..3af0dfdf336b 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -5,8 +5,8 @@
 
 #include "config.h"
 
-#ifdef CONFIG_RESET_VECTOR_ADDRESS
-#define RESET_VECTOR_ADDRESS	CONFIG_RESET_VECTOR_ADDRESS
+#ifdef CFG_RESET_VECTOR_ADDRESS
+#define RESET_VECTOR_ADDRESS	CFG_RESET_VECTOR_ADDRESS
 #else
 #define RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi
index 28f303b749e9..53bac5533f24 100644
--- a/arch/powerpc/dts/kmcent2-u-boot.dtsi
+++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi
@@ -91,7 +91,7 @@
 			align = <256>;
 		};
 		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
+			offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>;
 		};
 	};
 };
diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi
index b4b5257362e5..6b7375cff215 100644
--- a/arch/powerpc/dts/u-boot.dtsi
+++ b/arch/powerpc/dts/u-boot.dtsi
@@ -23,11 +23,11 @@
 		u-boot-dtb-with-ucode {
 			align = <4>;
 		};
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
+			offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>;
 		};
 	};
 };
diff --git a/board/freescale/p1_p2_rdb_pc/README b/board/freescale/p1_p2_rdb_pc/README
index f542decec79b..fd849bfc29a2 100644
--- a/board/freescale/p1_p2_rdb_pc/README
+++ b/board/freescale/p1_p2_rdb_pc/README
@@ -57,7 +57,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="p1020rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/board/freescale/p2041rdb/README b/board/freescale/p2041rdb/README
index 96612daeeb11..ae7702773723 100644
--- a/board/freescale/p2041rdb/README
+++ b/board/freescale/p2041rdb/README
@@ -98,7 +98,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="p2041rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 CPLD command
 ============
diff --git a/board/freescale/t104xrdb/README b/board/freescale/t104xrdb/README
index e90dca416639..f312e6a3e32b 100644
--- a/board/freescale/t104xrdb/README
+++ b/board/freescale/t104xrdb/README
@@ -379,7 +379,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/board/freescale/t208xqds/README b/board/freescale/t208xqds/README
index 63953d6b9b66..0d80c6901fb2 100755
--- a/board/freescale/t208xqds/README
+++ b/board/freescale/t208xqds/README
@@ -285,7 +285,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t2080qds" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/board/freescale/t208xrdb/README b/board/freescale/t208xrdb/README
index 60551f6723e6..533054bfe192 100644
--- a/board/freescale/t208xrdb/README
+++ b/board/freescale/t208xrdb/README
@@ -281,7 +281,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 1fa0b38ae201..eff275a5ada6 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -25,7 +25,7 @@
 #ifdef CONFIG_SPIFLASH
 #ifdef CONFIG_NXP_ESBC
 #define CFG_RAMBOOT_SPIFLASH
-#define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
+#define CFG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(512 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x11000000)
@@ -53,11 +53,11 @@
 #endif
 
 #ifdef CONFIG_NAND_SECBOOT	/* NAND Boot */
-#define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
+#define CFG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /* High Level Configuration Options */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index f4cf43e7100d..8cfa01135ffe 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #define CFG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
-#define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
@@ -21,13 +21,13 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index c61d086dbe57..9940eae0a36d 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x30000000)
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS	0x30000FFC
+#define CFG_RESET_VECTOR_ADDRESS	0x30000FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x30000000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x30000000)
@@ -45,8 +45,8 @@
 
 #endif /* CONFIG_RAMBOOT_PBL */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
@@ -87,7 +87,7 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS	\
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
 /*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index bae6742928e3..cd7a085b8b8c 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -35,7 +35,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x30000000)
@@ -43,7 +43,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x30000000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x30000000)
@@ -54,8 +54,8 @@
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index d9841397fb6b..b0ded3647212 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x00200000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x00200000)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x00200000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x00200000)
@@ -52,11 +52,11 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 9e38d5e9f3a2..e2c04d121edc 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
+#define        CFG_RESET_VECTOR_ADDRESS             0x200FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
+#define        CFG_RESET_VECTOR_ADDRESS             0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST      (0x00200000)
 #define CFG_SYS_MMC_U_BOOT_START    (0x00200000)
@@ -52,11 +52,11 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index c3a04a766abd..772db525bf81 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -17,13 +17,13 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
 #define CFG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
-#define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
 #define RESET_VECTOR_OFFSET		0x27FFC
 #define BOOT_PAGE_OFFSET		0x27000
 
 #ifdef	CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS	0x200FFC
+#define CFG_RESET_VECTOR_ADDRESS	0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	0x00200000
 #define CFG_SYS_MMC_U_BOOT_START	0x00200000
@@ -35,8 +35,8 @@
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index b64651527202..aa3112d94e0e 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -134,7 +134,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_RESET_VECTOR_ADDRESS	0xebfffffc
+#define CFG_RESET_VECTOR_ADDRESS	0xebfffffc
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 1e66d609d68d..7be07b5f43d5 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -105,8 +105,8 @@
 #endif /* not CONFIG_TPL_BUILD */
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 23d832894d3d..bd4936d08ada 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -173,7 +173,7 @@ CFG_RAMBOOT_SPIFLASH
 CFG_RAMBOOT_TEXT_BASE
 CFG_RAMDISK_ADDR
 CFG_RD_LVL
-CONFIG_RESET_VECTOR_ADDRESS
+CFG_RESET_VECTOR_ADDRESS
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROOTPATH
 CONFIG_SANDBOX_ARCH
-- 
2.25.1

[PoC 167/241] global: Migrate CONFIG_SANDBOX_ARCH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sandbox/include/asm/config.h | 2 +-
 drivers/adc/adc-uclass.c          | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/sandbox/include/asm/config.h b/arch/sandbox/include/asm/config.h
index 50215b35d777..0adb6978451c 100644
--- a/arch/sandbox/include/asm/config.h
+++ b/arch/sandbox/include/asm/config.h
@@ -6,7 +6,7 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SANDBOX_ARCH
+#define CFG_SANDBOX_ARCH
 
 /* Used by drivers/spi/sandbox_spi.c and arch/sandbox/include/asm/state.h */
 #ifndef CONFIG_SANDBOX_SPI_MAX_BUS
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index 67137ffb3414..67289bb1acae 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -22,7 +22,7 @@
 #define CHECK_MASK			(!CHECK_NUMBER)
 
 /* TODO: add support for timer uclass (for early calls) */
-#ifdef CONFIG_SANDBOX_ARCH
+#ifdef CFG_SANDBOX_ARCH
 #define sdelay(x)	udelay(x)
 #else
 extern void sdelay(unsigned long loops);
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 332b5493d30d..c9e0703f52a5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -176,7 +176,7 @@ CFG_RD_LVL
 CFG_RESET_VECTOR_ADDRESS
 CFG_ROCKCHIP_SDHCI_MAX_FREQ
 CFG_ROOTPATH
-CONFIG_SANDBOX_ARCH
+CFG_SANDBOX_ARCH
 CONFIG_SANDBOX_SDL
 CONFIG_SANDBOX_SPI_MAX_BUS
 CONFIG_SANDBOX_SPI_MAX_CS
-- 
2.25.1

[PoC 169/241] global: Migrate CONFIG_SANDBOX_SPI_MAX_CS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sandbox/include/asm/config.h | 4 ++--
 arch/sandbox/include/asm/state.h  | 2 +-
 drivers/spi/sandbox_spi.c         | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/sandbox/include/asm/config.h b/arch/sandbox/include/asm/config.h
index 36833987330c..2ffe94f10bc8 100644
--- a/arch/sandbox/include/asm/config.h
+++ b/arch/sandbox/include/asm/config.h
@@ -12,8 +12,8 @@
 #ifndef CFG_SANDBOX_SPI_MAX_BUS
 #define CFG_SANDBOX_SPI_MAX_BUS 1
 #endif
-#ifndef CONFIG_SANDBOX_SPI_MAX_CS
-#define CONFIG_SANDBOX_SPI_MAX_CS 10
+#ifndef CFG_SANDBOX_SPI_MAX_CS
+#define CFG_SANDBOX_SPI_MAX_CS 10
 #endif
 
 #endif
diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h
index ada85be5cb1a..e99a7d04e8da 100644
--- a/arch/sandbox/include/asm/state.h
+++ b/arch/sandbox/include/asm/state.h
@@ -99,7 +99,7 @@ struct sandbox_state {
 
 	/* Pointer to information for each SPI bus/cs */
 	struct sandbox_spi_info spi[CFG_SANDBOX_SPI_MAX_BUS]
-					[CONFIG_SANDBOX_SPI_MAX_CS];
+					[CFG_SANDBOX_SPI_MAX_CS];
 
 	/* Information about Watchdog */
 	struct sandbox_wdt_info wdt;
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 0c645904da14..0065a5c65755 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -90,7 +90,7 @@ static int sandbox_spi_xfer(struct udevice *slave, unsigned int bitlen,
 	busnum = dev_seq(bus);
 	cs = spi_chip_select(slave);
 	if (busnum >= CFG_SANDBOX_SPI_MAX_BUS ||
-	    cs >= CONFIG_SANDBOX_SPI_MAX_CS) {
+	    cs >= CFG_SANDBOX_SPI_MAX_CS) {
 		printf("%s: busnum=%u, cs=%u: out of range\n", __func__,
 		       busnum, cs);
 		return -ENOENT;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 815d8f8f12ba..7af096ee8f63 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -178,7 +178,7 @@ CFG_ROCKCHIP_SDHCI_MAX_FREQ
 CFG_ROOTPATH
 CFG_SANDBOX_ARCH
 CFG_SANDBOX_SPI_MAX_BUS
-CONFIG_SANDBOX_SPI_MAX_CS
+CFG_SANDBOX_SPI_MAX_CS
 CONFIG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SCIF_A
-- 
2.25.1

[PoC 170/241] global: Migrate CONFIG_SAR2_REG to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-mvebu/cpu.c              | 4 ++--
 arch/arm/mach-mvebu/include/mach/soc.h | 6 +++---
 scripts/config_whitelist.txt           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 67ad5e5907be..9139df1ae248 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -195,7 +195,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 	int i;
 
 #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS)
-	val = readl(CONFIG_SAR2_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR2_REG);	/* SAR - Sample At Reset */
 #else
 	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
 #endif
@@ -205,7 +205,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 	 * Shift CPU0 clock frequency select bit from SAR2 register
 	 * into correct position
 	 */
-	freq |= ((readl(CONFIG_SAR2_REG) & SAR2_CPU_FREQ_MASK)
+	freq |= ((readl(CFG_SAR2_REG) & SAR2_CPU_FREQ_MASK)
 		 >> SAR2_CPU_FREQ_OFFS) << 3;
 #endif
 	for (i = 0; sar_freq_tab[i].val != 0xff; i++) {
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index e6383d4a86e2..1210d26c7461 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -135,7 +135,7 @@
 #if defined(CONFIG_ARMADA_375)
 /* SAR values for Armada 375 */
 #define CONFIG_SAR_REG		(MVEBU_REGISTER(0xe8200))
-#define CONFIG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
+#define CFG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
 
 #define SAR_CPU_FREQ_OFFS	17
 #define SAR_CPU_FREQ_MASK	(0x1f << SAR_CPU_FREQ_OFFS)
@@ -174,7 +174,7 @@
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
 #define CONFIG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
-#define CONFIG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
+#define CFG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
 
 #define SAR_CPU_FREQ_OFFS	18
 #define SAR_CPU_FREQ_MASK	(0x7 << SAR_CPU_FREQ_OFFS)
@@ -192,7 +192,7 @@
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
 #define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
-#define CONFIG_SAR2_REG		(MVEBU_REGISTER(0x18234))
+#define CFG_SAR2_REG		(MVEBU_REGISTER(0x18234))
 
 #define SAR_CPU_FREQ_OFFS	21
 #define SAR_CPU_FREQ_MASK	(0x7 << SAR_CPU_FREQ_OFFS)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7af096ee8f63..ed50a507f270 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -179,7 +179,7 @@ CFG_ROOTPATH
 CFG_SANDBOX_ARCH
 CFG_SANDBOX_SPI_MAX_BUS
 CFG_SANDBOX_SPI_MAX_CS
-CONFIG_SAR2_REG
+CFG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
-- 
2.25.1

[PoC 171/241] global: Migrate CONFIG_SAR_REG to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-kirkwood/include/mach/kw88f6281.h |  2 +-
 arch/arm/mach-kirkwood/include/mach/soc.h       |  2 +-
 arch/arm/mach-mvebu/cpu.c                       |  4 ++--
 arch/arm/mach-mvebu/include/mach/soc.h          | 12 ++++++------
 scripts/config_whitelist.txt                    |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/mach-kirkwood/include/mach/kw88f6281.h b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
index 7f8e156a6bdc..67f0b3ec6772 100644
--- a/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
+++ b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
@@ -15,7 +15,7 @@
 #define KW_REGS_PHY_BASE		KW88F6281_REGS_PHYS_BASE
 
 /* TCLK Core Clock definition */
-#define CFG_SYS_TCLK			((readl(CONFIG_SAR_REG) & BIT(21)) ? \
+#define CFG_SYS_TCLK			((readl(CFG_SAR_REG) & BIT(21)) ? \
 					166666667 : 200000000)
 
 #endif /* _ASM_ARCH_KW88F6281_H */
diff --git a/arch/arm/mach-kirkwood/include/mach/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h
index 5f545c6f4349..4a7efc50f67a 100644
--- a/arch/arm/mach-kirkwood/include/mach/soc.h
+++ b/arch/arm/mach-kirkwood/include/mach/soc.h
@@ -62,7 +62,7 @@
 #define MVCPU_WIN_ENABLE	KWCPU_WIN_ENABLE
 #define MVCPU_WIN_DISABLE	KWCPU_WIN_DISABLE
 
-#define CONFIG_SAR_REG		(KW_MPP_BASE + 0x0030)
+#define CFG_SAR_REG		(KW_MPP_BASE + 0x0030)
 
 #if defined (CONFIG_KW88F6281)
 #include <asm/arch/kw88f6281.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 9139df1ae248..329d13691f0e 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -83,7 +83,7 @@ u32 get_boot_device(void)
 	/*
 	 * Now check the SAR register for the strapped boot-device
 	 */
-	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR_REG);	/* SAR - Sample At Reset */
 	boot_device = (val & BOOT_DEV_SEL_MASK) >> BOOT_DEV_SEL_OFFS;
 	debug("SAR_REG=0x%08x boot_device=0x%x\n", val, boot_device);
 	switch (boot_device) {
@@ -197,7 +197,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS)
 	val = readl(CFG_SAR2_REG);	/* SAR - Sample At Reset */
 #else
-	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR_REG);	/* SAR - Sample At Reset */
 #endif
 	freq = (val & SAR_CPU_FREQ_MASK) >> SAR_CPU_FREQ_OFFS;
 #if defined(SAR2_CPU_FREQ_MASK)
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index 1210d26c7461..6edd2e2d79c7 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -134,7 +134,7 @@
 
 #if defined(CONFIG_ARMADA_375)
 /* SAR values for Armada 375 */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0xe8200))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0xe8200))
 #define CFG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
 
 #define SAR_CPU_FREQ_OFFS	17
@@ -146,11 +146,11 @@
 #define BOOT_FROM_UART		0x30
 #define BOOT_FROM_SPI		0x38
 
-#define CFG_SYS_TCLK		((readl(CONFIG_SAR_REG) & BIT(20)) ? \
+#define CFG_SYS_TCLK		((readl(CFG_SAR_REG) & BIT(20)) ? \
 				 200000000 : 166000000)
 #elif defined(CONFIG_ARMADA_38X)
 /* SAR values for Armada 38x */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18600))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0x18600))
 
 #define SAR_CPU_FREQ_OFFS	10
 #define SAR_CPU_FREQ_MASK	(0x1f << SAR_CPU_FREQ_OFFS)
@@ -169,11 +169,11 @@
 #define BOOT_FROM_MMC		0x30
 #define BOOT_FROM_MMC_ALT	0x31
 
-#define CFG_SYS_TCLK		((readl(CONFIG_SAR_REG) & BIT(15)) ? \
+#define CFG_SYS_TCLK		((readl(CFG_SAR_REG) & BIT(15)) ? \
 				 200000000 : 250000000)
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
-#define CONFIG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
+#define CFG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
 #define CFG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
 
 #define SAR_CPU_FREQ_OFFS	18
@@ -191,7 +191,7 @@
 #define CFG_SYS_TCLK		200000000	/* 200MHz */
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0x18230))
 #define CFG_SAR2_REG		(MVEBU_REGISTER(0x18234))
 
 #define SAR_CPU_FREQ_OFFS	21
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ed50a507f270..bdb3b68f8c80 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -180,7 +180,7 @@ CFG_SANDBOX_ARCH
 CFG_SANDBOX_SPI_MAX_BUS
 CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
-CONFIG_SAR_REG
+CFG_SAR_REG
 CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
-- 
2.25.1

[PoC 172/241] global: Migrate CONFIG_SCIF_A to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/serial_sh.c   | 2 +-
 drivers/serial/serial_sh.h   | 8 ++++----
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e6c23cedff11..4671217b59a0 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -274,7 +274,7 @@ U_BOOT_DRIVER(serial_sh) = {
 # error "Default SCIF doesn't set....."
 #endif
 
-#if defined(CONFIG_SCIF_A)
+#if defined(CFG_SCIF_A)
 	#define SCIF_BASE_PORT	PORT_SCIFA
 #elif defined(CONFIG_SCI)
 	#define SCIF_BASE_PORT  PORT_SCI
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index 11deaa951168..e6ab6f1b9b76 100644
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -92,7 +92,7 @@ struct uart_port {
 # define SCIF_ORER 0x0001  /* overrun error bit */
 #elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) || \
       defined(CONFIG_R7S72100)
-# if defined(CONFIG_SCIF_A)
+# if defined(CFG_SCIF_A)
 #  define SCIF_ORER	0x0200
 # else
 #  define SCIF_ORER	0x0001
@@ -164,7 +164,7 @@ struct uart_port {
 # define SCIF2_TXROOM_MAX 16
 #elif defined(CONFIG_RCAR_GEN2)
 # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
-# if defined(CONFIG_SCIF_A)
+# if defined(CFG_SCIF_A)
 #  define SCIF_RFDC_MASK	0x007f
 # else
 #  define SCIF_RFDC_MASK	0x001f
@@ -380,7 +380,7 @@ SCIF_FNS(SCFDR,  0,  0, 0x1C, 16)
 SCIF_FNS(SCSPTR, 0,  0, 0x20, 16)
 SCIF_FNS(DL,     0,  0, 0x30, 16)
 SCIF_FNS(CKS,    0,  0, 0x34, 16)
-#if defined(CONFIG_SCIF_A)
+#if defined(CFG_SCIF_A)
 SCIF_FNS(SCLSR,  0,  0, 0x14, 16)
 #else
 SCIF_FNS(SCLSR,  0,  0, 0x24, 16)
@@ -491,7 +491,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk)
 #define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk)
 #elif defined(CONFIG_RCAR_GEN2)
 #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */
- #if defined(CONFIG_SCIF_A)
+ #if defined(CFG_SCIF_A)
   #define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */
  #else
   #define SCBRR_VALUE(bps, clk) (clk / bps / 32 - 1) /* Internal Clock */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 5058e0a204d7..be9013bcf93d 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -23,7 +23,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SCIF */
-#define CONFIG_SCIF_A
+#define CFG_SCIF_A
 
 /* SPI */
 #define CONFIG_SPI_FLASH_QUAD
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bdb3b68f8c80..d77171c2c553 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -181,7 +181,7 @@ CFG_SANDBOX_SPI_MAX_BUS
 CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
 CFG_SAR_REG
-CONFIG_SCIF_A
+CFG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
-- 
2.25.1

[PoC 173/241] global: Migrate CONFIG_SCSI_DEV_LIST to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/scsi/scsi.c          | 4 ++--
 include/configs/ls1021aiot.h | 2 +-
 include/configs/ls1028ardb.h | 2 +-
 include/configs/ls1043ardb.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 3e769b0843f0..a020a7da23a5 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -18,8 +18,8 @@
 #include <dm/uclass-internal.h>
 
 #if !defined(CONFIG_DM_SCSI)
-# ifdef CONFIG_SCSI_DEV_LIST
-#  define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST
+# ifdef CFG_SCSI_DEV_LIST
+#  define SCSI_DEV_LIST CFG_SCSI_DEV_LIST
 # else
 #  ifdef CONFIG_SATA_ULI5288
 
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index cc6d07b40620..d6122856f069 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -61,7 +61,7 @@
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440
 #endif
-#define CONFIG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
+#define CFG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
 	PCI_DEVICE_ID_FREESCALE_AHCI}
 
 /* SPI */
diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 8c53636beac3..ee4f885c5341 100644
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -52,7 +52,7 @@
 /* SATA */
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index ec81b3ca5b36..da84e517b127 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -210,7 +210,7 @@
 #ifndef SPL_NO_SATA
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 #endif
 
 #include <asm/fsl_secure_boot.h>
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d77171c2c553..179d6918cd64 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -182,7 +182,7 @@ CFG_SANDBOX_SPI_MAX_CS
 CFG_SAR2_REG
 CFG_SAR_REG
 CFG_SCIF_A
-CONFIG_SCSI_DEV_LIST
+CFG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
 CONFIG_SERVERIP
-- 
2.25.1

[PoC 174/241] global: Migrate CONFIG_SC_TIMER_CLK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-imx/syscounter.c | 2 +-
 include/configs/mx6_common.h   | 2 +-
 include/configs/mx7_common.h   | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index df478a232637..129efac6fa69 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -65,7 +65,7 @@ int timer_init(void)
 	struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
 	unsigned long val, freq;
 
-	freq = CONFIG_SC_TIMER_CLK;
+	freq = CFG_SC_TIMER_CLK;
 	asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
 
 	writel(freq, &sctr->cntfid0);
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 1e99cdc7df4d..8129be9e88ea 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -9,7 +9,7 @@
 #include <linux/stringify.h>
 
 #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL))
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #else
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CFG_SYS_PL310_BASE	L2_PL310_BASE
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 3a5917fed4b8..dfba95b769cc 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -15,7 +15,7 @@
 
 /* Timer settings */
 #define CFG_MXC_GPT_HCLK
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 179d6918cd64..b45fcaa9432c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -183,7 +183,7 @@ CFG_SAR2_REG
 CFG_SAR_REG
 CFG_SCIF_A
 CFG_SCSI_DEV_LIST
-CONFIG_SC_TIMER_CLK
+CFG_SC_TIMER_CLK
 CONFIG_SERIAL_BOOT
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
-- 
2.25.1

[PoC 175/241] global: Migrate CONFIG_SERIAL_BOOT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/m68k/cpu/mcf5445x/cpu_init.c |  2 +-
 arch/m68k/cpu/mcf5445x/start.S    | 10 +++++-----
 include/configs/stmark2.h         |  2 +-
 scripts/config_whitelist.txt      |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 1ce244872f14..257af6c965d2 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -28,7 +28,7 @@ void init_fbcs(void)
 {
 	fbcs_t *fbcs __maybe_unused = (fbcs_t *) MMAP_FBCS;
 
-#if !defined(CONFIG_SERIAL_BOOT)
+#if !defined(CFG_SERIAL_BOOT)
 #if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && defined(CFG_SYS_CS0_CTRL))
 	out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE);
 	out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL);
diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
index a083c3d45d27..0beacb38dfbb 100644
--- a/arch/m68k/cpu/mcf5445x/start.S
+++ b/arch/m68k/cpu/mcf5445x/start.S
@@ -25,7 +25,7 @@
 	addl	#60,%sp;		/* space for 15 regs */ \
 	rte;
 
-#if defined(CONFIG_SERIAL_BOOT)
+#if defined(CFG_SERIAL_BOOT)
 #define ASM_DRAMINIT	(asm_dram_init - CONFIG_TEXT_BASE + \
 	CFG_SYS_INIT_RAM_ADDR)
 #define ASM_DRAMINIT_N	(asm_dram_init - CONFIG_TEXT_BASE)
@@ -40,7 +40,7 @@
  * These vectors are to catch any un-intended traps.
  */
 _vectors:
-#if defined(CONFIG_SERIAL_BOOT)
+#if defined(CFG_SERIAL_BOOT)
 
 INITSP:	.long	0			/* Initial SP	*/
 #ifdef CONFIG_CF_SBF
@@ -68,7 +68,7 @@ vector10_17:
 vector18_1F:
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 
-#if !defined(CONFIG_SERIAL_BOOT)
+#if !defined(CFG_SERIAL_BOOT)
 
 /* TRAP #0 - #15 */
 vector20_2F:
@@ -111,7 +111,7 @@ vector192_255:
 .long	_FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT
 #endif
 
-#if defined(CONFIG_SERIAL_BOOT)
+#if defined(CFG_SERIAL_BOOT)
 	/* Image header: chksum 4 bytes, len 4 bytes, img dest 4 bytes */
 asm_sbf_img_hdr:
 	.long	0x00000000		/* checksum, not yet implemented */
@@ -436,7 +436,7 @@ asm_delay:
 	. = 0x400
 .globl _start
 _start:
-#if !defined(CONFIG_SERIAL_BOOT)
+#if !defined(CFG_SERIAL_BOOT)
 	nop
 	nop
 	move.w	#0x2700,%sr		/* Mask off Interrupt */
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 3b4743905596..ca3eb6a31b1e 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -64,7 +64,7 @@
 #define CFG_SYS_DRAM_TEST
 
 #if defined(CONFIG_CF_SBF)
-#define CONFIG_SERIAL_BOOT
+#define CFG_SERIAL_BOOT
 #endif
 
 /* Reserve 256 kB for Monitor */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b45fcaa9432c..0d58f8ff0a1b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -184,7 +184,7 @@ CFG_SAR_REG
 CFG_SCIF_A
 CFG_SCSI_DEV_LIST
 CFG_SC_TIMER_CLK
-CONFIG_SERIAL_BOOT
+CFG_SERIAL_BOOT
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
 CONFIG_SET_DFU_ALT_BUF_LEN
-- 
2.25.1

[PoC 176/241] global: Migrate CONFIG_SERVERIP to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                             |  2 +-
 doc/README.usb                     |  2 +-
 include/configs/M5208EVBE.h        |  2 +-
 include/configs/M5235EVB.h         |  2 +-
 include/configs/M5272C3.h          |  2 +-
 include/configs/M5282EVB.h         |  2 +-
 include/configs/M53017EVB.h        |  2 +-
 include/configs/M5329EVB.h         |  2 +-
 include/configs/M5373EVB.h         |  2 +-
 include/configs/MCR3000.h          |  2 +-
 include/configs/MPC8548CDS.h       |  2 +-
 include/configs/apalis-imx8.h      |  2 +-
 include/configs/apalis-tk1.h       |  4 ++--
 include/configs/apalis_imx6.h      |  4 ++--
 include/configs/cobra5272.h        |  2 +-
 include/configs/colibri-imx6ull.h  |  2 +-
 include/configs/colibri-imx8x.h    |  2 +-
 include/configs/colibri_imx6.h     |  4 ++--
 include/configs/colibri_imx7.h     |  2 +-
 include/configs/colibri_vf.h       |  2 +-
 include/configs/gw_ventana.h       |  2 +-
 include/configs/integratorcp.h     |  2 +-
 include/configs/mt7622.h           |  2 +-
 include/configs/mt7623.h           |  2 +-
 include/configs/mt7629.h           |  2 +-
 include/configs/mvebu_alleycat-5.h |  2 +-
 include/configs/poleg.h            |  2 +-
 include/configs/stm32mp15_common.h |  2 +-
 include/configs/uniphier.h         |  2 +-
 include/env_default.h              |  4 ++--
 net/bootp.c                        | 10 +++++-----
 scripts/config_whitelist.txt       |  2 +-
 32 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/README b/README
index 903bd1d8ff2d..aa989f67e2c0 100644
--- a/README
+++ b/README
@@ -743,7 +743,7 @@ The following options need to be configured:
 		(Environment variable "ipaddr")
 
 - Server IP address:
-		CONFIG_SERVERIP
+		CFG_SERVERIP
 
 		Defines a default value for the IP address of a TFTP
 		server to contact when using the "tftboot" command.
diff --git a/doc/README.usb b/doc/README.usb
index 495b1859a771..431942fbc32c 100644
--- a/doc/README.usb
+++ b/doc/README.usb
@@ -163,7 +163,7 @@ and all the parameters can either get stored in the board's external
 environment, or get obtained from the bootp server if not set.
 
 #define CFG_IPADDR		10.0.0.2  (replace with your value)
-#define CONFIG_SERVERIP		10.0.0.1  (replace with your value)
+#define CFG_SERVERIP		10.0.0.1  (replace with your value)
 #define CONFIG_BOOTFILE		"uImage"
 
 The 'usb start' command should identify the adapter something like this:
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 8eb5f7084f86..efbdc4c28afa 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -20,7 +20,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index b42177688427..ff99b6ab857d 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -29,7 +29,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 043e188189e1..fcd3106ccb6d 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -32,7 +32,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 88e3d72ef67f..adcaa164d3e0 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -32,7 +32,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 35c37a4449b1..c86eef2210e2 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -33,7 +33,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 8bb270ce6797..cc65740957a0 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -25,7 +25,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 1f904efa84bb..c2171281eab7 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -27,7 +27,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CFG_IPADDR	192.162.1.2
 #	define CFG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
+#	define CFG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 1248b367ae62..f5c887714f39 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -53,7 +53,7 @@
 		"bootm ${loadaddr} - 0xf00000\0"
 
 #define CFG_IPADDR			192.168.0.3
-#define CONFIG_SERVERIP			192.168.0.1
+#define CFG_SERVERIP			192.168.0.1
 #define CFG_NETMASK			255.0.0.0
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index d752a9050001..d47378e19352 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -331,7 +331,7 @@
 #define CFG_ROOTPATH	 "/nfsroot"
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
-#define CONFIG_SERVERIP	 192.168.1.1
+#define CFG_SERVERIP	 192.168.1.1
 #define CFG_GATEWAYIP 192.168.1.1
 #define CFG_NETMASK	 255.255.255.0
 
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 8f7841163936..580d2e3020ed 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -16,7 +16,7 @@
 /* Networking */
 #define CFG_IPADDR			192.168.10.2
 #define CFG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
+#define CFG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"fdt_addr_r=0x84000000\0" \
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 387fb3f69c83..7fd99ea907d1 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -36,8 +36,8 @@
 #undef CFG_IPADDR
 #define CFG_IPADDR		192.168.10.2
 #define CFG_NETMASK		255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP		192.168.10.1
+#undef CFG_SERVERIP
+#define CFG_SERVERIP		192.168.10.1
 
 #define DFU_ALT_EMMC_INFO	"apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \
 				"boot part 0 1 mmcpart 0; " \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 4f2addd42d8b..02de22ce6a24 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -38,8 +38,8 @@
 #undef CFG_IPADDR
 #define CFG_IPADDR			192.168.10.2
 #define CFG_NETMASK			255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP			192.168.10.1
+#undef CFG_SERVERIP
+#define CFG_SERVERIP			192.168.10.1
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index b0acdb2e7d62..df24e3014f00 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -71,7 +71,7 @@ enter a valid image address in flash */
 /* User network settings */
 
 #define CFG_IPADDR 192.168.100.2		/* default board IP address */
-#define CONFIG_SERVERIP 192.168.100.1	/* default tftp server IP address */
+#define CFG_SERVERIP 192.168.100.1	/* default tftp server IP address */
 
 #endif
 
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 3cf56e98faf8..b744ae1d6e85 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -22,7 +22,7 @@
 
 #define CFG_IPADDR			192.168.10.2
 #define CFG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
+#define CFG_SERVERIP			192.168.10.1
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC)
 #define UBOOT_UPDATE \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 0c879cc06bc7..fc8da4f9e358 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -16,7 +16,7 @@
 
 #define CFG_IPADDR			192.168.10.2
 #define CFG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
+#define CFG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"fdt_addr_r=0x83000000\0" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index c0d5e6f0aa06..e34d933abae2 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -33,8 +33,8 @@
 #undef CFG_IPADDR
 #define CFG_IPADDR			192.168.10.2
 #define CFG_NETMASK			255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP			192.168.10.1
+#undef CFG_SERVERIP
+#define CFG_SERVERIP			192.168.10.1
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index fdaeb6588146..8efcc8c17b3d 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -23,7 +23,7 @@
 
 #define CFG_IPADDR			192.168.10.2
 #define CFG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
+#define CFG_SERVERIP			192.168.10.1
 
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
 #define UBOOT_UPDATE \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 3da98a5165e4..83c79aa53fcb 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -18,7 +18,7 @@
 
 #define CFG_IPADDR		192.168.10.2
 #define CFG_NETMASK		255.255.255.0
-#define CONFIG_SERVERIP		192.168.10.1
+#define CFG_SERVERIP		192.168.10.1
 
 #define CFG_FDTADDR			0x84000000
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index d82856f5eb10..4d0acdd0f3b6 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -58,6 +58,6 @@
 
 /* Environment */
 #define CFG_IPADDR             192.168.1.1
-#define CONFIG_SERVERIP           192.168.1.146
+#define CFG_SERVERIP           192.168.1.146
 
 #endif			       /* __CONFIG_H */
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index ccf73604480b..d1b2d938ff9f 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -19,7 +19,7 @@
 /* Integrator CP-specific configuration */
 #define CFG_SYS_HZ_CLOCK		1000000	/* Timer 1 is clocked at 1Mhz */
 
-#define CONFIG_SERVERIP 192.168.1.100
+#define CFG_SERVERIP 192.168.1.100
 #define CFG_IPADDR 192.168.1.104
 
 /*
diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index 199da46ad018..f0459f1e44ed 100644
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -19,6 +19,6 @@
 
 /* Ethernet */
 #define CFG_IPADDR			192.168.1.1
-#define CONFIG_SERVERIP			192.168.1.3
+#define CFG_SERVERIP			192.168.1.3
 
 #endif
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index d3cf6597a633..b279fb44cfb7 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -34,7 +34,7 @@
 
 /* Ethernet */
 #define CFG_IPADDR			192.168.1.1
-#define CONFIG_SERVERIP			192.168.1.2
+#define CFG_SERVERIP			192.168.1.2
 
 #ifdef CONFIG_DISTRO_DEFAULTS
 
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 8c0b02b40e50..d7700673f6f7 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -29,6 +29,6 @@
 
 /* Ethernet */
 #define CFG_IPADDR			192.168.1.1
-#define CONFIG_SERVERIP			192.168.1.2
+#define CFG_SERVERIP			192.168.1.2
 
 #endif
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 10db30cd5366..3b0b269b3ad3 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -16,7 +16,7 @@
 
 /* Default Env vars */
 #define CFG_IPADDR           0.0.0.0 /* In order to cause an error */
-#define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
+#define CFG_SERVERIP         0.0.0.0 /* In order to cause an error */
 #define CFG_NETMASK          255.255.255.0
 #define CFG_GATEWAYIP        0.0.0.0
 #define CFG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index e824af8273a1..af0ed0002c83 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE           0x0
 
 /* Default environemnt variables */
-#define CONFIG_SERVERIP                 192.168.0.1
+#define CFG_SERVERIP                 192.168.0.1
 #define CFG_IPADDR                   192.168.0.2
 #define CFG_NETMASK                  255.255.255.0
 #define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index ec8c8fba91f1..85ddf1750768 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -25,7 +25,7 @@
 
 /* Ethernet need */
 #ifdef CONFIG_DWC_ETH_QOS
-#define CONFIG_SERVERIP                 192.168.1.1
+#define CFG_SERVERIP                 192.168.1.1
 #endif
 
 #define STM32MP_FIP_IMAGE_GUID \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 47086a7c9cc8..6ea5f2f83784 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -46,7 +46,7 @@
 /*
  * Network Configuration
  */
-#define CONFIG_SERVERIP			192.168.11.1
+#define CFG_SERVERIP			192.168.11.1
 #define CFG_IPADDR			192.168.11.10
 #define CFG_GATEWAYIP		192.168.11.1
 #define CFG_NETMASK			255.255.255.0
diff --git a/include/env_default.h b/include/env_default.h
index 06cf3e36d692..95e00c27f0b6 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -56,8 +56,8 @@ const char default_environment[] = {
 #ifdef	CFG_IPADDR
 	"ipaddr="	__stringify(CFG_IPADDR)	"\0"
 #endif
-#ifdef	CONFIG_SERVERIP
-	"serverip="	__stringify(CONFIG_SERVERIP)	"\0"
+#ifdef	CFG_SERVERIP
+	"serverip="	__stringify(CFG_SERVERIP)	"\0"
 #endif
 #ifdef	CONFIG_SYS_DISABLE_AUTOLOAD
 	"autoload=0\0"
diff --git a/net/bootp.c b/net/bootp.c
index 6c01e3815320..61cf853059bd 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -183,7 +183,7 @@ static void store_bootp_params(struct bootp_hdr *bp)
  */
 static void store_net_params(struct bootp_hdr *bp)
 {
-#if !defined(CONFIG_SERVERIP_FROM_PROXYDHCP)
+#if !defined(CFG_SERVERIP_FROM_PROXYDHCP)
 	store_bootp_params(bp);
 #endif
 	net_copy_ip(&net_ip, &bp->bp_yiaddr);
@@ -1056,7 +1056,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 	      "%d\n", src, dest, len, dhcp_state);
 
 	if (net_read_ip(&bp->bp_yiaddr).s_addr == 0) {
-#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP)
+#if defined(CFG_SERVERIP_FROM_PROXYDHCP)
 		store_bootp_params(bp);
 #endif
 		return;
@@ -1081,11 +1081,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 			    CONFIG_IS_ENABLED(NET_DEVICES))
 				efi_net_set_dhcp_ack(pkt, len);
 
-#if defined(CONFIG_SERVERIP_FROM_PROXYDHCP)
+#if defined(CFG_SERVERIP_FROM_PROXYDHCP)
 			if (!net_server_ip.s_addr)
-				udelay(CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS *
+				udelay(CFG_SERVERIP_FROM_PROXYDHCP_DELAY_MS *
 					1000);
-#endif	/* CONFIG_SERVERIP_FROM_PROXYDHCP */
+#endif	/* CFG_SERVERIP_FROM_PROXYDHCP */
 
 			debug("TRANSITIONING TO REQUESTING STATE\n");
 			dhcp_state = REQUESTING;
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0d58f8ff0a1b..9abd8a58bc37 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -185,7 +185,7 @@ CFG_SCIF_A
 CFG_SCSI_DEV_LIST
 CFG_SC_TIMER_CLK
 CFG_SERIAL_BOOT
-CONFIG_SERVERIP
+CFG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
 CONFIG_SET_DFU_ALT_BUF_LEN
 CONFIG_SH_ETHER_ALIGNE_SIZE
-- 
2.25.1

[PoC 177/241] global: Migrate CONFIG_SETUP_INITRD_TAG to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/legoev3.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 3a0622ab0b3b..15864f20350d 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -48,7 +48,7 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_SETUP_INITRD_TAG
+#define CFG_SETUP_INITRD_TAG
 #define CFG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
 	"fdtfile=da850-lego-ev3.dtb\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9abd8a58bc37..c8e2d10fe0be 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -186,7 +186,7 @@ CFG_SCSI_DEV_LIST
 CFG_SC_TIMER_CLK
 CFG_SERIAL_BOOT
 CFG_SERVERIP
-CONFIG_SETUP_INITRD_TAG
+CFG_SETUP_INITRD_TAG
 CONFIG_SET_DFU_ALT_BUF_LEN
 CONFIG_SH_ETHER_ALIGNE_SIZE
 CONFIG_SH_ETHER_CACHE_INVALIDATE
-- 
2.25.1

[PoC 178/241] global: Migrate CONFIG_SET_DFU_ALT_BUF_LEN to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/misc.c  | 2 +-
 include/configs/odroid.h     | 2 +-
 include/configs/odroid_xu3.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 9c0ec29c937b..5ffa216e2e5d 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_SET_DFU_ALT_INFO
 void set_dfu_alt_info(char *interface, char *devstr)
 {
-	size_t buf_size = CONFIG_SET_DFU_ALT_BUF_LEN;
+	size_t buf_size = CFG_SET_DFU_ALT_BUF_LEN;
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, buf_size);
 	char *alt_info = "Settings not found!";
 	char *status = "error!\n";
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 3ac13a65d63f..560a23c23efb 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -37,7 +37,7 @@
 	""PARTS_BOOT" part 0 1;" \
 	""PARTS_ROOT" part 0 2\0" \
 
-#define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 #define CFG_DFU_ALT_BOOT_EMMC \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 93f88ef53eba..e8ec504c355e 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -57,7 +57,7 @@
 	"params.bin raw 0x1880 0x20\0"
 
 /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */
-#define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
 #define CFG_ODROID_REV_AIN		9
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c8e2d10fe0be..6ffe0779b47d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -187,7 +187,7 @@ CFG_SC_TIMER_CLK
 CFG_SERIAL_BOOT
 CFG_SERVERIP
 CFG_SETUP_INITRD_TAG
-CONFIG_SET_DFU_ALT_BUF_LEN
+CFG_SET_DFU_ALT_BUF_LEN
 CONFIG_SH_ETHER_ALIGNE_SIZE
 CONFIG_SH_ETHER_CACHE_INVALIDATE
 CONFIG_SH_ETHER_CACHE_WRITEBACK
-- 
2.25.1

[PoC 179/241] global: Migrate CONFIG_SH_ETHER_ALIGNE_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sh_eth.c         |  4 ++--
 drivers/net/sh_eth.h         | 16 ++++++++--------
 include/configs/alt.h        |  2 +-
 include/configs/condor.h     |  2 +-
 include/configs/gose.h       |  2 +-
 include/configs/grpeach.h    |  2 +-
 include/configs/koelsch.h    |  2 +-
 include/configs/lager.h      |  2 +-
 include/configs/porter.h     |  2 +-
 include/configs/silk.h       |  2 +-
 include/configs/stout.h      |  2 +-
 scripts/config_whitelist.txt |  2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 1de3ff8add2c..0f91ad4128cd 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -43,7 +43,7 @@
 	!CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define flush_cache_wback(addr, len)    \
 		flush_dcache_range((unsigned long)addr, \
-		(unsigned long)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE)))
+		(unsigned long)(addr + ALIGN(len, CFG_SH_ETHER_ALIGNE_SIZE)))
 #else
 #define flush_cache_wback(...)
 #endif
@@ -51,7 +51,7 @@
 #if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
 #define invalidate_cache(addr, len)		\
 	{	\
-		unsigned long line_size = CONFIG_SH_ETHER_ALIGNE_SIZE;	\
+		unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE;	\
 		unsigned long start, end;	\
 		\
 		start = (unsigned long)addr;	\
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 520f7f732574..1c07610e1ac7 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -29,8 +29,8 @@
 #endif /* defined(CONFIG_SH) */
 
 /* base padding size is 16 */
-#ifndef CONFIG_SH_ETHER_ALIGNE_SIZE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE 16
+#ifndef CFG_SH_ETHER_ALIGNE_SIZE
+#define CFG_SH_ETHER_ALIGNE_SIZE 16
 #endif
 
 /* Number of supported ports */
@@ -47,7 +47,7 @@
 
 /* The size of the tx descriptor is determined by how much padding is used.
    4, 20, or 52 bytes of padding can be used */
-#define TX_DESC_PADDING	(CONFIG_SH_ETHER_ALIGNE_SIZE - 12)
+#define TX_DESC_PADDING	(CFG_SH_ETHER_ALIGNE_SIZE - 12)
 
 /* Tx descriptor. We always use 3 bytes of padding */
 struct tx_desc_s {
@@ -62,9 +62,9 @@ struct tx_desc_s {
 
 /* The size of the rx descriptor is determined by how much padding is used.
    4, 20, or 52 bytes of padding can be used */
-#define RX_DESC_PADDING	(CONFIG_SH_ETHER_ALIGNE_SIZE - 12)
+#define RX_DESC_PADDING	(CFG_SH_ETHER_ALIGNE_SIZE - 12)
 /* aligned cache line size */
-#define RX_BUF_ALIGNE_SIZE	(CONFIG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)
+#define RX_BUF_ALIGNE_SIZE	(CFG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)
 
 /* Rx descriptor. We always use 4 bytes of padding */
 struct rx_desc_s {
@@ -388,11 +388,11 @@ enum DMAC_M_BIT {
 #endif
 };
 
-#if CONFIG_SH_ETHER_ALIGNE_SIZE == 64
+#if CFG_SH_ETHER_ALIGNE_SIZE == 64
 # define EMDR_DESC EDMR_DL1
-#elif CONFIG_SH_ETHER_ALIGNE_SIZE == 32
+#elif CFG_SH_ETHER_ALIGNE_SIZE == 32
 # define EMDR_DESC EDMR_DL0
-#elif CONFIG_SH_ETHER_ALIGNE_SIZE == 16 /* Default */
+#elif CFG_SH_ETHER_ALIGNE_SIZE == 16 /* Default */
 # define EMDR_DESC 0
 #endif
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 6d530f6d24bc..846e755f1b62 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -29,7 +29,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 819184996e69..6d7c788163d3 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -19,7 +19,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 /* XTAL_CLK : 33.33MHz */
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45f0ec6f6a0e..93157de470bd 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index dd6b22de7bac..5b91e6ff039b 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -22,6 +22,6 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 #endif	/* __GRPEACH_H */
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 61ff80d2c983..ff02a875013c 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 777d5b94d1cd..83e8705dfe76 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 969e175883bb..ec70c76f46b0 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -30,7 +30,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 025d56671122..4da7e7141336 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -30,7 +30,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/stout.h b/include/configs/stout.h
index be9013bcf93d..a071d1425bb3 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -34,7 +34,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6ffe0779b47d..0c8b3c62f23b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -188,7 +188,7 @@ CFG_SERIAL_BOOT
 CFG_SERVERIP
 CFG_SETUP_INITRD_TAG
 CFG_SET_DFU_ALT_BUF_LEN
-CONFIG_SH_ETHER_ALIGNE_SIZE
+CFG_SH_ETHER_ALIGNE_SIZE
 CONFIG_SH_ETHER_CACHE_INVALIDATE
 CONFIG_SH_ETHER_CACHE_WRITEBACK
 CONFIG_SH_ETHER_PHY_ADDR
-- 
2.25.1

[PoC 180/241] global: Migrate CONFIG_SH_ETHER_CACHE_INVALIDATE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sh_eth.c         | 2 +-
 include/configs/alt.h        | 2 +-
 include/configs/condor.h     | 2 +-
 include/configs/gose.h       | 2 +-
 include/configs/grpeach.h    | 2 +-
 include/configs/koelsch.h    | 2 +-
 include/configs/lager.h      | 2 +-
 include/configs/porter.h     | 2 +-
 include/configs/silk.h       | 2 +-
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 0f91ad4128cd..38049b380d7c 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -48,7 +48,7 @@
 #define flush_cache_wback(...)
 #endif
 
-#if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
+#if defined(CFG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
 #define invalidate_cache(addr, len)		\
 	{	\
 		unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE;	\
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 846e755f1b62..940169b42043 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -28,7 +28,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 6d7c788163d3..fa3edef9b300 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -18,7 +18,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 93157de470bd..e54f4b24e048 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 5b91e6ff039b..5ae17f70e909 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -21,7 +21,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 #endif	/* __GRPEACH_H */
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index ff02a875013c..1d8aa6def88f 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 83e8705dfe76..bb8cc5fecb7a 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/porter.h b/include/configs/porter.h
index ec70c76f46b0..907cf29d0318 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -29,7 +29,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 4da7e7141336..7361daa27c49 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -29,7 +29,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index a071d1425bb3..b60e363b2c7c 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -33,7 +33,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0c8b3c62f23b..8627d6a91aa6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -189,7 +189,7 @@ CFG_SERVERIP
 CFG_SETUP_INITRD_TAG
 CFG_SET_DFU_ALT_BUF_LEN
 CFG_SH_ETHER_ALIGNE_SIZE
-CONFIG_SH_ETHER_CACHE_INVALIDATE
+CFG_SH_ETHER_CACHE_INVALIDATE
 CONFIG_SH_ETHER_CACHE_WRITEBACK
 CONFIG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
-- 
2.25.1

[PoC 181/241] global: Migrate CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 2 +-
 drivers/net/sh_eth.c         | 2 +-
 include/configs/alt.h        | 2 +-
 include/configs/condor.h     | 2 +-
 include/configs/gose.h       | 2 +-
 include/configs/grpeach.h    | 2 +-
 include/configs/koelsch.h    | 2 +-
 include/configs/lager.h      | 2 +-
 include/configs/porter.h     | 2 +-
 include/configs/silk.h       | 2 +-
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README b/README
index aa989f67e2c0..c35207cb2af5 100644
--- a/README
+++ b/README
@@ -553,7 +553,7 @@ The following options need to be configured:
 			CONFIG_SH_ETHER_PHY_ADDR
 			Define the ETH PHY's address
 
-			CONFIG_SH_ETHER_CACHE_WRITEBACK
+			CFG_SH_ETHER_CACHE_WRITEBACK
 			If this option is set, the driver enables cache flush.
 
 - TPM Support:
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 38049b380d7c..72fdf7ad89a1 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -39,7 +39,7 @@
 # error "Please define CONFIG_SH_ETHER_PHY_ADDR"
 #endif
 
-#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK) && \
+#if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \
 	!CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define flush_cache_wback(addr, len)    \
 		flush_dcache_range((unsigned long)addr, \
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 940169b42043..93aee6b6a460 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -27,7 +27,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/condor.h b/include/configs/condor.h
index fa3edef9b300..3f99cbf9dab9 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -17,7 +17,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/gose.h b/include/configs/gose.h
index e54f4b24e048..45a537341b0e 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -23,7 +23,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 5ae17f70e909..3fde61407094 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -20,7 +20,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 1d8aa6def88f..b3b6f03e08d4 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -23,7 +23,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index bb8cc5fecb7a..16d15ccdd913 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 907cf29d0318..7a1d9d48a150 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -28,7 +28,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 7361daa27c49..4edb1bc3c533 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -28,7 +28,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/stout.h b/include/configs/stout.h
index b60e363b2c7c..0004fb454c1e 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -32,7 +32,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8627d6a91aa6..bf1359f8df54 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -190,7 +190,7 @@ CFG_SETUP_INITRD_TAG
 CFG_SET_DFU_ALT_BUF_LEN
 CFG_SH_ETHER_ALIGNE_SIZE
 CFG_SH_ETHER_CACHE_INVALIDATE
-CONFIG_SH_ETHER_CACHE_WRITEBACK
+CFG_SH_ETHER_CACHE_WRITEBACK
 CONFIG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
 CONFIG_SH_ETHER_USE_PORT
-- 
2.25.1

[PoC 182/241] global: Migrate CONFIG_SH_ETHER_PHY_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 2 +-
 drivers/net/sh_eth.c         | 8 ++++----
 include/configs/alt.h        | 2 +-
 include/configs/condor.h     | 2 +-
 include/configs/gose.h       | 2 +-
 include/configs/grpeach.h    | 2 +-
 include/configs/koelsch.h    | 2 +-
 include/configs/lager.h      | 2 +-
 include/configs/porter.h     | 2 +-
 include/configs/silk.h       | 2 +-
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README b/README
index c35207cb2af5..0ae3c6b97c15 100644
--- a/README
+++ b/README
@@ -550,7 +550,7 @@ The following options need to be configured:
 			CONFIG_SH_ETHER_USE_PORT
 			Define the number of ports to be used
 
-			CONFIG_SH_ETHER_PHY_ADDR
+			CFG_SH_ETHER_PHY_ADDR
 			Define the ETH PHY's address
 
 			CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 72fdf7ad89a1..70ec27999062 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -35,8 +35,8 @@
 #ifndef CONFIG_SH_ETHER_USE_PORT
 # error "Please define CONFIG_SH_ETHER_USE_PORT"
 #endif
-#ifndef CONFIG_SH_ETHER_PHY_ADDR
-# error "Please define CONFIG_SH_ETHER_PHY_ADDR"
+#ifndef CFG_SH_ETHER_PHY_ADDR
+# error "Please define CFG_SH_ETHER_PHY_ADDR"
 #endif
 
 #if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \
@@ -636,7 +636,7 @@ int sh_eth_initialize(struct bd_info *bd)
 	memset(eth, 0, sizeof(struct sh_eth_dev));
 
 	eth->port = CONFIG_SH_ETHER_USE_PORT;
-	eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
+	eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
 	eth->port_info[eth->port].iobase =
 		(void __iomem *)(BASE_IO_ADDR + 0x800 * eth->port);
 
@@ -853,7 +853,7 @@ static int sh_ether_probe(struct udevice *udev)
 	priv->bus = miiphy_get_dev_by_name(udev->name);
 
 	eth->port = CONFIG_SH_ETHER_USE_PORT;
-	eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
+	eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
 	eth->port_info[eth->port].iobase =
 		(void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port);
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 93aee6b6a460..8dd4b101c668 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -25,7 +25,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 3f99cbf9dab9..43b88f127213 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -15,7 +15,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45a537341b0e..5184db41061f 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -21,7 +21,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 3fde61407094..8ba9b73672c8 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -18,7 +18,7 @@
 
 /* Network interface */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0
+#define CFG_SH_ETHER_PHY_ADDR	0
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index b3b6f03e08d4..2910336def6c 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -21,7 +21,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 16d15ccdd913..815239a73bd4 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -22,7 +22,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 7a1d9d48a150..8ba6a7d3bc8e 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -26,7 +26,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 4edb1bc3c533..df5f0a246241 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -26,7 +26,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 0004fb454c1e..a0a1c50cacdf 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -30,7 +30,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bf1359f8df54..1513dc9458e6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -191,7 +191,7 @@ CFG_SET_DFU_ALT_BUF_LEN
 CFG_SH_ETHER_ALIGNE_SIZE
 CFG_SH_ETHER_CACHE_INVALIDATE
 CFG_SH_ETHER_CACHE_WRITEBACK
-CONFIG_SH_ETHER_PHY_ADDR
+CFG_SH_ETHER_PHY_ADDR
 CONFIG_SH_ETHER_PHY_MODE
 CONFIG_SH_ETHER_USE_PORT
 CONFIG_SH_QSPI_BASE
-- 
2.25.1

[PoC 183/241] global: Migrate CONFIG_SH_ETHER_PHY_MODE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sh_eth.c         | 2 +-
 include/configs/alt.h        | 2 +-
 include/configs/condor.h     | 2 +-
 include/configs/gose.h       | 2 +-
 include/configs/grpeach.h    | 2 +-
 include/configs/koelsch.h    | 2 +-
 include/configs/lager.h      | 2 +-
 include/configs/porter.h     | 2 +-
 include/configs/silk.h       | 2 +-
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 70ec27999062..9bdc42ced24f 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -536,7 +536,7 @@ static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth)
 
 	phydev = phy_connect(
 			miiphy_get_dev_by_name(dev->name),
-			port_info->phy_addr, dev, CONFIG_SH_ETHER_PHY_MODE);
+			port_info->phy_addr, dev, CFG_SH_ETHER_PHY_MODE);
 	port_info->phydev = phydev;
 	phy_config(phydev);
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 8dd4b101c668..283af8a324e3 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -26,7 +26,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 43b88f127213..2c9817cf02c5 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -16,7 +16,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 5184db41061f..ed7dd70dd964 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -22,7 +22,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 8ba9b73672c8..6a11aa61f0fb 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -19,7 +19,7 @@
 /* Network interface */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 2910336def6c..31d0795f07fb 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -22,7 +22,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 815239a73bd4..991fc9020ee0 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -23,7 +23,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 8ba6a7d3bc8e..3b7dcd8e94b8 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -27,7 +27,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/silk.h b/include/configs/silk.h
index df5f0a246241..46615c46f6ec 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -27,7 +27,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/stout.h b/include/configs/stout.h
index a0a1c50cacdf..3bc569c908a0 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -31,7 +31,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1513dc9458e6..fa784171f026 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -192,7 +192,7 @@ CFG_SH_ETHER_ALIGNE_SIZE
 CFG_SH_ETHER_CACHE_INVALIDATE
 CFG_SH_ETHER_CACHE_WRITEBACK
 CFG_SH_ETHER_PHY_ADDR
-CONFIG_SH_ETHER_PHY_MODE
+CFG_SH_ETHER_PHY_MODE
 CONFIG_SH_ETHER_USE_PORT
 CONFIG_SH_QSPI_BASE
 CONFIG_SLIC
-- 
2.25.1

[PoC 184/241] global: Migrate CONFIG_SH_ETHER_USE_PORT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                       | 2 +-
 drivers/net/sh_eth.c         | 8 ++++----
 include/configs/alt.h        | 2 +-
 include/configs/condor.h     | 2 +-
 include/configs/gose.h       | 2 +-
 include/configs/grpeach.h    | 2 +-
 include/configs/koelsch.h    | 2 +-
 include/configs/lager.h      | 2 +-
 include/configs/porter.h     | 2 +-
 include/configs/silk.h       | 2 +-
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README b/README
index 0ae3c6b97c15..3eb882c6a248 100644
--- a/README
+++ b/README
@@ -547,7 +547,7 @@ The following options need to be configured:
 		CONFIG_SH_ETHER
 		Support for Renesas on-chip Ethernet controller
 
-			CONFIG_SH_ETHER_USE_PORT
+			CFG_SH_ETHER_USE_PORT
 			Define the number of ports to be used
 
 			CFG_SH_ETHER_PHY_ADDR
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 9bdc42ced24f..1775d801544c 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -32,8 +32,8 @@
 
 #include "sh_eth.h"
 
-#ifndef CONFIG_SH_ETHER_USE_PORT
-# error "Please define CONFIG_SH_ETHER_USE_PORT"
+#ifndef CFG_SH_ETHER_USE_PORT
+# error "Please define CFG_SH_ETHER_USE_PORT"
 #endif
 #ifndef CFG_SH_ETHER_PHY_ADDR
 # error "Please define CFG_SH_ETHER_PHY_ADDR"
@@ -635,7 +635,7 @@ int sh_eth_initialize(struct bd_info *bd)
 	memset(dev, 0, sizeof(struct eth_device));
 	memset(eth, 0, sizeof(struct sh_eth_dev));
 
-	eth->port = CONFIG_SH_ETHER_USE_PORT;
+	eth->port = CFG_SH_ETHER_USE_PORT;
 	eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
 	eth->port_info[eth->port].iobase =
 		(void __iomem *)(BASE_IO_ADDR + 0x800 * eth->port);
@@ -852,7 +852,7 @@ static int sh_ether_probe(struct udevice *udev)
 
 	priv->bus = miiphy_get_dev_by_name(udev->name);
 
-	eth->port = CONFIG_SH_ETHER_USE_PORT;
+	eth->port = CFG_SH_ETHER_USE_PORT;
 	eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
 	eth->port_info[eth->port].iobase =
 		(void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port);
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 283af8a324e3..45918c2af439 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -24,7 +24,7 @@
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 2c9817cf02c5..50c8d1733838 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -14,7 +14,7 @@
 /* Environment compatibility */
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/gose.h b/include/configs/gose.h
index ed7dd70dd964..7ae0726518da 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -20,7 +20,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512u * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 6a11aa61f0fb..8de4a36e931a 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_SDRAM_SIZE		(10 * 1024 * 1024)
 
 /* Network interface */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 31d0795f07fb..d47d70178ccd 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -20,7 +20,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 991fc9020ee0..2577c7a7da67 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -21,7 +21,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 3b7dcd8e94b8..1526f470e8e1 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -25,7 +25,7 @@
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 46615c46f6ec..c7346a356542 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -25,7 +25,7 @@
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 3bc569c908a0..910997e08c7e 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -29,7 +29,7 @@
 #define CONFIG_SPI_FLASH_QUAD
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fa784171f026..36cc068c4473 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -193,7 +193,7 @@ CFG_SH_ETHER_CACHE_INVALIDATE
 CFG_SH_ETHER_CACHE_WRITEBACK
 CFG_SH_ETHER_PHY_ADDR
 CFG_SH_ETHER_PHY_MODE
-CONFIG_SH_ETHER_USE_PORT
+CFG_SH_ETHER_USE_PORT
 CONFIG_SH_QSPI_BASE
 CONFIG_SLIC
 CONFIG_SMDK5420
-- 
2.25.1

[PoC 185/241] global: Migrate CONFIG_SH_QSPI_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/blanche.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index dc74ed3e79d6..5bc3df06aa11 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -23,7 +23,7 @@
 
 /* FLASH */
 #if !defined(CONFIG_MTD_NOR_FLASH)
-#define CONFIG_SH_QSPI_BASE	0xE6B10000
+#define CFG_SH_QSPI_BASE	0xE6B10000
 #else
 #define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BASE		0x00000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 36cc068c4473..8a23b09ef5c0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -194,7 +194,7 @@ CFG_SH_ETHER_CACHE_WRITEBACK
 CFG_SH_ETHER_PHY_ADDR
 CFG_SH_ETHER_PHY_MODE
 CFG_SH_ETHER_USE_PORT
-CONFIG_SH_QSPI_BASE
+CFG_SH_QSPI_BASE
 CONFIG_SLIC
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
-- 
2.25.1

[PoC 186/241] global: Migrate CONFIG_SLIC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 include/configs/p1_p2_rdb_pc.h              | 4 ++--
 scripts/config_whitelist.txt                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index ab7972442970..9e26c201b7a8 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -187,7 +187,7 @@ void board_gpio_init(void)
 	setbits_be32(&pgpio->gpdat, 0x00080000);
 #endif
 
-#ifdef CONFIG_SLIC
+#ifdef CFG_SLIC
 	/* reset SLIC */
 	setbits_be32(&pgpio->gpdir, 0x00040000);
 	setbits_be32(&pgpio->gpdat, 0x00040000);
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index ccc000227b19..4ab2efd528d1 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -13,7 +13,7 @@
 #include <linux/stringify.h>
 
 #if defined(CONFIG_TARGET_P1020RDB_PC)
-#define CONFIG_SLIC
+#define CFG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x5c
 #define __SW_BOOT_SPI		0x1c
@@ -42,7 +42,7 @@
  * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off
  */
 #if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_SLIC
+#define CFG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x64
 #define __SW_BOOT_SPI		0x34
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8a23b09ef5c0..c1129ffb9e53 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -195,7 +195,7 @@ CFG_SH_ETHER_PHY_ADDR
 CFG_SH_ETHER_PHY_MODE
 CFG_SH_ETHER_USE_PORT
 CFG_SH_QSPI_BASE
-CONFIG_SLIC
+CFG_SLIC
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
 CONFIG_SOCRATES
-- 
2.25.1

[PoC 187/241] global: Migrate CONFIG_SMDK5420 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/smdk5420.h   | 8 ++++----
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 0392530c0adf..e182625dd633 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -5,18 +5,18 @@
  * Configuration settings for the SAMSUNG SMDK5420 board.
  */
 
-#ifndef __CONFIG_SMDK5420_H
-#define __CONFIG_SMDK5420_H
+#ifndef __CFG_SMDK5420_H
+#define __CFG_SMDK5420_H
 
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_SMDK5420			/* which is in a SMDK5420 */
+#define CFG_SMDK5420			/* which is in a SMDK5420 */
 
 #define CFG_SYS_SDRAM_BASE	0x20000000
 
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */
 
-#endif	/* __CONFIG_SMDK5420_H */
+#endif	/* __CFG_SMDK5420_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c1129ffb9e53..4cf75324d291 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -196,7 +196,7 @@ CFG_SH_ETHER_PHY_MODE
 CFG_SH_ETHER_USE_PORT
 CFG_SH_QSPI_BASE
 CFG_SLIC
-CONFIG_SMDK5420
+CFG_SMDK5420
 CONFIG_SMP_PEN_ADDR
 CONFIG_SOCRATES
 CONFIG_SPI_ADDR
-- 
2.25.1

[PoC 188/241] global: Migrate CONFIG_SMP_PEN_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/nonsec_virt.S     | 4 ++--
 board/samsung/arndale/arndale.c      | 4 ++--
 include/configs/arndale.h            | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 2 +-
 include/configs/ls1021aiot.h         | 2 +-
 include/configs/ls1021aqds.h         | 2 +-
 include/configs/ls1021atwr.h         | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 51beda79c967..9794ade40463 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -205,11 +205,11 @@ ENTRY(_nonsec_init)
 	bx	lr
 ENDPROC(_nonsec_init)
 
-#ifdef CONFIG_SMP_PEN_ADDR
+#ifdef CFG_SMP_PEN_ADDR
 /* void __weak smp_waitloop(unsigned previous_address); */
 ENTRY(smp_waitloop)
 	wfi
-	ldr	r1, =CONFIG_SMP_PEN_ADDR	@ load start address
+	ldr	r1, =CFG_SMP_PEN_ADDR	@ load start address
 	ldr	r1, [r1]
 #ifdef CFG_PEN_ADDR_BIG_ENDIAN
 	rev	r1, r1
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index a992dc684291..3ebf600e1d7c 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -112,10 +112,10 @@ int checkboard(void)
 }
 #endif
 
-#ifdef CONFIG_SMP_PEN_ADDR
+#ifdef CFG_SMP_PEN_ADDR
 void smp_set_core_boot_addr(unsigned long addr, int corenr)
 {
-	writel(addr, CONFIG_SMP_PEN_ADDR);
+	writel(addr, CFG_SMP_PEN_ADDR);
 
 	/* make sure this write is really executed */
 	__asm__ volatile ("dsb\n");
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 8acc525b11c9..b56effcd411e 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -16,7 +16,7 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SMP_PEN_ADDR	0x02020000
+#define CFG_SMP_PEN_ADDR	0x02020000
 
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
 #define CFG_ARM_GIC_BASE_ADDRESS	0x10480000
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 7e850517494e..3b0ecf578063 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -164,7 +164,7 @@
 					{1, {I2C_NULL_HOP}                 }, \
 				}
 
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index d6122856f069..08532dc3e0aa 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -90,7 +90,7 @@
 #define FSL_PCIE_COMPAT		"fsl,ls1021a-pcie"
 
 #define CFG_PEN_ADDR_BIG_ENDIAN
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index ccbf7c2e70dc..498c89c3cf21 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -274,7 +274,7 @@
 #endif
 
 #define CFG_PEN_ADDR_BIG_ENDIAN
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index a554ee459042..128d80f48062 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -155,7 +155,7 @@
 /* GPIO */
 
 #define CFG_PEN_ADDR_BIG_ENDIAN
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4cf75324d291..fa6ceab52d5c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -197,7 +197,7 @@ CFG_SH_ETHER_USE_PORT
 CFG_SH_QSPI_BASE
 CFG_SLIC
 CFG_SMDK5420
-CONFIG_SMP_PEN_ADDR
+CFG_SMP_PEN_ADDR
 CONFIG_SOCRATES
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
-- 
2.25.1

[PoC 189/241] global: Migrate CONFIG_SOCRATES to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/socrates.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index eb5c14fff28e..ddbd257d08a5 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -17,7 +17,7 @@
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_SOCRATES		1
+#define CFG_SOCRATES		1
 
 /*
  * Only possible on E500 Version 2 or newer cores.
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fa6ceab52d5c..9f28554caab4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -198,7 +198,7 @@ CFG_SH_QSPI_BASE
 CFG_SLIC
 CFG_SMDK5420
 CFG_SMP_PEN_ADDR
-CONFIG_SOCRATES
+CFG_SOCRATES
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
-- 
2.25.1

[PoC 190/241] global: Migrate CONFIG_SPI_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/mt7629.h     | 4 ++--
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index d7700673f6f7..6fc851f2079c 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -17,8 +17,8 @@
 
 /* Defines for SPL */
 
-#define CONFIG_SPI_ADDR			0x30000000
-#define CFG_SYS_UBOOT_BASE		(CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
+#define CFG_SPI_ADDR			0x30000000
+#define CFG_SYS_UBOOT_BASE		(CFG_SPI_ADDR + CONFIG_SPL_PAD_TO)
 
 /* SPL -> Uboot */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9f28554caab4..9989d7052f14 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -199,7 +199,7 @@ CFG_SLIC
 CFG_SMDK5420
 CFG_SMP_PEN_ADDR
 CFG_SOCRATES
-CONFIG_SPI_ADDR
+CFG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
 CONFIG_SPI_FLASH_SIZE
-- 
2.25.1

[PoC 191/241] global: Migrate CONFIG_SPI_BOOTING to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/spl_boot.c     | 6 +++---
 include/configs/exynos5-dt-common.h | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 553dac75b61d..83bdee9f8579 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -94,7 +94,7 @@ static int config_branch_prediction(int set_cr_z)
 }
 #endif
 
-#ifdef CONFIG_SPI_BOOTING
+#ifdef CFG_SPI_BOOTING
 static void spi_rx_tx(struct exynos_spi *regs, int todo,
 			void *dinp, void const *doutp, int i)
 {
@@ -220,7 +220,7 @@ void copy_uboot_to_ram(void)
 
 	u32 (*copy_bl2)(u32 offset, u32 nblock, u32 dst) = NULL;
 	u32 offset = 0, size = 0;
-#ifdef CONFIG_SPI_BOOTING
+#ifdef CFG_SPI_BOOTING
 	struct spl_machine_param *param = spl_get_machine_params();
 #endif
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
@@ -248,7 +248,7 @@ void copy_uboot_to_ram(void)
 		bootmode = get_boot_mode();
 
 	switch (bootmode) {
-#ifdef CONFIG_SPI_BOOTING
+#ifdef CFG_SPI_BOOTING
 	case BOOT_MODE_SERIAL:
 		/* Customised function to copy u-boot from SF */
 		exynos_spi_copy(param->uboot_size, CONFIG_TEXT_BASE);
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index c9e0c13172cc..a0cdbd746a9a 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -17,6 +17,6 @@
 
 #define CFG_SYS_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(4 << 20)
-#define CONFIG_SPI_BOOTING
+#define CFG_SPI_BOOTING
 
 #endif
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9989d7052f14..cb15aa3c8f4e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -200,7 +200,7 @@ CFG_SMDK5420
 CFG_SMP_PEN_ADDR
 CFG_SOCRATES
 CFG_SPI_ADDR
-CONFIG_SPI_BOOTING
+CFG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
 CONFIG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
-- 
2.25.1

[PoC 192/241] global: Migrate CONFIG_SPI_FLASH_QUAD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/alt.h        | 2 +-
 include/configs/porter.h     | 2 +-
 include/configs/silk.h       | 2 +-
 include/configs/stout.h      | 2 +-
 scripts/config_whitelist.txt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 45918c2af439..1b29420db63d 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -21,7 +21,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD
 
 /* SH Ether */
 #define CFG_SH_ETHER_USE_PORT	0
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 1526f470e8e1..65d5eb95739f 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -22,7 +22,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(1024u * 1024 * 1024)
 
 /* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD
 
 /* SH Ether */
 #define CFG_SH_ETHER_USE_PORT	0
diff --git a/include/configs/silk.h b/include/configs/silk.h
index c7346a356542..be73a7f01ace 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -22,7 +22,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD
 
 /* SH Ether */
 #define CFG_SH_ETHER_USE_PORT	0
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 910997e08c7e..d9b8ebf311d9 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -26,7 +26,7 @@
 #define CFG_SCIF_A
 
 /* SPI */
-#define CONFIG_SPI_FLASH_QUAD
+#define CFG_SPI_FLASH_QUAD
 
 /* SH Ether */
 #define CFG_SH_ETHER_USE_PORT	0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cb15aa3c8f4e..371a292a17de 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -201,7 +201,7 @@ CFG_SMP_PEN_ADDR
 CFG_SOCRATES
 CFG_SPI_ADDR
 CFG_SPI_BOOTING
-CONFIG_SPI_FLASH_QUAD
+CFG_SPI_FLASH_QUAD
 CONFIG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
 CONFIG_SPI_N25Q256A_RESET
-- 
2.25.1

[PoC 193/241] global: Migrate CONFIG_SPI_FLASH_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/beaver.h      | 2 +-
 include/configs/cardhu.h      | 2 +-
 include/configs/cei-tk1-som.h | 2 +-
 include/configs/dalmore.h     | 2 +-
 include/configs/jetson-tk1.h  | 2 +-
 include/configs/nyan-big.h    | 2 +-
 include/configs/p2371-0000.h  | 2 +-
 include/configs/p2371-2180.h  | 2 +-
 include/configs/p2571.h       | 2 +-
 include/configs/p3450-0000.h  | 2 +-
 include/configs/tec-ng.h      | 2 +-
 include/configs/venice2.h     | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6b5f650811b8..1a540c9f7122 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -22,7 +22,7 @@
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 35c5a4f12261..0a5eaf03d9a5 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -26,7 +26,7 @@
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 55e2d744c4a0..3aaed94e15cb 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 24cf554649ba..39e1aded3730 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index b846889541c7..d3bb6d760376 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -21,7 +21,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index baa452156ecd..fbba4ca701db 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -19,7 +19,7 @@
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index ecd0405d297b..dd756a5056c8 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7f942888e74d..10b36e6a1657 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 50cddb4a4acb..6578350990d7 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -20,7 +20,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index ec1a8634e718..34ab82fe1173 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -24,7 +24,7 @@
 	func(DHCP, dhcp, na)
 
 /* Environment at end of QSPI, in the VER partition */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
+#define CFG_SPI_FLASH_SIZE		(4 << 20)
 
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 098796637010..6566dc170ff6 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -20,7 +20,7 @@
 
 /* SPI */
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b2dc04a975ad..1cf493a50373 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -21,7 +21,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
+#define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 371a292a17de..c1e6c9cc89bc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -202,7 +202,7 @@ CFG_SOCRATES
 CFG_SPI_ADDR
 CFG_SPI_BOOTING
 CFG_SPI_FLASH_QUAD
-CONFIG_SPI_FLASH_SIZE
+CFG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
 CONFIG_SPI_N25Q256A_RESET
 CONFIG_STACKBASE
-- 
2.25.1

[PoC 194/241] global: Migrate CONFIG_SPI_HALF_DUPLEX to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/mxs.h        | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 17b4295d2d6d..8d917dc12d2d 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -88,7 +88,7 @@
 
 /* SPI */
 #ifdef CONFIG_CMD_SPI
-#define CONFIG_SPI_HALF_DUPLEX
+#define CFG_SPI_HALF_DUPLEX
 #endif
 
 #endif	/* __CONFIGS_MXS_H__ */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c1e6c9cc89bc..c83653e9ca94 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -203,7 +203,7 @@ CFG_SPI_ADDR
 CFG_SPI_BOOTING
 CFG_SPI_FLASH_QUAD
 CFG_SPI_FLASH_SIZE
-CONFIG_SPI_HALF_DUPLEX
+CFG_SPI_HALF_DUPLEX
 CONFIG_SPI_N25Q256A_RESET
 CONFIG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
-- 
2.25.1

[PoC 195/241] global: Migrate CONFIG_SPI_N25Q256A_RESET to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/socfpga_sr1500.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 70df27241ca6..30663c08f2e2 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -16,7 +16,7 @@
 #define PHY_ANEG_TIMEOUT	8000
 
 /* Enable SPI NOR flash reset, needed for SPI booting */
-#define CONFIG_SPI_N25Q256A_RESET
+#define CFG_SPI_N25Q256A_RESET
 
 /* Environment setting for SPI flash */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c83653e9ca94..7058ba72ba7f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -204,7 +204,7 @@ CFG_SPI_BOOTING
 CFG_SPI_FLASH_QUAD
 CFG_SPI_FLASH_SIZE
 CFG_SPI_HALF_DUPLEX
-CONFIG_SPI_N25Q256A_RESET
+CFG_SPI_N25Q256A_RESET
 CONFIG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
 CONFIG_STD_DEVICES_SETTINGS
-- 
2.25.1

[PoC 196/241] global: Migrate CONFIG_STACKBASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/tegra-common.h    | 2 +-
 include/configs/tegra114-common.h | 2 +-
 include/configs/tegra124-common.h | 2 +-
 include/configs/tegra20-common.h  | 2 +-
 include/configs/tegra30-common.h  | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 66cf7ae5847e..bde7ffce008f 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -45,7 +45,7 @@
 #define CFG_SYS_BOOTMAPSZ	(256 << 20)	/* 256M */
 
 #ifndef CONFIG_ARM64
-#define CFG_SYS_INIT_RAM_ADDR	CONFIG_STACKBASE
+#define CFG_SYS_INIT_RAM_ADDR	CFG_STACKBASE
 #define CFG_SYS_INIT_RAM_SIZE	CONFIG_SYS_MALLOC_LEN
 
 /* Defines for SPL */
diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index 87ec1f5a99d6..ab4fa5504c52 100644
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -15,7 +15,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x83800000	/* 56MB */
+#define CFG_STACKBASE	0x83800000	/* 56MB */
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index 0485fea6ccb8..b413e2512128 100644
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -17,7 +17,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x83800000	/* 56MB */
+#define CFG_STACKBASE	0x83800000	/* 56MB */
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 617bfb2197cf..a313ac2041a9 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -16,7 +16,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x03800000	/* 56MB */
+#define CFG_STACKBASE	0x03800000	/* 56MB */
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 04fcf11ed82d..c57d2d157e33 100644
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -16,7 +16,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x83800000	/* 56MB */
+#define CFG_STACKBASE	0x83800000	/* 56MB */
 
 /*
  * Memory layout for where various images get loaded by boot scripts:
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7058ba72ba7f..f271ba83faca 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -205,7 +205,7 @@ CFG_SPI_FLASH_QUAD
 CFG_SPI_FLASH_SIZE
 CFG_SPI_HALF_DUPLEX
 CFG_SPI_N25Q256A_RESET
-CONFIG_STACKBASE
+CFG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
 CONFIG_STD_DEVICES_SETTINGS
 CONFIG_TEGRA_BOARD_STRING
-- 
2.25.1

[PoC 197/241] global: Migrate CONFIG_STANDALONE_LOAD_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                            | 2 +-
 arch/arc/config.mk                                | 2 +-
 arch/arm/config.mk                                | 6 +++---
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +-
 arch/m68k/config.mk                               | 2 +-
 arch/microblaze/config.mk                         | 2 +-
 arch/mips/config.mk                               | 4 ++--
 arch/nios2/config.mk                              | 2 +-
 arch/powerpc/config.mk                            | 2 +-
 arch/riscv/config.mk                              | 2 +-
 arch/sh/config.mk                                 | 2 +-
 arch/x86/config.mk                                | 2 +-
 config.mk                                         | 2 +-
 examples/standalone/Makefile                      | 2 +-
 include/configs/display5.h                        | 2 +-
 include/configs/microchip_mpfs_icicle.h           | 2 +-
 include/configs/opos6uldev.h                      | 2 +-
 include/configs/qemu-riscv.h                      | 2 +-
 include/configs/sifive-unleashed.h                | 2 +-
 include/configs/sifive-unmatched.h                | 2 +-
 include/configs/sunxi-common.h                    | 2 +-
 include/configs/xtfpga.h                          | 6 +++---
 scripts/config_whitelist.txt                      | 2 +-
 tools/patman/test_checkpatch.py                   | 2 +-
 24 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/README b/README
index 3eb882c6a248..57ca5733dd64 100644
--- a/README
+++ b/README
@@ -1224,7 +1224,7 @@ The following options need to be configured:
 		this is instead controlled by the value of
 		/config/load-environment.
 
-		CONFIG_STANDALONE_LOAD_ADDR
+		CFG_STANDALONE_LOAD_ADDR
 
 		This option defines a board specific value for the
 		address where standalone program gets loaded, thus
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index 2b70945ac342..05e0eb7c9e4b 100644
--- a/arch/arc/config.mk
+++ b/arch/arc/config.mk
@@ -23,4 +23,4 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common
 LDFLAGS_FINAL += -pie --gc-sections
 
 # Load address for standalone apps
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x82000000
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 2065438d0530..9f9d5964dccd 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -3,11 +3,11 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-ifndef CONFIG_STANDALONE_LOAD_ADDR
+ifndef CFG_STANDALONE_LOAD_ADDR
 ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
-CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
+CFG_STANDALONE_LOAD_ADDR = 0x80300000
 else
-CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
+CFG_STANDALONE_LOAD_ADDR = 0xc100000
 endif
 endif
 
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index b82aac9126d0..c3af74f1d83f 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -14,7 +14,7 @@
 #include <linux/bitops.h>
 #endif
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80300000
+#define CFG_STANDALONE_LOAD_ADDR	0x80300000
 
 /*
  * Reserve secure memory
diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
index ed592334af2e..9b54b0b8f9ff 100644
--- a/arch/m68k/config.mk
+++ b/arch/m68k/config.mk
@@ -3,7 +3,7 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
+CFG_STANDALONE_LOAD_ADDR ?= 0x20000
 
 PLATFORM_CPPFLAGS += -D__M68K__
 KBUILD_LDFLAGS  += -n
diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk
index d35b4f6db7a1..83e51fee649f 100644
--- a/arch/microblaze/config.mk
+++ b/arch/microblaze/config.mk
@@ -6,7 +6,7 @@
 # (C) Copyright 2004 Atmark Techno, Inc.
 # Yasushi SHOJI <yashi@atmark-techno.com>
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
+CFG_STANDALONE_LOAD_ADDR ?= 0x80F00000
 
 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
 PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections
diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 04f362780580..5434507a958b 100644
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -25,14 +25,14 @@ ifdef CONFIG_32BIT
 PLATFORM_CPPFLAGS	+= -mabi=32
 KBUILD_LDFLAGS		+= -m $(32bit-emul)
 OBJCOPYFLAGS		+= -O $(32bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR	?= 0x80200000
+CFG_STANDALONE_LOAD_ADDR	?= 0x80200000
 endif
 
 ifdef CONFIG_64BIT
 PLATFORM_CPPFLAGS	+= -mabi=64
 KBUILD_LDFLAGS		+= -m$(64bit-emul)
 OBJCOPYFLAGS		+= -O $(64bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR	?= 0xffffffff80200000
+CFG_STANDALONE_LOAD_ADDR	?= 0xffffffff80200000
 endif
 
 PLATFORM_CPPFLAGS += -D__MIPS__
diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index 44260b1431cb..ddf73e3ac2a3 100644
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -4,7 +4,7 @@
 # Psyent Corporation <www.psyent.com>
 # Scott McNutt <smcnutt@psyent.com>
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x02000000
 
 PLATFORM_CPPFLAGS += -D__NIOS2__
 PLATFORM_CPPFLAGS += -G0
diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index 307ca65745c8..5c3e71984ca9 100644
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -3,7 +3,7 @@
 # (C) Copyright 2000-2010
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
+CFG_STANDALONE_LOAD_ADDR ?= 0x40000
 LDFLAGS_FINAL += --gc-sections
 LDFLAGS_FINAL += --bss-plt
 PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index 1ebce5bd6748..3e81e34d41c2 100644
--- a/arch/riscv/config.mk
+++ b/arch/riscv/config.mk
@@ -23,7 +23,7 @@ KBUILD_LDFLAGS		+= -m $(64bit-emul)
 EFI_LDS			:= elf_riscv64_efi.lds
 endif
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x00000000
 
 PLATFORM_CPPFLAGS	+= -ffixed-gp -fpic
 PLATFORM_RELFLAGS	+= -fno-common -gdwarf-2 -ffunction-sections \
diff --git a/arch/sh/config.mk b/arch/sh/config.mk
index 78bb2660e1e3..14a81613d05b 100644
--- a/arch/sh/config.mk
+++ b/arch/sh/config.mk
@@ -3,7 +3,7 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
+CFG_STANDALONE_LOAD_ADDR ?= 0x8C000000
 ifeq ($(CPU),sh2)
 LDFLAGS_STANDALONE += -EB
 endif
diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index 889497b6bd75..b808d560c444 100644
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -3,7 +3,7 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
+CFG_STANDALONE_LOAD_ADDR ?= 0x40000
 
 PLATFORM_CPPFLAGS += -fomit-frame-pointer
 PF_CPPFLAGS_X86   := $(call cc-option, -fno-toplevel-reorder, \
diff --git a/config.mk b/config.mk
index b915c29b3f3e..db1c4aa74889 100644
--- a/config.mk
+++ b/config.mk
@@ -76,4 +76,4 @@ export PLATFORM_CPPFLAGS
 export RELFLAGS
 export LDFLAGS_FINAL
 export LDFLAGS_STANDALONE
-export CONFIG_STANDALONE_LOAD_ADDR
+export CFG_STANDALONE_LOAD_ADDR
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index 5b48a9d43c62..4f6693f5348d 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -42,7 +42,7 @@ endif
 # source file.
 ccflags-y += $(call cc-option,-fno-toplevel-reorder)
 
-LDFLAGS_STANDALONE	+= -Ttext $(CONFIG_STANDALONE_LOAD_ADDR)
+LDFLAGS_STANDALONE	+= -Ttext $(CFG_STANDALONE_LOAD_ADDR)
 
 #########################################################################
 
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 6900baa84545..3d63e3528127 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -279,7 +279,7 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x10001000
+#define CFG_STANDALONE_LOAD_ADDR	0x10001000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index 0350f7a62da7..ead07ca2dd6a 100644
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -11,7 +11,7 @@
 
 #define CFG_SYS_SDRAM_BASE       0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
+#define CFG_STANDALONE_LOAD_ADDR 0x80200000
 
 /* Environment options */
 
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 1adfa5b668ae..833b2ffe129a 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -11,7 +11,7 @@
 #include "mx6_common.h"
 
 /* Miscellaneous configurable options */
-#define CONFIG_STANDALONE_LOAD_ADDR	CONFIG_SYS_LOAD_ADDR
+#define CFG_STANDALONE_LOAD_ADDR	CONFIG_SYS_LOAD_ADDR
 
 /* Physical Memory Map */
 #define CFG_SYS_SDRAM_BASE		MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 11c795787887..8247c434e06d 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80200000
+#define CFG_STANDALONE_LOAD_ADDR	0x80200000
 
 #define RISCV_MMODE_TIMERBASE		0x2000000
 #define RISCV_MMODE_TIMER_FREQ		1000000
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 59e40710de48..72c042a9040e 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80200000
+#define CFG_STANDALONE_LOAD_ADDR	0x80200000
 
 #define RISCV_MMODE_TIMERBASE		0x2000000
 #define RISCV_MMODE_TIMER_FREQ		1000000
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index 3cf300a2e459..80df15d67d3e 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80200000
+#define CFG_STANDALONE_LOAD_ADDR	0x80200000
 
 /* Environment options */
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1be4cde2b70e..dec836a2fecc 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -77,7 +77,7 @@
  */
 
 /* standalone support */
-#define CONFIG_STANDALONE_LOAD_ADDR	CONFIG_SYS_LOAD_ADDR
+#define CFG_STANDALONE_LOAD_ADDR	CONFIG_SYS_LOAD_ADDR
 
 /* FLASH and environment organization */
 
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 105ce7c0c726..714b21afc6b0 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -61,12 +61,12 @@
  */
 #if XCHAL_HAVE_PTP_MMU
 #if XCHAL_VECBASE_RESET_VADDR == XCHAL_VECBASE_RESET_PADDR
-#define CONFIG_STANDALONE_LOAD_ADDR	0x00800000
+#define CFG_STANDALONE_LOAD_ADDR	0x00800000
 #else
-#define CONFIG_STANDALONE_LOAD_ADDR	0xd0800000
+#define CFG_STANDALONE_LOAD_ADDR	0xd0800000
 #endif
 #else
-#define CONFIG_STANDALONE_LOAD_ADDR	0x60800000
+#define CFG_STANDALONE_LOAD_ADDR	0x60800000
 #endif
 
 #if defined(CFG_MAX_MEM_MAPPED) && \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f271ba83faca..e5598eb4159d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -206,7 +206,7 @@ CFG_SPI_FLASH_SIZE
 CFG_SPI_HALF_DUPLEX
 CFG_SPI_N25Q256A_RESET
 CFG_STACKBASE
-CONFIG_STANDALONE_LOAD_ADDR
+CFG_STANDALONE_LOAD_ADDR
 CONFIG_STD_DEVICES_SETTINGS
 CONFIG_TEGRA_BOARD_STRING
 CONFIG_TEGRA_ENABLE_UARTA
diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py
index 8960cd505f82..a9faf6ab979f 100644
--- a/tools/patman/test_checkpatch.py
+++ b/tools/patman/test_checkpatch.py
@@ -205,7 +205,7 @@ index 6f3748d..f9e4e65 100644
 +		You can add calls to bootstage_mark() to set time markers.
 +
  - Standalone program support:
- 		CONFIG_STANDALONE_LOAD_ADDR
+ 		CFG_STANDALONE_LOAD_ADDR
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index b167b028ec..beb7dc634f 100644
-- 
2.25.1

[PoC 198/241] global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/bayleybay.h               | 2 +-
 include/configs/cherryhill.h              | 2 +-
 include/configs/chromebook_coral.h        | 4 ++--
 include/configs/chromebook_samus.h        | 4 ++--
 include/configs/conga-qeval20-qa3-e3845.h | 2 +-
 include/configs/coreboot.h                | 2 +-
 include/configs/cougarcanyon2.h           | 2 +-
 include/configs/crownbay.h                | 2 +-
 include/configs/dfi-bt700.h               | 2 +-
 include/configs/efi-x86_app.h             | 2 +-
 include/configs/efi-x86_payload.h         | 2 +-
 include/configs/galileo.h                 | 2 +-
 include/configs/minnowmax.h               | 2 +-
 include/configs/qemu-x86.h                | 2 +-
 include/configs/slimbootloader.h          | 4 ++--
 include/configs/som-db5800-som-6867.h     | 2 +-
 include/configs/theadorable-x86-common.h  | 2 +-
 include/configs/x86-chromebook.h          | 2 +-
 include/configs/x86-common.h              | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index b347125f2fa0..b0df328cd84b 100644
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h
index 726c43d35ea0..d6ce70a96aea 100644
--- a/include/configs/cherryhill.h
+++ b/include/configs/cherryhill.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h
index d14c1d445b25..43fdc394416d 100644
--- a/include/configs/chromebook_coral.h
+++ b/include/configs/chromebook_coral.h
@@ -13,8 +13,8 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_STD_DEVICES_SETTINGS
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
+#undef CFG_STD_DEVICES_SETTINGS
+#define CFG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h
index e29be3fda4ac..03a1033c5735 100644
--- a/include/configs/chromebook_samus.h
+++ b/include/configs/chromebook_samus.h
@@ -15,8 +15,8 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_STD_DEVICES_SETTINGS
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
+#undef CFG_STD_DEVICES_SETTINGS
+#define CFG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 31cfd2b12923..1066da3f8326 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index f73004386fda..b4f49bf5289d 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -15,7 +15,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index b64c7df1b25f..31639e48da88 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vga\0" \
 					"stderr=serial,vga\0"
 
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index ff74deb3d400..387bb8800e89 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 1510f8df4378..36c2510628fc 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -16,7 +16,7 @@
 /* Use BayTrail internal HS UART which is memory-mapped */
 #endif
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 6061a6db0a40..96ad15b535d1 100644
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -10,7 +10,7 @@
 
 #undef CONFIG_TPM_TIS_BASE_ADDRESS
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=vidconsole\0" \
 					"stderr=vidconsole\0"
 
diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h
index f50c2ce4dd07..c72b067c367d 100644
--- a/include/configs/efi-x86_payload.h
+++ b/include/configs/efi-x86_payload.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 472f236b9b6e..0380ac287be2 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -14,7 +14,7 @@
 
 /* ns16550 UART is memory-mapped in Quark SoC */
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 50c52f8839b1..f3f645f9d699 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0" \
 					"usb_pgood_delay=40\0"
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 5cd13887084c..33263a46a407 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -22,7 +22,7 @@
 #include <config_distro_bootcmd.h>
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h
index 748a423b0833..20b99a1021df 100644
--- a/include/configs/slimbootloader.h
+++ b/include/configs/slimbootloader.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS		\
+#define CFG_STD_DEVICES_SETTINGS		\
 	"stdin=serial,i8042-kbd,usbkbd\0"	\
 	"stdout=serial\0"			\
 	"stderr=serial\0"
@@ -18,7 +18,7 @@
  */
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_STD_DEVICES_SETTINGS		\
+	CFG_STD_DEVICES_SETTINGS		\
 	"netdev=eth0\0"				\
 	"consoledev=ttyS0\0"			\
 	"ramdiskaddr=0x4000000\0"		\
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index ee038d83bc05..14cacbfe3f13 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index f34063249e48..6b65fad50692 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -11,7 +11,7 @@
 #ifndef __THEADORABLE_X86_COMMON_H
 #define __THEADORABLE_X86_COMMON_H
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index ec87eddd4c72..dfacecbdd501 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -13,7 +13,7 @@
 #define VIDEO_IO_OFFSET				0
 #define CONFIG_X86EMU_RAW_IO
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 0470a90391b0..9cfaa02958c8 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -62,7 +62,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS			\
 	DISTRO_BOOTENV					\
-	CONFIG_STD_DEVICES_SETTINGS			\
+	CFG_STD_DEVICES_SETTINGS			\
 	SPLASH_SETTINGS					\
 	"pciconfighost=1\0"				\
 	"netdev=eth0\0"					\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e5598eb4159d..1f79a45cda8a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -207,7 +207,7 @@ CFG_SPI_HALF_DUPLEX
 CFG_SPI_N25Q256A_RESET
 CFG_STACKBASE
 CFG_STANDALONE_LOAD_ADDR
-CONFIG_STD_DEVICES_SETTINGS
+CFG_STD_DEVICES_SETTINGS
 CONFIG_TEGRA_BOARD_STRING
 CONFIG_TEGRA_ENABLE_UARTA
 CONFIG_TEGRA_ENABLE_UARTD
-- 
2.25.1

[PoC 199/241] global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board2.c  | 2 +-
 include/configs/beaver.h      | 2 +-
 include/configs/cardhu.h      | 2 +-
 include/configs/cei-tk1-som.h | 2 +-
 include/configs/dalmore.h     | 2 +-
 include/configs/harmony.h     | 2 +-
 include/configs/jetson-tk1.h  | 2 +-
 include/configs/medcom-wide.h | 2 +-
 include/configs/nyan-big.h    | 2 +-
 include/configs/p2371-0000.h  | 2 +-
 include/configs/p2371-2180.h  | 2 +-
 include/configs/p2571.h       | 2 +-
 include/configs/p2771-0000.h  | 2 +-
 include/configs/p3450-0000.h  | 2 +-
 include/configs/paz00.h       | 2 +-
 include/configs/plutux.h      | 2 +-
 include/configs/seaboard.h    | 2 +-
 include/configs/tec-ng.h      | 2 +-
 include/configs/tec.h         | 2 +-
 include/configs/trimslice.h   | 2 +-
 include/configs/venice2.h     | 2 +-
 include/configs/ventana.h     | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 54bbd8a776e9..c7a45f4ff82a 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -89,7 +89,7 @@ int checkboard(void)
 {
 	int board_id = tegra_board_id();
 
-	printf("Board: %s", CONFIG_TEGRA_BOARD_STRING);
+	printf("Board: %s", CFG_TEGRA_BOARD_STRING);
 	if (board_id != -1)
 		printf(", ID: %d\n", board_id);
 	printf("\n");
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 1a540c9f7122..c22cdaed3f74 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -14,7 +14,7 @@
 #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 0a5eaf03d9a5..c9cf110147a2 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -14,7 +14,7 @@
 #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
 
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"board_name=cardhu-a04\0" \
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 3aaed94e15cb..045cd25104d7 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -16,7 +16,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"CEI tk1-som"
+#define CFG_TEGRA_BOARD_STRING	"CEI tk1-som"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 39e1aded3730..8f97848b1714 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -11,7 +11,7 @@
 #include "tegra114-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 211dab4d2337..97914889092b 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index d3bb6d760376..4878e6526b5a 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -12,7 +12,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index a8d8d8b09e02..e0d947f7e3c5 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index fbba4ca701db..946759f4fb20 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -12,7 +12,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
+#define CFG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index dd756a5056c8..8b734e1e948c 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -12,7 +12,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 10b36e6a1657..7120ae7bd808 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -12,7 +12,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 6578350990d7..f1b0faf0091e 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -12,7 +12,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2571"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2571"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 84cdd5719623..e409cc3896d7 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -11,7 +11,7 @@
 #include "tegra186-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2771-0000"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2771-0000"
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index 34ab82fe1173..9eda594b8980 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -11,7 +11,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index a945f4e9b289..387e4fcaf2e5 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -13,7 +13,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Compal Paz00"
+#define CFG_TEGRA_BOARD_STRING	"Compal Paz00"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 99db59c489e0..82ef6959fd2f 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index f272fe9bf8f1..5cbc33461251 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 6566dc170ff6..966750539b5d 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -10,7 +10,7 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/include/configs/tec.h b/include/configs/tec.h
index ddf753da4a9f..b8819909b6bc 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index e4cbc7da843e..62c785cc0e78 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Compulab Trimslice"
+#define CFG_TEGRA_BOARD_STRING	"Compulab Trimslice"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 1cf493a50373..164aebf3045b 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -12,7 +12,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index f7a507768ec1..e585fb93d308 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTD
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1f79a45cda8a..825379421095 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -208,7 +208,7 @@ CFG_SPI_N25Q256A_RESET
 CFG_STACKBASE
 CFG_STANDALONE_LOAD_ADDR
 CFG_STD_DEVICES_SETTINGS
-CONFIG_TEGRA_BOARD_STRING
+CFG_TEGRA_BOARD_STRING
 CONFIG_TEGRA_ENABLE_UARTA
 CONFIG_TEGRA_ENABLE_UARTD
 CONFIG_TEGRA_SLINK_CTRLS
-- 
2.25.1

[PoC 200/241] global: Migrate CONFIG_TEGRA_ENABLE_UARTA to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board.c   | 2 +-
 include/configs/apalis-tk1.h  | 2 +-
 include/configs/apalis_t30.h  | 2 +-
 include/configs/beaver.h      | 2 +-
 include/configs/cardhu.h      | 2 +-
 include/configs/colibri_t20.h | 2 +-
 include/configs/colibri_t30.h | 2 +-
 include/configs/harmony.h     | 2 +-
 include/configs/nyan-big.h    | 2 +-
 include/configs/p2371-0000.h  | 2 +-
 include/configs/p2371-2180.h  | 2 +-
 include/configs/p2571.h       | 2 +-
 include/configs/p3450-0000.h  | 2 +-
 include/configs/paz00.h       | 2 +-
 include/configs/trimslice.h   | 2 +-
 include/configs/venice2.h     | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index f8b61a2b3e3b..b4b73df2265e 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -238,7 +238,7 @@ void board_init_uart_f(void)
 #if IS_ENABLED(CONFIG_TEGRA_PINCTRL)
 	int uart_ids = 0;	/* bit mask of which UART ids to enable */
 
-#ifdef CONFIG_TEGRA_ENABLE_UARTA
+#ifdef CFG_TEGRA_ENABLE_UARTA
 	uart_ids |= UARTA;
 #endif
 #ifdef CONFIG_TEGRA_ENABLE_UARTB
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 7fd99ea907d1..8600529379d1 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -13,7 +13,7 @@
 #include "tegra124-common.h"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #define FDT_MODULE			"apalis-v1.2"
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 4f00b3bad3f4..6d017d88707b 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -20,7 +20,7 @@
  * Apalis UART3: NVIDIA UARTB
  * Apalis UART4: NVIDIA UARTC
  */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #define UBOOT_UPDATE \
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index c22cdaed3f74..43bc8dc32159 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -17,7 +17,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index c9cf110147a2..29d5e011e6ef 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -21,7 +21,7 @@
 	"fdtfile=tegra30-cardhu-a04.dtb\0"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 2ba3c3bc87db..19044be6cc06 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_SDIO1
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index ffed71a2e828..86097670c275 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -21,7 +21,7 @@
  * Colibri UART-B: NVIDIA UARTD
  * Colibri UART-C: NVIDIA UARTB
  */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #define UBOOT_UPDATE \
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 97914889092b..59ead58587db 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -18,7 +18,7 @@
 
 /* UARTD: keyboard satellite board UART, default */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
-#ifdef CONFIG_TEGRA_ENABLE_UARTA
+#ifdef CFG_TEGRA_ENABLE_UARTA
 /* UARTA: debug board UART */
 #define CFG_SYS_NS16550_COM2		NV_PA_APB_UARTA_BASE
 #endif
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 946759f4fb20..02f8b2c624b3 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 8b734e1e948c..e22cb8e8eb1b 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7120ae7bd808..075b2caa8bd5 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index f1b0faf0091e..c80a6999490d 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA P2571"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index 9eda594b8980..764e412f3dfc 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -14,7 +14,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 
 /* Only MMC/PXE/DHCP for now, add USB back in later when supported */
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 387e4fcaf2e5..cbf0c71a1fcb 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -16,7 +16,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Compal Paz00"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 62c785cc0e78..ca5462fe4727 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -14,7 +14,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Compulab Trimslice"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_GPU
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 164aebf3045b..1f4860a333be 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
+#define CFG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 825379421095..130081c36143 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -209,7 +209,7 @@ CFG_STACKBASE
 CFG_STANDALONE_LOAD_ADDR
 CFG_STD_DEVICES_SETTINGS
 CFG_TEGRA_BOARD_STRING
-CONFIG_TEGRA_ENABLE_UARTA
+CFG_TEGRA_ENABLE_UARTA
 CONFIG_TEGRA_ENABLE_UARTD
 CONFIG_TEGRA_SLINK_CTRLS
 CONFIG_TEGRA_SPI
-- 
2.25.1

[PoC 201/241] global: Migrate CONFIG_TEGRA_ENABLE_UARTD to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board.c   | 2 +-
 include/configs/cei-tk1-som.h | 2 +-
 include/configs/dalmore.h     | 2 +-
 include/configs/harmony.h     | 2 +-
 include/configs/jetson-tk1.h  | 2 +-
 include/configs/medcom-wide.h | 2 +-
 include/configs/plutux.h      | 2 +-
 include/configs/seaboard.h    | 2 +-
 include/configs/tec-ng.h      | 2 +-
 include/configs/tec.h         | 2 +-
 include/configs/ventana.h     | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index b4b73df2265e..b4e30de509b7 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -247,7 +247,7 @@ void board_init_uart_f(void)
 #ifdef CONFIG_TEGRA_ENABLE_UARTC
 	uart_ids |= UARTC;
 #endif
-#ifdef CONFIG_TEGRA_ENABLE_UARTD
+#ifdef CFG_TEGRA_ENABLE_UARTD
 	uart_ids |= UARTD;
 #endif
 #ifdef CONFIG_TEGRA_ENABLE_UARTE
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 045cd25104d7..73b51336973e 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -19,7 +19,7 @@
 #define CFG_TEGRA_BOARD_STRING	"CEI tk1-som"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* SPI */
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 8f97848b1714..806fcd039f22 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -14,7 +14,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 59ead58587db..028ff8b8144b 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -14,7 +14,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 
 /* UARTD: keyboard satellite board UART, default */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 4878e6526b5a..0f29d21e9d47 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index e0d947f7e3c5..0096d1be50a4 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
+#define CFG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* NAND support */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 82ef6959fd2f..385b1aef7b81 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
+#define CFG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* NAND support */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 5cbc33461251..9b2fa23e076a 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 966750539b5d..22099a86d5f6 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -13,7 +13,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index b8819909b6bc..b344b3e5f16e 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -15,7 +15,7 @@
 #define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
+#define CFG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* NAND support */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index e585fb93d308..24335f90157d 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -14,7 +14,7 @@
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
+#define CFG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 130081c36143..c3ff80696412 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -210,7 +210,7 @@ CFG_STANDALONE_LOAD_ADDR
 CFG_STD_DEVICES_SETTINGS
 CFG_TEGRA_BOARD_STRING
 CFG_TEGRA_ENABLE_UARTA
-CONFIG_TEGRA_ENABLE_UARTD
+CFG_TEGRA_ENABLE_UARTD
 CONFIG_TEGRA_SLINK_CTRLS
 CONFIG_TEGRA_SPI
 CONFIG_TEGRA_UARTA_GPU
-- 
2.25.1

[PoC 202/241] global: Migrate CONFIG_TEGRA_SLINK_CTRLS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/beaver.h     | 2 +-
 include/configs/cardhu.h     | 2 +-
 include/configs/tec-ng.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 43bc8dc32159..35af678d2199 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -21,7 +21,7 @@
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS       6
+#define CFG_TEGRA_SLINK_CTRLS       6
 #define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 29d5e011e6ef..722e09d43bf3 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -25,7 +25,7 @@
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS       6
+#define CFG_TEGRA_SLINK_CTRLS       6
 #define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 22099a86d5f6..8b231e7c77a6 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -19,7 +19,7 @@
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 /* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS       6
+#define CFG_TEGRA_SLINK_CTRLS       6
 #define CFG_SPI_FLASH_SIZE          (4 << 20)
 
 #include "tegra-common-post.h"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c3ff80696412..b7f8b290bff3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -211,7 +211,7 @@ CFG_STD_DEVICES_SETTINGS
 CFG_TEGRA_BOARD_STRING
 CFG_TEGRA_ENABLE_UARTA
 CFG_TEGRA_ENABLE_UARTD
-CONFIG_TEGRA_SLINK_CTRLS
+CFG_TEGRA_SLINK_CTRLS
 CONFIG_TEGRA_SPI
 CONFIG_TEGRA_UARTA_GPU
 CONFIG_TEGRA_UARTA_SDIO1
-- 
2.25.1

[PoC 203/241] global: Migrate CONFIG_TEGRA_SPI to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board2.c        | 2 +-
 include/configs/tegra-common-post.h | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index c7a45f4ff82a..615d0ee43c0e 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -125,7 +125,7 @@ int board_init(void)
 
 	tegra_gpu_config();
 
-#ifdef CONFIG_TEGRA_SPI
+#ifdef CFG_TEGRA_SPI
 	pin_mux_spi();
 #endif
 
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 31c82822a2af..69fbe57e2649 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -74,7 +74,7 @@
 	BOARD_EXTRA_ENV_SETTINGS
 
 #if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
-#define CONFIG_TEGRA_SPI
+#define CFG_TEGRA_SPI
 #endif
 
 #endif /* __TEGRA_COMMON_POST_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b7f8b290bff3..2acc5a7412d6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -212,7 +212,7 @@ CFG_TEGRA_BOARD_STRING
 CFG_TEGRA_ENABLE_UARTA
 CFG_TEGRA_ENABLE_UARTD
 CFG_TEGRA_SLINK_CTRLS
-CONFIG_TEGRA_SPI
+CFG_TEGRA_SPI
 CONFIG_TEGRA_UARTA_GPU
 CONFIG_TEGRA_UARTA_SDIO1
 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
-- 
2.25.1

[PoC 204/241] global: Migrate CONFIG_TEGRA_UARTA_GPU to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board.c  | 2 +-
 include/configs/trimslice.h  | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index b4e30de509b7..e4f5540cab52 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -168,7 +168,7 @@ static int uart_configs[] = {
 #if defined(CONFIG_TEGRA20)
  #if defined(CONFIG_TEGRA_UARTA_UAA_UAB)
 	FUNCMUX_UART1_UAA_UAB,
- #elif defined(CONFIG_TEGRA_UARTA_GPU)
+ #elif defined(CFG_TEGRA_UARTA_GPU)
 	FUNCMUX_UART1_GPU,
  #elif defined(CONFIG_TEGRA_UARTA_SDIO1)
 	FUNCMUX_UART1_SDIO1,
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index ca5462fe4727..920cbc82d0c1 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -15,7 +15,7 @@
 
 /* Board-specific serial config */
 #define CFG_TEGRA_ENABLE_UARTA
-#define CONFIG_TEGRA_UARTA_GPU
+#define CFG_TEGRA_UARTA_GPU
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2acc5a7412d6..f3cb0607741b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -213,7 +213,7 @@ CFG_TEGRA_ENABLE_UARTA
 CFG_TEGRA_ENABLE_UARTD
 CFG_TEGRA_SLINK_CTRLS
 CFG_TEGRA_SPI
-CONFIG_TEGRA_UARTA_GPU
+CFG_TEGRA_UARTA_GPU
 CONFIG_TEGRA_UARTA_SDIO1
 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
-- 
2.25.1

[PoC 205/241] global: Migrate CONFIG_TEGRA_UARTA_SDIO1 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board.c   | 2 +-
 include/configs/colibri_t20.h | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index e4f5540cab52..45bc1b8c9673 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -170,7 +170,7 @@ static int uart_configs[] = {
 	FUNCMUX_UART1_UAA_UAB,
  #elif defined(CFG_TEGRA_UARTA_GPU)
 	FUNCMUX_UART1_GPU,
- #elif defined(CONFIG_TEGRA_UARTA_SDIO1)
+ #elif defined(CFG_TEGRA_UARTA_SDIO1)
 	FUNCMUX_UART1_SDIO1,
  #else
 	FUNCMUX_UART1_IRRX_IRTX,
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 19044be6cc06..206221606fa3 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -12,7 +12,7 @@
 
 /* Board-specific serial config */
 #define CFG_TEGRA_ENABLE_UARTA
-#define CONFIG_TEGRA_UARTA_SDIO1
+#define CFG_TEGRA_UARTA_SDIO1
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* NAND support */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f3cb0607741b..bb11839ede29 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -214,7 +214,7 @@ CFG_TEGRA_ENABLE_UARTD
 CFG_TEGRA_SLINK_CTRLS
 CFG_TEGRA_SPI
 CFG_TEGRA_UARTA_GPU
-CONFIG_TEGRA_UARTA_SDIO1
+CFG_TEGRA_UARTA_SDIO1
 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
-- 
2.25.1

[PoC 206/241] global: Migrate CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/tegra30/cpu.c | 2 +-
 include/configs/cardhu.h          | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c
index 651edd27ee87..1e2848b5049b 100644
--- a/arch/arm/mach-tegra/tegra30/cpu.c
+++ b/arch/arm/mach-tegra/tegra30/cpu.c
@@ -62,7 +62,7 @@ static void enable_cpu_power_rail(void)
 	tegra_i2c_ll_write_addr(TPS62366A_I2C_ADDR, 2);
 	tegra_i2c_ll_write_data(TPS62366A_SET1_DATA, I2C_SEND_2_BYTES);
 #endif
-#ifdef CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
+#ifdef CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 	tegra_i2c_ll_write_addr(TPS62361B_I2C_ADDR, 2);
 	tegra_i2c_ll_write_data(TPS62361B_SET3_DATA, I2C_SEND_2_BYTES);
 #endif
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 722e09d43bf3..8079acc47c29 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -11,7 +11,7 @@
 #include "tegra30-common.h"
 
 /* VDD core PMIC */
-#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
+#define CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 
 /* High-level configuration options */
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bb11839ede29..7b609b55e8cf 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -215,7 +215,7 @@ CFG_TEGRA_SLINK_CTRLS
 CFG_TEGRA_SPI
 CFG_TEGRA_UARTA_GPU
 CFG_TEGRA_UARTA_SDIO1
-CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
+CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
-- 
2.25.1

[PoC 207/241] global: Migrate CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/tegra30/cpu.c | 2 +-
 include/configs/beaver.h          | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-tegra/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c
index 1e2848b5049b..0e6835306b64 100644
--- a/arch/arm/mach-tegra/tegra30/cpu.c
+++ b/arch/arm/mach-tegra/tegra30/cpu.c
@@ -58,7 +58,7 @@ static void enable_cpu_power_rail(void)
 	writel(reg, &pmc->pmc_cntrl);
 
 	/* Set VDD_CORE to 1.200V. */
-#ifdef CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
+#ifdef CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 	tegra_i2c_ll_write_addr(TPS62366A_I2C_ADDR, 2);
 	tegra_i2c_ll_write_data(TPS62366A_SET1_DATA, I2C_SEND_2_BYTES);
 #endif
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 35af678d2199..cfe47c65f5eb 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -11,7 +11,7 @@
 #include "tegra30-common.h"
 
 /* VDD core PMIC */
-#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
+#define CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 
 /* High-level configuration options */
 #define CFG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7b609b55e8cf..8bb49acc7595 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -216,7 +216,7 @@ CFG_TEGRA_SPI
 CFG_TEGRA_UARTA_GPU
 CFG_TEGRA_UARTA_SDIO1
 CFG_TEGRA_VDD_CORE_TPS62361B_SET3
-CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
+CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
-- 
2.25.1

[PoC 208/241] global: Migrate CONFIG_TESTPIN_MASK to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/keymile/km83xx/km83xx.c | 2 +-
 include/configs/kmcoge5ne.h   | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 88afc76bbbf6..73e3709bbba2 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -217,7 +217,7 @@ int post_hotkeys_pressed(void)
 	struct km_bec_fpga *base =
 		(struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
 	int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG);
-	testpin = (testpin_reg & CONFIG_TESTPIN_MASK) != 0;
+	testpin = (testpin_reg & CFG_TESTPIN_MASK) != 0;
 	debug("post_hotkeys_pressed: %d\n", !testpin);
 	return testpin;
 }
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index c8da6aa3ce4e..161b07406f3a 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -37,6 +37,6 @@
 #define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
-#define CONFIG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
+#define CFG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
 
 #endif /* CONFIG */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8bb49acc7595..56a7f2f656c5 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -217,7 +217,7 @@ CFG_TEGRA_UARTA_GPU
 CFG_TEGRA_UARTA_SDIO1
 CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 CFG_TEGRA_VDD_CORE_TPS62366A_SET1
-CONFIG_TESTPIN_MASK
+CFG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
 CONFIG_TPM_TIS_BASE_ADDRESS
-- 
2.25.1

[PoC 209/241] global: Migrate CONFIG_TESTPIN_REG to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/keymile/km83xx/km83xx.c | 2 +-
 include/configs/kmcoge5ne.h   | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 73e3709bbba2..9ec1dbc6f97b 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -216,7 +216,7 @@ int post_hotkeys_pressed(void)
 	int testpin = 0;
 	struct km_bec_fpga *base =
 		(struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
-	int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG);
+	int testpin_reg = in_8(&base->CFG_TESTPIN_REG);
 	testpin = (testpin_reg & CFG_TESTPIN_MASK) != 0;
 	debug("post_hotkeys_pressed: %d\n", !testpin);
 	return testpin;
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 161b07406f3a..8ca64f8e9e9a 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -36,7 +36,7 @@
 #define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
 #define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
-#define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
+#define CFG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CFG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
 
 #endif /* CONFIG */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 56a7f2f656c5..dbb98c572076 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -218,7 +218,7 @@ CFG_TEGRA_UARTA_SDIO1
 CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 CFG_TESTPIN_MASK
-CONFIG_TESTPIN_REG
+CFG_TESTPIN_REG
 CONFIG_THOR_RESET_OFF
 CONFIG_TPM_TIS_BASE_ADDRESS
 CONFIG_TSEC1
-- 
2.25.1

[PoC 210/241] global: Migrate CONFIG_THOR_RESET_OFF to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/gadget/f_thor.c         | 4 ++--
 drivers/usb/gadget/f_thor.h         | 2 +-
 include/configs/xilinx_versal.h     | 2 +-
 include/configs/xilinx_versal_net.h | 2 +-
 include/configs/xilinx_zynqmp.h     | 2 +-
 include/configs/zynq-common.h       | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 47ef55b2fd31..a83fd6fe90b0 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -129,7 +129,7 @@ static int process_rqt_cmd(const struct rqt_box *rqt)
 		send_rsp(rsp);
 		g_dnl_unregister();
 		dfu_free_entities();
-#ifdef CONFIG_THOR_RESET_OFF
+#ifdef CFG_THOR_RESET_OFF
 		return RESET_DONE;
 #endif
 		run_command("reset", 0);
@@ -726,7 +726,7 @@ int thor_handle(void)
 
 		if (ret > 0) {
 			ret = process_data();
-#ifdef CONFIG_THOR_RESET_OFF
+#ifdef CFG_THOR_RESET_OFF
 			if (ret == RESET_DONE)
 				break;
 #endif
diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h
index 8ba3fa21b733..2c22ccef542b 100644
--- a/drivers/usb/gadget/f_thor.h
+++ b/drivers/usb/gadget/f_thor.h
@@ -120,7 +120,7 @@ struct f_thor {
 #define F_NAME_BUF_SIZE 32
 #define THOR_PACKET_SIZE SZ_1M      /* 1 MiB */
 #define THOR_STORE_UNIT_SIZE SZ_32M /* 32 MiB */
-#ifdef CONFIG_THOR_RESET_OFF
+#ifdef CFG_THOR_RESET_OFF
 #define RESET_DONE 0xFFFFFFFF
 #endif
 #endif /* _USB_THOR_H_ */
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 836a6506b1ad..00e466528e87 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -25,7 +25,7 @@
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define CONFIG_THOR_RESET_OFF
+#define CFG_THOR_RESET_OFF
 #endif
 
 /* Ethernet driver */
diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index b8d2685246f3..672c54e79fd9 100644
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -25,7 +25,7 @@
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define CONFIG_THOR_RESET_OFF
+#define CFG_THOR_RESET_OFF
 #define DFU_ALT_INFO_RAM \
 	"dfu_ram_info=" \
 	"setenv dfu_alt_info " \
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index f07e7d3f0ac3..2452f81570a8 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -31,7 +31,7 @@
 
 #if defined(CONFIG_ZYNQMP_USB)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define CONFIG_THOR_RESET_OFF
+#define CFG_THOR_RESET_OFF
 
 # define PARTS_DEFAULT \
 	"partitions=uuid_disk=${uuid_gpt_disk};" \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1edd49a784d4..901f602d3d4e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -41,7 +41,7 @@
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
 # define DFU_DEFAULT_POLL_TIMEOUT	300
-# define CONFIG_THOR_RESET_OFF
+# define CFG_THOR_RESET_OFF
 #endif
 
 /* enable preboot to be loaded before CONFIG_BOOTDELAY */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index dbb98c572076..b78294211ab0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -219,7 +219,7 @@ CFG_TEGRA_VDD_CORE_TPS62361B_SET3
 CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 CFG_TESTPIN_MASK
 CFG_TESTPIN_REG
-CONFIG_THOR_RESET_OFF
+CFG_THOR_RESET_OFF
 CONFIG_TPM_TIS_BASE_ADDRESS
 CONFIG_TSEC1
 CONFIG_TSEC1_NAME
-- 
2.25.1

[PoC 211/241] global: Migrate CONFIG_TPM_TIS_BASE_ADDRESS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                        | 2 +-
 include/configs/efi-x86_app.h | 2 +-
 include/configs/x86-common.h  | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 57ca5733dd64..aeb94d003f6a 100644
--- a/README
+++ b/README
@@ -585,7 +585,7 @@ The following options need to be configured:
 		Support for generic parallel port TPM devices. Only one device
 		per system is supported at this time.
 
-			CONFIG_TPM_TIS_BASE_ADDRESS
+			CFG_TPM_TIS_BASE_ADDRESS
 			Base address where the generic TPM device is mapped
 			to. Contemporary x86 systems usually map it at
 			0xfed40000.
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 96ad15b535d1..3420b4265a58 100644
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#undef CONFIG_TPM_TIS_BASE_ADDRESS
+#undef CFG_TPM_TIS_BASE_ADDRESS
 
 #define CFG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=vidconsole\0" \
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 9cfaa02958c8..becc87b1a6b4 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -16,7 +16,7 @@
  */
 
 /* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM_TIS_BASE_ADDRESS        0xfed40000
+#define CFG_TPM_TIS_BASE_ADDRESS        0xfed40000
 
 /*-----------------------------------------------------------------------
  * Serial Configuration
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b78294211ab0..34a34a2f0776 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -220,7 +220,7 @@ CFG_TEGRA_VDD_CORE_TPS62366A_SET1
 CFG_TESTPIN_MASK
 CFG_TESTPIN_REG
 CFG_THOR_RESET_OFF
-CONFIG_TPM_TIS_BASE_ADDRESS
+CFG_TPM_TIS_BASE_ADDRESS
 CONFIG_TSEC1
 CONFIG_TSEC1_NAME
 CONFIG_TSEC2
-- 
2.25.1

[PoC 212/241] global: Migrate CONFIG_TSEC1 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/pixis.c              | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c     | 2 +-
 board/freescale/p1010rdb/p1010rdb.c         | 2 +-
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 drivers/net/tsec.c                          | 2 +-
 include/configs/MPC837XERDB.h               | 6 +++---
 include/configs/MPC8548CDS.h                | 4 ++--
 include/configs/P1010RDB.h                  | 4 ++--
 include/configs/ls1021aiot.h                | 4 ++--
 include/configs/ls1021aqds.h                | 4 ++--
 include/configs/p1_p2_rdb_pc.h              | 4 ++--
 include/configs/socrates.h                  | 4 ++--
 scripts/config_whitelist.txt                | 4 ++--
 13 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 6fdb11039e54..37d502f7ff4b 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -296,7 +296,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc,
 		which_tsec = simple_strtoul(argv[1], NULL, 0);
 
 	switch (which_tsec) {
-#ifdef CONFIG_TSEC1
+#ifdef CFG_TSEC1
 	case 1:
 		mask = PIXIS_VSPEED2_TSEC1SER;
 		switch_mask = PIXIS_VCFGEN1_TSEC1SER;
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 73e024eaa011..4c10b1075e53 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -208,7 +208,7 @@ int board_eth_init(struct bd_info *bis)
 	struct tsec_info_struct tsec_info[4];
 	int num = 0;
 
-#ifdef CONFIG_TSEC1
+#ifdef CFG_TSEC1
 	SET_STD_TSEC_INFO(tsec_info[num], 1);
 	num++;
 #endif
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 0f014823c935..a527d44d6865 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -489,7 +489,7 @@ int board_eth_init(struct bd_info *bis)
 
 	cpu = gd->arch.cpu;
 
-#ifdef CONFIG_TSEC1
+#ifdef CFG_TSEC1
 	SET_STD_TSEC_INFO(tsec_info[num], 1);
 	num++;
 #endif
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 9e26c201b7a8..7d2b8ec12d9f 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -373,7 +373,7 @@ int board_eth_init(struct bd_info *bis)
 		(void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
 	int num = 0;
 
-#ifdef CONFIG_TSEC1
+#ifdef CFG_TSEC1
 	SET_STD_TSEC_INFO(tsec_info[num], 1);
 	num++;
 #endif
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 8b6f034ea165..ad2c68e2a73d 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -26,7 +26,7 @@
 /* Default initializations for TSEC controllers. */
 
 static struct tsec_info_struct tsec_info[] = {
-#ifdef CONFIG_TSEC1
+#ifdef CFG_TSEC1
 	STD_TSEC_INFO(1),	/* TSEC1 */
 #endif
 #ifdef CONFIG_TSEC2
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2ca7862147de..82101ced5323 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -185,10 +185,10 @@
 
 #define CFG_GMII			/* MII PHY management */
 
-#define CONFIG_TSEC1
+#define CFG_TSEC1
 
-#ifdef CONFIG_TSEC1
-#define CONFIG_TSEC1_NAME		"TSEC0"
+#ifdef CFG_TSEC1
+#define CFG_TSEC1_NAME		"TSEC0"
 #define CFG_SYS_TSEC1_OFFSET		0x24000
 #define TSEC1_PHY_ADDR			2
 #define TSEC1_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index d47378e19352..53639db0b9dd 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -285,8 +285,8 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"eTSEC0"
+#define CFG_TSEC1	1
+#define CFG_TSEC1_NAME	"eTSEC0"
 #define CONFIG_TSEC2	1
 #define CONFIG_TSEC2_NAME	"eTSEC1"
 #define CONFIG_TSEC3	1
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 04f270e11806..88865aac01eb 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -351,8 +351,8 @@ extern unsigned long get_sdram_size(void);
 
 #if defined(CONFIG_TSEC_ENET)
 #define CFG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"eTSEC1"
+#define CFG_TSEC1	1
+#define CFG_TSEC1_NAME	"eTSEC1"
 #define CONFIG_TSEC2	1
 #define CONFIG_TSEC2_NAME	"eTSEC2"
 #define CONFIG_TSEC3	1
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 08532dc3e0aa..fff4e816ecc1 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -72,8 +72,8 @@
 
 #ifdef CONFIG_TSEC_ENET
 #define CFG_MII_DEFAULT_TSEC		1
-#define CONFIG_TSEC1			1
-#define CONFIG_TSEC1_NAME		"eTSEC1"
+#define CFG_TSEC1			1
+#define CFG_TSEC1_NAME		"eTSEC1"
 #define CONFIG_TSEC2			1
 #define CONFIG_TSEC2_NAME		"eTSEC2"
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 498c89c3cf21..eab8ade5c9ef 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -253,8 +253,8 @@
 
 #ifdef CONFIG_TSEC_ENET
 #define CFG_MII_DEFAULT_TSEC		3
-#define CONFIG_TSEC1			1
-#define CONFIG_TSEC1_NAME		"eTSEC1"
+#define CFG_TSEC1			1
+#define CFG_TSEC1_NAME		"eTSEC1"
 #define CONFIG_TSEC2			1
 #define CONFIG_TSEC2_NAME		"eTSEC2"
 #define CONFIG_TSEC3			1
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 4ab2efd528d1..fa446c725c88 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -367,8 +367,8 @@
 #endif /* CONFIG_PCI */
 
 #if defined(CONFIG_TSEC_ENET)
-#define CONFIG_TSEC1
-#define CONFIG_TSEC1_NAME	"eTSEC1"
+#define CFG_TSEC1
+#define CFG_TSEC1_NAME	"eTSEC1"
 #define CONFIG_TSEC2
 #define CONFIG_TSEC2_NAME	"eTSEC2"
 #define CONFIG_TSEC3
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index ddbd257d08a5..bfba9782405f 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -111,8 +111,8 @@
 #define CFG_SYS_PCI1_MEM_PHYS	0x80000000
 #define CFG_SYS_PCI1_IO_PHYS	0xE2000000
 
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"TSEC0"
+#define CFG_TSEC1	1
+#define CFG_TSEC1_NAME	"TSEC0"
 #define CONFIG_TSEC3	1
 #define CONFIG_TSEC3_NAME	"TSEC1"
 #undef CONFIG_MPC85XX_FEC
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 34a34a2f0776..310ac53d91a1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -221,8 +221,8 @@ CFG_TESTPIN_MASK
 CFG_TESTPIN_REG
 CFG_THOR_RESET_OFF
 CFG_TPM_TIS_BASE_ADDRESS
-CONFIG_TSEC1
-CONFIG_TSEC1_NAME
+CFG_TSEC1
+CFG_TSEC1_NAME
 CONFIG_TSEC2
 CONFIG_TSEC2_NAME
 CONFIG_TSEC3
-- 
2.25.1

[PoC 213/241] global: Migrate CONFIG_TSEC2 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/pixis.c              | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c     | 2 +-
 board/freescale/p1010rdb/p1010rdb.c         | 2 +-
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 drivers/net/tsec.c                          | 2 +-
 include/configs/MPC837XERDB.h               | 6 +++---
 include/configs/MPC8548CDS.h                | 4 ++--
 include/configs/P1010RDB.h                  | 4 ++--
 include/configs/ls1021aiot.h                | 4 ++--
 include/configs/ls1021aqds.h                | 4 ++--
 include/configs/p1_p2_rdb_pc.h              | 4 ++--
 scripts/config_whitelist.txt                | 4 ++--
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 37d502f7ff4b..87deb4538a22 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -302,7 +302,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc,
 		switch_mask = PIXIS_VCFGEN1_TSEC1SER;
 		break;
 #endif
-#ifdef CONFIG_TSEC2
+#ifdef CFG_TSEC2
 	case 2:
 		mask = PIXIS_VSPEED2_TSEC2SER;
 		switch_mask = PIXIS_VCFGEN1_TSEC2SER;
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 4c10b1075e53..7ef204763eaa 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -212,7 +212,7 @@ int board_eth_init(struct bd_info *bis)
 	SET_STD_TSEC_INFO(tsec_info[num], 1);
 	num++;
 #endif
-#ifdef CONFIG_TSEC2
+#ifdef CFG_TSEC2
 	SET_STD_TSEC_INFO(tsec_info[num], 2);
 	num++;
 #endif
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index a527d44d6865..e7ba90a8d1a3 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -493,7 +493,7 @@ int board_eth_init(struct bd_info *bis)
 	SET_STD_TSEC_INFO(tsec_info[num], 1);
 	num++;
 #endif
-#ifdef CONFIG_TSEC2
+#ifdef CFG_TSEC2
 	SET_STD_TSEC_INFO(tsec_info[num], 2);
 	num++;
 #endif
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 7d2b8ec12d9f..5dac8fcce2cb 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -377,7 +377,7 @@ int board_eth_init(struct bd_info *bis)
 	SET_STD_TSEC_INFO(tsec_info[num], 1);
 	num++;
 #endif
-#ifdef CONFIG_TSEC2
+#ifdef CFG_TSEC2
 	SET_STD_TSEC_INFO(tsec_info[num], 2);
 	if (is_serdes_configured(SGMII_TSEC2)) {
 		printf("eTSEC2 is in sgmii mode.\n");
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index ad2c68e2a73d..7287c6ad4cbb 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -29,7 +29,7 @@ static struct tsec_info_struct tsec_info[] = {
 #ifdef CFG_TSEC1
 	STD_TSEC_INFO(1),	/* TSEC1 */
 #endif
-#ifdef CONFIG_TSEC2
+#ifdef CFG_TSEC2
 	STD_TSEC_INFO(2),	/* TSEC2 */
 #endif
 #ifdef CONFIG_MPC85XX_FEC
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 82101ced5323..b9ac67fae0be 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -41,7 +41,7 @@
 
 #ifdef CONFIG_VSC7385_ENET
 
-#define CONFIG_TSEC2
+#define CFG_TSEC2
 
 /* The flash address and size of the VSC7385 firmware image */
 #define CONFIG_VSC7385_IMAGE		0xFE7FE000
@@ -195,8 +195,8 @@
 #define TSEC1_PHYIDX			0
 #endif
 
-#ifdef CONFIG_TSEC2
-#define CONFIG_TSEC2_NAME		"TSEC1"
+#ifdef CFG_TSEC2
+#define CFG_TSEC2_NAME		"TSEC1"
 #define TSEC2_PHY_ADDR			0x1c
 #define TSEC2_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
 #define TSEC2_PHYIDX			0
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 53639db0b9dd..35154630add0 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -287,8 +287,8 @@
 
 #define CFG_TSEC1	1
 #define CFG_TSEC1_NAME	"eTSEC0"
-#define CONFIG_TSEC2	1
-#define CONFIG_TSEC2_NAME	"eTSEC1"
+#define CFG_TSEC2	1
+#define CFG_TSEC2_NAME	"eTSEC1"
 #define CONFIG_TSEC3	1
 #define CONFIG_TSEC3_NAME	"eTSEC2"
 #define CONFIG_TSEC4
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 88865aac01eb..b01b3b019662 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -353,8 +353,8 @@ extern unsigned long get_sdram_size(void);
 #define CFG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
 #define CFG_TSEC1	1
 #define CFG_TSEC1_NAME	"eTSEC1"
-#define CONFIG_TSEC2	1
-#define CONFIG_TSEC2_NAME	"eTSEC2"
+#define CFG_TSEC2	1
+#define CFG_TSEC2_NAME	"eTSEC2"
 #define CONFIG_TSEC3	1
 #define CONFIG_TSEC3_NAME	"eTSEC3"
 
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index fff4e816ecc1..f7063ca2a1a8 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -74,8 +74,8 @@
 #define CFG_MII_DEFAULT_TSEC		1
 #define CFG_TSEC1			1
 #define CFG_TSEC1_NAME		"eTSEC1"
-#define CONFIG_TSEC2			1
-#define CONFIG_TSEC2_NAME		"eTSEC2"
+#define CFG_TSEC2			1
+#define CFG_TSEC2_NAME		"eTSEC2"
 
 #define TSEC1_PHY_ADDR			1
 #define TSEC2_PHY_ADDR			3
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index eab8ade5c9ef..8747ef260b89 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -255,8 +255,8 @@
 #define CFG_MII_DEFAULT_TSEC		3
 #define CFG_TSEC1			1
 #define CFG_TSEC1_NAME		"eTSEC1"
-#define CONFIG_TSEC2			1
-#define CONFIG_TSEC2_NAME		"eTSEC2"
+#define CFG_TSEC2			1
+#define CFG_TSEC2_NAME		"eTSEC2"
 #define CONFIG_TSEC3			1
 #define CONFIG_TSEC3_NAME		"eTSEC3"
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index fa446c725c88..dfb2679883a9 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -369,8 +369,8 @@
 #if defined(CONFIG_TSEC_ENET)
 #define CFG_TSEC1
 #define CFG_TSEC1_NAME	"eTSEC1"
-#define CONFIG_TSEC2
-#define CONFIG_TSEC2_NAME	"eTSEC2"
+#define CFG_TSEC2
+#define CFG_TSEC2_NAME	"eTSEC2"
 #define CONFIG_TSEC3
 #define CONFIG_TSEC3_NAME	"eTSEC3"
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 310ac53d91a1..c4e7fdfa27fe 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -223,8 +223,8 @@ CFG_THOR_RESET_OFF
 CFG_TPM_TIS_BASE_ADDRESS
 CFG_TSEC1
 CFG_TSEC1_NAME
-CONFIG_TSEC2
-CONFIG_TSEC2_NAME
+CFG_TSEC2
+CFG_TSEC2_NAME
 CONFIG_TSEC3
 CONFIG_TSEC3_NAME
 CONFIG_TSEC4
-- 
2.25.1

[PoC 214/241] global: Migrate CONFIG_TSEC3 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/pixis.c              | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c     | 2 +-
 board/freescale/p1010rdb/p1010rdb.c         | 2 +-
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 drivers/net/tsec.c                          | 2 +-
 include/configs/MPC8548CDS.h                | 4 ++--
 include/configs/P1010RDB.h                  | 4 ++--
 include/configs/ls1021aqds.h                | 4 ++--
 include/configs/p1_p2_rdb_pc.h              | 4 ++--
 include/configs/socrates.h                  | 4 ++--
 scripts/config_whitelist.txt                | 4 ++--
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 87deb4538a22..ce60ec2c10f6 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -308,7 +308,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc,
 		switch_mask = PIXIS_VCFGEN1_TSEC2SER;
 		break;
 #endif
-#ifdef CONFIG_TSEC3
+#ifdef CFG_TSEC3
 	case 3:
 		mask = PIXIS_VSPEED2_TSEC3SER;
 		switch_mask = PIXIS_VCFGEN1_TSEC3SER;
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 7ef204763eaa..cbe8e0ddca99 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -216,7 +216,7 @@ int board_eth_init(struct bd_info *bis)
 	SET_STD_TSEC_INFO(tsec_info[num], 2);
 	num++;
 #endif
-#ifdef CONFIG_TSEC3
+#ifdef CFG_TSEC3
 	/* initialize TSEC3 only if Carrier is 1.3 or above on CDS */
 	if (get_board_version() >= 0x13) {
 		SET_STD_TSEC_INFO(tsec_info[num], 3);
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index e7ba90a8d1a3..4f98d7a5e2c6 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -497,7 +497,7 @@ int board_eth_init(struct bd_info *bis)
 	SET_STD_TSEC_INFO(tsec_info[num], 2);
 	num++;
 #endif
-#ifdef CONFIG_TSEC3
+#ifdef CFG_TSEC3
 	/* P1014 and it's derivatives do not support eTSEC3 */
 	if (cpu->soc_ver != SVR_P1014) {
 		SET_STD_TSEC_INFO(tsec_info[num], 3);
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 5dac8fcce2cb..b9f519aba6e9 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -385,7 +385,7 @@ int board_eth_init(struct bd_info *bis)
 	}
 	num++;
 #endif
-#ifdef CONFIG_TSEC3
+#ifdef CFG_TSEC3
 	SET_STD_TSEC_INFO(tsec_info[num], 3);
 	num++;
 #endif
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 7287c6ad4cbb..985cde092bca 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -41,7 +41,7 @@ static struct tsec_info_struct tsec_info[] = {
 		.mii_devname = DEFAULT_MII_NAME
 	},			/* FEC */
 #endif
-#ifdef CONFIG_TSEC3
+#ifdef CFG_TSEC3
 	STD_TSEC_INFO(3),	/* TSEC3 */
 #endif
 #ifdef CONFIG_TSEC4
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 35154630add0..7bc8f238e05b 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -289,8 +289,8 @@
 #define CFG_TSEC1_NAME	"eTSEC0"
 #define CFG_TSEC2	1
 #define CFG_TSEC2_NAME	"eTSEC1"
-#define CONFIG_TSEC3	1
-#define CONFIG_TSEC3_NAME	"eTSEC2"
+#define CFG_TSEC3	1
+#define CFG_TSEC3_NAME	"eTSEC2"
 #define CONFIG_TSEC4
 #define CONFIG_TSEC4_NAME	"eTSEC3"
 #undef CONFIG_MPC85XX_FEC
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b01b3b019662..dd8dd42b54d5 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -355,8 +355,8 @@ extern unsigned long get_sdram_size(void);
 #define CFG_TSEC1_NAME	"eTSEC1"
 #define CFG_TSEC2	1
 #define CFG_TSEC2_NAME	"eTSEC2"
-#define CONFIG_TSEC3	1
-#define CONFIG_TSEC3_NAME	"eTSEC3"
+#define CFG_TSEC3	1
+#define CFG_TSEC3_NAME	"eTSEC3"
 
 #define TSEC1_PHY_ADDR		1
 #define TSEC2_PHY_ADDR		0
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 8747ef260b89..c3c526d8558e 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -257,8 +257,8 @@
 #define CFG_TSEC1_NAME		"eTSEC1"
 #define CFG_TSEC2			1
 #define CFG_TSEC2_NAME		"eTSEC2"
-#define CONFIG_TSEC3			1
-#define CONFIG_TSEC3_NAME		"eTSEC3"
+#define CFG_TSEC3			1
+#define CFG_TSEC3_NAME		"eTSEC3"
 
 #define TSEC1_PHY_ADDR			1
 #define TSEC2_PHY_ADDR			2
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index dfb2679883a9..4560a432bed6 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -371,8 +371,8 @@
 #define CFG_TSEC1_NAME	"eTSEC1"
 #define CFG_TSEC2
 #define CFG_TSEC2_NAME	"eTSEC2"
-#define CONFIG_TSEC3
-#define CONFIG_TSEC3_NAME	"eTSEC3"
+#define CFG_TSEC3
+#define CFG_TSEC3_NAME	"eTSEC3"
 
 #define TSEC1_PHY_ADDR	2
 #define TSEC2_PHY_ADDR	0
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index bfba9782405f..3796d3464def 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -113,8 +113,8 @@
 
 #define CFG_TSEC1	1
 #define CFG_TSEC1_NAME	"TSEC0"
-#define CONFIG_TSEC3	1
-#define CONFIG_TSEC3_NAME	"TSEC1"
+#define CFG_TSEC3	1
+#define CFG_TSEC3_NAME	"TSEC1"
 #undef CONFIG_MPC85XX_FEC
 
 #define TSEC1_PHY_ADDR		0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c4e7fdfa27fe..a44112ccd25e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -225,8 +225,8 @@ CFG_TSEC1
 CFG_TSEC1_NAME
 CFG_TSEC2
 CFG_TSEC2_NAME
-CONFIG_TSEC3
-CONFIG_TSEC3_NAME
+CFG_TSEC3
+CFG_TSEC3_NAME
 CONFIG_TSEC4
 CONFIG_TSEC4_NAME
 CONFIG_TSECV2
-- 
2.25.1

[PoC 215/241] global: Migrate CONFIG_TSEC4 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/pixis.c          | 2 +-
 board/freescale/mpc8548cds/mpc8548cds.c | 2 +-
 drivers/net/tsec.c                      | 2 +-
 include/configs/MPC8548CDS.h            | 4 ++--
 scripts/config_whitelist.txt            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index ce60ec2c10f6..ad4d52a36e25 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -314,7 +314,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc,
 		switch_mask = PIXIS_VCFGEN1_TSEC3SER;
 		break;
 #endif
-#ifdef CONFIG_TSEC4
+#ifdef CFG_TSEC4
 	case 4:
 		mask = PIXIS_VSPEED2_TSEC4SER;
 		switch_mask = PIXIS_VCFGEN1_TSEC4SER;
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index cbe8e0ddca99..e7e271ee2d53 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -224,7 +224,7 @@ int board_eth_init(struct bd_info *bis)
 		num++;
 	}
 #endif
-#ifdef CONFIG_TSEC4
+#ifdef CFG_TSEC4
 	/* initialize TSEC4 only if Carrier is 1.3 or above on CDS */
 	if (get_board_version() >= 0x13) {
 		SET_STD_TSEC_INFO(tsec_info[num], 4);
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 985cde092bca..734e10c563e0 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -44,7 +44,7 @@ static struct tsec_info_struct tsec_info[] = {
 #ifdef CFG_TSEC3
 	STD_TSEC_INFO(3),	/* TSEC3 */
 #endif
-#ifdef CONFIG_TSEC4
+#ifdef CFG_TSEC4
 	STD_TSEC_INFO(4),	/* TSEC4 */
 #endif
 };
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 7bc8f238e05b..a493d73a4a82 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -291,8 +291,8 @@
 #define CFG_TSEC2_NAME	"eTSEC1"
 #define CFG_TSEC3	1
 #define CFG_TSEC3_NAME	"eTSEC2"
-#define CONFIG_TSEC4
-#define CONFIG_TSEC4_NAME	"eTSEC3"
+#define CFG_TSEC4
+#define CFG_TSEC4_NAME	"eTSEC3"
 #undef CONFIG_MPC85XX_FEC
 
 #define TSEC1_PHY_ADDR		0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a44112ccd25e..fa67d6fe3468 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -227,8 +227,8 @@ CFG_TSEC2
 CFG_TSEC2_NAME
 CFG_TSEC3
 CFG_TSEC3_NAME
-CONFIG_TSEC4
-CONFIG_TSEC4_NAME
+CFG_TSEC4
+CFG_TSEC4_NAME
 CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBICR_SETTINGS
-- 
2.25.1

[PoC 216/241] global: Migrate CONFIG_TSECV2 to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/include/asm/config_mpc85xx.h | 18 +++++++++---------
 arch/powerpc/include/asm/immap_85xx.h     |  4 ++--
 scripts/config_whitelist.txt              |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 0a67c76b61d6..b81ce1f98ba2 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -24,18 +24,18 @@
 
 #elif defined(CONFIG_ARCH_P1010)
 #define CFG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 
 /* P1011 is single core version of P1020 */
 #elif defined(CONFIG_ARCH_P1011)
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 
 #elif defined(CONFIG_ARCH_P1020)
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 
 #elif defined(CONFIG_ARCH_P1021)
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
 #define QE_NUM_OF_SNUM			28
@@ -49,11 +49,11 @@
 
 /* P1024 is lower end variant of P1020 */
 #elif defined(CONFIG_ARCH_P1024)
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 
 /* P1025 is lower end variant of P1021 */
 #elif defined(CONFIG_ARCH_P1025)
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
 #define QE_NUM_OF_SNUM			28
@@ -108,12 +108,12 @@
 
 #elif defined(CONFIG_ARCH_BSC9131)
 #define CFG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_BSC9132)
 #define CFG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2
+#define CFG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_T4240)
@@ -221,7 +221,7 @@
 
 #elif defined(CONFIG_ARCH_C29X)
 #define CFG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2_1
+#define CFG_TSECV2_1
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FSL_SEC_IDX_OFFSET	0x20000
 
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 05b83952f231..7fdbf8504f32 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2541,9 +2541,9 @@ struct ccsr_pman {
 #define CFG_SYS_MPC85xx_USB2_OFFSET		0x23000
 #define CFG_SYS_MPC85xx_USB1_PHY_OFFSET	0xE5000
 #define CFG_SYS_MPC85xx_USB2_PHY_OFFSET	0xE5100
-#ifdef CONFIG_TSECV2
+#ifdef CFG_TSECV2
 #define CFG_SYS_TSEC1_OFFSET			0xB0000
-#elif defined(CONFIG_TSECV2_1)
+#elif defined(CFG_TSECV2_1)
 #define CFG_SYS_TSEC1_OFFSET			0x10000
 #else
 #define CFG_SYS_TSEC1_OFFSET			0x24000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fa67d6fe3468..1d60965b520c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -229,8 +229,8 @@ CFG_TSEC3
 CFG_TSEC3_NAME
 CFG_TSEC4
 CFG_TSEC4_NAME
-CONFIG_TSECV2
-CONFIG_TSECV2_1
+CFG_TSECV2
+CFG_TSECV2_1
 CONFIG_TSEC_TBICR_SETTINGS
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
-- 
2.25.1

[PoC 217/241] global: Migrate CONFIG_TSEC_TBICR_SETTINGS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/tsec.c           | 8 ++++----
 include/configs/P1010RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 734e10c563e0..7ad690a1c875 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -57,14 +57,14 @@ static struct tsec_info_struct tsec_info[] = {
 		)
 
 /* By default force the TBI PHY into 1000Mbps full duplex when in SGMII mode */
-#ifndef CONFIG_TSEC_TBICR_SETTINGS
-#define CONFIG_TSEC_TBICR_SETTINGS ( \
+#ifndef CFG_TSEC_TBICR_SETTINGS
+#define CFG_TSEC_TBICR_SETTINGS ( \
 		TBICR_PHY_RESET \
 		| TBICR_ANEG_ENABLE \
 		| TBICR_FULL_DUPLEX \
 		| TBICR_SPEED1_SET \
 		)
-#endif /* CONFIG_TSEC_TBICR_SETTINGS */
+#endif /* CFG_TSEC_TBICR_SETTINGS */
 
 /* Configure the TBI for SGMII operation */
 static void tsec_configure_serdes(struct tsec_private *priv)
@@ -78,7 +78,7 @@ static void tsec_configure_serdes(struct tsec_private *priv)
 	tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa),
 			      0, TBI_TBICON, TBICON_CLK_SELECT);
 	tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa),
-			      0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS);
+			      0, TBI_CR, CFG_TSEC_TBICR_SETTINGS);
 }
 
 /* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index dd8dd42b54d5..91e5c544f616 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void);
 #define TSEC3_PHYIDX		0
 
 /* TBI PHY configuration for SGMII mode */
-#define CONFIG_TSEC_TBICR_SETTINGS ( \
+#define CFG_TSEC_TBICR_SETTINGS ( \
 		TBICR_PHY_RESET \
 		| TBICR_ANEG_ENABLE \
 		| TBICR_FULL_DUPLEX \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1d60965b520c..bd8a5af65985 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -231,7 +231,7 @@ CFG_TSEC4
 CFG_TSEC4_NAME
 CFG_TSECV2
 CFG_TSECV2_1
-CONFIG_TSEC_TBICR_SETTINGS
+CFG_TSEC_TBICR_SETTINGS
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBOOTPATH
-- 
2.25.1

[PoC 218/241] global: Migrate CONFIG_UBIFS_VOLUME to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/x530.h       | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/x530.h b/include/configs/x530.h
index f20a85cfa19a..6f8a393d0782 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -54,6 +54,6 @@
 	"initrd_high=0x10000000\0"
 
 #define CONFIG_UBI_PART			user
-#define CONFIG_UBIFS_VOLUME		user
+#define CFG_UBIFS_VOLUME		user
 
 #endif /* _CONFIG_X530_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bd8a5af65985..d2872d406039 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -232,7 +232,7 @@ CFG_TSEC4_NAME
 CFG_TSECV2
 CFG_TSECV2_1
 CFG_TSEC_TBICR_SETTINGS
-CONFIG_UBIFS_VOLUME
+CFG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBOOTPATH
 CONFIG_UBOOT_SECTOR_COUNT
-- 
2.25.1

[PoC 219/241] global: Migrate CONFIG_UBI_PART to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/x530.h       | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/x530.h b/include/configs/x530.h
index 6f8a393d0782..777b757babee 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -53,7 +53,7 @@
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
-#define CONFIG_UBI_PART			user
+#define CFG_UBI_PART			user
 #define CFG_UBIFS_VOLUME		user
 
 #endif /* _CONFIG_X530_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index d2872d406039..c2bc53a582f0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -233,7 +233,7 @@ CFG_TSECV2
 CFG_TSECV2_1
 CFG_TSEC_TBICR_SETTINGS
 CFG_UBIFS_VOLUME
-CONFIG_UBI_PART
+CFG_UBI_PART
 CONFIG_UBOOTPATH
 CONFIG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
-- 
2.25.1

[PoC 220/241] global: Migrate CONFIG_UBOOTPATH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/MPC837XERDB.h  | 4 ++--
 include/configs/MPC8548CDS.h   | 4 ++--
 include/configs/P1010RDB.h     | 4 ++--
 include/configs/P2041RDB.h     | 4 ++--
 include/configs/T102xRDB.h     | 4 ++--
 include/configs/T104xRDB.h     | 4 ++--
 include/configs/T208xQDS.h     | 4 ++--
 include/configs/T208xRDB.h     | 4 ++--
 include/configs/T4240RDB.h     | 4 ++--
 include/configs/p1_p2_rdb_pc.h | 4 ++--
 include/configs/qemu-ppce500.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index b9ac67fae0be..13406cfa547b 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -228,12 +228,12 @@
 #define CFG_HOSTNAME		"mpc837x_rdb"
 #define CFG_ROOTPATH		"/nfsroot"
 				/* U-Boot image on TFTP server */
-#define CONFIG_UBOOTPATH	"u-boot.bin"
+#define CFG_UBOOTPATH	"u-boot.bin"
 #define CFG_FDTFILE		"mpc8379_rdb.dtb"
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"netdev=" CFG_NETDEV "\0"				\
-	"uboot=" CONFIG_UBOOTPATH "\0"					\
+	"uboot=" CFG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
 		"protect off " __stringify(CONFIG_TEXT_BASE)	\
 			" +$filesize; "	\
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index a493d73a4a82..ef3f8f4b2b0e 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -329,7 +329,7 @@
 
 #define CFG_HOSTNAME	 "unknown"
 #define CFG_ROOTPATH	 "/nfsroot"
-#define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
+#define CFG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
 #define CFG_SERVERIP	 192.168.1.1
 #define CFG_GATEWAYIP 192.168.1.1
@@ -338,7 +338,7 @@
 #define	CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
 	"netdev=eth0\0"				\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot; "	\
 		"protect off " __stringify(CONFIG_TEXT_BASE)	\
 			" +$filesize; "	\
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 91e5c544f616..15700b390b66 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -413,12 +413,12 @@ extern unsigned long get_sdram_size(void);
  */
 
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
+#define CFG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
 #define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"	\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"		\
 	"loadaddr=1000000\0"			\
 	"consoledev=ttyS0\0"				\
 	"ramdiskaddr=2000000\0"			\
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 5432ad9e3950..2fa9d777b926 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -309,7 +309,7 @@
  * Environment Configuration
  */
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin
+#define CFG_UBOOTPATH	u-boot.bin
 
 #define __USB_PHY_TYPE	utmi
 
@@ -317,7 +317,7 @@
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"bank_intlv=cs0_cs1\0"					\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"			\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"			\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"		\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 36db5a5ad0bf..dff468d93bf1 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -424,7 +424,7 @@
  * Environment Configuration
  */
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
+#define CFG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 #define __USB_PHY_TYPE		utmi
 
 #ifdef CONFIG_ARCH_T1024
@@ -443,7 +443,7 @@
 	ARCH_EXTRA_ENV_SETTINGS					\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"  \
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"bootargs=root=/dev/ram rw console=ttyS0,115200\0" \
 	"netdev=eth0\0"						\
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index b7aab1c1087c..7b9669a6eb98 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -414,7 +414,7 @@
  * Environment Configuration
  */
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
+#define CFG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
 
 #define __USB_PHY_TYPE	utmi
 #define RAMDISKFILE	"t104xrdb/ramdisk.uboot"
@@ -436,7 +436,7 @@
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
 	"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 9d0141586156..ac1a7614b6a2 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -422,7 +422,7 @@
  * Environment Configuration
  */
 #define CFG_ROOTPATH	 "/opt/nfsroot"
-#define CONFIG_UBOOTPATH "u-boot.bin"	/* U-Boot image on TFTP server */
+#define CFG_UBOOTPATH "u-boot.bin"	/* U-Boot image on TFTP server */
 
 #define __USB_PHY_TYPE		utmi
 
@@ -432,7 +432,7 @@
 	"bank_intlv=auto;"					\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index fb7bdea3fe48..3f51554d2322 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -388,7 +388,7 @@
  * Environment Configuration
  */
 #define CFG_ROOTPATH	 "/opt/nfsroot"
-#define CONFIG_UBOOTPATH "u-boot.bin"	/* U-Boot image on TFTP server */
+#define CFG_UBOOTPATH "u-boot.bin"	/* U-Boot image on TFTP server */
 
 #define __USB_PHY_TYPE		utmi
 
@@ -398,7 +398,7 @@
 	"bank_intlv=auto;"					\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 1b3eb7d9f2b8..9081bd03749d 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -139,7 +139,7 @@
  * Environment Configuration
  */
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
+#define CFG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
 
 #define HVBOOT					\
 	"setenv bootargs config-addr=0x60000000; "	\
@@ -388,7 +388,7 @@
 	"bank_intlv=auto;"					\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" __stringify(CFG_UBOOTPATH) "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 4560a432bed6..2dc271771615 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -420,13 +420,13 @@
  */
 #define CFG_HOSTNAME		"unknown"
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
+#define CFG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
 #include "p1_p2_bootsrc.h"
 
 #define	CFG_EXTRA_ENV_SETTINGS	\
 "netdev=eth0\0"	\
-"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
+"uboot=" __stringify(CFG_UBOOTPATH) "\0"	\
 "loadaddr=1000000\0"	\
 "bootfile=uImage\0"	\
 "tftpflash=tftpboot $loadaddr $uboot; "	\
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index edf8222d5411..9040874a23ea 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -59,6 +59,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
  * Environment Configuration
  */
 #define CFG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
+#define CFG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
 
 #endif	/* __QEMU_PPCE500_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c2bc53a582f0..cd44d281e0ec 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -234,7 +234,7 @@ CFG_TSECV2_1
 CFG_TSEC_TBICR_SETTINGS
 CFG_UBIFS_VOLUME
 CFG_UBI_PART
-CONFIG_UBOOTPATH
+CFG_UBOOTPATH
 CONFIG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
 CONFIG_UEC_ETH
-- 
2.25.1

[PoC 221/241] global: Migrate CONFIG_UBOOT_SECTOR_COUNT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/xpress.h     | 4 ++--
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index f8ee40a9543b..2b57ba34be9c 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -35,7 +35,7 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_UBOOT_SECTOR_START	0x2
-#define CONFIG_UBOOT_SECTOR_COUNT	0x3fe
+#define CFG_UBOOT_SECTOR_COUNT	0x3fe
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
@@ -76,7 +76,7 @@
 		"fi;\0" \
 	"uboot=ccv/u-boot.imx\0"					\
 	"uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0"	\
-	"uboot_size="__stringify(CONFIG_UBOOT_SECTOR_COUNT)"\0"		\
+	"uboot_size="__stringify(CFG_UBOOT_SECTOR_COUNT)"\0"		\
 	"update_uboot=if tftp ${uboot}; then "				\
 		"if itest ${filesize} > 0; then "			\
 			"mmc dev 0 1;"					\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cd44d281e0ec..a520c70a2baf 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -235,7 +235,7 @@ CFG_TSEC_TBICR_SETTINGS
 CFG_UBIFS_VOLUME
 CFG_UBI_PART
 CFG_UBOOTPATH
-CONFIG_UBOOT_SECTOR_COUNT
+CFG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
 CONFIG_UEC_ETH
 CONFIG_USART_BASE
-- 
2.25.1

[PoC 222/241] global: Migrate CONFIG_UBOOT_SECTOR_START to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/xpress.h     | 4 ++--
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 2b57ba34be9c..fc1b08360ce5 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -34,7 +34,7 @@
 #define CFG_FEC_ENET_DEV		0
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_UBOOT_SECTOR_START	0x2
+#define CFG_UBOOT_SECTOR_START	0x2
 #define CFG_UBOOT_SECTOR_COUNT	0x3fe
 
 #define CFG_EXTRA_ENV_SETTINGS \
@@ -75,7 +75,7 @@
 			"bootz; " \
 		"fi;\0" \
 	"uboot=ccv/u-boot.imx\0"					\
-	"uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0"	\
+	"uboot_start="__stringify(CFG_UBOOT_SECTOR_START)"\0"	\
 	"uboot_size="__stringify(CFG_UBOOT_SECTOR_COUNT)"\0"		\
 	"update_uboot=if tftp ${uboot}; then "				\
 		"if itest ${filesize} > 0; then "			\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a520c70a2baf..ba5d1be700a3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -236,7 +236,7 @@ CFG_UBIFS_VOLUME
 CFG_UBI_PART
 CFG_UBOOTPATH
 CFG_UBOOT_SECTOR_COUNT
-CONFIG_UBOOT_SECTOR_START
+CFG_UBOOT_SECTOR_START
 CONFIG_UEC_ETH
 CONFIG_USART_BASE
 CONFIG_USART_ID
-- 
2.25.1

[PoC 223/241] global: Migrate CONFIG_UEC_ETH to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/cpu.c              |  2 +-
 arch/powerpc/cpu/mpc8xxx/cpu.c              |  2 +-
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c |  2 +-
 drivers/qe/uec.c                            | 16 ++++++++--------
 include/configs/km/km-mpc83xx.h             |  2 +-
 scripts/config_whitelist.txt                |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d531898bd89..52d804cce19d 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -187,7 +187,7 @@ void watchdog_reset (void)
  */
 int cpu_eth_init(struct bd_info *bis)
 {
-#if defined(CONFIG_UEC_ETH)
+#if defined(CFG_UEC_ETH)
 	uec_standard_init(bis);
 #endif
 
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 7f2019092296..3ee6908f436b 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -351,7 +351,7 @@ int fixup_cpu(void)
  */
 int cpu_eth_init(struct bd_info *bis)
 {
-#if defined(CONFIG_UEC_ETH)
+#if defined(CFG_UEC_ETH)
 	uec_standard_init(bis);
 #endif
 
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index b9f519aba6e9..f9eea1ad9c58 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -402,7 +402,7 @@ int board_eth_init(struct bd_info *bis)
 
 	tsec_eth_init(bis, tsec_info, num);
 
-#if defined(CONFIG_UEC_ETH)
+#if defined(CFG_UEC_ETH)
 	/*  QE0 and QE3 need to be exposed for UCC1 and UCC5 Eth mode */
 	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE0);
 	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE3);
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 310887964352..feac4f701e60 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -27,28 +27,28 @@
 #endif
 
 static struct uec_inf uec_info[] = {
-#ifdef CONFIG_UEC_ETH1
+#ifdef CFG_UEC_ETH1
 	STD_UEC_INFO(1),	/* UEC1 */
 #endif
-#ifdef CONFIG_UEC_ETH2
+#ifdef CFG_UEC_ETH2
 	STD_UEC_INFO(2),	/* UEC2 */
 #endif
-#ifdef CONFIG_UEC_ETH3
+#ifdef CFG_UEC_ETH3
 	STD_UEC_INFO(3),	/* UEC3 */
 #endif
-#ifdef CONFIG_UEC_ETH4
+#ifdef CFG_UEC_ETH4
 	STD_UEC_INFO(4),	/* UEC4 */
 #endif
-#ifdef CONFIG_UEC_ETH5
+#ifdef CFG_UEC_ETH5
 	STD_UEC_INFO(5),	/* UEC5 */
 #endif
-#ifdef CONFIG_UEC_ETH6
+#ifdef CFG_UEC_ETH6
 	STD_UEC_INFO(6),	/* UEC6 */
 #endif
-#ifdef CONFIG_UEC_ETH7
+#ifdef CFG_UEC_ETH7
 	STD_UEC_INFO(7),	/* UEC7 */
 #endif
-#ifdef CONFIG_UEC_ETH8
+#ifdef CFG_UEC_ETH8
 	STD_UEC_INFO(8),	/* UEC8 */
 #endif
 };
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 3192ca7742a7..8e4d40dd7683 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -94,4 +94,4 @@
 /*
  * QE UEC ethernet configuration
  */
-#define CONFIG_UEC_ETH
+#define CFG_UEC_ETH
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ba5d1be700a3..83c7abfab261 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -237,7 +237,7 @@ CFG_UBI_PART
 CFG_UBOOTPATH
 CFG_UBOOT_SECTOR_COUNT
 CFG_UBOOT_SECTOR_START
-CONFIG_UEC_ETH
+CFG_UEC_ETH
 CONFIG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
-- 
2.25.1

[PoC 224/241] global: Migrate CONFIG_USART_BASE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/atmel_usart.c        | 10 +++++-----
 include/configs/corvus.h            |  2 +-
 include/configs/sam9x60_curiosity.h |  2 +-
 include/configs/sam9x60ek.h         |  2 +-
 include/configs/smartweb.h          |  2 +-
 include/configs/taurus.h            |  2 +-
 include/configs/vinco.h             |  2 +-
 scripts/config_whitelist.txt        |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 90ccdf6b2945..56655427b06b 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -72,13 +72,13 @@ static void atmel_serial_activate(atmel_usart3_t *usart)
 
 static void atmel_serial_setbrg(void)
 {
-	atmel_serial_setbrg_internal((atmel_usart3_t *)CONFIG_USART_BASE,
+	atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
 				     CONFIG_USART_ID, gd->baudrate);
 }
 
 static int atmel_serial_init(void)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
 	atmel_serial_init_internal(usart);
 	serial_setbrg();
@@ -89,7 +89,7 @@ static int atmel_serial_init(void)
 
 static void atmel_serial_putc(char c)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
 	if (c == '\n')
 		serial_putc('\r');
@@ -100,7 +100,7 @@ static void atmel_serial_putc(char c)
 
 static int atmel_serial_getc(void)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
 	while (!(readl(&usart->csr) & USART3_BIT(RXRDY)))
 		 schedule();
@@ -109,7 +109,7 @@ static int atmel_serial_getc(void)
 
 static int atmel_serial_tstc(void)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 	return (readl(&usart->csr) & USART3_BIT(RXRDY)) != 0;
 }
 
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 8a61086ecc15..c9eb75d93088 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* serial console */
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CFG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /* SDRAM */
diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h
index f44ce909b918..204020d5ee74 100644
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_AT91_SLOW_CLOCK	32768
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
-#define CONFIG_USART_BASE   ATMEL_BASE_DBGU
+#define CFG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     0 /* ignored in arm */
 
 /* SDRAM */
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 27b39ebf4174..800b98ff98af 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_AT91_SLOW_CLOCK	32768
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
-#define CONFIG_USART_BASE   ATMEL_BASE_DBGU
+#define CFG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     0 /* ignored in arm */
 
 /*
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 762f61470b15..f9a5aa9e32d0 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -61,7 +61,7 @@
 #define CFG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 
 /* serial console */
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CFG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /* DFU class support */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 855218a8901e..88870d6fdf69 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -34,7 +34,7 @@
 
 /* Misc CPU related */
 
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CFG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /*
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 1e1175f00689..9d6abbf7b342 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -17,7 +17,7 @@
 /* The value in the common file is too far away for the VInCo platform */
 
 /* serial console */
-#define CONFIG_USART_BASE		0xfc00c000
+#define CFG_USART_BASE		0xfc00c000
 #define CONFIG_USART_ID			30
 
 /* Timer */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 83c7abfab261..1b89145261ce 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -238,7 +238,7 @@ CFG_UBOOTPATH
 CFG_UBOOT_SECTOR_COUNT
 CFG_UBOOT_SECTOR_START
 CFG_UEC_ETH
-CONFIG_USART_BASE
+CFG_USART_BASE
 CONFIG_USART_ID
 CONFIG_USBD_HS
 CONFIG_USB_BOOTING
-- 
2.25.1

[PoC 225/241] global: Migrate CONFIG_USART_ID to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/atmel_usart.c        | 2 +-
 include/configs/corvus.h            | 2 +-
 include/configs/sam9x60_curiosity.h | 2 +-
 include/configs/sam9x60ek.h         | 2 +-
 include/configs/smartweb.h          | 2 +-
 include/configs/taurus.h            | 2 +-
 include/configs/vinco.h             | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 56655427b06b..9d97bc865445 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -73,7 +73,7 @@ static void atmel_serial_activate(atmel_usart3_t *usart)
 static void atmel_serial_setbrg(void)
 {
 	atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
-				     CONFIG_USART_ID, gd->baudrate);
+				     CFG_USART_ID, gd->baudrate);
 }
 
 static int atmel_serial_init(void)
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index c9eb75d93088..f2675e0ec864 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -29,7 +29,7 @@
 
 /* serial console */
 #define CFG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CFG_USART_ID			ATMEL_ID_SYS
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h
index 204020d5ee74..e79f80f17f61 100644
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
 #define CFG_USART_BASE   ATMEL_BASE_DBGU
-#define CONFIG_USART_ID     0 /* ignored in arm */
+#define CFG_USART_ID     0 /* ignored in arm */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE		0x20000000
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 800b98ff98af..2c761821efb1 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -15,7 +15,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
 #define CFG_USART_BASE   ATMEL_BASE_DBGU
-#define CONFIG_USART_ID     0 /* ignored in arm */
+#define CFG_USART_ID     0 /* ignored in arm */
 
 /*
  * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index f9a5aa9e32d0..75a1670e3317 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -62,7 +62,7 @@
 
 /* serial console */
 #define CFG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CFG_USART_ID			ATMEL_ID_SYS
 
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 88870d6fdf69..174b848e2595 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -35,7 +35,7 @@
 /* Misc CPU related */
 
 #define CFG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CFG_USART_ID			ATMEL_ID_SYS
 
 /*
  * SDRAM: 1 bank, min 32, max 128 MB
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 9d6abbf7b342..1d7a3a1562a0 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -18,7 +18,7 @@
 
 /* serial console */
 #define CFG_USART_BASE		0xfc00c000
-#define CONFIG_USART_ID			30
+#define CFG_USART_ID			30
 
 /* Timer */
 #define CFG_SYS_TIMER_COUNTER	0xfc06863c
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1b89145261ce..96532633226f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -239,7 +239,7 @@ CFG_UBOOT_SECTOR_COUNT
 CFG_UBOOT_SECTOR_START
 CFG_UEC_ETH
 CFG_USART_BASE
-CONFIG_USART_ID
+CFG_USART_ID
 CONFIG_USBD_HS
 CONFIG_USB_BOOTING
 CONFIG_USB_EXT2_BOOT
-- 
2.25.1

[PoC 226/241] global: Migrate CONFIG_USBD_HS to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                 |  2 +-
 drivers/serial/usbtty.c                | 12 ++++++------
 drivers/serial/usbtty.h                |  2 +-
 drivers/usb/gadget/ep0.c               |  2 +-
 include/configs/apalis_imx6.h          |  2 +-
 include/configs/colibri-imx6ull.h      |  2 +-
 include/configs/colibri_imx6.h         |  2 +-
 include/configs/colibri_imx7.h         |  2 +-
 include/configs/ge_b1x5v2.h            |  2 +-
 include/configs/gw_ventana.h           |  2 +-
 include/configs/imx7-cm.h              |  2 +-
 include/configs/librem5.h              |  2 +-
 include/configs/mx6sabre_common.h      |  2 +-
 include/configs/mx7dsabresd.h          |  2 +-
 include/configs/nitrogen6x.h           |  2 +-
 include/configs/novena.h               |  2 +-
 include/configs/pico-imx6ul.h          |  2 +-
 include/configs/siemens-am33x-common.h |  2 +-
 include/configs/tbs2910.h              |  2 +-
 include/configs/warp7.h                |  2 +-
 include/usbdescriptors.h               |  2 +-
 include/usbdevice.h                    |  8 ++++----
 scripts/config_whitelist.txt           |  2 +-
 23 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README b/README
index aeb94d003f6a..43b34f4118c4 100644
--- a/README
+++ b/README
@@ -629,7 +629,7 @@ The following options need to be configured:
 		variable usbtty to be cdc_acm should suffice. The following
 		might be defined in YourBoardName.h
 
-			CONFIG_USBD_HS
+			CFG_USBD_HS
 			Define this to enable the high speed support for usb
 			device and usbtty. If this feature is enabled, a routine
 			int is_usbd_high_speed(void)
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index 4f4eb02de083..984a6c93f313 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -121,7 +121,7 @@ static struct usb_device_descriptor device_descriptor = {
 };
 
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 static struct usb_qualifier_descriptor qualifier_descriptor = {
 	.bLength = sizeof(struct usb_qualifier_descriptor),
 	.bDescriptorType =	USB_DT_QUAL,
@@ -639,7 +639,7 @@ static void usbtty_init_instances (void)
 	memset (device_instance, 0, sizeof (struct usb_device_instance));
 	device_instance->device_state = STATE_INIT;
 	device_instance->device_descriptor = &device_descriptor;
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 	device_instance->qualifier_descriptor = &qualifier_descriptor;
 #endif
 	device_instance->event = usbtty_event_handler;
@@ -755,7 +755,7 @@ static void usbtty_init_terminal_type(short type)
 			device_descriptor.idProduct =
 				cpu_to_le16(CONFIG_USBD_PRODUCTID_CDCACM);
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 			qualifier_descriptor.bDeviceClass =
 				COMMUNICATIONS_DEVICE_CLASS;
 #endif
@@ -787,7 +787,7 @@ static void usbtty_init_terminal_type(short type)
 			device_descriptor.bDeviceClass = 0xFF;
 			device_descriptor.idProduct =
 				cpu_to_le16(CONFIG_USBD_PRODUCTID_GSERIAL);
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 			qualifier_descriptor.bDeviceClass = 0xFF;
 #endif
 			/* Assign endpoint indices */
@@ -937,7 +937,7 @@ static int usbtty_configured (void)
 static void usbtty_event_handler (struct usb_device_instance *device,
 				  usb_device_event_t event, int data)
 {
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 	int i;
 #endif
 	switch (event) {
@@ -950,7 +950,7 @@ static void usbtty_event_handler (struct usb_device_instance *device,
 		break;
 
 	case DEVICE_ADDRESS_ASSIGNED:
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 		/*
 		 * is_usbd_high_speed routine needs to be defined by
 		 * specific gadget driver
diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h
index e27aa368c9af..002d69a40f1d 100644
--- a/drivers/serial/usbtty.h
+++ b/drivers/serial/usbtty.h
@@ -51,7 +51,7 @@
 #define CONFIG_USBD_SERIAL_INT_PKTSIZE	UDC_INT_PACKET_SIZE
 #define CONFIG_USBD_SERIAL_BULK_PKTSIZE	UDC_BULK_PACKET_SIZE
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 #define CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE	UDC_BULK_HS_PACKET_SIZE
 #endif
 
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c
index 6624f61b763c..84ef8abfe52e 100644
--- a/drivers/usb/gadget/ep0.c
+++ b/drivers/usb/gadget/ep0.c
@@ -371,7 +371,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device,
 		}
 		break;
 	case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER:
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 		{
 			struct usb_qualifier_descriptor *qualifier_descriptor =
 				device->qualifier_descriptor;
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 02de22ce6a24..d41e12460f57 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -29,7 +29,7 @@
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Client */
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index b744ae1d6e85..dd5ae3dff804 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -130,7 +130,7 @@
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index e34d933abae2..2a0408c0b137 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -26,7 +26,7 @@
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Client */
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* Command definition */
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 8efcc8c17b3d..bc2fb9358b3b 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -174,6 +174,6 @@
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #endif
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index dd3c56c480be..c1e004b24e12 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -26,7 +26,7 @@
 /* USB */
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* Memory */
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4d0acdd0f3b6..5aec15179a63 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -38,7 +38,7 @@
 /* USB Configs */
 #define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS      0
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 4202c5928c2f..182ed606c734 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -81,6 +81,6 @@
 /* USB Configs */
 #define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 4725be264a9b..565b68623df8 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -27,7 +27,7 @@
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #define CONSOLE_ON_UART1
 
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index e1cdedf27680..38cfefcddcac 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -145,6 +145,6 @@
 
 /* Environment organization */
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 5392f38074ed..8384589509c7 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -101,6 +101,6 @@
 /* USB Configs */
 #define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index d35650a66e13..9ce2425e1c1b 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -11,7 +11,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #define CFG_MXC_UART_BASE	       UART2_BASE
 
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 000626dcb485..63ee19d58064 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -60,7 +60,7 @@
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 /* Gadget part */
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 #endif
 
 /* Extra U-Boot environment. */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 531e462485d8..aa2e6878901a 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -26,7 +26,7 @@
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CFG_MXC_USB_FLAGS		0
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 437a76165fd5..9d1fc1c910ca 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -73,7 +73,7 @@
  */
 
 /* USB DRACO ID as default */
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* USB Device Firmware Update support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 7debc90205a8..047279c8f481 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -29,7 +29,7 @@
 #ifdef CONFIG_CMD_USB
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #endif /* CONFIG_CMD_USB      */
 
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index ebc5f4aa6c91..6db4eb9d8406 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -95,7 +95,7 @@
 
 #define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
+#define CFG_USBD_HS
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h
index 9a5038745116..f7e28cf8d3f1 100644
--- a/include/usbdescriptors.h
+++ b/include/usbdescriptors.h
@@ -227,7 +227,7 @@ struct usb_device_descriptor {
 	u8 bNumConfigurations;
 } __attribute__ ((packed));
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 struct usb_qualifier_descriptor {
 	u8 bLength;
 	u8 bDescriptorType;
diff --git a/include/usbdevice.h b/include/usbdevice.h
index 611cd6e4abf7..373360c4a4c9 100644
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -196,7 +196,7 @@ struct usb_bus_instance;
 #define USB_DT_INTERFACE		0x04
 #define USB_DT_ENDPOINT			0x05
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 #define USB_DT_QUAL			0x06
 #endif
 
@@ -279,7 +279,7 @@ struct usb_bus_instance;
  * USB Spec Release number
  */
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 #define USB_BCD_VERSION			0x0200
 #else
 #define USB_BCD_VERSION			0x0110
@@ -552,7 +552,7 @@ struct usb_device_instance {
 	/* generic */
 	char *name;
 	struct usb_device_descriptor *device_descriptor;	/* per device descriptor */
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 	struct usb_qualifier_descriptor *qualifier_descriptor;
 #endif
 
@@ -644,7 +644,7 @@ struct usb_string_descriptor *usbd_get_string (u8);
 struct usb_device_descriptor *usbd_device_device_descriptor(struct
 		usb_device_instance *, int);
 
-#if defined(CONFIG_USBD_HS)
+#if defined(CFG_USBD_HS)
 /*
  * is_usbd_high_speed routine needs to be defined by specific gadget driver
  * It returns true if device enumerates at High speed
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 96532633226f..2c7beda9248d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -240,7 +240,7 @@ CFG_UBOOT_SECTOR_START
 CFG_UEC_ETH
 CFG_USART_BASE
 CFG_USART_ID
-CONFIG_USBD_HS
+CFG_USBD_HS
 CONFIG_USB_BOOTING
 CONFIG_USB_EXT2_BOOT
 CONFIG_USB_FAT_BOOT
-- 
2.25.1

[PoC 227/241] global: Migrate CONFIG_USB_BOOTING to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/spl_boot.c  | 6 +++---
 include/configs/exynos5-common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 83bdee9f8579..d3eabef0e801 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -78,7 +78,7 @@ void *get_irom_func(int index)
 	return (void *)*(u32 *)irom_ptr_table[index];
 }
 
-#ifdef CONFIG_USB_BOOTING
+#ifdef CFG_USB_BOOTING
 /*
  * Set/clear program flow prediction and return the previous state.
  */
@@ -227,7 +227,7 @@ void copy_uboot_to_ram(void)
 	u32 (*copy_bl2_from_emmc)(u32 nblock, u32 dst);
 	void (*end_bootop_from_emmc)(void);
 #endif
-#ifdef CONFIG_USB_BOOTING
+#ifdef CFG_USB_BOOTING
 	int is_cr_z_set;
 	unsigned int sec_boot_check;
 
@@ -271,7 +271,7 @@ void copy_uboot_to_ram(void)
 		end_bootop_from_emmc();
 		break;
 #endif
-#ifdef CONFIG_USB_BOOTING
+#ifdef CFG_USB_BOOTING
 	case BOOT_MODE_USB:
 		/*
 		 * iROM needs program flow prediction to be disabled
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index e8236a9ec418..b91e2614e8d5 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -58,7 +58,7 @@
 /* USB */
 
 /* USB boot mode */
-#define CONFIG_USB_BOOTING
+#define CFG_USB_BOOTING
 #define EXYNOS_COPY_USB_FNPTR_ADDR	0x02020070
 #define EXYNOS_USB_SECONDARY_BOOT	0xfeed0002
 #define EXYNOS_IRAM_SECONDARY_BASE	0x02020018
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2c7beda9248d..16d64d1cd3c3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -241,7 +241,7 @@ CFG_UEC_ETH
 CFG_USART_BASE
 CFG_USART_ID
 CFG_USBD_HS
-CONFIG_USB_BOOTING
+CFG_USB_BOOTING
 CONFIG_USB_EXT2_BOOT
 CONFIG_USB_FAT_BOOT
 CONFIG_USB_ISP1301_I2C_ADDR
-- 
2.25.1

[PoC 228/241] global: Migrate CONFIG_USB_EXT2_BOOT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 2dc271771615..19e20de248a2 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -472,7 +472,7 @@ RST_DEF_CMD(defboot) \
 "fatload usb 0:2 $ramdiskaddr $ramdiskfile;"	\
 "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_USB_EXT2_BOOT	\
+#define CFG_USB_EXT2_BOOT	\
 "setenv bootargs root=/dev/ram rw "	\
 "console=$consoledev,$baudrate $othbootargs " \
 "ramdisk_size=$ramdisk_size;"	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 16d64d1cd3c3..1fc2e1cc51d1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -242,7 +242,7 @@ CFG_USART_BASE
 CFG_USART_ID
 CFG_USBD_HS
 CFG_USB_BOOTING
-CONFIG_USB_EXT2_BOOT
+CFG_USB_EXT2_BOOT
 CONFIG_USB_FAT_BOOT
 CONFIG_USB_ISP1301_I2C_ADDR
 CONFIG_U_BOOT_HDR_SIZE
-- 
2.25.1

[PoC 229/241] global: Migrate CONFIG_USB_FAT_BOOT to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 19e20de248a2..9790b0ac896c 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -462,7 +462,7 @@ RST_PCIE_CMD(pciboot) \
 RST_DEF_CMD(defboot) \
 ""
 
-#define CONFIG_USB_FAT_BOOT	\
+#define CFG_USB_FAT_BOOT	\
 "setenv bootargs root=/dev/ram rw "	\
 "console=$consoledev,$baudrate $othbootargs " \
 "ramdisk_size=$ramdisk_size;"	\
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1fc2e1cc51d1..21ab949e0d20 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -243,7 +243,7 @@ CFG_USART_ID
 CFG_USBD_HS
 CFG_USB_BOOTING
 CFG_USB_EXT2_BOOT
-CONFIG_USB_FAT_BOOT
+CFG_USB_FAT_BOOT
 CONFIG_USB_ISP1301_I2C_ADDR
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
-- 
2.25.1

[PoC 230/241] global: Migrate CONFIG_USB_ISP1301_I2C_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/host/ohci-lpc32xx.c | 2 +-
 include/configs/devkit3250.h    | 2 +-
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index 3be0b311a36e..a04b2961b961 100644
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -69,7 +69,7 @@ struct otg_regs {
 #define OTG1_DM_PULLDOWN		(1 << 3)
 #define OTG1_VBUS_DRV			(1 << 5)
 
-#define ISP1301_I2C_ADDR		CONFIG_USB_ISP1301_I2C_ADDR
+#define ISP1301_I2C_ADDR		CFG_USB_ISP1301_I2C_ADDR
 
 #define ISP1301_I2C_MODE_CONTROL_1_SET		0x04
 #define ISP1301_I2C_MODE_CONTROL_1_CLR		0x05
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 9cfee381d4ac..d85aeaafe519 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -53,7 +53,7 @@
 /*
  * USB
  */
-#define CONFIG_USB_ISP1301_I2C_ADDR		0x2d
+#define CFG_USB_ISP1301_I2C_ADDR		0x2d
 
 /*
  * U-Boot General Configurations
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 21ab949e0d20..ea722d3e2798 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -244,7 +244,7 @@ CFG_USBD_HS
 CFG_USB_BOOTING
 CFG_USB_EXT2_BOOT
 CFG_USB_FAT_BOOT
-CONFIG_USB_ISP1301_I2C_ADDR
+CFG_USB_ISP1301_I2C_ADDR
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
-- 
2.25.1

[PoC 231/241] global: Migrate CONFIG_U_BOOT_HDR_SIZE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/fsl_chain_of_trust.c | 2 +-
 drivers/mtd/nand/raw/fsl_ifc_spl.c          | 2 +-
 include/configs/T104xRDB.h                  | 4 ++--
 include/configs/ls1021atsn.h                | 6 +++---
 include/configs/ls1021atwr.h                | 6 +++---
 include/configs/ls1043a_common.h            | 8 ++++----
 include/configs/ls1046a_common.h            | 2 +-
 include/configs/ls1088a_common.h            | 2 +-
 scripts/config_whitelist.txt                | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index 9ca350ed4689..9e0e61e0bac7 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -143,7 +143,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 		(image_entry_noargs_t)(unsigned long)spl_image->entry_point;
 
 	hdr_addr = (spl_image->entry_point + spl_image->size -
-			CONFIG_U_BOOT_HDR_SIZE);
+			CFG_U_BOOT_HDR_SIZE);
 	spl_validate_uboot(hdr_addr, (uintptr_t)spl_image->entry_point);
 	/*
 	 * In case of failure in validation, spl_validate_uboot would
diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index 3b464ce10ce9..2df63c5fc3ee 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -281,7 +281,7 @@ void nand_boot(void)
 #define CONFIG_U_BOOT_HDR_ADDR \
 		((CFG_SYS_NAND_U_BOOT_START + \
 		  CFG_SYS_NAND_U_BOOT_SIZE) - \
-		 CONFIG_U_BOOT_HDR_SIZE)
+		 CFG_U_BOOT_HDR_SIZE)
 	spl_validate_uboot(CONFIG_U_BOOT_HDR_ADDR,
 			   CFG_SYS_NAND_U_BOOT_START);
 	/*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7b9669a6eb98..4691e99c8b82 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -20,13 +20,13 @@
 
 #ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE		(16 << 10)
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image.
  */
 #define CFG_SYS_NAND_U_BOOT_SIZE	((768 << 10) + \
-					 CONFIG_U_BOOT_HDR_SIZE)
+					 CFG_U_BOOT_HDR_SIZE)
 #else
 #define CFG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #endif
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index d4855819bd7f..728b1a08fafd 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -40,17 +40,17 @@
 
 #ifdef CONFIG_SD_BOOT
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE		(16 << 10)
 #endif /* ifdef CONFIG_NXP_ESBC */
 
-#ifdef CONFIG_U_BOOT_HDR_SIZE
+#ifdef CFG_U_BOOT_HDR_SIZE
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image. Here u-boot max. size is 512K. So if binary
  * size increases then increase this size in case of secure boot as
  * it uses raw U-Boot image instead of FIT image.
  */
-#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
+#endif /* ifdef CFG_U_BOOT_HDR_SIZE */
 #endif
 
 #define PHYS_SDRAM			0x80000000
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 128d80f48062..506f5ff1d10b 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -43,17 +43,17 @@
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image.
  */
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE				(16 << 10)
 #endif /* ifdef CONFIG_NXP_ESBC */
 
-#ifdef CONFIG_U_BOOT_HDR_SIZE
+#ifdef CFG_U_BOOT_HDR_SIZE
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image. Here u-boot max. size is 512K. So if binary
  * size increases then increase this size in case of secure boot as
  * it uses raw u-boot image instead of fit image.
  */
-#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
+#endif /* ifdef CFG_U_BOOT_HDR_SIZE */
 #endif
 
 #define PHYS_SDRAM			0x80000000
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index c79e113db4e4..674aa7e7cf40 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -45,7 +45,7 @@
 /* SD boot SPL */
 #ifdef CONFIG_SD_BOOT
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE				(16 << 10)
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image. Here u-boot max. size is 512K. So if binary
@@ -61,17 +61,17 @@
 #define CFG_SYS_NAND_U_BOOT_START	CONFIG_TEXT_BASE
 
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE				(16 << 10)
 #endif /* ifdef CONFIG_NXP_ESBC */
 
-#ifdef CONFIG_U_BOOT_HDR_SIZE
+#ifdef CFG_U_BOOT_HDR_SIZE
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image. Here u-boot max. size is 512K. So if binary
  * size increases then increase this size in case of secure boot as
  * it uses raw u-boot image instead of fit image.
  */
-#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
+#endif /* ifdef CFG_U_BOOT_HDR_SIZE */
 
 #endif
 
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index e566ad4eed33..161b34e57a2f 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -45,7 +45,7 @@
 /* SD boot SPL */
 #ifdef CONFIG_SD_BOOT
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE				(16 << 10)
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image. Here u-boot max. size is 512K. So if binary
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index e229ba2eea64..49686b4f160f 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -136,7 +136,7 @@ unsigned long long get_qixis_addr(void);
 
 #ifdef CONFIG_SPL
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
+#define CFG_U_BOOT_HDR_SIZE		(16 << 10)
 /*
  * HDR would be appended at end of image and copied to DDR along
  * with U-Boot image. Here u-boot max. size is 512K. So if binary
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ea722d3e2798..c5c22db16c1c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -245,7 +245,7 @@ CFG_USB_BOOTING
 CFG_USB_EXT2_BOOT
 CFG_USB_FAT_BOOT
 CFG_USB_ISP1301_I2C_ADDR
-CONFIG_U_BOOT_HDR_SIZE
+CFG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
 CONFIG_VSC7385_IMAGE
-- 
2.25.1

[PoC 232/241] global: Migrate CONFIG_VAR_SIZE_SPL to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/exynos5420-common.h | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 791ad154242e..0eefa1867a3b 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_EXYNOS5420_H
 #define __CONFIG_EXYNOS5420_H
 
-#define CONFIG_VAR_SIZE_SPL
+#define CFG_VAR_SIZE_SPL
 
 #define CFG_IRAM_TOP			0x02074000
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c5c22db16c1c..00973c35313c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -246,7 +246,7 @@ CFG_USB_EXT2_BOOT
 CFG_USB_FAT_BOOT
 CFG_USB_ISP1301_I2C_ADDR
 CFG_U_BOOT_HDR_SIZE
-CONFIG_VAR_SIZE_SPL
+CFG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
 CONFIG_VSC7385_IMAGE
 CONFIG_VSC7385_IMAGE_SIZE
-- 
2.25.1

[PoC 233/241] global: Migrate CONFIG_VERY_BIG_RAM to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-ls102xa/config.h | 2 +-
 arch/xtensa/include/asm/config.h           | 2 +-
 drivers/ram/mpc83xx_sdram.c                | 2 +-
 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/dra7xx_evm.h               | 2 +-
 include/configs/kmcent2.h                  | 2 +-
 include/configs/kontron_sl28.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/lx2160a_common.h           | 2 +-
 include/configs/mt7621.h                   | 2 +-
 include/configs/qemu-ppce500.h             | 2 +-
 include/configs/rcar-gen3-common.h         | 2 +-
 include/configs/socrates.h                 | 2 +-
 include/configs/synquacer.h                | 2 +-
 scripts/config_whitelist.txt               | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 86bea960f1d1..581d4b3f9a60 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -75,7 +75,7 @@
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #ifdef CONFIG_DDR_SPD
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
 #endif
 
diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h
index aad06118cdbd..07107c936481 100644
--- a/arch/xtensa/include/asm/config.h
+++ b/arch/xtensa/include/asm/config.h
@@ -14,7 +14,7 @@
  * restricting used physical memory to the first 128MB.
  */
 #if XCHAL_HAVE_PTP_MMU
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_MAX_MEM_MAPPED (128 << 20)
 #endif
 
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index 5d022d4993bc..ca207441b3fc 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -118,7 +118,7 @@ int dram_init(void)
 
 phys_size_t get_effective_memsize(void)
 {
-	if (!IS_ENABLED(CONFIG_VERY_BIG_RAM))
+	if (!IS_ENABLED(CFG_VERY_BIG_RAM))
 		return gd->ram_size;
 
 	/* Limit stack to what we can reasonable map */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 2fa9d777b926..89018fc3b38f 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -62,7 +62,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index dff468d93bf1..8241bba92b36 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -112,7 +112,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 #if defined(CONFIG_TARGET_T1024RDB)
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 4691e99c8b82..446b40a0c93d 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -86,7 +86,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index ac1a7614b6a2..dc88b4e80938 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -78,7 +78,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE	2048	/* for fixed parameter use */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 3f51554d2322..515ee7c85982 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -78,7 +78,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE	2048	/* for fixed parameter use */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 9081bd03749d..5a00853c9fa2 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -60,7 +60,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 2aca6ad085e6..4abf10be2c25 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -13,7 +13,7 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_MAX_MEM_MAPPED		0x80000000
 
 #ifndef CONFIG_QSPI_BOOT
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index aa3112d94e0e..a7cc42c526c5 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -161,7 +161,7 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 0029499ea3c0..26943ebae20d 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -18,7 +18,7 @@
 /* DDR */
 #define CFG_MEM_INIT_VALUE		0xdeadbeef
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index b190bfe9c8e0..cf3137281a81 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -12,7 +12,7 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 674aa7e7cf40..777f96f7bf83 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -31,7 +31,7 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 161b34e57a2f..b8b234c8c8d9 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -31,7 +31,7 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 49686b4f160f..12e0347edfdf 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -29,7 +29,7 @@
 /* Link Definitions */
 #define CFG_SYS_FSL_QSPI_BASE	0x20000000
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 631392cb8dd2..81e97759205e 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -16,7 +16,7 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index dea14f28828d..8305260c718b 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FLASH_BASE		0x20000000
 
 /* DDR */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE		0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_DDR_BLOCK2_BASE		0x2080000000ULL
diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h
index 188f481ec1fb..803de70f3d9c 100644
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_MAX_MEM_MAPPED		0x1c000000
 
 #define CFG_SYS_INIT_SP_OFFSET	0x800000
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 9040874a23ea..e2dea9ba6325 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -29,7 +29,7 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index f13e9e6213bb..9e6835e615f1 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -28,7 +28,7 @@
 #define DRAM_RSV_SIZE			0x08000000
 #define CFG_SYS_SDRAM_BASE		(0x40000000 + DRAM_RSV_SIZE)
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 #define CFG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
 /* ENV setting */
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 3796d3464def..3ebf3bb765f8 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -55,7 +55,7 @@
 
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
-#define CONFIG_VERY_BIG_RAM
+#define CFG_VERY_BIG_RAM
 
 /* I2C addresses of SPD EEPROMs */
 #define SPD_EEPROM_ADDRESS	0x50	/* CTLR 0 DIMM 0 */
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index be606ce2955b..d8b6d09c9ef7 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE		(0x80000000)	/* Start address of DDR3 */
 #define PHYS_SDRAM_SIZE			(0x7c000000)	/* Default size (2GB - Secure memory) */
 
-#define CONFIG_VERY_BIG_RAM				/* SynQuacer supports up to 64GB */
+#define CFG_VERY_BIG_RAM				/* SynQuacer supports up to 64GB */
 #define CFG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
 
 #define SQ_DRAMINFO_BASE		(0x2e00ffc0)	/* DRAM info from TF-A */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 00973c35313c..9b67ea892eb1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -247,7 +247,7 @@ CFG_USB_FAT_BOOT
 CFG_USB_ISP1301_I2C_ADDR
 CFG_U_BOOT_HDR_SIZE
 CFG_VAR_SIZE_SPL
-CONFIG_VERY_BIG_RAM
+CFG_VERY_BIG_RAM
 CONFIG_VSC7385_IMAGE
 CONFIG_VSC7385_IMAGE_SIZE
 CONFIG_WATCHDOG_PRESC
-- 
2.25.1

[PoC 234/241] global: Migrate CONFIG_VSC7385_IMAGE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc837xerdb/mpc837xerdb.c   | 6 +++---
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 include/configs/MPC837XERDB.h               | 4 ++--
 include/configs/p1_p2_rdb_pc.h              | 2 +-
 scripts/config_whitelist.txt                | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 8b1bfe0a9f91..97884a397964 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -206,9 +206,9 @@ int misc_init_r(void)
 {
 	int rc = 0;
 
-#ifdef CONFIG_VSC7385_IMAGE
-	if (vsc7385_upload_firmware((void *) CONFIG_VSC7385_IMAGE,
-		CONFIG_VSC7385_IMAGE_SIZE)) {
+#ifdef CFG_VSC7385_IMAGE
+	if (vsc7385_upload_firmware((void *) CFG_VSC7385_IMAGE,
+		CFG_VSC7385_IMAGE_SIZE)) {
 		puts("Failure uploading VSC7385 microcode.\n");
 		rc = 1;
 	}
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index f9eea1ad9c58..ecdf731ddf83 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -355,7 +355,7 @@ int board_early_init_r(void)
 		vscfw_addr = hextoul(tmp, NULL);
 		printf("uploading VSC7385 microcode from %x\n", vscfw_addr);
 		if (vsc7385_upload_firmware((void *)vscfw_addr,
-					    CONFIG_VSC7385_IMAGE_SIZE))
+					    CFG_VSC7385_IMAGE_SIZE))
 			puts("Failure uploading VSC7385 microcode.\n");
 	} else {
 		puts("No address specified for VSC7385 microcode.\n");
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 13406cfa547b..1b24d7983b3d 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -44,8 +44,8 @@
 #define CFG_TSEC2
 
 /* The flash address and size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE		0xFE7FE000
-#define CONFIG_VSC7385_IMAGE_SIZE	8192
+#define CFG_VSC7385_IMAGE		0xFE7FE000
+#define CFG_VSC7385_IMAGE_SIZE	8192
 
 #endif
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 9790b0ac896c..14d8f6c1c6d7 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -276,7 +276,7 @@
 #endif
 
 /* The size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE_SIZE	8192
+#define CFG_VSC7385_IMAGE_SIZE	8192
 #endif
 
 #ifndef __VSCFW_ADDR
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9b67ea892eb1..2e217a15b300 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -248,8 +248,8 @@ CFG_USB_ISP1301_I2C_ADDR
 CFG_U_BOOT_HDR_SIZE
 CFG_VAR_SIZE_SPL
 CFG_VERY_BIG_RAM
-CONFIG_VSC7385_IMAGE
-CONFIG_VSC7385_IMAGE_SIZE
+CFG_VSC7385_IMAGE
+CFG_VSC7385_IMAGE_SIZE
 CONFIG_WATCHDOG_PRESC
 CONFIG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
-- 
2.25.1

[PoC 235/241] global: Migrate CONFIG_WATCHDOG_PRESC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu.c | 2 +-
 include/configs/kmcent2.h      | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 0abcc01b8574..68c3b1f98b8c 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -357,7 +357,7 @@ void
 init_85xx_watchdog(void)
 {
 	mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WATCHDOG_MASK) |
-	      TCR_WP(CONFIG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
+	      TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
 }
 
 void
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index a7cc42c526c5..191ef7bb2870 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -377,7 +377,7 @@ int get_scl(void);
 /*
  * Hardware Watchdog
  */
-#define CONFIG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
+#define CFG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
 #define CONFIG_WATCHDOG_RC WRC_CHIP	/* reset chip on watchdog event */
 
 /*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2e217a15b300..29c5ad21d3ef 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -250,7 +250,7 @@ CFG_VAR_SIZE_SPL
 CFG_VERY_BIG_RAM
 CFG_VSC7385_IMAGE
 CFG_VSC7385_IMAGE_SIZE
-CONFIG_WATCHDOG_PRESC
+CFG_WATCHDOG_PRESC
 CONFIG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
 CONFIG_X86EMU_RAW_IO
-- 
2.25.1

[PoC 236/241] global: Migrate CONFIG_WATCHDOG_RC to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu.c | 2 +-
 include/configs/kmcent2.h      | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 68c3b1f98b8c..e8a3e82765fc 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -357,7 +357,7 @@ void
 init_85xx_watchdog(void)
 {
 	mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WATCHDOG_MASK) |
-	      TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
+	      TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CFG_WATCHDOG_RC));
 }
 
 void
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 191ef7bb2870..8e76924e8f0d 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -378,7 +378,7 @@ int get_scl(void);
  * Hardware Watchdog
  */
 #define CFG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
-#define CONFIG_WATCHDOG_RC WRC_CHIP	/* reset chip on watchdog event */
+#define CFG_WATCHDOG_RC WRC_CHIP	/* reset chip on watchdog event */
 
 /*
  * For booting Linux, the board info and command line data
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 29c5ad21d3ef..c0bfa41ab9d8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -251,7 +251,7 @@ CFG_VERY_BIG_RAM
 CFG_VSC7385_IMAGE
 CFG_VSC7385_IMAGE_SIZE
 CFG_WATCHDOG_PRESC
-CONFIG_WATCHDOG_RC
+CFG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
 CONFIG_X86EMU_RAW_IO
 CONFIG_X86_MRC_ADDR
-- 
2.25.1

[PoC 237/241] global: Migrate CONFIG_X86EMU_RAW_IO to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/bios_emulator/besys.c             | 18 +++++++++---------
 include/configs/conga-qeval20-qa3-e3845.h |  2 +-
 include/configs/dfi-bt700.h               |  2 +-
 include/configs/minnowmax.h               |  2 +-
 include/configs/som-db5800-som-6867.h     |  2 +-
 include/configs/theadorable-x86-common.h  |  2 +-
 include/configs/x86-chromebook.h          |  2 +-
 scripts/config_whitelist.txt              |  2 --
 8 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 02c4286a854c..28c41e70a226 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -54,7 +54,7 @@
 
 /*------------------------- Global Variables ------------------------------*/
 
-#ifndef CONFIG_X86EMU_RAW_IO
+#ifndef CFG_X86EMU_RAW_IO
 static char *BE_biosDate = "08/14/99";
 static u8 BE_model = 0xFC;
 static u8 BE_submodel = 0x00;
@@ -94,7 +94,7 @@ static u8 *BE_memaddr(u32 addr)
 	} else if (addr >= 0xA0000 && addr <= 0xBFFFF) {
 		return (u8*)(_BE_env.busmem_base + addr - 0xA0000);
 	}
-#ifdef CONFIG_X86EMU_RAW_IO
+#ifdef CFG_X86EMU_RAW_IO
 	else if (addr >= 0xD0000 && addr <= 0xFFFFF) {
 		/* We map the real System BIOS directly on real PC's */
 		DB(printf("BE_memaddr: System BIOS address %#lx\n",
@@ -240,7 +240,7 @@ void X86API BE_wrl(u32 addr, u32 val)
 	}
 }
 
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 
 /* For Non-Intel machines we may need to emulate some I/O port accesses that
  * the BIOS may try to access, such as the PCI config registers.
@@ -571,7 +571,7 @@ u8 X86API BE_inb(X86EMU_pioAddr port)
 {
 	u8 val = 0;
 
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 	if (IS_VGA_PORT(port)){
 		/*seems reading port 0x3c3 return the high 16 bit of io port*/
 		if(port == 0x3c3)
@@ -617,7 +617,7 @@ u16 X86API BE_inw(X86EMU_pioAddr port)
 {
 	u16 val = 0;
 
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 	if (IS_PCI_PORT(port))
 		val = PCI_inp(port, REG_READ_WORD);
 	else if (port < 0x100) {
@@ -650,7 +650,7 @@ u32 X86API BE_inl(X86EMU_pioAddr port)
 {
 	u32 val = 0;
 
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 	if (IS_PCI_PORT(port))
 		val = PCI_inp(port, REG_READ_DWORD);
 	else if (port < 0x100) {
@@ -678,7 +678,7 @@ through to the real hardware if we don't need to special case it.
 ****************************************************************************/
 void X86API BE_outb(X86EMU_pioAddr port, u8 val)
 {
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 	if (IS_VGA_PORT(port))
 		VGA_outpb(port, val);
 	else if (IS_TIMER_PORT(port))
@@ -713,7 +713,7 @@ through to the real hardware if we don't need to special case it.
 ****************************************************************************/
 void X86API BE_outw(X86EMU_pioAddr port, u16 val)
 {
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 	if (IS_VGA_PORT(port)) {
 		VGA_outpb(port, val);
 		VGA_outpb(port + 1, val >> 8);
@@ -744,7 +744,7 @@ through to the real hardware if we don't need to special case it.
 ****************************************************************************/
 void X86API BE_outl(X86EMU_pioAddr port, u32 val)
 {
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
 	if (IS_PCI_PORT(port)) {
 		PCI_outp(port, val, REG_WRITE_DWORD);
 	} else if (port < 0x100) {
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 1066da3f8326..5cc6e06ddc2d 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -17,7 +17,7 @@
 					"stderr=serial\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
 
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 36c2510628fc..0ffc0c7d4f0b 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -21,7 +21,7 @@
 					"stderr=serial\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
 
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index f3f645f9d699..e31c6b54652a 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -18,6 +18,6 @@
 					"usb_pgood_delay=40\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index 14cacbfe3f13..33f2e0ffbb5b 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -17,6 +17,6 @@
 					"stderr=serial,vidconsole\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index 6b65fad50692..b58c14205115 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -16,7 +16,7 @@
 					"stderr=serial\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
 
 /* Environment settings */
 
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index dfacecbdd501..ccd37abe2611 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -11,7 +11,7 @@
 #define CONFIG_X86_REFCODE_RUN_ADDR		0
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
 
 #define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c0bfa41ab9d8..e9ca514f3cdb 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -252,8 +252,6 @@ CFG_VSC7385_IMAGE
 CFG_VSC7385_IMAGE_SIZE
 CFG_WATCHDOG_PRESC
 CFG_WATCHDOG_RC
-CONFIG_WATCHDOG_TIMEOUT
-CONFIG_X86EMU_RAW_IO
 CONFIG_X86_MRC_ADDR
 CONFIG_X86_REFCODE_ADDR
 CONFIG_X86_REFCODE_RUN_ADDR
-- 
2.25.1

[PoC 238/241] global: Migrate CONFIG_X86_MRC_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/x86/cpu/intel_common/mrc.c  | 2 +-
 arch/x86/dts/u-boot.dtsi         | 2 +-
 include/configs/x86-chromebook.h | 2 +-
 scripts/config_whitelist.txt     | 3 ++-
 tools/binman/binman.rst          | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a4918fbad61a..69405d740b47 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -200,7 +200,7 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev,
 
 	debug("PEI data at %p:\n", pei_data);
 
-	data = (char *)CONFIG_X86_MRC_ADDR;
+	data = (char *)CFG_X86_MRC_ADDR;
 	if (data) {
 		int rv;
 		ulong start;
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 24e692f988d8..454efc17614e 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -86,7 +86,7 @@
 #endif
 #ifdef CONFIG_HAVE_MRC
 	intel-mrc {
-		offset = <CONFIG_X86_MRC_ADDR>;
+		offset = <CFG_X86_MRC_ADDR>;
 	};
 #endif
 #ifdef CONFIG_FSP_VERSION1
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index ccd37abe2611..7d93dcbfc2e5 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -6,7 +6,7 @@
 #ifndef _X86_CHROMEBOOK_H
 #define _X86_CHROMEBOOK_H
 
-#define CONFIG_X86_MRC_ADDR			0xfffa0000
+#define CFG_X86_MRC_ADDR			0xfffa0000
 #define CONFIG_X86_REFCODE_ADDR			0xffea0000
 #define CONFIG_X86_REFCODE_RUN_ADDR		0
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e9ca514f3cdb..66173404901d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -252,6 +252,7 @@ CFG_VSC7385_IMAGE
 CFG_VSC7385_IMAGE_SIZE
 CFG_WATCHDOG_PRESC
 CFG_WATCHDOG_RC
-CONFIG_X86_MRC_ADDR
+CFG_X86EMU_RAW_IO
+CFG_X86_MRC_ADDR
 CONFIG_X86_REFCODE_ADDR
 CONFIG_X86_REFCODE_RUN_ADDR
diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst
index fda16f1992d7..f50949aa37dd 100644
--- a/tools/binman/binman.rst
+++ b/tools/binman/binman.rst
@@ -298,7 +298,7 @@ C preprocessor::
 
     #ifdef CONFIG_HAVE_MRC
         intel-mrc {
-                offset = <CONFIG_X86_MRC_ADDR>;
+                offset = <CFG_X86_MRC_ADDR>;
         };
     #endif
 
-- 
2.25.1

[PoC 239/241] global: Migrate CONFIG_X86_REFCODE_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/x86/cpu/broadwell/refcode.c | 2 +-
 arch/x86/dts/u-boot.dtsi         | 2 +-
 include/configs/x86-chromebook.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 94c2e05346a6..3b7ec2b74e8e 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -78,7 +78,7 @@ static int cpu_run_reference_code(void)
 	int ret, dummy;
 	int size;
 
-	hdr = (struct rmodule_header *)CONFIG_X86_REFCODE_ADDR;
+	hdr = (struct rmodule_header *)CFG_X86_REFCODE_ADDR;
 	debug("Extracting code from rmodule at %p\n", hdr);
 	if (hdr->magic != RMODULE_MAGIC) {
 		debug("Invalid rmodule magic\n");
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 454efc17614e..e0de33180910 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -149,7 +149,7 @@
 #endif
 #ifdef CONFIG_HAVE_REFCODE
 	intel-refcode {
-		offset = <CONFIG_X86_REFCODE_ADDR>;
+		offset = <CFG_X86_REFCODE_ADDR>;
 	};
 #endif
 #ifdef CONFIG_TPL
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 7d93dcbfc2e5..fa45bf809700 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -7,7 +7,7 @@
 #define _X86_CHROMEBOOK_H
 
 #define CFG_X86_MRC_ADDR			0xfffa0000
-#define CONFIG_X86_REFCODE_ADDR			0xffea0000
+#define CFG_X86_REFCODE_ADDR			0xffea0000
 #define CONFIG_X86_REFCODE_RUN_ADDR		0
 
 #define VIDEO_IO_OFFSET				0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 66173404901d..2895dd09bfcf 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -254,5 +254,5 @@ CFG_WATCHDOG_PRESC
 CFG_WATCHDOG_RC
 CFG_X86EMU_RAW_IO
 CFG_X86_MRC_ADDR
-CONFIG_X86_REFCODE_ADDR
+CFG_X86_REFCODE_ADDR
 CONFIG_X86_REFCODE_RUN_ADDR
-- 
2.25.1

[PoC 240/241] global: Migrate CONFIG_X86_REFCODE_RUN_ADDR to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/x86/cpu/broadwell/refcode.c | 4 ++--
 include/configs/x86-chromebook.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 3b7ec2b74e8e..df2df7972e98 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -99,7 +99,7 @@ static int cpu_run_reference_code(void)
 	pei_data->saved_data = (void *)&dummy;
 
 	src = (char *)hdr + hdr->payload_begin_offset;
-	dest = (char *)CONFIG_X86_REFCODE_RUN_ADDR;
+	dest = (char *)CFG_X86_REFCODE_RUN_ADDR;
 
 	size = hdr->payload_end_offset - hdr->payload_begin_offset;
 	debug("Copying refcode from %p to %p, size %x\n", src, dest, size);
@@ -112,7 +112,7 @@ static int cpu_run_reference_code(void)
 	func = (asmlinkage int (*)(void *))dest;
 	debug("Running reference code at %p\n", func);
 #ifdef DEBUG
-	print_buffer(CONFIG_X86_REFCODE_RUN_ADDR, (void *)func, 1, 0x40, 0);
+	print_buffer(CFG_X86_REFCODE_RUN_ADDR, (void *)func, 1, 0x40, 0);
 #endif
 	ret = func(pei_data);
 	if (ret != 0) {
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index fa45bf809700..98a537141deb 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -8,7 +8,7 @@
 
 #define CFG_X86_MRC_ADDR			0xfffa0000
 #define CFG_X86_REFCODE_ADDR			0xffea0000
-#define CONFIG_X86_REFCODE_RUN_ADDR		0
+#define CFG_X86_REFCODE_RUN_ADDR		0
 
 #define VIDEO_IO_OFFSET				0
 #define CFG_X86EMU_RAW_IO
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2895dd09bfcf..1a57607fccf7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -255,4 +255,4 @@ CFG_WATCHDOG_RC
 CFG_X86EMU_RAW_IO
 CFG_X86_MRC_ADDR
 CFG_X86_REFCODE_ADDR
-CONFIG_X86_REFCODE_RUN_ADDR
+CFG_X86_REFCODE_RUN_ADDR
-- 
2.25.1

[PoC 241/241] Empty config_whitelist.txt

[Tom Rini]

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 scripts/config_whitelist.txt | 258 -----------------------------------
 1 file changed, 258 deletions(-)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1a57607fccf7..e69de29bb2d1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,258 +0,0 @@
-CFG_ARM_GIC_BASE_ADDRESS
-CFG_BOARDDIR
-CFG_DFU_ALT
-CFG_DFU_ALT_BOOT_EMMC
-CFG_DFU_ALT_BOOT_SD
-CFG_DFU_ALT_SYSTEM
-CFG_DFU_ENV_SETTINGS
-CFG_DM9000_BASE
-CFG_DM9000_BYTE_SWAPPED
-CFG_DM9000_NO_SROM
-CFG_DM9000_USE_16BIT
-CFG_DW_WDT_CLOCK_KHZ
-CFG_ENV_FLAGS_LIST_STATIC
-CFG_ENV_IS_EMBEDDED
-CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
-CFG_ENV_SETTINGS_NAND_V1
-CFG_ENV_SETTINGS_NAND_V2
-CFG_ENV_SETTINGS_V1
-CFG_ENV_SETTINGS_V2
-CFG_ENV_SROM_BANK
-CFG_ENV_TOTAL_SIZE
-CFG_ET1100_BASE
-CFG_ETHBASE
-CFG_EXTRA_ENV_SETTINGS
-CFG_FB_ADDR
-CFG_FDTADDR
-CFG_FDTFILE
-CFG_FEC_ENET_DEV
-CFG_FEC_FIXED_SPEED
-CFG_FEC_MXC_PHYADDR
-CFG_FLASH_BR_PRELIM
-CFG_FLASH_OR_PRELIM
-CFG_FLASH_SECTOR_SIZE
-CFG_FLASH_SHOW_PROGRESS
-CFG_FLASH_SPANSION_S29WS_N
-CFG_FLASH_VERIFY
-CFG_FM_PLAT_CLK_DIV
-CFG_FSL_CPLD
-CFG_FSL_ESDHC_PIN_MUX
-CFG_FSL_FM_10GEC_REGULAR_NOTATION
-CFG_FSL_ISBC_KEY_EXT
-CFG_FSL_PMIC_BITLEN
-CFG_FSL_PMIC_BUS
-CFG_FSL_PMIC_CLK
-CFG_FSL_PMIC_CS
-CFG_FSL_PMIC_MODE
-CFG_FSL_SDHC_V2_3
-CFG_FSL_SERDES1
-CFG_FSL_SERDES2
-CFG_GATEWAYIP
-CFG_GMII
-CFG_G_DNL_THOR_PRODUCT_NUM
-CFG_G_DNL_THOR_VENDOR_NUM
-CFG_G_DNL_UMS_PRODUCT_NUM
-CFG_G_DNL_UMS_VENDOR_NUM
-CFG_HDMI_ENCODER_I2C_ADDR
-CFG_HOSTNAME
-CFG_HSMMC2_8BIT
-CFG_HW_ENV_SETTINGS
-CFG_I2C_ENV_EEPROM_BUS
-CFG_I2C_MULTI_BUS
-CFG_I2C_MVTWSI
-CFG_I2C_MVTWSI_BASE0
-CFG_I2C_MVTWSI_BASE1
-CFG_I2C_RTC_ADDR
-CFG_ICS307_REFCLK_HZ
-CFG_IMX6_PWM_PER_CLK
-CFG_IPADDR
-CFG_IRAM_BASE
-CFG_IRAM_END
-CFG_IRAM_SIZE
-CFG_IRAM_TOP
-CFG_KM_DEF_ARCH
-CFG_KM_DEF_BOOT_ARGS_CPU
-CFG_KM_DEF_ENV
-CFG_KM_DEF_ENV_BOOTARGS
-CFG_KM_DEF_ENV_BOOTPARAMS
-CFG_KM_DEF_ENV_BOOTTARGETS
-CFG_KM_DEF_ENV_CONSTANTS
-CFG_KM_DEF_ENV_CPU
-CFG_KM_DEF_ENV_FLASH_BOOT
-CFG_KM_DEV_ENV_FLASH_BOOT_UBI
-CFG_KM_ECC_MODE
-CFG_KM_NEW_ENV
-CFG_KM_UBI_LINUX_MTD
-CFG_KM_UBI_PARTITION_NAME_APP
-CFG_KM_UBI_PARTITION_NAME_BOOT
-CFG_KM_UBI_PART_BOOT_OPTS
-CFG_KM_UIMAGE_NAME
-CFG_KSNET_CPSW_NUM_PORTS
-CFG_KSNET_MAC_ID_BASE
-CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
-CFG_KSNET_NETCP_BASE
-CFG_KSNET_NETCP_V1_0
-CFG_KSNET_NETCP_V1_5
-CFG_KSNET_SERDES_LANES_PER_SGMII
-CFG_KSNET_SERDES_SGMII2_BASE
-CFG_KSNET_SERDES_SGMII_BASE
-CFG_L1_INIT_RAM
-CFG_L2_CACHE
-CFG_LEGACY_BOOTCMD_ENV
-CFG_LOWPOWER_ADDR
-CFG_LOWPOWER_FLAG
-CFG_LPC32XX_NAND_MLC_BUSY_DELAY
-CFG_LPC32XX_NAND_MLC_NAND_TA
-CFG_LPC32XX_NAND_MLC_RD_HIGH
-CFG_LPC32XX_NAND_MLC_RD_LOW
-CFG_LPC32XX_NAND_MLC_TCEA_DELAY
-CFG_LPC32XX_NAND_MLC_WR_HIGH
-CFG_LPC32XX_NAND_MLC_WR_LOW
-CFG_LPC32XX_NAND_SLC_RDR_CLKS
-CFG_LPC32XX_NAND_SLC_RHOLD
-CFG_LPC32XX_NAND_SLC_RSETUP
-CFG_LPC32XX_NAND_SLC_RWIDTH
-CFG_LPC32XX_NAND_SLC_WDR_CLKS
-CFG_LPC32XX_NAND_SLC_WHOLD
-CFG_LPC32XX_NAND_SLC_WSETUP
-CFG_LPC32XX_NAND_SLC_WWIDTH
-CFG_MACB_SEARCH_PHY
-CFG_MALLOC_F_ADDR
-CFG_MALTA
-CFG_MAX_DSP_CPUS
-CFG_MAX_MEM_MAPPED
-CFG_MAX_RAM_BANK_SIZE
-CFG_MEMSIZE_IN_BYTES
-CFG_MEM_INIT_VALUE
-CFG_MFG_ENV_SETTINGS
-CFG_MII_DEFAULT_TSEC
-CFG_MIU_2BIT_21_7_INTERLEAVED
-CFG_MIU_2BIT_INTERLEAVED
-CFG_MMC_DEFAULT_DEV
-CFG_MMC_SUNXI_SLOT
-CFG_MONITOR_IS_IN_RAM
-CFG_MTD_NAND_VERIFY_WRITE
-CFG_MVGBE_PORTS
-CFG_MXC_GPT_HCLK
-CFG_MXC_NAND_HWECC
-CFG_MXC_NAND_IP_REGS_BASE
-CFG_MXC_NAND_REGS_BASE
-CFG_MXC_UART_BASE
-CFG_MXC_USB_FLAGS
-CFG_MXC_USB_PORT
-CFG_MXC_USB_PORTSC
-CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
-CFG_NAND_CS_INIT
-CFG_NETDEV
-CFG_NETMASK
-CFG_NORBOOT
-CFG_NUM_DSP_CPUS
-CFG_ODROID_REV_AIN
-CFG_OTHBOOTARGS
-CFG_OVERWRITE_ETHADDR_ONCE
-CFG_PCIE_IMX_PERST_GPIO
-CFG_PCIE_IMX_POWER_GPIO
-CFG_PEN_ADDR_BIG_ENDIAN
-CFG_PHY_BASE_ADR
-CFG_PHY_ET1011C_TX_CLK_FIX
-CFG_PHY_ID
-CFG_PHY_INTERFACE_MODE
-CFG_PHY_IRAM_BASE
-CFG_PL011_CLOCK
-CFG_PL01x_PORTS
-CFG_PME_PLAT_CLK_DIV
-CFG_POSTBOOTMENU
-CFG_POWER_LTC3676_I2C_ADDR
-CFG_POWER_PFUZE100_I2C_ADDR
-CFG_POWER_PFUZE3000_I2C_ADDR
-CFG_PPC_SPINTABLE_COMPATIBLE
-CFG_PRAM
-CFG_PSRAM_SCFG
-CFG_QBMAN_CLK_DIV
-CFG_RAMBOOT_SPIFLASH
-CFG_RAMBOOT_TEXT_BASE
-CFG_RAMDISK_ADDR
-CFG_RD_LVL
-CFG_RESET_VECTOR_ADDRESS
-CFG_ROCKCHIP_SDHCI_MAX_FREQ
-CFG_ROOTPATH
-CFG_SANDBOX_ARCH
-CFG_SANDBOX_SPI_MAX_BUS
-CFG_SANDBOX_SPI_MAX_CS
-CFG_SAR2_REG
-CFG_SAR_REG
-CFG_SCIF_A
-CFG_SCSI_DEV_LIST
-CFG_SC_TIMER_CLK
-CFG_SERIAL_BOOT
-CFG_SERVERIP
-CFG_SETUP_INITRD_TAG
-CFG_SET_DFU_ALT_BUF_LEN
-CFG_SH_ETHER_ALIGNE_SIZE
-CFG_SH_ETHER_CACHE_INVALIDATE
-CFG_SH_ETHER_CACHE_WRITEBACK
-CFG_SH_ETHER_PHY_ADDR
-CFG_SH_ETHER_PHY_MODE
-CFG_SH_ETHER_USE_PORT
-CFG_SH_QSPI_BASE
-CFG_SLIC
-CFG_SMDK5420
-CFG_SMP_PEN_ADDR
-CFG_SOCRATES
-CFG_SPI_ADDR
-CFG_SPI_BOOTING
-CFG_SPI_FLASH_QUAD
-CFG_SPI_FLASH_SIZE
-CFG_SPI_HALF_DUPLEX
-CFG_SPI_N25Q256A_RESET
-CFG_STACKBASE
-CFG_STANDALONE_LOAD_ADDR
-CFG_STD_DEVICES_SETTINGS
-CFG_TEGRA_BOARD_STRING
-CFG_TEGRA_ENABLE_UARTA
-CFG_TEGRA_ENABLE_UARTD
-CFG_TEGRA_SLINK_CTRLS
-CFG_TEGRA_SPI
-CFG_TEGRA_UARTA_GPU
-CFG_TEGRA_UARTA_SDIO1
-CFG_TEGRA_VDD_CORE_TPS62361B_SET3
-CFG_TEGRA_VDD_CORE_TPS62366A_SET1
-CFG_TESTPIN_MASK
-CFG_TESTPIN_REG
-CFG_THOR_RESET_OFF
-CFG_TPM_TIS_BASE_ADDRESS
-CFG_TSEC1
-CFG_TSEC1_NAME
-CFG_TSEC2
-CFG_TSEC2_NAME
-CFG_TSEC3
-CFG_TSEC3_NAME
-CFG_TSEC4
-CFG_TSEC4_NAME
-CFG_TSECV2
-CFG_TSECV2_1
-CFG_TSEC_TBICR_SETTINGS
-CFG_UBIFS_VOLUME
-CFG_UBI_PART
-CFG_UBOOTPATH
-CFG_UBOOT_SECTOR_COUNT
-CFG_UBOOT_SECTOR_START
-CFG_UEC_ETH
-CFG_USART_BASE
-CFG_USART_ID
-CFG_USBD_HS
-CFG_USB_BOOTING
-CFG_USB_EXT2_BOOT
-CFG_USB_FAT_BOOT
-CFG_USB_ISP1301_I2C_ADDR
-CFG_U_BOOT_HDR_SIZE
-CFG_VAR_SIZE_SPL
-CFG_VERY_BIG_RAM
-CFG_VSC7385_IMAGE
-CFG_VSC7385_IMAGE_SIZE
-CFG_WATCHDOG_PRESC
-CFG_WATCHDOG_RC
-CFG_X86EMU_RAW_IO
-CFG_X86_MRC_ADDR
-CFG_X86_REFCODE_ADDR
-CFG_X86_REFCODE_RUN_ADDR
-- 
2.25.1

Re: [000/241] Finish migration to Kconfig or CFG namespace

[Simon Glass]

Hi Tom,

On Sun, 20 Nov 2022 at 06:34, Tom Rini <trini@konsulko.com> wrote:
>
> Hey all,
>
> The intention of this series isn't to apply it just yet. This was a very
> quick scripted migration and so there's cases where we do more than one
> symbol, or we can see there's define but unused symbols. But it also
> shows that with the last few series I've posted, we're nearly done. With
> this series applied, everything builds still, and the resulting binaries
> seem to be the same (I'm doing a build where I keep before/after so I
> can check checksums now).

It's great to see this? When will it be applied? Perhaps when -next opens up?

Regards,
Simon

Re: [PATCH 01/38] power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

[Simon Glass]

On Sat, 19 Nov 2022 at 16:45, Tom Rini <trini@konsulko.com> wrote:
>
> As we have more legacy PMIC drivers to move to Kconfig, guard them all
> with POWER_LEGACY or SPL_POWER_LEGACY. Do the same kind of check for
> building the drivers too. This also means that we need to resort the
> list slightly in the Makefile.
>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  drivers/power/pmic/Kconfig  |  5 ++++-
>  drivers/power/pmic/Makefile | 10 ++++++----
>  2 files changed, 10 insertions(+), 5 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 19/38] arm: samsung: Move CONFIG_MISC_COMMON to Kconfig

[Simon Glass]

On Sat, 19 Nov 2022 at 16:49, Tom Rini <trini@konsulko.com> wrote:
>
> This option controls using board/samsung/common/misc.c, so add a Kconfig
> file there as well and select it from the boards which use this
> functionality.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/arm/Kconfig                    | 1 +
>  arch/arm/mach-exynos/Kconfig        | 5 +++++
>  arch/arm/mach-s5pc1xx/Kconfig       | 1 +
>  board/samsung/common/Kconfig        | 2 ++
>  include/configs/odroid.h            | 6 ------
>  include/configs/odroid_xu3.h        | 1 -
>  include/configs/s5p_goni.h          | 2 --
>  include/configs/s5pc210_universal.h | 3 ---
>  include/configs/trats.h             | 3 ---
>  include/configs/trats2.h            | 3 ---
>  10 files changed, 9 insertions(+), 18 deletions(-)
>  create mode 100644 board/samsung/common/Kconfig

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 35/38] scripts/config_whitelist.txt: Remove more referenced symbols

[Simon Glass]

On Sat, 19 Nov 2022 at 16:52, Tom Rini <trini@konsulko.com> wrote:
>
> Perform some deeper investigation on the remaining symbols listed in
> this file and remove more.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  include/configs/P1010RDB.h   |  2 --
>  scripts/config_whitelist.txt | 22 ----------------------
>  2 files changed, 24 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 37/38] post: Migrate to Kconfig

[Simon Glass]

On Sat, 19 Nov 2022 at 16:53, Tom Rini <trini@konsulko.com> wrote:
>
> We move the existing CONFIG_POST_* functionality over to CFG_POST and
> then introduce CONFIG_POST to Kconfig.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
>  configs/P2041RDB_NAND_defconfig               |  1 +
>  configs/P2041RDB_SDCARD_defconfig             |  1 +
>  configs/P2041RDB_SPIFLASH_defconfig           |  1 +
>  configs/P2041RDB_defconfig                    |  1 +
>  configs/kmcent2_defconfig                     |  1 +
>  configs/kmcoge5ne_defconfig                   |  1 +
>  configs/pg_wcom_expu1_defconfig               |  1 +
>  configs/pg_wcom_expu1_update_defconfig        |  1 +
>  configs/pg_wcom_seli8_defconfig               |  1 +
>  configs/pg_wcom_seli8_update_defconfig        |  1 +
>  doc/README.POST                               |  6 +-
>  doc/README.fsl-ddr                            |  2 +-
>  drivers/serial/serial-uclass.c                |  2 +-
>  drivers/serial/serial.c                       |  2 +-
>  include/configs/P2041RDB.h                    |  2 +-
>  include/configs/km/pg-wcom-ls102xa.h          |  4 +-
>  include/configs/kmcent2.h                     |  2 +-
>  include/configs/kmcoge5ne.h                   |  4 +-
>  include/post.h                                |  4 +-
>  include/serial.h                              |  4 +-
>  post/cpu/mpc83xx/ecc.c                        |  2 +-
>  post/drivers/flash.c                          |  2 +-
>  post/drivers/i2c.c                            |  4 +-
>  post/drivers/memory.c                         |  4 +-
>  post/drivers/rtc.c                            |  4 +-
>  post/lib_powerpc/andi.c                       |  2 +-
>  post/lib_powerpc/asm.S                        |  2 +-
>  post/lib_powerpc/b.c                          |  2 +-
>  post/lib_powerpc/cmp.c                        |  2 +-
>  post/lib_powerpc/cmpi.c                       |  2 +-
>  post/lib_powerpc/complex.c                    |  2 +-
>  post/lib_powerpc/cpu.c                        |  4 +-
>  post/lib_powerpc/cr.c                         |  2 +-
>  post/lib_powerpc/fpu/20001122-1.c             |  4 +-
>  post/lib_powerpc/fpu/20010114-2.c             |  4 +-
>  post/lib_powerpc/fpu/20010226-1.c             |  4 +-
>  post/lib_powerpc/fpu/980619-1.c               |  4 +-
>  post/lib_powerpc/fpu/acc1.c                   |  4 +-
>  post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
>  post/lib_powerpc/fpu/fpu.c                    |  4 +-
>  post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
>  post/lib_powerpc/load.c                       |  2 +-
>  post/lib_powerpc/multi.c                      |  2 +-
>  post/lib_powerpc/rlwimi.c                     |  2 +-
>  post/lib_powerpc/rlwinm.c                     |  2 +-
>  post/lib_powerpc/rlwnm.c                      |  2 +-
>  post/lib_powerpc/srawi.c                      |  2 +-
>  post/lib_powerpc/store.c                      |  2 +-
>  post/lib_powerpc/string.c                     |  2 +-
>  post/lib_powerpc/three.c                      |  2 +-
>  post/lib_powerpc/threei.c                     |  2 +-
>  post/lib_powerpc/threex.c                     |  2 +-
>  post/lib_powerpc/two.c                        |  2 +-
>  post/lib_powerpc/twox.c                       |  2 +-
>  post/post.c                                   |  4 +-
>  post/tests.c                                  | 68 +++++++++----------
>  test/Kconfig                                  |  5 ++
>  58 files changed, 114 insertions(+), 99 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

but please see below

> diff --git a/test/Kconfig b/test/Kconfig
> index a6b463e4d06c..9f4641ae6bc5 100644
> --- a/test/Kconfig
> +++ b/test/Kconfig
> @@ -1,3 +1,8 @@
> +config POST
> +       bool "Power On Self Test support"
> +       help
> +         See doc/README.POST for more details

Shouldn't this be in post/Kconfig ?

We use test/ for unit / functional tests.

Regards,
Simon

Re: [PATCH 36/38] sandbox: Rework how SDL is enabled / disabled

[Simon Glass]

On Sat, 19 Nov 2022 at 16:46, Tom Rini <trini@konsulko.com> wrote:
>
> Given that we can use Kconfig logic directly to see if we have a program
> available on the host or not, change from passing NO_SDL to instead
> controlling CONFIG_SANDBOX_SDL in Kconfig directly. Introduce
> CONFIG_HOST_HAS_SDL as the way to test for sdl2-config and default
> CONFIG_SANDBOX_SDL on if we have that, or not.
>
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  .azure-pipelines.yml         | 4 ++--
>  arch/sandbox/Kconfig         | 7 +++++++
>  arch/sandbox/config.mk       | 4 +---
>  doc/arch/sandbox/sandbox.rst | 9 +++------
>  doc/build/tools.rst          | 2 +-
>  drivers/video/Kconfig        | 2 +-
>  include/configs/sandbox.h    | 4 ----
>  7 files changed, 15 insertions(+), 17 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 16/38] sandbox: Move CONFIG_IO_TRACE to Kconfig

[Simon Glass]

On Sat, 19 Nov 2022 at 16:45, Tom Rini <trini@konsulko.com> wrote:
>
> This is only used on sandbox, so select it there.
>
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/Kconfig              | 1 +
>  common/Kconfig            | 3 +++
>  include/configs/sandbox.h | 2 --
>  3 files changed, 4 insertions(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [000/241] Finish migration to Kconfig or CFG namespace

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

On Mon, Nov 21, 2022 at 03:51:06PM -0700, Simon Glass wrote:
> Hi Tom,
> 
> On Sun, 20 Nov 2022 at 06:34, Tom Rini <trini@konsulko.com> wrote:
> >
> > Hey all,
> >
> > The intention of this series isn't to apply it just yet. This was a very
> > quick scripted migration and so there's cases where we do more than one
> > symbol, or we can see there's define but unused symbols. But it also
> > shows that with the last few series I've posted, we're nearly done. With
> > this series applied, everything builds still, and the resulting binaries
> > seem to be the same (I'm doing a build where I keep before/after so I
> > can check checksums now).
> 
> It's great to see this? When will it be applied? Perhaps when -next opens up?

Everything leading up to this will go in to -next. I have a handful of
notes already on symbols that should get migrated to Kconfig or removed
outright after skimming this series, and making that be real is the next
step. Then re-running the scripted everything-else series and applying.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 37/38] post: Migrate to Kconfig

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 4796 bytes --]

On Mon, Nov 21, 2022 at 03:51:10PM -0700, Simon Glass wrote:
> On Sat, 19 Nov 2022 at 16:53, Tom Rini <trini@konsulko.com> wrote:
> >
> > We move the existing CONFIG_POST_* functionality over to CFG_POST and
> > then introduce CONFIG_POST to Kconfig.
> >
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> > ---
> >  arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
> >  configs/P2041RDB_NAND_defconfig               |  1 +
> >  configs/P2041RDB_SDCARD_defconfig             |  1 +
> >  configs/P2041RDB_SPIFLASH_defconfig           |  1 +
> >  configs/P2041RDB_defconfig                    |  1 +
> >  configs/kmcent2_defconfig                     |  1 +
> >  configs/kmcoge5ne_defconfig                   |  1 +
> >  configs/pg_wcom_expu1_defconfig               |  1 +
> >  configs/pg_wcom_expu1_update_defconfig        |  1 +
> >  configs/pg_wcom_seli8_defconfig               |  1 +
> >  configs/pg_wcom_seli8_update_defconfig        |  1 +
> >  doc/README.POST                               |  6 +-
> >  doc/README.fsl-ddr                            |  2 +-
> >  drivers/serial/serial-uclass.c                |  2 +-
> >  drivers/serial/serial.c                       |  2 +-
> >  include/configs/P2041RDB.h                    |  2 +-
> >  include/configs/km/pg-wcom-ls102xa.h          |  4 +-
> >  include/configs/kmcent2.h                     |  2 +-
> >  include/configs/kmcoge5ne.h                   |  4 +-
> >  include/post.h                                |  4 +-
> >  include/serial.h                              |  4 +-
> >  post/cpu/mpc83xx/ecc.c                        |  2 +-
> >  post/drivers/flash.c                          |  2 +-
> >  post/drivers/i2c.c                            |  4 +-
> >  post/drivers/memory.c                         |  4 +-
> >  post/drivers/rtc.c                            |  4 +-
> >  post/lib_powerpc/andi.c                       |  2 +-
> >  post/lib_powerpc/asm.S                        |  2 +-
> >  post/lib_powerpc/b.c                          |  2 +-
> >  post/lib_powerpc/cmp.c                        |  2 +-
> >  post/lib_powerpc/cmpi.c                       |  2 +-
> >  post/lib_powerpc/complex.c                    |  2 +-
> >  post/lib_powerpc/cpu.c                        |  4 +-
> >  post/lib_powerpc/cr.c                         |  2 +-
> >  post/lib_powerpc/fpu/20001122-1.c             |  4 +-
> >  post/lib_powerpc/fpu/20010114-2.c             |  4 +-
> >  post/lib_powerpc/fpu/20010226-1.c             |  4 +-
> >  post/lib_powerpc/fpu/980619-1.c               |  4 +-
> >  post/lib_powerpc/fpu/acc1.c                   |  4 +-
> >  post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
> >  post/lib_powerpc/fpu/fpu.c                    |  4 +-
> >  post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
> >  post/lib_powerpc/load.c                       |  2 +-
> >  post/lib_powerpc/multi.c                      |  2 +-
> >  post/lib_powerpc/rlwimi.c                     |  2 +-
> >  post/lib_powerpc/rlwinm.c                     |  2 +-
> >  post/lib_powerpc/rlwnm.c                      |  2 +-
> >  post/lib_powerpc/srawi.c                      |  2 +-
> >  post/lib_powerpc/store.c                      |  2 +-
> >  post/lib_powerpc/string.c                     |  2 +-
> >  post/lib_powerpc/three.c                      |  2 +-
> >  post/lib_powerpc/threei.c                     |  2 +-
> >  post/lib_powerpc/threex.c                     |  2 +-
> >  post/lib_powerpc/two.c                        |  2 +-
> >  post/lib_powerpc/twox.c                       |  2 +-
> >  post/post.c                                   |  4 +-
> >  post/tests.c                                  | 68 +++++++++----------
> >  test/Kconfig                                  |  5 ++
> >  58 files changed, 114 insertions(+), 99 deletions(-)
> >
> 
> Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> but please see below
> 
> > diff --git a/test/Kconfig b/test/Kconfig
> > index a6b463e4d06c..9f4641ae6bc5 100644
> > --- a/test/Kconfig
> > +++ b/test/Kconfig
> > @@ -1,3 +1,8 @@
> > +config POST
> > +       bool "Power On Self Test support"
> > +       help
> > +         See doc/README.POST for more details
> 
> Shouldn't this be in post/Kconfig ?

It's non-trivial enough content that it really should be migrated to
doc/post/ and then expanded upon a bit further.

> We use test/ for unit / functional tests.

Yes, but post pre-dates all of that, keep in mind. It's also still in
active use (enabled on some semi-recent layerscape platforms for
example). This is an area that could use some attention and renovation,
yes, but the whole point of this and the huge follow-up are to get the
migrate to Kconfig part done already. 

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 37/38] post: Migrate to Kconfig

[Simon Glass]

Hi Tom,

On Mon, 21 Nov 2022 at 15:57, Tom Rini <trini@konsulko.com> wrote:
>
> On Mon, Nov 21, 2022 at 03:51:10PM -0700, Simon Glass wrote:
> > On Sat, 19 Nov 2022 at 16:53, Tom Rini <trini@konsulko.com> wrote:
> > >
> > > We move the existing CONFIG_POST_* functionality over to CFG_POST and
> > > then introduce CONFIG_POST to Kconfig.
> > >
> > > Signed-off-by: Tom Rini <trini@konsulko.com>
> > > ---
> > >  arch/powerpc/cpu/mpc85xx/cpu.c                |  2 +-
> > >  configs/P2041RDB_NAND_defconfig               |  1 +
> > >  configs/P2041RDB_SDCARD_defconfig             |  1 +
> > >  configs/P2041RDB_SPIFLASH_defconfig           |  1 +
> > >  configs/P2041RDB_defconfig                    |  1 +
> > >  configs/kmcent2_defconfig                     |  1 +
> > >  configs/kmcoge5ne_defconfig                   |  1 +
> > >  configs/pg_wcom_expu1_defconfig               |  1 +
> > >  configs/pg_wcom_expu1_update_defconfig        |  1 +
> > >  configs/pg_wcom_seli8_defconfig               |  1 +
> > >  configs/pg_wcom_seli8_update_defconfig        |  1 +
> > >  doc/README.POST                               |  6 +-
> > >  doc/README.fsl-ddr                            |  2 +-
> > >  drivers/serial/serial-uclass.c                |  2 +-
> > >  drivers/serial/serial.c                       |  2 +-
> > >  include/configs/P2041RDB.h                    |  2 +-
> > >  include/configs/km/pg-wcom-ls102xa.h          |  4 +-
> > >  include/configs/kmcent2.h                     |  2 +-
> > >  include/configs/kmcoge5ne.h                   |  4 +-
> > >  include/post.h                                |  4 +-
> > >  include/serial.h                              |  4 +-
> > >  post/cpu/mpc83xx/ecc.c                        |  2 +-
> > >  post/drivers/flash.c                          |  2 +-
> > >  post/drivers/i2c.c                            |  4 +-
> > >  post/drivers/memory.c                         |  4 +-
> > >  post/drivers/rtc.c                            |  4 +-
> > >  post/lib_powerpc/andi.c                       |  2 +-
> > >  post/lib_powerpc/asm.S                        |  2 +-
> > >  post/lib_powerpc/b.c                          |  2 +-
> > >  post/lib_powerpc/cmp.c                        |  2 +-
> > >  post/lib_powerpc/cmpi.c                       |  2 +-
> > >  post/lib_powerpc/complex.c                    |  2 +-
> > >  post/lib_powerpc/cpu.c                        |  4 +-
> > >  post/lib_powerpc/cr.c                         |  2 +-
> > >  post/lib_powerpc/fpu/20001122-1.c             |  4 +-
> > >  post/lib_powerpc/fpu/20010114-2.c             |  4 +-
> > >  post/lib_powerpc/fpu/20010226-1.c             |  4 +-
> > >  post/lib_powerpc/fpu/980619-1.c               |  4 +-
> > >  post/lib_powerpc/fpu/acc1.c                   |  4 +-
> > >  post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
> > >  post/lib_powerpc/fpu/fpu.c                    |  4 +-
> > >  post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
> > >  post/lib_powerpc/load.c                       |  2 +-
> > >  post/lib_powerpc/multi.c                      |  2 +-
> > >  post/lib_powerpc/rlwimi.c                     |  2 +-
> > >  post/lib_powerpc/rlwinm.c                     |  2 +-
> > >  post/lib_powerpc/rlwnm.c                      |  2 +-
> > >  post/lib_powerpc/srawi.c                      |  2 +-
> > >  post/lib_powerpc/store.c                      |  2 +-
> > >  post/lib_powerpc/string.c                     |  2 +-
> > >  post/lib_powerpc/three.c                      |  2 +-
> > >  post/lib_powerpc/threei.c                     |  2 +-
> > >  post/lib_powerpc/threex.c                     |  2 +-
> > >  post/lib_powerpc/two.c                        |  2 +-
> > >  post/lib_powerpc/twox.c                       |  2 +-
> > >  post/post.c                                   |  4 +-
> > >  post/tests.c                                  | 68 +++++++++----------
> > >  test/Kconfig                                  |  5 ++
> > >  58 files changed, 114 insertions(+), 99 deletions(-)
> > >
> >
> > Reviewed-by: Simon Glass <sjg@chromium.org>
> >
> > but please see below
> >
> > > diff --git a/test/Kconfig b/test/Kconfig
> > > index a6b463e4d06c..9f4641ae6bc5 100644
> > > --- a/test/Kconfig
> > > +++ b/test/Kconfig
> > > @@ -1,3 +1,8 @@
> > > +config POST
> > > +       bool "Power On Self Test support"
> > > +       help
> > > +         See doc/README.POST for more details
> >
> > Shouldn't this be in post/Kconfig ?
>
> It's non-trivial enough content that it really should be migrated to
> doc/post/ and then expanded upon a bit further.
>
> > We use test/ for unit / functional tests.
>
> Yes, but post pre-dates all of that, keep in mind. It's also still in
> active use (enabled on some semi-recent layerscape platforms for
> example). This is an area that could use some attention and renovation,
> yes, but the whole point of this and the huge follow-up are to get the
> migrate to Kconfig part done already.

OK, good to get all this over the line!!

Regards,
Simon

Re: [PATCH 19/38] arm: samsung: Move CONFIG_MISC_COMMON to Kconfig

[Minkyu Kang]

Hi,

On Tue, 22 Nov 2022 at 07:51, Simon Glass <sjg@chromium.org> wrote:

> On Sat, 19 Nov 2022 at 16:49, Tom Rini <trini@konsulko.com> wrote:
> >
> > This option controls using board/samsung/common/misc.c, so add a Kconfig
> > file there as well and select it from the boards which use this
> > functionality.
> >
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> > ---
> >  arch/arm/Kconfig                    | 1 +
> >  arch/arm/mach-exynos/Kconfig        | 5 +++++
> >  arch/arm/mach-s5pc1xx/Kconfig       | 1 +
> >  board/samsung/common/Kconfig        | 2 ++
> >  include/configs/odroid.h            | 6 ------
> >  include/configs/odroid_xu3.h        | 1 -
> >  include/configs/s5p_goni.h          | 2 --
> >  include/configs/s5pc210_universal.h | 3 ---
> >  include/configs/trats.h             | 3 ---
> >  include/configs/trats2.h            | 3 ---
> >  10 files changed, 9 insertions(+), 18 deletions(-)
> >  create mode 100644 board/samsung/common/Kconfig
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>

Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>
-- 
Thanks,
Minkyu Kang.

Re: [PATCH 33/38] net: ftmac100: Remove non-DM_ETH code

[Ramon Fried]

On Sun, Nov 20, 2022 at 1:50 AM Tom Rini <trini@konsulko.com> wrote:
>
> At this point all users of this driver enable DM_ETH, so remove the
> legacy code paths.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  drivers/net/ftmac100.c | 91 +-----------------------------------------
>  1 file changed, 2 insertions(+), 89 deletions(-)
>
> diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
> index c30ace96bb13..f710c271c64b 100644
> --- a/drivers/net/ftmac100.c
> +++ b/drivers/net/ftmac100.c
> @@ -17,10 +17,10 @@
>  #include <linux/io.h>
>
>  #include "ftmac100.h"
> -#ifdef CONFIG_DM_ETH
>  #include <dm.h>
> +
>  DECLARE_GLOBAL_DATA_PTR;
> -#endif
> +
>  #define ETH_ZLEN       60
>
>  struct ftmac100_data {
> @@ -231,92 +231,6 @@ static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
>         return 0;
>  }
>
> -#ifndef CONFIG_DM_ETH
> -/*
> - * disable transmitter, receiver
> - */
> -static void ftmac100_halt(struct eth_device *dev)
> -{
> -       struct ftmac100_data *priv = dev->priv;
> -       return _ftmac100_halt(priv);
> -}
> -
> -static int ftmac100_init(struct eth_device *dev, struct bd_info *bd)
> -{
> -       struct ftmac100_data *priv = dev->priv;
> -       return _ftmac100_init(priv , dev->enetaddr);
> -}
> -
> -static int _ftmac100_recv(struct ftmac100_data *priv)
> -{
> -       struct ftmac100_rxdes *curr_des;
> -       unsigned short len;
> -       curr_des = &priv->rxdes[priv->rx_index];
> -       len = __ftmac100_recv(priv);
> -       if (len) {
> -               /* pass the packet up to the protocol layers. */
> -               net_process_received_packet((void *)curr_des->rxdes2, len);
> -               _ftmac100_free_pkt(priv);
> -       }
> -       return len ? 1 : 0;
> -}
> -
> -/*
> - * Get a data block via Ethernet
> - */
> -static int ftmac100_recv(struct eth_device *dev)
> -{
> -       struct ftmac100_data *priv = dev->priv;
> -       return _ftmac100_recv(priv);
> -}
> -
> -/*
> - * Send a data block via Ethernet
> - */
> -static int ftmac100_send(struct eth_device *dev, void *packet, int length)
> -{
> -       struct ftmac100_data *priv = dev->priv;
> -       return _ftmac100_send(priv , packet , length);
> -}
> -
> -int ftmac100_initialize (struct bd_info *bd)
> -{
> -       struct eth_device *dev;
> -       struct ftmac100_data *priv;
> -       dev = malloc (sizeof *dev);
> -       if (!dev) {
> -               printf ("%s(): failed to allocate dev\n", __func__);
> -               goto out;
> -       }
> -       /* Transmit and receive descriptors should align to 16 bytes */
> -       priv = memalign (16, sizeof (struct ftmac100_data));
> -       if (!priv) {
> -               printf ("%s(): failed to allocate priv\n", __func__);
> -               goto free_dev;
> -       }
> -       memset (dev, 0, sizeof (*dev));
> -       memset (priv, 0, sizeof (*priv));
> -
> -       strcpy(dev->name, "FTMAC100");
> -       dev->iobase     = CONFIG_FTMAC100_BASE;
> -       dev->init       = ftmac100_init;
> -       dev->halt       = ftmac100_halt;
> -       dev->send       = ftmac100_send;
> -       dev->recv       = ftmac100_recv;
> -       dev->priv       = priv;
> -       priv->iobase    = dev->iobase;
> -       eth_register (dev);
> -
> -       return 1;
> -
> -free_dev:
> -       free (dev);
> -out:
> -       return 0;
> -}
> -#endif
> -
> -#ifdef CONFIG_DM_ETH
>  static int ftmac100_start(struct udevice *dev)
>  {
>         struct eth_pdata *plat = dev_get_plat(dev);
> @@ -445,4 +359,3 @@ U_BOOT_DRIVER(ftmac100) = {
>         .plat_auto      = sizeof(struct eth_pdata),
>         .flags  = DM_FLAG_ALLOC_PRIV_DMA,
>  };
> -#endif
> --
> 2.25.1
>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

[PATCH 01/41] xenguest_arm64: Disable networking support more fully

[Tom Rini]

This platform had largely disabled networking support before. More
completely disable it by turning off CONFIG_NET.

Cc: Anastasiia Lukianenko <anastasiia_lukianenko@epam.com>
Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/xenguest_arm64_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/xenguest_arm64_defconfig b/configs/xenguest_arm64_defconfig
index 1632ca36b669..a696c2807b06 100644
--- a/configs/xenguest_arm64_defconfig
+++ b/configs/xenguest_arm64_defconfig
@@ -35,10 +35,10 @@ CONFIG_CMD_PVBLOCK=y
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
 # CONFIG_CMD_SLEEP is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
+# CONFIG_NET is not set
 # CONFIG_MMC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_DM_SERIAL=y
-- 
2.25.1

[PATCH 02/41] LicheePi_Zero: Disable networking support more fully

[Tom Rini]

This platform had largely disabled networking support before. More
completely disable it by turning off CONFIG_NET.

Cc: Icenowy Zheng <icenowy@aosc.xyz>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/LicheePi_Zero_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/LicheePi_Zero_defconfig b/configs/LicheePi_Zero_defconfig
index 5e9732e62e66..027edde6a5a9 100644
--- a/configs/LicheePi_Zero_defconfig
+++ b/configs/LicheePi_Zero_defconfig
@@ -6,4 +6,4 @@ CONFIG_MACH_SUN8I_V3S=y
 CONFIG_DRAM_CLK=360
 # CONFIG_HAS_ARMV7_SECURE_BASE is not set
 CONFIG_SYS_MONITOR_LEN=786432
-# CONFIG_NETDEVICES is not set
+# CONFIG_NET is not set
-- 
2.25.1

[PATCH 03/41] pinecube: Disable networking support more fully

[Tom Rini]

This platform had largely disabled networking support before. More
completely disable it by turning off CONFIG_NET.

Cc: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/pinecube_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/pinecube_defconfig b/configs/pinecube_defconfig
index 3386eda88624..2ce7b2772a18 100644
--- a/configs/pinecube_defconfig
+++ b/configs/pinecube_defconfig
@@ -10,12 +10,12 @@ CONFIG_I2C0_ENABLE=y
 # CONFIG_HAS_ARMV7_SECURE_BASE is not set
 CONFIG_SYS_MONITOR_LEN=786432
 CONFIG_SPL_I2C=y
+# CONFIG_NET is not set
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x7f
 CONFIG_SYS_I2C_SPEED=400000
 CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_NETDEVICES is not set
 CONFIG_AXP209_POWER=y
 CONFIG_AXP_DCDC2_VOLT=1250
 CONFIG_AXP_DCDC3_VOLT=3300
-- 
2.25.1

[PATCH 04/41] topic_miami*: Disable networking support more fully

[Tom Rini]

This platform had largely disabled networking support before. More
completely disable it by turning off CONFIG_NET.

Cc: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/topic_miami_defconfig     | 2 +-
 configs/topic_miamilite_defconfig | 2 +-
 configs/topic_miamiplus_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
index 96aa62a7ec12..ece625f62924 100644
--- a/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
 CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_NET is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
index 41ba8a7487d1..693a602ea395 100644
--- a/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
 CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_NET is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index 763bd8cccdd3..97624e69e722 100644
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -50,6 +50,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_NET is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
@@ -62,7 +63,6 @@ CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_SF_DEFAULT_SPEED=108000000
 CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-# CONFIG_NETDEVICES is not set
 CONFIG_DEBUG_UART_ZYNQ=y
 CONFIG_ARM_DCC=y
 CONFIG_ZYNQ_SERIAL=y
-- 
2.25.1

[PATCH 05/41] chromebook_samus_tpl: Disable SPL networking

[Tom Rini]

We don't appear to actually use networking in SPL here, disable it.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/chromebook_samus_tpl_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig
index 77735739b825..337768b45fd0 100644
--- a/configs/chromebook_samus_tpl_defconfig
+++ b/configs/chromebook_samus_tpl_defconfig
@@ -39,7 +39,6 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_HANDOFF=y
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DM_SPI_FLASH=y
-CONFIG_SPL_NET=y
 CONFIG_SPL_PCI=y
 CONFIG_SPL_PCH=y
 CONFIG_TPL_PCI=y
-- 
2.25.1

[PATCH 06/41] sunxi: Move MMC_SUNXI_SLOT to Kconfig

[Tom Rini]

This value is always defined to 0, so move it to Kconfig as being set to
always 0.

Cc: Andre Przywara <andre.przywara@arm.com>
C: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-sunxi/Kconfig    | 4 ++++
 include/configs/sunxi-common.h | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index dbe6005daab1..c311a6d03523 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -685,6 +685,10 @@ config MMC1_PINS_PH
 	---help---
 	Select this option for boards where mmc1 uses the Port H pinmux.
 
+config MMC_SUNXI_SLOT
+	int
+	default 0
+
 config MMC_SUNXI_SLOT_EXTRA
 	int "mmc extra slot number"
 	default -1
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 1677aafad03b..496139f34635 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -69,9 +69,6 @@
 #define PHYS_SDRAM_0			CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */
 
-/* mmc config */
-#define CONFIG_MMC_SUNXI_SLOT		0
-
 /*
  * Miscellaneous configurable options
  */
-- 
2.25.1

[PATCH 07/41] net: Remove extraneous dependencies

[Tom Rini]

With DM_ETH being required now for all drivers, we don't need this
listed on individual drivers as well.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/Kconfig              |  4 ++--
 drivers/net/bnxt/Kconfig         |  1 -
 drivers/net/mscc_eswitch/Kconfig | 10 +++++-----
 drivers/net/phy/Kconfig          |  3 ---
 drivers/net/qe/Kconfig           |  1 -
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 32404972bb37..38699ad2beb4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,7 +1,6 @@
 source "drivers/net/phy/Kconfig"
 source "drivers/net/pfe_eth/Kconfig"
 source "drivers/net/fsl-mc/Kconfig"
-source "drivers/net/bnxt/Kconfig"
 
 config ETH
 	def_bool y
@@ -175,6 +174,8 @@ config BCMGENET
 	help
 	  This driver supports the BCMGENET Ethernet MAC.
 
+source "drivers/net/bnxt/Kconfig"
+
 config CORTINA_NI_ENET
 	bool "Cortina-Access Ethernet driver"
 	depends on CORTINA_PLATFORM
@@ -716,7 +717,6 @@ config RENESAS_RAVB
 config MPC8XX_FEC
 	bool "Fast Ethernet Controller on MPC8XX"
 	depends on MPC8xx
-	depends on DM_ETH
 	select MII
 	select SYS_DISCOVER_PHY
 	help
diff --git a/drivers/net/bnxt/Kconfig b/drivers/net/bnxt/Kconfig
index 412ecd430335..6ff3ffa137be 100644
--- a/drivers/net/bnxt/Kconfig
+++ b/drivers/net/bnxt/Kconfig
@@ -1,6 +1,5 @@
 config BNXT_ETH
 	bool "BNXT PCI support"
-	depends on DM_ETH
 	select PCI_INIT_R
 	help
 	  This driver implements support for bnxt pci controller
diff --git a/drivers/net/mscc_eswitch/Kconfig b/drivers/net/mscc_eswitch/Kconfig
index 930d2ef11301..f9780661c80f 100644
--- a/drivers/net/mscc_eswitch/Kconfig
+++ b/drivers/net/mscc_eswitch/Kconfig
@@ -4,35 +4,35 @@
 
 config MSCC_OCELOT_SWITCH
 	bool "Ocelot switch driver"
-	depends on DM_ETH && ARCH_MSCC
+	depends on ARCH_MSCC
 	select PHYLIB
 	help
 	  This driver supports the Ocelot network switch device.
 
 config MSCC_LUTON_SWITCH
 	bool "Luton switch driver"
-	depends on DM_ETH && ARCH_MSCC
+	depends on ARCH_MSCC
 	select PHYLIB
 	help
 	  This driver supports the Luton network switch device.
 
 config MSCC_JR2_SWITCH
 	bool "Jaguar2 switch driver"
-	depends on DM_ETH && ARCH_MSCC
+	depends on ARCH_MSCC
 	select PHYLIB
 	help
 	  This driver supports the Jaguar2 network switch device.
 
 config MSCC_SERVALT_SWITCH
 	bool "Servalt switch driver"
-	depends on DM_ETH && ARCH_MSCC
+	depends on ARCH_MSCC
 	select PHYLIB
 	help
 	  This driver supports the Servalt network switch device.
 
 config MSCC_SERVAL_SWITCH
 	bool "Serval switch driver"
-	depends on DM_ETH && ARCH_MSCC
+	depends on ARCH_MSCC
 	select PHYLIB
 	help
 	  This driver supports the Serval network switch device.
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 52ce08b3b384..a1f90a44671a 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -315,7 +315,6 @@ config PHY_XILINX
 
 config PHY_XILINX_GMII2RGMII
 	bool "Xilinx GMII to RGMII Ethernet PHYs support"
-	depends on DM_ETH
 	help
 	  This adds support for Xilinx GMII to RGMII IP core. This IP acts
 	  as bridge between MAC connected over GMII and external phy that
@@ -331,7 +330,6 @@ config PHY_ETHERNET_ID
 
 config PHY_FIXED
 	bool "Fixed-Link PHY"
-	depends on DM_ETH
 	help
 	  Fixed PHY is used for having a 'fixed-link' to another MAC with a direct
 	  connection (MII, RGMII, ...).
@@ -341,7 +339,6 @@ config PHY_FIXED
 
 config PHY_NCSI
 	bool "NC-SI based PHY"
-	depends on DM_ETH
 
 endif #PHYLIB
 
diff --git a/drivers/net/qe/Kconfig b/drivers/net/qe/Kconfig
index dec88dea2a3f..e795e913d42d 100644
--- a/drivers/net/qe/Kconfig
+++ b/drivers/net/qe/Kconfig
@@ -4,6 +4,5 @@
 
 config QE_UEC
 	bool "NXP QE UEC Ethernet controller"
-	depends on DM_ETH
 	help
 	  This driver supports the NXP QE UEC ethernet controller
-- 
2.25.1

[PATCH 08/41] global: Remove extraneous DM_ETH imply/select

[Tom Rini]

We only need to enable DM_ETH if we have a networking driver. All
networking drivers depend on DM_ETH being enabled, and their selection
ensures DM_ETH will be enabled.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/Kconfig                       |  2 --
 arch/arm/Kconfig                   | 13 -------------
 arch/arm/mach-at91/Kconfig         |  4 ----
 arch/arm/mach-imx/mx5/Kconfig      |  1 -
 arch/arm/mach-imx/mx6/Kconfig      | 16 ----------------
 arch/arm/mach-omap2/am33xx/Kconfig |  1 -
 arch/arm/mach-snapdragon/Kconfig   |  2 --
 arch/arm/mach-tegra/Kconfig        |  1 -
 arch/mips/Kconfig                  |  4 ----
 board/armltd/vexpress64/Kconfig    |  1 -
 board/keymile/km83xx/Kconfig       |  1 -
 board/tq/tqma6/Kconfig             |  1 -
 12 files changed, 47 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index 51d46a45fef1..b074cc6c51eb 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -113,7 +113,6 @@ config RISCV
 	select DM
 	select SPL_SEPARATE_BSS if SPL
 	imply DM_SERIAL
-	imply DM_ETH
 	imply DM_EVENT
 	imply DM_MMC
 	imply DM_SPI
@@ -241,7 +240,6 @@ config X86
 	imply CMD_SF
 	imply CMD_SF_TEST
 	imply CMD_ZBOOT
-	imply DM_ETH
 	imply DM_EVENT
 	imply DM_GPIO
 	imply DM_KEYBOARD
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1c734fa08774..f55113fb5c8b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -632,7 +632,6 @@ config ARCH_KIRKWOOD
 config ARCH_MVEBU
 	bool "Marvell MVEBU family (Armada XP/375/38x/3700/7K/8K)"
 	select DM
-	select DM_ETH
 	select DM_SERIAL
 	select DM_SPI
 	select DM_SPI_FLASH
@@ -736,7 +735,6 @@ config ARCH_EXYNOS
 	select DM
 	select DM_GPIO
 	select DM_I2C
-	select DM_ETH
 	select DM_KEYBOARD
 	select DM_SERIAL
 	select DM_SPI
@@ -767,7 +765,6 @@ config ARCH_HIGHBANK
 	select CLK
 	select CLK_CCF
 	select AHCI
-	select DM_ETH
 	select PHYS_64BIT
 	select TIMER
 	select SP804_TIMER
@@ -1041,7 +1038,6 @@ config ARCH_APPLE
 config ARCH_OWL
 	bool "Actions Semi OWL SoCs"
 	select DM
-	select DM_ETH
 	select DM_SERIAL
 	select GPIO_EXTRA_HEADER
 	select OWL_SERIAL
@@ -1141,7 +1137,6 @@ config ARCH_SUNXI
 	select CMD_USB if DISTRO_DEFAULTS && USB_HOST
 	select CLK
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C if I2C
 	select DM_SPI if SPI
@@ -1220,7 +1215,6 @@ config ARCH_VERSAL
 	select ARM64
 	select CLK
 	select DM
-	select DM_ETH if NET
 	select DM_MMC if MMC
 	select DM_SERIAL
 	select GICV3
@@ -1234,7 +1228,6 @@ config ARCH_VERSAL_NET
 	select ARM64
 	select CLK
 	select DM
-	select DM_ETH if NET
 	select DM_MMC if MMC
 	select DM_SERIAL
 	select OF_CONTROL
@@ -1259,7 +1252,6 @@ config ARCH_ZYNQ
 	select CPU_V7A
 	select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART
 	select DM
-	select DM_ETH if NET
 	select DM_MMC if MMC
 	select DM_SERIAL
 	select DM_SPI
@@ -1289,7 +1281,6 @@ config ARCH_ZYNQMP_R5
 	select CLK
 	select CPU_V7R
 	select DM
-	select DM_ETH if NET
 	select DM_MMC if MMC
 	select DM_SERIAL
 	select OF_CONTROL
@@ -1302,7 +1293,6 @@ config ARCH_ZYNQMP
 	select CLK
 	select DM
 	select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART
-	select DM_ETH if NET
 	select DM_MAILBOX
 	select DM_MMC if MMC
 	select DM_SERIAL
@@ -1849,7 +1839,6 @@ config TARGET_SL28
 	select DM_I2C
 	select DM_MMC
 	select DM_SPI_FLASH
-	select DM_ETH
 	select DM_MDIO
 	select PCI
 	select DM_RNG
@@ -1886,7 +1875,6 @@ config ARCH_UNIPHIER
 	bool "Socionext UniPhier SoCs"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -2072,7 +2060,6 @@ config TARGET_POMELO
 	select SCSI
 	select DM_SCSI
 	select DM_SERIAL
-	select DM_ETH if NET
 	imply CMD_PCI
 	help
 	   Support for pomelo platform.
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 094c9891f648..7c2e4ebbdb0f 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -85,7 +85,6 @@ config TARGET_GURNARD
 	select AT91_WANTS_COMMON_PHY
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_SERIAL
 	select DM_SPI
@@ -253,7 +252,6 @@ config TARGET_CORVUS
 	select AT91SAM9M10G45
 	select AT91_WANTS_COMMON_PHY
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_SERIAL
 	select SUPPORT_SPL
@@ -271,7 +269,6 @@ config TARGET_TAURUS
 	select AT91SAM9G20
 	select AT91_WANTS_COMMON_PHY
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_SERIAL
 	select DM_SPI
@@ -284,7 +281,6 @@ config TARGET_SMARTWEB
 	select AT91SAM9260
 	select AT91_WANTS_COMMON_PHY
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_SERIAL
 	select SUPPORT_SPL
diff --git a/arch/arm/mach-imx/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig
index 494e2136dc04..d282663dcf1f 100644
--- a/arch/arm/mach-imx/mx5/Kconfig
+++ b/arch/arm/mach-imx/mx5/Kconfig
@@ -22,7 +22,6 @@ config TARGET_KP_IMX53
 	bool "Support K+P imx53 board"
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_PMIC
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index e6b0ee757933..7529b311f80e 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -174,7 +174,6 @@ config TARGET_DART_6UL
 	bool "Variscite imx6ULL dart(DART-SOM-6ULL)"
 	depends on MX6ULL
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -197,7 +196,6 @@ config TARGET_DISPLAY5
 	bool "LWN DISPLAY5 board"
 	depends on MX6Q
 	select DM
-	select DM_ETH
 	select DM_I2C
 	select DM_MMC
 	select DM_SPI
@@ -245,7 +243,6 @@ config TARGET_KONTRON_MX6UL
 config TARGET_KOSAGI_NOVENA
 	bool "Kosagi Novena"
 	select BOARD_LATE_INIT
-	select DM_ETH
 	select DM_GPIO
 	select DM_MMC
 	select PCI
@@ -261,7 +258,6 @@ config TARGET_MCCMON6
 	select SUPPORT_SPL
 	select DM
 	select DM_GPIO
-	select DM_ETH
 	select DM_SERIAL
 	select DM_I2C
 	select DM_SPI
@@ -280,7 +276,6 @@ config TARGET_MX6LOGICPD
 	select BOARD_EARLY_INIT_F
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -301,7 +296,6 @@ config TARGET_MX6DL_MAMOJ
 	bool "Support BTicino Mamoj"
 	depends on MX6QDL
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -334,7 +328,6 @@ config TARGET_MX6Q_ENGICAM
 	depends on MX6QDL
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -355,7 +348,6 @@ config TARGET_MX6Q_ACC
 	select OF_CONTROL
 	select SPL_OF_LIBFDT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -447,7 +439,6 @@ config TARGET_MX6UL_ENGICAM
 	depends on MX6UL
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -484,7 +475,6 @@ config TARGET_MYS_6ULX
 	bool "MYiR MYS-6ULX"
 	depends on MX6ULL
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -504,7 +494,6 @@ config TARGET_NPI_IMX6ULL
 	bool "Seeed NPI-IMX6ULL"
 	depends on MX6ULL
 	select DM
-	select DM_ETH
 	select DM_MMC
 	select DM_GPIO
 	select DM_SERIAL
@@ -552,7 +541,6 @@ config TARGET_PCL063
 	bool "PHYTEC PCL063 (phyCORE-i.MX6UL)"
 	depends on MX6UL
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -564,7 +552,6 @@ config TARGET_PCL063_ULL
 	bool "PHYTEC PCL063 (phyCORE-i.MX6ULL)"
 	depends on MX6ULL
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
@@ -577,7 +564,6 @@ config TARGET_SOMLABS_VISIONSOM_6ULL
 	depends on MX6ULL
 	select BOARD_LATE_INIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_MMC
 	select DM_SERIAL
@@ -597,7 +583,6 @@ config TARGET_KP_IMX6Q_TPC
 	select SPL_DM if SPL
 	select DM_THERMAL
 	select DM_MMC
-	select DM_ETH
 	select DM_REGULATOR
 	select SPL_DM_REGULATOR if SPL
 	select DM_SERIAL
@@ -661,7 +646,6 @@ config TARGET_BRPPT2
 	select OF_CONTROL
 	select SPL_OF_LIBFDT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_MMC
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 6c2d46abc4cf..b666e8111040 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -230,7 +230,6 @@ config TARGET_AM43XX_EVM
 	bool "Support am43xx_evm"
 	select BOARD_LATE_INIT
 	select TI_I2C_BOARD_DETECT
-	imply DM_ETH
 	imply DM_I2C
 	imply DM_SPI
 	imply DM_SPI_FLASH
diff --git a/arch/arm/mach-snapdragon/Kconfig b/arch/arm/mach-snapdragon/Kconfig
index 092733330683..914f4d960534 100644
--- a/arch/arm/mach-snapdragon/Kconfig
+++ b/arch/arm/mach-snapdragon/Kconfig
@@ -55,7 +55,6 @@ config TARGET_DRAGONBOARD845C
 	  - 64GiB UFS drive
 	select MISC_INIT_R
 	select SDM845
-	select DM_ETH if NET
 
 config TARGET_STARQLTECHN
 	bool "Samsung S9 SM-G9600(starqltechn)"
@@ -67,7 +66,6 @@ config TARGET_STARQLTECHN
 	  - 64GiB UFS drive
 	select MISC_INIT_R
 	select SDM845
-	select DM_ETH if NET
 
 config TARGET_QCS404EVB
 	bool "Qualcomm Technologies, Inc. QCS404 EVB"
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 09ad2d6f5aec..edcf967afd96 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -44,7 +44,6 @@ config TEGRA_COMMON
 	select BOARD_EARLY_INIT_F
 	select CLK
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_KEYBOARD
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9af0133f1068..23142bd2700d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -19,7 +19,6 @@ config TARGET_MALTA
 	select DM
 	select DM_SERIAL
 	select PCI
-	select DM_ETH
 	select DYNAMIC_IO_PORT_BASE
 	select MIPS_CM
 	select MIPS_INSERT_BOOT_CONFIG
@@ -71,7 +70,6 @@ config ARCH_MTMIPS
 	imply CMD_DM
 	select DISPLAY_CPUINFO
 	select DM
-	imply DM_ETH
 	imply DM_GPIO
 	select DM_RESET
 	select DM_SERIAL
@@ -104,7 +102,6 @@ config ARCH_OCTEON
 	select DISPLAY_CPUINFO
 	select DMA_ADDR_T_64BIT
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_I2C
 	select DM_SERIAL
@@ -153,7 +150,6 @@ config TARGET_XILFPGA
 	bool "Support Imagination Xilfpga"
 	select HAS_FIXED_TIMER_FREQUENCY
 	select DM
-	select DM_ETH
 	select DM_GPIO
 	select DM_SERIAL
 	select SYS_CACHE_SHIFT_4
diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index c7adae0ea717..5616e223a90a 100644
--- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig
@@ -14,7 +14,6 @@ config VEXPRESS64_BASE_MODEL
 	select SEMIHOSTING
 	select VIRTIO_BLK if VIRTIO_MMIO
 	select VIRTIO_NET if VIRTIO_MMIO
-	select DM_ETH if VIRTIO_NET
 	select LINUX_KERNEL_IMAGE_HEADER
 	select POSITION_INDEPENDENT
 
diff --git a/board/keymile/km83xx/Kconfig b/board/keymile/km83xx/Kconfig
index ef3c62b9ded6..f87a2e64163e 100644
--- a/board/keymile/km83xx/Kconfig
+++ b/board/keymile/km83xx/Kconfig
@@ -6,7 +6,6 @@ config KM_ENABLE_FULL_DM_DTS_SUPPORT
 	default y
 	select CMD_DM
 	select DM
-	select DM_ETH
 	select DM_MDIO
 	select DM_SERIAL
 	select OF_CONTROL
diff --git a/board/tq/tqma6/Kconfig b/board/tq/tqma6/Kconfig
index 1cd90718f4a1..e7f23367afd2 100644
--- a/board/tq/tqma6/Kconfig
+++ b/board/tq/tqma6/Kconfig
@@ -63,7 +63,6 @@ choice
 
 config MBA6
 	bool "TQMa6 on MBa6 Starterkit"
-	select DM_ETH
 	select USB
 	select CMD_USB
 	select USB_STORAGE
-- 
2.25.1

[PATCH 09/41] net: tsec: Remove non-DM_ETH support code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.  Doing this removes some board support code
which was also unused. Finally, this removes some CONFIG symbols that
otherwise needed to be migrated to Kconfig, but were unused in code now.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-ls102xa/config.h  |   5 -
 arch/powerpc/include/asm/config_mpc85xx.h   |  17 --
 arch/powerpc/include/asm/immap_83xx.h       |   5 -
 arch/powerpc/include/asm/immap_85xx.h       |   8 -
 board/freescale/common/pixis.c              |  73 -------
 board/freescale/mpc8548cds/mpc8548cds.c     |  82 --------
 board/freescale/p1010rdb/p1010rdb.c         |  43 -----
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c |  50 -----
 drivers/net/tsec.c                          | 199 +-------------------
 include/configs/MPC837XERDB.h               |  27 ---
 include/configs/MPC8548CDS.h                |  27 ---
 include/configs/P1010RDB.h                  |  31 ---
 include/configs/ls1021aiot.h                |  21 ---
 include/configs/ls1021aqds.h                |  26 ---
 include/configs/p1_p2_rdb_pc.h              |  21 ---
 include/configs/socrates.h                  |  16 --
 include/tsec.h                              |  60 ------
 17 files changed, 1 insertion(+), 710 deletions(-)

diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 6413a307d273..14f86df5ed5a 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -36,11 +36,6 @@
 
 #define CFG_SYS_FSL_SEC_OFFSET		0x00700000
 #define CFG_SYS_FSL_JR0_OFFSET		0x00710000
-#define CFG_SYS_TSEC1_OFFSET			0x01d10000
-#define CFG_SYS_MDIO1_OFFSET			0x01d24000
-
-#define TSEC_BASE_ADDR	(CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)
-#define MDIO_BASE_ADDR	(CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)
 
 #define SCTR_BASE_ADDR				(CONFIG_SYS_IMMR + 0x01b00000)
 
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index d9e5a7d62170..1b5b4947f1a8 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -24,18 +24,9 @@
 
 #elif defined(CONFIG_ARCH_P1010)
 #define CONFIG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 
-/* P1011 is single core version of P1020 */
-#elif defined(CONFIG_ARCH_P1011)
-#define CONFIG_TSECV2
-
-#elif defined(CONFIG_ARCH_P1020)
-#define CONFIG_TSECV2
-
 #elif defined(CONFIG_ARCH_P1021)
-#define CONFIG_TSECV2
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
 #define QE_NUM_OF_SNUM			28
@@ -47,13 +38,8 @@
 #define CFG_SYS_BMAN_NUM_PORTALS	3
 #define CFG_SYS_FM_MURAM_SIZE	0x10000
 
-/* P1024 is lower end variant of P1020 */
-#elif defined(CONFIG_ARCH_P1024)
-#define CONFIG_TSECV2
-
 /* P1025 is lower end variant of P1021 */
 #elif defined(CONFIG_ARCH_P1025)
-#define CONFIG_TSECV2
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
 #define QE_NUM_OF_SNUM			28
@@ -108,12 +94,10 @@
 
 #elif defined(CONFIG_ARCH_BSC9131)
 #define CONFIG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_BSC9132)
 #define CONFIG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_T4240)
@@ -221,7 +205,6 @@
 
 #elif defined(CONFIG_ARCH_C29X)
 #define CONFIG_FSL_SDHC_V2_3
-#define CONFIG_TSECV2_1
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FSL_SEC_IDX_OFFSET	0x20000
 
diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index 19774f3053b3..24bd438c1432 100644
--- a/arch/powerpc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
@@ -873,9 +873,4 @@ struct ccsr_gpio {
 
 #define CFG_SYS_LBC_ADDR (&((immap_t *)CONFIG_SYS_IMMR)->im_lbc)
 
-#define CFG_SYS_TSEC1_OFFSET		0x24000
-#define CFG_SYS_MDIO1_OFFSET		0x24000
-
-#define TSEC_BASE_ADDR		(CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)
-#define MDIO_BASE_ADDR		(CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)
 #endif				/* __IMMAP_83xx__ */
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 283fdf3b458a..7293720fb3cd 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2541,13 +2541,6 @@ struct ccsr_pman {
 #define CFG_SYS_MPC85xx_USB2_OFFSET		0x23000
 #define CFG_SYS_MPC85xx_USB1_PHY_OFFSET	0xE5000
 #define CFG_SYS_MPC85xx_USB2_PHY_OFFSET	0xE5100
-#ifdef CONFIG_TSECV2
-#define CFG_SYS_TSEC1_OFFSET			0xB0000
-#elif defined(CONFIG_TSECV2_1)
-#define CFG_SYS_TSEC1_OFFSET			0x10000
-#else
-#define CFG_SYS_TSEC1_OFFSET			0x24000
-#endif
 #define CFG_SYS_MDIO1_OFFSET			0x24000
 #define CFG_SYS_MPC85xx_ESDHC_OFFSET		0x2e000
 #if defined(CONFIG_ARCH_C29X)
@@ -2673,7 +2666,6 @@ struct ccsr_pman {
 #define CFG_SYS_SEC_MON_ADDR  \
 	(CONFIG_SYS_IMMR + CFG_SYS_SEC_MON_OFFSET)
 
-#define TSEC_BASE_ADDR		(CONFIG_SYS_IMMR + CFG_SYS_TSEC1_OFFSET)
 #define MDIO_BASE_ADDR		(CONFIG_SYS_IMMR + CFG_SYS_MDIO1_OFFSET)
 
 #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index 6fdb11039e54..cb9f4549725c 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -281,79 +281,6 @@ U_BOOT_CMD(
 	""
 );
 
-#ifdef CONFIG_PIXIS_SGMII_CMD
-
-/* Enable or disable SGMII mode for a TSEC
- */
-static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc,
-			   char *const argv[])
-{
-	int which_tsec = -1;
-	unsigned char mask;
-	unsigned char switch_mask;
-
-	if ((argc > 2) && (strcmp(argv[1], "all") != 0))
-		which_tsec = simple_strtoul(argv[1], NULL, 0);
-
-	switch (which_tsec) {
-#ifdef CONFIG_TSEC1
-	case 1:
-		mask = PIXIS_VSPEED2_TSEC1SER;
-		switch_mask = PIXIS_VCFGEN1_TSEC1SER;
-		break;
-#endif
-#ifdef CONFIG_TSEC2
-	case 2:
-		mask = PIXIS_VSPEED2_TSEC2SER;
-		switch_mask = PIXIS_VCFGEN1_TSEC2SER;
-		break;
-#endif
-#ifdef CONFIG_TSEC3
-	case 3:
-		mask = PIXIS_VSPEED2_TSEC3SER;
-		switch_mask = PIXIS_VCFGEN1_TSEC3SER;
-		break;
-#endif
-#ifdef CONFIG_TSEC4
-	case 4:
-		mask = PIXIS_VSPEED2_TSEC4SER;
-		switch_mask = PIXIS_VCFGEN1_TSEC4SER;
-		break;
-#endif
-	default:
-		mask = PIXIS_VSPEED2_MASK;
-		switch_mask = PIXIS_VCFGEN1_MASK;
-		break;
-	}
-
-	/* Toggle whether the switches or FPGA control the settings */
-	if (!strcmp(argv[argc - 1], "switch"))
-		clrbits_8(pixis_base + PIXIS_VCFGEN1, switch_mask);
-	else
-		setbits_8(pixis_base + PIXIS_VCFGEN1, switch_mask);
-
-	/* If it's not the switches, enable or disable SGMII, as specified */
-	if (!strcmp(argv[argc - 1], "on"))
-		clrbits_8(pixis_base + PIXIS_VSPEED2, mask);
-	else if (!strcmp(argv[argc - 1], "off"))
-		setbits_8(pixis_base + PIXIS_VSPEED2, mask);
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	pixis_set_sgmii, CONFIG_SYS_MAXARGS, 1, pixis_set_sgmii,
-	"pixis_set_sgmii"
-	" - Enable or disable SGMII mode for a given TSEC \n",
-	"\npixis_set_sgmii [TSEC num] <on|off|switch>\n"
-	"    TSEC num: 1,2,3,4 or 'all'.  'all' is default.\n"
-	"    on - enables SGMII\n"
-	"    off - disables SGMII\n"
-	"    switch - use switch settings"
-);
-
-#endif
-
 /*
  * This function takes the non-integral cpu:mpx pll ratio
  * and converts it to an integer that can be used to assign
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 73e024eaa011..ec6e3a2d0ab5 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -168,85 +168,3 @@ void lbc_sdram_init(void)
 
 #endif	/* enable SDRAM init */
 }
-
-#ifndef CONFIG_DM_ETH
-static void configure_rgmii(void)
-{
-	unsigned short temp;
-
-	/* Change the resistors for the PHY */
-	/* This is needed to get the RGMII working for the 1.3+
-	 * CDS cards */
-	if (get_board_version() ==  0x13) {
-		miiphy_write(DEFAULT_MII_NAME,
-				TSEC1_PHY_ADDR, 29, 18);
-
-		miiphy_read(DEFAULT_MII_NAME,
-				TSEC1_PHY_ADDR, 30, &temp);
-
-		temp = (temp & 0xf03f);
-		temp |= 2 << 9;		/* 36 ohm */
-		temp |= 2 << 6;		/* 39 ohm */
-
-		miiphy_write(DEFAULT_MII_NAME,
-				TSEC1_PHY_ADDR, 30, temp);
-
-		miiphy_write(DEFAULT_MII_NAME,
-				TSEC1_PHY_ADDR, 29, 3);
-
-		miiphy_write(DEFAULT_MII_NAME,
-				TSEC1_PHY_ADDR, 30, 0x8000);
-	}
-
-	return;
-}
-
-int board_eth_init(struct bd_info *bis)
-{
-#ifdef CONFIG_TSEC_ENET
-	struct fsl_pq_mdio_info mdio_info;
-	struct tsec_info_struct tsec_info[4];
-	int num = 0;
-
-#ifdef CONFIG_TSEC1
-	SET_STD_TSEC_INFO(tsec_info[num], 1);
-	num++;
-#endif
-#ifdef CONFIG_TSEC2
-	SET_STD_TSEC_INFO(tsec_info[num], 2);
-	num++;
-#endif
-#ifdef CONFIG_TSEC3
-	/* initialize TSEC3 only if Carrier is 1.3 or above on CDS */
-	if (get_board_version() >= 0x13) {
-		SET_STD_TSEC_INFO(tsec_info[num], 3);
-		tsec_info[num].interface = PHY_INTERFACE_MODE_RGMII_ID;
-		num++;
-	}
-#endif
-#ifdef CONFIG_TSEC4
-	/* initialize TSEC4 only if Carrier is 1.3 or above on CDS */
-	if (get_board_version() >= 0x13) {
-		SET_STD_TSEC_INFO(tsec_info[num], 4);
-		tsec_info[num].interface = PHY_INTERFACE_MODE_RGMII_ID;
-		num++;
-	}
-#endif
-
-	if (!num) {
-		printf("No TSECs initialized\n");
-
-		return 0;
-	}
-
-	mdio_info.regs = (struct tsec_mii_mng *)CONFIG_SYS_MDIO_BASE_ADDR;
-	mdio_info.name = DEFAULT_MII_NAME;
-	fsl_pq_mdio_init(bis, &mdio_info);
-
-	tsec_eth_init(bis, tsec_info, num);
-	configure_rgmii();
-#endif
-
-	return pci_eth_init(bis);
-}
-#endif
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 0f014823c935..d32274b24812 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -478,49 +478,6 @@ int checkboard(void)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-int board_eth_init(struct bd_info *bis)
-{
-#ifdef CONFIG_TSEC_ENET
-	struct fsl_pq_mdio_info mdio_info;
-	struct tsec_info_struct tsec_info[4];
-	struct cpu_type *cpu;
-	int num = 0;
-
-	cpu = gd->arch.cpu;
-
-#ifdef CONFIG_TSEC1
-	SET_STD_TSEC_INFO(tsec_info[num], 1);
-	num++;
-#endif
-#ifdef CONFIG_TSEC2
-	SET_STD_TSEC_INFO(tsec_info[num], 2);
-	num++;
-#endif
-#ifdef CONFIG_TSEC3
-	/* P1014 and it's derivatives do not support eTSEC3 */
-	if (cpu->soc_ver != SVR_P1014) {
-		SET_STD_TSEC_INFO(tsec_info[num], 3);
-		num++;
-	}
-#endif
-	if (!num) {
-		printf("No TSECs initialized\n");
-		return 0;
-	}
-
-	mdio_info.regs = (struct tsec_mii_mng *)CONFIG_SYS_MDIO_BASE_ADDR;
-	mdio_info.name = DEFAULT_MII_NAME;
-
-	fsl_pq_mdio_init(bis, &mdio_info);
-
-	tsec_eth_init(bis, tsec_info, num);
-#endif
-
-	return pci_eth_init(bis);
-}
-#endif
-
 #if defined(CONFIG_OF_BOARD_SETUP)
 void fdt_del_flexcan(void *blob)
 {
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index ab7972442970..df9f6ae47322 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -364,56 +364,6 @@ int board_early_init_r(void)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-int board_eth_init(struct bd_info *bis)
-{
-	struct fsl_pq_mdio_info mdio_info;
-	struct tsec_info_struct tsec_info[4];
-	ccsr_gur_t *gur __attribute__((unused)) =
-		(void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
-	int num = 0;
-
-#ifdef CONFIG_TSEC1
-	SET_STD_TSEC_INFO(tsec_info[num], 1);
-	num++;
-#endif
-#ifdef CONFIG_TSEC2
-	SET_STD_TSEC_INFO(tsec_info[num], 2);
-	if (is_serdes_configured(SGMII_TSEC2)) {
-		printf("eTSEC2 is in sgmii mode.\n");
-		tsec_info[num].flags |= TSEC_SGMII;
-	}
-	num++;
-#endif
-#ifdef CONFIG_TSEC3
-	SET_STD_TSEC_INFO(tsec_info[num], 3);
-	num++;
-#endif
-
-	if (!num) {
-		printf("No TSECs initialized\n");
-		return 0;
-	}
-
-	mdio_info.regs = TSEC_GET_MDIO_REGS_BASE(1);
-	mdio_info.name = DEFAULT_MII_NAME;
-
-	fsl_pq_mdio_init(bis, &mdio_info);
-
-	tsec_eth_init(bis, tsec_info, num);
-
-#if defined(CONFIG_UEC_ETH)
-	/*  QE0 and QE3 need to be exposed for UCC1 and UCC5 Eth mode */
-	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE0);
-	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE3);
-
-	uec_standard_init(bis);
-#endif
-
-	return pci_eth_init(bis);
-}
-#endif
-
 #if defined(CONFIG_OF_BOARD_SETUP) || defined(CONFIG_OF_BOARD_FIXUP)
 static void fix_max6370_watchdog(void *blob)
 {
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 8b6f034ea165..f465409d8c8e 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -22,34 +22,6 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 
-#ifndef CONFIG_DM_ETH
-/* Default initializations for TSEC controllers. */
-
-static struct tsec_info_struct tsec_info[] = {
-#ifdef CONFIG_TSEC1
-	STD_TSEC_INFO(1),	/* TSEC1 */
-#endif
-#ifdef CONFIG_TSEC2
-	STD_TSEC_INFO(2),	/* TSEC2 */
-#endif
-#ifdef CONFIG_MPC85XX_FEC
-	{
-		.regs = TSEC_GET_REGS(2, 0x2000),
-		.devname = CONFIG_MPC85XX_FEC_NAME,
-		.phyaddr = FEC_PHY_ADDR,
-		.flags = FEC_FLAGS,
-		.mii_devname = DEFAULT_MII_NAME
-	},			/* FEC */
-#endif
-#ifdef CONFIG_TSEC3
-	STD_TSEC_INFO(3),	/* TSEC3 */
-#endif
-#ifdef CONFIG_TSEC4
-	STD_TSEC_INFO(4),	/* TSEC4 */
-#endif
-};
-#endif /* CONFIG_DM_ETH */
-
 #define TBIANA_SETTINGS ( \
 		TBIANA_ASYMMETRIC_PAUSE \
 		| TBIANA_SYMMETRIC_PAUSE \
@@ -124,23 +96,14 @@ static u32 ether_crc(size_t len, unsigned char const *p)
  * for PowerPC (tm) is usually the case) in the register holds
  * the entry.
  */
-#ifndef CONFIG_DM_ETH
-static int tsec_mcast_addr(struct eth_device *dev, const u8 *mcast_mac,
-			   int join)
-#else
 static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int join)
-#endif
 {
 	struct tsec_private *priv;
 	struct tsec __iomem *regs;
 	u32 result, value;
 	u8 whichbit, whichreg;
 
-#ifndef CONFIG_DM_ETH
-	priv = (struct tsec_private *)dev->priv;
-#else
 	priv = dev_get_priv(dev);
-#endif
 	regs = priv->regs;
 	result = ether_crc(MAC_ADDR_LEN, mcast_mac);
 	whichbit = (result >> 24) & 0x1f; /* the 5 LSB = which bit to set */
@@ -271,11 +234,7 @@ static void adjust_link(struct tsec_private *priv, struct phy_device *phydev)
  * do the same. Presumably, this would be zero if there were no
  * errors
  */
-#ifndef CONFIG_DM_ETH
-static int tsec_send(struct eth_device *dev, void *packet, int length)
-#else
 static int tsec_send(struct udevice *dev, void *packet, int length)
-#endif
 {
 	struct tsec_private *priv;
 	struct tsec __iomem *regs;
@@ -283,11 +242,7 @@ static int tsec_send(struct udevice *dev, void *packet, int length)
 	u16 status;
 	int i;
 
-#ifndef CONFIG_DM_ETH
-	priv = (struct tsec_private *)dev->priv;
-#else
 	priv = dev_get_priv(dev);
-#endif
 	regs = priv->regs;
 	/* Find an empty buffer descriptor */
 	for (i = 0;
@@ -324,42 +279,6 @@ static int tsec_send(struct udevice *dev, void *packet, int length)
 	return result;
 }
 
-#ifndef CONFIG_DM_ETH
-static int tsec_recv(struct eth_device *dev)
-{
-	struct tsec_private *priv = (struct tsec_private *)dev->priv;
-	struct tsec __iomem *regs = priv->regs;
-
-	while (!(in_be16(&priv->rxbd[priv->rx_idx].status) & RXBD_EMPTY)) {
-		int length = in_be16(&priv->rxbd[priv->rx_idx].length);
-		u16 status = in_be16(&priv->rxbd[priv->rx_idx].status);
-		uchar *packet = net_rx_packets[priv->rx_idx];
-
-		/* Send the packet up if there were no errors */
-		if (!(status & RXBD_STATS))
-			net_process_received_packet(packet, length - 4);
-		else
-			printf("Got error %x\n", (status & RXBD_STATS));
-
-		out_be16(&priv->rxbd[priv->rx_idx].length, 0);
-
-		status = RXBD_EMPTY;
-		/* Set the wrap bit if this is the last element in the list */
-		if ((priv->rx_idx + 1) == PKTBUFSRX)
-			status |= RXBD_WRAP;
-		out_be16(&priv->rxbd[priv->rx_idx].status, status);
-
-		priv->rx_idx = (priv->rx_idx + 1) % PKTBUFSRX;
-	}
-
-	if (in_be32(&regs->ievent) & IEVENT_BSY) {
-		out_be32(&regs->ievent, IEVENT_BSY);
-		out_be32(&regs->rstat, RSTAT_CLEAR_RHALT);
-	}
-
-	return -1;
-}
-#else
 static int tsec_recv(struct udevice *dev, int flags, uchar **packetp)
 {
 	struct tsec_private *priv = (struct tsec_private *)dev_get_priv(dev);
@@ -406,22 +325,12 @@ static int tsec_free_pkt(struct udevice *dev, uchar *packet, int length)
 
 	return 0;
 }
-#endif
 
-/* Stop the interface */
-#ifndef CONFIG_DM_ETH
-static void tsec_halt(struct eth_device *dev)
-#else
 static void tsec_halt(struct udevice *dev)
-#endif
 {
 	struct tsec_private *priv;
 	struct tsec __iomem *regs;
-#ifndef CONFIG_DM_ETH
-	priv = (struct tsec_private *)dev->priv;
-#else
 	priv = dev_get_priv(dev);
-#endif
 	regs = priv->regs;
 
 	clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS);
@@ -583,27 +492,15 @@ static void startup_tsec(struct tsec_private *priv)
  * that it returns success if the link is up, failure otherwise.
  * This allows U-Boot to find the first active controller.
  */
-#ifndef CONFIG_DM_ETH
-static int tsec_init(struct eth_device *dev, struct bd_info *bd)
-#else
 static int tsec_init(struct udevice *dev)
-#endif
 {
 	struct tsec_private *priv;
 	struct tsec __iomem *regs;
-#ifdef CONFIG_DM_ETH
 	struct eth_pdata *pdata = dev_get_plat(dev);
-#else
-	struct eth_device *pdata = dev;
-#endif
 	u32 tempval;
 	int ret;
 
-#ifndef CONFIG_DM_ETH
-	priv = (struct tsec_private *)dev->priv;
-#else
 	priv = dev_get_priv(dev);
-#endif
 	regs = priv->regs;
 	/* Make sure the controller is stopped */
 	tsec_halt(dev);
@@ -715,7 +612,7 @@ static int init_phy(struct tsec_private *priv)
 	if (priv->interface == PHY_INTERFACE_MODE_SGMII)
 		tsec_configure_serdes(priv);
 
-#if defined(CONFIG_DM_ETH) && defined(CONFIG_DM_MDIO)
+#if defined(CONFIG_DM_MDIO)
 	phydev = dm_eth_phy_connect(priv->dev);
 #else
 	phydev = phy_connect(priv->bus, priv->phyaddr, priv->dev,
@@ -734,99 +631,6 @@ static int init_phy(struct tsec_private *priv)
 	return 1;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * Initialize device structure. Returns success if PHY
- * initialization succeeded (i.e. if it recognizes the PHY)
- */
-static int tsec_initialize(struct bd_info *bis,
-			   struct tsec_info_struct *tsec_info)
-{
-	struct tsec_private *priv;
-	struct eth_device *dev;
-	int i;
-
-	dev = (struct eth_device *)malloc(sizeof(*dev));
-
-	if (!dev)
-		return 0;
-
-	memset(dev, 0, sizeof(*dev));
-
-	priv = (struct tsec_private *)malloc(sizeof(*priv));
-
-	if (!priv) {
-		free(dev);
-		return 0;
-	}
-
-	priv->regs = tsec_info->regs;
-	priv->phyregs_sgmii = tsec_info->miiregs_sgmii;
-
-	priv->phyaddr = tsec_info->phyaddr;
-	priv->tbiaddr = CFG_SYS_TBIPA_VALUE;
-	priv->flags = tsec_info->flags;
-
-	strcpy(dev->name, tsec_info->devname);
-	priv->interface = tsec_info->interface;
-	priv->bus = miiphy_get_dev_by_name(tsec_info->mii_devname);
-	priv->dev = dev;
-	dev->iobase = 0;
-	dev->priv = priv;
-	dev->init = tsec_init;
-	dev->halt = tsec_halt;
-	dev->send = tsec_send;
-	dev->recv = tsec_recv;
-	dev->mcast = tsec_mcast_addr;
-
-	/* Tell U-Boot to get the addr from the env */
-	for (i = 0; i < 6; i++)
-		dev->enetaddr[i] = 0;
-
-	eth_register(dev);
-
-	/* Reset the MAC */
-	setbits_be32(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
-	udelay(2);  /* Soft Reset must be asserted for 3 TX clocks */
-	clrbits_be32(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
-
-	/* Try to initialize PHY here, and return */
-	return init_phy(priv);
-}
-
-/*
- * Initialize all the TSEC devices
- *
- * Returns the number of TSEC devices that were initialized
- */
-int tsec_eth_init(struct bd_info *bis, struct tsec_info_struct *tsecs,
-		  int num)
-{
-	int i;
-	int count = 0;
-
-	for (i = 0; i < num; i++) {
-		int ret = tsec_initialize(bis, &tsecs[i]);
-
-		if (ret > 0)
-			count += ret;
-	}
-
-	return count;
-}
-
-int tsec_standard_init(struct bd_info *bis)
-{
-	struct fsl_pq_mdio_info info;
-
-	info.regs = TSEC_GET_MDIO_REGS_BASE(1);
-	info.name = DEFAULT_MII_NAME;
-
-	fsl_pq_mdio_init(bis, &info);
-
-	return tsec_eth_init(bis, tsec_info, ARRAY_SIZE(tsec_info));
-}
-#else /* CONFIG_DM_ETH */
 int tsec_probe(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -966,4 +770,3 @@ U_BOOT_DRIVER(eth_tsec) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif /* CONFIG_DM_ETH */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 95a90199a429..f312ffb37e23 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -41,8 +41,6 @@
 
 #ifdef CONFIG_VSC7385_ENET
 
-#define CONFIG_TSEC2
-
 /* The flash address and size of the VSC7385 firmware image */
 #define CONFIG_VSC7385_IMAGE		0xFE7FE000
 #define CONFIG_VSC7385_IMAGE_SIZE	8192
@@ -178,31 +176,6 @@
 #define CFG_SYS_PCIE2_MEM_PHYS	0xC8000000
 #define CFG_SYS_PCIE2_IO_PHYS	0xD8000000
 
-/*
- * TSEC
- */
-#ifdef CONFIG_TSEC_ENET
-
-#define CONFIG_GMII			/* MII PHY management */
-
-#define CONFIG_TSEC1
-
-#ifdef CONFIG_TSEC1
-#define CONFIG_TSEC1_NAME		"TSEC0"
-#define CFG_SYS_TSEC1_OFFSET		0x24000
-#define TSEC1_PHY_ADDR			2
-#define TSEC1_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC1_PHYIDX			0
-#endif
-
-#ifdef CONFIG_TSEC2
-#define CONFIG_TSEC2_NAME		"TSEC1"
-#define TSEC2_PHY_ADDR			0x1c
-#define TSEC2_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC2_PHYIDX			0
-#endif
-#endif
-
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CFG_SYS_FSL_ESDHC_ADDR	CFG_SYS_MPC83xx_ESDHC_ADDR
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 780ee5ae865a..34b876f829e2 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -283,33 +283,6 @@
 #endif
 #define CFG_SYS_SRIO1_MEM_SIZE	0x20000000	/* 512M */
 
-#if defined(CONFIG_TSEC_ENET)
-
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"eTSEC0"
-#define CONFIG_TSEC2	1
-#define CONFIG_TSEC2_NAME	"eTSEC1"
-#define CONFIG_TSEC3	1
-#define CONFIG_TSEC3_NAME	"eTSEC2"
-#define CONFIG_TSEC4
-#define CONFIG_TSEC4_NAME	"eTSEC3"
-#undef CONFIG_MPC85XX_FEC
-
-#define TSEC1_PHY_ADDR		0
-#define TSEC2_PHY_ADDR		1
-#define TSEC3_PHY_ADDR		2
-#define TSEC4_PHY_ADDR		3
-
-#define TSEC1_PHYIDX		0
-#define TSEC2_PHYIDX		0
-#define TSEC3_PHYIDX		0
-#define TSEC4_PHYIDX		0
-#define TSEC1_FLAGS		TSEC_GIGABIT
-#define TSEC2_FLAGS		TSEC_GIGABIT
-#define TSEC3_FLAGS		(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC4_FLAGS		(TSEC_GIGABIT | TSEC_REDUCED)
-#endif	/* CONFIG_TSEC_ENET */
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b1d6b15811dd..4418d5169569 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -349,37 +349,6 @@ extern unsigned long get_sdram_size(void);
 /* eSPI - Enhanced SPI */
 #endif
 
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_MII_DEFAULT_TSEC	1	/* Allow unregistered phys */
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"eTSEC1"
-#define CONFIG_TSEC2	1
-#define CONFIG_TSEC2_NAME	"eTSEC2"
-#define CONFIG_TSEC3	1
-#define CONFIG_TSEC3_NAME	"eTSEC3"
-
-#define TSEC1_PHY_ADDR		1
-#define TSEC2_PHY_ADDR		0
-#define TSEC3_PHY_ADDR		2
-
-#define TSEC1_FLAGS		(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC2_FLAGS		(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC3_FLAGS		(TSEC_GIGABIT | TSEC_REDUCED)
-
-#define TSEC1_PHYIDX		0
-#define TSEC2_PHYIDX		0
-#define TSEC3_PHYIDX		0
-
-/* TBI PHY configuration for SGMII mode */
-#define CONFIG_TSEC_TBICR_SETTINGS ( \
-		TBICR_PHY_RESET \
-		| TBICR_ANEG_ENABLE \
-		| TBICR_FULL_DUPLEX \
-		| TBICR_SPEED1_SET \
-		)
-
-#endif	/* CONFIG_TSEC_ENET */
-
 #ifdef CONFIG_MMC
 #define CFG_SYS_FSL_ESDHC_ADDR	CFG_SYS_MPC85xx_ESDHC_ADDR
 #endif
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 024a71852753..179c5128e3b1 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -66,27 +66,6 @@
 
 /* SPI */
 
-/*
- * eTSEC
- */
-
-#ifdef CONFIG_TSEC_ENET
-#define CONFIG_MII_DEFAULT_TSEC		1
-#define CONFIG_TSEC1			1
-#define CONFIG_TSEC1_NAME		"eTSEC1"
-#define CONFIG_TSEC2			1
-#define CONFIG_TSEC2_NAME		"eTSEC2"
-
-#define TSEC1_PHY_ADDR			1
-#define TSEC2_PHY_ADDR			3
-
-#define TSEC1_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC2_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-
-#define TSEC1_PHYIDX			0
-#define TSEC2_PHYIDX			0
-#endif
-
 #define FSL_PCIE_COMPAT		"fsl,ls1021a-pcie"
 
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 5a91cc3efec0..d6681e859870 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -247,32 +247,6 @@
  * MMC
  */
 
-/*
- * eTSEC
- */
-
-#ifdef CONFIG_TSEC_ENET
-#define CONFIG_MII_DEFAULT_TSEC		3
-#define CONFIG_TSEC1			1
-#define CONFIG_TSEC1_NAME		"eTSEC1"
-#define CONFIG_TSEC2			1
-#define CONFIG_TSEC2_NAME		"eTSEC2"
-#define CONFIG_TSEC3			1
-#define CONFIG_TSEC3_NAME		"eTSEC3"
-
-#define TSEC1_PHY_ADDR			1
-#define TSEC2_PHY_ADDR			2
-#define TSEC3_PHY_ADDR			3
-
-#define TSEC1_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC2_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC3_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
-
-#define TSEC1_PHYIDX			0
-#define TSEC2_PHYIDX			0
-#define TSEC3_PHYIDX			0
-#endif
-
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 9738e9fa9cb7..49c5aef3059e 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -366,27 +366,6 @@
 #endif
 #endif /* CONFIG_PCI */
 
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_TSEC1
-#define CONFIG_TSEC1_NAME	"eTSEC1"
-#define CONFIG_TSEC2
-#define CONFIG_TSEC2_NAME	"eTSEC2"
-#define CONFIG_TSEC3
-#define CONFIG_TSEC3_NAME	"eTSEC3"
-
-#define TSEC1_PHY_ADDR	2
-#define TSEC2_PHY_ADDR	0
-#define TSEC3_PHY_ADDR	1
-
-#define TSEC1_FLAGS	(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC2_FLAGS	(TSEC_GIGABIT | TSEC_REDUCED)
-#define TSEC3_FLAGS	(TSEC_GIGABIT | TSEC_REDUCED)
-
-#define TSEC1_PHYIDX	0
-#define TSEC2_PHYIDX	0
-#define TSEC3_PHYIDX	0
-#endif /* CONFIG_TSEC_ENET */
-
 /*
  * Environment
  */
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 95393d3ab25e..2a076716023f 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -111,22 +111,6 @@
 #define CFG_SYS_PCI1_MEM_PHYS	0x80000000
 #define CFG_SYS_PCI1_IO_PHYS	0xE2000000
 
-#define CONFIG_TSEC1	1
-#define CONFIG_TSEC1_NAME	"TSEC0"
-#define CONFIG_TSEC3	1
-#define CONFIG_TSEC3_NAME	"TSEC1"
-#undef CONFIG_MPC85XX_FEC
-
-#define TSEC1_PHY_ADDR		0
-#define TSEC3_PHY_ADDR		1
-
-#define TSEC1_PHYIDX		0
-#define TSEC3_PHYIDX		0
-#define TSEC1_FLAGS		TSEC_GIGABIT
-#define TSEC3_FLAGS		TSEC_GIGABIT
-
-/* Options are: TSEC[0,1] */
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/tsec.h b/include/tsec.h
index de279b211718..153337837a92 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -19,56 +19,6 @@
 
 #define TSEC_MDIO_REGS_OFFSET	0x520
 
-#ifndef CONFIG_DM_ETH
-
-#ifdef CONFIG_ARCH_LS1021A
-#define TSEC_SIZE		0x40000
-#define TSEC_MDIO_OFFSET	0x40000
-#else
-#define TSEC_SIZE		0x01000
-#define TSEC_MDIO_OFFSET	0x01000
-#endif
-
-#define CONFIG_SYS_MDIO_BASE_ADDR (MDIO_BASE_ADDR + TSEC_MDIO_REGS_OFFSET)
-
-#define TSEC_GET_REGS(num, offset) \
-	(struct tsec __iomem *)\
-	(TSEC_BASE_ADDR + (((num) - 1) * (offset)))
-
-#define TSEC_GET_REGS_BASE(num) \
-	TSEC_GET_REGS((num), TSEC_SIZE)
-
-#define TSEC_GET_MDIO_REGS(num, offset) \
-	(struct tsec_mii_mng __iomem *)\
-	(CONFIG_SYS_MDIO_BASE_ADDR  + ((num) - 1) * (offset))
-
-#define TSEC_GET_MDIO_REGS_BASE(num) \
-	TSEC_GET_MDIO_REGS((num), TSEC_MDIO_OFFSET)
-
-#define DEFAULT_MII_NAME "FSL_MDIO"
-
-#define STD_TSEC_INFO(num) \
-{			\
-	.regs = TSEC_GET_REGS_BASE(num), \
-	.miiregs_sgmii = TSEC_GET_MDIO_REGS_BASE(num), \
-	.devname = CONFIG_TSEC##num##_NAME, \
-	.phyaddr = TSEC##num##_PHY_ADDR, \
-	.flags = TSEC##num##_FLAGS, \
-	.mii_devname = DEFAULT_MII_NAME \
-}
-
-#define SET_STD_TSEC_INFO(x, num) \
-{			\
-	x.regs = TSEC_GET_REGS_BASE(num); \
-	x.miiregs_sgmii = TSEC_GET_MDIO_REGS_BASE(num); \
-	x.devname = CONFIG_TSEC##num##_NAME; \
-	x.phyaddr = TSEC##num##_PHY_ADDR; \
-	x.flags = TSEC##num##_FLAGS;\
-	x.mii_devname = DEFAULT_MII_NAME;\
-}
-
-#endif /* CONFIG_DM_ETH */
-
 #define MAC_ADDR_LEN		6
 
 /* #define TSEC_TIMEOUT	1000000 */
@@ -414,11 +364,7 @@ struct tsec_private {
 	u32 flags;
 	uint rx_idx;	/* index of the current RX buffer */
 	uint tx_idx;	/* index of the current TX buffer */
-#ifndef CONFIG_DM_ETH
-	struct eth_device *dev;
-#else
 	struct udevice *dev;
-#endif
 };
 
 struct tsec_info_struct {
@@ -431,10 +377,4 @@ struct tsec_info_struct {
 	u32 flags;
 };
 
-#ifndef CONFIG_DM_ETH
-int tsec_standard_init(struct bd_info *bis);
-int tsec_eth_init(struct bd_info *bis, struct tsec_info_struct *tsec_info,
-		  int num);
-#endif
-
 #endif /* __TSEC_H */
-- 
2.25.1

[PATCH 10/41] net: fm: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/fm/Makefile    |   1 -
 drivers/net/fm/eth.c       | 238 -----------------------
 drivers/net/fm/fm.c        |   4 -
 drivers/net/fm/fm.h        |   8 -
 drivers/net/fm/init.c      | 386 -------------------------------------
 drivers/net/fm/memac_phy.c |  52 -----
 6 files changed, 689 deletions(-)
 delete mode 100644 drivers/net/fm/init.c

diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index 5a7d3037af40..b34209d2b3ee 100644
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -6,7 +6,6 @@ obj-y += dtsec.o
 obj-y += eth.o
 obj-y += fdt.o
 obj-y += fm.o
-obj-y += init.o
 obj-y += tgec.o
 obj-y += tgec_phy.o
 
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index c8381cc7133c..9fd26de0d721 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -8,12 +8,10 @@
 #include <log.h>
 #include <part.h>
 #include <asm/io.h>
-#ifdef CONFIG_DM_ETH
 #include <dm.h>
 #include <dm/ofnode.h>
 #include <linux/compat.h>
 #include <phy_interface.h>
-#endif
 #include <malloc.h>
 #include <net.h>
 #include <hwconfig.h>
@@ -28,11 +26,6 @@
 
 #include "fm.h"
 
-#ifndef CONFIG_DM_ETH
-static struct eth_device *devlist[NUM_FM_PORTS];
-static int num_controllers;
-#endif
-
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) && !defined(BITBANGMII)
 
 #define TBIANA_SETTINGS (TBIANA_ASYMMETRIC_PAUSE | TBIANA_SYMMETRIC_PAUSE | \
@@ -53,14 +46,10 @@ static void dtsec_configure_serdes(struct fm_eth *priv)
 			PHY_INTERFACE_MODE_2500BASEX) ? true : false;
 	int i = 0, j;
 
-#ifndef CONFIG_DM_ETH
-	bus.priv = priv->mac->phyregs;
-#else
 	bus.priv = priv->pcs_mdio;
 	bus.read = memac_mdio_read;
 	bus.write = memac_mdio_write;
 	bus.reset = memac_mdio_reset;
-#endif
 
 qsgmii_loop:
 	/* SGMII IF mode + AN enable only for 1G SGMII, not for 2.5G */
@@ -136,19 +125,6 @@ static void dtsec_init_phy(struct fm_eth *fm_eth)
 	    fm_eth->enet_if == PHY_INTERFACE_MODE_2500BASEX)
 		dtsec_configure_serdes(fm_eth);
 }
-
-#ifndef CONFIG_DM_ETH
-#ifdef CONFIG_PHYLIB
-static int tgec_is_fibre(struct fm_eth *fm)
-{
-	char phyopt[20];
-
-	sprintf(phyopt, "fsl_fm%d_xaui_phy", fm->fm_index + 1);
-
-	return hwconfig_arg_cmp(phyopt, "xfi");
-}
-#endif
-#endif /* CONFIG_DM_ETH */
 #endif
 
 static u16 muram_readw(u16 *addr)
@@ -465,18 +441,10 @@ static void fmc_tx_port_graceful_stop_disable(struct fm_eth *fm_eth)
 	sync();
 }
 
-#ifndef CONFIG_DM_ETH
-static int fm_eth_open(struct eth_device *dev, struct bd_info *bd)
-#else
 static int fm_eth_open(struct udevice *dev)
-#endif
 {
-#ifndef CONFIG_DM_ETH
-	struct fm_eth *fm_eth = dev->priv;
-#else
 	struct eth_pdata *pdata = dev_get_plat(dev);
 	struct fm_eth *fm_eth = dev_get_priv(dev);
-#endif
 	unsigned char *enetaddr;
 	struct fsl_enet_mac *mac;
 #ifdef CONFIG_PHYLIB
@@ -485,11 +453,7 @@ static int fm_eth_open(struct udevice *dev)
 
 	mac = fm_eth->mac;
 
-#ifndef CONFIG_DM_ETH
-	enetaddr = &dev->enetaddr[0];
-#else
 	enetaddr = pdata->enetaddr;
-#endif
 
 	/* setup the MAC address */
 	if (enetaddr[0] & 0x01) {
@@ -512,12 +476,7 @@ static int fm_eth_open(struct udevice *dev)
 	if (fm_eth->phydev) {
 		ret = phy_startup(fm_eth->phydev);
 		if (ret) {
-#ifndef CONFIG_DM_ETH
-			printf("%s: Could not initialize\n",
-			       fm_eth->phydev->dev->name);
-#else
 			printf("%s: Could not initialize\n", dev->name);
-#endif
 			return ret;
 		}
 	} else {
@@ -540,20 +499,12 @@ static int fm_eth_open(struct udevice *dev)
 	return fm_eth->phydev->link ? 0 : -1;
 }
 
-#ifndef CONFIG_DM_ETH
-static void fm_eth_halt(struct eth_device *dev)
-#else
 static void fm_eth_halt(struct udevice *dev)
-#endif
 {
 	struct fm_eth *fm_eth;
 	struct fsl_enet_mac *mac;
 
-#ifndef CONFIG_DM_ETH
-	fm_eth = (struct fm_eth *)dev->priv;
-#else
 	fm_eth = dev_get_priv(dev);
-#endif
 	mac = fm_eth->mac;
 
 	/* graceful stop the transmission of frames */
@@ -571,11 +522,7 @@ static void fm_eth_halt(struct udevice *dev)
 #endif
 }
 
-#ifndef CONFIG_DM_ETH
-static int fm_eth_send(struct eth_device *dev, void *buf, int len)
-#else
 static int fm_eth_send(struct udevice *dev, void *buf, int len)
-#endif
 {
 	struct fm_eth *fm_eth;
 	struct fm_port_global_pram *pram;
@@ -583,11 +530,7 @@ static int fm_eth_send(struct udevice *dev, void *buf, int len)
 	u16 offset_in;
 	int i;
 
-#ifndef CONFIG_DM_ETH
-	fm_eth = (struct fm_eth *)dev->priv;
-#else
 	fm_eth = dev_get_priv(dev);
-#endif
 	pram = fm_eth->tx_pram;
 	txbd = fm_eth->cur_txbd;
 
@@ -668,11 +611,7 @@ static struct fm_port_bd *fm_eth_free_one(struct fm_eth *fm_eth,
 	return rxbd;
 }
 
-#ifndef CONFIG_DM_ETH
-static int fm_eth_recv(struct eth_device *dev)
-#else
 static int fm_eth_recv(struct udevice *dev, int flags, uchar **packetp)
-#endif
 {
 	struct fm_eth *fm_eth;
 	struct fm_port_bd *rxbd;
@@ -681,11 +620,7 @@ static int fm_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 	int ret = -1;
 	u8 *data;
 
-#ifndef CONFIG_DM_ETH
-	fm_eth = (struct fm_eth *)dev->priv;
-#else
 	fm_eth = dev_get_priv(dev);
-#endif
 	rxbd = fm_eth->cur_rxbd;
 	status = muram_readw(&rxbd->status);
 
@@ -695,12 +630,8 @@ static int fm_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 			buf_lo = in_be32(&rxbd->buf_ptr_lo);
 			data = (u8 *)((ulong)(buf_hi << 16) << 16 | buf_lo);
 			len = muram_readw(&rxbd->len);
-#ifndef CONFIG_DM_ETH
-			net_process_received_packet(data, len);
-#else
 			*packetp = data;
 			return len;
-#endif
 		} else {
 			printf("%s: Rx error\n", dev->name);
 			ret = 0;
@@ -717,7 +648,6 @@ static int fm_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 	return ret;
 }
 
-#ifdef CONFIG_DM_ETH
 static int fm_eth_free_pkt(struct udevice *dev, uchar *packet, int length)
 {
 	struct fm_eth *fm_eth = (struct fm_eth *)dev_get_priv(dev);
@@ -726,65 +656,7 @@ static int fm_eth_free_pkt(struct udevice *dev, uchar *packet, int length)
 
 	return 0;
 }
-#endif /* CONFIG_DM_ETH */
-
-#ifndef CONFIG_DM_ETH
-static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg)
-{
-	struct fsl_enet_mac *mac;
-	int num;
-	void *base, *phyregs = NULL;
-
-	num = fm_eth->num;
-
-#ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-	if (fm_eth->type == FM_ETH_10G_E) {
-		/* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240.
-		 * 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080.
-		 * 10GEC1 uses mEMAC1 on T1024.
-		 * so it needs to change the num.
-		 */
-		if (fm_eth->num >= 2)
-			num -= 2;
-		else
-			num += 8;
-	}
-#endif
-	base = &reg->memac[num].fm_memac;
-	phyregs = &reg->memac[num].fm_memac_mdio;
-#else
-	/* Get the mac registers base address */
-	if (fm_eth->type == FM_ETH_1G_E) {
-		base = &reg->mac_1g[num].fm_dtesc;
-		phyregs = &reg->mac_1g[num].fm_mdio.miimcfg;
-	} else {
-		base = &reg->mac_10g[num].fm_10gec;
-		phyregs = &reg->mac_10g[num].fm_10gec_mdio;
-	}
-#endif
-
-	/* alloc mac controller */
-	mac = malloc(sizeof(struct fsl_enet_mac));
-	if (!mac)
-		return -ENOMEM;
-	memset(mac, 0, sizeof(struct fsl_enet_mac));
-
-	/* save the mac to fm_eth struct */
-	fm_eth->mac = mac;
-
-#ifdef CONFIG_SYS_FMAN_V3
-	init_memac(mac, base, phyregs, MAX_RXBUF_LEN);
-#else
-	if (fm_eth->type == FM_ETH_1G_E)
-		init_dtsec(mac, base, phyregs, MAX_RXBUF_LEN);
-	else
-		init_tgec(mac, base, phyregs, MAX_RXBUF_LEN);
-#endif
 
-	return 0;
-}
-#else /* CONFIG_DM_ETH */
 static int fm_eth_init_mac(struct fm_eth *fm_eth, void *reg)
 {
 #ifndef CONFIG_SYS_FMAN_V3
@@ -817,15 +689,11 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, void *reg)
 
 	return 0;
 }
-#endif /* CONFIG_DM_ETH */
 
 static int init_phy(struct fm_eth *fm_eth)
 {
 #ifdef CONFIG_PHYLIB
 	u32 supported = PHY_GBIT_FEATURES;
-#ifndef CONFIG_DM_ETH
-	struct phy_device *phydev = NULL;
-#endif
 
 	if (fm_eth->type == FM_ETH_10G_E)
 		supported = PHY_10G_FEATURES;
@@ -836,7 +704,6 @@ static int init_phy(struct fm_eth *fm_eth)
 	if (fm_eth->type == FM_ETH_1G_E)
 		dtsec_init_phy(fm_eth);
 
-#ifdef CONFIG_DM_ETH
 #ifdef CONFIG_PHYLIB
 #ifdef CONFIG_DM_MDIO
 	fm_eth->phydev = dm_eth_phy_connect(fm_eth->dev);
@@ -848,112 +715,8 @@ static int init_phy(struct fm_eth *fm_eth)
 
 	phy_config(fm_eth->phydev);
 #endif
-#else /* CONFIG_DM_ETH */
-#ifdef CONFIG_PHYLIB
-	if (fm_eth->bus) {
-		phydev = phy_connect(fm_eth->bus, fm_eth->phyaddr, fm_eth->dev,
-				     fm_eth->enet_if);
-		if (!phydev) {
-			printf("Failed to connect\n");
-			return -1;
-		}
-	} else {
-		return 0;
-	}
-
-	if (fm_eth->type == FM_ETH_1G_E) {
-		supported = (SUPPORTED_10baseT_Half |
-				SUPPORTED_10baseT_Full |
-				SUPPORTED_100baseT_Half |
-				SUPPORTED_100baseT_Full |
-				SUPPORTED_1000baseT_Full);
-	} else {
-		supported = SUPPORTED_10000baseT_Full;
-
-		if (tgec_is_fibre(fm_eth))
-			phydev->port = PORT_FIBRE;
-	}
-
-	phydev->supported &= supported;
-	phydev->advertising = phydev->supported;
-
-	fm_eth->phydev = phydev;
-
-	phy_config(phydev);
-#endif
-#endif /* CONFIG_DM_ETH */
-	return 0;
-}
-
-#ifndef CONFIG_DM_ETH
-int fm_eth_initialize(struct ccsr_fman *reg, struct fm_eth_info *info)
-{
-	struct eth_device *dev;
-	struct fm_eth *fm_eth;
-	int i, num = info->num;
-	int ret;
-
-	/* alloc eth device */
-	dev = (struct eth_device *)malloc(sizeof(struct eth_device));
-	if (!dev)
-		return -ENOMEM;
-	memset(dev, 0, sizeof(struct eth_device));
-
-	/* alloc the FMan ethernet private struct */
-	fm_eth = (struct fm_eth *)malloc(sizeof(struct fm_eth));
-	if (!fm_eth)
-		return -ENOMEM;
-	memset(fm_eth, 0, sizeof(struct fm_eth));
-
-	/* save off some things we need from the info struct */
-	fm_eth->fm_index = info->index - 1; /* keep as 0 based for muram */
-	fm_eth->num = num;
-	fm_eth->type = info->type;
-
-	fm_eth->rx_port = (void *)&reg->port[info->rx_port_id - 1].fm_bmi;
-	fm_eth->tx_port = (void *)&reg->port[info->tx_port_id - 1].fm_bmi;
-
-	/* set the ethernet max receive length */
-	fm_eth->max_rx_len = MAX_RXBUF_LEN;
-
-	/* init global mac structure */
-	ret = fm_eth_init_mac(fm_eth, reg);
-	if (ret)
-		return ret;
-
-	/* keep same as the manual, we call FMAN1, FMAN2, DTSEC1, DTSEC2, etc */
-	if (fm_eth->type == FM_ETH_1G_E)
-		sprintf(dev->name, "FM%d@DTSEC%d", info->index, num + 1);
-	else
-		sprintf(dev->name, "FM%d@TGEC%d", info->index, num + 1);
-
-	devlist[num_controllers++] = dev;
-	dev->iobase = 0;
-	dev->priv = (void *)fm_eth;
-	dev->init = fm_eth_open;
-	dev->halt = fm_eth_halt;
-	dev->send = fm_eth_send;
-	dev->recv = fm_eth_recv;
-	fm_eth->dev = dev;
-	fm_eth->bus = info->bus;
-	fm_eth->phyaddr = info->phy_addr;
-	fm_eth->enet_if = info->enet_if;
-
-	/* startup the FM im */
-	ret = fm_eth_startup(fm_eth);
-	if (ret)
-		return ret;
-
-	init_phy(fm_eth);
-
-	/* clear the ethernet address */
-	for (i = 0; i < 6; i++)
-		dev->enetaddr[i] = 0;
-	eth_register(dev);
-
 	return 0;
 }
-#else /* CONFIG_DM_ETH */
 
 static int fm_eth_bind(struct udevice *dev)
 {
@@ -1139,4 +902,3 @@ U_BOOT_DRIVER(eth_fman) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index c476cb31200a..055dd61fbe5a 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -10,9 +10,7 @@
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <u-boot/crc.h>
-#ifdef CONFIG_DM_ETH
 #include <dm.h>
-#endif
 
 #include "fm.h"
 #include <fsl_qe.h>		/* For struct qe_firmware */
@@ -551,7 +549,6 @@ int fm_init_common(int index, struct ccsr_fman *reg)
 }
 #endif
 
-#ifdef CONFIG_DM_ETH
 struct fman_priv {
 	struct ccsr_fman *reg;
 	unsigned int fman_id;
@@ -626,4 +623,3 @@ U_BOOT_DRIVER(fman) = {
 	.priv_auto	= sizeof(struct fman_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h
index 3d9cc5ca069d..ba858cc24b06 100644
--- a/drivers/net/fm/fm.h
+++ b/drivers/net/fm/fm.h
@@ -57,7 +57,6 @@ struct fm_port_bd {
 #define TxBD_READY		0x8000
 #define TxBD_LAST		BD_LAST
 
-#ifdef CONFIG_DM_ETH
 enum fm_mac_type {
 #ifdef CONFIG_SYS_FMAN_V3
 	FM_MEMAC,
@@ -66,7 +65,6 @@ enum fm_mac_type {
 	FM_TGEC,
 #endif
 };
-#endif
 
 /* Fman ethernet private struct */
 /* Rx/Tx queue descriptor */
@@ -115,9 +113,7 @@ void fman_disable_port(enum fm_port port);
 void fman_enable_port(enum fm_port port);
 int fman_id(struct udevice *dev);
 void *fman_port(struct udevice *dev, int num);
-#ifdef CONFIG_DM_ETH
 void *fman_mdio(struct udevice *dev, enum fm_mac_type type, int num);
-#endif
 
 struct fsl_enet_mac {
 	void *base; /* MAC controller registers base address */
@@ -143,13 +139,9 @@ struct fm_eth {
 	struct mii_dev *bus;
 	struct phy_device *phydev;
 	int phyaddr;
-#ifndef CONFIG_DM_ETH
-	struct eth_device *dev;
-#else
 	enum fm_mac_type mac_type;
 	struct udevice *dev;
 	struct udevice *pcs_mdio;
-#endif
 	int max_rx_len;
 	struct fm_port_global_pram *rx_pram; /* Rx parameter table */
 	struct fm_port_global_pram *tx_pram; /* Tx parameter table */
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
deleted file mode 100644
index 618c1bccbe3f..000000000000
--- a/drivers/net/fm/init.c
+++ /dev/null
@@ -1,386 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2011-2015 Freescale Semiconductor, Inc.
- */
-#include <errno.h>
-#include <common.h>
-#include <net.h>
-#include <asm/io.h>
-#include <fdt_support.h>
-#include <fsl_mdio.h>
-#ifdef CONFIG_FSL_LAYERSCAPE
-#include <asm/arch/fsl_serdes.h>
-#include <linux/libfdt.h>
-#else
-#include <asm/fsl_serdes.h>
-#endif
-
-#include "fm.h"
-
-#ifndef CONFIG_DM_ETH
-struct fm_eth_info fm_info[] = {
-#if (CFG_SYS_NUM_FM1_DTSEC >= 1)
-	FM_DTSEC_INFO_INITIALIZER(1, 1),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 2)
-	FM_DTSEC_INFO_INITIALIZER(1, 2),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 3)
-	FM_DTSEC_INFO_INITIALIZER(1, 3),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 4)
-	FM_DTSEC_INFO_INITIALIZER(1, 4),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 5)
-	FM_DTSEC_INFO_INITIALIZER(1, 5),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 6)
-	FM_DTSEC_INFO_INITIALIZER(1, 6),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 7)
-	FM_DTSEC_INFO_INITIALIZER(1, 9),
-#endif
-#if (CFG_SYS_NUM_FM1_DTSEC >= 8)
-	FM_DTSEC_INFO_INITIALIZER(1, 10),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 1)
-	FM_DTSEC_INFO_INITIALIZER(2, 1),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 2)
-	FM_DTSEC_INFO_INITIALIZER(2, 2),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 3)
-	FM_DTSEC_INFO_INITIALIZER(2, 3),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 4)
-	FM_DTSEC_INFO_INITIALIZER(2, 4),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 5)
-	FM_DTSEC_INFO_INITIALIZER(2, 5),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 6)
-	FM_DTSEC_INFO_INITIALIZER(2, 6),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 7)
-	FM_DTSEC_INFO_INITIALIZER(2, 9),
-#endif
-#if (CFG_SYS_NUM_FM2_DTSEC >= 8)
-	FM_DTSEC_INFO_INITIALIZER(2, 10),
-#endif
-#if (CFG_SYS_NUM_FM1_10GEC >= 1)
-	FM_TGEC_INFO_INITIALIZER(1, 1),
-#endif
-#if (CFG_SYS_NUM_FM1_10GEC >= 2)
-	FM_TGEC_INFO_INITIALIZER(1, 2),
-#endif
-#if (CFG_SYS_NUM_FM1_10GEC >= 3)
-	FM_TGEC_INFO_INITIALIZER2(1, 3),
-#endif
-#if (CFG_SYS_NUM_FM1_10GEC >= 4)
-	FM_TGEC_INFO_INITIALIZER2(1, 4),
-#endif
-#if (CFG_SYS_NUM_FM2_10GEC >= 1)
-	FM_TGEC_INFO_INITIALIZER(2, 1),
-#endif
-#if (CFG_SYS_NUM_FM2_10GEC >= 2)
-	FM_TGEC_INFO_INITIALIZER(2, 2),
-#endif
-};
-
-int fm_standard_init(struct bd_info *bis)
-{
-	int i;
-	struct ccsr_fman *reg;
-
-	reg = (void *)CFG_SYS_FSL_FM1_ADDR;
-	if (fm_init_common(0, reg))
-		return 0;
-
-	for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
-		if ((fm_info[i].enabled) && (fm_info[i].index == 1))
-			fm_eth_initialize(reg, &fm_info[i]);
-	}
-
-#if (CFG_SYS_NUM_FMAN == 2)
-	reg = (void *)CFG_SYS_FSL_FM2_ADDR;
-	if (fm_init_common(1, reg))
-		return 0;
-
-	for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
-		if ((fm_info[i].enabled) && (fm_info[i].index == 2))
-			fm_eth_initialize(reg, &fm_info[i]);
-	}
-#endif
-
-	return 1;
-}
-
-/* simple linear search to map from port to array index */
-static int fm_port_to_index(enum fm_port port)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
-		if (fm_info[i].port == port)
-			return i;
-	}
-
-	return -1;
-}
-
-/*
- * Determine if an interface is actually active based on HW config
- * we expect fman_port_enet_if() to report PHY_INTERFACE_MODE_NA if
- * the interface is not active based on HW cfg of the SoC
- */
-void fman_enet_init(void)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
-		phy_interface_t enet_if;
-
-		enet_if = fman_port_enet_if(fm_info[i].port);
-		if (enet_if != PHY_INTERFACE_MODE_NA) {
-			fm_info[i].enabled = 1;
-			fm_info[i].enet_if = enet_if;
-		} else {
-			fm_info[i].enabled = 0;
-		}
-	}
-
-	return;
-}
-
-void fm_disable_port(enum fm_port port)
-{
-	int i = fm_port_to_index(port);
-
-	if (i == -1)
-		return;
-
-	fm_info[i].enabled = 0;
-#ifndef CONFIG_SYS_FMAN_V3
-	fman_disable_port(port);
-#endif
-}
-
-void fm_enable_port(enum fm_port port)
-{
-	int i = fm_port_to_index(port);
-
-	if (i == -1)
-		return;
-
-	fm_info[i].enabled = 1;
-	fman_enable_port(port);
-}
-
-void fm_info_set_mdio(enum fm_port port, struct mii_dev *bus)
-{
-	int i = fm_port_to_index(port);
-
-	if (i == -1)
-		return;
-
-	fm_info[i].bus = bus;
-}
-
-void fm_info_set_phy_address(enum fm_port port, int address)
-{
-	int i = fm_port_to_index(port);
-
-	if (i == -1)
-		return;
-
-	fm_info[i].phy_addr = address;
-}
-
-/*
- * Returns the PHY address for a given Fman port
- *
- * The port must be set via a prior call to fm_info_set_phy_address().
- * A negative error code is returned if the port is invalid.
- */
-int fm_info_get_phy_address(enum fm_port port)
-{
-	int i = fm_port_to_index(port);
-
-	if (i == -1)
-		return -1;
-
-	return fm_info[i].phy_addr;
-}
-
-/*
- * Returns the type of the data interface between the given MAC and its PHY.
- * This is typically determined by the RCW.
- */
-phy_interface_t fm_info_get_enet_if(enum fm_port port)
-{
-	int i = fm_port_to_index(port);
-
-	if (i == -1)
-		return PHY_INTERFACE_MODE_NA;
-
-	if (fm_info[i].enabled)
-		return fm_info[i].enet_if;
-
-	return PHY_INTERFACE_MODE_NA;
-}
-
-static void
-__def_board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
-				enum fm_port port, int offset)
-{
-	return;
-}
-
-void board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
-				enum fm_port port, int offset)
-	 __attribute__((weak, alias("__def_board_ft_fman_fixup_port")));
-
-int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
-{
-	int off;
-	uint32_t ph;
-	phys_addr_t paddr = CFG_SYS_CCSRBAR_PHYS + info->compat_offset;
-#ifndef CONFIG_SYS_FMAN_V3
-	u64 dtsec1_addr = (u64)CFG_SYS_CCSRBAR_PHYS +
-				CFG_SYS_FSL_FM1_DTSEC1_OFFSET;
-#endif
-
-	off = fdt_node_offset_by_compat_reg(blob, prop, paddr);
-	if (off == -FDT_ERR_NOTFOUND)
-		return -EINVAL;
-
-	if (info->enabled) {
-		fdt_fixup_phy_connection(blob, off, info->enet_if);
-		board_ft_fman_fixup_port(blob, prop, paddr, info->port, off);
-		return 0;
-	}
-
-#ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-	/*
-	 * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same
-	 * dual-role MAC, when FM1_10GEC1 is enabled and  FM1_DTSEC9
-	 * is disabled, ensure that the dual-role MAC is not disabled,
-	 * ditto for other dual-role MACs.
-	 */
-	if (((info->port == FM1_DTSEC9) && (PORT_IS_ENABLED(FM1_10GEC1)))  ||
-	    ((info->port == FM1_DTSEC10) && (PORT_IS_ENABLED(FM1_10GEC2))) ||
-	    ((info->port == FM1_DTSEC1) && (PORT_IS_ENABLED(FM1_10GEC3)))  ||
-	    ((info->port == FM1_DTSEC2) && (PORT_IS_ENABLED(FM1_10GEC4)))  ||
-	    ((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC9)))  ||
-	    ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC10))) ||
-	    ((info->port == FM1_10GEC3) && (PORT_IS_ENABLED(FM1_DTSEC1)))  ||
-	    ((info->port == FM1_10GEC4) && (PORT_IS_ENABLED(FM1_DTSEC2)))
-#if (CFG_SYS_NUM_FMAN == 2)
-										||
-	    ((info->port == FM2_DTSEC9) && (PORT_IS_ENABLED(FM2_10GEC1)))	||
-	    ((info->port == FM2_DTSEC10) && (PORT_IS_ENABLED(FM2_10GEC2)))	||
-	    ((info->port == FM2_10GEC1) && (PORT_IS_ENABLED(FM2_DTSEC9)))	||
-	    ((info->port == FM2_10GEC2) && (PORT_IS_ENABLED(FM2_DTSEC10)))
-#endif
-#else
-	/* FM1_DTSECx and FM1_10GECx use the same dual-role MAC */
-	if (((info->port == FM1_DTSEC1) && (PORT_IS_ENABLED(FM1_10GEC1)))  ||
-	    ((info->port == FM1_DTSEC2) && (PORT_IS_ENABLED(FM1_10GEC2)))  ||
-	    ((info->port == FM1_DTSEC3) && (PORT_IS_ENABLED(FM1_10GEC3)))  ||
-	    ((info->port == FM1_DTSEC4) && (PORT_IS_ENABLED(FM1_10GEC4)))  ||
-	    ((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC1)))  ||
-	    ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC2)))  ||
-	    ((info->port == FM1_10GEC3) && (PORT_IS_ENABLED(FM1_DTSEC3)))  ||
-	    ((info->port == FM1_10GEC4) && (PORT_IS_ENABLED(FM1_DTSEC4)))
-#endif
-	)
-		return 0;
-#endif
-	/* board code might have caused offset to change */
-	off = fdt_node_offset_by_compat_reg(blob, prop, paddr);
-
-#ifndef CONFIG_SYS_FMAN_V3
-	/* Don't disable FM1-DTSEC1 MAC as its used for MDIO */
-	if (paddr != dtsec1_addr)
-#endif
-		fdt_status_disabled(blob, off); /* disable the MAC node */
-
-	/* disable the fsl,dpa-ethernet node that points to the MAC */
-	ph = fdt_get_phandle(blob, off);
-	do_fixup_by_prop(blob, "fsl,fman-mac", &ph, sizeof(ph),
-		"status", "disabled", strlen("disabled") + 1, 1);
-
-	return 0;
-}
-
-void fdt_fixup_fman_ethernet(void *blob)
-{
-	int i;
-
-#ifdef CONFIG_SYS_FMAN_V3
-	for (i = 0; i < ARRAY_SIZE(fm_info); i++)
-		ft_fixup_port(blob, &fm_info[i], "fsl,fman-memac");
-#else
-	for (i = 0; i < ARRAY_SIZE(fm_info); i++) {
-		/* Try the new compatible first.
-		 * If the node is missing, try the old.
-		 */
-		if (fm_info[i].type == FM_ETH_1G_E) {
-			if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-dtsec"))
-				ft_fixup_port(blob, &fm_info[i],
-					      "fsl,fman-1g-mac");
-		} else {
-			if (ft_fixup_port(blob, &fm_info[i], "fsl,fman-xgec") &&
-			    ft_fixup_port(blob, &fm_info[i], "fsl,fman-tgec"))
-				ft_fixup_port(blob, &fm_info[i],
-					      "fsl,fman-10g-mac");
-		}
-	}
-#endif
-}
-
-/*QSGMII Riser Card can work in SGMII mode, but the PHY address is different.
- *This function scans which Riser Card being used(QSGMII or SGMII Riser Card),
- *then set the correct PHY address
- */
-void set_sgmii_phy(struct mii_dev *bus, enum fm_port base_port,
-		unsigned int port_num, int phy_base_addr)
-{
-	unsigned int regnum = 0;
-	int qsgmii;
-	int i;
-	int phy_real_addr;
-
-	qsgmii = is_qsgmii_riser_card(bus, phy_base_addr, port_num, regnum);
-
-	if (!qsgmii)
-		return;
-
-	for (i = base_port; i < base_port + port_num; i++) {
-		if (fm_info_get_enet_if(i) == PHY_INTERFACE_MODE_SGMII) {
-			phy_real_addr = phy_base_addr + i - base_port;
-			fm_info_set_phy_address(i, phy_real_addr);
-		}
-	}
-}
-
-/*to check whether qsgmii riser card is used*/
-int is_qsgmii_riser_card(struct mii_dev *bus, int phy_base_addr,
-		unsigned int port_num, unsigned regnum)
-{
-	int i;
-	int val;
-
-	if (!bus)
-		return 0;
-
-	for (i = phy_base_addr; i < phy_base_addr + port_num; i++) {
-		val = bus->read(bus, i, MDIO_DEVAD_NONE, regnum);
-		if (val != MIIM_TIMEOUT)
-			return 1;
-	}
-
-	return 0;
-}
-#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 3ddae97e0979..e0b62b944909 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -22,11 +22,9 @@
 #define memac_setbits_32(a, v)	setbits_be32(a, v)
 #endif
 
-#ifdef CONFIG_DM_ETH
 struct fm_mdio_priv {
 	struct memac_mdio_controller *regs;
 };
-#endif
 
 #define MAX_NUM_RETRIES		1000
 
@@ -88,9 +86,6 @@ int memac_mdio_write(struct mii_dev *bus, int port_addr, int dev_addr,
 	u32 c45 = 1; /* Default to 10G interface */
 	int err;
 
-#ifndef CONFIG_DM_ETH
-	regs = bus->priv;
-#else
 	struct fm_mdio_priv *priv;
 
 	if (!bus->priv)
@@ -99,7 +94,6 @@ int memac_mdio_write(struct mii_dev *bus, int port_addr, int dev_addr,
 	regs = priv->regs;
 	debug("memac_mdio_write(regs %p, port %d, dev %d, reg %d, val %#x)\n",
 	      regs, port_addr, dev_addr, regnum, value);
-#endif
 
 	if (dev_addr == MDIO_DEVAD_NONE) {
 		c45 = 0; /* clause 22 */
@@ -147,22 +141,14 @@ int memac_mdio_read(struct mii_dev *bus, int port_addr, int dev_addr,
 	u32 c45 = 1;
 	int err;
 
-#ifndef CONFIG_DM_ETH
-	regs = bus->priv;
-#else
 	struct fm_mdio_priv *priv;
 
 	if (!bus->priv)
 		return -EINVAL;
 	priv = dev_get_priv(bus->priv);
 	regs = priv->regs;
-#endif
 
 	if (dev_addr == MDIO_DEVAD_NONE) {
-#ifndef CONFIG_DM_ETH
-		if (!strcmp(bus->name, DEFAULT_FM_TGEC_MDIO_NAME))
-			return 0xffff;
-#endif
 		c45 = 0; /* clause 22 */
 		dev_addr = regnum & 0x1f;
 		memac_clrbits_32(&regs->mdio_stat, MDIO_STAT_ENC);
@@ -205,43 +191,6 @@ int memac_mdio_reset(struct mii_dev *bus)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-int fm_memac_mdio_init(struct bd_info *bis, struct memac_mdio_info *info)
-{
-	struct mii_dev *bus = mdio_alloc();
-
-	if (!bus) {
-		printf("Failed to allocate FM TGEC MDIO bus\n");
-		return -1;
-	}
-
-	bus->read = memac_mdio_read;
-	bus->write = memac_mdio_write;
-	bus->reset = memac_mdio_reset;
-	strcpy(bus->name, info->name);
-
-	bus->priv = info->regs;
-
-	/*
-	 * On some platforms like B4860, default value of MDIO_CLK_DIV bits
-	 * in mdio_stat(mdio_cfg) register generates MDIO clock too high
-	 * (much higher than 2.5MHz), violating the IEEE specs.
-	 * On other platforms like T1040, default value of MDIO_CLK_DIV bits
-	 * is zero, so MDIO clock is disabled.
-	 * So, for proper functioning of MDIO, MDIO_CLK_DIV bits needs to
-	 * be properly initialized.
-	 * NEG bit default should be '1' as per FMAN-v3 RM, but on platform
-	 * like T2080QDS, this bit default is '0', which leads to MDIO failure
-	 * on XAUI PHY, so set this bit definitely.
-	 */
-	memac_setbits_32(
-		&((struct memac_mdio_controller *)info->regs)->mdio_stat,
-		MDIO_STAT_CLKDIV(258) | MDIO_STAT_NEG);
-
-	return mdio_register(bus);
-}
-
-#else /* CONFIG_DM_ETH */
 #if defined(CONFIG_PHYLIB) && defined(CONFIG_DM_MDIO)
 static int fm_mdio_read(struct udevice *dev, int addr, int devad, int reg)
 {
@@ -341,4 +290,3 @@ U_BOOT_DRIVER(fman_mdio) = {
 	.plat_auto	= sizeof(struct mdio_perdev_priv),
 };
 #endif /* CONFIG_PHYLIB && CONFIG_DM_MDIO */
-#endif /* CONFIG_DM_ETH */
-- 
2.25.1

[PATCH 11/41] net: dc2114x: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/dc2114x.c | 156 ------------------------------------------
 1 file changed, 156 deletions(-)

diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index deedfe76e43c..4e7af95b41c4 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -73,13 +73,7 @@
 
 #define POLL_DEMAND	1
 
-#if defined(CONFIG_DM_ETH)
 #define phys_to_bus(dev, a)	dm_pci_phys_to_mem((dev), (a))
-#elif defined(CONFIG_E500)
-#define phys_to_bus(dev, a)	(a)
-#else
-#define phys_to_bus(dev, a)	pci_phys_to_mem((dev), (a))
-#endif
 
 #define NUM_RX_DESC PKTBUFSRX
 #define NUM_TX_DESC 1			/* Number of TX descriptors   */
@@ -103,12 +97,7 @@ struct dc2114x_priv {
 	int tx_new;	/* TX descriptor ring pointer */
 	char rx_ring_size;
 	char tx_ring_size;
-#ifdef CONFIG_DM_ETH
 	struct udevice		*devno;
-#else
-	struct eth_device	dev;
-	pci_dev_t		devno;
-#endif
 	char			*name;
 	void __iomem		*iobase;
 	u8			*enetaddr;
@@ -479,150 +468,6 @@ static struct pci_device_id supported[] = {
 	{ }
 };
 
-#ifndef CONFIG_DM_ETH
-static int dc21x4x_init(struct eth_device *dev, struct bd_info *bis)
-{
-	struct dc2114x_priv *priv =
-		container_of(dev, struct dc2114x_priv, dev);
-
-	/* Ensure we're not sleeping. */
-	pci_write_config_byte(priv->devno, PCI_CFDA_PSM, WAKEUP);
-
-	return dc21x4x_init_common(priv);
-}
-
-static void dc21x4x_halt(struct eth_device *dev)
-{
-	struct dc2114x_priv *priv =
-		container_of(dev, struct dc2114x_priv, dev);
-
-	dc21x4x_halt_common(priv);
-
-	pci_write_config_byte(priv->devno, PCI_CFDA_PSM, SLEEP);
-}
-
-static int dc21x4x_send(struct eth_device *dev, void *packet, int length)
-{
-	struct dc2114x_priv *priv =
-		container_of(dev, struct dc2114x_priv, dev);
-
-	return dc21x4x_send_common(priv, packet, length);
-}
-
-static int dc21x4x_recv(struct eth_device *dev)
-{
-	struct dc2114x_priv *priv =
-		container_of(dev, struct dc2114x_priv, dev);
-	int length = 0;
-	int ret;
-
-	while (true) {
-		ret = dc21x4x_recv_check(priv);
-		if (!ret)
-			break;
-
-		if (ret > 0) {
-			length = ret;
-			/* Pass the packet up to the protocol layers */
-			net_process_received_packet
-				(net_rx_packets[priv->rx_new], length - 4);
-		}
-
-		/*
-		 * Change buffer ownership for this frame,
-		 * back to the adapter.
-		 */
-		if (ret != -EAGAIN)
-			priv->rx_ring[priv->rx_new].status = cpu_to_le32(R_OWN);
-
-		/* Update entry information. */
-		priv->rx_new = (priv->rx_new + 1) % priv->rx_ring_size;
-	}
-
-	return length;
-}
-
-int dc21x4x_initialize(struct bd_info *bis)
-{
-	struct dc2114x_priv *priv;
-	struct eth_device *dev;
-	unsigned short status;
-	unsigned char timer;
-	unsigned int iobase;
-	int card_number = 0;
-	pci_dev_t devbusfn;
-	int idx = 0;
-
-	while (1) {
-		devbusfn = pci_find_devices(supported, idx++);
-		if (devbusfn == -1)
-			break;
-
-		pci_read_config_word(devbusfn, PCI_COMMAND, &status);
-		status |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
-		pci_write_config_word(devbusfn, PCI_COMMAND, status);
-
-		pci_read_config_word(devbusfn, PCI_COMMAND, &status);
-		if (!(status & PCI_COMMAND_MEMORY)) {
-			printf("Error: Can not enable MEMORY access.\n");
-			continue;
-		}
-
-		if (!(status & PCI_COMMAND_MASTER)) {
-			printf("Error: Can not enable Bus Mastering.\n");
-			continue;
-		}
-
-		/* Check the latency timer for values >= 0x60. */
-		pci_read_config_byte(devbusfn, PCI_LATENCY_TIMER, &timer);
-
-		if (timer < 0x60) {
-			pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER,
-					      0x60);
-		}
-
-		/* read BAR for memory space access */
-		pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &iobase);
-		iobase &= PCI_BASE_ADDRESS_MEM_MASK;
-		debug("dc21x4x: DEC 21142 PCI Device @0x%x\n", iobase);
-
-		priv = memalign(32, sizeof(*priv));
-		if (!priv) {
-			printf("Can not allocalte memory of dc21x4x\n");
-			break;
-		}
-		memset(priv, 0, sizeof(*priv));
-
-		dev = &priv->dev;
-
-		sprintf(dev->name, "dc21x4x#%d", card_number);
-		priv->devno = devbusfn;
-		priv->name = dev->name;
-		priv->enetaddr = dev->enetaddr;
-
-		dev->iobase = pci_mem_to_phys(devbusfn, iobase);
-		dev->priv = (void *)devbusfn;
-		dev->init = dc21x4x_init;
-		dev->halt = dc21x4x_halt;
-		dev->send = dc21x4x_send;
-		dev->recv = dc21x4x_recv;
-
-		/* Ensure we're not sleeping. */
-		pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP);
-
-		udelay(10 * 1000);
-
-		read_hw_addr(priv);
-
-		eth_register(dev);
-
-		card_number++;
-	}
-
-	return card_number;
-}
-
-#else	/* DM_ETH */
 static int dc2114x_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -756,4 +601,3 @@ U_BOOT_DRIVER(eth_dc2114x) = {
 };
 
 U_BOOT_PCI_DEVICE(eth_dc2114x, supported);
-#endif
-- 
2.25.1

[PATCH 12/41] net: designware: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/designware.c | 112 ++-------------------------------------
 drivers/net/designware.h |   5 --
 2 files changed, 3 insertions(+), 114 deletions(-)

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 0e63f70934c0..ddaf7ed1d38a 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -34,12 +34,8 @@
 
 static int dw_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
 {
-#ifdef CONFIG_DM_ETH
 	struct dw_eth_dev *priv = dev_get_priv((struct udevice *)bus->priv);
 	struct eth_mac_regs *mac_p = priv->mac_regs_p;
-#else
-	struct eth_mac_regs *mac_p = bus->priv;
-#endif
 	ulong start;
 	u16 miiaddr;
 	int timeout = CONFIG_MDIO_TIMEOUT;
@@ -62,12 +58,8 @@ static int dw_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
 static int dw_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
 			u16 val)
 {
-#ifdef CONFIG_DM_ETH
 	struct dw_eth_dev *priv = dev_get_priv((struct udevice *)bus->priv);
 	struct eth_mac_regs *mac_p = priv->mac_regs_p;
-#else
-	struct eth_mac_regs *mac_p = bus->priv;
-#endif
 	ulong start;
 	u16 miiaddr;
 	int ret = -ETIMEDOUT, timeout = CONFIG_MDIO_TIMEOUT;
@@ -90,7 +82,7 @@ static int dw_mdio_write(struct mii_dev *bus, int addr, int devad, int reg,
 	return ret;
 }
 
-#if defined(CONFIG_DM_ETH) && CONFIG_IS_ENABLED(DM_GPIO)
+#if CONFIG_IS_ENABLED(DM_GPIO)
 static int __dw_mdio_reset(struct udevice *dev)
 {
 	struct dw_eth_dev *priv = dev_get_priv(dev);
@@ -192,7 +184,7 @@ static int dw_mdio_init(const char *name, void *priv)
 	bus->read = dw_mdio_read;
 	bus->write = dw_mdio_write;
 	snprintf(bus->name, sizeof(bus->name), "%s", name);
-#if defined(CONFIG_DM_ETH) && CONFIG_IS_ENABLED(DM_GPIO)
+#if CONFIG_IS_ENABLED(DM_GPIO)
 	bus->reset = dw_mdio_reset;
 #endif
 
@@ -575,7 +567,7 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev)
 	struct phy_device *phydev;
 	int ret;
 
-#if IS_ENABLED(CONFIG_DM_MDIO) && IS_ENABLED(CONFIG_DM_ETH)
+#if IS_ENABLED(CONFIG_DM_MDIO)
 	phydev = dm_eth_phy_connect(dev);
 	if (!phydev)
 		return -ENODEV;
@@ -605,103 +597,6 @@ static int dw_phy_init(struct dw_eth_dev *priv, void *dev)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-static int dw_eth_init(struct eth_device *dev, struct bd_info *bis)
-{
-	int ret;
-
-	ret = designware_eth_init(dev->priv, dev->enetaddr);
-	if (!ret)
-		ret = designware_eth_enable(dev->priv);
-
-	return ret;
-}
-
-static int dw_eth_send(struct eth_device *dev, void *packet, int length)
-{
-	return _dw_eth_send(dev->priv, packet, length);
-}
-
-static int dw_eth_recv(struct eth_device *dev)
-{
-	uchar *packet;
-	int length;
-
-	length = _dw_eth_recv(dev->priv, &packet);
-	if (length == -EAGAIN)
-		return 0;
-	net_process_received_packet(packet, length);
-
-	_dw_free_pkt(dev->priv);
-
-	return 0;
-}
-
-static void dw_eth_halt(struct eth_device *dev)
-{
-	return _dw_eth_halt(dev->priv);
-}
-
-static int dw_write_hwaddr(struct eth_device *dev)
-{
-	return _dw_write_hwaddr(dev->priv, dev->enetaddr);
-}
-
-int designware_initialize(ulong base_addr, u32 interface)
-{
-	struct eth_device *dev;
-	struct dw_eth_dev *priv;
-
-	dev = (struct eth_device *) malloc(sizeof(struct eth_device));
-	if (!dev)
-		return -ENOMEM;
-
-	/*
-	 * Since the priv structure contains the descriptors which need a strict
-	 * buswidth alignment, memalign is used to allocate memory
-	 */
-	priv = (struct dw_eth_dev *) memalign(ARCH_DMA_MINALIGN,
-					      sizeof(struct dw_eth_dev));
-	if (!priv) {
-		free(dev);
-		return -ENOMEM;
-	}
-
-	if ((phys_addr_t)priv + sizeof(*priv) > (1ULL << 32)) {
-		printf("designware: buffers are outside DMA memory\n");
-		return -EINVAL;
-	}
-
-	memset(dev, 0, sizeof(struct eth_device));
-	memset(priv, 0, sizeof(struct dw_eth_dev));
-
-	sprintf(dev->name, "dwmac.%lx", base_addr);
-	dev->iobase = (int)base_addr;
-	dev->priv = priv;
-
-	priv->dev = dev;
-	priv->mac_regs_p = (struct eth_mac_regs *)base_addr;
-	priv->dma_regs_p = (struct eth_dma_regs *)(base_addr +
-			DW_DMA_BASE_OFFSET);
-
-	dev->init = dw_eth_init;
-	dev->send = dw_eth_send;
-	dev->recv = dw_eth_recv;
-	dev->halt = dw_eth_halt;
-	dev->write_hwaddr = dw_write_hwaddr;
-
-	eth_register(dev);
-
-	priv->interface = interface;
-
-	dw_mdio_init(dev->name, priv->mac_regs_p);
-	priv->bus = miiphy_get_dev_by_name(dev->name);
-
-	return dw_phy_init(priv, dev);
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int designware_eth_start(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -971,4 +866,3 @@ static struct pci_device_id supported[] = {
 };
 
 U_BOOT_PCI_DEVICE(eth_designware, supported);
-#endif
diff --git a/drivers/net/designware.h b/drivers/net/designware.h
index 3793d550980e..138c3c14bf52 100644
--- a/drivers/net/designware.h
+++ b/drivers/net/designware.h
@@ -233,9 +233,6 @@ struct dw_eth_dev {
 
 	struct eth_mac_regs *mac_regs_p;
 	struct eth_dma_regs *dma_regs_p;
-#ifndef CONFIG_DM_ETH
-	struct eth_device *dev;
-#endif
 #if CONFIG_IS_ENABLED(DM_GPIO)
 	struct gpio_desc reset_gpio;
 #endif
@@ -248,7 +245,6 @@ struct dw_eth_dev {
 	struct mii_dev *bus;
 };
 
-#ifdef CONFIG_DM_ETH
 int designware_eth_of_to_plat(struct udevice *dev);
 int designware_eth_probe(struct udevice *dev);
 extern const struct eth_ops designware_eth_ops;
@@ -266,6 +262,5 @@ int designware_eth_free_pkt(struct udevice *dev, uchar *packet,
 				   int length);
 void designware_eth_stop(struct udevice *dev);
 int designware_eth_write_hwaddr(struct udevice *dev);
-#endif
 
 #endif
-- 
2.25.1

[PATCH 13/41] net: dm9000x: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/dm9000x.c | 66 -------------------------------------------
 1 file changed, 66 deletions(-)

diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 07733df533e2..b46bdeb23bee 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -75,9 +75,6 @@ struct dm9000_priv {
 	void (*outblk)(struct dm9000_priv *db, void *data_ptr, int count);
 	void (*inblk)(struct dm9000_priv *db, void *data_ptr, int count);
 	void (*rx_status)(struct dm9000_priv *db, u16 *rxstatus, u16 *rxlen);
-#ifndef CONFIG_DM_ETH
-	struct eth_device dev;
-#endif
 	void __iomem *base_io;
 	void __iomem *base_data;
 };
@@ -572,68 +569,6 @@ static void dm9000_get_enetaddr(struct dm9000_priv *db, u8 *enetaddr)
 static void dm9000_get_enetaddr(struct dm9000_priv *db, u8 *enetaddr) {}
 #endif
 
-#ifndef CONFIG_DM_ETH
-static int dm9000_init(struct eth_device *dev, struct bd_info *bd)
-{
-	struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev);
-
-	return dm9000_init_common(db, dev->enetaddr);
-}
-
-static void dm9000_halt(struct eth_device *dev)
-{
-	struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev);
-
-	dm9000_halt_common(db);
-}
-
-static int dm9000_send(struct eth_device *dev, void *packet, int length)
-{
-	struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev);
-
-	return dm9000_send_common(db, packet, length);
-}
-
-static int dm9000_recv(struct eth_device *dev)
-{
-	struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev);
-	int ret;
-
-	ret = dm9000_recv_common(db, net_rx_packets[0]);
-	if (ret > 0)
-		net_process_received_packet(net_rx_packets[0], ret);
-
-	return ret;
-}
-
-int dm9000_initialize(struct bd_info *bis)
-{
-	struct dm9000_priv *priv;
-	struct eth_device *dev;
-
-	priv = calloc(1, sizeof(*priv));
-	if (!priv)
-		return -ENOMEM;
-
-	dev = &priv->dev;
-
-	priv->base_io = (void __iomem *)DM9000_IO;
-	priv->base_data = (void __iomem *)DM9000_DATA;
-
-	/* Load MAC address from EEPROM */
-	dm9000_get_enetaddr(priv, dev->enetaddr);
-
-	dev->init = dm9000_init;
-	dev->halt = dm9000_halt;
-	dev->send = dm9000_send;
-	dev->recv = dm9000_recv;
-	strcpy(dev->name, "dm9000");
-
-	eth_register(&priv->dev);
-
-	return 0;
-}
-#else	/* ifdef CONFIG_DM_ETH */
 static int dm9000_start(struct udevice *dev)
 {
 	struct dm9000_priv *db = dev_get_priv(dev);
@@ -746,4 +681,3 @@ U_BOOT_DRIVER(dm9000) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
-- 
2.25.1

[PATCH 14/41] net: e1000: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/e1000.c | 216 +-------------------------------------------
 drivers/net/e1000.h |  11 ---
 2 files changed, 1 insertion(+), 226 deletions(-)

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 5fe016ebaf7c..41e6ba760e29 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -65,9 +65,7 @@ DEFINE_ALIGN_BUFFER(unsigned char, packet, 4096, E1000_BUFFER_ALIGN);
 
 static int tx_tail;
 static int rx_tail, rx_last;
-#ifdef CONFIG_DM_ETH
 static int num_cards;	/* Number of E1000 devices seen so far */
-#endif
 
 static struct pci_device_id e1000_supported[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82542) },
@@ -1611,13 +1609,8 @@ e1000_reset_hw(struct e1000_hw *hw)
 	/* For 82542 (rev 2.0), disable MWI before issuing a device reset */
 	if (hw->mac_type == e1000_82542_rev2_0) {
 		DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-#ifdef CONFIG_DM_ETH
 		dm_pci_write_config16(hw->pdev, PCI_COMMAND,
 				hw->pci_cmd_word & ~PCI_COMMAND_INVALIDATE);
-#else
-		pci_write_config_word(hw->pdev, PCI_COMMAND,
-				hw->pci_cmd_word & ~PCI_COMMAND_INVALIDATE);
-#endif
 	}
 
 	/* Clear interrupt mask to stop board from generating interrupts */
@@ -1695,11 +1688,7 @@ e1000_reset_hw(struct e1000_hw *hw)
 
 	/* If MWI was previously enabled, reenable it. */
 	if (hw->mac_type == e1000_82542_rev2_0) {
-#ifdef CONFIG_DM_ETH
 		dm_pci_write_config16(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
-#else
-		pci_write_config_word(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
-#endif
 	}
 	if (hw->mac_type != e1000_igb)
 		E1000_WRITE_REG(hw, PBA, pba);
@@ -1884,15 +1873,9 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])
 	/* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
 	if (hw->mac_type == e1000_82542_rev2_0) {
 		DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-#ifdef CONFIG_DM_ETH
 		dm_pci_write_config16(hw->pdev, PCI_COMMAND,
 				      hw->
 				      pci_cmd_word & ~PCI_COMMAND_INVALIDATE);
-#else
-		pci_write_config_word(hw->pdev, PCI_COMMAND,
-				      hw->
-				      pci_cmd_word & ~PCI_COMMAND_INVALIDATE);
-#endif
 		E1000_WRITE_REG(hw, RCTL, E1000_RCTL_RST);
 		E1000_WRITE_FLUSH(hw);
 		mdelay(5);
@@ -1908,11 +1891,7 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])
 		E1000_WRITE_REG(hw, RCTL, 0);
 		E1000_WRITE_FLUSH(hw);
 		mdelay(1);
-#ifdef CONFIG_DM_ETH
 		dm_pci_write_config16(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
-#else
-		pci_write_config_word(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
-#endif
 	}
 
 	/* Zero out the Multicast HASH table */
@@ -1935,17 +1914,10 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])
 	default:
 	/* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
 	if (hw->bus_type == e1000_bus_type_pcix) {
-#ifdef CONFIG_DM_ETH
 		dm_pci_read_config16(hw->pdev, PCIX_COMMAND_REGISTER,
 				     &pcix_cmd_word);
 		dm_pci_read_config16(hw->pdev, PCIX_STATUS_REGISTER_HI,
 				     &pcix_stat_hi_word);
-#else
-		pci_read_config_word(hw->pdev, PCIX_COMMAND_REGISTER,
-				     &pcix_cmd_word);
-		pci_read_config_word(hw->pdev, PCIX_STATUS_REGISTER_HI,
-				     &pcix_stat_hi_word);
-#endif
 		cmd_mmrbc =
 		    (pcix_cmd_word & PCIX_COMMAND_MMRBC_MASK) >>
 		    PCIX_COMMAND_MMRBC_SHIFT;
@@ -1957,13 +1929,8 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6])
 		if (cmd_mmrbc > stat_mmrbc) {
 			pcix_cmd_word &= ~PCIX_COMMAND_MMRBC_MASK;
 			pcix_cmd_word |= stat_mmrbc << PCIX_COMMAND_MMRBC_SHIFT;
-#ifdef CONFIG_DM_ETH
 			dm_pci_write_config16(hw->pdev, PCIX_COMMAND_REGISTER,
 					      pcix_cmd_word);
-#else
-			pci_write_config_word(hw->pdev, PCIX_COMMAND_REGISTER,
-					      pcix_cmd_word);
-#endif
 		}
 	}
 		break;
@@ -5060,7 +5027,6 @@ e1000_sw_init(struct e1000_hw *hw)
 	int result;
 
 	/* PCI config space info */
-#ifdef CONFIG_DM_ETH
 	dm_pci_read_config16(hw->pdev, PCI_VENDOR_ID, &hw->vendor_id);
 	dm_pci_read_config16(hw->pdev, PCI_DEVICE_ID, &hw->device_id);
 	dm_pci_read_config16(hw->pdev, PCI_SUBSYSTEM_VENDOR_ID,
@@ -5069,16 +5035,6 @@ e1000_sw_init(struct e1000_hw *hw)
 
 	dm_pci_read_config8(hw->pdev, PCI_REVISION_ID, &hw->revision_id);
 	dm_pci_read_config16(hw->pdev, PCI_COMMAND, &hw->pci_cmd_word);
-#else
-	pci_read_config_word(hw->pdev, PCI_VENDOR_ID, &hw->vendor_id);
-	pci_read_config_word(hw->pdev, PCI_DEVICE_ID, &hw->device_id);
-	pci_read_config_word(hw->pdev, PCI_SUBSYSTEM_VENDOR_ID,
-			     &hw->subsystem_vendor_id);
-	pci_read_config_word(hw->pdev, PCI_SUBSYSTEM_ID, &hw->subsystem_id);
-
-	pci_read_config_byte(hw->pdev, PCI_REVISION_ID, &hw->revision_id);
-	pci_read_config_word(hw->pdev, PCI_COMMAND, &hw->pci_cmd_word);
-#endif
 
 	/* identify the MAC */
 	result = e1000_set_mac_type(hw);
@@ -5485,51 +5441,25 @@ void e1000_get_bus_type(struct e1000_hw *hw)
 	}
 }
 
-#ifndef CONFIG_DM_ETH
-/* A list of all registered e1000 devices */
-static LIST_HEAD(e1000_hw_list);
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int e1000_init_one(struct e1000_hw *hw, int cardnum,
 			  struct udevice *devno, unsigned char enetaddr[6])
-#else
-static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
-			  unsigned char enetaddr[6])
-#endif
 {
 	u32 val;
 
 	/* Assign the passed-in values */
-#ifdef CONFIG_DM_ETH
-	hw->pdev = devno;
-#else
 	hw->pdev = devno;
-#endif
 	hw->cardnum = cardnum;
 
 	/* Print a debug message with the IO base address */
-#ifdef CONFIG_DM_ETH
 	dm_pci_read_config32(devno, PCI_BASE_ADDRESS_0, &val);
-#else
-	pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &val);
-#endif
 	E1000_DBG(hw, "iobase 0x%08x\n", val & 0xfffffff0);
 
 	/* Try to enable I/O accesses and bus-mastering */
 	val = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
-#ifdef CONFIG_DM_ETH
 	dm_pci_write_config32(devno, PCI_COMMAND, val);
-#else
-	pci_write_config_dword(devno, PCI_COMMAND, val);
-#endif
 
 	/* Make sure it worked */
-#ifdef CONFIG_DM_ETH
 	dm_pci_read_config32(devno, PCI_COMMAND, &val);
-#else
-	pci_read_config_dword(devno, PCI_COMMAND, &val);
-#endif
 	if (!(val & PCI_COMMAND_MEMORY)) {
 		E1000_ERR(hw, "Can't enable I/O memory\n");
 		return -ENOSPC;
@@ -5548,13 +5478,8 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
 #ifndef CONFIG_E1000_NO_NVM
 	hw->eeprom_semaphore_present = true;
 #endif
-#ifdef CONFIG_DM_ETH
 	hw->hw_addr = dm_pci_map_bar(devno,	PCI_BASE_ADDRESS_0, 0, 0,
 						PCI_REGION_TYPE, PCI_REGION_MEM);
-#else
-	hw->hw_addr = pci_map_bar(devno,	PCI_BASE_ADDRESS_0,
-						PCI_REGION_MEM);
-#endif
 	hw->mac_type = e1000_undefined;
 
 	/* MAC and Phy settings */
@@ -5599,71 +5524,13 @@ static void e1000_name(char *str, int cardnum)
 	sprintf(str, "e1000#%u", cardnum);
 }
 
-#ifndef CONFIG_DM_ETH
-/**************************************************************************
-TRANSMIT - Transmit a frame
-***************************************************************************/
-static int e1000_transmit(struct eth_device *nic, void *txpacket, int length)
-{
-	struct e1000_hw *hw = nic->priv;
-
-	return _e1000_transmit(hw, txpacket, length);
-}
-
-/**************************************************************************
-DISABLE - Turn off ethernet interface
-***************************************************************************/
-static void
-e1000_disable(struct eth_device *nic)
-{
-	struct e1000_hw *hw = nic->priv;
-
-	_e1000_disable(hw);
-}
-
-/**************************************************************************
-INIT - set up ethernet interface(s)
-***************************************************************************/
-static int
-e1000_init(struct eth_device *nic, struct bd_info *bis)
-{
-	struct e1000_hw *hw = nic->priv;
-
-	return _e1000_init(hw, nic->enetaddr);
-}
-
-static int
-e1000_poll(struct eth_device *nic)
-{
-	struct e1000_hw *hw = nic->priv;
-	int len;
-
-	len = _e1000_poll(hw);
-	if (len) {
-		net_process_received_packet((uchar *)packet, len);
-		fill_rx(hw);
-	}
-
-	return len ? 1 : 0;
-}
-#endif /* !CONFIG_DM_ETH */
-
-#ifdef CONFIG_DM_ETH
 static int e1000_write_hwaddr(struct udevice *dev)
-#else
-static int e1000_write_hwaddr(struct eth_device *dev)
-#endif
 {
 #ifndef CONFIG_E1000_NO_NVM
 	unsigned char current_mac[6];
-#ifdef CONFIG_DM_ETH
 	struct eth_pdata *plat = dev_get_plat(dev);
 	struct e1000_hw *hw = dev_get_priv(dev);
 	u8 *mac = plat->enetaddr;
-#else
-	struct e1000_hw *hw = dev->priv;
-	u8 *mac = dev->enetaddr;
-#endif
 	uint16_t data[3];
 	int ret_val, i;
 
@@ -5701,87 +5568,16 @@ static int e1000_write_hwaddr(struct eth_device *dev)
 #endif
 }
 
-#ifndef CONFIG_DM_ETH
-/**************************************************************************
-PROBE - Look for an adapter, this routine's visible to the outside
-You should omit the last argument struct pci_device * for a non-PCI NIC
-***************************************************************************/
-int
-e1000_initialize(struct bd_info * bis)
-{
-	unsigned int i;
-	pci_dev_t devno;
-	int ret;
-
-	DEBUGFUNC();
-
-	/* Find and probe all the matching PCI devices */
-	for (i = 0; (devno = pci_find_devices(e1000_supported, i)) >= 0; i++) {
-		/*
-		 * These will never get freed due to errors, this allows us to
-		 * perform SPI EEPROM programming from U-Boot, for example.
-		 */
-		struct eth_device *nic = malloc(sizeof(*nic));
-		struct e1000_hw *hw = malloc(sizeof(*hw));
-		if (!nic || !hw) {
-			printf("e1000#%u: Out of Memory!\n", i);
-			free(nic);
-			free(hw);
-			continue;
-		}
-
-		/* Make sure all of the fields are initially zeroed */
-		memset(nic, 0, sizeof(*nic));
-		memset(hw, 0, sizeof(*hw));
-		nic->priv = hw;
-
-		/* Generate a card name */
-		e1000_name(nic->name, i);
-		hw->name = nic->name;
-
-		ret = e1000_init_one(hw, i, devno, nic->enetaddr);
-		if (ret)
-			continue;
-		list_add_tail(&hw->list_node, &e1000_hw_list);
-
-		hw->nic = nic;
-
-		/* Set up the function pointers and register the device */
-		nic->init = e1000_init;
-		nic->recv = e1000_poll;
-		nic->send = e1000_transmit;
-		nic->halt = e1000_disable;
-		nic->write_hwaddr = e1000_write_hwaddr;
-		eth_register(nic);
-	}
-
-	return i;
-}
-
-struct e1000_hw *e1000_find_card(unsigned int cardnum)
-{
-	struct e1000_hw *hw;
-
-	list_for_each_entry(hw, &e1000_hw_list, list_node)
-		if (hw->cardnum == cardnum)
-			return hw;
-
-	return NULL;
-}
-#endif /* !CONFIG_DM_ETH */
-
 #ifdef CONFIG_CMD_E1000
 static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
 {
 	unsigned char *mac = NULL;
-#ifdef CONFIG_DM_ETH
 	struct eth_pdata *plat;
 	struct udevice *dev;
 	char name[30];
 	int ret;
-#endif
-#if !defined(CONFIG_DM_ETH) || defined(CONFIG_E1000_SPI)
+#if defined(CONFIG_E1000_SPI)
 	struct e1000_hw *hw;
 #endif
 	int cardnum;
@@ -5793,18 +5589,12 @@ static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc,
 
 	/* Make sure we can find the requested e1000 card */
 	cardnum = dectoul(argv[1], NULL);
-#ifdef CONFIG_DM_ETH
 	e1000_name(name, cardnum);
 	ret = uclass_get_device_by_name(UCLASS_ETH, name, &dev);
 	if (!ret) {
 		plat = dev_get_plat(dev);
 		mac = plat->enetaddr;
 	}
-#else
-	hw = e1000_find_card(cardnum);
-	if (hw)
-		mac = hw->nic->enetaddr;
-#endif
 	if (!mac) {
 		printf("e1000: ERROR: No such device: e1000#%s\n", argv[1]);
 		return 1;
@@ -5817,9 +5607,7 @@ static int do_e1000(struct cmd_tbl *cmdtp, int flag, int argc,
 	}
 
 #ifdef CONFIG_E1000_SPI
-#ifdef CONFIG_DM_ETH
 	hw = dev_get_priv(dev);
-#endif
 	/* Handle the "SPI" subcommand */
 	if (!strcmp(argv[2], "spi"))
 		return do_e1000_spi(cmdtp, hw, argc - 3, argv + 3);
@@ -5843,7 +5631,6 @@ U_BOOT_CMD(
 );
 #endif /* not CONFIG_CMD_E1000 */
 
-#ifdef CONFIG_DM_ETH
 static int e1000_eth_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -5948,4 +5735,3 @@ U_BOOT_DRIVER(eth_e1000) = {
 };
 
 U_BOOT_PCI_DEVICE(eth_e1000, e1000_supported);
-#endif
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index f96f12c8f445..f788394da874 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -21,10 +21,6 @@
 #include <linux/list.h>
 #include <malloc.h>
 #include <net.h>
-/* Avoids a compile error since struct eth_device is not defined */
-#ifndef CONFIG_DM_ETH
-#include <netdev.h>
-#endif
 #include <asm/io.h>
 #include <pci.h>
 
@@ -1077,19 +1073,12 @@ typedef enum {
 struct e1000_hw {
 	const char *name;
 	struct list_head list_node;
-#ifndef CONFIG_DM_ETH
-	struct eth_device *nic;
-#endif
 #ifdef CONFIG_E1000_SPI
 	struct spi_slave spi;
 #endif
 	unsigned int cardnum;
 
-#ifdef CONFIG_DM_ETH
 	struct udevice *pdev;
-#else
-	pci_dev_t pdev;
-#endif
 	uint8_t *hw_addr;
 	e1000_mac_type mac_type;
 	e1000_phy_type phy_type;
-- 
2.25.1

[PATCH 15/41] net: eepro100: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/eepro100.c | 134 -----------------------------------------
 1 file changed, 134 deletions(-)

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 935cd9c99cef..a0424505bde8 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -206,27 +206,14 @@ struct eepro100_priv {
 	/* TX descriptor ring pointer */
 	int			tx_next;
 	int			tx_threshold;
-#ifdef CONFIG_DM_ETH
 	struct udevice		*devno;
-#else
-	struct eth_device	dev;
-	pci_dev_t		devno;
-#endif
 	char			*name;
 	void __iomem		*iobase;
 	u8			*enetaddr;
 };
 
-#if defined(CONFIG_DM_ETH)
 #define bus_to_phys(dev, a)	dm_pci_mem_to_phys((dev), (a))
 #define phys_to_bus(dev, a)	dm_pci_phys_to_mem((dev), (a))
-#elif defined(CONFIG_E500)
-#define bus_to_phys(dev, a)	(a)
-#define phys_to_bus(dev, a)	(a)
-#else
-#define bus_to_phys(dev, a)	pci_mem_to_phys((dev), (a))
-#define phys_to_bus(dev, a)	pci_phys_to_mem((dev), (a))
-#endif
 
 static int INW(struct eepro100_priv *priv, u_long addr)
 {
@@ -778,126 +765,6 @@ done:
 	return;
 }
 
-#ifndef CONFIG_DM_ETH
-static int eepro100_init(struct eth_device *dev, struct bd_info *bis)
-{
-	struct eepro100_priv *priv =
-		container_of(dev, struct eepro100_priv, dev);
-
-	return eepro100_init_common(priv);
-}
-
-static void eepro100_halt(struct eth_device *dev)
-{
-	struct eepro100_priv *priv =
-		container_of(dev, struct eepro100_priv, dev);
-
-	eepro100_halt_common(priv);
-}
-
-static int eepro100_send(struct eth_device *dev, void *packet, int length)
-{
-	struct eepro100_priv *priv =
-		container_of(dev, struct eepro100_priv, dev);
-
-	return eepro100_send_common(priv, packet, length);
-}
-
-static int eepro100_recv(struct eth_device *dev)
-{
-	struct eepro100_priv *priv =
-		container_of(dev, struct eepro100_priv, dev);
-	uchar *packet;
-	int ret;
-
-	ret = eepro100_recv_common(priv, &packet);
-	if (ret > 0)
-		net_process_received_packet(packet, ret);
-	if (ret)
-		eepro100_free_pkt_common(priv);
-
-	return ret;
-}
-
-int eepro100_initialize(struct bd_info *bis)
-{
-	struct eepro100_priv *priv;
-	struct eth_device *dev;
-	int card_number = 0;
-	u32 iobase, status;
-	pci_dev_t devno;
-	int idx = 0;
-	int ret;
-
-	while (1) {
-		/* Find PCI device */
-		devno = pci_find_devices(supported, idx++);
-		if (devno < 0)
-			break;
-
-		pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &iobase);
-		iobase &= ~0xf;
-
-		debug("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n",
-		      iobase);
-
-		pci_write_config_dword(devno, PCI_COMMAND,
-				       PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
-
-		/* Check if I/O accesses and Bus Mastering are enabled. */
-		pci_read_config_dword(devno, PCI_COMMAND, &status);
-		if (!(status & PCI_COMMAND_MEMORY)) {
-			printf("Error: Can not enable MEM access.\n");
-			continue;
-		}
-
-		if (!(status & PCI_COMMAND_MASTER)) {
-			printf("Error: Can not enable Bus Mastering.\n");
-			continue;
-		}
-
-		priv = calloc(1, sizeof(*priv));
-		if (!priv) {
-			printf("eepro100: Can not allocate memory\n");
-			break;
-		}
-		dev = &priv->dev;
-
-		sprintf(dev->name, "i82559#%d", card_number);
-		priv->name = dev->name;
-		/* this have to come before bus_to_phys() */
-		priv->devno = devno;
-		priv->iobase = (void __iomem *)bus_to_phys(devno, iobase);
-		priv->enetaddr = dev->enetaddr;
-
-		dev->init = eepro100_init;
-		dev->halt = eepro100_halt;
-		dev->send = eepro100_send;
-		dev->recv = eepro100_recv;
-
-		eth_register(dev);
-
-		ret = eepro100_initialize_mii(priv);
-		if (ret) {
-			eth_unregister(dev);
-			free(priv);
-			return ret;
-		}
-
-		card_number++;
-
-		/* Set the latency timer for value. */
-		pci_write_config_byte(devno, PCI_LATENCY_TIMER, 0x20);
-
-		udelay(10 * 1000);
-
-		eepro100_get_hwaddr(priv);
-	}
-
-	return card_number;
-}
-
-#else	/* DM_ETH */
 static int eepro100_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -1014,4 +881,3 @@ U_BOOT_DRIVER(eth_eepro100) = {
 };
 
 U_BOOT_PCI_DEVICE(eth_eepro100, supported);
-#endif
-- 
2.25.1

[PATCH 16/41] net: ethoc: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ethoc.c                  | 85 ----------------------------
 include/dm/platform_data/net_ethoc.h |  4 --
 2 files changed, 89 deletions(-)

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index a219affb58a2..29067e9e9494 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -643,8 +643,6 @@ static inline int ethoc_phy_init(struct ethoc *priv, void *dev)
 
 #endif
 
-#ifdef CONFIG_DM_ETH
-
 static int ethoc_write_hwaddr(struct udevice *dev)
 {
 	struct ethoc_eth_pdata *pdata = dev_get_plat(dev);
@@ -753,86 +751,3 @@ U_BOOT_DRIVER(ethoc) = {
 	.priv_auto		= sizeof(struct ethoc),
 	.plat_auto	= sizeof(struct ethoc_eth_pdata),
 };
-
-#else
-
-static int ethoc_init(struct eth_device *dev, struct bd_info *bd)
-{
-	struct ethoc *priv = (struct ethoc *)dev->priv;
-
-	return ethoc_init_common(priv);
-}
-
-static int ethoc_write_hwaddr(struct eth_device *dev)
-{
-	struct ethoc *priv = (struct ethoc *)dev->priv;
-	u8 *mac = dev->enetaddr;
-
-	return ethoc_write_hwaddr_common(priv, mac);
-}
-
-static int ethoc_send(struct eth_device *dev, void *packet, int length)
-{
-	return ethoc_send_common(dev->priv, packet, length);
-}
-
-static void ethoc_halt(struct eth_device *dev)
-{
-	ethoc_disable_rx_and_tx(dev->priv);
-}
-
-static int ethoc_recv(struct eth_device *dev)
-{
-	struct ethoc *priv = (struct ethoc *)dev->priv;
-	int count;
-
-	if (!ethoc_is_new_packet_received(priv))
-		return 0;
-
-	for (count = 0; count < PKTBUFSRX; ++count) {
-		uchar *packetp;
-		int size = ethoc_rx_common(priv, &packetp);
-
-		if (size < 0)
-			break;
-		if (size > 0)
-			net_process_received_packet(packetp, size);
-		ethoc_free_pkt_common(priv);
-	}
-	return 0;
-}
-
-int ethoc_initialize(u8 dev_num, int base_addr)
-{
-	struct ethoc *priv;
-	struct eth_device *dev;
-
-	priv = malloc(sizeof(*priv));
-	if (!priv)
-		return 0;
-	dev = malloc(sizeof(*dev));
-	if (!dev) {
-		free(priv);
-		return 0;
-	}
-
-	memset(dev, 0, sizeof(*dev));
-	dev->priv = priv;
-	dev->iobase = base_addr;
-	dev->init = ethoc_init;
-	dev->halt = ethoc_halt;
-	dev->send = ethoc_send;
-	dev->recv = ethoc_recv;
-	dev->write_hwaddr = ethoc_write_hwaddr;
-	sprintf(dev->name, "%s-%hu", "ETHOC", dev_num);
-	priv->iobase = ioremap(dev->iobase, ETHOC_IOSIZE);
-
-	eth_register(dev);
-
-	ethoc_mdio_init(dev->name, priv);
-	ethoc_phy_init(priv, dev);
-
-	return 1;
-}
-
-#endif
diff --git a/include/dm/platform_data/net_ethoc.h b/include/dm/platform_data/net_ethoc.h
index 855e9999a0a8..44547d14f53e 100644
--- a/include/dm/platform_data/net_ethoc.h
+++ b/include/dm/platform_data/net_ethoc.h
@@ -8,13 +8,9 @@
 
 #include <net.h>
 
-#ifdef CONFIG_DM_ETH
-
 struct ethoc_eth_pdata {
 	struct eth_pdata eth_pdata;
 	phys_addr_t packet_base;
 };
 
-#endif
-
 #endif /* _ETHOC_H */
-- 
2.25.1

[PATCH 17/41] net: fec_mxc: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/fec_mxc.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h
index 48faa33d66ec..77bfc1cbf450 100644
--- a/drivers/net/fec_mxc.h
+++ b/drivers/net/fec_mxc.h
@@ -263,9 +263,7 @@ struct fec_priv {
 	uint32_t reset_delay;
 	uint32_t reset_post_delay;
 #endif
-#ifdef CONFIG_DM_ETH
 	u32 interface;
-#endif
 	struct clk ipg_clk;
 	struct clk ahb_clk;
 	struct clk clk_enet_out;
-- 
2.25.1

[PATCH 18/41] net: fsl-mc: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/fsl-mc/mc.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 69da465eaabc..6b36860187ca 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -165,21 +165,12 @@ enum mc_fixup_type {
 };
 
 static int mc_fixup_mac_addr(void *blob, int nodeoffset,
-#ifdef CONFIG_DM_ETH
 			     const char *propname, struct udevice *eth_dev,
-#else
-			     const char *propname, struct eth_device *eth_dev,
-#endif
 			     enum mc_fixup_type type)
 {
-#ifdef CONFIG_DM_ETH
 	struct eth_pdata *plat = dev_get_plat(eth_dev);
 	unsigned char *enetaddr = plat->enetaddr;
 	int eth_index = dev_seq(eth_dev);
-#else
-	unsigned char *enetaddr = eth_dev->enetaddr;
-	int eth_index = eth_dev->index;
-#endif
 	int err = 0, len = 0, size, i;
 	unsigned char env_enetaddr[ARP_HLEN];
 	unsigned int enetaddr_32[ARP_HLEN];
@@ -252,11 +243,7 @@ const char *dpl_get_connection_endpoint(void *blob, char *endpoint)
 }
 
 static int mc_fixup_dpl_mac_addr(void *blob, int dpmac_id,
-#ifdef CONFIG_DM_ETH
 				 struct udevice *eth_dev)
-#else
-				 struct eth_device *eth_dev)
-#endif
 {
 	int objoff = fdt_path_offset(blob, "/objects");
 	int dpmacoff = -1, dpnioff = -1;
@@ -355,11 +342,7 @@ void fdt_fsl_mc_fixup_iommu_map_entry(void *blob)
 }
 
 static int mc_fixup_dpc_mac_addr(void *blob, int dpmac_id,
-#ifdef CONFIG_DM_ETH
 				 struct udevice *eth_dev)
-#else
-				 struct eth_device *eth_dev)
-#endif
 {
 	int nodeoffset = fdt_path_offset(blob, "/board_info/ports"), noff;
 	int err = 0;
@@ -402,12 +385,8 @@ static int mc_fixup_dpc_mac_addr(void *blob, int dpmac_id,
 static int mc_fixup_mac_addrs(void *blob, enum mc_fixup_type type)
 {
 	int i, err = 0, ret = 0;
-#ifdef CONFIG_DM_ETH
 #define ETH_NAME_LEN 20
 	struct udevice *eth_dev;
-#else
-	struct eth_device *eth_dev;
-#endif
 	char ethname[ETH_NAME_LEN];
 
 	for (i = WRIOP1_DPMAC1; i < NUM_WRIOP_PORTS; i++) {
-- 
2.25.1

[PATCH 19/41] net: ldpaa_eth: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ldpaa_eth/ldpaa_eth.c | 198 +-----------------------------
 drivers/net/ldpaa_eth/ldpaa_eth.h |   4 -
 2 files changed, 2 insertions(+), 200 deletions(-)

diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index b6f589eb91a5..24850777949a 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -24,7 +24,6 @@
 #include "ldpaa_eth.h"
 
 #ifdef CONFIG_PHYLIB
-#ifdef CONFIG_DM_ETH
 static void init_phy(struct udevice *dev)
 {
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
@@ -36,51 +35,6 @@ static void init_phy(struct udevice *dev)
 
 	phy_config(priv->phy);
 }
-#else
-static int init_phy(struct eth_device *dev)
-{
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv;
-	struct phy_device *phydev = NULL;
-	struct mii_dev *bus;
-	int phy_addr, phy_num;
-	int ret = 0;
-
-	bus = wriop_get_mdio(priv->dpmac_id);
-	if (bus == NULL)
-		return 0;
-
-	for (phy_num = 0; phy_num < WRIOP_MAX_PHY_NUM; phy_num++) {
-		phy_addr = wriop_get_phy_address(priv->dpmac_id, phy_num);
-		if (phy_addr < 0)
-			continue;
-
-		phydev = phy_connect(bus, phy_addr, dev,
-				     wriop_get_enet_if(priv->dpmac_id));
-		if (!phydev) {
-			printf("Failed to connect\n");
-			ret = -ENODEV;
-			break;
-		}
-		wriop_set_phy_dev(priv->dpmac_id, phy_num, phydev);
-		ret = phy_config(phydev);
-		if (ret)
-			break;
-	}
-
-	if (ret) {
-		for (phy_num = 0; phy_num < WRIOP_MAX_PHY_NUM; phy_num++) {
-			phydev = wriop_get_phy_dev(priv->dpmac_id, phy_num);
-			if (!phydev)
-				continue;
-
-			free(phydev);
-			wriop_set_phy_dev(priv->dpmac_id, phy_num, NULL);
-		}
-	}
-
-	return ret;
-}
-#endif
 #endif
 
 #ifdef DEBUG
@@ -147,15 +101,9 @@ static void ldpaa_eth_get_dpni_counter(void)
 	}
 }
 
-#ifdef CONFIG_DM_ETH
 static void ldpaa_eth_get_dpmac_counter(struct udevice *dev)
 {
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
-#else
-static void ldpaa_eth_get_dpmac_counter(struct eth_device *net_dev)
-{
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv;
-#endif
 	int err = 0;
 	u64 value;
 
@@ -288,16 +236,10 @@ error:
 	return;
 }
 
-#ifdef CONFIG_DM_ETH
 static int ldpaa_eth_pull_dequeue_rx(struct udevice *dev,
 				     int flags, uchar **packetp)
 {
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
-#else
-static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
-{
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv;
-#endif
 	const struct ldpaa_dq *dq;
 	const struct dpaa_fd *fd;
 	int i = 5, err = 0, status;
@@ -354,15 +296,9 @@ static int ldpaa_eth_pull_dequeue_rx(struct eth_device *dev)
 	return err;
 }
 
-#ifdef CONFIG_DM_ETH
 static int ldpaa_eth_tx(struct udevice *dev, void *buf, int len)
 {
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
-#else
-static int ldpaa_eth_tx(struct eth_device *net_dev, void *buf, int len)
-{
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv;
-#endif
 	struct dpaa_fd fd;
 	u64 buffer_start;
 	int data_offset, err;
@@ -438,27 +374,6 @@ error:
 	return err;
 }
 
-static struct phy_device *ldpaa_get_phydev(struct ldpaa_eth_priv *priv)
-{
-#ifdef CONFIG_DM_ETH
-	return priv->phy;
-#else
-#ifdef CONFIG_PHYLIB
-	struct phy_device *phydev = NULL;
-	int phy_num;
-
-	/* start the phy devices one by one and update the dpmac state */
-	for (phy_num = 0; phy_num < WRIOP_MAX_PHY_NUM; phy_num++) {
-		phydev = wriop_get_phy_dev(priv->dpmac_id, phy_num);
-		if (phydev)
-			return phydev;
-	}
-	return NULL;
-#endif
-	return NULL;
-#endif
-}
-
 static int ldpaa_get_dpmac_state(struct ldpaa_eth_priv *priv,
 				 struct dpmac_link_state *state)
 {
@@ -479,7 +394,7 @@ static int ldpaa_get_dpmac_state(struct ldpaa_eth_priv *priv,
 
 	state->up = 1;
 	state->options |= DPMAC_LINK_OPT_AUTONEG;
-	phydev = ldpaa_get_phydev(priv);
+	phydev = priv->phy;
 
 	if (phydev) {
 		err = phy_startup(phydev);
@@ -509,16 +424,10 @@ static int ldpaa_get_dpmac_state(struct ldpaa_eth_priv *priv,
 	return 0;
 }
 
-#ifdef CONFIG_DM_ETH
 static int ldpaa_eth_open(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
-#else
-static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd)
-{
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv;
-#endif
 	struct dpmac_link_state	dpmac_link_state = { 0 };
 #ifdef DEBUG
 	struct dpni_link_state link_state;
@@ -526,13 +435,8 @@ static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd)
 	int err = 0;
 	struct dpni_queue d_queue;
 
-#ifdef CONFIG_DM_ETH
 	if (eth_is_active(dev))
 		return 0;
-#else
-	if (net_dev->state == ETH_STATE_ACTIVE)
-		return 0;
-#endif
 
 	if (get_mc_boot_status() != 0) {
 		printf("ERROR (MC is not booted)\n");
@@ -572,13 +476,8 @@ static int ldpaa_eth_open(struct eth_device *net_dev, struct bd_info *bd)
 	if (err)
 		goto err_dpni_bind;
 
-#ifdef CONFIG_DM_ETH
 	err = dpni_add_mac_addr(dflt_mc_io, MC_CMD_NO_FLAGS,
 				dflt_dpni->dpni_handle, plat->enetaddr);
-#else
-	err = dpni_add_mac_addr(dflt_mc_io, MC_CMD_NO_FLAGS,
-				dflt_dpni->dpni_handle, net_dev->enetaddr);
-#endif
 	if (err) {
 		printf("dpni_add_mac_addr() failed\n");
 		return err;
@@ -651,34 +550,18 @@ err_dpmac_setup:
 	return err;
 }
 
-#ifdef CONFIG_DM_ETH
 static void ldpaa_eth_stop(struct udevice *dev)
 {
 	struct ldpaa_eth_priv *priv = dev_get_priv(dev);
-#else
-static void ldpaa_eth_stop(struct eth_device *net_dev)
-{
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv;
-#endif
 	struct phy_device *phydev = NULL;
 	int err = 0;
 
-#ifdef CONFIG_DM_ETH
 	if (!eth_is_active(dev))
 		return;
-#else
-	if ((net_dev->state == ETH_STATE_PASSIVE) ||
-	    (net_dev->state == ETH_STATE_INIT))
-		return;
-#endif
 
 #ifdef DEBUG
 	ldpaa_eth_get_dpni_counter();
-#ifdef CONFIG_DM_ETH
 	ldpaa_eth_get_dpmac_counter(dev);
-#else
-	ldpaa_eth_get_dpmac_counter(net_dev);
-#endif
 #endif
 
 	err = dprc_disconnect(dflt_mc_io, MC_CMD_NO_FLAGS,
@@ -702,7 +585,7 @@ static void ldpaa_eth_stop(struct eth_device *net_dev)
 	if (err < 0)
 		printf("dpni_disable() failed\n");
 
-	phydev = ldpaa_get_phydev(priv);
+	phydev = priv->phy;
 	if (phydev)
 		phy_shutdown(phydev);
 
@@ -1097,7 +980,6 @@ static int ldpaa_dpni_bind(struct ldpaa_eth_priv *priv)
 	return 0;
 }
 
-#ifdef CONFIG_DM_ETH
 static int ldpaa_eth_probe(struct udevice *dev)
 {
 	struct ofnode_phandle_args phandle;
@@ -1177,79 +1059,3 @@ U_BOOT_DRIVER(ldpaa_eth) = {
 	.priv_auto	= sizeof(struct ldpaa_eth_priv),
 	.plat_auto	= sizeof(struct eth_pdata),
 };
-
-#else
-
-static int ldpaa_eth_netdev_init(struct eth_device *net_dev,
-				 phy_interface_t enet_if)
-{
-	int err;
-	struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv;
-
-	snprintf(net_dev->name, ETH_NAME_LEN, "DPMAC%d@%s", priv->dpmac_id,
-		 phy_interface_strings[enet_if]);
-
-	net_dev->iobase = 0;
-	net_dev->init = ldpaa_eth_open;
-	net_dev->halt = ldpaa_eth_stop;
-	net_dev->send = ldpaa_eth_tx;
-	net_dev->recv = ldpaa_eth_pull_dequeue_rx;
-
-#ifdef CONFIG_PHYLIB
-	err = init_phy(net_dev);
-	if (err < 0)
-		return err;
-#endif
-
-	err = eth_register(net_dev);
-	if (err < 0) {
-		printf("eth_register() = %d\n", err);
-		return err;
-	}
-
-	return 0;
-}
-
-int ldpaa_eth_init(int dpmac_id, phy_interface_t enet_if)
-{
-	struct eth_device		*net_dev = NULL;
-	struct ldpaa_eth_priv		*priv = NULL;
-	int				err = 0;
-
-	/* Net device */
-	net_dev = (struct eth_device *)malloc(sizeof(struct eth_device));
-	if (!net_dev) {
-		printf("eth_device malloc() failed\n");
-		return -ENOMEM;
-	}
-	memset(net_dev, 0, sizeof(struct eth_device));
-
-	/* alloc the ldpaa ethernet private struct */
-	priv = (struct ldpaa_eth_priv *)malloc(sizeof(struct ldpaa_eth_priv));
-	if (!priv) {
-		printf("ldpaa_eth_priv malloc() failed\n");
-		free(net_dev);
-		return -ENOMEM;
-	}
-	memset(priv, 0, sizeof(struct ldpaa_eth_priv));
-
-	net_dev->priv = (void *)priv;
-	priv->net_dev = (struct eth_device *)net_dev;
-	priv->dpmac_id = dpmac_id;
-	debug("%s dpmac_id=%d\n", __func__, dpmac_id);
-
-	err = ldpaa_eth_netdev_init(net_dev, enet_if);
-	if (err)
-		goto err_netdev_init;
-
-	debug("ldpaa ethernet: Probed interface %s\n", net_dev->name);
-	return 0;
-
-err_netdev_init:
-	free(priv);
-	net_dev->priv = NULL;
-	free(net_dev);
-
-	return err;
-}
-#endif
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h
index e90513e56f9a..16d0106233e0 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.h
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.h
@@ -116,13 +116,9 @@ struct ldpaa_fas {
 					 LDPAA_ETH_FAS_TIDE)
 
 struct ldpaa_eth_priv {
-#ifdef CONFIG_DM_ETH
 	struct phy_device *phy;
 	int phy_mode;
 	bool started;
-#else
-	struct eth_device *net_dev;
-#endif
 	uint32_t dpmac_id;
 	uint16_t dpmac_handle;
 
-- 
2.25.1

[PATCH 20/41] net: macb: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/macb.c | 194 +--------------------------------------------
 1 file changed, 2 insertions(+), 192 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index e02a57b4114c..57d7bb753ff8 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -33,9 +33,6 @@
  */
 
 #include <net.h>
-#ifndef CONFIG_DM_ETH
-#include <netdev.h>
-#endif
 #include <malloc.h>
 #include <miiphy.h>
 
@@ -128,21 +125,16 @@ struct macb_device {
 	unsigned long		dummy_desc_dma;
 
 	const struct device	*dev;
-#ifndef CONFIG_DM_ETH
-	struct eth_device	netdev;
-#endif
 	unsigned short		phy_addr;
 	struct mii_dev		*bus;
 #ifdef CONFIG_PHYLIB
 	struct phy_device	*phydev;
 #endif
 
-#ifdef CONFIG_DM_ETH
 #ifdef CONFIG_CLK
 	unsigned long		pclk_rate;
 #endif
 	phy_interface_t		phy_interface;
-#endif
 };
 
 struct macb_usrio_cfg {
@@ -161,10 +153,6 @@ struct macb_config {
 	const struct macb_usrio_cfg	*usrio;
 };
 
-#ifndef CONFIG_DM_ETH
-#define to_macb(_nd) container_of(_nd, struct macb_device, netdev)
-#endif
-
 static int macb_is_gem(struct macb_device *macb)
 {
 	return MACB_BFEXT(IDNUM, macb_readl(macb, MID)) >= 0x2;
@@ -255,13 +243,8 @@ void __weak arch_get_mdio_control(const char *name)
 int macb_miiphy_read(struct mii_dev *bus, int phy_adr, int devad, int reg)
 {
 	u16 value = 0;
-#ifdef CONFIG_DM_ETH
 	struct udevice *dev = eth_get_dev_by_name(bus->name);
 	struct macb_device *macb = dev_get_priv(dev);
-#else
-	struct eth_device *dev = eth_get_dev_by_name(bus->name);
-	struct macb_device *macb = to_macb(dev);
-#endif
 
 	arch_get_mdio_control(bus->name);
 	value = macb_mdio_read(macb, phy_adr, reg);
@@ -272,13 +255,8 @@ int macb_miiphy_read(struct mii_dev *bus, int phy_adr, int devad, int reg)
 int macb_miiphy_write(struct mii_dev *bus, int phy_adr, int devad, int reg,
 		      u16 value)
 {
-#ifdef CONFIG_DM_ETH
 	struct udevice *dev = eth_get_dev_by_name(bus->name);
 	struct macb_device *macb = dev_get_priv(dev);
-#else
-	struct eth_device *dev = eth_get_dev_by_name(bus->name);
-	struct macb_device *macb = to_macb(dev);
-#endif
 
 	arch_get_mdio_control(bus->name);
 	macb_mdio_write(macb, phy_adr, reg, value);
@@ -571,7 +549,6 @@ static int macb_phy_find(struct macb_device *macb, const char *name)
  * Returns 0 when operation success and negative errno number
  * when operation failed.
  */
-#ifdef CONFIG_DM_ETH
 static int macb_sifive_clk_init(struct udevice *dev, ulong rate)
 {
 	void *gemgxl_regs;
@@ -651,22 +628,10 @@ int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed)
 
 	return 0;
 }
-#else
-int __weak macb_linkspd_cb(void *regs, unsigned int speed)
-{
-	return 0;
-}
-#endif
 
-#ifdef CONFIG_DM_ETH
 static int macb_phy_init(struct udevice *dev, const char *name)
-#else
-static int macb_phy_init(struct macb_device *macb, const char *name)
-#endif
 {
-#ifdef CONFIG_DM_ETH
 	struct macb_device *macb = dev_get_priv(dev);
-#endif
 	u32 ncfgr;
 	u16 phy_id, status, adv, lpa;
 	int media, speed, duplex;
@@ -687,14 +652,8 @@ static int macb_phy_init(struct macb_device *macb, const char *name)
 	}
 
 #ifdef CONFIG_PHYLIB
-#ifdef CONFIG_DM_ETH
 	macb->phydev = phy_connect(macb->bus, macb->phy_addr, dev,
 			     macb->phy_interface);
-#else
-	/* need to consider other phy interface mode */
-	macb->phydev = phy_connect(macb->bus, macb->phy_addr, &macb->netdev,
-			     PHY_INTERFACE_MODE_RGMII);
-#endif
 	if (!macb->phydev) {
 		printf("phy_connect failed\n");
 		return -ENODEV;
@@ -751,11 +710,7 @@ static int macb_phy_init(struct macb_device *macb, const char *name)
 
 			macb_writel(macb, NCFGR, ncfgr);
 
-#ifdef CONFIG_DM_ETH
 			ret = macb_linkspd_cb(dev, _1000BASET);
-#else
-			ret = macb_linkspd_cb(macb->regs, _1000BASET);
-#endif
 			if (ret)
 				return ret;
 
@@ -780,17 +735,9 @@ static int macb_phy_init(struct macb_device *macb, const char *name)
 	ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE));
 	if (speed) {
 		ncfgr |= MACB_BIT(SPD);
-#ifdef CONFIG_DM_ETH
 		ret = macb_linkspd_cb(dev, _100BASET);
-#else
-		ret = macb_linkspd_cb(macb->regs, _100BASET);
-#endif
 	} else {
-#ifdef CONFIG_DM_ETH
 		ret = macb_linkspd_cb(dev, _10BASET);
-#else
-		ret = macb_linkspd_cb(macb->regs, _10BASET);
-#endif
 	}
 
 	if (ret)
@@ -864,16 +811,10 @@ static void gmac_configure_dma(struct macb_device *macb)
 	gem_writel(macb, DMACFG, dmacfg);
 }
 
-#ifdef CONFIG_DM_ETH
 static int _macb_init(struct udevice *dev, const char *name)
-#else
-static int _macb_init(struct macb_device *macb, const char *name)
-#endif
 {
-#ifdef CONFIG_DM_ETH
 	struct macb_device *macb = dev_get_priv(dev);
 	unsigned int val = 0;
-#endif
 	unsigned long paddr;
 	int ret;
 	int i;
@@ -942,7 +883,6 @@ static int _macb_init(struct macb_device *macb, const char *name)
 		 * When the GMAC IP without GE feature, this bit is used
 		 * to select interface between RMII and MII.
 		 */
-#ifdef CONFIG_DM_ETH
 		if (macb->phy_interface == PHY_INTERFACE_MODE_RGMII ||
 		    macb->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||
 		    macb->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID ||
@@ -964,16 +904,8 @@ static int _macb_init(struct macb_device *macb, const char *name)
 			ncfgr |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL);
 			macb_writel(macb, NCFGR, ncfgr);
 		}
-#else
-#if defined(CONFIG_RGMII) || defined(CONFIG_RMII)
-		gem_writel(macb, USRIO, macb->config->usrio->rgmii);
-#else
-		gem_writel(macb, USRIO, 0);
-#endif
-#endif
 	} else {
 	/* choose RMII or MII mode. This depends on the board */
-#ifdef CONFIG_DM_ETH
 #ifdef CONFIG_AT91FAMILY
 		if (macb->phy_interface == PHY_INTERFACE_MODE_RMII) {
 			macb_writel(macb, USRIO,
@@ -987,30 +919,10 @@ static int _macb_init(struct macb_device *macb, const char *name)
 			macb_writel(macb, USRIO, 0);
 		else
 			macb_writel(macb, USRIO, macb->config->usrio->mii);
-#endif
-#else
-#ifdef CONFIG_RMII
-#ifdef CONFIG_AT91FAMILY
-	macb_writel(macb, USRIO, macb->config->usrio->rmii |
-		    macb->config->usrio->clken);
-#else
-	macb_writel(macb, USRIO, 0);
-#endif
-#else
-#ifdef CONFIG_AT91FAMILY
-	macb_writel(macb, USRIO, macb->config->usrio->clken);
-#else
-	macb_writel(macb, USRIO, macb->config->usrio->mii);
-#endif
-#endif /* CONFIG_RMII */
 #endif
 	}
 
-#ifdef CONFIG_DM_ETH
 	ret = macb_phy_init(dev, name);
-#else
-	ret = macb_phy_init(macb, name);
-#endif
 	if (ret)
 		return ret;
 
@@ -1054,7 +966,7 @@ static int _macb_write_hwaddr(struct macb_device *macb, unsigned char *enetaddr)
 static u32 macb_mdc_clk_div(int id, struct macb_device *macb)
 {
 	u32 config;
-#if defined(CONFIG_DM_ETH) && defined(CONFIG_CLK)
+#if defined(CONFIG_CLK)
 	unsigned long macb_hz = macb->pclk_rate;
 #else
 	unsigned long macb_hz = get_macb_pclk_rate(id);
@@ -1076,7 +988,7 @@ static u32 gem_mdc_clk_div(int id, struct macb_device *macb)
 {
 	u32 config;
 
-#if defined(CONFIG_DM_ETH) && defined(CONFIG_CLK)
+#if defined(CONFIG_CLK)
 	unsigned long macb_hz = macb->pclk_rate;
 #else
 	unsigned long macb_hz = get_macb_pclk_rate(id);
@@ -1155,106 +1067,6 @@ static void _macb_eth_initialize(struct macb_device *macb)
 	macb_writel(macb, NCFGR, ncfgr);
 }
 
-#ifndef CONFIG_DM_ETH
-static int macb_send(struct eth_device *netdev, void *packet, int length)
-{
-	struct macb_device *macb = to_macb(netdev);
-
-	return _macb_send(macb, netdev->name, packet, length);
-}
-
-static int macb_recv(struct eth_device *netdev)
-{
-	struct macb_device *macb = to_macb(netdev);
-	uchar *packet;
-	int length;
-
-	macb->wrapped = false;
-	for (;;) {
-		macb->next_rx_tail = macb->rx_tail;
-		length = _macb_recv(macb, &packet);
-		if (length >= 0) {
-			net_process_received_packet(packet, length);
-			reclaim_rx_buffers(macb, macb->next_rx_tail);
-		} else {
-			return length;
-		}
-	}
-}
-
-static int macb_init(struct eth_device *netdev, struct bd_info *bd)
-{
-	struct macb_device *macb = to_macb(netdev);
-
-	return _macb_init(macb, netdev->name);
-}
-
-static void macb_halt(struct eth_device *netdev)
-{
-	struct macb_device *macb = to_macb(netdev);
-
-	return _macb_halt(macb);
-}
-
-static int macb_write_hwaddr(struct eth_device *netdev)
-{
-	struct macb_device *macb = to_macb(netdev);
-
-	return _macb_write_hwaddr(macb, netdev->enetaddr);
-}
-
-int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)
-{
-	struct macb_device *macb;
-	struct eth_device *netdev;
-
-	macb = malloc(sizeof(struct macb_device));
-	if (!macb) {
-		printf("Error: Failed to allocate memory for MACB%d\n", id);
-		return -1;
-	}
-	memset(macb, 0, sizeof(struct macb_device));
-
-	netdev = &macb->netdev;
-
-	macb->regs = regs;
-	macb->phy_addr = phy_addr;
-
-	if (macb_is_gem(macb))
-		sprintf(netdev->name, "gmac%d", id);
-	else
-		sprintf(netdev->name, "macb%d", id);
-
-	netdev->init = macb_init;
-	netdev->halt = macb_halt;
-	netdev->send = macb_send;
-	netdev->recv = macb_recv;
-	netdev->write_hwaddr = macb_write_hwaddr;
-
-	_macb_eth_initialize(macb);
-
-	eth_register(netdev);
-
-#if defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB)
-	int retval;
-	struct mii_dev *mdiodev = mdio_alloc();
-	if (!mdiodev)
-		return -ENOMEM;
-	strlcpy(mdiodev->name, netdev->name, MDIO_NAME_LEN);
-	mdiodev->read = macb_miiphy_read;
-	mdiodev->write = macb_miiphy_write;
-
-	retval = mdio_register(mdiodev);
-	if (retval < 0)
-		return retval;
-	macb->bus = miiphy_get_dev_by_name(netdev->name);
-#endif
-	return 0;
-}
-#endif /* !CONFIG_DM_ETH */
-
-#ifdef CONFIG_DM_ETH
-
 static int macb_start(struct udevice *dev)
 {
 	return _macb_init(dev, dev->name);
@@ -1509,5 +1321,3 @@ U_BOOT_DRIVER(eth_macb) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 };
 #endif
-
-#endif
-- 
2.25.1

[PATCH 21/41] net: mcfmii: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/mcfmii.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index e2c8f41876e7..48dd558405c5 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -85,11 +85,7 @@ void mii_reset(fec_info_t *info)
 /* send command to phy using mii, wait for result */
 uint mii_send(uint mii_cmd)
 {
-#ifdef CONFIG_DM_ETH
 	struct udevice *dev;
-#else
-	struct eth_device *dev;
-#endif
 	fec_info_t *info;
 	volatile FEC_T *ep;
 	uint mii_reply;
@@ -97,11 +93,7 @@ uint mii_send(uint mii_cmd)
 
 	/* retrieve from register structure */
 	dev = eth_get_dev();
-#ifdef CONFIG_DM_ETH
 	info = dev_get_priv(dev);
-#else
-	info = dev->priv;
-#endif
 
 	ep = (FEC_T *) info->miibase;
 
@@ -202,11 +194,7 @@ int mii_discover_phy(fec_info_t *info)
 
 __weak void mii_init(void)
 {
-#ifdef CONFIG_DM_ETH
 	struct udevice *dev;
-#else
-	struct eth_device *dev;
-#endif
 	fec_info_t *info;
 	volatile FEC_T *fecp;
 	int miispd = 0, i = 0;
@@ -215,11 +203,7 @@ __weak void mii_init(void)
 
 	/* retrieve from register structure */
 	dev = eth_get_dev();
-#ifdef CONFIG_DM_ETH
 	info = dev_get_priv(dev);
-#else
-	info = dev->priv;
-#endif
 
 	fecp = (FEC_T *) info->miibase;
 
-- 
2.25.1

[PATCH 22/41] net: mvgbe: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/mvgbe.c | 214 +-------------------------------------------
 drivers/net/mvgbe.h |   8 --
 2 files changed, 2 insertions(+), 220 deletions(-)

diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index a77c05743262..58363fce0570 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -132,12 +132,7 @@ static int __mvgbe_mdio_read(struct mvgbe_device *dmvgbe, int phy_adr,
 static int smi_reg_read(struct mii_dev *bus, int phy_adr, int devad,
 			int reg_ofs)
 {
-#ifdef CONFIG_DM_ETH
 	struct mvgbe_device *dmvgbe = bus->priv;
-#else
-	struct eth_device *dev = eth_get_dev_by_name(bus->name);
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-#endif
 
 	return __mvgbe_mdio_read(dmvgbe, phy_adr, devad, reg_ofs);
 }
@@ -189,12 +184,7 @@ static int __mvgbe_mdio_write(struct mvgbe_device *dmvgbe, int phy_adr,
 static int smi_reg_write(struct mii_dev *bus, int phy_adr, int devad,
 			 int reg_ofs, u16 data)
 {
-#ifdef CONFIG_DM_ETH
 	struct mvgbe_device *dmvgbe = bus->priv;
-#else
-	struct eth_device *dev = eth_get_dev_by_name(bus->name);
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-#endif
 
 	return __mvgbe_mdio_write(dmvgbe, phy_adr, devad, reg_ofs, data);
 }
@@ -432,12 +422,6 @@ static int __mvgbe_init(struct mvgbe_device *dmvgbe, u8 *enetaddr,
 			const char *name)
 {
 	struct mvgbe_registers *regs = dmvgbe->regs;
-#if (defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) &&  \
-	!defined(CONFIG_PHYLIB) &&			 \
-	!defined(CONFIG_DM_ETH) &&			 \
-	defined(CONFIG_SYS_FAULT_ECHO_LINK_DOWN)
-	int i;
-#endif
 	/* setup RX rings */
 	mvgbe_init_rx_desc_ring(dmvgbe);
 
@@ -486,37 +470,9 @@ static int __mvgbe_init(struct mvgbe_device *dmvgbe, u8 *enetaddr,
 	/* Enable port Rx. */
 	MVGBE_REG_WR(regs->rqc, (1 << RXUQ));
 
-#if (defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) && \
-	!defined(CONFIG_PHYLIB) && \
-	!defined(CONFIG_DM_ETH) && \
-	defined(CONFIG_SYS_FAULT_ECHO_LINK_DOWN)
-	/* Wait up to 5s for the link status */
-	for (i = 0; i < 5; i++) {
-		u16 phyadr;
-
-		miiphy_read(name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, &phyadr);
-		/* Return if we get link up */
-		if (miiphy_link(name, phyadr))
-			return 0;
-		udelay(1000000);
-	}
-
-	printf("No link on %s\n", name);
-	return -1;
-#endif
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-static int mvgbe_init(struct eth_device *dev)
-{
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-
-	return __mvgbe_init(dmvgbe, dmvgbe->dev.enetaddr, dmvgbe->dev.name);
-}
-#endif
-
 static void __mvgbe_halt(struct mvgbe_device *dmvgbe)
 {
 	struct mvgbe_registers *regs = dmvgbe->regs;
@@ -542,18 +498,6 @@ static void __mvgbe_halt(struct mvgbe_device *dmvgbe)
 	MVGBE_REG_WR(regs->peim, 0);
 }
 
-#ifndef CONFIG_DM_ETH
-static int mvgbe_halt(struct eth_device *dev)
-{
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-
-	__mvgbe_halt(dmvgbe);
-
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int mvgbe_write_hwaddr(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -562,16 +506,6 @@ static int mvgbe_write_hwaddr(struct udevice *dev)
 
 	return 0;
 }
-#else
-static int mvgbe_write_hwaddr(struct eth_device *dev)
-{
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-
-	/* Programs net device MAC address after initialization */
-	port_uc_addr_set(dmvgbe, dmvgbe->dev.enetaddr);
-	return 0;
-}
-#endif
 
 static int __mvgbe_send(struct mvgbe_device *dmvgbe, void *dataptr,
 			int datasize)
@@ -628,15 +562,6 @@ static int __mvgbe_send(struct mvgbe_device *dmvgbe, void *dataptr,
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-static int mvgbe_send(struct eth_device *dev, void *dataptr, int datasize)
-{
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-
-	return __mvgbe_send(dmvgbe, dataptr, datasize);
-}
-#endif
-
 static int __mvgbe_recv(struct mvgbe_device *dmvgbe, uchar **packetp)
 {
 	struct mvgbe_rxdesc *p_rxdesc_curr = dmvgbe->p_rxdesc_curr;
@@ -710,35 +635,11 @@ static int __mvgbe_recv(struct mvgbe_device *dmvgbe, uchar **packetp)
 	return rx_bytes;
 }
 
-#ifndef CONFIG_DM_ETH
-static int mvgbe_recv(struct eth_device *dev)
-{
-	struct mvgbe_device *dmvgbe = to_mvgbe(dev);
-	uchar *packet;
-	int ret;
-
-	ret = __mvgbe_recv(dmvgbe, &packet);
-	if (ret < 0)
-		return ret;
-
-	net_process_received_packet(packet, ret);
-
-	return 0;
-}
-#endif
-
-#if defined(CONFIG_PHYLIB) || defined(CONFIG_DM_ETH)
-#if defined(CONFIG_DM_ETH)
+#if defined(CONFIG_PHYLIB)
 static struct phy_device *__mvgbe_phy_init(struct udevice *dev,
 					   struct mii_dev *bus,
 					   phy_interface_t phy_interface,
 					   int phyid)
-#else
-static struct phy_device *__mvgbe_phy_init(struct eth_device *dev,
-					   struct mii_dev *bus,
-					   phy_interface_t phy_interface,
-					   int phyid)
-#endif
 {
 	struct phy_device *phydev;
 
@@ -760,38 +661,7 @@ static struct phy_device *__mvgbe_phy_init(struct eth_device *dev,
 
 	return phydev;
 }
-#endif /* CONFIG_PHYLIB || CONFIG_DM_ETH */
-
-#if defined(CONFIG_PHYLIB) && !defined(CONFIG_DM_ETH)
-int mvgbe_phylib_init(struct eth_device *dev, int phyid)
-{
-	struct mii_dev *bus;
-	struct phy_device *phydev;
-	int ret;
-
-	bus = mdio_alloc();
-	if (!bus) {
-		printf("mdio_alloc failed\n");
-		return -ENOMEM;
-	}
-	bus->read = smi_reg_read;
-	bus->write = smi_reg_write;
-	strcpy(bus->name, dev->name);
-
-	ret = mdio_register(bus);
-	if (ret) {
-		printf("mdio_register failed\n");
-		free(bus);
-		return -ENOMEM;
-	}
-
-	phydev = __mvgbe_phy_init(dev, bus, PHY_INTERFACE_MODE_RGMII, phyid);
-	if (!phydev)
-		return -ENODEV;
-
-	return 0;
-}
-#endif
+#endif /* CONFIG_PHYLIB */
 
 static int mvgbe_alloc_buffers(struct mvgbe_device *dmvgbe)
 {
@@ -825,85 +695,6 @@ error1:
 	return -ENOMEM;
 }
 
-#ifndef CONFIG_DM_ETH
-int mvgbe_initialize(struct bd_info *bis)
-{
-	struct mvgbe_device *dmvgbe;
-	struct eth_device *dev;
-	int devnum;
-	int ret;
-	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
-
-	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
-		/*skip if port is configured not to use */
-		if (used_ports[devnum] == 0)
-			continue;
-
-		dmvgbe = malloc(sizeof(struct mvgbe_device));
-		if (!dmvgbe)
-			return -ENOMEM;
-
-		memset(dmvgbe, 0, sizeof(struct mvgbe_device));
-		ret = mvgbe_alloc_buffers(dmvgbe);
-		if (ret) {
-			printf("Err.. %s Failed to allocate memory\n",
-				__func__);
-			free(dmvgbe);
-			return ret;
-		}
-
-		dev = &dmvgbe->dev;
-
-		/* must be less than sizeof(dev->name) */
-		sprintf(dev->name, "egiga%d", devnum);
-
-		switch (devnum) {
-		case 0:
-			dmvgbe->regs = (void *)MVGBE0_BASE;
-			break;
-#if defined(MVGBE1_BASE)
-		case 1:
-			dmvgbe->regs = (void *)MVGBE1_BASE;
-			break;
-#endif
-		default:	/* this should never happen */
-			printf("Err..(%s) Invalid device number %d\n",
-				__func__, devnum);
-			return -1;
-		}
-
-		dev->init = (void *)mvgbe_init;
-		dev->halt = (void *)mvgbe_halt;
-		dev->send = (void *)mvgbe_send;
-		dev->recv = (void *)mvgbe_recv;
-		dev->write_hwaddr = (void *)mvgbe_write_hwaddr;
-
-		eth_register(dev);
-
-#if defined(CONFIG_PHYLIB)
-		mvgbe_phylib_init(dev, PHY_BASE_ADR + devnum);
-#elif defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-		int retval;
-		struct mii_dev *mdiodev = mdio_alloc();
-		if (!mdiodev)
-			return -ENOMEM;
-		strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
-		mdiodev->read = smi_reg_read;
-		mdiodev->write = smi_reg_write;
-
-		retval = mdio_register(mdiodev);
-		if (retval < 0)
-			return retval;
-		/* Set phy address of the port */
-		miiphy_write(dev->name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, PHY_BASE_ADR + devnum);
-#endif
-	}
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int mvgbe_port_is_fixed_link(struct mvgbe_device *dmvgbe)
 {
 	return dmvgbe->phyaddr > PHY_MAX_ADDR;
@@ -1046,4 +837,3 @@ U_BOOT_DRIVER(mvgbe) = {
 	.priv_auto	= sizeof(struct mvgbe_device),
 	.plat_auto	= sizeof(struct eth_pdata),
 };
-#endif /* CONFIG_DM_ETH */
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 44541c0a85e3..e3f5ac06399d 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -30,9 +30,6 @@
 #define RXUQ	0 /* Used Rx queue */
 #define TXUQ	0 /* Used Rx queue */
 
-#ifndef CONFIG_DM_ETH
-#define to_mvgbe(_d) container_of(_d, struct mvgbe_device, dev)
-#endif
 #define MVGBE_REG_WR(adr, val)		writel(val, &adr)
 #define MVGBE_REG_RD(adr)		readl(&adr)
 #define MVGBE_REG_BITS_RESET(adr, val)	writel(readl(&adr) & ~(val), &adr)
@@ -481,9 +478,6 @@ struct mvgbe_txdesc {
 
 /* port device data struct */
 struct mvgbe_device {
-#ifndef CONFIG_DM_ETH
-	struct eth_device dev;
-#endif
 	struct mvgbe_registers *regs;
 	struct mvgbe_txdesc *p_txdesc;
 	struct mvgbe_rxdesc *p_rxdesc;
@@ -491,7 +485,6 @@ struct mvgbe_device {
 	u8 *p_rxbuf;
 	u8 *p_aligned_txbuf;
 
-#ifdef CONFIG_DM_ETH
 	phy_interface_t phy_interface;
 	unsigned int link;
 	unsigned int duplex;
@@ -501,7 +494,6 @@ struct mvgbe_device {
 	int phyaddr;
 	struct phy_device *phydev;
 	struct mii_dev *bus;
-#endif
 };
 
 #endif /* __MVGBE_H__ */
-- 
2.25.1

[PATCH 23/41] net: netconsole: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/netconsole.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index cec96c571504..1e52917ff2c3 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -172,11 +172,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
 
 static void nc_send_packet(const char *buf, int len)
 {
-#ifdef CONFIG_DM_ETH
 	struct udevice *eth;
-#else
-	struct eth_device *eth;
-#endif
 	int inited = 0;
 	uchar *pkt;
 	uchar *ether;
@@ -298,11 +294,7 @@ static int nc_stdio_getc(struct stdio_dev *dev)
 
 static int nc_stdio_tstc(struct stdio_dev *dev)
 {
-#ifdef CONFIG_DM_ETH
 	struct udevice *eth;
-#else
-	struct eth_device *eth;
-#endif
 
 	if (input_recursion)
 		return 0;
-- 
2.25.1

[PATCH 24/41] net: pcnet: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/pcnet.c | 136 --------------------------------------------
 1 file changed, 136 deletions(-)

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 59ef10433495..a1f3c2bd290c 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -83,13 +83,8 @@ struct pcnet_priv {
 	/* Receive Buffer space */
 	unsigned char rx_buf[RX_RING_SIZE][PKT_BUF_SZ + 4];
 	struct pcnet_uncached_priv *uc;
-#ifdef CONFIG_DM_ETH
 	struct udevice *dev;
 	const char *name;
-#else
-	pci_dev_t dev;
-	char *name;
-#endif
 	void __iomem *iobase;
 	u8 *enetaddr;
 	u16 status;
@@ -142,11 +137,7 @@ static inline pci_addr_t pcnet_virt_to_mem(struct pcnet_priv *lp, void *addr)
 {
 	void *virt_addr = addr;
 
-#ifdef CONFIG_DM_ETH
 	return dm_pci_virt_to_mem(lp->dev, virt_addr);
-#else
-	return pci_virt_to_mem(lp->dev, virt_addr);
-#endif
 }
 
 static struct pci_device_id supported[] = {
@@ -457,132 +448,6 @@ static void pcnet_halt_common(struct pcnet_priv *lp)
 		printf("%s: TIMEOUT: controller reset failed\n", lp->name);
 }
 
-#ifndef CONFIG_DM_ETH
-static int pcnet_init(struct eth_device *dev, struct bd_info *bis)
-{
-	struct pcnet_priv *lp = dev->priv;
-
-	return pcnet_init_common(lp);
-}
-
-static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
-{
-	struct pcnet_priv *lp = dev->priv;
-
-	return pcnet_send_common(lp, packet, pkt_len);
-}
-
-static int pcnet_recv(struct eth_device *dev)
-{
-	struct pcnet_priv *lp = dev->priv;
-	uchar *packet;
-	int ret;
-
-	ret = pcnet_recv_common(lp, &packet);
-	if (ret > 0)
-		net_process_received_packet(packet, ret);
-	if (ret)
-		pcnet_free_pkt_common(lp, ret);
-
-	return ret;
-}
-
-static void pcnet_halt(struct eth_device *dev)
-{
-	struct pcnet_priv *lp = dev->priv;
-
-	pcnet_halt_common(lp);
-}
-
-int pcnet_initialize(struct bd_info *bis)
-{
-	pci_dev_t devbusfn;
-	struct eth_device *dev;
-	struct pcnet_priv *lp;
-	u16 command, status;
-	int dev_nr = 0;
-	u32 bar;
-
-	PCNET_DEBUG1("\n%s...\n", __func__);
-
-	for (dev_nr = 0; ; dev_nr++) {
-		/*
-		 * Find the PCnet PCI device(s).
-		 */
-		devbusfn = pci_find_devices(supported, dev_nr);
-		if (devbusfn < 0)
-			break;
-
-		/*
-		 * Allocate and pre-fill the device structure.
-		 */
-		dev = calloc(1, sizeof(*dev));
-		if (!dev) {
-			printf("pcnet: Can not allocate memory\n");
-			break;
-		}
-
-		/*
-		 * We only maintain one structure because the drivers will
-		 * never be used concurrently. In 32bit mode the RX and TX
-		 * ring entries must be aligned on 16-byte boundaries.
-		 */
-		lp = malloc_cache_aligned(sizeof(*lp));
-		lp->uc = map_physmem((phys_addr_t)&lp->ucp,
-				     sizeof(lp->ucp), MAP_NOCACHE);
-		lp->dev = devbusfn;
-		flush_dcache_range((unsigned long)lp,
-				   (unsigned long)lp + sizeof(*lp));
-		dev->priv = lp;
-		sprintf(dev->name, "pcnet#%d", dev_nr);
-		lp->name = dev->name;
-		lp->enetaddr = dev->enetaddr;
-
-		/*
-		 * Setup the PCI device.
-		 */
-		pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &bar);
-		lp->iobase = (void *)(pci_mem_to_phys(devbusfn, bar) & ~0xf);
-
-		PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%p: ",
-			     lp->name, devbusfn, lp->iobase);
-
-		command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
-		pci_write_config_word(devbusfn, PCI_COMMAND, command);
-		pci_read_config_word(devbusfn, PCI_COMMAND, &status);
-		if ((status & command) != command) {
-			printf("%s: Couldn't enable IO access or Bus Mastering\n",
-			       lp->name);
-			free(dev);
-			continue;
-		}
-
-		pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x40);
-
-		/*
-		 * Probe the PCnet chip.
-		 */
-		if (pcnet_probe_common(lp) < 0) {
-			free(dev);
-			continue;
-		}
-
-		/*
-		 * Setup device structure and register the driver.
-		 */
-		dev->init = pcnet_init;
-		dev->halt = pcnet_halt;
-		dev->send = pcnet_send;
-		dev->recv = pcnet_recv;
-
-		eth_register(dev);
-	}
-
-	udelay(10 * 1000);
-
-	return dev_nr;
-}
-#else /* DM_ETH */
 static int pcnet_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -695,4 +560,3 @@ U_BOOT_DRIVER(eth_pcnet) = {
 };
 
 U_BOOT_PCI_DEVICE(eth_pcnet, supported);
-#endif
-- 
2.25.1

[PATCH 25/41] net: phy: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/phy/aquantia.c       |  2 --
 drivers/net/phy/atheros.c        |  2 --
 drivers/net/phy/dp83867.c        | 14 -----------
 drivers/net/phy/dp83869.c        | 14 -----------
 drivers/net/phy/marvell.c        |  7 ------
 drivers/net/phy/micrel_ksz90x1.c | 18 --------------
 drivers/net/phy/phy.c            | 13 ----------
 include/phy.h                    | 41 --------------------------------
 8 files changed, 111 deletions(-)

diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 7e950fe0c2fe..db6becf929c6 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -338,7 +338,6 @@ static int aquantia_set_proto(struct phy_device *phydev,
 
 static int aquantia_dts_config(struct phy_device *phydev)
 {
-#ifdef CONFIG_DM_ETH
 	ofnode node = phydev->node;
 	u32 prop;
 	u16 reg;
@@ -374,7 +373,6 @@ static int aquantia_dts_config(struct phy_device *phydev)
 			  (u16)(prop << 1));
 	}
 
-#endif
 	return 0;
 }
 
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index fa1fe08518f4..c6f9f916459b 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -191,7 +191,6 @@ static int ar803x_regs_config(struct phy_device *phydev)
 
 static int ar803x_of_init(struct phy_device *phydev)
 {
-#if defined(CONFIG_DM_ETH)
 	struct ar803x_priv *priv;
 	ofnode node, vddio_reg_node;
 	u32 strength, freq, min_uV, max_uV;
@@ -306,7 +305,6 @@ static int ar803x_of_init(struct phy_device *phydev)
 
 	debug("%s: flags=%x clk_25m_reg=%04x clk_25m_mask=%04x\n", __func__,
 	      priv->flags, priv->clk_25m_reg, priv->clk_25m_mask);
-#endif
 
 	return 0;
 }
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 3d862636b6b2..a45152bddc97 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -144,7 +144,6 @@ static int dp83867_config_port_mirroring(struct phy_device *phydev)
 	return 0;
 }
 
-#if defined(CONFIG_DM_ETH)
 /**
  * dp83867_data_init - Convenience function for setting PHY specific data
  *
@@ -249,19 +248,6 @@ static int dp83867_of_init(struct phy_device *phydev)
 
 	return 0;
 }
-#else
-static int dp83867_of_init(struct phy_device *phydev)
-{
-	struct dp83867_private *dp83867 = phydev->priv;
-
-	dp83867->rx_id_delay = DP83867_RGMIIDCTL_2_25_NS;
-	dp83867->tx_id_delay = DP83867_RGMIIDCTL_2_75_NS;
-	dp83867->fifo_depth = DEFAULT_FIFO_DEPTH;
-	dp83867->io_impedance = -EINVAL;
-
-	return 0;
-}
-#endif
 
 static int dp83867_config(struct phy_device *phydev)
 {
diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c
index c9461185cfe8..23dbf42b68c6 100644
--- a/drivers/net/phy/dp83869.c
+++ b/drivers/net/phy/dp83869.c
@@ -157,7 +157,6 @@ static int dp83869_config_port_mirroring(struct phy_device *phydev)
 	return 0;
 }
 
-#ifdef CONFIG_DM_ETH
 static const int dp83869_internal_delay[] = {250, 500, 750, 1000, 1250, 1500,
 					     1750, 2000, 2250, 2500, 2750, 3000,
 					     3250, 3500, 3750, 4000};
@@ -269,19 +268,6 @@ static int dp83869_of_init(struct phy_device *phydev)
 
 	return 0;
 }
-#else
-static int dp83869_of_init(struct phy_device *phydev)
-{
-	struct dp83869_private *dp83869 = phydev->priv;
-
-	dp83869->rx_int_delay = DP83869_RGMIIDCTL_2_25_NS;
-	dp83869->tx_int_delay = DP83869_RGMIIDCTL_2_75_NS;
-	dp83869->fifo_depth = DEFAULT_FIFO_DEPTH;
-	dp83869->io_impedance = -EINVAL;
-
-	return 0;
-}
-#endif /* CONFIG_OF_MDIO */
 
 static int dp83869_configure_rgmii(struct phy_device *phydev,
 				   struct dp83869_private *dp83869)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 212a861596f6..1a25775eee62 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -104,7 +104,6 @@
 #define MIIM_88E151x_MODE_SGMII		1
 #define MIIM_88E151x_RESET_OFFS		15
 
-#if IS_ENABLED(CONFIG_DM_ETH)
 static int marvell_read_page(struct phy_device *phydev)
 {
 	return phy_read(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE);
@@ -179,12 +178,6 @@ static int marvell_of_reg_init(struct phy_device *phydev)
 err:
 	return marvell_write_page(phydev, saved_page);
 }
-#else
-static int marvell_of_reg_init(struct phy_device *phydev)
-{
-	return 0;
-}
-#endif /* CONFIG_DM_ETH */
 
 static int m88e1xxx_phy_extread(struct phy_device *phydev, int addr,
 				int devaddr, int regnum)
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index e5f578201f35..79ebdb5e82a0 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -68,7 +68,6 @@ static int ksz90xx_startup(struct phy_device *phydev)
 }
 
 /* Common OF config bits for KSZ9021 and KSZ9031 */
-#ifdef CONFIG_DM_ETH
 struct ksz90x1_reg_field {
 	const char	*name;
 	const u8	size;	/* Size of the bitfield, in bits */
@@ -211,23 +210,6 @@ static int ksz9031_center_flp_timing(struct phy_device *phydev)
 	return ret;
 }
 
-#else /* !CONFIG_DM_ETH */
-static int ksz9021_of_config(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static int ksz9031_of_config(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static int ksz9031_center_flp_timing(struct phy_device *phydev)
-{
-	return 0;
-}
-#endif
-
 /*
  * KSZ9021
  */
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 90876630533e..f971dc97de61 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -686,9 +686,7 @@ struct phy_device *phy_device_create(struct mii_dev *bus, int addr,
 	dev->link = 0;
 	dev->interface = PHY_INTERFACE_MODE_NA;
 
-#ifdef CONFIG_DM_ETH
 	dev->node = ofnode_null();
-#endif
 
 	dev->autoneg = AUTONEG_ENABLE;
 
@@ -919,13 +917,8 @@ struct phy_device *phy_find_by_mask(struct mii_dev *bus, uint phy_mask)
 	return get_phy_device_by_mask(bus, phy_mask);
 }
 
-#ifdef CONFIG_DM_ETH
 void phy_connect_dev(struct phy_device *phydev, struct udevice *dev,
 		     phy_interface_t interface)
-#else
-void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev,
-		     phy_interface_t interface)
-#endif
 {
 	/* Soft Reset the PHY */
 	phy_reset(phydev);
@@ -1008,15 +1001,9 @@ static struct phy_device *phy_connect_fixed(struct mii_dev *bus,
 }
 #endif
 
-#ifdef CONFIG_DM_ETH
 struct phy_device *phy_connect(struct mii_dev *bus, int addr,
 			       struct udevice *dev,
 			       phy_interface_t interface)
-#else
-struct phy_device *phy_connect(struct mii_dev *bus, int addr,
-			       struct eth_device *dev,
-			       phy_interface_t interface)
-#endif
 {
 	struct phy_device *phydev = NULL;
 	uint mask = (addr >= 0) ? (1 << addr) : 0xffffffff;
diff --git a/include/phy.h b/include/phy.h
index 0737c4e8f9ae..af74fe58a7fc 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -138,12 +138,8 @@ struct phy_device {
 	struct phy_driver *drv;
 	void *priv;
 
-#ifdef CONFIG_DM_ETH
 	struct udevice *dev;
 	ofnode node;
-#else
-	struct eth_device *dev;
-#endif
 
 	/* forced speed & duplex (no autoneg)
 	 * partner speed & duplex & pause (autoneg)
@@ -233,8 +229,6 @@ static inline struct phy_device *fixed_phy_create(ofnode node)
 
 #endif
 
-#ifdef CONFIG_DM_ETH
-
 /**
  * phy_connect_dev() - Associates the given pair of PHY and Ethernet devices
  * @phydev:	PHY device
@@ -293,41 +287,6 @@ static inline ofnode phy_get_ofnode(struct phy_device *phydev)
 	else
 		return dev_ofnode(phydev->dev);
 }
-#else
-
-/**
- * phy_connect_dev() - Associates the given pair of PHY and Ethernet devices
- * @phydev:	PHY device
- * @dev:	Ethernet device
- * @interface:	type of MAC-PHY interface
- */
-void phy_connect_dev(struct phy_device *phydev, struct eth_device *dev,
-		     phy_interface_t interface);
-
-/**
- * phy_connect() - Creates a PHY device for the Ethernet interface
- * Creates a PHY device for the PHY at the given address, if one doesn't exist
- * already, and associates it with the Ethernet device.
- * The function may be called with addr <= 0, in this case addr value is ignored
- * and the bus is scanned to detect a PHY.  Scanning should only be used if only
- * one PHY is expected to be present on the MDIO bus, otherwise it is undefined
- * which PHY is returned.
- *
- * @bus:	MII/MDIO bus that hosts the PHY
- * @addr:	PHY address on MDIO bus
- * @dev:	Ethernet device to associate to the PHY
- * @interface:	type of MAC-PHY interface
- * @return: pointer to phy_device if a PHY is found, or NULL otherwise
- */
-struct phy_device *phy_connect(struct mii_dev *bus, int addr,
-				struct eth_device *dev,
-				phy_interface_t interface);
-
-static inline ofnode phy_get_ofnode(struct phy_device *phydev)
-{
-	return ofnode_null();
-}
-#endif
 
 int phy_read(struct phy_device *phydev, int devad, int regnum);
 int phy_write(struct phy_device *phydev, int devad, int regnum, u16 val);
-- 
2.25.1

[PATCH 26/41] net: rtl8139: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/rtl8139.c | 112 ------------------------------------------
 1 file changed, 112 deletions(-)

diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index feeea930fbe8..106bc1c7ae79 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -97,13 +97,8 @@
 #define DEBUG_TX	0	/* set to 1 to enable debug code */
 #define DEBUG_RX	0	/* set to 1 to enable debug code */
 
-#ifdef CONFIG_DM_ETH
 #define bus_to_phys(devno, a)	dm_pci_mem_to_phys((devno), (a))
 #define phys_to_bus(devno, a)	dm_pci_phys_to_mem((devno), (a))
-#else
-#define bus_to_phys(devno, a)	pci_mem_to_phys((pci_dev_t)(devno), (a))
-#define phys_to_bus(devno, a)	pci_phys_to_mem((pci_dev_t)(devno), (a))
-#endif
 
 /* Symbolic offsets to registers. */
 /* Ethernet hardware address. */
@@ -198,12 +193,7 @@
 #define RTL_STS_RXSTATUSOK			BIT(0)
 
 struct rtl8139_priv {
-#ifndef CONFIG_DM_ETH
-	struct eth_device	dev;
-	pci_dev_t		devno;
-#else
 	struct udevice		*devno;
-#endif
 	unsigned int		rxstatus;
 	unsigned int		cur_rx;
 	unsigned int		cur_tx;
@@ -557,107 +547,6 @@ static struct pci_device_id supported[] = {
 	{ }
 };
 
-#ifndef CONFIG_DM_ETH
-static int rtl8139_bcast_addr(struct eth_device *dev, const u8 *bcast_mac,
-			      int join)
-{
-	return 0;
-}
-
-static int rtl8139_init(struct eth_device *dev, struct bd_info *bis)
-{
-	struct rtl8139_priv *priv = container_of(dev, struct rtl8139_priv, dev);
-
-	return rtl8139_init_common(priv);
-}
-
-static void rtl8139_stop(struct eth_device *dev)
-{
-	struct rtl8139_priv *priv = container_of(dev, struct rtl8139_priv, dev);
-
-	return rtl8139_stop_common(priv);
-}
-
-static int rtl8139_send(struct eth_device *dev, void *packet, int length)
-{
-	struct rtl8139_priv *priv = container_of(dev, struct rtl8139_priv, dev);
-
-	return rtl8139_send_common(priv, packet, length);
-}
-
-static int rtl8139_recv(struct eth_device *dev)
-{
-	struct rtl8139_priv *priv = container_of(dev, struct rtl8139_priv, dev);
-	unsigned char rxdata[RX_BUF_LEN];
-	uchar *packet;
-	int ret;
-
-	ret = rtl8139_recv_common(priv, rxdata, &packet);
-	if (ret) {
-		net_process_received_packet(packet, ret);
-		rtl8139_free_pkt_common(priv, ret);
-	}
-
-	return ret;
-}
-
-int rtl8139_initialize(struct bd_info *bis)
-{
-	struct rtl8139_priv *priv;
-	struct eth_device *dev;
-	int card_number = 0;
-	pci_dev_t devno;
-	int idx = 0;
-	u32 iobase;
-
-	while (1) {
-		/* Find RTL8139 */
-		devno = pci_find_devices(supported, idx++);
-		if (devno < 0)
-			break;
-
-		pci_read_config_dword(devno, PCI_BASE_ADDRESS_1, &iobase);
-		iobase &= ~0xf;
-
-		debug("rtl8139: REALTEK RTL8139 @0x%x\n", iobase);
-
-		priv = calloc(1, sizeof(*priv));
-		if (!priv) {
-			printf("Can not allocate memory of rtl8139\n");
-			break;
-		}
-
-		priv->devno = devno;
-		priv->ioaddr = (unsigned long)bus_to_phys(devno, iobase);
-
-		dev = &priv->dev;
-
-		rtl8139_name(dev->name, card_number);
-
-		dev->iobase = priv->ioaddr;	/* Non-DM compatibility */
-		dev->init = rtl8139_init;
-		dev->halt = rtl8139_stop;
-		dev->send = rtl8139_send;
-		dev->recv = rtl8139_recv;
-		dev->mcast = rtl8139_bcast_addr;
-
-		rtl8139_get_hwaddr(priv);
-
-		/* Non-DM compatibility */
-		memcpy(priv->dev.enetaddr, priv->enetaddr, 6);
-
-		eth_register(dev);
-
-		card_number++;
-
-		pci_write_config_byte(devno, PCI_LATENCY_TIMER, 0x20);
-
-		udelay(10 * 1000);
-	}
-
-	return card_number;
-}
-#else /* DM_ETH */
 static int rtl8139_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -776,4 +665,3 @@ U_BOOT_DRIVER(eth_rtl8139) = {
 };
 
 U_BOOT_PCI_DEVICE(eth_rtl8139, supported);
-#endif
-- 
2.25.1

[PATCH 27/41] net: rtl8169: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/rtl8169.c | 166 ------------------------------------------
 1 file changed, 166 deletions(-)

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index da2cfb7f550f..c9c07a5a8ffe 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -47,9 +47,6 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <net.h>
-#ifndef CONFIG_DM_ETH
-#include <netdev.h>
-#endif
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <pci.h>
@@ -514,13 +511,8 @@ static void rtl_flush_buffer(void *buf, size_t size)
 /**************************************************************************
 RECV - Receive a frame
 ***************************************************************************/
-#ifdef CONFIG_DM_ETH
 static int rtl_recv_common(struct udevice *dev, unsigned long dev_iobase,
 			   uchar **packetp)
-#else
-static int rtl_recv_common(pci_dev_t dev, unsigned long dev_iobase,
-			   uchar **packetp)
-#endif
 {
 	/* return true if there's an ethernet packet ready to read */
 	/* nic->packet should contain data on return */
@@ -551,22 +543,12 @@ static int rtl_recv_common(pci_dev_t dev, unsigned long dev_iobase,
 			else
 				tpc->RxDescArray[cur_rx].status =
 					cpu_to_le32(OWNbit + RX_BUF_SIZE);
-#ifdef CONFIG_DM_ETH
 			tpc->RxDescArray[cur_rx].buf_addr = cpu_to_le32(
 				dm_pci_mem_to_phys(dev,
 					(pci_addr_t)(unsigned long)
 					tpc->RxBufferRing[cur_rx]));
-#else
-			tpc->RxDescArray[cur_rx].buf_addr = cpu_to_le32(
-				pci_mem_to_phys(dev, (pci_addr_t)(unsigned long)
-				tpc->RxBufferRing[cur_rx]));
-#endif
 			rtl_flush_rx_desc(&tpc->RxDescArray[cur_rx]);
-#ifdef CONFIG_DM_ETH
 			*packetp = rxdata;
-#else
-			net_process_received_packet(rxdata, length);
-#endif
 		} else {
 			puts("Error Rx");
 			length = -EIO;
@@ -584,32 +566,19 @@ static int rtl_recv_common(pci_dev_t dev, unsigned long dev_iobase,
 	return (0);		/* initially as this is called to flush the input */
 }
 
-#ifdef CONFIG_DM_ETH
 int rtl8169_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 {
 	struct rtl8169_private *priv = dev_get_priv(dev);
 
 	return rtl_recv_common(dev, priv->iobase, packetp);
 }
-#else
-static int rtl_recv(struct eth_device *dev)
-{
-	return rtl_recv_common((pci_dev_t)(unsigned long)dev->priv,
-			       dev->iobase, NULL);
-}
-#endif /* nCONFIG_DM_ETH */
 
 #define HZ 1000
 /**************************************************************************
 SEND - Transmit a frame
 ***************************************************************************/
-#ifdef CONFIG_DM_ETH
 static int rtl_send_common(struct udevice *dev, unsigned long dev_iobase,
 			   void *packet, int length)
-#else
-static int rtl_send_common(pci_dev_t dev, unsigned long dev_iobase,
-			   void *packet, int length)
-#endif
 {
 	/* send the packet to destination */
 
@@ -637,13 +606,8 @@ static int rtl_send_common(pci_dev_t dev, unsigned long dev_iobase,
 	rtl_flush_buffer(ptxb, ALIGN(len, RTL8169_ALIGN));
 
 	tpc->TxDescArray[entry].buf_Haddr = 0;
-#ifdef CONFIG_DM_ETH
 	tpc->TxDescArray[entry].buf_addr = cpu_to_le32(
 		dm_pci_mem_to_phys(dev, (pci_addr_t)(unsigned long)ptxb));
-#else
-	tpc->TxDescArray[entry].buf_addr = cpu_to_le32(
-		pci_mem_to_phys(dev, (pci_addr_t)(unsigned long)ptxb));
-#endif
 	if (entry != (NUM_TX_DESC - 1)) {
 		tpc->TxDescArray[entry].status =
 			cpu_to_le32((OWNbit | FSbit | LSbit) |
@@ -680,7 +644,6 @@ static int rtl_send_common(pci_dev_t dev, unsigned long dev_iobase,
 	return ret;
 }
 
-#ifdef CONFIG_DM_ETH
 int rtl8169_eth_send(struct udevice *dev, void *packet, int length)
 {
 	struct rtl8169_private *priv = dev_get_priv(dev);
@@ -688,14 +651,6 @@ int rtl8169_eth_send(struct udevice *dev, void *packet, int length)
 	return rtl_send_common(dev, priv->iobase, packet, length);
 }
 
-#else
-static int rtl_send(struct eth_device *dev, void *packet, int length)
-{
-	return rtl_send_common((pci_dev_t)(unsigned long)dev->priv,
-			       dev->iobase, packet, length);
-}
-#endif
-
 static void rtl8169_set_rx_mode(void)
 {
 	u32 mc_filter[2];	/* Multicast hash filter */
@@ -719,11 +674,7 @@ static void rtl8169_set_rx_mode(void)
 	RTL_W32(MAR0 + 4, mc_filter[1]);
 }
 
-#ifdef CONFIG_DM_ETH
 static void rtl8169_hw_start(struct udevice *dev)
-#else
-static void rtl8169_hw_start(pci_dev_t dev)
-#endif
 {
 	u32 i;
 
@@ -768,21 +719,11 @@ static void rtl8169_hw_start(pci_dev_t dev)
 
 	tpc->cur_rx = 0;
 
-#ifdef CONFIG_DM_ETH
 	RTL_W32(TxDescStartAddrLow, dm_pci_mem_to_phys(dev,
 			(pci_addr_t)(unsigned long)tpc->TxDescArray));
-#else
-	RTL_W32(TxDescStartAddrLow, pci_mem_to_phys(dev,
-			(pci_addr_t)(unsigned long)tpc->TxDescArray));
-#endif
 	RTL_W32(TxDescStartAddrHigh, (unsigned long)0);
-#ifdef CONFIG_DM_ETH
 	RTL_W32(RxDescStartAddrLow, dm_pci_mem_to_phys(
 			dev, (pci_addr_t)(unsigned long)tpc->RxDescArray));
-#else
-	RTL_W32(RxDescStartAddrLow, pci_mem_to_phys(
-			dev, (pci_addr_t)(unsigned long)tpc->RxDescArray));
-#endif
 	RTL_W32(RxDescStartAddrHigh, (unsigned long)0);
 
 	/* RTL-8169sc/8110sc or later version */
@@ -804,11 +745,7 @@ static void rtl8169_hw_start(pci_dev_t dev)
 #endif
 }
 
-#ifdef CONFIG_DM_ETH
 static void rtl8169_init_ring(struct udevice *dev)
-#else
-static void rtl8169_init_ring(pci_dev_t dev)
-#endif
 {
 	int i;
 
@@ -836,13 +773,8 @@ static void rtl8169_init_ring(pci_dev_t dev)
 				cpu_to_le32(OWNbit + RX_BUF_SIZE);
 
 		tpc->RxBufferRing[i] = &rxb[i * RX_BUF_SIZE];
-#ifdef CONFIG_DM_ETH
 		tpc->RxDescArray[i].buf_addr = cpu_to_le32(dm_pci_mem_to_phys(
 			dev, (pci_addr_t)(unsigned long)tpc->RxBufferRing[i]));
-#else
-		tpc->RxDescArray[i].buf_addr = cpu_to_le32(pci_mem_to_phys(
-			dev, (pci_addr_t)(unsigned long)tpc->RxBufferRing[i]));
-#endif
 		rtl_flush_rx_desc(&tpc->RxDescArray[i]);
 	}
 
@@ -851,13 +783,8 @@ static void rtl8169_init_ring(pci_dev_t dev)
 #endif
 }
 
-#ifdef CONFIG_DM_ETH
 static void rtl8169_common_start(struct udevice *dev, unsigned char *enetaddr,
 				 unsigned long dev_iobase)
-#else
-static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr,
-				 unsigned long dev_iobase)
-#endif
 {
 	int i;
 
@@ -887,7 +814,6 @@ static void rtl8169_common_start(pci_dev_t dev, unsigned char *enetaddr,
 #endif
 }
 
-#ifdef CONFIG_DM_ETH
 static int rtl8169_eth_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -897,18 +823,6 @@ static int rtl8169_eth_start(struct udevice *dev)
 
 	return 0;
 }
-#else
-/**************************************************************************
-RESET - Finish setting up the ethernet interface
-***************************************************************************/
-static int rtl_reset(struct eth_device *dev, struct bd_info *bis)
-{
-	rtl8169_common_start((pci_dev_t)(unsigned long)dev->priv,
-			     dev->enetaddr, dev->iobase);
-
-	return 0;
-}
-#endif /* nCONFIG_DM_ETH */
 
 static void rtl_halt_common(unsigned long dev_iobase)
 {
@@ -933,24 +847,13 @@ static void rtl_halt_common(unsigned long dev_iobase)
 	}
 }
 
-#ifdef CONFIG_DM_ETH
 void rtl8169_eth_stop(struct udevice *dev)
 {
 	struct rtl8169_private *priv = dev_get_priv(dev);
 
 	rtl_halt_common(priv->iobase);
 }
-#else
-/**************************************************************************
-HALT - Turn off ethernet interface
-***************************************************************************/
-static void rtl_halt(struct eth_device *dev)
-{
-	rtl_halt_common(dev->iobase);
-}
-#endif
 
-#ifdef CONFIG_DM_ETH
 static int rtl8169_write_hwaddr(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -965,7 +868,6 @@ static int rtl8169_write_hwaddr(struct udevice *dev)
 
 	return 0;
 }
-#endif
 
 /**************************************************************************
 INIT - Look for an adapter, this routine's visible to the outside
@@ -1118,73 +1020,6 @@ static int rtl_init(unsigned long dev_ioaddr, const char *name,
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-int rtl8169_initialize(struct bd_info *bis)
-{
-	pci_dev_t devno;
-	int card_number = 0;
-	struct eth_device *dev;
-	u32 iobase;
-	int idx=0;
-
-	while(1){
-		unsigned int region;
-		u16 device;
-		int err;
-
-		/* Find RTL8169 */
-		if ((devno = pci_find_devices(supported, idx++)) < 0)
-			break;
-
-		pci_read_config_word(devno, PCI_DEVICE_ID, &device);
-		switch (device) {
-		case 0x8168:
-			region = 2;
-			break;
-
-		default:
-			region = 1;
-			break;
-		}
-
-		pci_read_config_dword(devno, PCI_BASE_ADDRESS_0 + (region * 4), &iobase);
-		iobase &= ~0xf;
-
-		debug ("rtl8169: REALTEK RTL8169 @0x%x\n", iobase);
-
-		dev = (struct eth_device *)malloc(sizeof *dev);
-		if (!dev) {
-			printf("Can not allocate memory of rtl8169\n");
-			break;
-		}
-
-		memset(dev, 0, sizeof(*dev));
-		sprintf (dev->name, "RTL8169#%d", card_number);
-
-		dev->priv = (void *)(unsigned long)devno;
-		dev->iobase = (int)pci_mem_to_phys(devno, iobase);
-
-		dev->init = rtl_reset;
-		dev->halt = rtl_halt;
-		dev->send = rtl_send;
-		dev->recv = rtl_recv;
-
-		err = rtl_init(dev->iobase, dev->name, dev->enetaddr);
-		if (err < 0) {
-			printf(pr_fmt("failed to initialize card: %d\n"), err);
-			free(dev);
-			continue;
-		}
-
-		eth_register (dev);
-
-		card_number++;
-	}
-	return card_number;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int rtl8169_eth_probe(struct udevice *dev)
 {
 	struct pci_child_plat *pplat = dev_get_parent_plat(dev);
@@ -1253,4 +1088,3 @@ U_BOOT_DRIVER(eth_rtl8169) = {
 };
 
 U_BOOT_PCI_DEVICE(eth_rtl8169, supported);
-#endif
-- 
2.25.1

[PATCH 28/41] net: sh_eth: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sh_eth.c | 160 -------------------------------------------
 1 file changed, 160 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 1de3ff8add2c..0c584a23b97e 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -23,12 +23,10 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_DM_ETH
 #include <clk.h>
 #include <dm.h>
 #include <linux/mii.h>
 #include <asm/gpio.h>
-#endif
 
 #include "sh_eth.h"
 
@@ -526,163 +524,6 @@ static int sh_eth_start_common(struct sh_eth_dev *eth)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth)
-{
-	int ret = 0;
-	struct sh_eth_info *port_info = &eth->port_info[eth->port];
-	struct eth_device *dev = port_info->dev;
-	struct phy_device *phydev;
-
-	phydev = phy_connect(
-			miiphy_get_dev_by_name(dev->name),
-			port_info->phy_addr, dev, CONFIG_SH_ETHER_PHY_MODE);
-	port_info->phydev = phydev;
-	phy_config(phydev);
-
-	return ret;
-}
-
-static int sh_eth_send_legacy(struct eth_device *dev, void *packet, int len)
-{
-	struct sh_eth_dev *eth = dev->priv;
-
-	return sh_eth_send_common(eth, packet, len);
-}
-
-static int sh_eth_recv_common(struct sh_eth_dev *eth)
-{
-	int len = 0;
-	struct sh_eth_info *port_info = &eth->port_info[eth->port];
-	uchar *packet = (uchar *)ADDR_TO_P2(port_info->rx_desc_cur->rd2);
-
-	len = sh_eth_recv_start(eth);
-	if (len > 0) {
-		invalidate_cache(packet, len);
-		net_process_received_packet(packet, len);
-		sh_eth_recv_finish(eth);
-	} else
-		len = 0;
-
-	/* Restart the receiver if disabled */
-	if (!(sh_eth_read(port_info, EDRRR) & EDRRR_R))
-		sh_eth_write(port_info, EDRRR_R, EDRRR);
-
-	return len;
-}
-
-static int sh_eth_recv_legacy(struct eth_device *dev)
-{
-	struct sh_eth_dev *eth = dev->priv;
-
-	return sh_eth_recv_common(eth);
-}
-
-static int sh_eth_init_legacy(struct eth_device *dev, struct bd_info *bd)
-{
-	struct sh_eth_dev *eth = dev->priv;
-	int ret;
-
-	ret = sh_eth_init_common(eth, dev->enetaddr);
-	if (ret)
-		return ret;
-
-	ret = sh_eth_phy_config_legacy(eth);
-	if (ret) {
-		printf(SHETHER_NAME ": phy config timeout\n");
-		goto err_start;
-	}
-
-	ret = sh_eth_start_common(eth);
-	if (ret)
-		goto err_start;
-
-	return 0;
-
-err_start:
-	sh_eth_tx_desc_free(eth);
-	sh_eth_rx_desc_free(eth);
-	return ret;
-}
-
-void sh_eth_halt_legacy(struct eth_device *dev)
-{
-	struct sh_eth_dev *eth = dev->priv;
-
-	sh_eth_stop(eth);
-}
-
-int sh_eth_initialize(struct bd_info *bd)
-{
-	int ret = 0;
-	struct sh_eth_dev *eth = NULL;
-	struct eth_device *dev = NULL;
-	struct mii_dev *mdiodev;
-
-	eth = (struct sh_eth_dev *)malloc(sizeof(struct sh_eth_dev));
-	if (!eth) {
-		printf(SHETHER_NAME ": %s: malloc failed\n", __func__);
-		ret = -ENOMEM;
-		goto err;
-	}
-
-	dev = (struct eth_device *)malloc(sizeof(struct eth_device));
-	if (!dev) {
-		printf(SHETHER_NAME ": %s: malloc failed\n", __func__);
-		ret = -ENOMEM;
-		goto err;
-	}
-	memset(dev, 0, sizeof(struct eth_device));
-	memset(eth, 0, sizeof(struct sh_eth_dev));
-
-	eth->port = CONFIG_SH_ETHER_USE_PORT;
-	eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
-	eth->port_info[eth->port].iobase =
-		(void __iomem *)(BASE_IO_ADDR + 0x800 * eth->port);
-
-	dev->priv = (void *)eth;
-	dev->iobase = 0;
-	dev->init = sh_eth_init_legacy;
-	dev->halt = sh_eth_halt_legacy;
-	dev->send = sh_eth_send_legacy;
-	dev->recv = sh_eth_recv_legacy;
-	eth->port_info[eth->port].dev = dev;
-
-	strcpy(dev->name, SHETHER_NAME);
-
-	/* Register Device to EtherNet subsystem  */
-	eth_register(dev);
-
-	bb_miiphy_buses[0].priv = eth;
-	mdiodev = mdio_alloc();
-	if (!mdiodev)
-		return -ENOMEM;
-	strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
-	mdiodev->read = bb_miiphy_read;
-	mdiodev->write = bb_miiphy_write;
-
-	ret = mdio_register(mdiodev);
-	if (ret < 0)
-		return ret;
-
-	if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr))
-		puts("Please set MAC address\n");
-
-	return ret;
-
-err:
-	if (dev)
-		free(dev);
-
-	if (eth)
-		free(eth);
-
-	printf(SHETHER_NAME ": Failed\n");
-	return ret;
-}
-
-#else /* CONFIG_DM_ETH */
-
 struct sh_ether_priv {
 	struct sh_eth_dev	shdev;
 
@@ -955,7 +796,6 @@ U_BOOT_DRIVER(eth_sh_ether) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
 
 /******* for bb_miiphy *******/
 static int sh_eth_bb_init(struct bb_miiphy_bus *bus)
-- 
2.25.1

[PATCH 29/41] net: smc911x: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/smc911x.c | 147 ------------------------------------------
 1 file changed, 147 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 5d9a73f23d75..5c5ad8b84a98 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -22,9 +22,6 @@ struct chip_id {
 };
 
 struct smc911x_priv {
-#ifndef CONFIG_DM_ETH
-	struct eth_device	dev;
-#endif
 	phys_addr_t		iobase;
 	const struct chip_id	*chipid;
 	unsigned char		enetaddr[6];
@@ -382,149 +379,6 @@ static int smc911x_recv_common(struct smc911x_priv *priv, u32 *data)
 	return pktlen;
 }
 
-#ifndef CONFIG_DM_ETH
-
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-/* wrapper for smc911x_eth_phy_read */
-static int smc911x_miiphy_read(struct mii_dev *bus, int phy, int devad,
-			       int reg)
-{
-	struct eth_device *dev = eth_get_dev_by_name(bus->name);
-	struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
-	u16 val = 0;
-	int ret;
-
-	if (!dev || !priv)
-		return -ENODEV;
-
-	ret = smc911x_eth_phy_read(priv, phy, reg, &val);
-	if (ret < 0)
-		return ret;
-
-	return val;
-}
-
-/* wrapper for smc911x_eth_phy_write */
-static int smc911x_miiphy_write(struct mii_dev *bus, int phy, int devad,
-				int reg, u16 val)
-{
-	struct eth_device *dev = eth_get_dev_by_name(bus->name);
-	struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
-
-	if (!dev || !priv)
-		return -ENODEV;
-
-	return smc911x_eth_phy_write(priv, phy, reg, val);
-}
-
-static int smc911x_initialize_mii(struct smc911x_priv *priv)
-{
-	struct mii_dev *mdiodev = mdio_alloc();
-	int ret;
-
-	if (!mdiodev)
-		return -ENOMEM;
-
-	strlcpy(mdiodev->name, priv->dev.name, MDIO_NAME_LEN);
-	mdiodev->read = smc911x_miiphy_read;
-	mdiodev->write = smc911x_miiphy_write;
-
-	ret = mdio_register(mdiodev);
-	if (ret < 0) {
-		mdio_free(mdiodev);
-		return ret;
-	}
-
-	return 0;
-}
-#else
-static int smc911x_initialize_mii(struct smc911x_priv *priv)
-{
-	return 0;
-}
-#endif
-
-static int smc911x_init(struct eth_device *dev, struct bd_info *bd)
-{
-	struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
-
-	return smc911x_init_common(priv);
-}
-
-static void smc911x_halt(struct eth_device *dev)
-{
-	struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
-
-	smc911x_halt_common(priv);
-}
-
-static int smc911x_send(struct eth_device *dev, void *packet, int length)
-{
-	struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
-
-	return smc911x_send_common(priv, packet, length);
-}
-
-static int smc911x_recv(struct eth_device *dev)
-{
-	struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);
-	u32 *data = (u32 *)net_rx_packets[0];
-	int ret;
-
-	ret = smc911x_recv_common(priv, data);
-	if (ret)
-		net_process_received_packet(net_rx_packets[0], ret);
-
-	return ret;
-}
-
-int smc911x_initialize(u8 dev_num, phys_addr_t base_addr)
-{
-	struct smc911x_priv *priv;
-	int ret;
-
-	priv = calloc(1, sizeof(*priv));
-	if (!priv)
-		return -ENOMEM;
-
-	priv->iobase = base_addr;
-	priv->dev.iobase = base_addr;
-
-	priv->use_32_bit_io = CONFIG_IS_ENABLED(SMC911X_32_BIT);
-
-	/* Try to detect chip. Will fail if not present. */
-	ret = smc911x_detect_chip(priv);
-	if (ret) {
-		ret = 0;	/* Card not detected is not an error */
-		goto err_detect;
-	}
-
-	if (smc911x_read_mac_address(priv))
-		memcpy(priv->dev.enetaddr, priv->enetaddr, 6);
-
-	priv->dev.init = smc911x_init;
-	priv->dev.halt = smc911x_halt;
-	priv->dev.send = smc911x_send;
-	priv->dev.recv = smc911x_recv;
-	sprintf(priv->dev.name, "%s-%hu", DRIVERNAME, dev_num);
-
-	eth_register(&priv->dev);
-
-	ret = smc911x_initialize_mii(priv);
-	if (ret)
-		goto err_mii;
-
-	return 1;
-
-err_mii:
-	eth_unregister(&priv->dev);
-err_detect:
-	free(priv);
-	return ret;
-}
-
-#else	/* ifdef CONFIG_DM_ETH */
-
 static int smc911x_start(struct udevice *dev)
 {
 	struct eth_pdata *plat = dev_get_plat(dev);
@@ -642,4 +496,3 @@ U_BOOT_DRIVER(smc911x) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags		= DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif
-- 
2.25.1

[PATCH 30/41] net: sunxi_emac: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sunxi_emac.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 8625e49dae4d..ad9e1abd161e 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -164,9 +164,7 @@ struct emac_eth_dev {
 	struct mii_dev *bus;
 	struct phy_device *phydev;
 	int link_printed;
-#ifdef CONFIG_DM_ETH
 	uchar rx_buf[EMAC_RX_BUFSIZE];
-#endif
 };
 
 struct emac_rxhdr {
-- 
2.25.1

[PATCH 31/41] net: cpsw: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/cpsw.c | 96 -------------------------------------------
 1 file changed, 96 deletions(-)

diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index 41cba7930d13..a19dc38e5251 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -200,11 +200,7 @@ struct cpdma_chan {
 				((priv)->data)->slaves; slave++)
 
 struct cpsw_priv {
-#ifdef CONFIG_DM_ETH
 	struct udevice			*dev;
-#else
-	struct eth_device		*dev;
-#endif
 	struct cpsw_platform_data	*data;
 	int				host_port;
 
@@ -455,15 +451,10 @@ static inline void setbit_and_wait_for_clear32(void *addr)
 static void cpsw_set_slave_mac(struct cpsw_slave *slave,
 			       struct cpsw_priv *priv)
 {
-#ifdef CONFIG_DM_ETH
 	struct eth_pdata *pdata = dev_get_plat(priv->dev);
 
 	writel(mac_hi(pdata->enetaddr), &slave->regs->sa_hi);
 	writel(mac_lo(pdata->enetaddr), &slave->regs->sa_lo);
-#else
-	__raw_writel(mac_hi(priv->dev->enetaddr), &slave->regs->sa_hi);
-	__raw_writel(mac_lo(priv->dev->enetaddr), &slave->regs->sa_lo);
-#endif
 }
 
 static int cpsw_slave_update_link(struct cpsw_slave *slave,
@@ -856,21 +847,13 @@ static int cpsw_phy_init(struct cpsw_priv *priv, struct cpsw_slave *slave)
 		ret = phy_set_supported(phydev, slave->data->max_speed);
 		if (ret)
 			return ret;
-#if CONFIG_IS_ENABLED(DM_ETH)
 		dev_dbg(priv->dev, "Port %u speed forced to %uMbit\n",
 			slave->slave_num + 1, slave->data->max_speed);
-#else
-		log_debug("%s: Port %u speed forced to %uMbit\n",
-			  priv->dev->name, slave->slave_num + 1,
-			  slave->data->max_speed);
-#endif
 	}
 	phydev->advertising = phydev->supported;
 
-#ifdef CONFIG_DM_ETH
 	if (ofnode_valid(slave->data->phy_of_handle))
 		phydev->node = slave->data->phy_of_handle;
-#endif
 
 	priv->phydev = phydev;
 	phy_config(phydev);
@@ -935,84 +918,6 @@ int _cpsw_register(struct cpsw_priv *priv)
 	return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-static int cpsw_init(struct eth_device *dev, struct bd_info *bis)
-{
-	struct cpsw_priv	*priv = dev->priv;
-
-	return _cpsw_init(priv, dev->enetaddr);
-}
-
-static void cpsw_halt(struct eth_device *dev)
-{
-	struct cpsw_priv *priv = dev->priv;
-
-	return _cpsw_halt(priv);
-}
-
-static int cpsw_send(struct eth_device *dev, void *packet, int length)
-{
-	struct cpsw_priv	*priv = dev->priv;
-
-	return _cpsw_send(priv, packet, length);
-}
-
-static int cpsw_recv(struct eth_device *dev)
-{
-	struct cpsw_priv *priv = dev->priv;
-	uchar *pkt = NULL;
-	int len;
-
-	len = _cpsw_recv(priv, &pkt);
-
-	if (len > 0) {
-		net_process_received_packet(pkt, len);
-		cpdma_submit(priv, &priv->rx_chan, pkt, PKTSIZE);
-	}
-
-	return len;
-}
-
-int cpsw_register(struct cpsw_platform_data *data)
-{
-	struct cpsw_priv	*priv;
-	struct eth_device	*dev;
-	int ret;
-
-	dev = calloc(sizeof(*dev), 1);
-	if (!dev)
-		return -ENOMEM;
-
-	priv = calloc(sizeof(*priv), 1);
-	if (!priv) {
-		free(dev);
-		return -ENOMEM;
-	}
-
-	priv->dev = dev;
-	priv->data = data;
-
-	strcpy(dev->name, "cpsw");
-	dev->iobase	= 0;
-	dev->init	= cpsw_init;
-	dev->halt	= cpsw_halt;
-	dev->send	= cpsw_send;
-	dev->recv	= cpsw_recv;
-	dev->priv	= priv;
-
-	eth_register(dev);
-
-	ret = _cpsw_register(priv);
-	if (ret < 0) {
-		eth_unregister(dev);
-		free(dev);
-		free(priv);
-		return ret;
-	}
-
-	return 1;
-}
-#else
 static int cpsw_eth_start(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -1380,4 +1285,3 @@ U_BOOT_DRIVER(eth_cpsw) = {
 	.priv_auto	= sizeof(struct cpsw_priv),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_PRE_RELOC,
 };
-#endif /* CONFIG_DM_ETH */
-- 
2.25.1

[PATCH 32/41] net: keystone_net: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to
remove the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 1bdbd599d7b4..679a0450f1d5 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -592,10 +592,8 @@ static int ks2_eth_probe(struct udevice *dev)
 	if (priv->has_mdio) {
 		priv->phydev = phy_connect(priv->mdio_bus, priv->phy_addr,
 					   dev, priv->phy_if);
-#ifdef CONFIG_DM_ETH
-	if (ofnode_valid(priv->phy_ofnode))
-		priv->phydev->node = priv->phy_ofnode;
-#endif
+		if (ofnode_valid(priv->phy_ofnode))
+			priv->phydev->node = priv->phy_ofnode;
 		phy_config(priv->phydev);
 	}
 
-- 
2.25.1

[PATCH 33/41] usb: eth: asix: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/eth/asix.c | 255 -----------------------------------------
 1 file changed, 255 deletions(-)

diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c
index 674f78e214dc..26dd312b7d06 100644
--- a/drivers/usb/eth/asix.c
+++ b/drivers/usb/eth/asix.c
@@ -101,16 +101,9 @@
 /* driver private */
 struct asix_private {
 	int flags;
-#ifdef CONFIG_DM_ETH
 	struct ueth_data ueth;
-#endif
 };
 
-#ifndef CONFIG_DM_ETH
-/* local vars */
-static int curr_eth_dev; /* index for name of next device detected */
-#endif
-
 /*
  * Asix infrastructure commands
  */
@@ -494,253 +487,6 @@ static int asix_send_common(struct ueth_data *dev, void *packet, int length)
 	return err;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * Asix callbacks
- */
-static int asix_init(struct eth_device *eth, struct bd_info *bd)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	return asix_init_common(dev, eth->enetaddr);
-}
-
-static int asix_send(struct eth_device *eth, void *packet, int length)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	return asix_send_common(dev, packet, length);
-}
-
-static int asix_recv(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, recv_buf, AX_RX_URB_SIZE);
-	unsigned char *buf_ptr;
-	int err;
-	int actual_len;
-	u32 packet_len;
-
-	debug("** %s()\n", __func__);
-
-	err = usb_bulk_msg(dev->pusb_dev,
-				usb_rcvbulkpipe(dev->pusb_dev, dev->ep_in),
-				(void *)recv_buf,
-				AX_RX_URB_SIZE,
-				&actual_len,
-				USB_BULK_RECV_TIMEOUT);
-	debug("Rx: len = %u, actual = %u, err = %d\n", AX_RX_URB_SIZE,
-		actual_len, err);
-	if (err != 0) {
-		debug("Rx: failed to receive\n");
-		return -1;
-	}
-	if (actual_len > AX_RX_URB_SIZE) {
-		debug("Rx: received too many bytes %d\n", actual_len);
-		return -1;
-	}
-
-	buf_ptr = recv_buf;
-	while (actual_len > 0) {
-		/*
-		 * 1st 4 bytes contain the length of the actual data as two
-		 * complementary 16-bit words. Extract the length of the data.
-		 */
-		if (actual_len < sizeof(packet_len)) {
-			debug("Rx: incomplete packet length\n");
-			return -1;
-		}
-		memcpy(&packet_len, buf_ptr, sizeof(packet_len));
-		le32_to_cpus(&packet_len);
-		if (((~packet_len >> 16) & 0x7ff) != (packet_len & 0x7ff)) {
-			debug("Rx: malformed packet length: %#x (%#x:%#x)\n",
-			      packet_len, (~packet_len >> 16) & 0x7ff,
-			      packet_len & 0x7ff);
-			return -1;
-		}
-		packet_len = packet_len & 0x7ff;
-		if (packet_len > actual_len - sizeof(packet_len)) {
-			debug("Rx: too large packet: %d\n", packet_len);
-			return -1;
-		}
-
-		/* Notify net stack */
-		net_process_received_packet(buf_ptr + sizeof(packet_len),
-					    packet_len);
-
-		/* Adjust for next iteration. Packets are padded to 16-bits */
-		if (packet_len & 1)
-			packet_len++;
-		actual_len -= sizeof(packet_len) + packet_len;
-		buf_ptr += sizeof(packet_len) + packet_len;
-	}
-
-	return err;
-}
-
-static void asix_halt(struct eth_device *eth)
-{
-	debug("** %s()\n", __func__);
-}
-
-static int asix_write_hwaddr(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	return asix_write_hwaddr_common(dev, eth->enetaddr);
-}
-
-/*
- * Asix probing functions
- */
-void asix_eth_before_probe(void)
-{
-	curr_eth_dev = 0;
-}
-
-struct asix_dongle {
-	unsigned short vendor;
-	unsigned short product;
-	int flags;
-};
-
-static const struct asix_dongle asix_dongles[] = {
-	{ 0x05ac, 0x1402, FLAG_TYPE_AX88772 },	/* Apple USB Ethernet Adapter */
-	{ 0x07d1, 0x3c05, FLAG_TYPE_AX88772 },	/* D-Link DUB-E100 H/W Ver B1 */
-	{ 0x2001, 0x1a02, FLAG_TYPE_AX88772 },	/* D-Link DUB-E100 H/W Ver C1 */
-	/* Cables-to-Go USB Ethernet Adapter */
-	{ 0x0b95, 0x772a, FLAG_TYPE_AX88772 },
-	{ 0x0b95, 0x7720, FLAG_TYPE_AX88772 },	/* Trendnet TU2-ET100 V3.0R */
-	{ 0x0b95, 0x1720, FLAG_TYPE_AX88172 },	/* SMC */
-	{ 0x0db0, 0xa877, FLAG_TYPE_AX88772 },	/* MSI - ASIX 88772a */
-	{ 0x13b1, 0x0018, FLAG_TYPE_AX88172 },	/* Linksys 200M v2.1 */
-	{ 0x1557, 0x7720, FLAG_TYPE_AX88772 },	/* 0Q0 cable ethernet */
-	/* DLink DUB-E100 H/W Ver B1 Alternate */
-	{ 0x2001, 0x3c05, FLAG_TYPE_AX88772 },
-	/* ASIX 88772B */
-	{ 0x0b95, 0x772b, FLAG_TYPE_AX88772B | FLAG_EEPROM_MAC },
-	{ 0x0b95, 0x7e2b, FLAG_TYPE_AX88772B },
-	{ 0x0000, 0x0000, FLAG_NONE }	/* END - Do not remove */
-};
-
-/* Probe to see if a new device is actually an asix device */
-int asix_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss)
-{
-	struct usb_interface *iface;
-	struct usb_interface_descriptor *iface_desc;
-	int ep_in_found = 0, ep_out_found = 0;
-	int i;
-
-	/* let's examine the device now */
-	iface = &dev->config.if_desc[ifnum];
-	iface_desc = &dev->config.if_desc[ifnum].desc;
-
-	for (i = 0; asix_dongles[i].vendor != 0; i++) {
-		if (dev->descriptor.idVendor == asix_dongles[i].vendor &&
-		    dev->descriptor.idProduct == asix_dongles[i].product)
-			/* Found a supported dongle */
-			break;
-	}
-
-	if (asix_dongles[i].vendor == 0)
-		return 0;
-
-	memset(ss, 0, sizeof(struct ueth_data));
-
-	/* At this point, we know we've got a live one */
-	debug("\n\nUSB Ethernet device detected: %#04x:%#04x\n",
-	      dev->descriptor.idVendor, dev->descriptor.idProduct);
-
-	/* Initialize the ueth_data structure with some useful info */
-	ss->ifnum = ifnum;
-	ss->pusb_dev = dev;
-	ss->subclass = iface_desc->bInterfaceSubClass;
-	ss->protocol = iface_desc->bInterfaceProtocol;
-
-	/* alloc driver private */
-	ss->dev_priv = calloc(1, sizeof(struct asix_private));
-	if (!ss->dev_priv)
-		return 0;
-
-	((struct asix_private *)ss->dev_priv)->flags = asix_dongles[i].flags;
-
-	/*
-	 * We are expecting a minimum of 3 endpoints - in, out (bulk), and
-	 * int. We will ignore any others.
-	 */
-	for (i = 0; i < iface_desc->bNumEndpoints; i++) {
-		/* is it an BULK endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		     USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
-			u8 ep_addr = iface->ep_desc[i].bEndpointAddress;
-			if (ep_addr & USB_DIR_IN) {
-				if (!ep_in_found) {
-					ss->ep_in = ep_addr &
-						USB_ENDPOINT_NUMBER_MASK;
-					ep_in_found = 1;
-				}
-			} else {
-				if (!ep_out_found) {
-					ss->ep_out = ep_addr &
-						USB_ENDPOINT_NUMBER_MASK;
-					ep_out_found = 1;
-				}
-			}
-		}
-
-		/* is it an interrupt endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		    USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) {
-			ss->ep_int = iface->ep_desc[i].bEndpointAddress &
-				USB_ENDPOINT_NUMBER_MASK;
-			ss->irqinterval = iface->ep_desc[i].bInterval;
-		}
-	}
-	debug("Endpoints In %d Out %d Int %d\n",
-		  ss->ep_in, ss->ep_out, ss->ep_int);
-
-	/* Do some basic sanity checks, and bail if we find a problem */
-	if (usb_set_interface(dev, iface_desc->bInterfaceNumber, 0) ||
-	    !ss->ep_in || !ss->ep_out || !ss->ep_int) {
-		debug("Problems with device\n");
-		return 0;
-	}
-	dev->privptr = (void *)ss;
-	return 1;
-}
-
-int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-				struct eth_device *eth)
-{
-	struct asix_private *priv = (struct asix_private *)ss->dev_priv;
-
-	if (!eth) {
-		debug("%s: missing parameter.\n", __func__);
-		return 0;
-	}
-	sprintf(eth->name, "%s%d", ASIX_BASE_NAME, curr_eth_dev++);
-	eth->init = asix_init;
-	eth->send = asix_send;
-	eth->recv = asix_recv;
-	eth->halt = asix_halt;
-	if (!(priv->flags & FLAG_TYPE_AX88172))
-		eth->write_hwaddr = asix_write_hwaddr;
-	eth->priv = ss;
-
-	if (asix_basic_reset(ss))
-		return 0;
-
-	/* Get the MAC address */
-	if (asix_read_mac_common(ss, priv, eth->enetaddr))
-		return 0;
-	debug("MAC %pM\n", eth->enetaddr);
-
-	return 1;
-}
-#endif
-
-#ifdef CONFIG_DM_ETH
 static int asix_eth_start(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_plat(dev);
@@ -909,4 +655,3 @@ static const struct usb_device_id asix_eth_id_table[] = {
 };
 
 U_BOOT_USB_DEVICE(asix_eth, asix_eth_id_table);
-#endif
-- 
2.25.1

[PATCH 34/41] usb: eth: asix88179: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/eth/asix88179.c | 250 ------------------------------------
 1 file changed, 250 deletions(-)

diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c
index 4742a95af933..2e737e606685 100644
--- a/drivers/usb/eth/asix88179.c
+++ b/drivers/usb/eth/asix88179.c
@@ -199,18 +199,12 @@ static const struct {
 	{7, 0xcc, 0x4c, 0x04, 8},
 };
 
-#ifndef CONFIG_DM_ETH
-static int curr_eth_dev; /* index for name of next device detected */
-#endif
-
 /* driver private */
 struct asix_private {
-#ifdef CONFIG_DM_ETH
 	struct ueth_data ueth;
 	unsigned pkt_cnt;
 	uint8_t *pkt_data;
 	uint32_t *pkt_hdr;
-#endif
 	int flags;
 	int rx_urb_size;
 	int maxpacketsize;
@@ -505,249 +499,6 @@ static int asix_send_common(struct ueth_data *dev,
 	return err;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * Asix callbacks
- */
-static int asix_init(struct eth_device *eth, struct bd_info *bd)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct asix_private *dev_priv = (struct asix_private *)dev->dev_priv;
-
-	return asix_init_common(dev, dev_priv);
-}
-
-static int asix_write_hwaddr(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	return asix_write_mac(dev, eth->enetaddr);
-}
-
-static int asix_send(struct eth_device *eth, void *packet, int length)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct asix_private *dev_priv = (struct asix_private *)dev->dev_priv;
-
-	return asix_send_common(dev, dev_priv, packet, length);
-}
-
-static int asix_recv(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct asix_private *dev_priv = (struct asix_private *)dev->dev_priv;
-
-	u16 frame_pos;
-	int err;
-	int actual_len;
-
-	int pkt_cnt;
-	u32 rx_hdr;
-	u16 hdr_off;
-	u32 *pkt_hdr;
-	ALLOC_CACHE_ALIGN_BUFFER(u8, recv_buf, dev_priv->rx_urb_size);
-
-	actual_len = -1;
-
-	debug("** %s()\n", __func__);
-
-	err = usb_bulk_msg(dev->pusb_dev,
-				usb_rcvbulkpipe(dev->pusb_dev, dev->ep_in),
-				(void *)recv_buf,
-				dev_priv->rx_urb_size,
-				&actual_len,
-				USB_BULK_RECV_TIMEOUT);
-	debug("Rx: len = %u, actual = %u, err = %d\n", dev_priv->rx_urb_size,
-	      actual_len, err);
-
-	if (err != 0) {
-		debug("Rx: failed to receive\n");
-		return -ECOMM;
-	}
-	if (actual_len > dev_priv->rx_urb_size) {
-		debug("Rx: received too many bytes %d\n", actual_len);
-		return -EMSGSIZE;
-	}
-
-
-	rx_hdr = *(u32 *)(recv_buf + actual_len - 4);
-	le32_to_cpus(&rx_hdr);
-
-	pkt_cnt = (u16)rx_hdr;
-	hdr_off = (u16)(rx_hdr >> 16);
-	pkt_hdr = (u32 *)(recv_buf + hdr_off);
-
-
-	frame_pos = 0;
-
-	while (pkt_cnt--) {
-		u16 pkt_len;
-
-		le32_to_cpus(pkt_hdr);
-		pkt_len = (*pkt_hdr >> 16) & 0x1fff;
-
-		frame_pos += 2;
-
-		net_process_received_packet(recv_buf + frame_pos, pkt_len);
-
-		pkt_hdr++;
-		frame_pos += ((pkt_len + 7) & 0xFFF8)-2;
-
-		if (pkt_cnt == 0)
-			return 0;
-	}
-	return err;
-}
-
-static void asix_halt(struct eth_device *eth)
-{
-	debug("** %s()\n", __func__);
-}
-
-/*
- * Asix probing functions
- */
-void ax88179_eth_before_probe(void)
-{
-	curr_eth_dev = 0;
-}
-
-struct asix_dongle {
-	unsigned short vendor;
-	unsigned short product;
-	int flags;
-};
-
-static const struct asix_dongle asix_dongles[] = {
-	{ 0x0b95, 0x1790, FLAG_TYPE_AX88179 },
-	{ 0x0b95, 0x178a, FLAG_TYPE_AX88178a },
-	{ 0x2001, 0x4a00, FLAG_TYPE_DLINK_DUB1312 },
-	{ 0x0df6, 0x0072, FLAG_TYPE_SITECOM },
-	{ 0x04e8, 0xa100, FLAG_TYPE_SAMSUNG },
-	{ 0x17ef, 0x304b, FLAG_TYPE_LENOVO },
-	{ 0x04b4, 0x3610, FLAG_TYPE_GX3 },
-	{ 0x0000, 0x0000, FLAG_NONE }	/* END - Do not remove */
-};
-
-/* Probe to see if a new device is actually an asix device */
-int ax88179_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss)
-{
-	struct usb_interface *iface;
-	struct usb_interface_descriptor *iface_desc;
-	struct asix_private *dev_priv;
-	int ep_in_found = 0, ep_out_found = 0;
-	int i;
-
-	/* let's examine the device now */
-	iface = &dev->config.if_desc[ifnum];
-	iface_desc = &dev->config.if_desc[ifnum].desc;
-
-	for (i = 0; asix_dongles[i].vendor != 0; i++) {
-		if (dev->descriptor.idVendor == asix_dongles[i].vendor &&
-		    dev->descriptor.idProduct == asix_dongles[i].product)
-			/* Found a supported dongle */
-			break;
-	}
-
-	if (asix_dongles[i].vendor == 0)
-		return 0;
-
-	memset(ss, 0, sizeof(struct ueth_data));
-
-	/* At this point, we know we've got a live one */
-	debug("\n\nUSB Ethernet device detected: %#04x:%#04x\n",
-	      dev->descriptor.idVendor, dev->descriptor.idProduct);
-
-	/* Initialize the ueth_data structure with some useful info */
-	ss->ifnum = ifnum;
-	ss->pusb_dev = dev;
-	ss->subclass = iface_desc->bInterfaceSubClass;
-	ss->protocol = iface_desc->bInterfaceProtocol;
-
-	/* alloc driver private */
-	ss->dev_priv = calloc(1, sizeof(struct asix_private));
-	if (!ss->dev_priv)
-		return 0;
-	dev_priv = ss->dev_priv;
-	dev_priv->flags = asix_dongles[i].flags;
-
-	/*
-	 * We are expecting a minimum of 3 endpoints - in, out (bulk), and
-	 * int. We will ignore any others.
-	 */
-	for (i = 0; i < iface_desc->bNumEndpoints; i++) {
-		/* is it an interrupt endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		    USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) {
-			ss->ep_int = iface->ep_desc[i].bEndpointAddress &
-				USB_ENDPOINT_NUMBER_MASK;
-			ss->irqinterval = iface->ep_desc[i].bInterval;
-			continue;
-		}
-
-		/* is it an BULK endpoint? */
-		if (!((iface->ep_desc[i].bmAttributes &
-		     USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK))
-			continue;
-
-		u8 ep_addr = iface->ep_desc[i].bEndpointAddress;
-		if ((ep_addr & USB_DIR_IN) && !ep_in_found) {
-			ss->ep_in = ep_addr &
-				USB_ENDPOINT_NUMBER_MASK;
-			ep_in_found = 1;
-		}
-		if (!(ep_addr & USB_DIR_IN) && !ep_out_found) {
-			ss->ep_out = ep_addr &
-				USB_ENDPOINT_NUMBER_MASK;
-			dev_priv->maxpacketsize =
-				dev->epmaxpacketout[AX_ENDPOINT_OUT];
-			ep_out_found = 1;
-		}
-	}
-	debug("Endpoints In %d Out %d Int %d\n",
-	      ss->ep_in, ss->ep_out, ss->ep_int);
-
-	/* Do some basic sanity checks, and bail if we find a problem */
-	if (usb_set_interface(dev, iface_desc->bInterfaceNumber, 0) ||
-	    !ss->ep_in || !ss->ep_out || !ss->ep_int) {
-		debug("Problems with device\n");
-		return 0;
-	}
-	dev->privptr = (void *)ss;
-	return 1;
-}
-
-int ax88179_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-				struct eth_device *eth)
-{
-	struct asix_private *dev_priv = (struct asix_private *)ss->dev_priv;
-
-	if (!eth) {
-		debug("%s: missing parameter.\n", __func__);
-		return 0;
-	}
-	sprintf(eth->name, "%s%d", ASIX_BASE_NAME, curr_eth_dev++);
-	eth->init = asix_init;
-	eth->send = asix_send;
-	eth->recv = asix_recv;
-	eth->halt = asix_halt;
-	eth->write_hwaddr = asix_write_hwaddr;
-	eth->priv = ss;
-
-	if (asix_basic_reset(ss, dev_priv))
-		return 0;
-
-	/* Get the MAC address */
-	if (asix_read_mac(ss, eth->enetaddr))
-		return 0;
-	debug("MAC %pM\n", eth->enetaddr);
-
-	return 1;
-}
-
-#else /* !CONFIG_DM_ETH */
-
 static int ax88179_eth_start(struct udevice *dev)
 {
 	struct asix_private *priv = dev_get_priv(dev);
@@ -918,4 +669,3 @@ static const struct usb_device_id ax88179_eth_id_table[] = {
 };
 
 U_BOOT_USB_DEVICE(ax88179_eth, ax88179_eth_id_table);
-#endif /* !CONFIG_DM_ETH */
-- 
2.25.1

[PATCH 35/41] usb: eth: msc7830: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/eth/mcs7830.c | 276 --------------------------------------
 1 file changed, 276 deletions(-)

diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c
index 783ab62f6b7a..8a256b3e3469 100644
--- a/drivers/usb/eth/mcs7830.c
+++ b/drivers/usb/eth/mcs7830.c
@@ -86,10 +86,8 @@ struct mcs7830_regs {
  * @mchash:	shadow for the network adapter's multicast hash registers
  */
 struct mcs7830_private {
-#ifdef CONFIG_DM_ETH
 	uint8_t rx_buf[MCS7830_RX_URB_SIZE];
 	struct ueth_data ueth;
-#endif
 	uint8_t config;
 	uint8_t mchash[8];
 };
@@ -575,279 +573,6 @@ static int mcs7830_recv_common(struct ueth_data *ueth, uint8_t *buf)
 	return -EIO;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * mcs7830_init() - network interface's init callback
- * @udev:	network device to initialize
- * @bd:		board information
- * Return: zero upon success, negative upon error
- *
- * after initial setup during probe() and get_info(), this init() callback
- * ensures that the link is up and subsequent send() and recv() calls can
- * exchange ethernet frames
- */
-static int mcs7830_init(struct eth_device *eth, struct bd_info *bd)
-{
-	struct ueth_data *dev = eth->priv;
-
-	return mcs7830_init_common(dev->pusb_dev);
-}
-
-/*
- * mcs7830_send() - network interface's send callback
- * @eth:	network device to send the frame from
- * @packet:	ethernet frame content
- * @length:	ethernet frame length
- * Return: zero upon success, negative upon error
- *
- * this routine send an ethernet frame out of the network interface
- */
-static int mcs7830_send(struct eth_device *eth, void *packet, int length)
-{
-	struct ueth_data *dev = eth->priv;
-
-	return mcs7830_send_common(dev, packet, length);
-}
-
-/*
- * mcs7830_recv() - network interface's recv callback
- * @eth:	network device to receive frames from
- * Return: zero upon success, negative upon error
- *
- * this routine checks for available ethernet frames that the network
- * interface might have received, and notifies the network stack
- */
-static int mcs7830_recv(struct eth_device *eth)
-{
-	ALLOC_CACHE_ALIGN_BUFFER(uint8_t, buf, MCS7830_RX_URB_SIZE);
-	struct ueth_data *ueth = eth->priv;
-	int len;
-
-	len = mcs7830_recv_common(ueth, buf);
-	if (len >= 0) {
-		net_process_received_packet(buf, len);
-		return 0;
-	}
-
-	return len;
-}
-
-/*
- * mcs7830_halt() - network interface's halt callback
- * @eth:	network device to cease operation of
- * Return: none
- *
- * this routine is supposed to undo the effect of previous initialization and
- * ethernet frames exchange; in this implementation it's a NOP
- */
-static void mcs7830_halt(struct eth_device *eth)
-{
-	debug("%s()\n", __func__);
-}
-
-/*
- * mcs7830_write_mac() - write an ethernet adapter's MAC address
- * @eth:	network device to write to
- * Return: zero upon success, negative upon error
- *
- * this routine takes the MAC address from the ethernet interface's data
- * structure, and writes it into the ethernet adapter such that subsequent
- * exchange of ethernet frames uses this address
- */
-static int mcs7830_write_mac(struct eth_device *eth)
-{
-	struct ueth_data *ueth = eth->priv;
-
-	return mcs7830_write_mac_common(ueth->pusb_dev, eth->enetaddr);
-}
-
-/*
- * mcs7830_iface_idx - index of detected network interfaces
- *
- * this counter keeps track of identified supported interfaces,
- * to assign unique names as more interfaces are found
- */
-static int mcs7830_iface_idx;
-
-/*
- * mcs7830_eth_before_probe() - network driver's before_probe callback
- * Return: none
- *
- * this routine initializes driver's internal data in preparation of
- * subsequent probe callbacks
- */
-void mcs7830_eth_before_probe(void)
-{
-	mcs7830_iface_idx = 0;
-}
-
-/*
- * struct mcs7830_dongle - description of a supported Moschip ethernet dongle
- * @vendor:	16bit USB vendor identification
- * @product:	16bit USB product identification
- *
- * this structure describes a supported USB ethernet dongle by means of the
- * vendor and product codes found during USB enumeration; no flags are held
- * here since all supported dongles have identical behaviour, and required
- * fixups get determined at runtime, such that no manual configuration is
- * needed
- */
-struct mcs7830_dongle {
-	uint16_t vendor;
-	uint16_t product;
-};
-
-/*
- * mcs7830_dongles - the list of supported Moschip based USB ethernet dongles
- */
-static const struct mcs7830_dongle mcs7830_dongles[] = {
-	{ 0x9710, 0x7832, },	/* Moschip 7832 */
-	{ 0x9710, 0x7830, },	/* Moschip 7830 */
-	{ 0x9710, 0x7730, },	/* Moschip 7730 */
-	{ 0x0df6, 0x0021, },	/* Sitecom LN 30 */
-};
-
-/*
- * mcs7830_eth_probe() - network driver's probe callback
- * @dev:	detected USB device to check
- * @ifnum:	detected USB interface to check
- * @ss:		USB ethernet data structure to fill in upon match
- * Return: #1 upon match, #0 upon mismatch or error
- *
- * this routine checks whether the found USB device is supported by
- * this ethernet driver, and upon match fills in the USB ethernet
- * data structure which later is passed to the get_info callback
- */
-int mcs7830_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss)
-{
-	struct usb_interface *iface;
-	struct usb_interface_descriptor *iface_desc;
-	int i;
-	struct mcs7830_private *priv;
-	int ep_in_found, ep_out_found, ep_intr_found;
-
-	debug("%s()\n", __func__);
-
-	/* iterate the list of supported dongles */
-	iface = &dev->config.if_desc[ifnum];
-	iface_desc = &iface->desc;
-	for (i = 0; i < ARRAY_SIZE(mcs7830_dongles); i++) {
-		if (dev->descriptor.idVendor == mcs7830_dongles[i].vendor &&
-		    dev->descriptor.idProduct == mcs7830_dongles[i].product)
-			break;
-	}
-	if (i == ARRAY_SIZE(mcs7830_dongles))
-		return 0;
-	debug("detected USB ethernet device: %04X:%04X\n",
-	      dev->descriptor.idVendor, dev->descriptor.idProduct);
-
-	/* fill in driver private data */
-	priv = calloc(1, sizeof(*priv));
-	if (!priv)
-		return 0;
-
-	/* fill in the ueth_data structure, attach private data */
-	memset(ss, 0, sizeof(*ss));
-	ss->ifnum = ifnum;
-	ss->pusb_dev = dev;
-	ss->subclass = iface_desc->bInterfaceSubClass;
-	ss->protocol = iface_desc->bInterfaceProtocol;
-	ss->dev_priv = priv;
-
-	/*
-	 * a minimum of three endpoints is expected: in (bulk),
-	 * out (bulk), and interrupt; ignore all others
-	 */
-	ep_in_found = ep_out_found = ep_intr_found = 0;
-	for (i = 0; i < iface_desc->bNumEndpoints; i++) {
-		uint8_t eptype, epaddr;
-		bool is_input;
-
-		eptype = iface->ep_desc[i].bmAttributes;
-		eptype &= USB_ENDPOINT_XFERTYPE_MASK;
-
-		epaddr = iface->ep_desc[i].bEndpointAddress;
-		is_input = epaddr & USB_DIR_IN;
-		epaddr &= USB_ENDPOINT_NUMBER_MASK;
-
-		if (eptype == USB_ENDPOINT_XFER_BULK) {
-			if (is_input && !ep_in_found) {
-				ss->ep_in = epaddr;
-				ep_in_found++;
-			}
-			if (!is_input && !ep_out_found) {
-				ss->ep_out = epaddr;
-				ep_out_found++;
-			}
-		}
-
-		if (eptype == USB_ENDPOINT_XFER_INT) {
-			if (is_input && !ep_intr_found) {
-				ss->ep_int = epaddr;
-				ss->irqinterval = iface->ep_desc[i].bInterval;
-				ep_intr_found++;
-			}
-		}
-	}
-	debug("endpoints: in %d, out %d, intr %d\n",
-	      ss->ep_in, ss->ep_out, ss->ep_int);
-
-	/* apply basic sanity checks */
-	if (usb_set_interface(dev, iface_desc->bInterfaceNumber, 0) ||
-	    !ss->ep_in || !ss->ep_out || !ss->ep_int) {
-		debug("device probe incomplete\n");
-		return 0;
-	}
-
-	dev->privptr = ss;
-	return 1;
-}
-
-/*
- * mcs7830_eth_get_info() - network driver's get_info callback
- * @dev:	detected USB device
- * @ss:		USB ethernet data structure filled in at probe()
- * @eth:	ethernet interface data structure to fill in
- * Return: #1 upon success, #0 upon error
- *
- * this routine registers the mandatory init(), send(), recv(), and
- * halt() callbacks with the ethernet interface, can register the
- * optional write_hwaddr() callback with the ethernet interface,
- * and initiates configuration of the interface such that subsequent
- * calls to those callbacks results in network communication
- */
-int mcs7830_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-			 struct eth_device *eth)
-{
-	debug("%s()\n", __func__);
-	if (!eth) {
-		debug("%s: missing parameter.\n", __func__);
-		return 0;
-	}
-
-	snprintf(eth->name, sizeof(eth->name), "%s%d",
-		 MCS7830_BASE_NAME, mcs7830_iface_idx++);
-	eth->init = mcs7830_init;
-	eth->send = mcs7830_send;
-	eth->recv = mcs7830_recv;
-	eth->halt = mcs7830_halt;
-	eth->write_hwaddr = mcs7830_write_mac;
-	eth->priv = ss;
-
-	if (mcs7830_basic_reset(ss->pusb_dev, ss->dev_priv))
-		return 0;
-
-	if (mcs7830_read_mac(ss->pusb_dev, eth->enetaddr))
-		return 0;
-	debug("MAC %pM\n", eth->enetaddr);
-
-	return 1;
-}
-#endif
-
-
-#ifdef CONFIG_DM_ETH
 static int mcs7830_eth_start(struct udevice *dev)
 {
 	struct usb_device *udev = dev_get_parent_priv(dev);
@@ -942,4 +667,3 @@ static const struct usb_device_id mcs7830_eth_id_table[] = {
 };
 
 U_BOOT_USB_DEVICE(mcs7830_eth, mcs7830_eth_id_table);
-#endif
-- 
2.25.1

[PATCH 36/41] usb: eth: r8152: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/eth/r8152.c | 275 ----------------------------------------
 drivers/usb/eth/r8152.h |   2 -
 2 files changed, 277 deletions(-)

diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c
index 1aaa5a79b3f6..3c866f4f1e2d 100644
--- a/drivers/usb/eth/r8152.c
+++ b/drivers/usb/eth/r8152.c
@@ -18,43 +18,6 @@
 #include "usb_ether.h"
 #include "r8152.h"
 
-#ifndef CONFIG_DM_ETH
-/* local vars */
-static int curr_eth_dev; /* index for name of next device detected */
-
-struct r8152_dongle {
-	unsigned short vendor;
-	unsigned short product;
-};
-
-static const struct r8152_dongle r8152_dongles[] = {
-	/* Realtek */
-	{ 0x0bda, 0x8050 },
-	{ 0x0bda, 0x8152 },
-	{ 0x0bda, 0x8153 },
-
-	/* Samsung */
-	{ 0x04e8, 0xa101 },
-
-	/* Lenovo */
-	{ 0x17ef, 0x304f },
-	{ 0x17ef, 0x3052 },
-	{ 0x17ef, 0x3054 },
-	{ 0x17ef, 0x3057 },
-	{ 0x17ef, 0x7205 },
-	{ 0x17ef, 0x720a },
-	{ 0x17ef, 0x720b },
-	{ 0x17ef, 0x720c },
-
-	/* TP-LINK */
-	{ 0x2357, 0x0601 },
-	{ 0x2357, 0x0602 },
-
-	/* Nvidia */
-	{ 0x0955, 0x09ff },
-};
-#endif
-
 struct r8152_version {
 	unsigned short tcr;
 	unsigned short version;
@@ -1479,243 +1442,6 @@ static int r8152_send_common(struct ueth_data *ueth, void *packet, int length)
 	return err;
 }
 
-#ifndef CONFIG_DM_ETH
-static int r8152_init(struct eth_device *eth, struct bd_info *bd)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct r8152 *tp = (struct r8152 *)dev->dev_priv;
-
-	return r8152_init_common(tp);
-}
-
-static int r8152_send(struct eth_device *eth, void *packet, int length)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	return r8152_send_common(dev, packet, length);
-}
-
-static int r8152_recv(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	ALLOC_CACHE_ALIGN_BUFFER(uint8_t, recv_buf, RTL8152_AGG_BUF_SZ);
-	unsigned char *pkt_ptr;
-	int err;
-	int actual_len;
-	u16 packet_len;
-
-	u32 bytes_process = 0;
-	struct rx_desc *rx_desc;
-
-	debug("** %s()\n", __func__);
-
-	err = usb_bulk_msg(dev->pusb_dev,
-				usb_rcvbulkpipe(dev->pusb_dev, dev->ep_in),
-				(void *)recv_buf,
-				RTL8152_AGG_BUF_SZ,
-				&actual_len,
-				USB_BULK_RECV_TIMEOUT);
-	debug("Rx: len = %u, actual = %u, err = %d\n", RTL8152_AGG_BUF_SZ,
-	      actual_len, err);
-	if (err != 0) {
-		debug("Rx: failed to receive\n");
-		return -1;
-	}
-	if (actual_len > RTL8152_AGG_BUF_SZ) {
-		debug("Rx: received too many bytes %d\n", actual_len);
-		return -1;
-	}
-
-	while (bytes_process < actual_len) {
-		rx_desc = (struct rx_desc *)(recv_buf + bytes_process);
-		pkt_ptr = recv_buf + sizeof(struct rx_desc) + bytes_process;
-
-		packet_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK;
-		packet_len -= CRC_SIZE;
-
-		net_process_received_packet(pkt_ptr, packet_len);
-
-		bytes_process +=
-			(packet_len + sizeof(struct rx_desc) + CRC_SIZE);
-
-		if (bytes_process % 8)
-			bytes_process = bytes_process + 8 - (bytes_process % 8);
-	}
-
-	return 0;
-}
-
-static void r8152_halt(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct r8152 *tp = (struct r8152 *)dev->dev_priv;
-
-	debug("** %s()\n", __func__);
-
-	tp->rtl_ops.disable(tp);
-}
-
-static int r8152_write_hwaddr(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct r8152 *tp = (struct r8152 *)dev->dev_priv;
-
-	unsigned char enetaddr[8] = {0};
-
-	memcpy(enetaddr, eth->enetaddr, ETH_ALEN);
-
-	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
-	pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, enetaddr);
-	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
-
-	debug("MAC %pM\n", eth->enetaddr);
-	return 0;
-}
-
-void r8152_eth_before_probe(void)
-{
-	curr_eth_dev = 0;
-}
-
-/* Probe to see if a new device is actually an realtek device */
-int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss)
-{
-	struct usb_interface *iface;
-	struct usb_interface_descriptor *iface_desc;
-	int ep_in_found = 0, ep_out_found = 0;
-	struct r8152 *tp;
-	int i;
-
-	/* let's examine the device now */
-	iface = &dev->config.if_desc[ifnum];
-	iface_desc = &dev->config.if_desc[ifnum].desc;
-
-	for (i = 0; i < ARRAY_SIZE(r8152_dongles); i++) {
-		if (dev->descriptor.idVendor == r8152_dongles[i].vendor &&
-		    dev->descriptor.idProduct == r8152_dongles[i].product)
-			/* Found a supported dongle */
-			break;
-	}
-
-	if (i == ARRAY_SIZE(r8152_dongles))
-		return 0;
-
-	memset(ss, 0, sizeof(struct ueth_data));
-
-	/* At this point, we know we've got a live one */
-	debug("\n\nUSB Ethernet device detected: %#04x:%#04x\n",
-	      dev->descriptor.idVendor, dev->descriptor.idProduct);
-
-	/* Initialize the ueth_data structure with some useful info */
-	ss->ifnum = ifnum;
-	ss->pusb_dev = dev;
-	ss->subclass = iface_desc->bInterfaceSubClass;
-	ss->protocol = iface_desc->bInterfaceProtocol;
-
-	/* alloc driver private */
-	ss->dev_priv = calloc(1, sizeof(struct r8152));
-
-	if (!ss->dev_priv)
-		return 0;
-
-	/*
-	 * We are expecting a minimum of 3 endpoints - in, out (bulk), and
-	 * int. We will ignore any others.
-	 */
-	for (i = 0; i < iface_desc->bNumEndpoints; i++) {
-		/* is it an BULK endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		     USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
-			u8 ep_addr = iface->ep_desc[i].bEndpointAddress;
-
-			if (ep_addr & USB_DIR_IN) {
-				if (!ep_in_found) {
-					ss->ep_in = ep_addr &
-						USB_ENDPOINT_NUMBER_MASK;
-					ep_in_found = 1;
-				}
-			} else {
-				if (!ep_out_found) {
-					ss->ep_out = ep_addr &
-						USB_ENDPOINT_NUMBER_MASK;
-					ep_out_found = 1;
-				}
-			}
-		}
-
-		/* is it an interrupt endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		    USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) {
-			ss->ep_int = iface->ep_desc[i].bEndpointAddress &
-				USB_ENDPOINT_NUMBER_MASK;
-			ss->irqinterval = iface->ep_desc[i].bInterval;
-		}
-	}
-
-	debug("Endpoints In %d Out %d Int %d\n",
-	      ss->ep_in, ss->ep_out, ss->ep_int);
-
-	/* Do some basic sanity checks, and bail if we find a problem */
-	if (usb_set_interface(dev, iface_desc->bInterfaceNumber, 0) ||
-	    !ss->ep_in || !ss->ep_out || !ss->ep_int) {
-		debug("Problems with device\n");
-		goto error;
-	}
-
-	dev->privptr = (void *)ss;
-
-	tp = ss->dev_priv;
-	tp->udev = dev;
-	tp->intf = iface;
-
-	r8152b_get_version(tp);
-
-	if (rtl_ops_init(tp))
-		goto error;
-
-	tp->rtl_ops.init(tp);
-	tp->rtl_ops.up(tp);
-
-	rtl8152_set_speed(tp, AUTONEG_ENABLE,
-			  tp->supports_gmii ? SPEED_1000 : SPEED_100,
-			  DUPLEX_FULL);
-
-	return 1;
-
-error:
-	cfree(ss->dev_priv);
-	ss->dev_priv = 0;
-	return 0;
-}
-
-int r8152_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-				struct eth_device *eth)
-{
-	if (!eth) {
-		debug("%s: missing parameter.\n", __func__);
-		return 0;
-	}
-
-	sprintf(eth->name, "%s#%d", R8152_BASE_NAME, curr_eth_dev++);
-	eth->init = r8152_init;
-	eth->send = r8152_send;
-	eth->recv = r8152_recv;
-	eth->halt = r8152_halt;
-	eth->write_hwaddr = r8152_write_hwaddr;
-	eth->priv = ss;
-
-	/* Get the MAC address */
-	if (r8152_read_mac(ss->dev_priv, eth->enetaddr) < 0)
-		return 0;
-
-	debug("MAC %pM\n", eth->enetaddr);
-	return 1;
-}
-#endif /* !CONFIG_DM_ETH */
-
-#ifdef CONFIG_DM_ETH
 static int r8152_eth_start(struct udevice *dev)
 {
 	struct r8152 *tp = dev_get_priv(dev);
@@ -1895,4 +1621,3 @@ static const struct usb_device_id r8152_eth_id_table[] = {
 };
 
 U_BOOT_USB_DEVICE(r8152_eth, r8152_eth_id_table);
-#endif /* CONFIG_DM_ETH */
diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h
index 45172c055f42..7b128b1934b6 100644
--- a/drivers/usb/eth/r8152.h
+++ b/drivers/usb/eth/r8152.h
@@ -642,9 +642,7 @@ struct r8152 {
 
 	u8 version;
 
-#ifdef CONFIG_DM_ETH
 	struct ueth_data ueth;
-#endif
 };
 
 int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen,
-- 
2.25.1

[PATCH 37/41] usb: eth: smsc95xx: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/eth/smsc95xx.c | 234 -------------------------------------
 1 file changed, 234 deletions(-)

diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c
index 283c52c16ac6..de6586e62639 100644
--- a/drivers/usb/eth/smsc95xx.c
+++ b/drivers/usb/eth/smsc95xx.c
@@ -143,16 +143,9 @@
 
 #define TURBO_MODE
 
-#ifndef CONFIG_DM_ETH
-/* local vars */
-static int curr_eth_dev; /* index for name of next device detected */
-#endif
-
 /* driver private */
 struct smsc95xx_private {
-#ifdef CONFIG_DM_ETH
 	struct ueth_data ueth;
-#endif
 	size_t rx_urb_size;  /* maximum USB URB size */
 	u32 mac_cr;  /* MAC control register value */
 	int have_hwaddr;  /* 1 if we have a hardware MAC address */
@@ -521,11 +514,6 @@ static int smsc95xx_init_common(struct usb_device *udev, struct ueth_data *dev,
 		debug("timeout waiting for PHY Reset\n");
 		return -ETIMEDOUT;
 	}
-#ifndef CONFIG_DM_ETH
-	if (!priv->have_hwaddr && smsc95xx_init_mac_address(enetaddr, udev) ==
-			0)
-		priv->have_hwaddr = 1;
-#endif
 	if (!priv->have_hwaddr) {
 		puts("Error: SMSC95xx: No MAC address set - set usbethaddr\n");
 		return -EADDRNOTAVAIL;
@@ -712,227 +700,6 @@ static int smsc95xx_send_common(struct ueth_data *dev, void *packet, int length)
 	return err;
 }
 
-#ifndef CONFIG_DM_ETH
-/*
- * Smsc95xx callbacks
- */
-static int smsc95xx_init(struct eth_device *eth, struct bd_info *bd)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	struct usb_device *udev = dev->pusb_dev;
-	struct smsc95xx_private *priv =
-		(struct smsc95xx_private *)dev->dev_priv;
-
-	return smsc95xx_init_common(udev, dev, priv, eth->enetaddr);
-}
-
-static int smsc95xx_send(struct eth_device *eth, void *packet, int length)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-
-	return smsc95xx_send_common(dev, packet, length);
-}
-
-static int smsc95xx_recv(struct eth_device *eth)
-{
-	struct ueth_data *dev = (struct ueth_data *)eth->priv;
-	DEFINE_CACHE_ALIGN_BUFFER(unsigned char, recv_buf, RX_URB_SIZE);
-	unsigned char *buf_ptr;
-	int err;
-	int actual_len;
-	u32 packet_len;
-	int cur_buf_align;
-
-	debug("** %s()\n", __func__);
-	err = usb_bulk_msg(dev->pusb_dev,
-			   usb_rcvbulkpipe(dev->pusb_dev, dev->ep_in),
-			   (void *)recv_buf, RX_URB_SIZE, &actual_len,
-			   USB_BULK_RECV_TIMEOUT);
-	debug("Rx: len = %u, actual = %u, err = %d\n", RX_URB_SIZE,
-	      actual_len, err);
-	if (err != 0) {
-		debug("Rx: failed to receive\n");
-		return -err;
-	}
-	if (actual_len > RX_URB_SIZE) {
-		debug("Rx: received too many bytes %d\n", actual_len);
-		return -ENOSPC;
-	}
-
-	buf_ptr = recv_buf;
-	while (actual_len > 0) {
-		/*
-		 * 1st 4 bytes contain the length of the actual data plus error
-		 * info. Extract data length.
-		 */
-		if (actual_len < sizeof(packet_len)) {
-			debug("Rx: incomplete packet length\n");
-			return -EIO;
-		}
-		memcpy(&packet_len, buf_ptr, sizeof(packet_len));
-		le32_to_cpus(&packet_len);
-		if (packet_len & RX_STS_ES_) {
-			debug("Rx: Error header=%#x", packet_len);
-			return -EIO;
-		}
-		packet_len = ((packet_len & RX_STS_FL_) >> 16);
-
-		if (packet_len > actual_len - sizeof(packet_len)) {
-			debug("Rx: too large packet: %d\n", packet_len);
-			return -EIO;
-		}
-
-		/* Notify net stack */
-		net_process_received_packet(buf_ptr + sizeof(packet_len),
-					    packet_len - 4);
-
-		/* Adjust for next iteration */
-		actual_len -= sizeof(packet_len) + packet_len;
-		buf_ptr += sizeof(packet_len) + packet_len;
-		cur_buf_align = (ulong)buf_ptr - (ulong)recv_buf;
-
-		if (cur_buf_align & 0x03) {
-			int align = 4 - (cur_buf_align & 0x03);
-
-			actual_len -= align;
-			buf_ptr += align;
-		}
-	}
-	return err;
-}
-
-static void smsc95xx_halt(struct eth_device *eth)
-{
-	debug("** %s()\n", __func__);
-}
-
-static int smsc95xx_write_hwaddr(struct eth_device *eth)
-{
-	struct ueth_data *dev = eth->priv;
-	struct usb_device *udev = dev->pusb_dev;
-	struct smsc95xx_private *priv = dev->dev_priv;
-
-	return smsc95xx_write_hwaddr_common(udev, priv, eth->enetaddr);
-}
-
-/*
- * SMSC probing functions
- */
-void smsc95xx_eth_before_probe(void)
-{
-	curr_eth_dev = 0;
-}
-
-struct smsc95xx_dongle {
-	unsigned short vendor;
-	unsigned short product;
-};
-
-static const struct smsc95xx_dongle smsc95xx_dongles[] = {
-	{ 0x0424, 0xec00 },	/* LAN9512/LAN9514 Ethernet */
-	{ 0x0424, 0x9500 },	/* LAN9500 Ethernet */
-	{ 0x0424, 0x9730 },	/* LAN9730 Ethernet (HSIC) */
-	{ 0x0424, 0x9900 },	/* SMSC9500 USB Ethernet Device (SAL10) */
-	{ 0x0424, 0x9e00 },	/* LAN9500A Ethernet */
-	{ 0x0000, 0x0000 }	/* END - Do not remove */
-};
-
-/* Probe to see if a new device is actually an SMSC device */
-int smsc95xx_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss)
-{
-	struct usb_interface *iface;
-	struct usb_interface_descriptor *iface_desc;
-	int i;
-
-	/* let's examine the device now */
-	iface = &dev->config.if_desc[ifnum];
-	iface_desc = &dev->config.if_desc[ifnum].desc;
-
-	for (i = 0; smsc95xx_dongles[i].vendor != 0; i++) {
-		if (dev->descriptor.idVendor == smsc95xx_dongles[i].vendor &&
-		    dev->descriptor.idProduct == smsc95xx_dongles[i].product)
-			/* Found a supported dongle */
-			break;
-	}
-	if (smsc95xx_dongles[i].vendor == 0)
-		return 0;
-
-	/* At this point, we know we've got a live one */
-	debug("\n\nUSB Ethernet device detected\n");
-	memset(ss, '\0', sizeof(struct ueth_data));
-
-	/* Initialize the ueth_data structure with some useful info */
-	ss->ifnum = ifnum;
-	ss->pusb_dev = dev;
-	ss->subclass = iface_desc->bInterfaceSubClass;
-	ss->protocol = iface_desc->bInterfaceProtocol;
-
-	/*
-	 * We are expecting a minimum of 3 endpoints - in, out (bulk), and int.
-	 * We will ignore any others.
-	 */
-	for (i = 0; i < iface_desc->bNumEndpoints; i++) {
-		/* is it an BULK endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		     USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
-			if (iface->ep_desc[i].bEndpointAddress & USB_DIR_IN)
-				ss->ep_in =
-					iface->ep_desc[i].bEndpointAddress &
-					USB_ENDPOINT_NUMBER_MASK;
-			else
-				ss->ep_out =
-					iface->ep_desc[i].bEndpointAddress &
-					USB_ENDPOINT_NUMBER_MASK;
-		}
-
-		/* is it an interrupt endpoint? */
-		if ((iface->ep_desc[i].bmAttributes &
-		    USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) {
-			ss->ep_int = iface->ep_desc[i].bEndpointAddress &
-				USB_ENDPOINT_NUMBER_MASK;
-			ss->irqinterval = iface->ep_desc[i].bInterval;
-		}
-	}
-	debug("Endpoints In %d Out %d Int %d\n",
-		  ss->ep_in, ss->ep_out, ss->ep_int);
-
-	/* Do some basic sanity checks, and bail if we find a problem */
-	if (usb_set_interface(dev, iface_desc->bInterfaceNumber, 0) ||
-	    !ss->ep_in || !ss->ep_out || !ss->ep_int) {
-		debug("Problems with device\n");
-		return 0;
-	}
-	dev->privptr = (void *)ss;
-
-	/* alloc driver private */
-	ss->dev_priv = calloc(1, sizeof(struct smsc95xx_private));
-	if (!ss->dev_priv)
-		return 0;
-
-	return 1;
-}
-
-int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-				struct eth_device *eth)
-{
-	debug("** %s()\n", __func__);
-	if (!eth) {
-		debug("%s: missing parameter.\n", __func__);
-		return 0;
-	}
-	sprintf(eth->name, "%s%d", SMSC95XX_BASE_NAME, curr_eth_dev++);
-	eth->init = smsc95xx_init;
-	eth->send = smsc95xx_send;
-	eth->recv = smsc95xx_recv;
-	eth->halt = smsc95xx_halt;
-	eth->write_hwaddr = smsc95xx_write_hwaddr;
-	eth->priv = ss;
-	return 1;
-}
-#endif /* !CONFIG_DM_ETH */
-
-#ifdef CONFIG_DM_ETH
 static int smsc95xx_eth_start(struct udevice *dev)
 {
 	struct usb_device *udev = dev_get_parent_priv(dev);
@@ -1077,4 +844,3 @@ static const struct usb_device_id smsc95xx_eth_id_table[] = {
 };
 
 U_BOOT_USB_DEVICE(smsc95xx_eth, smsc95xx_eth_id_table);
-#endif
-- 
2.25.1

[PATCH 38/41] usb: eth: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code fro usb_ether itself.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/eth/usb_ether.c   | 199 ----------------------------------
 drivers/usb/host/usb-uclass.c |  43 --------
 include/usb.h                 |  15 ---
 include/usb_ether.h           |  44 +-------
 4 files changed, 1 insertion(+), 300 deletions(-)

diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c
index e368ecda0d70..2e9af54fd63d 100644
--- a/drivers/usb/eth/usb_ether.c
+++ b/drivers/usb/eth/usb_ether.c
@@ -15,8 +15,6 @@
 
 #include "usb_ether.h"
 
-#ifdef CONFIG_DM_ETH
-
 #define USB_BULK_RECV_TIMEOUT 500
 
 int usb_ether_register(struct udevice *dev, struct ueth_data *ueth, int rxsize)
@@ -137,200 +135,3 @@ int usb_ether_get_rx_bytes(struct ueth_data *ueth, uint8_t **ptrp)
 
 	return ueth->rxlen - ueth->rxptr;
 }
-
-#else
-
-typedef void (*usb_eth_before_probe)(void);
-typedef int (*usb_eth_probe)(struct usb_device *dev, unsigned int ifnum,
-			struct ueth_data *ss);
-typedef int (*usb_eth_get_info)(struct usb_device *dev, struct ueth_data *ss,
-			struct eth_device *dev_desc);
-
-struct usb_eth_prob_dev {
-	usb_eth_before_probe	before_probe; /* optional */
-	usb_eth_probe			probe;
-	usb_eth_get_info		get_info;
-};
-
-/* driver functions go here, each bracketed by #ifdef CONFIG_USB_ETHER_xxx */
-static const struct usb_eth_prob_dev prob_dev[] = {
-#ifdef CONFIG_USB_ETHER_ASIX
-	{
-		.before_probe = asix_eth_before_probe,
-		.probe = asix_eth_probe,
-		.get_info = asix_eth_get_info,
-	},
-#endif
-#ifdef CONFIG_USB_ETHER_ASIX88179
-	{
-		.before_probe = ax88179_eth_before_probe,
-		.probe = ax88179_eth_probe,
-		.get_info = ax88179_eth_get_info,
-	},
-#endif
-#ifdef CONFIG_USB_ETHER_MCS7830
-	{
-		.before_probe = mcs7830_eth_before_probe,
-		.probe = mcs7830_eth_probe,
-		.get_info = mcs7830_eth_get_info,
-	},
-#endif
-#ifdef CONFIG_USB_ETHER_SMSC95XX
-	{
-		.before_probe = smsc95xx_eth_before_probe,
-		.probe = smsc95xx_eth_probe,
-		.get_info = smsc95xx_eth_get_info,
-	},
-#endif
-#ifdef CONFIG_USB_ETHER_RTL8152
-	{
-		.before_probe = r8152_eth_before_probe,
-		.probe = r8152_eth_probe,
-		.get_info = r8152_eth_get_info,
-	},
-#endif
-	{ },		/* END */
-};
-
-static int usb_max_eth_dev; /* number of highest available usb eth device */
-static struct ueth_data usb_eth[USB_MAX_ETH_DEV];
-
-/*******************************************************************************
- * tell if current ethernet device is a usb dongle
- */
-int is_eth_dev_on_usb_host(void)
-{
-	int i;
-	struct eth_device *dev = eth_get_dev();
-
-	if (dev) {
-		for (i = 0; i < usb_max_eth_dev; i++)
-			if (&usb_eth[i].eth_dev == dev)
-				return 1;
-	}
-	return 0;
-}
-
-/*
- * Given a USB device, ask each driver if it can support it, and attach it
- * to the first driver that says 'yes'
- */
-static void probe_valid_drivers(struct usb_device *dev)
-{
-	struct eth_device *eth;
-	int j;
-
-	for (j = 0; prob_dev[j].probe && prob_dev[j].get_info; j++) {
-		if (!prob_dev[j].probe(dev, 0, &usb_eth[usb_max_eth_dev]))
-			continue;
-		/*
-		 * ok, it is a supported eth device. Get info and fill it in
-		 */
-		eth = &usb_eth[usb_max_eth_dev].eth_dev;
-		if (prob_dev[j].get_info(dev,
-			&usb_eth[usb_max_eth_dev],
-			eth)) {
-			/* found proper driver */
-			/* register with networking stack */
-			usb_max_eth_dev++;
-
-			/*
-			 * usb_max_eth_dev must be incremented prior to this
-			 * call since eth_current_changed (internally called)
-			 * relies on it
-			 */
-			eth_register(eth);
-			if (eth_write_hwaddr(eth, "usbeth",
-					usb_max_eth_dev - 1))
-				puts("Warning: failed to set MAC address\n");
-			break;
-			}
-		}
-	}
-
-/*******************************************************************************
- * scan the usb and reports device info
- * to the user if mode = 1
- * returns current device or -1 if no
- */
-int usb_host_eth_scan(int mode)
-{
-	int i, old_async;
-
-	if (mode == 1)
-		printf("       scanning usb for ethernet devices... ");
-
-	old_async = usb_disable_asynch(1); /* asynch transfer not allowed */
-
-	/* unregister a previously detected device */
-	for (i = 0; i < usb_max_eth_dev; i++)
-		eth_unregister(&usb_eth[i].eth_dev);
-
-	memset(usb_eth, 0, sizeof(usb_eth));
-
-	for (i = 0; prob_dev[i].probe; i++) {
-		if (prob_dev[i].before_probe)
-			prob_dev[i].before_probe();
-	}
-
-	usb_max_eth_dev = 0;
-#if CONFIG_IS_ENABLED(DM_USB)
-	/*
-	 * TODO: We should add U_BOOT_USB_DEVICE() declarations to each USB
-	 * Ethernet driver and then most of this file can be removed.
-	 */
-	struct udevice *bus;
-	struct uclass *uc;
-	int ret;
-
-	ret = uclass_get(UCLASS_USB, &uc);
-	if (ret)
-		return ret;
-	uclass_foreach_dev(bus, uc) {
-		for (i = 0; i < USB_MAX_DEVICE; i++) {
-			struct usb_device *dev;
-
-			dev = usb_get_dev_index(bus, i); /* get device */
-			debug("i=%d, %s\n", i, dev ? dev->dev->name : "(done)");
-			if (!dev)
-				break; /* no more devices available */
-
-			/*
-			 * find valid usb_ether driver for this device,
-			 * if any
-			 */
-			probe_valid_drivers(dev);
-
-			/* check limit */
-			if (usb_max_eth_dev == USB_MAX_ETH_DEV)
-				break;
-		} /* for */
-	}
-#else
-	for (i = 0; i < USB_MAX_DEVICE; i++) {
-		struct usb_device *dev;
-
-		dev = usb_get_dev_index(i); /* get device */
-		debug("i=%d\n", i);
-		if (!dev)
-			break; /* no more devices available */
-
-		/* find valid usb_ether driver for this device, if any */
-		probe_valid_drivers(dev);
-
-		/* check limit */
-		if (usb_max_eth_dev == USB_MAX_ETH_DEV)
-			break;
-	} /* for */
-#endif
-	if (usb_max_eth_dev == USB_MAX_ETH_DEV) {
-		printf("max USB Ethernet Device reached: %d stopping\n",
-		       usb_max_eth_dev);
-	}
-	usb_disable_asynch(old_async); /* restore asynch value */
-	printf("%d Ethernet Device(s) found\n", usb_max_eth_dev);
-	if (usb_max_eth_dev > 0)
-		return 0;
-	return -1;
-}
-#endif
diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 27e2fc6fcd36..7b7c2a7241b9 100644
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -346,49 +346,6 @@ int usb_init(void)
 	return usb_started ? 0 : -1;
 }
 
-/*
- * TODO(sjg@chromium.org): Remove this legacy function. At present it is needed
- * to support boards which use driver model for USB but not Ethernet, and want
- * to use USB Ethernet.
- *
- * The #if clause is here to ensure that remains the only case.
- */
-#if !defined(CONFIG_DM_ETH) && defined(CONFIG_USB_HOST_ETHER)
-static struct usb_device *find_child_devnum(struct udevice *parent, int devnum)
-{
-	struct usb_device *udev;
-	struct udevice *dev;
-
-	if (!device_active(parent))
-		return NULL;
-	udev = dev_get_parent_priv(parent);
-	if (udev->devnum == devnum)
-		return udev;
-
-	for (device_find_first_child(parent, &dev);
-	     dev;
-	     device_find_next_child(&dev)) {
-		udev = find_child_devnum(dev, devnum);
-		if (udev)
-			return udev;
-	}
-
-	return NULL;
-}
-
-struct usb_device *usb_get_dev_index(struct udevice *bus, int index)
-{
-	struct udevice *dev;
-	int devnum = index + 1; /* Addresses are allocated from 1 on USB */
-
-	device_find_first_child(bus, &dev);
-	if (!dev)
-		return NULL;
-
-	return find_child_devnum(dev, devnum);
-}
-#endif
-
 int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp)
 {
 	struct usb_plat *plat;
diff --git a/include/usb.h b/include/usb.h
index 7e3796bd5baa..80cb84672030 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -808,21 +808,6 @@ struct dm_usb_ops {
 #define usb_get_ops(dev)	((struct dm_usb_ops *)(dev)->driver->ops)
 #define usb_get_emul_ops(dev)	((struct dm_usb_ops *)(dev)->driver->ops)
 
-/**
- * usb_get_dev_index() - look up a device index number
- *
- * Look up devices using their index number (starting at 0). This works since
- * in U-Boot device addresses are allocated starting at 1 with no gaps.
- *
- * TODO(sjg@chromium.org): Remove this function when usb_ether.c is modified
- * to work better with driver model.
- *
- * @bus:	USB bus to check
- * @index:	Index number of device to find (0=first). This is just the
- *		device address less 1.
- */
-struct usb_device *usb_get_dev_index(struct udevice *bus, int index);
-
 /**
  * usb_setup_device() - set up a device ready for use
  *
diff --git a/include/usb_ether.h b/include/usb_ether.h
index 8c7bd0690643..18d7184711b2 100644
--- a/include/usb_ether.h
+++ b/include/usb_ether.h
@@ -8,19 +8,13 @@
 
 #include <net.h>
 
-/* TODO(sjg@chromium.org): Remove @pusb_dev when all boards use CONFIG_DM_ETH */
+/* TODO(sjg@chromium.org): Remove @pusb_dev now that all boards use CONFIG_DM_ETH */
 struct ueth_data {
 	/* eth info */
-#ifdef CONFIG_DM_ETH
 	uint8_t *rxbuf;
 	int rxsize;
 	int rxlen;			/* Total bytes available in rxbuf */
 	int rxptr;			/* Current position in rxbuf */
-#else
-	struct eth_device eth_dev;	/* used with eth_register */
-	/* driver private */
-	void *dev_priv;
-#endif
 	int phy_id;			/* mii phy id */
 
 	/* usb info */
@@ -34,7 +28,6 @@ struct ueth_data {
 	unsigned char	irqinterval;	/* Intervall for IRQ Pipe */
 };
 
-#ifdef CONFIG_DM_ETH
 /**
  * usb_ether_register() - register a new USB ethernet device
  *
@@ -92,40 +85,5 @@ int usb_ether_get_rx_bytes(struct ueth_data *ueth, uint8_t **ptrp);
  * @num_bytes:	Number of bytes to skip, or -1 to skip all bytes
  */
 void usb_ether_advance_rxbuf(struct ueth_data *ueth, int num_bytes);
-#else
-/*
- * Function definitions for each USB ethernet driver go here
- * (declaration is unconditional, compilation is conditional)
- */
-void asix_eth_before_probe(void);
-int asix_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss);
-int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-		      struct eth_device *eth);
-
-void ax88179_eth_before_probe(void);
-int ax88179_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss);
-int ax88179_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-		      struct eth_device *eth);
-
-void mcs7830_eth_before_probe(void);
-int mcs7830_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		      struct ueth_data *ss);
-int mcs7830_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-			 struct eth_device *eth);
-
-void smsc95xx_eth_before_probe(void);
-int smsc95xx_eth_probe(struct usb_device *dev, unsigned int ifnum,
-			struct ueth_data *ss);
-int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-			struct eth_device *eth);
-
-void r8152_eth_before_probe(void);
-int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
-		    struct ueth_data *ss);
-int r8152_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-		       struct eth_device *eth);
-#endif
 
 #endif /* __USB_ETHER_H__ */
-- 
2.25.1

[PATCH 39/41] usb: gadget: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/gadget/ether.c | 97 --------------------------------------
 drivers/usb/gadget/rndis.c |  9 ----
 drivers/usb/gadget/rndis.h | 11 -----
 3 files changed, 117 deletions(-)

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 43aec7ffa702..85c971e4c43e 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -109,11 +109,7 @@ struct eth_dev {
 
 	struct usb_request	*tx_req, *rx_req;
 
-#ifndef CONFIG_DM_ETH
-	struct eth_device	*net;
-#else
 	struct udevice		*net;
-#endif
 	struct net_device_stats	stats;
 	unsigned int		tx_qlen;
 
@@ -140,11 +136,7 @@ struct eth_dev {
 /*-------------------------------------------------------------------------*/
 struct ether_priv {
 	struct eth_dev ethdev;
-#ifndef CONFIG_DM_ETH
-	struct eth_device netdev;
-#else
 	struct udevice *netdev;
-#endif
 	struct usb_gadget_driver eth_driver;
 };
 
@@ -1827,22 +1819,14 @@ static void rndis_control_ack_complete(struct usb_ep *ep,
 
 static char rndis_resp_buf[8] __attribute__((aligned(sizeof(__le32))));
 
-#ifndef CONFIG_DM_ETH
-static int rndis_control_ack(struct eth_device *net)
-#else
 static int rndis_control_ack(struct udevice *net)
-#endif
 {
 	struct ether_priv *priv;
 	struct eth_dev *dev;
 	int length;
 	struct usb_request *resp;
 
-#ifndef CONFIG_DM_ETH
-	priv = (struct ether_priv *)net->priv;
-#else
 	priv = dev_get_priv(net);
-#endif
 	dev = &priv->ethdev;
 	resp = dev->stat_req;
 
@@ -1989,9 +1973,7 @@ static int eth_bind(struct usb_gadget *gadget)
 	int			status = -ENOMEM;
 	int			gcnum;
 	u8			tmp[7];
-#ifdef CONFIG_DM_ETH
 	struct eth_pdata	*pdata = dev_get_plat(l_priv->netdev);
-#endif
 
 	/* these flags are only ever cleared; compiler take note */
 #ifndef	CONFIG_USB_ETH_CDC
@@ -2168,11 +2150,7 @@ autoconf_fail:
 
 
 	/* network device setup */
-#ifndef CONFIG_DM_ETH
-	dev->net = &l_priv->netdev;
-#else
 	dev->net = l_priv->netdev;
-#endif
 
 	dev->cdc = cdc;
 	dev->zlp = zlp;
@@ -2189,13 +2167,8 @@ autoconf_fail:
 	 * host side code for the SAFE thing cares -- its original BLAN
 	 * thing didn't, Sharp never assigned those addresses on Zaurii.
 	 */
-#ifndef CONFIG_DM_ETH
-	get_ether_addr(dev_addr, dev->net->enetaddr);
-	memcpy(tmp, dev->net->enetaddr, sizeof(dev->net->enetaddr));
-#else
 	get_ether_addr(dev_addr, pdata->enetaddr);
 	memcpy(tmp, pdata->enetaddr, sizeof(pdata->enetaddr));
-#endif
 
 	get_ether_addr(host_addr, dev->host_mac);
 
@@ -2256,11 +2229,7 @@ autoconf_fail:
 		status_ep ? " STATUS " : "",
 		status_ep ? status_ep->name : ""
 		);
-#ifndef CONFIG_DM_ETH
-	printf("MAC %pM\n", dev->net->enetaddr);
-#else
 	printf("MAC %pM\n", pdata->enetaddr);
-#endif
 
 	if (cdc || rndis)
 		printf("HOST MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -2490,71 +2459,6 @@ static void _usb_eth_halt(struct ether_priv *priv)
 	usb_gadget_release(0);
 }
 
-#ifndef CONFIG_DM_ETH
-static int usb_eth_init(struct eth_device *netdev, struct bd_info *bd)
-{
-	struct ether_priv *priv = (struct ether_priv *)netdev->priv;
-
-	return _usb_eth_init(priv);
-}
-
-static int usb_eth_send(struct eth_device *netdev, void *packet, int length)
-{
-	struct ether_priv	*priv = (struct ether_priv *)netdev->priv;
-
-	return _usb_eth_send(priv, packet, length);
-}
-
-static int usb_eth_recv(struct eth_device *netdev)
-{
-	struct ether_priv *priv = (struct ether_priv *)netdev->priv;
-	struct eth_dev *dev = &priv->ethdev;
-	int ret;
-
-	ret = _usb_eth_recv(priv);
-	if (ret) {
-		pr_err("error packet receive\n");
-		return ret;
-	}
-
-	if (!packet_received)
-		return 0;
-
-	if (dev->rx_req) {
-		net_process_received_packet(net_rx_packets[0],
-					    dev->rx_req->length);
-	} else {
-		pr_err("dev->rx_req invalid");
-	}
-	packet_received = 0;
-	rx_submit(dev, dev->rx_req, 0);
-
-	return 0;
-}
-
-void usb_eth_halt(struct eth_device *netdev)
-{
-	struct ether_priv *priv = (struct ether_priv *)netdev->priv;
-
-	_usb_eth_halt(priv);
-}
-
-int usb_eth_initialize(struct bd_info *bi)
-{
-	struct eth_device *netdev = &l_priv->netdev;
-
-	strlcpy(netdev->name, USB_NET_NAME, sizeof(netdev->name));
-
-	netdev->init = usb_eth_init;
-	netdev->send = usb_eth_send;
-	netdev->recv = usb_eth_recv;
-	netdev->halt = usb_eth_halt;
-	netdev->priv = l_priv;
-
-	eth_register(netdev);
-	return 0;
-}
-#else
 static int usb_eth_start(struct udevice *dev)
 {
 	struct ether_priv *priv = dev_get_priv(dev);
@@ -2663,4 +2567,3 @@ U_BOOT_DRIVER(eth_usb) = {
 	.plat_auto	= sizeof(struct eth_pdata),
 	.flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif /* CONFIG_DM_ETH */
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 13c327ea38ad..d2a51829f96f 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -1115,11 +1115,7 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
 	return -ENOTSUPP;
 }
 
-#ifndef CONFIG_DM_ETH
-int rndis_register(int (*rndis_control_ack)(struct eth_device *))
-#else
 int rndis_register(int (*rndis_control_ack)(struct udevice *))
-#endif
 {
 	u8 i;
 
@@ -1147,13 +1143,8 @@ void rndis_deregister(int configNr)
 	return;
 }
 
-#ifndef CONFIG_DM_ETH
-int  rndis_set_param_dev(u8 configNr, struct eth_device *dev, int mtu,
-			 struct net_device_stats *stats, u16 *cdc_filter)
-#else
 int  rndis_set_param_dev(u8 configNr, struct udevice *dev, int mtu,
 			 struct net_device_stats *stats, u16 *cdc_filter)
-#endif
 {
 	debug("%s: configNr = %d\n", __func__, configNr);
 	if (!dev || !stats)
diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h
index e827af0be4aa..77db55a563ff 100644
--- a/drivers/usb/gadget/rndis.h
+++ b/drivers/usb/gadget/rndis.h
@@ -226,13 +226,8 @@ typedef struct rndis_params {
 
 	u32			vendorID;
 	const char		*vendorDescr;
-#ifndef CONFIG_DM_ETH
-	struct eth_device	*dev;
-	int (*ack)(struct eth_device *);
-#else
 	struct udevice		*dev;
 	int (*ack)(struct udevice *);
-#endif
 	struct list_head	resp_queue;
 } rndis_params;
 
@@ -240,15 +235,9 @@ typedef struct rndis_params {
 int  rndis_msg_parser(u8 configNr, u8 *buf);
 enum rndis_state rndis_get_state(int configNr);
 void rndis_deregister(int configNr);
-#ifndef CONFIG_DM_ETH
-int  rndis_register(int (*rndis_control_ack)(struct eth_device *));
-int  rndis_set_param_dev(u8 configNr, struct eth_device *dev, int mtu,
-			 struct net_device_stats *stats, u16 *cdc_filter);
-#else
 int  rndis_register(int (*rndis_control_ack)(struct udevice *));
 int  rndis_set_param_dev(u8 configNr, struct udevice *dev, int mtu,
 			 struct net_device_stats *stats, u16 *cdc_filter);
-#endif
 int  rndis_set_param_vendor(u8 configNr, u32 vendorID,
 			    const char *vendorDescr);
 int  rndis_set_param_medium(u8 configNr, u32 medium, u32 speed);
-- 
2.25.1

[PATCH 40/41] qe: Remove non-DM_ETH code

[Tom Rini]

As DM_ETH is required for all network drivers, it's now safe to remove
the non-DM_ETH support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/qe/Makefile  |    2 +-
 drivers/qe/uccf.c    |  509 ---------------
 drivers/qe/uccf.h    |  119 ----
 drivers/qe/uec.c     | 1436 ------------------------------------------
 drivers/qe/uec.h     |  692 --------------------
 drivers/qe/uec_phy.c |  930 ---------------------------
 drivers/qe/uec_phy.h |  214 -------
 7 files changed, 1 insertion(+), 3901 deletions(-)
 delete mode 100644 drivers/qe/uccf.c
 delete mode 100644 drivers/qe/uccf.h
 delete mode 100644 drivers/qe/uec.c
 delete mode 100644 drivers/qe/uec.h
 delete mode 100644 drivers/qe/uec_phy.c
 delete mode 100644 drivers/qe/uec_phy.h

diff --git a/drivers/qe/Makefile b/drivers/qe/Makefile
index 0d31ed1a429b..12d0b459fba9 100644
--- a/drivers/qe/Makefile
+++ b/drivers/qe/Makefile
@@ -2,6 +2,6 @@
 #
 # Copyright (C) 2006 Freescale Semiconductor, Inc.
 
-obj-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o
+obj-$(CONFIG_QE) += qe.o
 obj-$(CONFIG_U_QE) += qe.o
 obj-$(CONFIG_OF_LIBFDT) += fdt.o
diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c
deleted file mode 100644
index d5d734439cf7..000000000000
--- a/drivers/qe/uccf.c
+++ /dev/null
@@ -1,509 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2006 Freescale Semiconductor, Inc.
- *
- * Dave Liu <daveliu@freescale.com>
- * based on source code of Shlomi Gridish
- */
-
-#include <common.h>
-#include <malloc.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <linux/immap_qe.h>
-#include "uccf.h"
-#include <fsl_qe.h>
-
-#if !defined(CONFIG_DM_ETH)
-void ucc_fast_transmit_on_demand(struct ucc_fast_priv *uccf)
-{
-	out_be16(&uccf->uf_regs->utodr, UCC_FAST_TOD);
-}
-
-u32 ucc_fast_get_qe_cr_subblock(int ucc_num)
-{
-	switch (ucc_num) {
-	case 0:
-		return QE_CR_SUBBLOCK_UCCFAST1;
-	case 1:
-		return QE_CR_SUBBLOCK_UCCFAST2;
-	case 2:
-		return QE_CR_SUBBLOCK_UCCFAST3;
-	case 3:
-		return QE_CR_SUBBLOCK_UCCFAST4;
-	case 4:
-		return QE_CR_SUBBLOCK_UCCFAST5;
-	case 5:
-		return QE_CR_SUBBLOCK_UCCFAST6;
-	case 6:
-		return QE_CR_SUBBLOCK_UCCFAST7;
-	case 7:
-		return QE_CR_SUBBLOCK_UCCFAST8;
-	default:
-		return QE_CR_SUBBLOCK_INVALID;
-	}
-}
-
-static void ucc_get_cmxucr_reg(int ucc_num, u32 **p_cmxucr,
-			       u8 *reg_num, u8 *shift)
-{
-	switch (ucc_num) {
-	case 0:	/* UCC1 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr1;
-		*reg_num = 1;
-		*shift  = 16;
-		break;
-	case 2:	/* UCC3 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr1;
-		*reg_num = 1;
-		*shift  = 0;
-		break;
-	case 4:	/* UCC5 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr2;
-		*reg_num = 2;
-		*shift  = 16;
-		break;
-	case 6:	/* UCC7 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr2;
-		*reg_num = 2;
-		*shift  = 0;
-		break;
-	case 1:	/* UCC2 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr3;
-		*reg_num = 3;
-		*shift  = 16;
-		break;
-	case 3:	/* UCC4 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr3;
-		*reg_num = 3;
-		*shift  = 0;
-		break;
-	case 5:	/* UCC6 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr4;
-		*reg_num = 4;
-		*shift  = 16;
-		break;
-	case 7:	/* UCC8 */
-		*p_cmxucr  = &qe_immr->qmx.cmxucr4;
-		*reg_num = 4;
-		*shift  = 0;
-		break;
-	default:
-		break;
-	}
-}
-
-static int ucc_set_clk_src(int ucc_num, qe_clock_e clock, comm_dir_e mode)
-{
-	u32	*p_cmxucr = NULL;
-	u8	reg_num = 0;
-	u8	shift = 0;
-	u32	clk_bits;
-	u32	clk_mask;
-	int	source = -1;
-
-	/* check if the UCC number is in range. */
-	if ((ucc_num > UCC_MAX_NUM - 1) || ucc_num < 0)
-		return -EINVAL;
-
-	if (!(mode == COMM_DIR_RX || mode == COMM_DIR_TX)) {
-		printf("%s: bad comm mode type passed\n", __func__);
-		return -EINVAL;
-	}
-
-	ucc_get_cmxucr_reg(ucc_num, &p_cmxucr, &reg_num, &shift);
-
-	switch (reg_num) {
-	case 1:
-		switch (clock) {
-		case QE_BRG1:
-			source = 1;
-			break;
-		case QE_BRG2:
-			source = 2;
-			break;
-		case QE_BRG7:
-			source = 3;
-			break;
-		case QE_BRG8:
-			source = 4;
-			break;
-		case QE_CLK9:
-			source = 5;
-			break;
-		case QE_CLK10:
-			source = 6;
-			break;
-		case QE_CLK11:
-			source = 7;
-			break;
-		case QE_CLK12:
-			source = 8;
-			break;
-		case QE_CLK15:
-			source = 9;
-			break;
-		case QE_CLK16:
-			source = 10;
-			break;
-		default:
-			source = -1;
-			break;
-		}
-		break;
-	case 2:
-		switch (clock) {
-		case QE_BRG5:
-			source = 1;
-			break;
-		case QE_BRG6:
-			source = 2;
-			break;
-		case QE_BRG7:
-			source = 3;
-			break;
-		case QE_BRG8:
-			source = 4;
-			break;
-		case QE_CLK13:
-			source = 5;
-			break;
-		case QE_CLK14:
-			source = 6;
-			break;
-		case QE_CLK19:
-			source = 7;
-			break;
-		case QE_CLK20:
-			source = 8;
-			break;
-		case QE_CLK15:
-			source = 9;
-			break;
-		case QE_CLK16:
-			source = 10;
-			break;
-		default:
-			source = -1;
-			break;
-		}
-		break;
-	case 3:
-		switch (clock) {
-		case QE_BRG9:
-			source = 1;
-			break;
-		case QE_BRG10:
-			source = 2;
-			break;
-		case QE_BRG15:
-			source = 3;
-			break;
-		case QE_BRG16:
-			source = 4;
-			break;
-		case QE_CLK3:
-			source = 5;
-			break;
-		case QE_CLK4:
-			source = 6;
-			break;
-		case QE_CLK17:
-			source = 7;
-			break;
-		case QE_CLK18:
-			source = 8;
-			break;
-		case QE_CLK7:
-			source = 9;
-			break;
-		case QE_CLK8:
-			source = 10;
-			break;
-		case QE_CLK16:
-			source = 11;
-			break;
-		default:
-			source = -1;
-			break;
-		}
-		break;
-	case 4:
-		switch (clock) {
-		case QE_BRG13:
-			source = 1;
-			break;
-		case QE_BRG14:
-			source = 2;
-			break;
-		case QE_BRG15:
-			source = 3;
-			break;
-		case QE_BRG16:
-			source = 4;
-			break;
-		case QE_CLK5:
-			source = 5;
-			break;
-		case QE_CLK6:
-			source = 6;
-			break;
-		case QE_CLK21:
-			source = 7;
-			break;
-		case QE_CLK22:
-			source = 8;
-			break;
-		case QE_CLK7:
-			source = 9;
-			break;
-		case QE_CLK8:
-			source = 10;
-			break;
-		case QE_CLK16:
-			source = 11;
-			break;
-		default:
-			source = -1;
-			break;
-		}
-		break;
-	default:
-		source = -1;
-		break;
-	}
-
-	if (source == -1) {
-		printf("%s: Bad combination of clock and UCC\n", __func__);
-		return -ENOENT;
-	}
-
-	clk_bits = (u32)source;
-	clk_mask = QE_CMXUCR_TX_CLK_SRC_MASK;
-	if (mode == COMM_DIR_RX) {
-		clk_bits <<= 4; /* Rx field is 4 bits to left of Tx field */
-		clk_mask <<= 4; /* Rx field is 4 bits to left of Tx field */
-	}
-	clk_bits <<= shift;
-	clk_mask <<= shift;
-
-	out_be32(p_cmxucr, (in_be32(p_cmxucr) & ~clk_mask) | clk_bits);
-
-	return 0;
-}
-
-static uint ucc_get_reg_baseaddr(int ucc_num)
-{
-	uint base = 0;
-
-	/* check if the UCC number is in range */
-	if ((ucc_num > UCC_MAX_NUM - 1) || ucc_num < 0) {
-		printf("%s: the UCC num not in ranges\n", __func__);
-		return 0;
-	}
-
-	switch (ucc_num) {
-	case 0:
-		base = 0x00002000;
-		break;
-	case 1:
-		base = 0x00003000;
-		break;
-	case 2:
-		base = 0x00002200;
-		break;
-	case 3:
-		base = 0x00003200;
-		break;
-	case 4:
-		base = 0x00002400;
-		break;
-	case 5:
-		base = 0x00003400;
-		break;
-	case 6:
-		base = 0x00002600;
-		break;
-	case 7:
-		base = 0x00003600;
-		break;
-	default:
-		break;
-	}
-
-	base = (uint)qe_immr + base;
-	return base;
-}
-
-void ucc_fast_enable(struct ucc_fast_priv *uccf, comm_dir_e mode)
-{
-	ucc_fast_t	*uf_regs;
-	u32		gumr;
-
-	uf_regs = uccf->uf_regs;
-
-	/* Enable reception and/or transmission on this UCC. */
-	gumr = in_be32(&uf_regs->gumr);
-	if (mode & COMM_DIR_TX) {
-		gumr |= UCC_FAST_GUMR_ENT;
-		uccf->enabled_tx = 1;
-	}
-	if (mode & COMM_DIR_RX) {
-		gumr |= UCC_FAST_GUMR_ENR;
-		uccf->enabled_rx = 1;
-	}
-	out_be32(&uf_regs->gumr, gumr);
-}
-
-void ucc_fast_disable(struct ucc_fast_priv *uccf, comm_dir_e mode)
-{
-	ucc_fast_t	*uf_regs;
-	u32		gumr;
-
-	uf_regs = uccf->uf_regs;
-
-	/* Disable reception and/or transmission on this UCC. */
-	gumr = in_be32(&uf_regs->gumr);
-	if (mode & COMM_DIR_TX) {
-		gumr &= ~UCC_FAST_GUMR_ENT;
-		uccf->enabled_tx = 0;
-	}
-	if (mode & COMM_DIR_RX) {
-		gumr &= ~UCC_FAST_GUMR_ENR;
-		uccf->enabled_rx = 0;
-	}
-	out_be32(&uf_regs->gumr, gumr);
-}
-
-int ucc_fast_init(struct ucc_fast_inf *uf_info,
-		  struct ucc_fast_priv **uccf_ret)
-{
-	struct ucc_fast_priv	*uccf;
-	ucc_fast_t		*uf_regs;
-
-	if (!uf_info)
-		return -EINVAL;
-
-	if (uf_info->ucc_num < 0 || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
-		printf("%s: Illagal UCC number!\n", __func__);
-		return -EINVAL;
-	}
-
-	uccf = (struct ucc_fast_priv *)malloc(sizeof(struct ucc_fast_priv));
-	if (!uccf) {
-		printf("%s: No memory for UCC fast data structure!\n",
-		       __func__);
-		return -ENOMEM;
-	}
-	memset(uccf, 0, sizeof(struct ucc_fast_priv));
-
-	/* Save fast UCC structure */
-	uccf->uf_info	= uf_info;
-	uccf->uf_regs	= (ucc_fast_t *)ucc_get_reg_baseaddr(uf_info->ucc_num);
-
-	if (!uccf->uf_regs) {
-		printf("%s: No memory map for UCC fast controller!\n",
-		       __func__);
-		return -ENOMEM;
-	}
-
-	uccf->enabled_tx	= 0;
-	uccf->enabled_rx	= 0;
-
-	uf_regs			= uccf->uf_regs;
-	uccf->p_ucce		= (u32 *)&uf_regs->ucce;
-	uccf->p_uccm		= (u32 *)&uf_regs->uccm;
-
-	/* Init GUEMR register, UCC both Rx and Tx is Fast protocol */
-	out_8(&uf_regs->guemr, UCC_GUEMR_SET_RESERVED3 | UCC_GUEMR_MODE_FAST_RX
-				 | UCC_GUEMR_MODE_FAST_TX);
-
-	/* Set GUMR, disable UCC both Rx and Tx, Ethernet protocol */
-	out_be32(&uf_regs->gumr, UCC_FAST_GUMR_ETH);
-
-	/* Set the Giga ethernet VFIFO stuff */
-	if (uf_info->eth_type == GIGA_ETH) {
-		/* Allocate memory for Tx Virtual Fifo */
-		uccf->ucc_fast_tx_virtual_fifo_base_offset =
-		qe_muram_alloc(UCC_GETH_UTFS_GIGA_INIT,
-			       UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
-
-		/* Allocate memory for Rx Virtual Fifo */
-		uccf->ucc_fast_rx_virtual_fifo_base_offset =
-		qe_muram_alloc(UCC_GETH_URFS_GIGA_INIT +
-			       UCC_FAST_RX_VIRTUAL_FIFO_SIZE_PAD,
-			       UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
-
-		/* utfb, urfb are offsets from MURAM base */
-		out_be32(&uf_regs->utfb,
-			 uccf->ucc_fast_tx_virtual_fifo_base_offset);
-		out_be32(&uf_regs->urfb,
-			 uccf->ucc_fast_rx_virtual_fifo_base_offset);
-
-		/* Set Virtual Fifo registers */
-		out_be16(&uf_regs->urfs, UCC_GETH_URFS_GIGA_INIT);
-		out_be16(&uf_regs->urfet, UCC_GETH_URFET_GIGA_INIT);
-		out_be16(&uf_regs->urfset, UCC_GETH_URFSET_GIGA_INIT);
-		out_be16(&uf_regs->utfs, UCC_GETH_UTFS_GIGA_INIT);
-		out_be16(&uf_regs->utfet, UCC_GETH_UTFET_GIGA_INIT);
-		out_be16(&uf_regs->utftt, UCC_GETH_UTFTT_GIGA_INIT);
-	}
-
-	/* Set the Fast ethernet VFIFO stuff */
-	if (uf_info->eth_type == FAST_ETH) {
-		/* Allocate memory for Tx Virtual Fifo */
-		uccf->ucc_fast_tx_virtual_fifo_base_offset =
-		qe_muram_alloc(UCC_GETH_UTFS_INIT,
-			       UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
-
-		/* Allocate memory for Rx Virtual Fifo */
-		uccf->ucc_fast_rx_virtual_fifo_base_offset =
-		qe_muram_alloc(UCC_GETH_URFS_INIT +
-				 UCC_FAST_RX_VIRTUAL_FIFO_SIZE_PAD,
-				UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
-
-		/* utfb, urfb are offsets from MURAM base */
-		out_be32(&uf_regs->utfb,
-			 uccf->ucc_fast_tx_virtual_fifo_base_offset);
-		out_be32(&uf_regs->urfb,
-			 uccf->ucc_fast_rx_virtual_fifo_base_offset);
-
-		/* Set Virtual Fifo registers */
-		out_be16(&uf_regs->urfs, UCC_GETH_URFS_INIT);
-		out_be16(&uf_regs->urfet, UCC_GETH_URFET_INIT);
-		out_be16(&uf_regs->urfset, UCC_GETH_URFSET_INIT);
-		out_be16(&uf_regs->utfs, UCC_GETH_UTFS_INIT);
-		out_be16(&uf_regs->utfet, UCC_GETH_UTFET_INIT);
-		out_be16(&uf_regs->utftt, UCC_GETH_UTFTT_INIT);
-	}
-
-	/* Rx clock routing */
-	if (uf_info->rx_clock != QE_CLK_NONE) {
-		if (ucc_set_clk_src(uf_info->ucc_num,
-				    uf_info->rx_clock, COMM_DIR_RX)) {
-			printf("%s: Illegal value for parameter 'RxClock'.\n",
-			       __func__);
-			return -EINVAL;
-		}
-	}
-
-	/* Tx clock routing */
-	if (uf_info->tx_clock != QE_CLK_NONE) {
-		if (ucc_set_clk_src(uf_info->ucc_num,
-				    uf_info->tx_clock, COMM_DIR_TX)) {
-			printf("%s: Illegal value for parameter 'TxClock'.\n",
-			       __func__);
-			return -EINVAL;
-		}
-	}
-
-	/* Clear interrupt mask register to disable all of interrupts */
-	out_be32(&uf_regs->uccm, 0x0);
-
-	/* Writing '1' to clear all of envents */
-	out_be32(&uf_regs->ucce, 0xffffffff);
-
-	*uccf_ret = uccf;
-	return 0;
-}
-#endif
diff --git a/drivers/qe/uccf.h b/drivers/qe/uccf.h
deleted file mode 100644
index 99f8458edf67..000000000000
--- a/drivers/qe/uccf.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2006 Freescale Semiconductor, Inc.
- *
- * Dave Liu <daveliu@freescale.com>
- * based on source code of Shlomi Gridish
- */
-
-#ifndef __UCCF_H__
-#define __UCCF_H__
-
-#include "common.h"
-#include "linux/immap_qe.h"
-#include <fsl_qe.h>
-
-/* Fast or Giga ethernet */
-enum enet_type {
-	FAST_ETH,
-	GIGA_ETH,
-};
-
-/* General UCC Extended Mode Register */
-#define UCC_GUEMR_MODE_MASK_RX		0x02
-#define UCC_GUEMR_MODE_MASK_TX		0x01
-#define UCC_GUEMR_MODE_FAST_RX		0x02
-#define UCC_GUEMR_MODE_FAST_TX		0x01
-#define UCC_GUEMR_MODE_SLOW_RX		0x00
-#define UCC_GUEMR_MODE_SLOW_TX		0x00
-/* Bit 3 must be set 1 */
-#define UCC_GUEMR_SET_RESERVED3		0x10
-
-/* General UCC FAST Mode Register */
-#define UCC_FAST_GUMR_TCI		0x20000000
-#define UCC_FAST_GUMR_TRX		0x10000000
-#define UCC_FAST_GUMR_TTX		0x08000000
-#define UCC_FAST_GUMR_CDP		0x04000000
-#define UCC_FAST_GUMR_CTSP		0x02000000
-#define UCC_FAST_GUMR_CDS		0x01000000
-#define UCC_FAST_GUMR_CTSS		0x00800000
-#define UCC_FAST_GUMR_TXSY		0x00020000
-#define UCC_FAST_GUMR_RSYN		0x00010000
-#define UCC_FAST_GUMR_RTSM		0x00002000
-#define UCC_FAST_GUMR_REVD		0x00000400
-#define UCC_FAST_GUMR_ENR		0x00000020
-#define UCC_FAST_GUMR_ENT		0x00000010
-
-/* GUMR [MODE] bit maps */
-#define UCC_FAST_GUMR_HDLC		0x00000000
-#define UCC_FAST_GUMR_QMC		0x00000002
-#define UCC_FAST_GUMR_UART		0x00000004
-#define UCC_FAST_GUMR_BISYNC		0x00000008
-#define UCC_FAST_GUMR_ATM		0x0000000a
-#define UCC_FAST_GUMR_ETH		0x0000000c
-
-/* Transmit On Demand (UTORD) */
-#define UCC_SLOW_TOD			0x8000
-#define UCC_FAST_TOD			0x8000
-
-/* Fast Ethernet (10/100 Mbps) */
-/* Rx virtual FIFO size */
-#define UCC_GETH_URFS_INIT		512
-/* 1/2 urfs */
-#define UCC_GETH_URFET_INIT		256
-/* 3/4 urfs */
-#define UCC_GETH_URFSET_INIT		384
-/* Tx virtual FIFO size */
-#define UCC_GETH_UTFS_INIT		512
-/* 1/2 utfs */
-#define UCC_GETH_UTFET_INIT		256
-#define UCC_GETH_UTFTT_INIT		128
-
-/* Gigabit Ethernet (1000 Mbps) */
-/* Rx virtual FIFO size */
-#define UCC_GETH_URFS_GIGA_INIT		4096/*2048*/
-/* 1/2 urfs */
-#define UCC_GETH_URFET_GIGA_INIT	2048/*1024*/
-/* 3/4 urfs */
-#define UCC_GETH_URFSET_GIGA_INIT	3072/*1536*/
-/* Tx virtual FIFO size */
-#define UCC_GETH_UTFS_GIGA_INIT		8192/*2048*/
-/* 1/2 utfs */
-#define UCC_GETH_UTFET_GIGA_INIT	4096/*1024*/
-#define UCC_GETH_UTFTT_GIGA_INIT	0x400/*0x40*/
-
-/* UCC fast alignment */
-#define UCC_FAST_RX_ALIGN			4
-#define UCC_FAST_MRBLR_ALIGNMENT		4
-#define UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT	8
-
-/* Sizes */
-#define UCC_FAST_RX_VIRTUAL_FIFO_SIZE_PAD	8
-
-/* UCC fast structure. */
-struct ucc_fast_inf {
-	int		ucc_num;
-	qe_clock_e	rx_clock;
-	qe_clock_e	tx_clock;
-	enum enet_type	eth_type;
-};
-
-struct ucc_fast_priv {
-	struct ucc_fast_inf	*uf_info;
-	ucc_fast_t	*uf_regs; /* a pointer to memory map of UCC regs */
-	u32		*p_ucce; /* a pointer to the event register */
-	u32		*p_uccm; /* a pointer to the mask register */
-	int		enabled_tx; /* whether UCC is enabled for Tx (ENT) */
-	int		enabled_rx; /* whether UCC is enabled for Rx (ENR) */
-	u32		ucc_fast_tx_virtual_fifo_base_offset;
-	u32		ucc_fast_rx_virtual_fifo_base_offset;
-};
-
-void ucc_fast_transmit_on_demand(struct ucc_fast_priv *uccf);
-u32 ucc_fast_get_qe_cr_subblock(int ucc_num);
-void ucc_fast_enable(struct ucc_fast_priv *uccf, comm_dir_e mode);
-void ucc_fast_disable(struct ucc_fast_priv *uccf, comm_dir_e mode);
-int ucc_fast_init(struct ucc_fast_inf *uf_info,
-		  struct ucc_fast_priv **uccf_ret);
-
-#endif /* __UCCF_H__ */
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
deleted file mode 100644
index 310887964352..000000000000
--- a/drivers/qe/uec.c
+++ /dev/null
@@ -1,1436 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2006-2011 Freescale Semiconductor, Inc.
- *
- * Dave Liu <daveliu@freescale.com>
- */
-
-#include <common.h>
-#include <log.h>
-#include <net.h>
-#include <malloc.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <asm/io.h>
-#include <linux/immap_qe.h>
-#include "uccf.h"
-#include "uec.h"
-#include "uec_phy.h"
-#include "miiphy.h"
-#include <fsl_qe.h>
-#include <phy.h>
-
-#if !defined(CONFIG_DM_ETH)
-/* Default UTBIPAR SMI address */
-#ifndef CONFIG_UTBIPAR_INIT_TBIPA
-#define CONFIG_UTBIPAR_INIT_TBIPA 0x1F
-#endif
-
-static struct uec_inf uec_info[] = {
-#ifdef CONFIG_UEC_ETH1
-	STD_UEC_INFO(1),	/* UEC1 */
-#endif
-#ifdef CONFIG_UEC_ETH2
-	STD_UEC_INFO(2),	/* UEC2 */
-#endif
-#ifdef CONFIG_UEC_ETH3
-	STD_UEC_INFO(3),	/* UEC3 */
-#endif
-#ifdef CONFIG_UEC_ETH4
-	STD_UEC_INFO(4),	/* UEC4 */
-#endif
-#ifdef CONFIG_UEC_ETH5
-	STD_UEC_INFO(5),	/* UEC5 */
-#endif
-#ifdef CONFIG_UEC_ETH6
-	STD_UEC_INFO(6),	/* UEC6 */
-#endif
-#ifdef CONFIG_UEC_ETH7
-	STD_UEC_INFO(7),	/* UEC7 */
-#endif
-#ifdef CONFIG_UEC_ETH8
-	STD_UEC_INFO(8),	/* UEC8 */
-#endif
-};
-
-#define MAXCONTROLLERS	(8)
-
-static struct eth_device *devlist[MAXCONTROLLERS];
-
-static int uec_mac_enable(struct uec_priv *uec, comm_dir_e mode)
-{
-	uec_t		*uec_regs;
-	u32		maccfg1;
-
-	if (!uec) {
-		printf("%s: uec not initial\n", __func__);
-		return -EINVAL;
-	}
-	uec_regs = uec->uec_regs;
-
-	maccfg1 = in_be32(&uec_regs->maccfg1);
-
-	if (mode & COMM_DIR_TX)	{
-		maccfg1 |= MACCFG1_ENABLE_TX;
-		out_be32(&uec_regs->maccfg1, maccfg1);
-		uec->mac_tx_enabled = 1;
-	}
-
-	if (mode & COMM_DIR_RX)	{
-		maccfg1 |= MACCFG1_ENABLE_RX;
-		out_be32(&uec_regs->maccfg1, maccfg1);
-		uec->mac_rx_enabled = 1;
-	}
-
-	return 0;
-}
-
-static int uec_mac_disable(struct uec_priv *uec, comm_dir_e mode)
-{
-	uec_t		*uec_regs;
-	u32		maccfg1;
-
-	if (!uec) {
-		printf("%s: uec not initial\n", __func__);
-		return -EINVAL;
-	}
-	uec_regs = uec->uec_regs;
-
-	maccfg1 = in_be32(&uec_regs->maccfg1);
-
-	if (mode & COMM_DIR_TX)	{
-		maccfg1 &= ~MACCFG1_ENABLE_TX;
-		out_be32(&uec_regs->maccfg1, maccfg1);
-		uec->mac_tx_enabled = 0;
-	}
-
-	if (mode & COMM_DIR_RX)	{
-		maccfg1 &= ~MACCFG1_ENABLE_RX;
-		out_be32(&uec_regs->maccfg1, maccfg1);
-		uec->mac_rx_enabled = 0;
-	}
-
-	return 0;
-}
-
-static int uec_graceful_stop_tx(struct uec_priv *uec)
-{
-	ucc_fast_t		*uf_regs;
-	u32			cecr_subblock;
-	u32			ucce;
-
-	if (!uec || !uec->uccf) {
-		printf("%s: No handle passed.\n", __func__);
-		return -EINVAL;
-	}
-
-	uf_regs = uec->uccf->uf_regs;
-
-	/* Clear the grace stop event */
-	out_be32(&uf_regs->ucce, UCCE_GRA);
-
-	/* Issue host command */
-	cecr_subblock =
-		 ucc_fast_get_qe_cr_subblock(uec->uec_info->uf_info.ucc_num);
-	qe_issue_cmd(QE_GRACEFUL_STOP_TX, cecr_subblock,
-		     (u8)QE_CR_PROTOCOL_ETHERNET, 0);
-
-	/* Wait for command to complete */
-	do {
-		ucce = in_be32(&uf_regs->ucce);
-	} while (!(ucce & UCCE_GRA));
-
-	uec->grace_stopped_tx = 1;
-
-	return 0;
-}
-
-static int uec_graceful_stop_rx(struct uec_priv *uec)
-{
-	u32		cecr_subblock;
-	u8		ack;
-
-	if (!uec) {
-		printf("%s: No handle passed.\n", __func__);
-		return -EINVAL;
-	}
-
-	if (!uec->p_rx_glbl_pram) {
-		printf("%s: No init rx global parameter\n", __func__);
-		return -EINVAL;
-	}
-
-	/* Clear acknowledge bit */
-	ack = uec->p_rx_glbl_pram->rxgstpack;
-	ack &= ~GRACEFUL_STOP_ACKNOWLEDGE_RX;
-	uec->p_rx_glbl_pram->rxgstpack = ack;
-
-	/* Keep issuing cmd and checking ack bit until it is asserted */
-	do {
-		/* Issue host command */
-		cecr_subblock =
-		 ucc_fast_get_qe_cr_subblock(uec->uec_info->uf_info.ucc_num);
-		qe_issue_cmd(QE_GRACEFUL_STOP_RX, cecr_subblock,
-			     (u8)QE_CR_PROTOCOL_ETHERNET, 0);
-		ack = uec->p_rx_glbl_pram->rxgstpack;
-	} while (!(ack & GRACEFUL_STOP_ACKNOWLEDGE_RX));
-
-	uec->grace_stopped_rx = 1;
-
-	return 0;
-}
-
-static int uec_restart_tx(struct uec_priv *uec)
-{
-	u32		cecr_subblock;
-
-	if (!uec || !uec->uec_info) {
-		printf("%s: No handle passed.\n", __func__);
-		return -EINVAL;
-	}
-
-	cecr_subblock =
-	 ucc_fast_get_qe_cr_subblock(uec->uec_info->uf_info.ucc_num);
-	qe_issue_cmd(QE_RESTART_TX, cecr_subblock,
-		     (u8)QE_CR_PROTOCOL_ETHERNET, 0);
-
-	uec->grace_stopped_tx = 0;
-
-	return 0;
-}
-
-static int uec_restart_rx(struct uec_priv *uec)
-{
-	u32		cecr_subblock;
-
-	if (!uec || !uec->uec_info) {
-		printf("%s: No handle passed.\n", __func__);
-		return -EINVAL;
-	}
-
-	cecr_subblock =
-	 ucc_fast_get_qe_cr_subblock(uec->uec_info->uf_info.ucc_num);
-	qe_issue_cmd(QE_RESTART_RX, cecr_subblock,
-		     (u8)QE_CR_PROTOCOL_ETHERNET, 0);
-
-	uec->grace_stopped_rx = 0;
-
-	return 0;
-}
-
-static int uec_open(struct uec_priv *uec, comm_dir_e mode)
-{
-	struct ucc_fast_priv	*uccf;
-
-	if (!uec || !uec->uccf) {
-		printf("%s: No handle passed.\n", __func__);
-		return -EINVAL;
-	}
-	uccf = uec->uccf;
-
-	/* check if the UCC number is in range. */
-	if (uec->uec_info->uf_info.ucc_num >= UCC_MAX_NUM) {
-		printf("%s: ucc_num out of range.\n", __func__);
-		return -EINVAL;
-	}
-
-	/* Enable MAC */
-	uec_mac_enable(uec, mode);
-
-	/* Enable UCC fast */
-	ucc_fast_enable(uccf, mode);
-
-	/* RISC microcode start */
-	if ((mode & COMM_DIR_TX) && uec->grace_stopped_tx)
-		uec_restart_tx(uec);
-	if ((mode & COMM_DIR_RX) && uec->grace_stopped_rx)
-		uec_restart_rx(uec);
-
-	return 0;
-}
-
-static int uec_stop(struct uec_priv *uec, comm_dir_e mode)
-{
-	if (!uec || !uec->uccf) {
-		printf("%s: No handle passed.\n", __func__);
-		return -EINVAL;
-	}
-
-	/* check if the UCC number is in range. */
-	if (uec->uec_info->uf_info.ucc_num >= UCC_MAX_NUM) {
-		printf("%s: ucc_num out of range.\n", __func__);
-		return -EINVAL;
-	}
-	/* Stop any transmissions */
-	if ((mode & COMM_DIR_TX) && !uec->grace_stopped_tx)
-		uec_graceful_stop_tx(uec);
-
-	/* Stop any receptions */
-	if ((mode & COMM_DIR_RX) && !uec->grace_stopped_rx)
-		uec_graceful_stop_rx(uec);
-
-	/* Disable the UCC fast */
-	ucc_fast_disable(uec->uccf, mode);
-
-	/* Disable the MAC */
-	uec_mac_disable(uec, mode);
-
-	return 0;
-}
-
-static int uec_set_mac_duplex(struct uec_priv *uec, int duplex)
-{
-	uec_t		*uec_regs;
-	u32		maccfg2;
-
-	if (!uec) {
-		printf("%s: uec not initial\n", __func__);
-		return -EINVAL;
-	}
-	uec_regs = uec->uec_regs;
-
-	if (duplex == DUPLEX_HALF) {
-		maccfg2 = in_be32(&uec_regs->maccfg2);
-		maccfg2 &= ~MACCFG2_FDX;
-		out_be32(&uec_regs->maccfg2, maccfg2);
-	}
-
-	if (duplex == DUPLEX_FULL) {
-		maccfg2 = in_be32(&uec_regs->maccfg2);
-		maccfg2 |= MACCFG2_FDX;
-		out_be32(&uec_regs->maccfg2, maccfg2);
-	}
-
-	return 0;
-}
-
-static int uec_set_mac_if_mode(struct uec_priv *uec,
-			       phy_interface_t if_mode, int speed)
-{
-	phy_interface_t		enet_if_mode;
-	uec_t			*uec_regs;
-	u32			upsmr;
-	u32			maccfg2;
-
-	if (!uec) {
-		printf("%s: uec not initial\n", __func__);
-		return -EINVAL;
-	}
-
-	uec_regs = uec->uec_regs;
-	enet_if_mode = if_mode;
-
-	maccfg2 = in_be32(&uec_regs->maccfg2);
-	maccfg2 &= ~MACCFG2_INTERFACE_MODE_MASK;
-
-	upsmr = in_be32(&uec->uccf->uf_regs->upsmr);
-	upsmr &= ~(UPSMR_RPM | UPSMR_TBIM | UPSMR_R10M | UPSMR_RMM);
-
-	switch (speed) {
-	case SPEED_10:
-		maccfg2 |= MACCFG2_INTERFACE_MODE_NIBBLE;
-		switch (enet_if_mode) {
-		case PHY_INTERFACE_MODE_MII:
-			break;
-		case PHY_INTERFACE_MODE_RGMII:
-			upsmr |= (UPSMR_RPM | UPSMR_R10M);
-			break;
-		case PHY_INTERFACE_MODE_RMII:
-			upsmr |= (UPSMR_R10M | UPSMR_RMM);
-			break;
-		default:
-			return -EINVAL;
-		}
-		break;
-	case SPEED_100:
-		maccfg2 |= MACCFG2_INTERFACE_MODE_NIBBLE;
-		switch (enet_if_mode) {
-		case PHY_INTERFACE_MODE_MII:
-			break;
-		case PHY_INTERFACE_MODE_RGMII:
-			upsmr |= UPSMR_RPM;
-			break;
-		case PHY_INTERFACE_MODE_RMII:
-			upsmr |= UPSMR_RMM;
-			break;
-		default:
-			return -EINVAL;
-		}
-		break;
-	case SPEED_1000:
-		maccfg2 |= MACCFG2_INTERFACE_MODE_BYTE;
-		switch (enet_if_mode) {
-		case PHY_INTERFACE_MODE_GMII:
-			break;
-		case PHY_INTERFACE_MODE_TBI:
-			upsmr |= UPSMR_TBIM;
-			break;
-		case PHY_INTERFACE_MODE_RTBI:
-			upsmr |= (UPSMR_RPM | UPSMR_TBIM);
-			break;
-		case PHY_INTERFACE_MODE_RGMII_RXID:
-		case PHY_INTERFACE_MODE_RGMII_TXID:
-		case PHY_INTERFACE_MODE_RGMII_ID:
-		case PHY_INTERFACE_MODE_RGMII:
-			upsmr |= UPSMR_RPM;
-			break;
-		case PHY_INTERFACE_MODE_SGMII:
-			upsmr |= UPSMR_SGMM;
-			break;
-		default:
-			return -EINVAL;
-		}
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	out_be32(&uec_regs->maccfg2, maccfg2);
-	out_be32(&uec->uccf->uf_regs->upsmr, upsmr);
-
-	return 0;
-}
-
-static int init_mii_management_configuration(uec_mii_t *uec_mii_regs)
-{
-	uint		timeout = 0x1000;
-	u32		miimcfg = 0;
-
-	miimcfg = in_be32(&uec_mii_regs->miimcfg);
-	miimcfg |= MIIMCFG_MNGMNT_CLC_DIV_INIT_VALUE;
-	out_be32(&uec_mii_regs->miimcfg, miimcfg);
-
-	/* Wait until the bus is free */
-	while ((in_be32(&uec_mii_regs->miimcfg) & MIIMIND_BUSY) && timeout--)
-		;
-	if (timeout <= 0) {
-		printf("%s: The MII Bus is stuck!", __func__);
-		return -ETIMEDOUT;
-	}
-
-	return 0;
-}
-
-static int init_phy(struct eth_device *dev)
-{
-	struct uec_priv		*uec;
-	uec_mii_t		*umii_regs;
-	struct uec_mii_info	*mii_info;
-	struct phy_info		*curphy;
-	int			err;
-
-	uec = (struct uec_priv *)dev->priv;
-	umii_regs = uec->uec_mii_regs;
-
-	uec->oldlink = 0;
-	uec->oldspeed = 0;
-	uec->oldduplex = -1;
-
-	mii_info = malloc(sizeof(*mii_info));
-	if (!mii_info) {
-		printf("%s: Could not allocate mii_info", dev->name);
-		return -ENOMEM;
-	}
-	memset(mii_info, 0, sizeof(*mii_info));
-
-	if (uec->uec_info->uf_info.eth_type == GIGA_ETH)
-		mii_info->speed = SPEED_1000;
-	else
-		mii_info->speed = SPEED_100;
-
-	mii_info->duplex = DUPLEX_FULL;
-	mii_info->pause = 0;
-	mii_info->link = 1;
-
-	mii_info->advertising = (ADVERTISED_10baseT_Half |
-				ADVERTISED_10baseT_Full |
-				ADVERTISED_100baseT_Half |
-				ADVERTISED_100baseT_Full |
-				ADVERTISED_1000baseT_Full);
-	mii_info->autoneg = 1;
-	mii_info->mii_id = uec->uec_info->phy_address;
-	mii_info->dev = dev;
-
-	mii_info->mdio_read = &uec_read_phy_reg;
-	mii_info->mdio_write = &uec_write_phy_reg;
-
-	uec->mii_info = mii_info;
-
-	qe_set_mii_clk_src(uec->uec_info->uf_info.ucc_num);
-
-	if (init_mii_management_configuration(umii_regs)) {
-		printf("%s: The MII Bus is stuck!", dev->name);
-		err = -1;
-		goto bus_fail;
-	}
-
-	/* get info for this PHY */
-	curphy = uec_get_phy_info(uec->mii_info);
-	if (!curphy) {
-		printf("%s: No PHY found", dev->name);
-		err = -1;
-		goto no_phy;
-	}
-
-	mii_info->phyinfo = curphy;
-
-	/* Run the commands which initialize the PHY */
-	if (curphy->init) {
-		err = curphy->init(uec->mii_info);
-		if (err)
-			goto phy_init_fail;
-	}
-
-	return 0;
-
-phy_init_fail:
-no_phy:
-bus_fail:
-	free(mii_info);
-	return err;
-}
-
-static void adjust_link(struct eth_device *dev)
-{
-	struct uec_priv		*uec = (struct uec_priv *)dev->priv;
-	struct uec_mii_info	*mii_info = uec->mii_info;
-
-	if (mii_info->link) {
-		/*
-		 * Now we make sure that we can be in full duplex mode.
-		 * If not, we operate in half-duplex mode.
-		 */
-		if (mii_info->duplex != uec->oldduplex) {
-			if (!(mii_info->duplex)) {
-				uec_set_mac_duplex(uec, DUPLEX_HALF);
-				printf("%s: Half Duplex\n", dev->name);
-			} else {
-				uec_set_mac_duplex(uec, DUPLEX_FULL);
-				printf("%s: Full Duplex\n", dev->name);
-			}
-			uec->oldduplex = mii_info->duplex;
-		}
-
-		if (mii_info->speed != uec->oldspeed) {
-			phy_interface_t mode =
-				uec->uec_info->enet_interface_type;
-			if (uec->uec_info->uf_info.eth_type == GIGA_ETH) {
-				switch (mii_info->speed) {
-				case SPEED_1000:
-					break;
-				case SPEED_100:
-					printf("switching to rgmii 100\n");
-					mode = PHY_INTERFACE_MODE_RGMII;
-					break;
-				case SPEED_10:
-					printf("switching to rgmii 10\n");
-					mode = PHY_INTERFACE_MODE_RGMII;
-					break;
-				default:
-					printf("%s: Ack,Speed(%d)is illegal\n",
-					       dev->name, mii_info->speed);
-					break;
-				}
-			}
-
-			/* change phy */
-			change_phy_interface_mode(dev, mode, mii_info->speed);
-			/* change the MAC interface mode */
-			uec_set_mac_if_mode(uec, mode, mii_info->speed);
-
-			printf("%s: Speed %dBT\n", dev->name, mii_info->speed);
-			uec->oldspeed = mii_info->speed;
-		}
-
-		if (!uec->oldlink) {
-			printf("%s: Link is up\n", dev->name);
-			uec->oldlink = 1;
-		}
-
-	} else { /* if (mii_info->link) */
-		if (uec->oldlink) {
-			printf("%s: Link is down\n", dev->name);
-			uec->oldlink = 0;
-			uec->oldspeed = 0;
-			uec->oldduplex = -1;
-		}
-	}
-}
-
-static void phy_change(struct eth_device *dev)
-{
-	struct uec_priv	*uec = (struct uec_priv *)dev->priv;
-
-#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
-	ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
-
-	/* QE9 and QE12 need to be set for enabling QE MII management signals */
-	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE9);
-	setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE12);
-#endif
-
-	/* Update the link, speed, duplex */
-	uec->mii_info->phyinfo->read_status(uec->mii_info);
-
-#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
-	/*
-	 * QE12 is muxed with LBCTL, it needs to be released for enabling
-	 * LBCTL signal for LBC usage.
-	 */
-	clrbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE12);
-#endif
-
-	/* Adjust the interface according to speed */
-	adjust_link(dev);
-}
-
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-
-/*
- * Find a device index from the devlist by name
- *
- * Returns:
- *  The index where the device is located, -1 on error
- */
-static int uec_miiphy_find_dev_by_name(const char *devname)
-{
-	int i;
-
-	for (i = 0; i < MAXCONTROLLERS; i++) {
-		if (strncmp(devname, devlist[i]->name, strlen(devname)) == 0)
-			break;
-	}
-
-	/* If device cannot be found, returns -1 */
-	if (i == MAXCONTROLLERS) {
-		debug("%s: device %s not found in devlist\n", __func__,
-		      devname);
-		i = -1;
-	}
-
-	return i;
-}
-
-/*
- * Read a MII PHY register.
- *
- * Returns:
- *  0 on success
- */
-static int uec_miiphy_read(struct mii_dev *bus, int addr, int devad, int reg)
-{
-	unsigned short value = 0;
-	int devindex = 0;
-
-	if (!bus->name) {
-		debug("%s: NULL pointer given\n", __func__);
-	} else {
-		devindex = uec_miiphy_find_dev_by_name(bus->name);
-		if (devindex >= 0)
-			value = uec_read_phy_reg(devlist[devindex], addr, reg);
-	}
-	return value;
-}
-
-/*
- * Write a MII PHY register.
- *
- * Returns:
- *  0 on success
- */
-static int uec_miiphy_write(struct mii_dev *bus, int addr, int devad, int reg,
-			    u16 value)
-{
-	int devindex = 0;
-
-	if (!bus->name) {
-		debug("%s: NULL pointer given\n", __func__);
-	} else {
-		devindex = uec_miiphy_find_dev_by_name(bus->name);
-		if (devindex >= 0)
-			uec_write_phy_reg(devlist[devindex], addr, reg, value);
-	}
-	return 0;
-}
-#endif
-
-static int uec_set_mac_address(struct uec_priv *uec, u8 *mac_addr)
-{
-	uec_t		*uec_regs;
-	u32		mac_addr1;
-	u32		mac_addr2;
-
-	if (!uec) {
-		printf("%s: uec not initial\n", __func__);
-		return -EINVAL;
-	}
-
-	uec_regs = uec->uec_regs;
-
-	/*
-	 * if a station address of 0x12345678ABCD, perform a write to
-	 * MACSTNADDR1 of 0xCDAB7856,
-	 * MACSTNADDR2 of 0x34120000
-	 */
-
-	mac_addr1 = (mac_addr[5] << 24) | (mac_addr[4] << 16) |
-			(mac_addr[3] << 8)  | (mac_addr[2]);
-	out_be32(&uec_regs->macstnaddr1, mac_addr1);
-
-	mac_addr2 = ((mac_addr[1] << 24) | (mac_addr[0] << 16)) & 0xffff0000;
-	out_be32(&uec_regs->macstnaddr2, mac_addr2);
-
-	return 0;
-}
-
-static int uec_convert_threads_num(enum uec_num_of_threads threads_num,
-				   int *threads_num_ret)
-{
-	int	num_threads_numerica;
-
-	switch (threads_num) {
-	case UEC_NUM_OF_THREADS_1:
-		num_threads_numerica = 1;
-		break;
-	case UEC_NUM_OF_THREADS_2:
-		num_threads_numerica = 2;
-		break;
-	case UEC_NUM_OF_THREADS_4:
-		num_threads_numerica = 4;
-		break;
-	case UEC_NUM_OF_THREADS_6:
-		num_threads_numerica = 6;
-		break;
-	case UEC_NUM_OF_THREADS_8:
-		num_threads_numerica = 8;
-		break;
-	default:
-		printf("%s: Bad number of threads value.",
-		       __func__);
-		return -EINVAL;
-	}
-
-	*threads_num_ret = num_threads_numerica;
-
-	return 0;
-}
-
-static void uec_init_tx_parameter(struct uec_priv *uec, int num_threads_tx)
-{
-	struct uec_inf	*uec_info;
-	u32		end_bd;
-	u8		bmrx = 0;
-	int		i;
-
-	uec_info = uec->uec_info;
-
-	/* Alloc global Tx parameter RAM page */
-	uec->tx_glbl_pram_offset =
-		qe_muram_alloc(sizeof(struct uec_tx_global_pram),
-			       UEC_TX_GLOBAL_PRAM_ALIGNMENT);
-	uec->p_tx_glbl_pram = (struct uec_tx_global_pram *)
-				qe_muram_addr(uec->tx_glbl_pram_offset);
-
-	/* Zero the global Tx prameter RAM */
-	memset(uec->p_tx_glbl_pram, 0, sizeof(struct uec_tx_global_pram));
-
-	/* Init global Tx parameter RAM */
-
-	/* TEMODER, RMON statistics disable, one Tx queue */
-	out_be16(&uec->p_tx_glbl_pram->temoder, TEMODER_INIT_VALUE);
-
-	/* SQPTR */
-	uec->send_q_mem_reg_offset =
-		qe_muram_alloc(sizeof(struct uec_send_queue_qd),
-			       UEC_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT);
-	uec->p_send_q_mem_reg = (struct uec_send_queue_mem_region *)
-				qe_muram_addr(uec->send_q_mem_reg_offset);
-	out_be32(&uec->p_tx_glbl_pram->sqptr, uec->send_q_mem_reg_offset);
-
-	/* Setup the table with TxBDs ring */
-	end_bd = (u32)uec->p_tx_bd_ring + (uec_info->tx_bd_ring_len - 1)
-					 * SIZEOFBD;
-	out_be32(&uec->p_send_q_mem_reg->sqqd[0].bd_ring_base,
-		 (u32)(uec->p_tx_bd_ring));
-	out_be32(&uec->p_send_q_mem_reg->sqqd[0].last_bd_completed_address,
-		 end_bd);
-
-	/* Scheduler Base Pointer, we have only one Tx queue, no need it */
-	out_be32(&uec->p_tx_glbl_pram->schedulerbasepointer, 0);
-
-	/* TxRMON Base Pointer, TxRMON disable, we don't need it */
-	out_be32(&uec->p_tx_glbl_pram->txrmonbaseptr, 0);
-
-	/* TSTATE, global snooping, big endian, the CSB bus selected */
-	bmrx = BMR_INIT_VALUE;
-	out_be32(&uec->p_tx_glbl_pram->tstate, ((u32)(bmrx) << BMR_SHIFT));
-
-	/* IPH_Offset */
-	for (i = 0; i < MAX_IPH_OFFSET_ENTRY; i++)
-		out_8(&uec->p_tx_glbl_pram->iphoffset[i], 0);
-
-	/* VTAG table */
-	for (i = 0; i < UEC_TX_VTAG_TABLE_ENTRY_MAX; i++)
-		out_be32(&uec->p_tx_glbl_pram->vtagtable[i], 0);
-
-	/* TQPTR */
-	uec->thread_dat_tx_offset =
-		qe_muram_alloc(num_threads_tx *
-			       sizeof(struct uec_thread_data_tx) +
-			       32 * (num_threads_tx == 1),
-			       UEC_THREAD_DATA_ALIGNMENT);
-
-	uec->p_thread_data_tx = (struct uec_thread_data_tx *)
-				qe_muram_addr(uec->thread_dat_tx_offset);
-	out_be32(&uec->p_tx_glbl_pram->tqptr, uec->thread_dat_tx_offset);
-}
-
-static void uec_init_rx_parameter(struct uec_priv *uec, int num_threads_rx)
-{
-	u8	bmrx = 0;
-	int	i;
-	struct uec_82xx_add_filtering_pram	*p_af_pram;
-
-	/* Allocate global Rx parameter RAM page */
-	uec->rx_glbl_pram_offset =
-		qe_muram_alloc(sizeof(struct uec_rx_global_pram),
-			       UEC_RX_GLOBAL_PRAM_ALIGNMENT);
-	uec->p_rx_glbl_pram = (struct uec_rx_global_pram *)
-				qe_muram_addr(uec->rx_glbl_pram_offset);
-
-	/* Zero Global Rx parameter RAM */
-	memset(uec->p_rx_glbl_pram, 0, sizeof(struct uec_rx_global_pram));
-
-	/* Init global Rx parameter RAM */
-	/*
-	 * REMODER, Extended feature mode disable, VLAN disable,
-	 * LossLess flow control disable, Receive firmware statisic disable,
-	 * Extended address parsing mode disable, One Rx queues,
-	 * Dynamic maximum/minimum frame length disable, IP checksum check
-	 * disable, IP address alignment disable
-	 */
-	out_be32(&uec->p_rx_glbl_pram->remoder, REMODER_INIT_VALUE);
-
-	/* RQPTR */
-	uec->thread_dat_rx_offset =
-		qe_muram_alloc(num_threads_rx *
-			       sizeof(struct uec_thread_data_rx),
-			       UEC_THREAD_DATA_ALIGNMENT);
-	uec->p_thread_data_rx = (struct uec_thread_data_rx *)
-				qe_muram_addr(uec->thread_dat_rx_offset);
-	out_be32(&uec->p_rx_glbl_pram->rqptr, uec->thread_dat_rx_offset);
-
-	/* Type_or_Len */
-	out_be16(&uec->p_rx_glbl_pram->typeorlen, 3072);
-
-	/* RxRMON base pointer, we don't need it */
-	out_be32(&uec->p_rx_glbl_pram->rxrmonbaseptr, 0);
-
-	/* IntCoalescingPTR, we don't need it, no interrupt */
-	out_be32(&uec->p_rx_glbl_pram->intcoalescingptr, 0);
-
-	/* RSTATE, global snooping, big endian, the CSB bus selected */
-	bmrx = BMR_INIT_VALUE;
-	out_8(&uec->p_rx_glbl_pram->rstate, bmrx);
-
-	/* MRBLR */
-	out_be16(&uec->p_rx_glbl_pram->mrblr, MAX_RXBUF_LEN);
-
-	/* RBDQPTR */
-	uec->rx_bd_qs_tbl_offset =
-		qe_muram_alloc(sizeof(struct uec_rx_bd_queues_entry) +
-			       sizeof(struct uec_rx_pref_bds),
-			       UEC_RX_BD_QUEUES_ALIGNMENT);
-	uec->p_rx_bd_qs_tbl = (struct uec_rx_bd_queues_entry *)
-				qe_muram_addr(uec->rx_bd_qs_tbl_offset);
-
-	/* Zero it */
-	memset(uec->p_rx_bd_qs_tbl, 0, sizeof(struct uec_rx_bd_queues_entry) +
-	       sizeof(struct uec_rx_pref_bds));
-	out_be32(&uec->p_rx_glbl_pram->rbdqptr, uec->rx_bd_qs_tbl_offset);
-	out_be32(&uec->p_rx_bd_qs_tbl->externalbdbaseptr,
-		 (u32)uec->p_rx_bd_ring);
-
-	/* MFLR */
-	out_be16(&uec->p_rx_glbl_pram->mflr, MAX_FRAME_LEN);
-	/* MINFLR */
-	out_be16(&uec->p_rx_glbl_pram->minflr, MIN_FRAME_LEN);
-	/* MAXD1 */
-	out_be16(&uec->p_rx_glbl_pram->maxd1, MAX_DMA1_LEN);
-	/* MAXD2 */
-	out_be16(&uec->p_rx_glbl_pram->maxd2, MAX_DMA2_LEN);
-	/* ECAM_PTR */
-	out_be32(&uec->p_rx_glbl_pram->ecamptr, 0);
-	/* L2QT */
-	out_be32(&uec->p_rx_glbl_pram->l2qt, 0);
-	/* L3QT */
-	for (i = 0; i < 8; i++)
-		out_be32(&uec->p_rx_glbl_pram->l3qt[i], 0);
-
-	/* VLAN_TYPE */
-	out_be16(&uec->p_rx_glbl_pram->vlantype, 0x8100);
-	/* TCI */
-	out_be16(&uec->p_rx_glbl_pram->vlantci, 0);
-
-	/* Clear PQ2 style address filtering hash table */
-	p_af_pram = (struct uec_82xx_add_filtering_pram *)
-			uec->p_rx_glbl_pram->addressfiltering;
-
-	p_af_pram->iaddr_h = 0;
-	p_af_pram->iaddr_l = 0;
-	p_af_pram->gaddr_h = 0;
-	p_af_pram->gaddr_l = 0;
-}
-
-static int uec_issue_init_enet_rxtx_cmd(struct uec_priv *uec,
-					int thread_tx, int thread_rx)
-{
-	struct uec_init_cmd_pram		*p_init_enet_param;
-	u32				init_enet_param_offset;
-	struct uec_inf			*uec_info;
-	struct ucc_fast_inf			*uf_info;
-	int				i;
-	int				snum;
-	u32				off;
-	u32				entry_val;
-	u32				command;
-	u32				cecr_subblock;
-
-	uec_info = uec->uec_info;
-	uf_info = &uec_info->uf_info;
-
-	/* Allocate init enet command parameter */
-	uec->init_enet_param_offset =
-		qe_muram_alloc(sizeof(struct uec_init_cmd_pram), 4);
-	init_enet_param_offset = uec->init_enet_param_offset;
-	uec->p_init_enet_param = (struct uec_init_cmd_pram *)
-				qe_muram_addr(uec->init_enet_param_offset);
-
-	/* Zero init enet command struct */
-	memset((void *)uec->p_init_enet_param, 0,
-	       sizeof(struct uec_init_cmd_pram));
-
-	/* Init the command struct */
-	p_init_enet_param = uec->p_init_enet_param;
-	p_init_enet_param->resinit0 = ENET_INIT_PARAM_MAGIC_RES_INIT0;
-	p_init_enet_param->resinit1 = ENET_INIT_PARAM_MAGIC_RES_INIT1;
-	p_init_enet_param->resinit2 = ENET_INIT_PARAM_MAGIC_RES_INIT2;
-	p_init_enet_param->resinit3 = ENET_INIT_PARAM_MAGIC_RES_INIT3;
-	p_init_enet_param->resinit4 = ENET_INIT_PARAM_MAGIC_RES_INIT4;
-	p_init_enet_param->largestexternallookupkeysize = 0;
-
-	p_init_enet_param->rgftgfrxglobal |= ((u32)uec_info->num_threads_rx)
-					 << ENET_INIT_PARAM_RGF_SHIFT;
-	p_init_enet_param->rgftgfrxglobal |= ((u32)uec_info->num_threads_tx)
-					 << ENET_INIT_PARAM_TGF_SHIFT;
-
-	/* Init Rx global parameter pointer */
-	p_init_enet_param->rgftgfrxglobal |= uec->rx_glbl_pram_offset |
-						 (u32)uec_info->risc_rx;
-
-	/* Init Rx threads */
-	for (i = 0; i < (thread_rx + 1); i++) {
-		snum = qe_get_snum();
-		if (snum < 0) {
-			printf("%s can not get snum\n", __func__);
-			return -ENOMEM;
-		}
-
-		if (i == 0) {
-			off = 0;
-		} else {
-			off = qe_muram_alloc(sizeof(struct uec_thread_rx_pram),
-					     UEC_THREAD_RX_PRAM_ALIGNMENT);
-		}
-
-		entry_val = ((u32)snum << ENET_INIT_PARAM_SNUM_SHIFT) |
-				 off | (u32)uec_info->risc_rx;
-		p_init_enet_param->rxthread[i] = entry_val;
-	}
-
-	/* Init Tx global parameter pointer */
-	p_init_enet_param->txglobal = uec->tx_glbl_pram_offset |
-					 (u32)uec_info->risc_tx;
-
-	/* Init Tx threads */
-	for (i = 0; i < thread_tx; i++) {
-		snum = qe_get_snum();
-		if (snum  < 0)	{
-			printf("%s can not get snum\n", __func__);
-			return -ENOMEM;
-		}
-
-		off = qe_muram_alloc(sizeof(struct uec_thread_tx_pram),
-				     UEC_THREAD_TX_PRAM_ALIGNMENT);
-
-		entry_val = ((u32)snum << ENET_INIT_PARAM_SNUM_SHIFT) |
-				 off | (u32)uec_info->risc_tx;
-		p_init_enet_param->txthread[i] = entry_val;
-	}
-
-	__asm__ __volatile__("sync");
-
-	/* Issue QE command */
-	command = QE_INIT_TX_RX;
-	cecr_subblock =	ucc_fast_get_qe_cr_subblock(uf_info->ucc_num);
-	qe_issue_cmd(command, cecr_subblock, (u8)QE_CR_PROTOCOL_ETHERNET,
-		     init_enet_param_offset);
-
-	return 0;
-}
-
-static int uec_startup(struct uec_priv *uec)
-{
-	struct uec_inf			*uec_info;
-	struct ucc_fast_inf		*uf_info;
-	struct ucc_fast_priv		*uccf;
-	ucc_fast_t			*uf_regs;
-	uec_t				*uec_regs;
-	int				num_threads_tx;
-	int				num_threads_rx;
-	u32				utbipar;
-	u32				length;
-	u32				align;
-	struct buffer_descriptor	*bd;
-	u8				*buf;
-	int				i;
-
-	if (!uec || !uec->uec_info) {
-		printf("%s: uec or uec_info not initial\n", __func__);
-		return -EINVAL;
-	}
-
-	uec_info = uec->uec_info;
-	uf_info = &uec_info->uf_info;
-
-	/* Check if Rx BD ring len is illegal */
-	if (uec_info->rx_bd_ring_len < UEC_RX_BD_RING_SIZE_MIN ||
-	    (uec_info->rx_bd_ring_len % UEC_RX_BD_RING_SIZE_ALIGNMENT)) {
-		printf("%s: Rx BD ring len must be multiple of 4, and > 8.\n",
-		       __func__);
-		return -EINVAL;
-	}
-
-	/* Check if Tx BD ring len is illegal */
-	if (uec_info->tx_bd_ring_len < UEC_TX_BD_RING_SIZE_MIN) {
-		printf("%s: Tx BD ring length must not be smaller than 2.\n",
-		       __func__);
-		return -EINVAL;
-	}
-
-	/* Check if MRBLR is illegal */
-	if (MAX_RXBUF_LEN == 0 || MAX_RXBUF_LEN  % UEC_MRBLR_ALIGNMENT) {
-		printf("%s: max rx buffer length must be mutliple of 128.\n",
-		       __func__);
-		return -EINVAL;
-	}
-
-	/* Both Rx and Tx are stopped */
-	uec->grace_stopped_rx = 1;
-	uec->grace_stopped_tx = 1;
-
-	/* Init UCC fast */
-	if (ucc_fast_init(uf_info, &uccf)) {
-		printf("%s: failed to init ucc fast\n", __func__);
-		return -ENOMEM;
-	}
-
-	/* Save uccf */
-	uec->uccf = uccf;
-
-	/* Convert the Tx threads number */
-	if (uec_convert_threads_num(uec_info->num_threads_tx,
-				    &num_threads_tx)) {
-		return -EINVAL;
-	}
-
-	/* Convert the Rx threads number */
-	if (uec_convert_threads_num(uec_info->num_threads_rx,
-				    &num_threads_rx)) {
-		return -EINVAL;
-	}
-
-	uf_regs = uccf->uf_regs;
-
-	/* UEC register is following UCC fast registers */
-	uec_regs = (uec_t *)(&uf_regs->ucc_eth);
-
-	/* Save the UEC register pointer to UEC private struct */
-	uec->uec_regs = uec_regs;
-
-	/* Init UPSMR, enable hardware statistics (UCC) */
-	out_be32(&uec->uccf->uf_regs->upsmr, UPSMR_INIT_VALUE);
-
-	/* Init MACCFG1, flow control disable, disable Tx and Rx */
-	out_be32(&uec_regs->maccfg1, MACCFG1_INIT_VALUE);
-
-	/* Init MACCFG2, length check, MAC PAD and CRC enable */
-	out_be32(&uec_regs->maccfg2, MACCFG2_INIT_VALUE);
-
-	/* Setup MAC interface mode */
-	uec_set_mac_if_mode(uec, uec_info->enet_interface_type,
-			    uec_info->speed);
-
-	/* Setup MII management base */
-#ifndef CONFIG_eTSEC_MDIO_BUS
-	uec->uec_mii_regs = (uec_mii_t *)(&uec_regs->miimcfg);
-#else
-	uec->uec_mii_regs = (uec_mii_t *)CONFIG_MIIM_ADDRESS;
-#endif
-
-	/* Setup MII master clock source */
-	qe_set_mii_clk_src(uec_info->uf_info.ucc_num);
-
-	/* Setup UTBIPAR */
-	utbipar = in_be32(&uec_regs->utbipar);
-	utbipar &= ~UTBIPAR_PHY_ADDRESS_MASK;
-
-	/* Initialize UTBIPAR address to CONFIG_UTBIPAR_INIT_TBIPA for ALL UEC.
-	 * This frees up the remaining SMI addresses for use.
-	 */
-	utbipar |= CONFIG_UTBIPAR_INIT_TBIPA << UTBIPAR_PHY_ADDRESS_SHIFT;
-	out_be32(&uec_regs->utbipar, utbipar);
-
-	/* Configure the TBI for SGMII operation */
-	if (uec->uec_info->enet_interface_type == PHY_INTERFACE_MODE_SGMII &&
-	    uec->uec_info->speed == SPEED_1000) {
-		uec_write_phy_reg(uec->dev, uec_regs->utbipar,
-				  ENET_TBI_MII_ANA, TBIANA_SETTINGS);
-
-		uec_write_phy_reg(uec->dev, uec_regs->utbipar,
-				  ENET_TBI_MII_TBICON, TBICON_CLK_SELECT);
-
-		uec_write_phy_reg(uec->dev, uec_regs->utbipar,
-				  ENET_TBI_MII_CR, TBICR_SETTINGS);
-	}
-
-	/* Allocate Tx BDs */
-	length = ((uec_info->tx_bd_ring_len * SIZEOFBD) /
-		 UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) *
-		 UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT;
-	if ((uec_info->tx_bd_ring_len * SIZEOFBD) %
-		 UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) {
-		length += UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT;
-	}
-
-	align = UEC_TX_BD_RING_ALIGNMENT;
-	uec->tx_bd_ring_offset = (u32)malloc((u32)(length + align));
-	if (uec->tx_bd_ring_offset != 0) {
-		uec->p_tx_bd_ring = (u8 *)((uec->tx_bd_ring_offset + align)
-						 & ~(align - 1));
-	}
-
-	/* Zero all of Tx BDs */
-	memset((void *)(uec->tx_bd_ring_offset), 0, length + align);
-
-	/* Allocate Rx BDs */
-	length = uec_info->rx_bd_ring_len * SIZEOFBD;
-	align = UEC_RX_BD_RING_ALIGNMENT;
-	uec->rx_bd_ring_offset = (u32)(malloc((u32)(length + align)));
-	if (uec->rx_bd_ring_offset != 0) {
-		uec->p_rx_bd_ring = (u8 *)((uec->rx_bd_ring_offset + align)
-							 & ~(align - 1));
-	}
-
-	/* Zero all of Rx BDs */
-	memset((void *)(uec->rx_bd_ring_offset), 0, length + align);
-
-	/* Allocate Rx buffer */
-	length = uec_info->rx_bd_ring_len * MAX_RXBUF_LEN;
-	align = UEC_RX_DATA_BUF_ALIGNMENT;
-	uec->rx_buf_offset = (u32)malloc(length + align);
-	if (uec->rx_buf_offset != 0) {
-		uec->p_rx_buf = (u8 *)((uec->rx_buf_offset + align)
-						 & ~(align - 1));
-	}
-
-	/* Zero all of the Rx buffer */
-	memset((void *)(uec->rx_buf_offset), 0, length + align);
-
-	/* Init TxBD ring */
-	bd = (struct buffer_descriptor *)uec->p_tx_bd_ring;
-	uec->tx_bd = bd;
-
-	for (i = 0; i < uec_info->tx_bd_ring_len; i++) {
-		BD_DATA_CLEAR(bd);
-		BD_STATUS_SET(bd, 0);
-		BD_LENGTH_SET(bd, 0);
-		bd++;
-	}
-	BD_STATUS_SET((--bd), TX_BD_WRAP);
-
-	/* Init RxBD ring */
-	bd = (struct buffer_descriptor *)uec->p_rx_bd_ring;
-	uec->rx_bd = bd;
-	buf = uec->p_rx_buf;
-	for (i = 0; i < uec_info->rx_bd_ring_len; i++) {
-		BD_DATA_SET(bd, buf);
-		BD_LENGTH_SET(bd, 0);
-		BD_STATUS_SET(bd, RX_BD_EMPTY);
-		buf += MAX_RXBUF_LEN;
-		bd++;
-	}
-	BD_STATUS_SET((--bd), RX_BD_WRAP | RX_BD_EMPTY);
-
-	/* Init global Tx parameter RAM */
-	uec_init_tx_parameter(uec, num_threads_tx);
-
-	/* Init global Rx parameter RAM */
-	uec_init_rx_parameter(uec, num_threads_rx);
-
-	/* Init ethernet Tx and Rx parameter command */
-	if (uec_issue_init_enet_rxtx_cmd(uec, num_threads_tx,
-					 num_threads_rx)) {
-		printf("%s issue init enet cmd failed\n", __func__);
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-
-static int uec_init(struct eth_device *dev, struct bd_info *bd)
-{
-	struct uec_priv		*uec;
-	int			err, i;
-	struct phy_info         *curphy;
-#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
-	ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
-#endif
-
-	uec = (struct uec_priv *)dev->priv;
-
-	if (!uec->the_first_run) {
-#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
-		/*
-		 * QE9 and QE12 need to be set for enabling QE MII
-		 * management signals
-		 */
-		setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE9);
-		setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE12);
-#endif
-
-		err = init_phy(dev);
-		if (err) {
-			printf("%s: Cannot initialize PHY, aborting.\n",
-			       dev->name);
-			return err;
-		}
-
-		curphy = uec->mii_info->phyinfo;
-
-		if (curphy->config_aneg) {
-			err = curphy->config_aneg(uec->mii_info);
-			if (err) {
-				printf("%s: Can't negotiate PHY\n", dev->name);
-				return err;
-			}
-		}
-
-		/* Give PHYs up to 5 sec to report a link */
-		i = 50;
-		do {
-			err = curphy->read_status(uec->mii_info);
-			if (!(((i-- > 0) && !uec->mii_info->link) || err))
-				break;
-			mdelay(100);
-		} while (1);
-
-#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025)
-		/* QE12 needs to be released for enabling LBCTL signal*/
-		clrbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE12);
-#endif
-
-		if (err || i <= 0)
-			printf("warning: %s: timeout on PHY link\n", dev->name);
-
-		adjust_link(dev);
-		uec->the_first_run = 1;
-	}
-
-	/* Set up the MAC address */
-	if (dev->enetaddr[0] & 0x01) {
-		printf("%s: MacAddress is multcast address\n",
-		       __func__);
-		return -1;
-	}
-	uec_set_mac_address(uec, dev->enetaddr);
-
-	err = uec_open(uec, COMM_DIR_RX_AND_TX);
-	if (err) {
-		printf("%s: cannot enable UEC device\n", dev->name);
-		return -1;
-	}
-
-	phy_change(dev);
-
-	return uec->mii_info->link ? 0 : -1;
-}
-
-static void uec_halt(struct eth_device *dev)
-{
-	struct uec_priv	*uec = (struct uec_priv *)dev->priv;
-
-	uec_stop(uec, COMM_DIR_RX_AND_TX);
-}
-
-static int uec_send(struct eth_device *dev, void *buf, int len)
-{
-	struct uec_priv		*uec;
-	struct ucc_fast_priv	*uccf;
-	struct buffer_descriptor	*bd;
-	u16			status;
-	int			i;
-	int			result = 0;
-
-	uec = (struct uec_priv *)dev->priv;
-	uccf = uec->uccf;
-	bd = uec->tx_bd;
-
-	/* Find an empty TxBD */
-	for (i = 0; BD_STATUS(bd) & TX_BD_READY; i++) {
-		if (i > 0x100000) {
-			printf("%s: tx buffer not ready\n", dev->name);
-			return result;
-		}
-	}
-
-	/* Init TxBD */
-	BD_DATA_SET(bd, buf);
-	BD_LENGTH_SET(bd, len);
-	status = BD_STATUS(bd);
-	status &= BD_WRAP;
-	status |= (TX_BD_READY | TX_BD_LAST);
-	BD_STATUS_SET(bd, status);
-
-	/* Tell UCC to transmit the buffer */
-	ucc_fast_transmit_on_demand(uccf);
-
-	/* Wait for buffer to be transmitted */
-	for (i = 0; BD_STATUS(bd) & TX_BD_READY; i++) {
-		if (i > 0x100000) {
-			printf("%s: tx error\n", dev->name);
-			return result;
-		}
-	}
-
-	/* Ok, the buffer be transimitted */
-	BD_ADVANCE(bd, status, uec->p_tx_bd_ring);
-	uec->tx_bd = bd;
-	result = 1;
-
-	return result;
-}
-
-static int uec_recv(struct eth_device *dev)
-{
-	struct uec_priv		*uec = dev->priv;
-	struct buffer_descriptor	*bd;
-	u16			status;
-	u16			len;
-	u8			*data;
-
-	bd = uec->rx_bd;
-	status = BD_STATUS(bd);
-
-	while (!(status & RX_BD_EMPTY)) {
-		if (!(status & RX_BD_ERROR)) {
-			data = BD_DATA(bd);
-			len = BD_LENGTH(bd);
-			net_process_received_packet(data, len);
-		} else {
-			printf("%s: Rx error\n", dev->name);
-		}
-		status &= BD_CLEAN;
-		BD_LENGTH_SET(bd, 0);
-		BD_STATUS_SET(bd, status | RX_BD_EMPTY);
-		BD_ADVANCE(bd, status, uec->p_rx_bd_ring);
-		status = BD_STATUS(bd);
-	}
-	uec->rx_bd = bd;
-
-	return 1;
-}
-
-int uec_initialize(struct bd_info *bis, struct uec_inf *uec_info)
-{
-	struct eth_device	*dev;
-	int			i;
-	struct uec_priv		*uec;
-	int			err;
-
-	dev = (struct eth_device *)malloc(sizeof(struct eth_device));
-	if (!dev)
-		return 0;
-	memset(dev, 0, sizeof(struct eth_device));
-
-	/* Allocate the UEC private struct */
-	uec = (struct uec_priv *)malloc(sizeof(struct uec_priv));
-	if (!uec)
-		return -ENOMEM;
-
-	memset(uec, 0, sizeof(struct uec_priv));
-
-	/* Adjust uec_info */
-#if (MAX_QE_RISC == 4)
-	uec_info->risc_tx = QE_RISC_ALLOCATION_FOUR_RISCS;
-	uec_info->risc_rx = QE_RISC_ALLOCATION_FOUR_RISCS;
-#endif
-
-	devlist[uec_info->uf_info.ucc_num] = dev;
-
-	uec->uec_info = uec_info;
-	uec->dev = dev;
-
-	sprintf(dev->name, "UEC%d", uec_info->uf_info.ucc_num);
-	dev->iobase = 0;
-	dev->priv = (void *)uec;
-	dev->init = uec_init;
-	dev->halt = uec_halt;
-	dev->send = uec_send;
-	dev->recv = uec_recv;
-
-	/* Clear the ethnet address */
-	for (i = 0; i < 6; i++)
-		dev->enetaddr[i] = 0;
-
-	eth_register(dev);
-
-	err = uec_startup(uec);
-	if (err) {
-		printf("%s: Cannot configure net device, aborting.", dev->name);
-		return err;
-	}
-
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
-	int retval;
-	struct mii_dev *mdiodev = mdio_alloc();
-
-	if (!mdiodev)
-		return -ENOMEM;
-	strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
-	mdiodev->read = uec_miiphy_read;
-	mdiodev->write = uec_miiphy_write;
-
-	retval = mdio_register(mdiodev);
-	if (retval < 0)
-		return retval;
-#endif
-
-	return 1;
-}
-
-int uec_eth_init(struct bd_info *bis, struct uec_inf *uecs, int num)
-{
-	int i;
-
-	for (i = 0; i < num; i++)
-		uec_initialize(bis, &uecs[i]);
-
-	return 0;
-}
-
-int uec_standard_init(struct bd_info *bis)
-{
-	return uec_eth_init(bis, uec_info, ARRAY_SIZE(uec_info));
-}
-#endif
diff --git a/drivers/qe/uec.h b/drivers/qe/uec.h
deleted file mode 100644
index 63371e71bf74..000000000000
--- a/drivers/qe/uec.h
+++ /dev/null
@@ -1,692 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2006-2010 Freescale Semiconductor, Inc.
- *
- * Dave Liu <daveliu@freescale.com>
- * based on source code of Shlomi Gridish
- */
-
-#ifndef __UEC_H__
-#define __UEC_H__
-
-#include "uccf.h"
-#include <fsl_qe.h>
-#include <phy.h>
-
-#define MAX_TX_THREADS				8
-#define MAX_RX_THREADS				8
-#define MAX_TX_QUEUES				8
-#define MAX_RX_QUEUES				8
-#define MAX_PREFETCHED_BDS			4
-#define MAX_IPH_OFFSET_ENTRY			8
-#define MAX_ENET_INIT_PARAM_ENTRIES_RX		9
-#define MAX_ENET_INIT_PARAM_ENTRIES_TX		8
-
-/* UEC UPSMR (Protocol Specific Mode Register)
- */
-#define UPSMR_ECM	0x04000000 /* Enable CAM Miss               */
-#define UPSMR_HSE	0x02000000 /* Hardware Statistics Enable    */
-#define UPSMR_PRO	0x00400000 /* Promiscuous                   */
-#define UPSMR_CAP	0x00200000 /* CAM polarity                  */
-#define UPSMR_RSH	0x00100000 /* Receive Short Frames          */
-#define UPSMR_RPM	0x00080000 /* Reduced Pin Mode interfaces   */
-#define UPSMR_R10M	0x00040000 /* RGMII/RMII 10 Mode            */
-#define UPSMR_RLPB	0x00020000 /* RMII Loopback Mode            */
-#define UPSMR_TBIM	0x00010000 /* Ten-bit Interface Mode        */
-#define UPSMR_RMM	0x00001000 /* RMII/RGMII Mode               */
-#define UPSMR_CAM	0x00000400 /* CAM Address Matching          */
-#define UPSMR_BRO	0x00000200 /* Broadcast Address             */
-#define UPSMR_RES1	0x00002000 /* Reserved feild - must be 1    */
-#define UPSMR_SGMM	0x00000020 /* SGMII mode    */
-
-#define UPSMR_INIT_VALUE	(UPSMR_HSE | UPSMR_RES1)
-
-/* UEC MACCFG1 (MAC Configuration 1 Register)
- */
-#define MACCFG1_FLOW_RX			0x00000020 /* Flow Control Rx */
-#define MACCFG1_FLOW_TX			0x00000010 /* Flow Control Tx */
-#define MACCFG1_ENABLE_SYNCHED_RX	0x00000008 /* Enable Rx Sync  */
-#define MACCFG1_ENABLE_RX		0x00000004 /* Enable Rx       */
-#define MACCFG1_ENABLE_SYNCHED_TX	0x00000002 /* Enable Tx Sync  */
-#define MACCFG1_ENABLE_TX		0x00000001 /* Enable Tx       */
-
-#define MACCFG1_INIT_VALUE		(0)
-
-/* UEC MACCFG2 (MAC Configuration 2 Register)
- */
-#define MACCFG2_PREL				0x00007000
-#define MACCFG2_PREL_SHIFT			(31 - 19)
-#define MACCFG2_PREL_MASK			0x0000f000
-#define MACCFG2_SRP				0x00000080
-#define MACCFG2_STP				0x00000040
-#define MACCFG2_RESERVED_1			0x00000020 /* must be set  */
-#define MACCFG2_LC				0x00000010 /* Length Check */
-#define MACCFG2_MPE				0x00000008
-#define MACCFG2_FDX				0x00000001 /* Full Duplex  */
-#define MACCFG2_FDX_MASK			0x00000001
-#define MACCFG2_PAD_CRC				0x00000004
-#define MACCFG2_CRC_EN				0x00000002
-#define MACCFG2_PAD_AND_CRC_MODE_NONE		0x00000000
-#define MACCFG2_PAD_AND_CRC_MODE_CRC_ONLY	0x00000002
-#define MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC	0x00000004
-#define MACCFG2_INTERFACE_MODE_NIBBLE		0x00000100
-#define MACCFG2_INTERFACE_MODE_BYTE		0x00000200
-#define MACCFG2_INTERFACE_MODE_MASK		0x00000300
-
-#define MACCFG2_INIT_VALUE	(MACCFG2_PREL | MACCFG2_RESERVED_1 | \
-				 MACCFG2_LC | MACCFG2_PAD_CRC | MACCFG2_FDX)
-
-/* UEC Event Register */
-#define UCCE_MPD				0x80000000
-#define UCCE_SCAR				0x40000000
-#define UCCE_GRA				0x20000000
-#define UCCE_CBPR				0x10000000
-#define UCCE_BSY				0x08000000
-#define UCCE_RXC				0x04000000
-#define UCCE_TXC				0x02000000
-#define UCCE_TXE				0x01000000
-#define UCCE_TXB7				0x00800000
-#define UCCE_TXB6				0x00400000
-#define UCCE_TXB5				0x00200000
-#define UCCE_TXB4				0x00100000
-#define UCCE_TXB3				0x00080000
-#define UCCE_TXB2				0x00040000
-#define UCCE_TXB1				0x00020000
-#define UCCE_TXB0				0x00010000
-#define UCCE_RXB7				0x00008000
-#define UCCE_RXB6				0x00004000
-#define UCCE_RXB5				0x00002000
-#define UCCE_RXB4				0x00001000
-#define UCCE_RXB3				0x00000800
-#define UCCE_RXB2				0x00000400
-#define UCCE_RXB1				0x00000200
-#define UCCE_RXB0				0x00000100
-#define UCCE_RXF7				0x00000080
-#define UCCE_RXF6				0x00000040
-#define UCCE_RXF5				0x00000020
-#define UCCE_RXF4				0x00000010
-#define UCCE_RXF3				0x00000008
-#define UCCE_RXF2				0x00000004
-#define UCCE_RXF1				0x00000002
-#define UCCE_RXF0				0x00000001
-
-#define UCCE_TXB	(UCCE_TXB7 | UCCE_TXB6 | UCCE_TXB5 | UCCE_TXB4 | \
-			 UCCE_TXB3 | UCCE_TXB2 | UCCE_TXB1 | UCCE_TXB0)
-#define UCCE_RXB	(UCCE_RXB7 | UCCE_RXB6 | UCCE_RXB5 | UCCE_RXB4 | \
-			 UCCE_RXB3 | UCCE_RXB2 | UCCE_RXB1 | UCCE_RXB0)
-#define UCCE_RXF	(UCCE_RXF7 | UCCE_RXF6 | UCCE_RXF5 | UCCE_RXF4 | \
-			 UCCE_RXF3 | UCCE_RXF2 | UCCE_RXF1 | UCCE_RXF0)
-#define UCCE_OTHER	(UCCE_SCAR | UCCE_GRA  | UCCE_CBPR | UCCE_BSY  | \
-			 UCCE_RXC  | UCCE_TXC  | UCCE_TXE)
-
-/* UEC TEMODR Register */
-#define TEMODER_SCHEDULER_ENABLE		0x2000
-#define TEMODER_IP_CHECKSUM_GENERATE		0x0400
-#define TEMODER_PERFORMANCE_OPTIMIZATION_MODE1	0x0200
-#define TEMODER_RMON_STATISTICS			0x0100
-#define TEMODER_NUM_OF_QUEUES_SHIFT		(15 - 15)
-
-#define TEMODER_INIT_VALUE			0xc000
-
-/* UEC REMODR Register */
-#define REMODER_RX_RMON_STATISTICS_ENABLE	0x00001000
-#define REMODER_RX_EXTENDED_FEATURES		0x80000000
-#define REMODER_VLAN_OPERATION_TAGGED_SHIFT	(31 - 9)
-#define REMODER_VLAN_OPERATION_NON_TAGGED_SHIFT	(31 - 10)
-#define REMODER_RX_QOS_MODE_SHIFT		(31 - 15)
-#define REMODER_RMON_STATISTICS			0x00001000
-#define REMODER_RX_EXTENDED_FILTERING		0x00000800
-#define REMODER_NUM_OF_QUEUES_SHIFT		(31 - 23)
-#define REMODER_DYNAMIC_MAX_FRAME_LENGTH	0x00000008
-#define REMODER_DYNAMIC_MIN_FRAME_LENGTH	0x00000004
-#define REMODER_IP_CHECKSUM_CHECK		0x00000002
-#define REMODER_IP_ADDRESS_ALIGNMENT		0x00000001
-
-#define REMODER_INIT_VALUE			0
-
-/* BMRx - Bus Mode Register */
-#define BMR_GLB					0x20
-#define BMR_BO_BE				0x10
-#define BMR_DTB_SECONDARY_BUS			0x02
-#define BMR_BDB_SECONDARY_BUS			0x01
-
-#define BMR_SHIFT				24
-#define BMR_INIT_VALUE				(BMR_GLB | BMR_BO_BE)
-
-/* UEC UCCS (Ethernet Status Register)
- */
-#define UCCS_BPR				0x02
-#define UCCS_PAU				0x02
-#define UCCS_MPD				0x01
-
-/* UEC MIIMCFG (MII Management Configuration Register)
- */
-#define MIIMCFG_RESET_MANAGEMENT		0x80000000
-#define MIIMCFG_NO_PREAMBLE			0x00000010
-#define MIIMCFG_CLOCK_DIVIDE_SHIFT		(31 - 31)
-#define MIIMCFG_CLOCK_DIVIDE_MASK		0x0000000f
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_4	0x00000001
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_6	0x00000002
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_8	0x00000003
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_10	0x00000004
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_14	0x00000005
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_20	0x00000006
-#define MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_28	0x00000007
-
-#define MIIMCFG_MNGMNT_CLC_DIV_INIT_VALUE	\
-	MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_10
-
-/* UEC MIIMCOM (MII Management Command Register)
- */
-#define MIIMCOM_SCAN_CYCLE			0x00000002 /* Scan cycle */
-#define MIIMCOM_READ_CYCLE			0x00000001 /* Read cycle */
-
-/* UEC MIIMADD (MII Management Address Register)
- */
-#define MIIMADD_PHY_ADDRESS_SHIFT		(31 - 23)
-#define MIIMADD_PHY_REGISTER_SHIFT		(31 - 31)
-
-/* UEC MIIMCON (MII Management Control Register)
- */
-#define MIIMCON_PHY_CONTROL_SHIFT		(31 - 31)
-#define MIIMCON_PHY_STATUS_SHIFT		(31 - 31)
-
-/* UEC MIIMIND (MII Management Indicator Register)
- */
-#define MIIMIND_NOT_VALID			0x00000004
-#define MIIMIND_SCAN				0x00000002
-#define MIIMIND_BUSY				0x00000001
-
-/* UEC UTBIPAR (Ten Bit Interface Physical Address Register)
- */
-#define UTBIPAR_PHY_ADDRESS_SHIFT		(31 - 31)
-#define UTBIPAR_PHY_ADDRESS_MASK		0x0000001f
-
-/* UEC UESCR (Ethernet Statistics Control Register)
- */
-#define UESCR_AUTOZ				0x8000
-#define UESCR_CLRCNT				0x4000
-#define UESCR_MAXCOV_SHIFT			(15 -  7)
-#define UESCR_SCOV_SHIFT			(15 - 15)
-
-/****** Tx data struct collection ******/
-/* Tx thread data, each Tx thread has one this struct. */
-struct uec_thread_data_tx {
-	u8   res0[136];
-} __packed;
-
-/* Tx thread parameter, each Tx thread has one this struct. */
-struct uec_thread_tx_pram {
-	u8   res0[64];
-} __packed;
-
-/* Send queue queue-descriptor, each Tx queue has one this QD */
-struct uec_send_queue_qd {
-	u32    bd_ring_base; /* pointer to BD ring base address */
-	u8     res0[0x8];
-	u32    last_bd_completed_address; /* last entry in BD ring */
-	u8     res1[0x30];
-} __packed;
-
-/* Send queue memory region */
-struct uec_send_queue_mem_region {
-	struct uec_send_queue_qd   sqqd[MAX_TX_QUEUES];
-} __packed;
-
-/* Scheduler struct */
-struct uec_scheduler {
-	u16  cpucount0;        /* CPU packet counter */
-	u16  cpucount1;        /* CPU packet counter */
-	u16  cecount0;         /* QE  packet counter */
-	u16  cecount1;         /* QE  packet counter */
-	u16  cpucount2;        /* CPU packet counter */
-	u16  cpucount3;        /* CPU packet counter */
-	u16  cecount2;         /* QE  packet counter */
-	u16  cecount3;         /* QE  packet counter */
-	u16  cpucount4;        /* CPU packet counter */
-	u16  cpucount5;        /* CPU packet counter */
-	u16  cecount4;         /* QE  packet counter */
-	u16  cecount5;         /* QE  packet counter */
-	u16  cpucount6;        /* CPU packet counter */
-	u16  cpucount7;        /* CPU packet counter */
-	u16  cecount6;         /* QE  packet counter */
-	u16  cecount7;         /* QE  packet counter */
-	u32  weightstatus[MAX_TX_QUEUES]; /* accumulated weight factor */
-	u32  rtsrshadow;       /* temporary variable handled by QE */
-	u32  time;             /* temporary variable handled by QE */
-	u32  ttl;              /* temporary variable handled by QE */
-	u32  mblinterval;      /* max burst length interval        */
-	u16  nortsrbytetime;   /* normalized value of byte time in tsr units */
-	u8   fracsiz;
-	u8   res0[1];
-	u8   strictpriorityq;  /* Strict Priority Mask register */
-	u8   txasap;           /* Transmit ASAP register        */
-	u8   extrabw;          /* Extra BandWidth register      */
-	u8   oldwfqmask;       /* temporary variable handled by QE */
-	u8   weightfactor[MAX_TX_QUEUES]; /**< weight factor for queues */
-	u32  minw;             /* temporary variable handled by QE */
-	u8   res1[0x70 - 0x64];
-} __packed;
-
-/* Tx firmware counters */
-struct uec_tx_firmware_statistics_pram {
-	u32  sicoltx;            /* single collision */
-	u32  mulcoltx;           /* multiple collision */
-	u32  latecoltxfr;        /* late collision */
-	u32  frabortduecol;      /* frames aborted due to tx collision */
-	u32  frlostinmactxer;    /* frames lost due to internal MAC error tx */
-	u32  carriersenseertx;   /* carrier sense error */
-	u32  frtxok;             /* frames transmitted OK */
-	u32  txfrexcessivedefer;
-	u32  txpkts256;          /* total packets(including bad) 256~511 B */
-	u32  txpkts512;          /* total packets(including bad) 512~1023B */
-	u32  txpkts1024;         /* total packets(including bad) 1024~1518B */
-	u32  txpktsjumbo;        /* total packets(including bad)  >1024 */
-} __packed;
-
-/* Tx global parameter table */
-struct uec_tx_global_pram {
-	u16  temoder;
-	u8   res0[0x38 - 0x02];
-	u32  sqptr;
-	u32  schedulerbasepointer;
-	u32  txrmonbaseptr;
-	u32  tstate;
-	u8   iphoffset[MAX_IPH_OFFSET_ENTRY];
-	u32  vtagtable[0x8];
-	u32  tqptr;
-	u8   res2[0x80 - 0x74];
-} __packed;
-
-/****** Rx data struct collection ******/
-/* Rx thread data, each Rx thread has one this struct. */
-struct uec_thread_data_rx {
-	u8   res0[40];
-} __packed;
-
-/* Rx thread parameter, each Rx thread has one this struct. */
-struct uec_thread_rx_pram {
-	u8   res0[128];
-} __packed;
-
-/* Rx firmware counters */
-struct uec_rx_firmware_statistics_pram {
-	u32   frrxfcser;         /* frames with crc error */
-	u32   fraligner;         /* frames with alignment error */
-	u32   inrangelenrxer;    /* in range length error */
-	u32   outrangelenrxer;   /* out of range length error */
-	u32   frtoolong;         /* frame too long */
-	u32   runt;              /* runt */
-	u32   verylongevent;     /* very long event */
-	u32   symbolerror;       /* symbol error */
-	u32   dropbsy;           /* drop because of BD not ready */
-	u8    res0[0x8];
-	u32   mismatchdrop;      /* drop because of MAC filtering */
-	u32   underpkts;         /* total frames less than 64 octets */
-	u32   pkts256;           /* total frames(including bad)256~511 B */
-	u32   pkts512;           /* total frames(including bad)512~1023 B */
-	u32   pkts1024;          /* total frames(including bad)1024~1518 B */
-	u32   pktsjumbo;         /* total frames(including bad) >1024 B */
-	u32   frlossinmacer;
-	u32   pausefr;           /* pause frames */
-	u8    res1[0x4];
-	u32   removevlan;
-	u32   replacevlan;
-	u32   insertvlan;
-} __packed;
-
-/* Rx interrupt coalescing entry, each Rx queue has one this entry. */
-struct uec_rx_interrupt_coalescing_entry {
-	u32   maxvalue;
-	u32   counter;
-} __packed;
-
-struct uec_rx_interrupt_coalescing_table {
-	struct uec_rx_interrupt_coalescing_entry   entry[MAX_RX_QUEUES];
-} __packed;
-
-/* RxBD queue entry, each Rx queue has one this entry. */
-struct uec_rx_bd_queues_entry {
-	u32   bdbaseptr;         /* BD base pointer          */
-	u32   bdptr;             /* BD pointer               */
-	u32   externalbdbaseptr; /* external BD base pointer */
-	u32   externalbdptr;     /* external BD pointer      */
-} __packed;
-
-/* Rx global parameter table */
-struct uec_rx_global_pram {
-	u32  remoder;             /* ethernet mode reg. */
-	u32  rqptr;               /* base pointer to the Rx Queues */
-	u32  res0[0x1];
-	u8   res1[0x20 - 0xc];
-	u16  typeorlen;
-	u8   res2[0x1];
-	u8   rxgstpack;           /* ack on GRACEFUL STOP RX command */
-	u32  rxrmonbaseptr;       /* Rx RMON statistics base */
-	u8   res3[0x30 - 0x28];
-	u32  intcoalescingptr;    /* Interrupt coalescing table pointer */
-	u8   res4[0x36 - 0x34];
-	u8   rstate;
-	u8   res5[0x46 - 0x37];
-	u16  mrblr;               /* max receive buffer length reg. */
-	u32  rbdqptr;             /* RxBD parameter table description */
-	u16  mflr;                /* max frame length reg. */
-	u16  minflr;              /* min frame length reg. */
-	u16  maxd1;               /* max dma1 length reg. */
-	u16  maxd2;               /* max dma2 length reg. */
-	u32  ecamptr;             /* external CAM address */
-	u32  l2qt;                /* VLAN priority mapping table. */
-	u32  l3qt[0x8];           /* IP   priority mapping table. */
-	u16  vlantype;            /* vlan type */
-	u16  vlantci;             /* default vlan tci */
-	u8   addressfiltering[64];/* address filtering data structure */
-	u32  exf_global_param;      /* extended filtering global parameters */
-	u8   res6[0x100 - 0xc4];    /* Initialize to zero */
-} __packed;
-
-#define GRACEFUL_STOP_ACKNOWLEDGE_RX            0x01
-
-/****** UEC common ******/
-/* UCC statistics - hardware counters */
-struct uec_hardware_statistics {
-	u32 tx64;
-	u32 tx127;
-	u32 tx255;
-	u32 rx64;
-	u32 rx127;
-	u32 rx255;
-	u32 txok;
-	u16 txcf;
-	u32 tmca;
-	u32 tbca;
-	u32 rxfok;
-	u32 rxbok;
-	u32 rbyt;
-	u32 rmca;
-	u32 rbca;
-} __packed;
-
-/* InitEnet command parameter */
-struct uec_init_cmd_pram {
-	u8   resinit0;
-	u8   resinit1;
-	u8   resinit2;
-	u8   resinit3;
-	u16  resinit4;
-	u8   res1[0x1];
-	u8   largestexternallookupkeysize;
-	u32  rgftgfrxglobal;
-	u32  rxthread[MAX_ENET_INIT_PARAM_ENTRIES_RX]; /* rx threads */
-	u8   res2[0x38 - 0x30];
-	u32  txglobal;				   /* tx global  */
-	u32  txthread[MAX_ENET_INIT_PARAM_ENTRIES_TX]; /* tx threads */
-	u8   res3[0x1];
-} __packed;
-
-#define ENET_INIT_PARAM_RGF_SHIFT		(32 - 4)
-#define ENET_INIT_PARAM_TGF_SHIFT		(32 - 8)
-
-#define ENET_INIT_PARAM_RISC_MASK		0x0000003f
-#define ENET_INIT_PARAM_PTR_MASK		0x00ffffc0
-#define ENET_INIT_PARAM_SNUM_MASK		0xff000000
-#define ENET_INIT_PARAM_SNUM_SHIFT		24
-
-#define ENET_INIT_PARAM_MAGIC_RES_INIT0		0x06
-#define ENET_INIT_PARAM_MAGIC_RES_INIT1		0x30
-#define ENET_INIT_PARAM_MAGIC_RES_INIT2		0xff
-#define ENET_INIT_PARAM_MAGIC_RES_INIT3		0x00
-#define ENET_INIT_PARAM_MAGIC_RES_INIT4		0x0400
-
-/* structure representing 82xx Address Filtering Enet Address in PRAM */
-struct uec_82xx_enet_addr {
-	u8   res1[0x2];
-	u16  h;       /* address (MSB) */
-	u16  m;       /* address       */
-	u16  l;       /* address (LSB) */
-} __packed;
-
-/* structure representing 82xx Address Filtering PRAM */
-struct uec_82xx_add_filtering_pram {
-	u32  iaddr_h;        /* individual address filter, high */
-	u32  iaddr_l;        /* individual address filter, low  */
-	u32  gaddr_h;        /* group address filter, high      */
-	u32  gaddr_l;        /* group address filter, low       */
-	struct uec_82xx_enet_addr    taddr;
-	struct uec_82xx_enet_addr    paddr[4];
-	u8                         res0[0x40 - 0x38];
-} __packed;
-
-/* Buffer Descriptor */
-struct buffer_descriptor {
-	u16 status;
-	u16 len;
-	u32 data;
-} __packed;
-
-#define	SIZEOFBD	sizeof(struct buffer_descriptor)
-
-/* Common BD flags */
-#define BD_WRAP			0x2000
-#define BD_INT			0x1000
-#define BD_LAST			0x0800
-#define BD_CLEAN		0x3000
-
-/* TxBD status flags */
-#define TX_BD_READY		0x8000
-#define TX_BD_PADCRC		0x4000
-#define TX_BD_WRAP		BD_WRAP
-#define TX_BD_INT		BD_INT
-#define TX_BD_LAST		BD_LAST
-#define TX_BD_TXCRC		0x0400
-#define TX_BD_DEF		0x0200
-#define TX_BD_PP			0x0100
-#define TX_BD_LC			0x0080
-#define TX_BD_RL			0x0040
-#define TX_BD_RC			0x003C
-#define TX_BD_UNDERRUN		0x0002
-#define TX_BD_TRUNC		0x0001
-
-#define TX_BD_ERROR		(TX_BD_UNDERRUN | TX_BD_TRUNC)
-
-/* RxBD status flags */
-#define RX_BD_EMPTY		0x8000
-#define RX_BD_OWNER		0x4000
-#define RX_BD_WRAP		BD_WRAP
-#define RX_BD_INT		BD_INT
-#define RX_BD_LAST		BD_LAST
-#define RX_BD_FIRST		0x0400
-#define RX_BD_CMR		0x0200
-#define RX_BD_MISS		0x0100
-#define RX_BD_BCAST		0x0080
-#define RX_BD_MCAST		0x0040
-#define RX_BD_LG			0x0020
-#define RX_BD_NO			0x0010
-#define RX_BD_SHORT		0x0008
-#define RX_BD_CRCERR		0x0004
-#define RX_BD_OVERRUN		0x0002
-#define RX_BD_IPCH		0x0001
-
-#define RX_BD_ERROR		(RX_BD_LG | RX_BD_NO | RX_BD_SHORT | \
-				 RX_BD_CRCERR | RX_BD_OVERRUN)
-
-/* BD access macros */
-#define BD_STATUS(_bd)		(in_be16(&((_bd)->status)))
-#define BD_STATUS_SET(_bd, _v)	(out_be16(&((_bd)->status), _v))
-#define BD_LENGTH(_bd)		(in_be16(&((_bd)->len)))
-#define BD_LENGTH_SET(_bd, _v)	(out_be16(&((_bd)->len), _v))
-#define BD_DATA_CLEAR(_bd)	(out_be32(&((_bd)->data), 0))
-#define BD_DATA(_bd)		((u8 *)(((_bd)->data)))
-#define BD_DATA_SET(_bd, _data)	(out_be32(&((_bd)->data), (u32)_data))
-#define BD_ADVANCE(_bd, _status, _base)	\
-	(((_status) & BD_WRAP) ? (_bd) = \
-	 ((struct buffer_descriptor *)(_base)) : ++(_bd))
-
-/* Rx Prefetched BDs */
-struct uec_rx_pref_bds {
-	struct buffer_descriptor   bd[MAX_PREFETCHED_BDS]; /* prefetched bd */
-} __packed;
-
-/* Alignments */
-#define UEC_RX_GLOBAL_PRAM_ALIGNMENT				64
-#define UEC_TX_GLOBAL_PRAM_ALIGNMENT				64
-#define UEC_THREAD_RX_PRAM_ALIGNMENT				128
-#define UEC_THREAD_TX_PRAM_ALIGNMENT				64
-#define UEC_THREAD_DATA_ALIGNMENT				256
-#define UEC_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT		32
-#define UEC_SCHEDULER_ALIGNMENT					4
-#define UEC_TX_STATISTICS_ALIGNMENT				4
-#define UEC_RX_STATISTICS_ALIGNMENT				4
-#define UEC_RX_INTERRUPT_COALESCING_ALIGNMENT			4
-#define UEC_RX_BD_QUEUES_ALIGNMENT				8
-#define UEC_RX_PREFETCHED_BDS_ALIGNMENT				128
-#define UEC_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT	4
-#define UEC_RX_BD_RING_ALIGNMENT				32
-#define UEC_TX_BD_RING_ALIGNMENT				32
-#define UEC_MRBLR_ALIGNMENT					128
-#define UEC_RX_BD_RING_SIZE_ALIGNMENT				4
-#define UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT			32
-#define UEC_RX_DATA_BUF_ALIGNMENT				64
-
-#define UEC_VLAN_PRIORITY_MAX					8
-#define UEC_IP_PRIORITY_MAX					64
-#define UEC_TX_VTAG_TABLE_ENTRY_MAX				8
-#define UEC_RX_BD_RING_SIZE_MIN					8
-#define UEC_TX_BD_RING_SIZE_MIN					2
-
-/* TBI / MII Set Register */
-enum enet_tbi_mii_reg {
-	ENET_TBI_MII_CR        = 0x00,
-	ENET_TBI_MII_SR        = 0x01,
-	ENET_TBI_MII_ANA       = 0x04,
-	ENET_TBI_MII_ANLPBPA   = 0x05,
-	ENET_TBI_MII_ANEX      = 0x06,
-	ENET_TBI_MII_ANNPT     = 0x07,
-	ENET_TBI_MII_ANLPANP   = 0x08,
-	ENET_TBI_MII_EXST      = 0x0F,
-	ENET_TBI_MII_JD        = 0x10,
-	ENET_TBI_MII_TBICON    = 0x11
-};
-
-/* TBI MDIO register bit fields*/
-#define TBICON_CLK_SELECT	0x0020
-#define TBIANA_ASYMMETRIC_PAUSE	0x0100
-#define TBIANA_SYMMETRIC_PAUSE	0x0080
-#define TBIANA_HALF_DUPLEX	0x0040
-#define TBIANA_FULL_DUPLEX	0x0020
-#define TBICR_PHY_RESET		0x8000
-#define TBICR_ANEG_ENABLE	0x1000
-#define TBICR_RESTART_ANEG	0x0200
-#define TBICR_FULL_DUPLEX	0x0100
-#define TBICR_SPEED1_SET	0x0040
-
-#define TBIANA_SETTINGS ( \
-		TBIANA_ASYMMETRIC_PAUSE \
-		| TBIANA_SYMMETRIC_PAUSE \
-		| TBIANA_FULL_DUPLEX \
-		)
-
-#define TBICR_SETTINGS ( \
-		TBICR_PHY_RESET \
-		| TBICR_ANEG_ENABLE \
-		| TBICR_FULL_DUPLEX \
-		| TBICR_SPEED1_SET \
-		)
-
-/* UEC number of threads */
-enum uec_num_of_threads {
-	UEC_NUM_OF_THREADS_1  = 0x1,  /* 1 */
-	UEC_NUM_OF_THREADS_2  = 0x2,  /* 2 */
-	UEC_NUM_OF_THREADS_4  = 0x0,  /* 4 */
-	UEC_NUM_OF_THREADS_6  = 0x3,  /* 6 */
-	UEC_NUM_OF_THREADS_8  = 0x4   /* 8 */
-};
-
-/* UEC initialization info struct */
-#define STD_UEC_INFO(num) \
-{			\
-	.uf_info		= {	\
-		.ucc_num	= CFG_SYS_UEC##num##_UCC_NUM,\
-		.rx_clock	= CFG_SYS_UEC##num##_RX_CLK,	\
-		.tx_clock	= CFG_SYS_UEC##num##_TX_CLK,	\
-		.eth_type	= CFG_SYS_UEC##num##_ETH_TYPE,\
-	},	\
-	.num_threads_tx		= UEC_NUM_OF_THREADS_1,	\
-	.num_threads_rx		= UEC_NUM_OF_THREADS_1,	\
-	.risc_tx		= QE_RISC_ALLOCATION_RISC1_AND_RISC2, \
-	.risc_rx		= QE_RISC_ALLOCATION_RISC1_AND_RISC2, \
-	.tx_bd_ring_len		= 16,	\
-	.rx_bd_ring_len		= 16,	\
-	.phy_address		= CFG_SYS_UEC##num##_PHY_ADDR, \
-	.enet_interface_type	= CFG_SYS_UEC##num##_INTERFACE_TYPE, \
-	.speed			= CFG_SYS_UEC##num##_INTERFACE_SPEED, \
-}
-
-struct uec_inf {
-	struct ucc_fast_inf		uf_info;
-	enum uec_num_of_threads		num_threads_tx;
-	enum uec_num_of_threads		num_threads_rx;
-	unsigned int			risc_tx;
-	unsigned int			risc_rx;
-	u16				rx_bd_ring_len;
-	u16				tx_bd_ring_len;
-	u8				phy_address;
-	phy_interface_t			enet_interface_type;
-	int				speed;
-};
-
-/* UEC driver initialized info */
-#define MAX_RXBUF_LEN			1536
-#define MAX_FRAME_LEN			1518
-#define MIN_FRAME_LEN			64
-#define MAX_DMA1_LEN			1520
-#define MAX_DMA2_LEN			1520
-
-/* UEC driver private struct */
-struct uec_priv {
-	struct uec_inf			*uec_info;
-	struct ucc_fast_priv		*uccf;
-	struct eth_device		*dev;
-	uec_t				*uec_regs;
-	uec_mii_t			*uec_mii_regs;
-	/* enet init command parameter */
-	struct uec_init_cmd_pram		*p_init_enet_param;
-	u32				init_enet_param_offset;
-	/* Rx and Tx parameter */
-	struct uec_rx_global_pram		*p_rx_glbl_pram;
-	u32				rx_glbl_pram_offset;
-	struct uec_tx_global_pram		*p_tx_glbl_pram;
-	u32				tx_glbl_pram_offset;
-	struct uec_send_queue_mem_region	*p_send_q_mem_reg;
-	u32				send_q_mem_reg_offset;
-	struct uec_thread_data_tx		*p_thread_data_tx;
-	u32				thread_dat_tx_offset;
-	struct uec_thread_data_rx		*p_thread_data_rx;
-	u32				thread_dat_rx_offset;
-	struct uec_rx_bd_queues_entry	*p_rx_bd_qs_tbl;
-	u32				rx_bd_qs_tbl_offset;
-	/* BDs specific */
-	u8				*p_tx_bd_ring;
-	u32				tx_bd_ring_offset;
-	u8				*p_rx_bd_ring;
-	u32				rx_bd_ring_offset;
-	u8				*p_rx_buf;
-	u32				rx_buf_offset;
-	struct buffer_descriptor	*tx_bd;
-	struct buffer_descriptor	*rx_bd;
-	/* Status */
-	int				mac_tx_enabled;
-	int				mac_rx_enabled;
-	int				grace_stopped_tx;
-	int				grace_stopped_rx;
-	int				the_first_run;
-	/* PHY specific */
-	struct uec_mii_info		*mii_info;
-	int				oldspeed;
-	int				oldduplex;
-	int				oldlink;
-};
-
-int uec_initialize(struct bd_info *bis, struct uec_inf *uec_info);
-int uec_eth_init(struct bd_info *bis, struct uec_inf *uecs, int num);
-int uec_standard_init(struct bd_info *bis);
-#endif /* __UEC_H__ */
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
deleted file mode 100644
index fcf06d103283..000000000000
--- a/drivers/qe/uec_phy.c
+++ /dev/null
@@ -1,930 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2005,2010-2011 Freescale Semiconductor, Inc.
- *
- * Author: Shlomi Gridish
- *
- * Description: UCC GETH Driver -- PHY handling
- *		Driver for UEC on QE
- *		Based on 8260_io/fcc_enet.c
- */
-
-#include <common.h>
-#include <net.h>
-#include <malloc.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/immap_qe.h>
-#include <asm/io.h>
-#include "uccf.h"
-#include "uec.h"
-#include "uec_phy.h"
-#include "miiphy.h"
-#include <fsl_qe.h>
-#include <phy.h>
-
-#if !defined(CONFIG_DM_ETH)
-
-#define ugphy_printk(format, arg...)  \
-	printf(format "\n", ## arg)
-
-#define ugphy_dbg(format, arg...)	     \
-	ugphy_printk(format, ## arg)
-#define ugphy_err(format, arg...)	     \
-	ugphy_printk(format, ## arg)
-#define ugphy_info(format, arg...)	     \
-	ugphy_printk(format, ## arg)
-#define ugphy_warn(format, arg...)	     \
-	ugphy_printk(format, ## arg)
-
-#ifdef UEC_VERBOSE_DEBUG
-#define ugphy_vdbg ugphy_dbg
-#else
-#define ugphy_vdbg(ugeth, fmt, args...) do { } while (0)
-#endif /* UEC_VERBOSE_DEBUG */
-
-/*
- * --------------------------------------------------------------------
- * Fixed PHY (PHY-less) support for Ethernet Ports.
- *
- * Copied from arch/powerpc/cpu/ppc4xx/4xx_enet.c
- *--------------------------------------------------------------------
- *
- * Some boards do not have a PHY for each ethernet port. These ports are known
- * as Fixed PHY (or PHY-less) ports. For such ports, set the appropriate
- * CFG_SYS_UECx_PHY_ADDR equal to CONFIG_FIXED_PHY_ADDR (an unused address)
- * When the drver tries to identify the PHYs, CONFIG_FIXED_PHY will be returned
- * and the driver will search CONFIG_SYS_FIXED_PHY_PORTS to find what network
- * speed and duplex should be for the port.
- *
- * Example board header configuration file:
- *     #define CONFIG_FIXED_PHY   0xFFFFFFFF
- *     #define CONFIG_SYS_FIXED_PHY_ADDR 0x1E (pick an unused phy address)
- *
- *     #define CFG_SYS_UEC1_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR
- *     #define CFG_SYS_UEC2_PHY_ADDR 0x02
- *     #define CFG_SYS_UEC3_PHY_ADDR CONFIG_SYS_FIXED_PHY_ADDR
- *     #define CFG_SYS_UEC4_PHY_ADDR 0x04
- *
- *     #define CONFIG_SYS_FIXED_PHY_PORT(name,speed,duplex) \
- *                 {name, speed, duplex},
- *
- *     #define CONFIG_SYS_FIXED_PHY_PORTS \
- *                 CONFIG_SYS_FIXED_PHY_PORT("UEC0",SPEED_100,DUPLEX_FULL) \
- *                 CONFIG_SYS_FIXED_PHY_PORT("UEC2",SPEED_100,DUPLEX_HALF)
- */
-
-#ifndef CONFIG_FIXED_PHY
-#define CONFIG_FIXED_PHY	0xFFFFFFFF /* Fixed PHY (PHY-less) */
-#endif
-
-#ifndef CONFIG_SYS_FIXED_PHY_PORTS
-#define CONFIG_SYS_FIXED_PHY_PORTS	/* default is an empty array */
-#endif
-
-struct fixed_phy_port {
-	char name[16];	/* ethernet port name */
-	unsigned int speed;	/* specified speed 10,100 or 1000 */
-	unsigned int duplex;	/* specified duplex FULL or HALF */
-};
-
-static const struct fixed_phy_port fixed_phy_port[] = {
-	CONFIG_SYS_FIXED_PHY_PORTS /* defined in board configuration file */
-};
-
-/*
- * -------------------------------------------------------------------
- * BitBang MII support for ethernet ports
- *
- * Based from MPC8560ADS implementation
- *--------------------------------------------------------------------
- *
- * Example board header file to define bitbang ethernet ports:
- *
- * #define CONFIG_SYS_BITBANG_PHY_PORT(name) name,
- * #define CONFIG_SYS_BITBANG_PHY_PORTS CONFIG_SYS_BITBANG_PHY_PORT("UEC0")
- */
-#ifndef CONFIG_SYS_BITBANG_PHY_PORTS
-#define CONFIG_SYS_BITBANG_PHY_PORTS	/* default is an empty array */
-#endif
-
-#if defined(CONFIG_BITBANGMII)
-static const char * const bitbang_phy_port[] = {
-	CONFIG_SYS_BITBANG_PHY_PORTS /* defined in board configuration file */
-};
-#endif /* CONFIG_BITBANGMII */
-
-static void config_genmii_advert(struct uec_mii_info *mii_info);
-static void genmii_setup_forced(struct uec_mii_info *mii_info);
-static void genmii_restart_aneg(struct uec_mii_info *mii_info);
-static int gbit_config_aneg(struct uec_mii_info *mii_info);
-static int genmii_config_aneg(struct uec_mii_info *mii_info);
-static int genmii_update_link(struct uec_mii_info *mii_info);
-static int genmii_read_status(struct uec_mii_info *mii_info);
-static u16 uec_phy_read(struct uec_mii_info *mii_info, u16 regnum);
-static void uec_phy_write(struct uec_mii_info *mii_info, u16 regnum,
-			  u16 val);
-
-/*
- * Write value to the PHY for this device to the register at regnum,
- * waiting until the write is done before it returns.  All PHY
- * configuration has to be done through the TSEC1 MIIM regs
- */
-void uec_write_phy_reg(struct eth_device *dev, int mii_id, int regnum,
-		       int value)
-{
-	struct uec_priv *ugeth = (struct uec_priv *)dev->priv;
-	uec_mii_t *ug_regs;
-	enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg)regnum;
-	u32 tmp_reg;
-
-#if defined(CONFIG_BITBANGMII)
-	u32 i = 0;
-
-	for (i = 0; i < ARRAY_SIZE(bitbang_phy_port); i++) {
-		if (strncmp(dev->name, bitbang_phy_port[i],
-			    sizeof(dev->name)) == 0) {
-			(void)bb_miiphy_write(NULL, mii_id, regnum, value);
-			return;
-		}
-	}
-#endif /* CONFIG_BITBANGMII */
-
-	ug_regs = ugeth->uec_mii_regs;
-
-	/* Stop the MII management read cycle */
-	out_be32 (&ug_regs->miimcom, 0);
-	/* Setting up the MII Management Address Register */
-	tmp_reg = ((u32)mii_id << MIIMADD_PHY_ADDRESS_SHIFT) | mii_reg;
-	out_be32 (&ug_regs->miimadd, tmp_reg);
-
-	/* Setting up the MII Management Control Register with the value */
-	out_be32 (&ug_regs->miimcon, (u32)value);
-	sync();
-
-	/* Wait till MII management write is complete */
-	while ((in_be32 (&ug_regs->miimind)) & MIIMIND_BUSY)
-		;
-}
-
-/*
- * Reads from register regnum in the PHY for device dev,
- * returning the value.  Clears miimcom first.  All PHY
- * configuration has to be done through the TSEC1 MIIM regs
- */
-int uec_read_phy_reg(struct eth_device *dev, int mii_id, int regnum)
-{
-	struct uec_priv *ugeth = (struct uec_priv *)dev->priv;
-	uec_mii_t *ug_regs;
-	enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg)regnum;
-	u32 tmp_reg;
-	u16 value;
-
-#if defined(CONFIG_BITBANGMII)
-	u32 i = 0;
-
-	for (i = 0; i < ARRAY_SIZE(bitbang_phy_port); i++) {
-		if (strncmp(dev->name, bitbang_phy_port[i],
-			    sizeof(dev->name)) == 0) {
-			(void)bb_miiphy_read(NULL, mii_id, regnum, &value);
-			return value;
-		}
-	}
-#endif /* CONFIG_BITBANGMII */
-
-	ug_regs = ugeth->uec_mii_regs;
-
-	/* Setting up the MII Management Address Register */
-	tmp_reg = ((u32)mii_id << MIIMADD_PHY_ADDRESS_SHIFT) | mii_reg;
-	out_be32 (&ug_regs->miimadd, tmp_reg);
-
-	/* clear MII management command cycle */
-	out_be32 (&ug_regs->miimcom, 0);
-	sync();
-
-	/* Perform an MII management read cycle */
-	out_be32 (&ug_regs->miimcom, MIIMCOM_READ_CYCLE);
-
-	/* Wait till MII management write is complete */
-	while ((in_be32 (&ug_regs->miimind)) &
-	       (MIIMIND_NOT_VALID | MIIMIND_BUSY))
-		;
-
-	/* Read MII management status  */
-	value = (u16)in_be32 (&ug_regs->miimstat);
-	if (value == 0xffff)
-		ugphy_vdbg
-			("read wrong value : mii_id %d,mii_reg %d, base %08x",
-			 mii_id, mii_reg, (u32)&ug_regs->miimcfg);
-
-	return value;
-}
-
-void mii_clear_phy_interrupt(struct uec_mii_info *mii_info)
-{
-	if (mii_info->phyinfo->ack_interrupt)
-		mii_info->phyinfo->ack_interrupt(mii_info);
-}
-
-void mii_configure_phy_interrupt(struct uec_mii_info *mii_info,
-				 u32 interrupts)
-{
-	mii_info->interrupts = interrupts;
-	if (mii_info->phyinfo->config_intr)
-		mii_info->phyinfo->config_intr(mii_info);
-}
-
-/* Writes MII_ADVERTISE with the appropriate values, after
- * sanitizing advertise to make sure only supported features
- * are advertised
- */
-static void config_genmii_advert(struct uec_mii_info *mii_info)
-{
-	u32 advertise;
-	u16 adv;
-
-	/* Only allow advertising what this PHY supports */
-	mii_info->advertising &= mii_info->phyinfo->features;
-	advertise = mii_info->advertising;
-
-	/* Setup standard advertisement */
-	adv = uec_phy_read(mii_info, MII_ADVERTISE);
-	adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
-	if (advertise & ADVERTISED_10baseT_Half)
-		adv |= ADVERTISE_10HALF;
-	if (advertise & ADVERTISED_10baseT_Full)
-		adv |= ADVERTISE_10FULL;
-	if (advertise & ADVERTISED_100baseT_Half)
-		adv |= ADVERTISE_100HALF;
-	if (advertise & ADVERTISED_100baseT_Full)
-		adv |= ADVERTISE_100FULL;
-	uec_phy_write(mii_info, MII_ADVERTISE, adv);
-}
-
-static void genmii_setup_forced(struct uec_mii_info *mii_info)
-{
-	u16 ctrl;
-	u32 features = mii_info->phyinfo->features;
-
-	ctrl = uec_phy_read(mii_info, MII_BMCR);
-
-	ctrl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 |
-		  BMCR_SPEED1000 | BMCR_ANENABLE);
-	ctrl |= BMCR_RESET;
-
-	switch (mii_info->speed) {
-	case SPEED_1000:
-		if (features & (SUPPORTED_1000baseT_Half
-				| SUPPORTED_1000baseT_Full)) {
-			ctrl |= BMCR_SPEED1000;
-			break;
-		}
-		mii_info->speed = SPEED_100;
-	case SPEED_100:
-		if (features & (SUPPORTED_100baseT_Half
-				| SUPPORTED_100baseT_Full)) {
-			ctrl |= BMCR_SPEED100;
-			break;
-		}
-		mii_info->speed = SPEED_10;
-	case SPEED_10:
-		if (features & (SUPPORTED_10baseT_Half
-				| SUPPORTED_10baseT_Full))
-			break;
-	default:		/* Unsupported speed! */
-		ugphy_err("%s: Bad speed!", mii_info->dev->name);
-		break;
-	}
-
-	uec_phy_write(mii_info, MII_BMCR, ctrl);
-}
-
-/* Enable and Restart Autonegotiation */
-static void genmii_restart_aneg(struct uec_mii_info *mii_info)
-{
-	u16 ctl;
-
-	ctl = uec_phy_read(mii_info, MII_BMCR);
-	ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
-	uec_phy_write(mii_info, MII_BMCR, ctl);
-}
-
-static int gbit_config_aneg(struct uec_mii_info *mii_info)
-{
-	u16 adv;
-	u32 advertise;
-
-	if (mii_info->autoneg) {
-		/* Configure the ADVERTISE register */
-		config_genmii_advert(mii_info);
-		advertise = mii_info->advertising;
-
-		adv = uec_phy_read(mii_info, MII_CTRL1000);
-		adv &= ~(ADVERTISE_1000FULL |
-			 ADVERTISE_1000HALF);
-		if (advertise & SUPPORTED_1000baseT_Half)
-			adv |= ADVERTISE_1000HALF;
-		if (advertise & SUPPORTED_1000baseT_Full)
-			adv |= ADVERTISE_1000FULL;
-		uec_phy_write(mii_info, MII_CTRL1000, adv);
-
-		/* Start/Restart aneg */
-		genmii_restart_aneg(mii_info);
-	} else {
-		genmii_setup_forced(mii_info);
-	}
-
-	return 0;
-}
-
-static int marvell_config_aneg(struct uec_mii_info *mii_info)
-{
-	/*
-	 * The Marvell PHY has an errata which requires
-	 * that certain registers get written in order
-	 * to restart autonegotiation
-	 */
-	uec_phy_write(mii_info, MII_BMCR, BMCR_RESET);
-
-	uec_phy_write(mii_info, 0x1d, 0x1f);
-	uec_phy_write(mii_info, 0x1e, 0x200c);
-	uec_phy_write(mii_info, 0x1d, 0x5);
-	uec_phy_write(mii_info, 0x1e, 0);
-	uec_phy_write(mii_info, 0x1e, 0x100);
-
-	gbit_config_aneg(mii_info);
-
-	return 0;
-}
-
-static int genmii_config_aneg(struct uec_mii_info *mii_info)
-{
-	if (mii_info->autoneg) {
-		/*
-		 * Speed up the common case, if link is already up, speed and
-		 * duplex match, skip auto neg as it already matches
-		 */
-		if (!genmii_read_status(mii_info) && mii_info->link)
-			if (mii_info->duplex == DUPLEX_FULL &&
-			    mii_info->speed == SPEED_100)
-				if (mii_info->advertising &
-				    ADVERTISED_100baseT_Full)
-					return 0;
-
-		config_genmii_advert(mii_info);
-		genmii_restart_aneg(mii_info);
-	} else {
-		genmii_setup_forced(mii_info);
-	}
-
-	return 0;
-}
-
-static int genmii_update_link(struct uec_mii_info *mii_info)
-{
-	u16 status;
-
-	/* Status is read once to clear old link state */
-	uec_phy_read(mii_info, MII_BMSR);
-
-	/*
-	 * Wait if the link is up, and autonegotiation is in progress
-	 * (ie - we're capable and it's not done)
-	 */
-	status = uec_phy_read(mii_info, MII_BMSR);
-	if ((status & BMSR_LSTATUS) && (status & BMSR_ANEGCAPABLE) &&
-	    !(status & BMSR_ANEGCOMPLETE)) {
-		int i = 0;
-
-		while (!(status & BMSR_ANEGCOMPLETE)) {
-			/*
-			 * Timeout reached ?
-			 */
-			if (i > UGETH_AN_TIMEOUT) {
-				mii_info->link = 0;
-				return 0;
-			}
-
-			i++;
-			udelay(1000);	/* 1 ms */
-			status = uec_phy_read(mii_info, MII_BMSR);
-		}
-		mii_info->link = 1;
-	} else {
-		if (status & BMSR_LSTATUS)
-			mii_info->link = 1;
-		else
-			mii_info->link = 0;
-	}
-
-	return 0;
-}
-
-static int genmii_read_status(struct uec_mii_info *mii_info)
-{
-	u16 status;
-	int err;
-
-	/* Update the link, but return if there was an error */
-	err = genmii_update_link(mii_info);
-	if (err)
-		return err;
-
-	if (mii_info->autoneg) {
-		status = uec_phy_read(mii_info, MII_STAT1000);
-
-		if (status & (LPA_1000FULL | LPA_1000HALF)) {
-			mii_info->speed = SPEED_1000;
-			if (status & LPA_1000FULL)
-				mii_info->duplex = DUPLEX_FULL;
-			else
-				mii_info->duplex = DUPLEX_HALF;
-		} else {
-			status = uec_phy_read(mii_info, MII_LPA);
-
-			if (status & (LPA_10FULL | LPA_100FULL))
-				mii_info->duplex = DUPLEX_FULL;
-			else
-				mii_info->duplex = DUPLEX_HALF;
-			if (status & (LPA_100FULL | LPA_100HALF))
-				mii_info->speed = SPEED_100;
-			else
-				mii_info->speed = SPEED_10;
-		}
-		mii_info->pause = 0;
-	}
-	/* On non-aneg, we assume what we put in BMCR is the speed,
-	 * though magic-aneg shouldn't prevent this case from occurring
-	 */
-
-	return 0;
-}
-
-static int bcm_init(struct uec_mii_info *mii_info)
-{
-	struct eth_device *edev = mii_info->dev;
-	struct uec_priv *uec = edev->priv;
-
-	gbit_config_aneg(mii_info);
-
-	if (uec->uec_info->enet_interface_type ==
-				PHY_INTERFACE_MODE_RGMII_RXID &&
-			uec->uec_info->speed == SPEED_1000) {
-		u16 val;
-		int cnt = 50;
-
-		/* Wait for aneg to complete. */
-		do
-			val = uec_phy_read(mii_info, MII_BMSR);
-		while (--cnt && !(val & BMSR_ANEGCOMPLETE));
-
-		/* Set RDX clk delay. */
-		uec_phy_write(mii_info, 0x18, 0x7 | (7 << 12));
-
-		val = uec_phy_read(mii_info, 0x18);
-		/* Set RDX-RXC skew. */
-		val |= (1 << 8);
-		val |= (7 | (7 << 12));
-		/* Write bits 14:0. */
-		val |= (1 << 15);
-		uec_phy_write(mii_info, 0x18, val);
-	}
-
-	return 0;
-}
-
-static int uec_marvell_init(struct uec_mii_info *mii_info)
-{
-	struct eth_device *edev = mii_info->dev;
-	struct uec_priv *uec = edev->priv;
-	phy_interface_t iface = uec->uec_info->enet_interface_type;
-	int	speed = uec->uec_info->speed;
-
-	if (speed == SPEED_1000 &&
-	    (iface == PHY_INTERFACE_MODE_RGMII_ID ||
-	    iface == PHY_INTERFACE_MODE_RGMII_RXID ||
-	    iface == PHY_INTERFACE_MODE_RGMII_TXID)) {
-		int temp;
-
-		temp = uec_phy_read(mii_info, MII_M1111_PHY_EXT_CR);
-		if (iface == PHY_INTERFACE_MODE_RGMII_ID) {
-			temp |= MII_M1111_RX_DELAY | MII_M1111_TX_DELAY;
-		} else if (iface == PHY_INTERFACE_MODE_RGMII_RXID) {
-			temp &= ~MII_M1111_TX_DELAY;
-			temp |= MII_M1111_RX_DELAY;
-		} else if (iface == PHY_INTERFACE_MODE_RGMII_TXID) {
-			temp &= ~MII_M1111_RX_DELAY;
-			temp |= MII_M1111_TX_DELAY;
-		}
-		uec_phy_write(mii_info, MII_M1111_PHY_EXT_CR, temp);
-
-		temp = uec_phy_read(mii_info, MII_M1111_PHY_EXT_SR);
-		temp &= ~MII_M1111_HWCFG_MODE_MASK;
-		temp |= MII_M1111_HWCFG_MODE_RGMII;
-		uec_phy_write(mii_info, MII_M1111_PHY_EXT_SR, temp);
-
-		uec_phy_write(mii_info, MII_BMCR, BMCR_RESET);
-	}
-
-	return 0;
-}
-
-static int marvell_read_status(struct uec_mii_info *mii_info)
-{
-	u16 status;
-	int err;
-
-	/* Update the link, but return if there was an error */
-	err = genmii_update_link(mii_info);
-	if (err)
-		return err;
-
-	/*
-	 * If the link is up, read the speed and duplex
-	 * If we aren't autonegotiating, assume speeds
-	 * are as set
-	 */
-	if (mii_info->autoneg && mii_info->link) {
-		int speed;
-
-		status = uec_phy_read(mii_info, MII_M1011_PHY_SPEC_STATUS);
-
-		/* Get the duplexity */
-		if (status & MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX)
-			mii_info->duplex = DUPLEX_FULL;
-		else
-			mii_info->duplex = DUPLEX_HALF;
-
-		/* Get the speed */
-		speed = status & MII_M1011_PHY_SPEC_STATUS_SPD_MASK;
-		switch (speed) {
-		case MII_M1011_PHY_SPEC_STATUS_1000:
-			mii_info->speed = SPEED_1000;
-			break;
-		case MII_M1011_PHY_SPEC_STATUS_100:
-			mii_info->speed = SPEED_100;
-			break;
-		default:
-			mii_info->speed = SPEED_10;
-			break;
-		}
-		mii_info->pause = 0;
-	}
-
-	return 0;
-}
-
-static int marvell_ack_interrupt(struct uec_mii_info *mii_info)
-{
-	/* Clear the interrupts by reading the reg */
-	uec_phy_read(mii_info, MII_M1011_IEVENT);
-
-	return 0;
-}
-
-static int marvell_config_intr(struct uec_mii_info *mii_info)
-{
-	if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-		uec_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_INIT);
-	else
-		uec_phy_write(mii_info, MII_M1011_IMASK,
-			      MII_M1011_IMASK_CLEAR);
-
-	return 0;
-}
-
-static int dm9161_init(struct uec_mii_info *mii_info)
-{
-	/* Reset the PHY */
-	uec_phy_write(mii_info, MII_BMCR, uec_phy_read(mii_info, MII_BMCR) |
-		   BMCR_RESET);
-	/* PHY and MAC connect */
-	uec_phy_write(mii_info, MII_BMCR, uec_phy_read(mii_info, MII_BMCR) &
-		   ~BMCR_ISOLATE);
-
-	uec_phy_write(mii_info, MII_DM9161_SCR, MII_DM9161_SCR_INIT);
-
-	config_genmii_advert(mii_info);
-	/* Start/restart aneg */
-	genmii_config_aneg(mii_info);
-
-	return 0;
-}
-
-static int dm9161_config_aneg(struct uec_mii_info *mii_info)
-{
-	return 0;
-}
-
-static int dm9161_read_status(struct uec_mii_info *mii_info)
-{
-	u16 status;
-	int err;
-
-	/* Update the link, but return if there was an error */
-	err = genmii_update_link(mii_info);
-	if (err)
-		return err;
-	/*
-	 * If the link is up, read the speed and duplex
-	 * If we aren't autonegotiating assume speeds are as set
-	 */
-	if (mii_info->autoneg && mii_info->link) {
-		status = uec_phy_read(mii_info, MII_DM9161_SCSR);
-		if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_100H))
-			mii_info->speed = SPEED_100;
-		else
-			mii_info->speed = SPEED_10;
-
-		if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_10F))
-			mii_info->duplex = DUPLEX_FULL;
-		else
-			mii_info->duplex = DUPLEX_HALF;
-	}
-
-	return 0;
-}
-
-static int dm9161_ack_interrupt(struct uec_mii_info *mii_info)
-{
-	/* Clear the interrupt by reading the reg */
-	uec_phy_read(mii_info, MII_DM9161_INTR);
-
-	return 0;
-}
-
-static int dm9161_config_intr(struct uec_mii_info *mii_info)
-{
-	if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-		uec_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_INIT);
-	else
-		uec_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_STOP);
-
-	return 0;
-}
-
-static void dm9161_close(struct uec_mii_info *mii_info)
-{
-}
-
-static int fixed_phy_aneg(struct uec_mii_info *mii_info)
-{
-	mii_info->autoneg = 0; /* Turn off auto negotiation for fixed phy */
-	return 0;
-}
-
-static int fixed_phy_read_status(struct uec_mii_info *mii_info)
-{
-	int i = 0;
-
-	for (i = 0; i < ARRAY_SIZE(fixed_phy_port); i++) {
-		if (strncmp(mii_info->dev->name, fixed_phy_port[i].name,
-			    strlen(mii_info->dev->name)) == 0) {
-			mii_info->speed = fixed_phy_port[i].speed;
-			mii_info->duplex = fixed_phy_port[i].duplex;
-			mii_info->link = 1; /* Link is always UP */
-			mii_info->pause = 0;
-			break;
-		}
-	}
-	return 0;
-}
-
-static int smsc_config_aneg(struct uec_mii_info *mii_info)
-{
-	return 0;
-}
-
-static int smsc_read_status(struct uec_mii_info *mii_info)
-{
-	u16 status;
-	int err;
-
-	/* Update the link, but return if there was an error */
-	err = genmii_update_link(mii_info);
-	if (err)
-		return err;
-
-	/*
-	 * If the link is up, read the speed and duplex
-	 * If we aren't autonegotiating, assume speeds
-	 * are as set
-	 */
-	if (mii_info->autoneg && mii_info->link) {
-		int	val;
-
-		status = uec_phy_read(mii_info, 0x1f);
-		val = (status & 0x1c) >> 2;
-
-		switch (val) {
-		case 1:
-			mii_info->duplex = DUPLEX_HALF;
-			mii_info->speed = SPEED_10;
-			break;
-		case 5:
-			mii_info->duplex = DUPLEX_FULL;
-			mii_info->speed = SPEED_10;
-			break;
-		case 2:
-			mii_info->duplex = DUPLEX_HALF;
-			mii_info->speed = SPEED_100;
-			break;
-		case 6:
-			mii_info->duplex = DUPLEX_FULL;
-			mii_info->speed = SPEED_100;
-			break;
-		}
-		mii_info->pause = 0;
-	}
-
-	return 0;
-}
-
-static struct phy_info phy_info_dm9161 = {
-	.phy_id = 0x0181b880,
-	.phy_id_mask = 0x0ffffff0,
-	.name = "Davicom DM9161E",
-	.init = dm9161_init,
-	.config_aneg = dm9161_config_aneg,
-	.read_status = dm9161_read_status,
-	.close = dm9161_close,
-};
-
-static struct phy_info phy_info_dm9161a = {
-	.phy_id = 0x0181b8a0,
-	.phy_id_mask = 0x0ffffff0,
-	.name = "Davicom DM9161A",
-	.features = MII_BASIC_FEATURES,
-	.init = dm9161_init,
-	.config_aneg = dm9161_config_aneg,
-	.read_status = dm9161_read_status,
-	.ack_interrupt = dm9161_ack_interrupt,
-	.config_intr = dm9161_config_intr,
-	.close = dm9161_close,
-};
-
-static struct phy_info phy_info_marvell = {
-	.phy_id = 0x01410c00,
-	.phy_id_mask = 0xffffff00,
-	.name = "Marvell 88E11x1",
-	.features = MII_GBIT_FEATURES,
-	.init = &uec_marvell_init,
-	.config_aneg = &marvell_config_aneg,
-	.read_status = &marvell_read_status,
-	.ack_interrupt = &marvell_ack_interrupt,
-	.config_intr = &marvell_config_intr,
-};
-
-static struct phy_info phy_info_bcm5481 = {
-	.phy_id = 0x0143bca0,
-	.phy_id_mask = 0xffffff0,
-	.name = "Broadcom 5481",
-	.features = MII_GBIT_FEATURES,
-	.read_status = genmii_read_status,
-	.init = bcm_init,
-};
-
-static struct phy_info phy_info_fixedphy = {
-	.phy_id = CONFIG_FIXED_PHY,
-	.phy_id_mask = CONFIG_FIXED_PHY,
-	.name = "Fixed PHY",
-	.config_aneg = fixed_phy_aneg,
-	.read_status = fixed_phy_read_status,
-};
-
-static struct phy_info phy_info_smsclan8700 = {
-	.phy_id = 0x0007c0c0,
-	.phy_id_mask = 0xfffffff0,
-	.name = "SMSC LAN8700",
-	.features = MII_BASIC_FEATURES,
-	.config_aneg = smsc_config_aneg,
-	.read_status = smsc_read_status,
-};
-
-static struct phy_info phy_info_genmii = {
-	.phy_id = 0x00000000,
-	.phy_id_mask = 0x00000000,
-	.name = "Generic MII",
-	.features = MII_BASIC_FEATURES,
-	.config_aneg = genmii_config_aneg,
-	.read_status = genmii_read_status,
-};
-
-static struct phy_info *phy_info[] = {
-	&phy_info_dm9161,
-	&phy_info_dm9161a,
-	&phy_info_marvell,
-	&phy_info_bcm5481,
-	&phy_info_smsclan8700,
-	&phy_info_fixedphy,
-	&phy_info_genmii,
-	NULL
-};
-
-static u16 uec_phy_read(struct uec_mii_info *mii_info, u16 regnum)
-{
-	return mii_info->mdio_read(mii_info->dev, mii_info->mii_id, regnum);
-}
-
-static void uec_phy_write(struct uec_mii_info *mii_info, u16 regnum, u16 val)
-{
-	mii_info->mdio_write(mii_info->dev, mii_info->mii_id, regnum, val);
-}
-
-/* Use the PHY ID registers to determine what type of PHY is attached
- * to device dev.  return a struct phy_info structure describing that PHY
- */
-struct phy_info *uec_get_phy_info(struct uec_mii_info *mii_info)
-{
-	u16 phy_reg;
-	u32 phy_ID;
-	int i;
-	struct phy_info *info = NULL;
-
-	/* Grab the bits from PHYIR1, and put them in the upper half */
-	phy_reg = uec_phy_read(mii_info, MII_PHYSID1);
-	phy_ID = (phy_reg & 0xffff) << 16;
-
-	/* Grab the bits from PHYIR2, and put them in the lower half */
-	phy_reg = uec_phy_read(mii_info, MII_PHYSID2);
-	phy_ID |= (phy_reg & 0xffff);
-
-	/* loop through all the known PHY types, and find one that */
-	/* matches the ID we read from the PHY. */
-	for (i = 0; phy_info[i]; i++)
-		if (phy_info[i]->phy_id ==
-		    (phy_ID & phy_info[i]->phy_id_mask)) {
-			info = phy_info[i];
-			break;
-		}
-
-	/* This shouldn't happen, as we have generic PHY support */
-	if (!info) {
-		ugphy_info("UEC: PHY id %x is not supported!", phy_ID);
-		return NULL;
-	}
-	ugphy_info("UEC: PHY is %s (%x)", info->name, phy_ID);
-
-	return info;
-}
-
-void marvell_phy_interface_mode(struct eth_device *dev, phy_interface_t type,
-				int speed)
-{
-	struct uec_priv *uec = (struct uec_priv *)dev->priv;
-	struct uec_mii_info *mii_info;
-	u16 status;
-
-	if (!uec->mii_info) {
-		printf("%s: the PHY not initialized\n", __func__);
-		return;
-	}
-	mii_info = uec->mii_info;
-
-	if (type == PHY_INTERFACE_MODE_RGMII) {
-		if (speed == SPEED_100) {
-			uec_phy_write(mii_info, 0x00, 0x9140);
-			uec_phy_write(mii_info, 0x1d, 0x001f);
-			uec_phy_write(mii_info, 0x1e, 0x200c);
-			uec_phy_write(mii_info, 0x1d, 0x0005);
-			uec_phy_write(mii_info, 0x1e, 0x0000);
-			uec_phy_write(mii_info, 0x1e, 0x0100);
-			uec_phy_write(mii_info, 0x09, 0x0e00);
-			uec_phy_write(mii_info, 0x04, 0x01e1);
-			uec_phy_write(mii_info, 0x00, 0x9140);
-			uec_phy_write(mii_info, 0x00, 0x1000);
-			mdelay(100);
-			uec_phy_write(mii_info, 0x00, 0x2900);
-			uec_phy_write(mii_info, 0x14, 0x0cd2);
-			uec_phy_write(mii_info, 0x00, 0xa100);
-			uec_phy_write(mii_info, 0x09, 0x0000);
-			uec_phy_write(mii_info, 0x1b, 0x800b);
-			uec_phy_write(mii_info, 0x04, 0x05e1);
-			uec_phy_write(mii_info, 0x00, 0xa100);
-			uec_phy_write(mii_info, 0x00, 0x2100);
-			mdelay(1000);
-		} else if (speed == SPEED_10) {
-			uec_phy_write(mii_info, 0x14, 0x8e40);
-			uec_phy_write(mii_info, 0x1b, 0x800b);
-			uec_phy_write(mii_info, 0x14, 0x0c82);
-			uec_phy_write(mii_info, 0x00, 0x8100);
-			mdelay(1000);
-		}
-	}
-
-	/* handle 88e1111 rev.B2 erratum 5.6 */
-	if (mii_info->autoneg) {
-		status = uec_phy_read(mii_info, MII_BMCR);
-		uec_phy_write(mii_info, MII_BMCR, status | BMCR_ANENABLE);
-	}
-	/* now the B2 will correctly report autoneg completion status */
-}
-
-void change_phy_interface_mode(struct eth_device *dev,
-			       phy_interface_t type, int speed)
-{
-#ifdef CONFIG_PHY_MODE_NEED_CHANGE
-	marvell_phy_interface_mode(dev, type, speed);
-#endif
-}
-#endif
diff --git a/drivers/qe/uec_phy.h b/drivers/qe/uec_phy.h
deleted file mode 100644
index 7fd0e2c54401..000000000000
--- a/drivers/qe/uec_phy.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2005, 2011 Freescale Semiconductor, Inc.
- *
- * Author: Shlomi Gridish <gridish@freescale.com>
- *
- * Description: UCC ethernet driver -- PHY handling
- *		Driver for UEC on QE
- *		Based on 8260_io/fcc_enet.c
- */
-#ifndef __UEC_PHY_H__
-#define __UEC_PHY_H__
-
-#include <linux/bitops.h>
-
-#define MII_end ((u32)-2)
-#define MII_read ((u32)-1)
-
-#define MIIMIND_BUSY		0x00000001
-#define MIIMIND_NOTVALID	0x00000004
-
-#define UGETH_AN_TIMEOUT	2000
-
-/* Cicada Extended Control Register 1 */
-#define MII_CIS8201_EXT_CON1	    0x17
-#define MII_CIS8201_EXTCON1_INIT    0x0000
-
-/* Cicada Interrupt Mask Register */
-#define MII_CIS8201_IMASK	    0x19
-#define MII_CIS8201_IMASK_IEN	    0x8000
-#define MII_CIS8201_IMASK_SPEED	    0x4000
-#define MII_CIS8201_IMASK_LINK	    0x2000
-#define MII_CIS8201_IMASK_DUPLEX    0x1000
-#define MII_CIS8201_IMASK_MASK	    0xf000
-
-/* Cicada Interrupt Status Register */
-#define MII_CIS8201_ISTAT	    0x1a
-#define MII_CIS8201_ISTAT_STATUS    0x8000
-#define MII_CIS8201_ISTAT_SPEED	    0x4000
-#define MII_CIS8201_ISTAT_LINK	    0x2000
-#define MII_CIS8201_ISTAT_DUPLEX    0x1000
-
-/* Cicada Auxiliary Control/Status Register */
-#define MII_CIS8201_AUX_CONSTAT	       0x1c
-#define MII_CIS8201_AUXCONSTAT_INIT    0x0004
-#define MII_CIS8201_AUXCONSTAT_DUPLEX  0x0020
-#define MII_CIS8201_AUXCONSTAT_SPEED   0x0018
-#define MII_CIS8201_AUXCONSTAT_GBIT    0x0010
-#define MII_CIS8201_AUXCONSTAT_100     0x0008
-
-/* 88E1011 PHY Status Register */
-#define MII_M1011_PHY_SPEC_STATUS		0x11
-#define MII_M1011_PHY_SPEC_STATUS_1000		0x8000
-#define MII_M1011_PHY_SPEC_STATUS_100		0x4000
-#define MII_M1011_PHY_SPEC_STATUS_SPD_MASK	0xc000
-#define MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX	0x2000
-#define MII_M1011_PHY_SPEC_STATUS_RESOLVED	0x0800
-#define MII_M1011_PHY_SPEC_STATUS_LINK		0x0400
-
-#define MII_M1011_IEVENT		0x13
-#define MII_M1011_IEVENT_CLEAR		0x0000
-
-#define MII_M1011_IMASK			0x12
-#define MII_M1011_IMASK_INIT		0x6400
-#define MII_M1011_IMASK_CLEAR		0x0000
-
-/* 88E1111 PHY Register */
-#define MII_M1111_PHY_EXT_CR            0x14
-#define MII_M1111_RX_DELAY              0x80
-#define MII_M1111_TX_DELAY              0x2
-#define MII_M1111_PHY_EXT_SR            0x1b
-#define MII_M1111_HWCFG_MODE_MASK       0xf
-#define MII_M1111_HWCFG_MODE_RGMII      0xb
-
-#define MII_DM9161_SCR			0x10
-#define MII_DM9161_SCR_INIT		0x0610
-#define MII_DM9161_SCR_RMII_INIT	0x0710
-
-/* DM9161 Specified Configuration and Status Register */
-#define MII_DM9161_SCSR			0x11
-#define MII_DM9161_SCSR_100F		0x8000
-#define MII_DM9161_SCSR_100H		0x4000
-#define MII_DM9161_SCSR_10F		0x2000
-#define MII_DM9161_SCSR_10H		0x1000
-
-/* DM9161 Interrupt Register */
-#define MII_DM9161_INTR			0x15
-#define MII_DM9161_INTR_PEND		0x8000
-#define MII_DM9161_INTR_DPLX_MASK	0x0800
-#define MII_DM9161_INTR_SPD_MASK	0x0400
-#define MII_DM9161_INTR_LINK_MASK	0x0200
-#define MII_DM9161_INTR_MASK		0x0100
-#define MII_DM9161_INTR_DPLX_CHANGE	0x0010
-#define MII_DM9161_INTR_SPD_CHANGE	0x0008
-#define MII_DM9161_INTR_LINK_CHANGE	0x0004
-#define MII_DM9161_INTR_INIT		0x0000
-#define MII_DM9161_INTR_STOP	\
-		(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK | \
-		 MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
-
-/* DM9161 10BT Configuration/Status */
-#define MII_DM9161_10BTCSR		0x12
-#define MII_DM9161_10BTCSR_INIT		0x7800
-
-#define MII_BASIC_FEATURES    (SUPPORTED_10baseT_Half | \
-		 SUPPORTED_10baseT_Full | \
-		 SUPPORTED_100baseT_Half | \
-		 SUPPORTED_100baseT_Full | \
-		 SUPPORTED_Autoneg | \
-		 SUPPORTED_TP | \
-		 SUPPORTED_MII)
-
-#define MII_GBIT_FEATURES    (MII_BASIC_FEATURES | \
-		 SUPPORTED_1000baseT_Half | \
-		 SUPPORTED_1000baseT_Full)
-
-#define MII_READ_COMMAND		0x00000001
-
-#define MII_INTERRUPT_DISABLED		0x0
-#define MII_INTERRUPT_ENABLED		0x1
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-
-/* Duplex, half or full. */
-#define DUPLEX_HALF		0x00
-#define DUPLEX_FULL		0x01
-
-/* Taken from mii_if_info and sungem_phy.h */
-struct uec_mii_info {
-	/* Information about the PHY type */
-	/* And management functions */
-	struct phy_info *phyinfo;
-
-	struct eth_device *dev;
-
-	/* forced speed & duplex (no autoneg)
-	 * partner speed & duplex & pause (autoneg)
-	 */
-	int speed;
-	int duplex;
-	int pause;
-
-	/* The most recently read link state */
-	int link;
-
-	/* Enabled Interrupts */
-	u32 interrupts;
-
-	u32 advertising;
-	int autoneg;
-	int mii_id;
-
-	/* private data pointer */
-	/* For use by PHYs to maintain extra state */
-	void *priv;
-
-	/* Provided by ethernet driver */
-	int (*mdio_read)(struct eth_device *dev, int mii_id, int reg);
-	void (*mdio_write)(struct eth_device *dev, int mii_id, int reg,
-			   int val);
-};
-
-/* struct phy_info: a structure which defines attributes for a PHY
- *
- * id will contain a number which represents the PHY.  During
- * startup, the driver will poll the PHY to find out what its
- * UID--as defined by registers 2 and 3--is.  The 32-bit result
- * gotten from the PHY will be ANDed with phy_id_mask to
- * discard any bits which may change based on revision numbers
- * unimportant to functionality
- *
- * There are 6 commands which take a ugeth_mii_info structure.
- * Each PHY must declare config_aneg, and read_status.
- */
-struct phy_info {
-	u32 phy_id;
-	char *name;
-	unsigned int phy_id_mask;
-	u32 features;
-
-	/* Called to initialize the PHY */
-	int (*init)(struct uec_mii_info *mii_info);
-
-	/* Called to suspend the PHY for power */
-	int (*suspend)(struct uec_mii_info *mii_info);
-
-	/* Reconfigures autonegotiation (or disables it) */
-	int (*config_aneg)(struct uec_mii_info *mii_info);
-
-	/* Determines the negotiated speed and duplex */
-	int (*read_status)(struct uec_mii_info *mii_info);
-
-	/* Clears any pending interrupts */
-	int (*ack_interrupt)(struct uec_mii_info *mii_info);
-
-	/* Enables or disables interrupts */
-	int (*config_intr)(struct uec_mii_info *mii_info);
-
-	/* Clears up any memory if needed */
-	void (*close)(struct uec_mii_info *mii_info);
-};
-
-struct phy_info *uec_get_phy_info(struct uec_mii_info *mii_info);
-void uec_write_phy_reg(struct eth_device *dev, int mii_id, int regnum,
-		       int value);
-int uec_read_phy_reg(struct eth_device *dev, int mii_id, int regnum);
-void mii_clear_phy_interrupt(struct uec_mii_info *mii_info);
-void mii_configure_phy_interrupt(struct uec_mii_info *mii_info,
-				 u32 interrupts);
-void change_phy_interface_mode(struct eth_device *dev,
-			       phy_interface_t type, int speed);
-#endif /* __UEC_PHY_H__ */
-- 
2.25.1

[PATCH 41/41] net: Remove eth_legacy.c

[Tom Rini]

As there are no more non-DM_ETH cases for networking, remove this legacy
file and update the Makefile to match current usage.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 boot/bootm.c        |   3 -
 cmd/net.c           |   2 -
 cmd/usb.c           |  10 --
 drivers/net/Kconfig |   4 +
 include/net.h       |  71 --------
 net/Makefile        |  10 +-
 net/eth_internal.h  |   4 -
 net/eth_legacy.c    | 426 --------------------------------------------
 8 files changed, 7 insertions(+), 523 deletions(-)
 delete mode 100644 net/eth_legacy.c

diff --git a/boot/bootm.c b/boot/bootm.c
index a4c0870c0fea..15fce8ad95e0 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -475,9 +475,6 @@ ulong bootm_disable_interrupts(void)
 #ifdef CONFIG_NETCONSOLE
 	/* Stop the ethernet stack if NetConsole could have left it up */
 	eth_halt();
-# ifndef CONFIG_DM_ETH
-	eth_unregister(eth_get_dev());
-# endif
 #endif
 
 #if defined(CONFIG_CMD_USB)
diff --git a/cmd/net.c b/cmd/net.c
index addcad3ac140..2360d9e66a9e 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -523,7 +523,6 @@ U_BOOT_CMD(
 
 #endif  /* CONFIG_CMD_LINK_LOCAL */
 
-#ifdef CONFIG_DM_ETH
 static int do_net_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 	const struct udevice *current = eth_get_dev();
@@ -566,7 +565,6 @@ U_BOOT_CMD(
 	"NET sub-system",
 	"list - list available devices\n"
 );
-#endif // CONFIG_DM_ETH
 
 #if defined(CONFIG_CMD_NCSI)
 static int do_ncsi(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
diff --git a/cmd/usb.c b/cmd/usb.c
index 2ba056982c38..73addb04c498 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -591,16 +591,6 @@ static void do_usb_start(void)
 	drv_usb_kbd_init();
 # endif
 #endif /* !CONFIG_DM_USB */
-#ifdef CONFIG_USB_HOST_ETHER
-# ifdef CONFIG_DM_ETH
-#  ifndef CONFIG_DM_USB
-#   error "You must use CONFIG_DM_USB if you want to use CONFIG_USB_HOST_ETHER with CONFIG_DM_ETH"
-#  endif
-# else
-	/* try to recognize ethernet devices immediately */
-	usb_ether_curr_dev = usb_host_eth_scan(1);
-# endif
-#endif
 }
 
 #ifdef CONFIG_DM_USB
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38699ad2beb4..90822a2f09f0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -15,6 +15,10 @@ config DM_ETH
 	  This is currently implemented in net/eth-uclass.c
 	  Look in include/net.h for details.
 
+config SPL_DM_ETH
+	depends on SPL_NET
+	def_bool y
+
 config DM_MDIO
 	bool "Enable Driver Model for MDIO devices"
 	depends on PHYLIB
diff --git a/include/net.h b/include/net.h
index 32364ed0ced9..220b67c210a6 100644
--- a/include/net.h
+++ b/include/net.h
@@ -101,7 +101,6 @@ enum eth_state_t {
 	ETH_STATE_ACTIVE
 };
 
-#ifdef CONFIG_DM_ETH
 /**
  * struct eth_pdata - Platform data for Ethernet MAC controllers
  *
@@ -180,76 +179,6 @@ unsigned char *eth_get_ethaddr(void); /* get the current device MAC */
 int eth_is_active(struct udevice *dev); /* Test device for active state */
 int eth_init_state_only(void); /* Set active state */
 void eth_halt_state_only(void); /* Set passive state */
-#endif
-
-#ifndef CONFIG_DM_ETH
-struct eth_device {
-#define ETH_NAME_LEN 20
-	char name[ETH_NAME_LEN];
-	unsigned char enetaddr[ARP_HLEN];
-	phys_addr_t iobase;
-	int state;
-
-	int (*init)(struct eth_device *eth, struct bd_info *bd);
-	int (*send)(struct eth_device *, void *packet, int length);
-	int (*recv)(struct eth_device *);
-	void (*halt)(struct eth_device *);
-	int (*mcast)(struct eth_device *, const u8 *enetaddr, int join);
-	int (*write_hwaddr)(struct eth_device *eth);
-	struct eth_device *next;
-	int index;
-	void *priv;
-};
-
-int eth_register(struct eth_device *dev);/* Register network device */
-int eth_unregister(struct eth_device *dev);/* Remove network device */
-
-extern struct eth_device *eth_current;
-
-static __always_inline struct eth_device *eth_get_dev(void)
-{
-	return eth_current;
-}
-struct eth_device *eth_get_dev_by_name(const char *devname);
-struct eth_device *eth_get_dev_by_index(int index); /* get dev @ index */
-
-/* get the current device MAC */
-static inline unsigned char *eth_get_ethaddr(void)
-{
-	if (eth_current)
-		return eth_current->enetaddr;
-	return NULL;
-}
-
-/* Used only when NetConsole is enabled */
-int eth_is_active(struct eth_device *dev); /* Test device for active state */
-/* Set active state */
-static __always_inline int eth_init_state_only(void)
-{
-	eth_get_dev()->state = ETH_STATE_ACTIVE;
-
-	return 0;
-}
-/* Set passive state */
-static __always_inline void eth_halt_state_only(void)
-{
-	eth_get_dev()->state = ETH_STATE_PASSIVE;
-}
-
-/*
- * Set the hardware address for an ethernet interface based on 'eth%daddr'
- * environment variable (or just 'ethaddr' if eth_number is 0).
- * Args:
- *	base_name - base name for device (normally "eth")
- *	eth_number - value of %d (0 for first device of this type)
- * Returns:
- *	0 is success, non-zero is error status from driver.
- */
-int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
-		     int eth_number);
-
-int usb_eth_initialize(struct bd_info *bi);
-#endif
 
 int eth_initialize(void);		/* Initialize network subsystem */
 void eth_try_another(int first_restart);	/* Change the device */
diff --git a/net/Makefile b/net/Makefile
index 6c812502d3ea..272c7d3b2edf 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -10,17 +10,13 @@ obj-$(CONFIG_CMD_BOOTP) += bootp.o
 obj-$(CONFIG_CMD_CDP)  += cdp.o
 obj-$(CONFIG_CMD_DNS)  += dns.o
 obj-$(CONFIG_DM_DSA)   += dsa-uclass.o
-ifdef CONFIG_DM_ETH
-obj-$(CONFIG_NET)      += eth-uclass.o
+obj-$(CONFIG_$(SPL_)DM_ETH) += eth-uclass.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTDEV_ETH) += eth_bootdev.o
-else
-obj-$(CONFIG_NET)      += eth_legacy.o
-endif
 obj-$(CONFIG_DM_MDIO)  += mdio-uclass.o
 obj-$(CONFIG_DM_MDIO_MUX) += mdio-mux-uclass.o
-obj-$(CONFIG_NET)      += eth_common.o
+obj-$(CONFIG_$(SPL_)DM_ETH) += eth_common.o
 obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o
-obj-$(CONFIG_NET)      += net.o
+obj-$(CONFIG_$(SPL_)DM_ETH) += net.o
 obj-$(CONFIG_CMD_NFS)  += nfs.o
 obj-$(CONFIG_CMD_PING) += ping.o
 obj-$(CONFIG_CMD_PCAP) += pcap.o
diff --git a/net/eth_internal.h b/net/eth_internal.h
index 042e58a99ae2..0b829a8d3883 100644
--- a/net/eth_internal.h
+++ b/net/eth_internal.h
@@ -29,11 +29,7 @@ int eth_env_set_enetaddr_by_index(const char *base_name, int index,
 
 int eth_mac_skip(int index);
 void eth_current_changed(void);
-#ifdef CONFIG_DM_ETH
 void eth_set_dev(struct udevice *dev);
-#else
-void eth_set_dev(struct eth_device *dev);
-#endif
 void eth_set_current_to_next(void);
 
 #endif
diff --git a/net/eth_legacy.c b/net/eth_legacy.c
deleted file mode 100644
index 0b282d918bec..000000000000
--- a/net/eth_legacy.c
+++ /dev/null
@@ -1,426 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2001-2015
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- * Joe Hershberger, National Instruments
- */
-
-#include <common.h>
-#include <bootstage.h>
-#include <command.h>
-#include <dm.h>
-#include <env.h>
-#include <log.h>
-#include <net.h>
-#include <phy.h>
-#include <asm/global_data.h>
-#include <linux/bug.h>
-#include <linux/errno.h>
-#include <net/pcap.h>
-#include "eth_internal.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * CPU and board-specific Ethernet initializations.  Aliased function
- * signals caller to move on
- */
-static int __def_eth_init(struct bd_info *bis)
-{
-	return -1;
-}
-int cpu_eth_init(struct bd_info *bis) __attribute__((weak, alias("__def_eth_init")));
-int board_eth_init(struct bd_info *bis) __attribute__((weak, alias("__def_eth_init")));
-
-#ifdef CONFIG_API
-static struct {
-	uchar data[PKTSIZE];
-	int length;
-} eth_rcv_bufs[PKTBUFSRX];
-
-static unsigned int eth_rcv_current, eth_rcv_last;
-#endif
-
-static struct eth_device *eth_devices;
-struct eth_device *eth_current;
-
-void eth_set_current_to_next(void)
-{
-	eth_current = eth_current->next;
-}
-
-void eth_set_dev(struct eth_device *dev)
-{
-	eth_current = dev;
-}
-
-struct eth_device *eth_get_dev_by_name(const char *devname)
-{
-	struct eth_device *dev, *target_dev;
-
-	BUG_ON(devname == NULL);
-
-	if (!eth_devices)
-		return NULL;
-
-	dev = eth_devices;
-	target_dev = NULL;
-	do {
-		if (strcmp(devname, dev->name) == 0) {
-			target_dev = dev;
-			break;
-		}
-		dev = dev->next;
-	} while (dev != eth_devices);
-
-	return target_dev;
-}
-
-struct eth_device *eth_get_dev_by_index(int index)
-{
-	struct eth_device *dev, *target_dev;
-
-	if (!eth_devices)
-		return NULL;
-
-	dev = eth_devices;
-	target_dev = NULL;
-	do {
-		if (dev->index == index) {
-			target_dev = dev;
-			break;
-		}
-		dev = dev->next;
-	} while (dev != eth_devices);
-
-	return target_dev;
-}
-
-int eth_get_dev_index(void)
-{
-	if (!eth_current)
-		return -1;
-
-	return eth_current->index;
-}
-
-static int on_ethaddr(const char *name, const char *value, enum env_op op,
-	int flags)
-{
-	int index;
-	struct eth_device *dev;
-
-	if (!eth_devices)
-		return 0;
-
-	/* look for an index after "eth" */
-	index = dectoul(name + 3, NULL);
-
-	dev = eth_devices;
-	do {
-		if (dev->index == index) {
-			switch (op) {
-			case env_op_create:
-			case env_op_overwrite:
-				string_to_enetaddr(value, dev->enetaddr);
-				eth_write_hwaddr(dev, "eth", dev->index);
-				break;
-			case env_op_delete:
-				memset(dev->enetaddr, 0, ARP_HLEN);
-			}
-		}
-		dev = dev->next;
-	} while (dev != eth_devices);
-
-	return 0;
-}
-U_BOOT_ENV_CALLBACK(ethaddr, on_ethaddr);
-
-int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
-		   int eth_number)
-{
-	unsigned char env_enetaddr[ARP_HLEN];
-	int ret = 0;
-
-	eth_env_get_enetaddr_by_index(base_name, eth_number, env_enetaddr);
-
-	if (!is_zero_ethaddr(env_enetaddr)) {
-		if (!is_zero_ethaddr(dev->enetaddr) &&
-		    memcmp(dev->enetaddr, env_enetaddr, ARP_HLEN)) {
-			printf("\nWarning: %s MAC addresses don't match:\n",
-			       dev->name);
-			printf("Address in SROM is         %pM\n",
-			       dev->enetaddr);
-			printf("Address in environment is  %pM\n",
-			       env_enetaddr);
-		}
-
-		memcpy(dev->enetaddr, env_enetaddr, ARP_HLEN);
-	} else if (is_valid_ethaddr(dev->enetaddr)) {
-		eth_env_set_enetaddr_by_index(base_name, eth_number,
-					      dev->enetaddr);
-	} else if (is_zero_ethaddr(dev->enetaddr)) {
-#ifdef CONFIG_NET_RANDOM_ETHADDR
-		net_random_ethaddr(dev->enetaddr);
-		printf("\nWarning: %s (eth%d) using random MAC address - %pM\n",
-		       dev->name, eth_number, dev->enetaddr);
-		eth_env_set_enetaddr_by_index("eth", eth_number,
-					      dev->enetaddr);
-#else
-		printf("\nError: %s address not set.\n",
-		       dev->name);
-		return -EINVAL;
-#endif
-	}
-
-	if (dev->write_hwaddr && !eth_mac_skip(eth_number)) {
-		if (!is_valid_ethaddr(dev->enetaddr)) {
-			printf("\nError: %s address %pM illegal value\n",
-			       dev->name, dev->enetaddr);
-			return -EINVAL;
-		}
-
-		ret = dev->write_hwaddr(dev);
-		if (ret)
-			printf("\nWarning: %s failed to set MAC address\n",
-			       dev->name);
-	}
-
-	return ret;
-}
-
-int eth_register(struct eth_device *dev)
-{
-	struct eth_device *d;
-	static int index;
-
-	assert(strlen(dev->name) < sizeof(dev->name));
-
-	if (!eth_devices) {
-		eth_devices = dev;
-		eth_current = dev;
-		eth_current_changed();
-	} else {
-		for (d = eth_devices; d->next != eth_devices; d = d->next)
-			;
-		d->next = dev;
-	}
-
-	dev->state = ETH_STATE_INIT;
-	dev->next  = eth_devices;
-	dev->index = index++;
-
-	return 0;
-}
-
-int eth_unregister(struct eth_device *dev)
-{
-	struct eth_device *cur;
-
-	/* No device */
-	if (!eth_devices)
-		return -ENODEV;
-
-	for (cur = eth_devices; cur->next != eth_devices && cur->next != dev;
-	     cur = cur->next)
-		;
-
-	/* Device not found */
-	if (cur->next != dev)
-		return -ENODEV;
-
-	cur->next = dev->next;
-
-	if (eth_devices == dev)
-		eth_devices = dev->next == eth_devices ? NULL : dev->next;
-
-	if (eth_current == dev) {
-		eth_current = eth_devices;
-		eth_current_changed();
-	}
-
-	return 0;
-}
-
-int eth_initialize(void)
-{
-	int num_devices = 0;
-
-	eth_devices = NULL;
-	eth_current = NULL;
-	eth_common_init();
-	/*
-	 * If board-specific initialization exists, call it.
-	 * If not, call a CPU-specific one
-	 */
-	if (board_eth_init != __def_eth_init) {
-		if (board_eth_init(gd->bd) < 0)
-			printf("Board Net Initialization Failed\n");
-	} else if (cpu_eth_init != __def_eth_init) {
-		if (cpu_eth_init(gd->bd) < 0)
-			printf("CPU Net Initialization Failed\n");
-	} else {
-		printf("Net Initialization Skipped\n");
-	}
-
-	if (!eth_devices) {
-		log_err("No ethernet found.\n");
-		bootstage_error(BOOTSTAGE_ID_NET_ETH_START);
-	} else {
-		struct eth_device *dev = eth_devices;
-		char *ethprime = env_get("ethprime");
-
-		bootstage_mark(BOOTSTAGE_ID_NET_ETH_INIT);
-		do {
-			if (dev->index)
-				puts(", ");
-
-			printf("%s", dev->name);
-
-			if (ethprime && strcmp(dev->name, ethprime) == 0) {
-				eth_current = dev;
-				puts(" [PRIME]");
-			}
-
-			if (strchr(dev->name, ' '))
-				puts("\nWarning: eth device name has a space!"
-					"\n");
-
-			eth_write_hwaddr(dev, "eth", dev->index);
-
-			dev = dev->next;
-			num_devices++;
-		} while (dev != eth_devices);
-
-		eth_current_changed();
-		putc('\n');
-	}
-
-	return num_devices;
-}
-
-/* Multicast.
- * mcast_addr: multicast ipaddr from which multicast Mac is made
- * join: 1=join, 0=leave.
- */
-int eth_mcast_join(struct in_addr mcast_ip, int join)
-{
-	u8 mcast_mac[ARP_HLEN];
-	if (!eth_current || !eth_current->mcast)
-		return -1;
-	mcast_mac[5] = htonl(mcast_ip.s_addr) & 0xff;
-	mcast_mac[4] = (htonl(mcast_ip.s_addr)>>8) & 0xff;
-	mcast_mac[3] = (htonl(mcast_ip.s_addr)>>16) & 0x7f;
-	mcast_mac[2] = 0x5e;
-	mcast_mac[1] = 0x0;
-	mcast_mac[0] = 0x1;
-	return eth_current->mcast(eth_current, mcast_mac, join);
-}
-
-int eth_init(void)
-{
-	struct eth_device *old_current;
-
-	if (!eth_current) {
-		log_err("No ethernet found.\n");
-		return -ENODEV;
-	}
-
-	old_current = eth_current;
-	do {
-		debug("Trying %s\n", eth_current->name);
-
-		if (eth_current->init(eth_current, gd->bd) >= 0) {
-			eth_current->state = ETH_STATE_ACTIVE;
-
-			return 0;
-		}
-		debug("FAIL\n");
-
-		eth_try_another(0);
-	} while (old_current != eth_current);
-
-	return -ETIMEDOUT;
-}
-
-void eth_halt(void)
-{
-	if (!eth_current)
-		return;
-
-	eth_current->halt(eth_current);
-
-	eth_current->state = ETH_STATE_PASSIVE;
-}
-
-int eth_is_active(struct eth_device *dev)
-{
-	return dev && dev->state == ETH_STATE_ACTIVE;
-}
-
-int eth_send(void *packet, int length)
-{
-	int ret;
-
-	if (!eth_current)
-		return -ENODEV;
-
-	ret = eth_current->send(eth_current, packet, length);
-#if defined(CONFIG_CMD_PCAP)
-	if (ret >= 0)
-		pcap_post(packet, length, true);
-#endif
-	return ret;
-}
-
-int eth_rx(void)
-{
-	if (!eth_current)
-		return -ENODEV;
-
-	return eth_current->recv(eth_current);
-}
-
-#ifdef CONFIG_API
-static void eth_save_packet(void *packet, int length)
-{
-	char *p = packet;
-	int i;
-
-	if ((eth_rcv_last+1) % PKTBUFSRX == eth_rcv_current)
-		return;
-
-	if (PKTSIZE < length)
-		return;
-
-	for (i = 0; i < length; i++)
-		eth_rcv_bufs[eth_rcv_last].data[i] = p[i];
-
-	eth_rcv_bufs[eth_rcv_last].length = length;
-	eth_rcv_last = (eth_rcv_last + 1) % PKTBUFSRX;
-}
-
-int eth_receive(void *packet, int length)
-{
-	char *p = packet;
-	void *pp = push_packet;
-	int i;
-
-	if (eth_rcv_current == eth_rcv_last) {
-		push_packet = eth_save_packet;
-		eth_rx();
-		push_packet = pp;
-
-		if (eth_rcv_current == eth_rcv_last)
-			return -1;
-	}
-
-	length = min(eth_rcv_bufs[eth_rcv_current].length, length);
-
-	for (i = 0; i < length; i++)
-		p[i] = eth_rcv_bufs[eth_rcv_current].data[i];
-
-	eth_rcv_current = (eth_rcv_current + 1) % PKTBUFSRX;
-	return length;
-}
-#endif /* CONFIG_API */
-- 
2.25.1

Re: [PATCH 06/41] sunxi: Move MMC_SUNXI_SLOT to Kconfig

[Andre Przywara]

On Sun, 27 Nov 2022 10:25:01 -0500
Tom Rini <trini@konsulko.com> wrote:

Hi Tom,

> This value is always defined to 0, so move it to Kconfig as being set to
> always 0.

Yeah, but that's not needed in Kconfig at all, it's just a name for the
first MMC slot, its definition being misplaced in the config directory.
I will send a patch that removes the CONFIG_ prefix and moves it into
the C file using it, so you can drop this patch here.

Thanks,
Andre

> Cc: Andre Przywara <andre.przywara@arm.com>
> C: Icenowy Zheng <icenowy@aosc.io>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/arm/mach-sunxi/Kconfig    | 4 ++++
>  include/configs/sunxi-common.h | 3 ---
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index dbe6005daab1..c311a6d03523 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -685,6 +685,10 @@ config MMC1_PINS_PH
>  	---help---
>  	Select this option for boards where mmc1 uses the Port H pinmux.
>  
> +config MMC_SUNXI_SLOT
> +	int
> +	default 0
> +
>  config MMC_SUNXI_SLOT_EXTRA
>  	int "mmc extra slot number"
>  	default -1
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 1677aafad03b..496139f34635 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -69,9 +69,6 @@
>  #define PHYS_SDRAM_0			CFG_SYS_SDRAM_BASE
>  #define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */
>  
> -/* mmc config */
> -#define CONFIG_MMC_SUNXI_SLOT		0
> -
>  /*
>   * Miscellaneous configurable options
>   */

Re: [PATCH 06/41] sunxi: Move MMC_SUNXI_SLOT to Kconfig

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

On Sun, Nov 27, 2022 at 08:39:44PM +0000, Andre Przywara wrote:
> On Sun, 27 Nov 2022 10:25:01 -0500
> Tom Rini <trini@konsulko.com> wrote:
> 
> Hi Tom,
> 
> > This value is always defined to 0, so move it to Kconfig as being set to
> > always 0.
> 
> Yeah, but that's not needed in Kconfig at all, it's just a name for the
> first MMC slot, its definition being misplaced in the config directory.
> I will send a patch that removes the CONFIG_ prefix and moves it into
> the C file using it, so you can drop this patch here.

That works for me, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[PATCH 01/41] usb: Update USB_STORAGE dependencies

[Tom Rini]

As it's no longer possible to have !DM_USB set, we can remove these
dependencies.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 common/spl/Kconfig  | 2 +-
 drivers/usb/Kconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index c6da4a403e98..78797e99e02d 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1347,7 +1347,7 @@ config SPL_USB_HOST
 
 config SPL_USB_STORAGE
 	bool "Support loading from USB"
-	depends on SPL_USB_HOST && !(BLK && !DM_USB)
+	depends on SPL_USB_HOST
 	help
 	  Enable support for USB devices in SPL. This allows use of USB
 	  devices such as hard drives and flash drivers for loading U-Boot.
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 3afb45d5ccb2..8efd46145736 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -93,7 +93,6 @@ comment "USB peripherals"
 
 config USB_STORAGE
 	bool "USB Mass Storage support"
-	depends on !(BLK && !DM_USB)
 	---help---
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
-- 
2.25.1

[PATCH 02/41] arm: exynos5: Migrate USB_BOOTING to Kconfig

[Tom Rini]

This symbol is enabled for all exynos5 platforms, move to Kconfig and
select it.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Please note that include/configs/exynos5-common.h isn't covered by a
MAINTAINERS entry and should be, thanks.
---
 arch/arm/mach-exynos/Kconfig     | 4 ++++
 include/configs/exynos5-common.h | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 29e35e443c6a..383af83066ec 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -4,6 +4,9 @@ config BOARD_COMMON
 	def_bool y
 	depends on !TARGET_SMDKV310 && !TARGET_ARNDALE
 
+config USB_BOOTING
+	bool
+
 choice
 	prompt "EXYNOS architecture type select"
 	optional
@@ -24,6 +27,7 @@ config ARCH_EXYNOS5
 	select BOARD_EARLY_INIT_F
 	select CPU_V7A
 	select SHA_HW_ACCEL
+	select USB_BOOTING
 	imply CMD_HASH
 	imply CRC32_VERIFY
 	imply HASH_VERIFY
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index dd322c2b3a79..9b5c329bda18 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -58,7 +58,6 @@
 /* USB */
 
 /* USB boot mode */
-#define CONFIG_USB_BOOTING
 #define EXYNOS_COPY_USB_FNPTR_ADDR	0x02020070
 #define EXYNOS_USB_SECONDARY_BOOT	0xfeed0002
 #define EXYNOS_IRAM_SECONDARY_BASE	0x02020018
-- 
2.25.1

[PATCH 03/41] p1_p1_rdb: Remove unused environment sections

[Tom Rini]

The CONFIG_USB_FAT_BOOT, CONFIG_USB_EXT2_BOOT and CONFIG_NORBOOT defines
are not referenced anywhere, so remove them.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 49c5aef3059e..f86b96b21410 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -441,29 +441,4 @@ RST_PCIE_CMD(pciboot) \
 RST_DEF_CMD(defboot) \
 ""
 
-#define CONFIG_USB_FAT_BOOT	\
-"setenv bootargs root=/dev/ram rw "	\
-"console=$consoledev,$baudrate $othbootargs " \
-"ramdisk_size=$ramdisk_size;"	\
-"usb start;"	\
-"fatload usb 0:2 $loadaddr $bootfile;"	\
-"fatload usb 0:2 $fdtaddr $fdtfile;"	\
-"fatload usb 0:2 $ramdiskaddr $ramdiskfile;"	\
-"bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_USB_EXT2_BOOT	\
-"setenv bootargs root=/dev/ram rw "	\
-"console=$consoledev,$baudrate $othbootargs " \
-"ramdisk_size=$ramdisk_size;"	\
-"usb start;"	\
-"ext2load usb 0:4 $loadaddr $bootfile;"	\
-"ext2load usb 0:4 $fdtaddr $fdtfile;" \
-"ext2load usb 0:4 $ramdiskaddr $ramdiskfile;" \
-"bootm $loadaddr $ramdiskaddr $fdtaddr"
-
-#define CONFIG_NORBOOT	\
-"setenv bootargs root=/dev/$jffs2nor rw "	\
-"console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;"	\
-"bootm $norbootaddr - $norfdtaddr"
-
 #endif /* __CONFIG_H */
-- 
2.25.1

[PATCH 04/41] x530: Remove unused symbols

[Tom Rini]

The symbols CONFIG_UBI_PART and CONFIG_UBIFS_VOLUME are not referenced
anywhere, drop them.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/x530.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/configs/x530.h b/include/configs/x530.h
index dee87cb77325..6cc3496ee593 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -53,7 +53,4 @@
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
-#define CONFIG_UBI_PART			user
-#define CONFIG_UBIFS_VOLUME		user
-
 #endif /* _CONFIG_X530_H */
-- 
2.25.1

[PATCH 05/41] arm: trats2: Set mmcdev directly

[Tom Rini]

Only this platform sets mmcdev via CONFIG_MMC_DEFAULT_DEV so we
hard-code that default directly.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/exynos4-common.h | 3 ---
 include/configs/s5p_goni.h       | 3 ---
 include/configs/trats2.h         | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 81f450cde6c4..bf965e5cedb3 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -10,9 +10,6 @@
 
 #include "exynos-common.h"
 
-/* SD/MMC configuration */
-#define CONFIG_MMC_DEFAULT_DEV	0
-
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 /* USB Samsung's IDs */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index fdade1ee66fa..97f5dd0e473a 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -119,9 +119,6 @@
 #define PHYS_SDRAM_3		0x50000000		/* mDDR DMC2 Bank #2 */
 #define PHYS_SDRAM_3_SIZE	(128 << 20)		/* 128 MB in Bank #2 */
 
-/* FLASH and environment organization */
-#define CONFIG_MMC_DEFAULT_DEV	0
-
 #define CFG_SYS_ONENAND_BASE		0xB0000000
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 0aa331e39359..4d39b4005bd6 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -81,7 +81,7 @@
 		"${kernelname}\0" \
 	"loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \
 		"${fdtfile}\0" \
-	"mmcdev=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \
+	"mmcdev=0\0" \
 	"mmcbootpart=2\0" \
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
-- 
2.25.1

[PATCH 06/41] Convert CONFIG_HSMMC2_8BIT to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_HSMMC2_8BIT

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/am335x_shc_defconfig         | 1 +
 configs/am335x_shc_ict_defconfig     | 1 +
 configs/am335x_shc_netboot_defconfig | 1 +
 configs/am335x_shc_sdboot_defconfig  | 1 +
 configs/am57xx_evm_defconfig         | 1 +
 configs/am57xx_hs_evm_defconfig      | 1 +
 configs/am57xx_hs_evm_usb_defconfig  | 1 +
 configs/cm_t43_defconfig             | 1 +
 configs/dra7xx_evm_defconfig         | 1 +
 configs/dra7xx_hs_evm_defconfig      | 1 +
 configs/dra7xx_hs_evm_usb_defconfig  | 1 +
 configs/omap5_uevm_defconfig         | 1 +
 drivers/mmc/Kconfig                  | 5 +++++
 include/configs/am335x_shc.h         | 2 --
 include/configs/am57xx_evm.h         | 3 ---
 include/configs/cm_t43.h             | 2 --
 include/configs/dra7xx_evm.h         | 3 ---
 include/configs/omap5_uevm.h         | 3 ---
 18 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
index 9d81f8d0ad73..5a6db3ce6a40 100644
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -72,6 +72,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SLAVE=0x1
 CONFIG_SYS_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index de83139d1515..aa55a7a61e5e 100644
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -70,6 +70,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SLAVE=0x1
 CONFIG_SYS_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index e1dfd6a9bd12..cb73b104d23f 100644
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -73,6 +73,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SLAVE=0x1
 CONFIG_SYS_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig
index 74f0834466db..f28e6e6b160c 100644
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -72,6 +72,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SLAVE=0x1
 CONFIG_SYS_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_PHY_ADDR_ENABLE=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 054e9747a8b2..03f799506e15 100644
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -92,6 +92,7 @@ CONFIG_MISC=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=76800000
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index 02a2543a3f07..86bcfe85ae36 100644
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -89,6 +89,7 @@ CONFIG_MISC=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=76800000
diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig
index 84eca42aac05..eedbfd0d865f 100644
--- a/configs/am57xx_hs_evm_usb_defconfig
+++ b/configs/am57xx_hs_evm_usb_defconfig
@@ -88,6 +88,7 @@ CONFIG_MISC=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=76800000
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 867ca3032058..6eda33ebbc0f 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -76,6 +76,7 @@ CONFIG_SYS_RX_ETH_BUFFER=64
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_ONFI_DETECTION=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index d91cf3e13018..41df92f3d287 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -101,6 +101,7 @@ CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_SPL_MMC_HS200_SUPPORT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index 195bc0e4ee0f..7392b7308533 100644
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -96,6 +96,7 @@ CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_SPL_MMC_HS200_SUPPORT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_ONFI_DETECTION=y
diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig
index 99cdbbc02f89..1bda6db7a36b 100644
--- a/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@ -92,6 +92,7 @@ CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_SPL_MMC_HS200_SUPPORT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=76800000
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 502990b0a8b9..79e579b438dc 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -52,6 +52,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_HSMMC2_8BIT=y
 CONFIG_PALMAS_POWER=y
 CONFIG_SCSI=y
 CONFIG_SCSI_AHCI_PLAT=y
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index bf4d994ff695..698c91c57f4f 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -385,6 +385,11 @@ config MMC_OMAP36XX_PINS
 
 	  If unsure, say N.
 
+config HSMMC2_8BIT
+	bool "Enable 8-bit interface for eMMC (interface #2)"
+	depends on MMC_OMAP_HS && (OMAP44XX || OMAP54XX || DRA7XX || AM33XX || \
+		AM43XX || ARCH_KEYSTONE)
+
 config SH_SDHI
 	bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
 	depends on ARCH_RMOBILE
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 452887d6995c..70645edcb140 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -20,8 +20,6 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_HSMMC2_8BIT
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index dacfd41ccedf..ba91f2b0545b 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -35,9 +35,6 @@
 
 #include <configs/ti_omap5_common.h>
 
-/* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
-
 /* CPSW Ethernet */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at 1G */
 
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index fcc17fc6b7ce..8a18d6f97ab5 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -36,8 +36,6 @@
  * we don't need to do it twice.
  */
 
-#define CONFIG_HSMMC2_8BIT
-
 #include <configs/ti_armv7_omap.h>
 
 #define V_OSCK				24000000  /* Clock output from T2 */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index ac3fcacc68ed..b8f518612ee3 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -48,9 +48,6 @@
 
 #include <configs/ti_omap5_common.h>
 
-/* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
-
 /*
  * Default to using SPI for environment, etc.
  * 0x000000 - 0x040000 : QSPI.SPL (256KiB)
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index d7fa2d43914a..39d0b403139a 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -32,9 +32,6 @@
 
 /* MMC ENV related defines */
 
-/* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
-
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CFG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CFG_SYS_I2C_TCA642X_ADDR 0x22
-- 
2.25.1

[PATCH 07/41] env: Rework ENV_IS_EMBEDDED and related logic slightly

[Tom Rini]

- Drop CONFIG_BUILD_ENVCRC as this is never set directly but instead
  means ENV_IS_EMBEDDED, so reference that in code and rename the Makefile
  usage to BUILD_ENVCRC.
- Remove extra-$(CONFIG_ENV_IS_EMBEDDED) line as it could never be true,
  and likely why there is an extra- line for CONFIG_ENV_IS_IN_FLASH (the
  only use case today of embedded environments).
- With these slight changes we can then see that using the calculated
  symbol of ENV_IS_EMBEDDED is the right thing to use in any code which
  needs to know this situation and can remove CONFIG_ENV_IS_EMBEDDED
  entirely.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                 |  5 -----
 env/Makefile           |  1 -
 env/embedded.c         |  2 +-
 include/env_internal.h | 23 +----------------------
 tools/Makefile         |  5 ++---
 tools/envcrc.c         | 10 +++-------
 6 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/README b/README
index 103562bbbe8d..3fef1d2afa01 100644
--- a/README
+++ b/README
@@ -1542,11 +1542,6 @@ The following definitions that deal with the placement and management
 of environment data (variable area); in general, we support the
 following configurations:
 
-- CONFIG_BUILD_ENVCRC:
-
-	Builds up envcrc with the target environment so that external utils
-	may easily extract it and embed it in final U-Boot images.
-
 BE CAREFUL! The first access to the environment happens quite early
 in U-Boot initialization (when we try to get the setting of for the
 console baudrate). You *MUST* have mapped your NVRAM area then, or
diff --git a/env/Makefile b/env/Makefile
index c4ad65432865..bb6e24b396df 100644
--- a/env/Makefile
+++ b/env/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o
 ifndef CONFIG_SPL_BUILD
 obj-y += callback.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
-extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o
 obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o
 extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o
 obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o
diff --git a/env/embedded.c b/env/embedded.c
index 27fb45bf8c3e..7cbe54c56e00 100644
--- a/env/embedded.c
+++ b/env/embedded.c
@@ -27,7 +27,7 @@
  * Generate embedded environment table
  * inside U-Boot image, if needed.
  */
-#if defined(ENV_IS_EMBEDDED) || defined(CONFIG_BUILD_ENVCRC)
+#if defined(ENV_IS_EMBEDDED)
 /*
  * Put the environment in the .text section when we are building
  * U-Boot proper.  The host based program "tools/envcrc" does not need
diff --git a/include/env_internal.h b/include/env_internal.h
index f30fd6159d87..aee6b3e48fa0 100644
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -41,10 +41,6 @@
 	(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #  define ENV_IS_EMBEDDED
 # endif
-# ifdef CONFIG_ENV_IS_EMBEDDED
-#  error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
-#  error "it is calculated automatically for you"
-# endif
 #endif	/* CONFIG_ENV_IS_IN_FLASH */
 
 #if defined(CONFIG_ENV_IS_IN_NAND)
@@ -57,23 +53,6 @@ extern unsigned long nand_env_oob_offset;
 # endif /* CONFIG_ENV_OFFSET_OOB */
 #endif /* CONFIG_ENV_IS_IN_NAND */
 
-/*
- * For the flash types where embedded env is supported, but it cannot be
- * calculated automatically (i.e. NAND), take the board opt-in.
- */
-#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED)
-# define ENV_IS_EMBEDDED
-#endif
-
-/* The build system likes to know if the env is embedded */
-#ifdef DO_DEPS_ONLY
-# ifdef ENV_IS_EMBEDDED
-#  ifndef CONFIG_ENV_IS_EMBEDDED
-#   define CONFIG_ENV_IS_EMBEDDED
-#  endif
-# endif
-#endif
-
 #include "compiler.h"
 
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
@@ -88,7 +67,7 @@ extern unsigned long nand_env_oob_offset;
  * If the environment is in RAM, allocate extra space for it in the malloc
  * region.
  */
-#if defined(CONFIG_ENV_IS_EMBEDDED)
+#if defined(ENV_IS_EMBEDDED)
 #define TOTAL_MALLOC_LEN	CONFIG_SYS_MALLOC_LEN
 #elif (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE < CONFIG_SYS_MONITOR_BASE) || \
       (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) || \
diff --git a/tools/Makefile b/tools/Makefile
index 26be0a7ba2ea..39c940ef929f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -36,21 +36,20 @@ endif
 subdir-$(HOST_TOOLS_ALL) += gdb
 
 # Merge all the different vars for envcrc into one
-ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_NAND) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_NVRAM) = y
 ENVCRC-$(CONFIG_ENV_IS_IN_SPI_FLASH) = y
-CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y)
+BUILD_ENVCRC ?= $(ENVCRC-y)
 
 hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params
 
 hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
 HOSTCFLAGS_bmp_logo.o := -pedantic
 
-hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc
+hostprogs-$(BUILD_ENVCRC) += envcrc
 envcrc-objs := envcrc.o lib/crc32.o env/embedded.o lib/sha1.o
 
 hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr
diff --git a/tools/envcrc.c b/tools/envcrc.c
index a021c785aeed..550f31038bd7 100644
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -40,10 +40,6 @@
 # endif
 #endif	/* CONFIG_ENV_IS_IN_FLASH */
 
-#if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
-# define CONFIG_BUILD_ENVCRC
-#endif
-
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
 # define ENV_HEADER_SIZE	(sizeof(uint32_t) + 1)
 #else
@@ -53,17 +49,17 @@
 #define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
 
 
-#ifdef CONFIG_BUILD_ENVCRC
+#ifdef ENV_IS_EMBEDDED
 # include <env_internal.h>
 extern unsigned int env_size;
 extern env_t embedded_environment;
-#endif	/* CONFIG_BUILD_ENVCRC */
+#endif	/* ENV_IS_EMBEDDED */
 
 extern uint32_t crc32(uint32_t, const unsigned char *, unsigned int);
 
 int main (int argc, char **argv)
 {
-#ifdef CONFIG_BUILD_ENVCRC
+#ifdef ENV_IS_EMBEDDED
 	unsigned char pad = 0x00;
 	uint32_t crc;
 	unsigned char *envptr = (unsigned char *)&embedded_environment,
-- 
2.25.1

[PATCH 08/41] Convert CONFIG_DM9000_BYTE_SWAPPED et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_DM9000_BYTE_SWAPPED
   CONFIG_DM9000_NO_SROM
   CONFIG_DM9000_USE_16BIT
   CONFIG_DM9000_DEBUG
   CONFIG_MXC_GPT_HCLK
   CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig                              |  2 ++
 arch/arm/mach-imx/Kconfig                     |  3 +++
 board/davinci/da8xxevm/Kconfig                |  3 +++
 board/timll/devkit8000/devkit8000.c           |  7 +++----
 configs/M5253DEMO_defconfig                   |  1 +
 configs/at91sam9261ek_dataflash_cs0_defconfig |  2 ++
 configs/at91sam9261ek_dataflash_cs3_defconfig |  2 ++
 configs/at91sam9261ek_nandflash_defconfig     |  2 ++
 configs/devkit8000_defconfig                  |  2 ++
 drivers/net/Kconfig                           | 12 ++++++++++++
 include/configs/M5253DEMO.h                   |  6 ------
 include/configs/at91sam9261ek.h               |  7 -------
 include/configs/brppt2.h                      |  2 --
 include/configs/ci20.h                        |  7 -------
 include/configs/devkit8000.h                  | 11 -----------
 include/configs/mx6_common.h                  |  1 -
 include/configs/mx7_common.h                  |  1 -
 include/configs/omapl138_lcdk.h               |  1 -
 18 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f55113fb5c8b..5eb382ea1d70 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -961,6 +961,7 @@ config ARCH_MX7
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
 	select MACH_IMX
+	select MXC_GPT_HCLK
 	select SYS_FSL_HAS_SEC
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
@@ -974,6 +975,7 @@ config ARCH_MX6
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
 	select MACH_IMX
+	select MXC_GPT_HCLK
 	select SYS_FSL_HAS_SEC
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ee5f1996a830..3266545c2663 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -18,6 +18,9 @@ config SYSCOUNTER_TIMER
 config GPT_TIMER
 	bool
 
+config MXC_GPT_HCLK
+	bool
+
 config IMX_RDC
 	bool "i.MX Resource domain controller driver"
 	depends on ARCH_MX6 || ARCH_MX7
diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig
index c5499a63fd36..34055f69754b 100644
--- a/board/davinci/da8xxevm/Kconfig
+++ b/board/davinci/da8xxevm/Kconfig
@@ -37,6 +37,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "omapl138_lcdk"
 
+config NAND_6BYTES_OOB_FREE_10BYTES_ECC
+	def_bool y
+
 endif
 
 source "board/ti/common/Kconfig"
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index 0808ca1a54c0..06009d8ad54c 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -76,10 +76,11 @@ int board_init(void)
 }
 
 /* Configure GPMC registers for DM9000 */
+#define DM9000_BASE	0x2c000000
 static void gpmc_dm9000_config(void)
 {
 	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
-		CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+		DM9000_BASE, GPMC_SIZE_16M);
 }
 
 /*
@@ -100,9 +101,7 @@ int misc_init_r(void)
 #endif
 
 #ifdef CONFIG_DRIVER_DM9000
-	/* Configure GPMC registers for DM9000 */
-	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
-			CONFIG_DM9000_BASE, GPMC_SIZE_16M);
+	gpmc_dm9000_config();
 
 	/* Use OMAP DIE_ID as MAC address */
 	if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 581023f967b8..2684ce05f267 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -44,4 +44,5 @@ CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_MAX_FLASH_SECT=2048
 CONFIG_USE_SYS_MAX_FLASH_BANKS=y
 CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_BYTE_SWAPPED=y
 CONFIG_MCFUART=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index c6c83b8da355..a398e6d97a1e 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -54,6 +54,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
 CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 1c16d26c8248..1b464ff29259 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -54,6 +54,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
 CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 8dbcb27f95c2..f23262494250 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -52,6 +52,8 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_SPI_FLASH_DATAFLASH=y
 CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_AT91=y
 CONFIG_DM_SERIAL=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 8347b67681d4..6fd4410df5b6 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -84,4 +84,6 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_DRIVER_DM9000=y
+CONFIG_DM9000_NO_SROM=y
+CONFIG_DM9000_USE_16BIT=y
 CONFIG_JFFS2_NAND=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4e5da5ab72a5..0607f959da49 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -198,6 +198,18 @@ config DRIVER_DM9000
 	help
 	  The Davicom DM9000 parallel bus external ethernet interface chip.
 
+config DM9000_BYTE_SWAPPED
+	bool "Byte swapped access for DM9000"
+	depends on DRIVER_DM9000
+
+config DM9000_NO_SROM
+	bool "No SROM on DM9000"
+	depends on DRIVER_DM9000
+
+config DM9000_USE_16BIT
+	bool "Use 16bit access in DM9000"
+	depends on DRIVER_DM9000
+
 config DWC_ETH_QOS
 	bool "Synopsys DWC Ethernet QOS device support"
 	select PHYLIB
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 7e37c6d11997..ad55938348e5 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -20,12 +20,6 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#	define CONFIG_DM9000_BASE	(CFG_SYS_CS1_BASE | 0x300)
-#	define DM9000_IO		CONFIG_DM9000_BASE
-#	define DM9000_DATA		(CONFIG_DM9000_BASE + 4)
-#	undef CONFIG_DM9000_DEBUG
-#	define CONFIG_DM9000_BYTE_SWAPPED
-
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 
 #	define CONFIG_EXTRA_ENV_SETTINGS		\
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 56247e390bf6..39f6ff8a7252 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -34,13 +34,6 @@
 
 #endif
 
-/* Ethernet */
-#define CONFIG_DM9000_BASE		0x30000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT
-#define CONFIG_DM9000_NO_SROM
-
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9261_UHP_BASE */
 
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index d35c7c4a591e..80104b2d3193 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -16,8 +16,6 @@
 #define CFG_SYS_PL310_BASE		L2_PL310_BASE
 #endif /* !CONFIG_SYS_L2CACHE_OFF */
 
-#define CONFIG_MXC_GPT_HCLK
-
 /* MMC */
 
 /* Boot */
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index 3329c24fa68c..446d5c4f3da9 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -17,11 +17,4 @@
 /* NS16550-ish UARTs */
 #define CFG_SYS_NS16550_CLK		48000000
 
-/* Ethernet: davicom DM9000 */
-#define CONFIG_DM9000_BASE		0xb6000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 2)
-
-/* Miscellaneous configuration options */
-
 #endif /* __CONFIG_CI20_H__ */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 46410595c2bc..e3621fd6f9c7 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -16,17 +16,6 @@
 
 #include <configs/ti_omap3_common.h>
 
-/* Hardware drivers */
-/* DM9000 */
-#define	CONFIG_DM9000_BASE		0x2c000000
-#define	DM9000_IO			CONFIG_DM9000_BASE
-#define	DM9000_DATA			(CONFIG_DM9000_BASE + 0x400)
-#define	CONFIG_DM9000_USE_16BIT		1
-#define CONFIG_DM9000_NO_SROM		1
-#undef	CONFIG_DM9000_DEBUG
-
-/* TWL4030 */
-
 /* BOOTP/DHCP options */
 
 #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 245530aa640b..dd8cabc2e935 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -16,7 +16,6 @@
 #endif
 
 #endif
-#define CONFIG_MXC_GPT_HCLK
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index d5af6990107d..6e14b4fbf053 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -14,7 +14,6 @@
 #include <asm/mach-imx/gpio.h>
 
 /* Timer settings */
-#define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 788a1113868b..f19211fe6479 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -109,7 +109,6 @@
 #define CFG_SYS_NAND_BASE		DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
 #define CFG_SYS_NAND_MASK_CLE	0x10
 #define CFG_SYS_NAND_MASK_ALE	0x8
-#define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 #define CFG_SYS_NAND_U_BOOT_SIZE	SZ_512K
 #define CFG_SYS_NAND_U_BOOT_DST	0xc1080000
 #define CFG_SYS_NAND_U_BOOT_START	CFG_SYS_NAND_U_BOOT_DST
-- 
2.25.1

[PATCH 09/41] fec_mxc: Remove CONFIG_FEC_FIXED_SPEED support

[Tom Rini]

This option is only used on one platform currently. However, with PHYLIB
enabled, which this platform also does, this option is not checked and
the functional use case is handled. Remove this code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 doc/README.fec_mxc       | 6 ------
 drivers/net/fec_mxc.c    | 4 ----
 include/configs/brppt2.h | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index d17dfb676f79..4e890d348f47 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -22,12 +22,6 @@ CONFIG_FEC_MXC_PHYADDR
 	Optional, selects the exact phy address that should be connected
 	and function fecmxc_initialize will try to initialize it.
 
-CONFIG_FEC_FIXED_SPEED
-	Optional, selects a fixed speed on the MAC interface without asking some
-	phy. This is usefull if there is a direct MAC <-> MAC connection, for
-	example if the CPU is connected directly via the RGMII interface to a
-	ethernet-switch.
-
 Reading the ethaddr from the SoC eFuses:
 if CONFIG_FEC_MXC is defined and the U-Boot environment does not contain the
 ethaddr variable, then its value gets read from the corresponding eFuses in
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index a61a1fc75738..9cb235ad5e37 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -268,7 +268,6 @@ static int miiphy_restart_aneg(struct eth_device *dev)
 	return ret;
 }
 
-#ifndef CONFIG_FEC_FIXED_SPEED
 static int miiphy_wait_aneg(struct eth_device *dev)
 {
 	uint32_t start;
@@ -294,7 +293,6 @@ static int miiphy_wait_aneg(struct eth_device *dev)
 
 	return 0;
 }
-#endif /* CONFIG_FEC_FIXED_SPEED */
 #endif
 
 static int fec_rx_task_enable(struct fec_priv *fec)
@@ -536,8 +534,6 @@ static int fec_open(struct udevice *dev)
 		}
 		speed = fec->phydev->speed;
 	}
-#elif CONFIG_FEC_FIXED_SPEED
-	speed = CONFIG_FEC_FIXED_SPEED;
 #else
 	miiphy_wait_aneg(edev);
 	speed = miiphy_speed(edev->name, fec->phy_id);
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 80104b2d3193..984602c2cf7c 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -78,9 +78,6 @@ BUR_COMMON_ENV \
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
-/* Ethernet */
-#define CONFIG_FEC_FIXED_SPEED		_1000BASET
-
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
-- 
2.25.1

[PATCH 10/41] Convert CONFIG_FLASH_SHOW_PROGRESS to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FLASH_SHOW_PROGRESS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                        | 5 -----
 configs/3c120_defconfig                       | 1 +
 configs/M5208EVBE_defconfig                   | 1 +
 configs/M5235EVB_Flash32_defconfig            | 1 +
 configs/M5235EVB_defconfig                    | 1 +
 configs/M5249EVB_defconfig                    | 1 +
 configs/M5272C3_defconfig                     | 1 +
 configs/M5275EVB_defconfig                    | 1 +
 configs/M5282EVB_defconfig                    | 1 +
 configs/M53017EVB_defconfig                   | 1 +
 configs/M5329AFEE_defconfig                   | 1 +
 configs/M5329BFEE_defconfig                   | 1 +
 configs/M5373EVB_defconfig                    | 1 +
 configs/MCR3000_defconfig                     | 1 +
 configs/MPC837XERDB_defconfig                 | 1 +
 configs/MPC8548CDS_36BIT_defconfig            | 1 +
 configs/MPC8548CDS_defconfig                  | 1 +
 configs/MPC8548CDS_legacy_defconfig           | 1 +
 configs/ae350_rv32_defconfig                  | 1 +
 configs/ae350_rv32_spl_defconfig              | 1 +
 configs/ae350_rv32_spl_xip_defconfig          | 1 +
 configs/ae350_rv32_xip_defconfig              | 1 +
 configs/ae350_rv64_defconfig                  | 1 +
 configs/ae350_rv64_spl_defconfig              | 1 +
 configs/ae350_rv64_spl_xip_defconfig          | 1 +
 configs/ae350_rv64_xip_defconfig              | 1 +
 configs/amcore_defconfig                      | 1 +
 configs/astro_mcf5373l_defconfig              | 1 +
 configs/at91sam9263ek_norflash_boot_defconfig | 1 +
 configs/at91sam9263ek_norflash_defconfig      | 1 +
 configs/boston32r2_defconfig                  | 1 +
 configs/boston32r2el_defconfig                | 1 +
 configs/boston32r6_defconfig                  | 1 +
 configs/boston32r6el_defconfig                | 1 +
 configs/boston64r2_defconfig                  | 1 +
 configs/boston64r2el_defconfig                | 1 +
 configs/boston64r6_defconfig                  | 1 +
 configs/boston64r6el_defconfig                | 1 +
 configs/comtrend_ct5361_ram_defconfig         | 1 +
 configs/comtrend_wap5813n_ram_defconfig       | 1 +
 configs/da850evm_direct_nor_defconfig         | 1 +
 configs/devkit3250_defconfig                  | 1 +
 configs/gazerbeam_defconfig                   | 1 +
 configs/huawei_hg556a_ram_defconfig           | 1 +
 configs/integratorap_cm720t_defconfig         | 1 +
 configs/integratorap_cm920t_defconfig         | 1 +
 configs/integratorap_cm926ejs_defconfig       | 1 +
 configs/integratorap_cm946es_defconfig        | 1 +
 configs/integratorcp_cm1136_defconfig         | 1 +
 configs/integratorcp_cm920t_defconfig         | 1 +
 configs/integratorcp_cm926ejs_defconfig       | 1 +
 configs/integratorcp_cm946es_defconfig        | 1 +
 configs/j7200_evm_a72_defconfig               | 1 +
 configs/j7200_evm_r5_defconfig                | 1 +
 configs/j7200_hs_evm_a72_defconfig            | 1 +
 configs/j7200_hs_evm_r5_defconfig             | 1 +
 configs/j721e_evm_a72_defconfig               | 1 +
 configs/j721e_evm_r5_defconfig                | 1 +
 configs/j721e_hs_evm_a72_defconfig            | 1 +
 configs/j721e_hs_evm_r5_defconfig             | 1 +
 configs/j721s2_evm_a72_defconfig              | 1 +
 configs/j721s2_evm_r5_defconfig               | 1 +
 configs/j721s2_hs_evm_a72_defconfig           | 1 +
 configs/j721s2_hs_evm_r5_defconfig            | 1 +
 configs/kmcent2_defconfig                     | 1 +
 configs/kmcoge5ne_defconfig                   | 1 +
 configs/kmeter1_defconfig                     | 1 +
 configs/kmopti2_defconfig                     | 1 +
 configs/kmsupx5_defconfig                     | 1 +
 configs/kmtepr2_defconfig                     | 1 +
 configs/malta64_defconfig                     | 1 +
 configs/malta64el_defconfig                   | 1 +
 configs/malta_defconfig                       | 1 +
 configs/maltael_defconfig                     | 1 +
 configs/mccmon6_nor_defconfig                 | 1 +
 configs/mccmon6_sd_defconfig                  | 1 +
 configs/microblaze-generic_defconfig          | 1 +
 configs/octeon_ebb7304_defconfig              | 1 +
 configs/omap35_logic_somlv_defconfig          | 1 +
 configs/omap3_logic_somlv_defconfig           | 1 +
 configs/pm9261_defconfig                      | 1 +
 configs/pm9263_defconfig                      | 1 +
 configs/qemu-riscv32_defconfig                | 1 +
 configs/qemu-riscv32_smode_defconfig          | 1 +
 configs/qemu-riscv32_spl_defconfig            | 1 +
 configs/qemu-riscv64_defconfig                | 1 +
 configs/qemu-riscv64_smode_defconfig          | 1 +
 configs/qemu-riscv64_spl_defconfig            | 1 +
 configs/qemu_arm64_defconfig                  | 1 +
 configs/qemu_arm_defconfig                    | 1 +
 configs/r2dplus_defconfig                     | 1 +
 configs/sama5d3xek_mmc_defconfig              | 1 +
 configs/sama5d3xek_nandflash_defconfig        | 1 +
 configs/sama5d3xek_spiflash_defconfig         | 1 +
 configs/sfr_nb4-ser_ram_defconfig             | 1 +
 configs/socrates_defconfig                    | 1 +
 configs/synquacer_developerbox_defconfig      | 1 +
 configs/total_compute_defconfig               | 1 +
 configs/tuge1_defconfig                       | 1 +
 configs/tuxx1_defconfig                       | 1 +
 configs/vexpress_aemv8a_juno_defconfig        | 1 +
 configs/vexpress_aemv8a_semi_defconfig        | 1 +
 configs/vexpress_ca9x4_defconfig              | 1 +
 configs/xilinx_zynq_virt_defconfig            | 1 +
 configs/xtfpga_defconfig                      | 1 +
 configs/zynq_cse_nor_defconfig                | 1 +
 drivers/mtd/Kconfig                           | 9 +++++++++
 drivers/mtd/cfi_flash.c                       | 4 ++--
 include/configs/P1010RDB.h                    | 1 -
 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/blanche.h                     | 1 -
 include/configs/draak.h                       | 1 -
 include/configs/eb_cpu5282.h                  | 1 -
 include/configs/ebisu.h                       | 1 -
 include/configs/km/pg-wcom-ls102xa.h          | 2 --
 include/configs/ls1021aqds.h                  | 1 -
 include/configs/ls1021atwr.h                  | 2 --
 include/configs/ls1043a_common.h              | 4 ----
 include/configs/ls1046aqds.h                  | 4 ----
 include/configs/ls1088aqds.h                  | 2 --
 include/configs/ls1088ardb.h                  | 2 --
 include/configs/ls2080aqds.h                  | 2 --
 include/configs/ls2080ardb.h                  | 2 --
 include/configs/p1_p2_rdb_pc.h                | 1 -
 include/configs/salvator-x.h                  | 1 -
 include/configs/ulcb.h                        | 1 -
 include/configs/zynq-common.h                 | 3 ---
 132 files changed, 116 insertions(+), 51 deletions(-)

diff --git a/README b/README
index 3fef1d2afa01..058352074265 100644
--- a/README
+++ b/README
@@ -1481,11 +1481,6 @@ Configuration Settings:
 		s29ws-n MirrorBit flash has non-standard addresses for buffered
 		write commands.
 
-- CONFIG_FLASH_SHOW_PROGRESS
-		If defined (must be an integer), print out countdown
-		digits and dots.  Recommended value: 45 (9..1) for 80
-		column displays, 15 (3..1) for 40 column displays.
-
 - CONFIG_FLASH_VERIFY
 		If defined, the content of the flash (destination) is compared
 		against the source after the write operation. An error message
diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig
index 3d62512ff9d2..8c421f099be8 100644
--- a/configs/3c120_defconfig
+++ b/configs/3c120_defconfig
@@ -39,6 +39,7 @@ CONFIG_MISC=y
 CONFIG_ALTERA_SYSID=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index 680c2d43671b..20250c02a119 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -37,6 +37,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=254
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index c0087aa67f95..38c5076d5f84 100644
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -44,6 +44,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index b099e986067b..cb5bcb7221cb 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -44,6 +44,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig
index b192839766e2..de7f14165bd9 100644
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -27,6 +27,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_CHECKSUM=y
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index a321b1c5c244..f2d70a4e269f 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYS_OR7_PRELIM=0xFFC0007C
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index e7e799b7bdb0..01961e5ae27f 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=11
 CONFIG_MCFFEC=y
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 5521cced6da4..0ef2e7b4ffee 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -32,6 +32,7 @@ CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_CHECKSUM=y
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 32d195808801..8158cd4e84e8 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 9f0b4196392b..6fede625fb82 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -39,6 +39,7 @@ CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index 05388796fb11..fe70245497c9 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -40,6 +40,7 @@ CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 90d83216489a..b074cf520ffb 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -40,6 +40,7 @@ CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index d8d6417d21e6..7d54807e6453 100644
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -83,6 +83,7 @@ CONFIG_SYS_OR7_PRELIM=0xFFFF810A
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=35
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 6372a72bc3e3..11a077d19ecc 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -197,6 +197,7 @@ CONFIG_SYS_I2C_SPEED=400000
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 8d2a0785a8af..29072b8a3181 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -68,6 +68,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index 5faba03e136d..08b6b3e3c830 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -67,6 +67,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index dbabf665cbf4..3f504189a4c0 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -67,6 +67,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig
index d876602fa014..e5c8358e54da 100644
--- a/configs/ae350_rv32_defconfig
+++ b/configs/ae350_rv32_defconfig
@@ -34,6 +34,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig
index 1c0b5345379d..a66db6562168 100644
--- a/configs/ae350_rv32_spl_defconfig
+++ b/configs/ae350_rv32_spl_defconfig
@@ -40,6 +40,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig
index dc584a6fd452..606962c0a71e 100644
--- a/configs/ae350_rv32_spl_xip_defconfig
+++ b/configs/ae350_rv32_spl_xip_defconfig
@@ -41,6 +41,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig
index ec6299495d69..069a9d3982e7 100644
--- a/configs/ae350_rv32_xip_defconfig
+++ b/configs/ae350_rv32_xip_defconfig
@@ -35,6 +35,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig
index 65b3fc646f30..c373b99b956a 100644
--- a/configs/ae350_rv64_defconfig
+++ b/configs/ae350_rv64_defconfig
@@ -34,6 +34,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig
index 4c3e1beb0050..f235db7990ac 100644
--- a/configs/ae350_rv64_spl_defconfig
+++ b/configs/ae350_rv64_spl_defconfig
@@ -40,6 +40,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig
index 3c6408a12ada..4cbfd52fb19b 100644
--- a/configs/ae350_rv64_spl_xip_defconfig
+++ b/configs/ae350_rv64_spl_xip_defconfig
@@ -41,6 +41,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig
index f4deee6871cf..4fed2ead1db6 100644
--- a/configs/ae350_rv64_xip_defconfig
+++ b/configs/ae350_rv64_xip_defconfig
@@ -35,6 +35,7 @@ CONFIG_FTSDC010_SDIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_CFI_FLASH_STATUS_POLL=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index b8e8bc41b6ad..cebb79f733c4 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_NET is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=1024
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 9e5665a12b84..a1a25622c779 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -42,6 +42,7 @@ CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=80000
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index e7d32f099103..d5db00448151 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -50,6 +50,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=256
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 794cf0e38d07..d82cd2147217 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -51,6 +51,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=256
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/boston32r2_defconfig b/configs/boston32r2_defconfig
index d80152be0f36..708a3a39d88e 100644
--- a/configs/boston32r2_defconfig
+++ b/configs/boston32r2_defconfig
@@ -42,6 +42,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston32r2el_defconfig b/configs/boston32r2el_defconfig
index 8624853ebac8..41769be634c0 100644
--- a/configs/boston32r2el_defconfig
+++ b/configs/boston32r2el_defconfig
@@ -43,6 +43,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston32r6_defconfig b/configs/boston32r6_defconfig
index 464b2559202e..12abbb899850 100644
--- a/configs/boston32r6_defconfig
+++ b/configs/boston32r6_defconfig
@@ -43,6 +43,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston32r6el_defconfig b/configs/boston32r6el_defconfig
index 67abbb9f7fa2..89d14b61fbf8 100644
--- a/configs/boston32r6el_defconfig
+++ b/configs/boston32r6el_defconfig
@@ -44,6 +44,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston64r2_defconfig b/configs/boston64r2_defconfig
index 253d2323749e..80031666f9c6 100644
--- a/configs/boston64r2_defconfig
+++ b/configs/boston64r2_defconfig
@@ -43,6 +43,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston64r2el_defconfig b/configs/boston64r2el_defconfig
index 190c993725a0..ad79c4e58511 100644
--- a/configs/boston64r2el_defconfig
+++ b/configs/boston64r2el_defconfig
@@ -44,6 +44,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston64r6_defconfig b/configs/boston64r6_defconfig
index f6e246e07f4e..581ddfa5b33e 100644
--- a/configs/boston64r6_defconfig
+++ b/configs/boston64r6_defconfig
@@ -43,6 +43,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/boston64r6el_defconfig b/configs/boston64r6el_defconfig
index 82e01bb21f7a..9a5655fb0276 100644
--- a/configs/boston64r6el_defconfig
+++ b/configs/boston64r6el_defconfig
@@ -44,6 +44,7 @@ CONFIG_CLK=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/comtrend_ct5361_ram_defconfig b/configs/comtrend_ct5361_ram_defconfig
index 594bddea6e15..f3f09e593fe3 100644
--- a/configs/comtrend_ct5361_ram_defconfig
+++ b/configs/comtrend_ct5361_ram_defconfig
@@ -51,6 +51,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/comtrend_wap5813n_ram_defconfig b/configs/comtrend_wap5813n_ram_defconfig
index 69a958d87963..a8ce3000d8a6 100644
--- a/configs/comtrend_wap5813n_ram_defconfig
+++ b/configs/comtrend_wap5813n_ram_defconfig
@@ -51,6 +51,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 9332c8cb3ff5..137f9ec4f57d 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -65,6 +65,7 @@ CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 66300698a9fc..cd5ddc4ad3f1 100644
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -65,6 +65,7 @@ CONFIG_SYS_I2C_LPC32XX=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=71
diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig
index d2946971b482..a852b96d4efb 100644
--- a/configs/gazerbeam_defconfig
+++ b/configs/gazerbeam_defconfig
@@ -192,6 +192,7 @@ CONFIG_IHS_FPGA=y
 CONFIG_FSL_ESDHC=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig
index 9fbec97d51d5..fdff11e16fe3 100644
--- a/configs/huawei_hg556a_ram_defconfig
+++ b/configs/huawei_hg556a_ram_defconfig
@@ -51,6 +51,7 @@ CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index e2709ec5218a..444953db91ad 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -30,6 +30,7 @@ CONFIG_SYS_RX_ETH_BUFFER=8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index e8baca158b89..6eb912c1a141 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -30,6 +30,7 @@ CONFIG_SYS_RX_ETH_BUFFER=8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 04032c8b946d..023b84200ea0 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -30,6 +30,7 @@ CONFIG_SYS_RX_ETH_BUFFER=8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index 3d910d3d48d4..fab727406812 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -30,6 +30,7 @@ CONFIG_SYS_RX_ETH_BUFFER=8
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index ea1f858135e6..7417b53e86fb 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -34,6 +34,7 @@ CONFIG_BOOTFILE="uImage"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 19c72c759e7d..36b71fc4019f 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -34,6 +34,7 @@ CONFIG_BOOTFILE="uImage"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index e0ba5720f3fe..947d21ef35e8 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -34,6 +34,7 @@ CONFIG_BOOTFILE="uImage"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index e4e960e72a3e..630fe0d813d9 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -34,6 +34,7 @@ CONFIG_BOOTFILE="uImage"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig
index e7cdd84ecbad..053f29b11f54 100644
--- a/configs/j7200_evm_a72_defconfig
+++ b/configs/j7200_evm_a72_defconfig
@@ -138,6 +138,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig
index 87101cbf53e9..dc6c1b6935df 100644
--- a/configs/j7200_evm_r5_defconfig
+++ b/configs/j7200_evm_r5_defconfig
@@ -112,6 +112,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j7200_hs_evm_a72_defconfig b/configs/j7200_hs_evm_a72_defconfig
index b9598ca1fe26..782a42b74657 100644
--- a/configs/j7200_hs_evm_a72_defconfig
+++ b/configs/j7200_hs_evm_a72_defconfig
@@ -139,6 +139,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j7200_hs_evm_r5_defconfig b/configs/j7200_hs_evm_r5_defconfig
index 608778ade86c..73979f4cc32c 100644
--- a/configs/j7200_hs_evm_r5_defconfig
+++ b/configs/j7200_hs_evm_r5_defconfig
@@ -112,6 +112,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index 48a244469413..5efaff26d22a 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -140,6 +140,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig
index d6da4c6ae2ed..9d333e490562 100644
--- a/configs/j721e_evm_r5_defconfig
+++ b/configs/j721e_evm_r5_defconfig
@@ -120,6 +120,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721e_hs_evm_a72_defconfig b/configs/j721e_hs_evm_a72_defconfig
index a1cc7da0bfba..ec66b18740ec 100644
--- a/configs/j721e_hs_evm_a72_defconfig
+++ b/configs/j721e_hs_evm_a72_defconfig
@@ -141,6 +141,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721e_hs_evm_r5_defconfig b/configs/j721e_hs_evm_r5_defconfig
index eb9df3655384..e496ec85af14 100644
--- a/configs/j721e_hs_evm_r5_defconfig
+++ b/configs/j721e_hs_evm_r5_defconfig
@@ -120,6 +120,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig
index 2b2f80c4aaa6..99a0eee12d9a 100644
--- a/configs/j721s2_evm_a72_defconfig
+++ b/configs/j721s2_evm_a72_defconfig
@@ -139,6 +139,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
index 2de5d87bdb29..cd2501699809 100644
--- a/configs/j721s2_evm_r5_defconfig
+++ b/configs/j721s2_evm_r5_defconfig
@@ -118,6 +118,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721s2_hs_evm_a72_defconfig b/configs/j721s2_hs_evm_a72_defconfig
index 3e0ec40fb2e7..9fc90737da80 100644
--- a/configs/j721s2_hs_evm_a72_defconfig
+++ b/configs/j721s2_hs_evm_a72_defconfig
@@ -140,6 +140,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/j721s2_hs_evm_r5_defconfig b/configs/j721s2_hs_evm_r5_defconfig
index bc8672f7096d..d9988fc17fc7 100644
--- a/configs/j721s2_hs_evm_r5_defconfig
+++ b/configs/j721s2_hs_evm_r5_defconfig
@@ -118,6 +118,7 @@ CONFIG_MMC_SDHCI_AM654=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig
index 41b26287d567..ba82a852050a 100644
--- a/configs/kmcent2_defconfig
+++ b/configs/kmcent2_defconfig
@@ -74,6 +74,7 @@ CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 013277c9bf12..2348f5e37036 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -230,6 +230,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 66ec936cce4a..6525232b5e3c 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -196,6 +196,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 3ba334c2401c..ba9d7b1b9b9b 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -210,6 +210,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 4a02e5e88fc1..b660f6285a84 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -187,6 +187,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 55158864ea33..2f816b7f62aa 100644
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -209,6 +209,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig
index b635c651aaea..03de1616840b 100644
--- a/configs/malta64_defconfig
+++ b/configs/malta64_defconfig
@@ -37,6 +37,7 @@ CONFIG_SYS_ATA_REG_OFFSET=0
 CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig
index 243213cb8197..3ea9fa9857e8 100644
--- a/configs/malta64el_defconfig
+++ b/configs/malta64el_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_ATA_REG_OFFSET=0
 CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index ed41e298f443..317b422a6b65 100644
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -36,6 +36,7 @@ CONFIG_SYS_ATA_REG_OFFSET=0
 CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig
index 63e5fcb6a5ce..3e4d2beda2f3 100644
--- a/configs/maltael_defconfig
+++ b/configs/maltael_defconfig
@@ -38,6 +38,7 @@ CONFIG_SYS_ATA_REG_OFFSET=0
 CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=128
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index 2566bdef168b..5f8a28737330 100644
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -63,6 +63,7 @@ CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
index 43ffc3c6bc14..651eef5d06fd 100644
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -61,6 +61,7 @@ CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_FLASH_CFI_MTD=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index f1b9cb461b92..186521aac6c8 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -64,6 +64,7 @@ CONFIG_LED_GPIO=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
diff --git a/configs/octeon_ebb7304_defconfig b/configs/octeon_ebb7304_defconfig
index b966b1d24f04..a642a64d5c18 100644
--- a/configs/octeon_ebb7304_defconfig
+++ b/configs/octeon_ebb7304_defconfig
@@ -50,6 +50,7 @@ CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 471e0556fa88..fb9430b45412 100644
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -74,6 +74,7 @@ CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index e18cbaa5c18c..37708516f1d9 100644
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -75,6 +75,7 @@ CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index d43043427a9c..d30d07bcbf10 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -45,6 +45,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=256
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 2e42ba080327..11ec775b38b7 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -49,6 +49,7 @@ CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=256
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig
index 40ba25297f6c..425bb37c9883 100644
--- a/configs/qemu-riscv32_defconfig
+++ b/configs/qemu-riscv32_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_MAX_FLASH_BANKS=2
diff --git a/configs/qemu-riscv32_smode_defconfig b/configs/qemu-riscv32_smode_defconfig
index eb9bf9b918a8..eeb90360cdbb 100644
--- a/configs/qemu-riscv32_smode_defconfig
+++ b/configs/qemu-riscv32_smode_defconfig
@@ -21,4 +21,5 @@ CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_MAX_FLASH_BANKS=2
diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig
index 756e7f35f68b..04447e5ed3ca 100644
--- a/configs/qemu-riscv32_spl_defconfig
+++ b/configs/qemu-riscv32_spl_defconfig
@@ -25,5 +25,6 @@ CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_MAX_FLASH_BANKS=2
 # CONFIG_BINMAN_FDT is not set
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
index d5eae95c80fd..7430fa075d71 100644
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -20,4 +20,5 @@ CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_MAX_FLASH_BANKS=2
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 1cb06b4b2cdd..03ef58ba4751 100644
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -23,4 +23,5 @@ CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_MAX_FLASH_BANKS=2
diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
index 68b16f0a2c8a..840e0ff151ca 100644
--- a/configs/qemu-riscv64_spl_defconfig
+++ b/configs/qemu-riscv64_spl_defconfig
@@ -24,5 +24,6 @@ CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_MAX_FLASH_BANKS=2
 # CONFIG_BINMAN_FDT is not set
diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
index 4123338b8dd3..933523315269 100644
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -45,6 +45,7 @@ CONFIG_DFU_RAM=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
index f6c6c28764e7..6373185f2972 100644
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -47,6 +47,7 @@ CONFIG_DFU_RAM=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 4217175345da..0653089ecae2 100644
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -44,6 +44,7 @@ CONFIG_IDE_RESET=y
 CONFIG_CLK=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=256
 CONFIG_E1000=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index b3108fa64afb..ba2e7dd76d41 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -81,6 +81,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=131
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index f06c21fdf11f..3afb2aaffba8 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -80,6 +80,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=131
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index 2045146fb8d7..8d71ba7d4f44 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -82,6 +82,7 @@ CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=131
diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig
index 5cf020a3ebba..61404246707d 100644
--- a/configs/sfr_nb4-ser_ram_defconfig
+++ b/configs/sfr_nb4-ser_ram_defconfig
@@ -53,6 +53,7 @@ CONFIG_LED_BCM6358=y
 CONFIG_LED_GPIO=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index f45f570764cd..4cc50d355896 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -77,6 +77,7 @@ CONFIG_SYS_I2C_FSL=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_FLASH_QUIET_TEST=y
 CONFIG_SYS_MAX_FLASH_SECT=256
diff --git a/configs/synquacer_developerbox_defconfig b/configs/synquacer_developerbox_defconfig
index f69b873a36a1..a6fc65baeeca 100644
--- a/configs/synquacer_developerbox_defconfig
+++ b/configs/synquacer_developerbox_defconfig
@@ -60,6 +60,7 @@ CONFIG_MMC_SDHCI_F_SDH30=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig
index 807e9ebd8622..04d27058f389 100644
--- a/configs/total_compute_defconfig
+++ b/configs/total_compute_defconfig
@@ -53,6 +53,7 @@ CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 894a79df59e9..fda64643fa4c 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -187,6 +187,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 6e66e6ce3052..7df2564dfb60 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -211,6 +211,7 @@ CONFIG_SYS_I2C_SPEED=200000
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 73b7363b68d4..47841e8b6ca1 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index 0b566b8005c2..4b22d49b29a4 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_SYS_FLASH_CFI_WIDTH_32BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
index 70ce13ecccf7..83e15ddbe17f 100644
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -43,6 +43,7 @@ CONFIG_SYS_MMC_MAX_BLK_COUNT=127
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_EMPTY_INFO=y
diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig
index a4c555dac5c5..506856576904 100644
--- a/configs/xilinx_zynq_virt_defconfig
+++ b/configs/xilinx_zynq_virt_defconfig
@@ -109,6 +109,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=10
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig
index d4e8d7586353..e1f1f9517eff 100644
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@@ -39,6 +39,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
+CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig
index f1c648a8f9a6..c194e89b7ecc 100644
--- a/configs/zynq_cse_nor_defconfig
+++ b/configs/zynq_cse_nor_defconfig
@@ -75,6 +75,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_SHOW_PROGRESS=10
 CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_CFI=y
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index d8e2dec0a8d0..04ae45665e40 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -77,6 +77,15 @@ config SYS_FLASH_CFI_WIDTH
 	help
 	  This must be kept in sync with the table in include/flash.h
 
+config FLASH_SHOW_PROGRESS
+	int "Print out a countdown durinng writes"
+	depends on FLASH_CFI_DRIVER
+	default 45
+	help
+	  If set to a non-zero value, print out countdown digits and dots.
+	  Recommended value: 45 (9..1) for 80 column displays, 15 (3..1) for 40
+	  column displays.
+
 config CFI_FLASH
 	bool "Enable Driver Model for CFI Flash driver"
 	depends on DM_MTD
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index c1cdd2cbc3e2..f378f6fb6139 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1292,7 +1292,7 @@ void flash_print_info(flash_info_t *info)
  * effect updates to digit and dots.  Repeated code is nasty too, so
  * we define it once here.
  */
-#ifdef CONFIG_FLASH_SHOW_PROGRESS
+#if CONFIG_FLASH_SHOW_PROGRESS
 #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \
 	if (flash_verbose) { \
 		dots -= dots_sub; \
@@ -1325,7 +1325,7 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 	int buffered_size;
 #endif
-#ifdef CONFIG_FLASH_SHOW_PROGRESS
+#if CONFIG_FLASH_SHOW_PROGRESS
 	int digit = CONFIG_FLASH_SHOW_PROGRESS;
 	int scale = 0;
 	int dots  = 0;
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 4418d5169569..f79c62adba30 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -161,7 +161,6 @@ extern unsigned long get_sdram_size(void);
 #define CFG_SYS_NOR_FTIM3	0x0
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 /* CFI for NOR Flash */
 
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 8b901ca47a0c..707157e4a9af 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -101,8 +101,6 @@
 #define PIXIS_LBMAP_SHIFT	4
 #define PIXIS_LBMAP_ALTBANK	0x40
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
 #define CFG_SYS_NAND_BASE		0xffa00000
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 623d4cf5562d..b590f127392a 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -158,8 +158,6 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
 #ifdef CONFIG_TARGET_T1024RDB
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index b6938056bbe1..9d805f446b46 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -126,8 +126,6 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
 /* CPLD on IFC */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index a93e05dd4d2d..804b7ec4c1cf 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -119,8 +119,6 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS \
 					+ 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
 
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index cf65a0da1883..d8213b4662fb 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -114,8 +114,6 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS }
 
 /* CPLD on IFC */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index b51762264ade..958933689d38 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -184,8 +184,6 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS \
 					+ 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
 
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index cb28ae28dd3e..fe09997e1784 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -25,7 +25,6 @@
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SH_QSPI_BASE	0xE6B10000
 #else
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BASE		0x00000000
 #define CFG_SYS_FLASH_SIZE		0x04000000	/* 64 MB */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
diff --git a/include/configs/draak.h b/include/configs/draak.h
index 8140bc469c52..946f1d964696 100644
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -13,7 +13,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 21eab9b3a479..717f49ca29d8 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -84,7 +84,6 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 
 #define CFG_SYS_FLASH_BASE		CFG_SYS_CS0_BASE
 #define	CFG_SYS_INT_FLASH_BASE	0xF0000000
diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h
index d1882a9646be..ad5944230a6c 100644
--- a/include/configs/ebisu.h
+++ b/include/configs/ebisu.h
@@ -15,7 +15,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index dfa81c037f48..a8dc41df0088 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -61,8 +61,6 @@
 					FTIM2_NOR_TWP(0xb))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE_PHYS }
 
 #define CFG_SYS_WRITE_SWAPPED_DATA
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index d6681e859870..e49588489c11 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -60,7 +60,6 @@
 					FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS, \
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 3c4c207edd06..b07978a999e2 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -92,8 +92,6 @@
 					FTIM2_NOR_TWPH(0x0e))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE_PHYS }
 
 #define CFG_SYS_WRITE_SWAPPED_DATA
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index a3fa92d1ff47..e54e903a8a94 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -90,10 +90,6 @@
 #define CFG_SYS_FLASH_BASE			0x60000000
 #define CFG_SYS_FLASH_BASE_PHYS		CFG_SYS_FLASH_BASE
 #define CFG_SYS_FLASH_BASE_PHYS_EARLY	0x00000000
-
-#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
-#endif
 #endif
 #endif
 
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 553ae841caba..e9b8ad0c0b7f 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -41,10 +41,6 @@
 #define CFG_SYS_FLASH_BASE			0x60000000
 #define CFG_SYS_FLASH_BASE_PHYS		CFG_SYS_FLASH_BASE
 #define CFG_SYS_FLASH_BASE_PHYS_EARLY	0x00000000
-
-#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
-#endif
 #endif
 
 /* LPUART */
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index a35045d640ff..dc9cded49fdf 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -62,8 +62,6 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 7bc4fc6a6652..e2444cd8eb4b 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -47,8 +47,6 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE }
 #endif
 #endif
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 924d4057d936..4e6d40afbf1c 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -64,8 +64,6 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index c50b6030680c..8f36958f7103 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -61,8 +61,6 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
-
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index f86b96b21410..eb2c5a2d8379 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -199,7 +199,6 @@
 #define CONFIG_FLASH_OR_PRELIM	0xfc000ff7
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 2e422cd241e9..8dc6702de481 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -13,7 +13,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index ab199bc726a6..6e03375c6c3c 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -13,7 +13,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index b8c142fed37b..37b54289073b 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -35,9 +35,6 @@
 /* Ethernet driver */
 
 /* NOR */
-#ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_FLASH_SHOW_PROGRESS	10
-#endif
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
 # define DFU_DEFAULT_POLL_TIMEOUT	300
-- 
2.25.1

[PATCH 11/41] Convert CONFIG_FLASH_SPANSION_S29WS_N et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:

   CONFIG_FLASH_SPANSION_S29WS_N
   CONFIG_FLASH_VERIFY
   CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
   CONFIG_FSL_ISBC_KEY_EXT
   CONFIG_FSL_TRUST_ARCH_v1
   CONFIG_FSL_SDHC_V2_3
   CONFIG_MAX_DSP_CPUS
   CONFIG_MIU_2BIT_INTERLEAVED
   CONFIG_SERIAL_BOOT
   CONFIG_SPI_BOOTING
   CONFIG_X86EMU_RAW_IO

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                     | 13 -------------
 arch/Kconfig.nxp                           | 17 +++++++++++++++++
 arch/arm/include/asm/fsl_secure_boot.h     | 15 ---------------
 arch/arm/mach-exynos/Kconfig               |  4 ++++
 arch/powerpc/cpu/mpc85xx/Kconfig           |  5 +++++
 arch/powerpc/include/asm/config_mpc85xx.h  |  7 -------
 arch/powerpc/include/asm/fsl_secure_boot.h | 18 ------------------
 board/freescale/common/fsl_validate.c      | 18 +++++++++---------
 board/google/Kconfig                       |  4 ++++
 board/samsung/smdkv310/Kconfig             |  3 +++
 board/sysam/stmark2/Kconfig                |  4 ++++
 configs/M53017EVB_defconfig                |  1 +
 configs/mccmon6_nor_defconfig              |  1 +
 configs/mccmon6_sd_defconfig               |  1 +
 doc/README.fsl-dpaa                        | 10 ----------
 drivers/mmc/Kconfig                        |  5 +++++
 drivers/mtd/Kconfig                        | 19 +++++++++++++++++++
 drivers/net/Kconfig                        | 13 +++++++++++++
 include/configs/M53017EVB.h                |  1 -
 include/configs/conga-qeval20-qa3-e3845.h  |  1 -
 include/configs/dfi-bt700.h                |  1 -
 include/configs/exynos5-dt-common.h        |  1 -
 include/configs/mccmon6.h                  |  1 -
 include/configs/minnowmax.h                |  1 -
 include/configs/smdkv310.h                 |  3 ---
 include/configs/som-db5800-som-6867.h      |  1 -
 include/configs/stmark2.h                  |  4 ----
 include/configs/theadorable-x86-common.h   |  1 -
 include/configs/x86-chromebook.h           |  1 -
 29 files changed, 86 insertions(+), 88 deletions(-)
 delete mode 100644 doc/README.fsl-dpaa

diff --git a/README b/README
index 058352074265..b833aca2e582 100644
--- a/README
+++ b/README
@@ -1477,19 +1477,6 @@ Configuration Settings:
 - CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 		Use buffered writes to flash.
 
-- CONFIG_FLASH_SPANSION_S29WS_N
-		s29ws-n MirrorBit flash has non-standard addresses for buffered
-		write commands.
-
-- CONFIG_FLASH_VERIFY
-		If defined, the content of the flash (destination) is compared
-		against the source after the write operation. An error message
-		will be printed when the contents are not identical.
-		Please note that this option is useless in nearly all cases,
-		since such flash programming errors usually are detected earlier
-		while unprotecting/erasing/programming. Please only enable
-		this option if you really know what you are doing.
-
 - CONFIG_ENV_FLAGS_LIST_DEFAULT
 - CONFIG_ENV_FLAGS_LIST_STATIC
 	Enable validation of the values given to environment variables when
diff --git a/arch/Kconfig.nxp b/arch/Kconfig.nxp
index 805fe934a1f5..ad61dabb31b3 100644
--- a/arch/Kconfig.nxp
+++ b/arch/Kconfig.nxp
@@ -1,5 +1,10 @@
+config FSL_TRUST_ARCH_v1
+	bool
+
 config NXP_ESBC
 	bool "NXP ESBC (secure boot) functionality"
+	select FSL_TRUST_ARCH_v1 if ARCH_P3041 || ARCH_P4080 || \
+		ARCH_P5040 || ARCH_P2041
 	help
 	  Enable Freescale Secure Boot feature. Normally selected by defconfig.
 	  If unsure, do not change.
@@ -10,6 +15,7 @@ menu "Chain of trust / secure boot options"
 config CHAIN_OF_TRUST
 	select FSL_CAAM
 	select ARCH_MISC_INIT
+	select FSL_ISBC_KEY_EXT if (ARM || FSL_CORENET) && !SYS_RAMBOOT
 	select FSL_SEC_MON
 	select SPL_BOARD_INIT if (ARM && SPL)
 	select SPL_HASH if (ARM && SPL)
@@ -41,6 +47,17 @@ config ESBC_ADDR_64BIT
 	help
 	  For Layerscape based platforms, ESBC image Address in Header is 64bit.
 
+config FSL_ISBC_KEY_EXT
+	bool
+	help
+	  The key used for verification of next level images is picked up from
+	  an Extension Table which has been verified by the ISBC (Internal
+	  Secure boot Code) in boot ROM of the SoC.  The feature is only
+	  applicable in case of NOR boot and is not applicable in case of
+	  RAMBOOT (NAND, SD, SPI).  For Layerscape, this feature is available
+	  for all device if IE Table is copied to XIP memory Also, for
+	  Layerscape, ISBC doesn't verify this table.
+
 config SYS_FSL_SFP_BE
 	def_bool y
 	depends on PPC || FSL_LSCH2 || ARCH_LS1021A
diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index a4f4961fc877..6a9d198cb811 100644
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -9,21 +9,6 @@
 
 #ifdef CONFIG_CHAIN_OF_TRUST
 #ifndef CONFIG_SPL_BUILD
-#ifndef CONFIG_SYS_RAMBOOT
-/* The key used for verification of next level images
- * is picked up from an Extension Table which has
- * been verified by the ISBC (Internal Secure boot Code)
- * in boot ROM of the SoC.
- * The feature is only applicable in case of NOR boot and is
- * not applicable in case of RAMBOOT (NAND, SD, SPI).
- * For LS, this feature is available for all device if IE Table
- * is copied to XIP memory
- * Also, for LS, ISBC doesn't verify this table.
- */
-#define CONFIG_FSL_ISBC_KEY_EXT
-
-#endif
-
 #ifdef CONFIG_FSL_LS_PPA
 /* Define the key hash here if SRK used for signing PPA image is
  * different from SRK hash put in SFP used for U-Boot.
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 383af83066ec..8f3aee052c8a 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -4,6 +4,9 @@ config BOARD_COMMON
 	def_bool y
 	depends on !TARGET_SMDKV310 && !TARGET_ARNDALE
 
+config SPI_BOOTING
+	bool
+
 config USB_BOOTING
 	bool
 
@@ -27,6 +30,7 @@ config ARCH_EXYNOS5
 	select BOARD_EARLY_INIT_F
 	select CPU_V7A
 	select SHA_HW_ACCEL
+	select SPI_BOOTING if EXYNOS5_DT
 	select USB_BOOTING
 	imply CMD_HASH
 	imply CRC32_VERIFY
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index f2361560e9ad..721dafc5ab16 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -1324,6 +1324,11 @@ config SYS_ULB_CLK
 config SYS_ETVPE_CLK
 	int
 	default 1
+
+config MAX_DSP_CPUS
+	int
+	default 12 if ARCH_B4860
+	default 2 if ARCH_B4420
 endif
 
 config SYS_L2_SIZE_256KB
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 1b5b4947f1a8..edaf8baaaebe 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -23,7 +23,6 @@
 #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM	2
 
 #elif defined(CONFIG_ARCH_P1010)
-#define CONFIG_FSL_SDHC_V2_3
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 
 #elif defined(CONFIG_ARCH_P1021)
@@ -93,11 +92,9 @@
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
 #elif defined(CONFIG_ARCH_BSC9131)
-#define CONFIG_FSL_SDHC_V2_3
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_BSC9132)
-#define CONFIG_FSL_SDHC_V2_3
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_T4240)
@@ -136,7 +133,6 @@
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
 
 #ifdef CONFIG_ARCH_B4860
-#define CONFIG_MAX_DSP_CPUS		12
 #define CONFIG_NUM_DSP_CPUS		6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	6
@@ -145,7 +141,6 @@
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #else
-#define CONFIG_MAX_DSP_CPUS		2
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	0
@@ -173,7 +168,6 @@
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	1
-#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
 #define CONFIG_QBMAN_CLK_DIV		1
@@ -204,7 +198,6 @@
 
 
 #elif defined(CONFIG_ARCH_C29X)
-#define CONFIG_FSL_SDHC_V2_3
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FSL_SEC_IDX_OFFSET	0x20000
 
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index e8b26802062b..09f37ec3e49a 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -35,24 +35,6 @@
 #define CFG_SYS_INIT_L3_ADDR		0xbff00000
 #endif
 #endif
-
-#if defined(CONFIG_ARCH_P3041)	||	\
-	defined(CONFIG_ARCH_P4080) ||	\
-	defined(CONFIG_ARCH_P5040) ||	\
-	defined(CONFIG_ARCH_P2041)
-	#define	CONFIG_FSL_TRUST_ARCH_v1
-#endif
-
-#if defined(CONFIG_FSL_CORENET) && !defined(CONFIG_SYS_RAMBOOT)
-/* The key used for verification of next level images
- * is picked up from an Extension Table which has
- * been verified by the ISBC (Internal Secure boot Code)
- * in boot ROM of the SoC.
- * The feature is only applicable in case of NOR boot and is
- * not applicable in case of RAMBOOT (NAND, SD, SPI).
- */
-#define CONFIG_FSL_ISBC_KEY_EXT
-#endif
 #endif /* #ifdef CONFIG_NXP_ESBC */
 
 #ifdef CONFIG_CHAIN_OF_TRUST
diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index 285ed9afcc9a..bfe6357b0d60 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -29,7 +29,7 @@
 #define CHECK_KEY_LEN(key_len)	(((key_len) == 2 * KEY_SIZE_BYTES / 4) || \
 				 ((key_len) == 2 * KEY_SIZE_BYTES / 2) || \
 				 ((key_len) == 2 * KEY_SIZE_BYTES))
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 /* Global data structure */
 static struct fsl_secboot_glb glb;
 #endif
@@ -63,7 +63,7 @@ self:
 	goto self;
 }
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 static u32 check_ie(struct fsl_secboot_img_priv *img)
 {
 	if (img->hdr.ie_flag & IE_FLAG_MASK)
@@ -188,7 +188,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img)
 {
 #ifdef CONFIG_ESBC_HDR_LS
 	/* In LS, No SRK Flag as SRK is always present if IE not present*/
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 	return !check_ie(img);
 #endif
 	return 1;
@@ -278,7 +278,7 @@ static u32 read_validate_single_key(struct fsl_secboot_img_priv *img)
 }
 #endif /* CONFIG_ESBC_HDR_LS */
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 
 static void install_ie_tbl(uintptr_t ie_tbl_addr,
 		struct fsl_secboot_img_priv *img)
@@ -434,7 +434,7 @@ void fsl_secboot_handle_error(int error)
 	case ERROR_ESBC_CLIENT_HEADER_INVALID_KEY_NUM:
 	case ERROR_ESBC_CLIENT_HEADER_INV_SRK_ENTRY_KEYLEN:
 #endif
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 	/*@fallthrough@*/
 	case ERROR_ESBC_CLIENT_HEADER_IE_KEY_REVOKED:
 	case ERROR_ESBC_CLIENT_HEADER_INVALID_IE_NUM_ENTRY:
@@ -571,7 +571,7 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img)
 		key_hash = 1;
 	}
 #endif
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 	if (!key_hash && check_ie(img))
 		key_hash = 1;
 #endif
@@ -705,7 +705,7 @@ static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img)
 	}
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 	if (!key_found && check_ie(img)) {
 		ret = read_validate_ie_tbl(img);
 		if (ret != 0)
@@ -851,7 +851,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr)
 		return -ENOMEM;
 	memset(img, 0, sizeof(struct fsl_secboot_img_priv));
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 	if (glb.ie_addr)
 		img->ie_addr = glb.ie_addr;
 #endif
@@ -952,7 +952,7 @@ int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
 	else
 		ret = memcmp(srk_hash, img->img_key_hash, SHA256_BYTES);
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if CONFIG_IS_ENABLED(FSL_ISBC_KEY_EXT)
 	if (!hash_cmd && check_ie(img))
 		ret = 0;
 #endif
diff --git a/board/google/Kconfig b/board/google/Kconfig
index c57e518c33fe..0474b4e69384 100644
--- a/board/google/Kconfig
+++ b/board/google/Kconfig
@@ -6,6 +6,10 @@ if VENDOR_GOOGLE
 
 config BIOSEMU
 	bool
+	select X86EMU_RAW_IO
+
+config X86EMU_RAW_IO
+	bool
 
 choice
 	prompt "Mainboard model"
diff --git a/board/samsung/smdkv310/Kconfig b/board/samsung/smdkv310/Kconfig
index a6fd657697eb..cf5ac1707430 100644
--- a/board/samsung/smdkv310/Kconfig
+++ b/board/samsung/smdkv310/Kconfig
@@ -1,5 +1,8 @@
 if TARGET_SMDKV310
 
+config MIU_2BIT_INTERLEAVED
+	def_bool y
+
 config SYS_BOARD
 	default "smdkv310"
 
diff --git a/board/sysam/stmark2/Kconfig b/board/sysam/stmark2/Kconfig
index 49d02744a9a0..b2595059c682 100644
--- a/board/sysam/stmark2/Kconfig
+++ b/board/sysam/stmark2/Kconfig
@@ -6,6 +6,10 @@ config CF_SBF
 config EXTRA_CLOCK
 	def_bool y
 
+config SERIAL_BOOT
+	def_bool y
+	depends on CF_SBF
+
 config SYS_INPUT_CLKSRC
 	hex
 	default 30000000
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 8158cd4e84e8..b6783ab95baa 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -41,6 +41,7 @@ CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI_WIDTH_16BIT=y
 CONFIG_FLASH_SHOW_PROGRESS=0
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
+CONFIG_FLASH_SPANSION_S29WS_N=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_SYS_MAX_FLASH_SECT=137
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index 5f8a28737330..1e6cec012137 100644
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -69,6 +69,7 @@ CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_FLASH_VERIFY=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SPANSION=y
diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
index 651eef5d06fd..20b6e03bdfd2 100644
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -67,6 +67,7 @@ CONFIG_SYS_FLASH_EMPTY_INFO=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_FLASH_VERIFY=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=25000000
 CONFIG_SPI_FLASH_SPANSION=y
diff --git a/doc/README.fsl-dpaa b/doc/README.fsl-dpaa
deleted file mode 100644
index 3ef5eeb32e11..000000000000
--- a/doc/README.fsl-dpaa
+++ /dev/null
@@ -1,10 +0,0 @@
-This file documents Freescale DPAA-specific options.
-
-FMan (Frame Manager)
-  - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-	on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below:
-		10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2
-	on SoCs T1024, etc, the notation between 10GEC and MAC as below:
-		10GEC1->MAC1, 10GEC2->MAC2
-	so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
-	which 10GEC enumeration is consistent with MAC enumeration.
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 698c91c57f4f..5a5a31c75ab9 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -825,8 +825,13 @@ config MMC_MTK
 
 endif
 
+config FSL_SDHC_V2_3
+	bool
+
 config FSL_ESDHC
 	bool "Freescale/NXP eSDHC controller support"
+	select FSL_SDHC_V2_3 if ARCH_P1010 || ARCH_BSC9131 || ARCH_BSC9132 \
+		|| ARCH_C29X
 	help
 	  This selects support for the eSDHC (Enhanced Secure Digital Host
 	  Controller) found on numerous Freescale/NXP SoCs.
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 04ae45665e40..af45ef00dae4 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -119,6 +119,13 @@ config SYS_FLASH_EMPTY_INFO
 	bool "Enable displaying empty sectors in flash info"
 	depends on FLASH_CFI_DRIVER
 
+config FLASH_SPANSION_S29WS_N
+	bool "Non-standard s29ws-n MirrorBit flash"
+	depends on FLASH_CFI_DRIVER
+	help
+	  Enable this if the s29ws-n MirrorBit flash has non-standard addresses
+	  for buffered write commands.
+
 config FLASH_CFI_MTD
 	bool "Enable CFI MTD driver"
 	depends on FLASH_CFI_DRIVER
@@ -156,6 +163,18 @@ config SYS_FLASH_CHECKSUM
 	  If the variable flashchecksum is set in the environment, perform a CRC
 	  of the flash and print the value to console.
 
+config FLASH_VERIFY
+	bool "Compare writes to NOR flash with source location"
+	depends on MTD_NOR_FLASH
+	help
+	  If enabled, the content of the flash (destination) is compared
+	  against the source after the write operation. An error message will
+	  be printed when the contents are not identical.  Please note that
+	  this option is useless in nearly all cases, since such flash
+	  programming errors usually are detected earlier while
+	  unprotecting/erasing/programming. Please only enable this option if
+	  you really know what you are doing.
+
 config ALTERA_QSPI
 	bool "Altera Generic Quad SPI Controller"
 	depends on DM_MTD
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0607f959da49..53fb69f52607 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -372,6 +372,7 @@ config FMAN_ENET
 	select SYS_FMAN_V3 if ARCH_B4420 || ARCH_B4860 || ARCH_LS1043A || \
 		ARCH_LS1046A || ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || \
 		ARCH_T2080 || ARCH_T4240
+	select FSL_FM_10GEC_REGULAR_NOTATION if ARCH_T1024
 	help
 	  This driver support the Freescale FMan Ethernet controller
 
@@ -391,6 +392,18 @@ config SYS_FMAN_V3
 	help
 	  SoC has FMan v3 with mEMAC
 
+config FSL_FM_10GEC_REGULAR_NOTATION
+	bool
+	help
+	  On SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and
+	  MAC as below:
+		10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2
+	  While on SoCs T1024, etc, the notation between 10GEC and MAC as below:
+		10GEC1->MAC1, 10GEC2->MAC2
+	  so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the
+	  new SoCs on which 10GEC enumeration is consistent with MAC
+	  enumeration.
+
 config FTMAC100
 	bool "Ftmac100 Ethernet Support"
 	help
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 42b74aeb9b5d..439ed93a2372 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -93,7 +93,6 @@
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#	define CONFIG_FLASH_SPANSION_S29WS_N	1
 #	define CFG_SYS_FLASH_SIZE		0x1000000	/* Max size that the board might have */
 #endif
 
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 823d37fc38ca..e9b85b4e1c72 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -17,7 +17,6 @@
 					"stderr=serial\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 52f2d50118a4..154c4f4f13f3 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -21,7 +21,6 @@
 					"stderr=serial\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index c9e0c13172cc..8f2dac61cba3 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -17,6 +17,5 @@
 
 #define CFG_SYS_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(4 << 20)
-#define CONFIG_SPI_BOOTING
 
 #endif
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 7c401a2cfd6c..a7f550769261 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -25,7 +25,6 @@
 
 /* NOR 16-bit mode */
 #define CFG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
-#define CONFIG_FLASH_VERIFY
 
 /* NOR Flash MTD */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 50c52f8839b1..6c15c72efda5 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -18,6 +18,5 @@
 					"usb_pgood_delay=40\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index af0c8200fc23..601c16ea4538 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -34,9 +34,6 @@
 
 /* FLASH and environment organization */
 
-/* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_INTERLEAVED
-
 #define RESERVE_BLOCK_SIZE		(512)
 #define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
 
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index ee038d83bc05..f09709213673 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -17,6 +17,5 @@
 					"stderr=serial,vidconsole\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index faff8d6ed6d1..f81cef0a2c4d 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -63,10 +63,6 @@
 
 #define CFG_SYS_DRAM_TEST
 
-#if defined(CONFIG_CF_SBF)
-#define CONFIG_SERIAL_BOOT
-#endif
-
 /* Reserve 256 kB for Monitor */
 
 /*
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index af0a095dfc8c..b57b1beaafe4 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -16,7 +16,6 @@
 					"stderr=serial\0"
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
 
 /* Environment settings */
 
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index ec87eddd4c72..9df3bfd527f6 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -11,7 +11,6 @@
 #define CONFIG_X86_REFCODE_RUN_ADDR		0
 
 #define VIDEO_IO_OFFSET				0
-#define CONFIG_X86EMU_RAW_IO
 
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
-- 
2.25.1

[PATCH 12/41] Convert CONFIG_FSL_ESDHC_PIN_MUX to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_FSL_ESDHC_PIN_MUX

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/MPC837XERDB_defconfig | 1 +
 drivers/mmc/Kconfig           | 4 ++++
 drivers/mmc/fsl_esdhc_imx.c   | 2 +-
 include/configs/MPC837XERDB.h | 1 -
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 11a077d19ecc..fd89e8acc0e1 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -195,6 +195,7 @@ CONFIG_SYS_FSL_I2C_OFFSET=0x3000
 CONFIG_SYS_I2C_SLAVE=0x7F
 CONFIG_SYS_I2C_SPEED=400000
 CONFIG_FSL_ESDHC=y
+CONFIG_FSL_ESDHC_PIN_MUX=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_FLASH_SHOW_PROGRESS=0
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 5a5a31c75ab9..878f867c627b 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -891,6 +891,10 @@ config FSL_USDHC
 	help
 	  This enables the Ultra Secured Digital Host Controller enhancements
 
+config FSL_ESDHC_PIN_MUX
+	bool "Perform esdhc device-tree fixup"
+	depends on (FSL_ESDHC || FSL_ESDHC_IMX) && OF_LIBFDT
+
 endmenu
 
 config SYS_FSL_ERRATUM_ESDHC111
diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 5ee3ce782313..66caf683f741 100644
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/drivers/mmc/fsl_esdhc_imx.c
@@ -1360,7 +1360,7 @@ int fsl_esdhc_mmc_init(struct bd_info *bis)
 #if CONFIG_IS_ENABLED(OF_LIBFDT)
 __weak int esdhc_status_fixup(void *blob, const char *compat)
 {
-	if (IS_ENABLED(FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
+	if (IS_ENABLED(CONFIG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
 		do_fixup_by_compat(blob, compat, "status", "disabled",
 				sizeof("disabled"), 1);
 		return 1;
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index f312ffb37e23..dbfcdfb738b0 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -177,7 +177,6 @@
 #define CFG_SYS_PCIE2_IO_PHYS	0xD8000000
 
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC_PIN_MUX
 #define CFG_SYS_FSL_ESDHC_ADDR	CFG_SYS_MPC83xx_ESDHC_ADDR
 #endif
 
-- 
2.25.1

[PATCH 13/41] env: nvram: Drop CONFIG_SYS_NVRAM_ACCESS_ROUTINE

[Tom Rini]

This option is unused anywhere and likely untested for quite a long
while. Drop this support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 env/nvram.c | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/env/nvram.c b/env/nvram.c
index fb265235afc7..229c34f5367c 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -7,22 +7,6 @@
  * Andreas Heppel <aheppel@sysgo.de>
  */
 
-/*
- * 09-18-2001 Andreas Heppel, Sysgo RTS GmbH <aheppel@sysgo.de>
- *
- * It might not be possible in all cases to use 'memcpy()' to copy
- * the environment to NVRAM, as the NVRAM might not be mapped into
- * the memory space. (I.e. this is the case for the BAB750). In those
- * cases it might be possible to access the NVRAM using a different
- * method. For example, the RTC on the BAB750 is accessible in IO
- * space using its address and data registers. To enable usage of
- * NVRAM in those cases I invented the functions 'nvram_read()' and
- * 'nvram_write()', which will be activated upon the configuration
- * #define CONFIG_SYS_NVRAM_ACCESS_ROUTINE. Note, that those functions are
- * strongly dependent on the used HW, and must be redefined for each
- * board that wants to use them.
- */
-
 #include <common.h>
 #include <command.h>
 #include <env.h>
@@ -35,22 +19,14 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-extern void *nvram_read(void *dest, const long src, size_t count);
-extern void nvram_write(long dest, const void *src, size_t count);
-#else
 static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-#endif
 
 static int env_nvram_load(void)
 {
 	char buf[CONFIG_ENV_SIZE];
 
-#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
-	nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
-#else
 	memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
-#endif
+
 	return env_import(buf, 1, H_EXTERNAL);
 }
 
@@ -63,12 +39,9 @@ static int env_nvram_save(void)
 	if (rcode)
 		return rcode;
 
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-	nvram_write(CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE);
-#else
 	if (memcpy((char *)CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE) == NULL)
 		rcode = 1;
-#endif
+
 	return rcode;
 }
 
@@ -79,19 +52,8 @@ static int env_nvram_save(void)
  */
 static int env_nvram_init(void)
 {
-#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
-	ulong crc;
-	uchar data[ENV_SIZE];
-
-	nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
-	nvram_read(data, CONFIG_ENV_ADDR + sizeof(ulong), ENV_SIZE);
-
-	if (crc32(0, data, ENV_SIZE) == crc) {
-		gd->env_addr = (ulong)CONFIG_ENV_ADDR + sizeof(long);
-#else
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
 		gd->env_addr = (ulong)&env_ptr->data;
-#endif
 		gd->env_valid = ENV_VALID;
 	} else {
 		gd->env_valid = ENV_INVALID;
-- 
2.25.1

[PATCH 14/41] CONFIG_SYS_MPC8xxx_GUTS_ADDR: Migrate to CFG_SYS

[Tom Rini]

Due to whitespace, CONFIG_SYS_MPC8xxx_GUTS_ADDR wasn't migrated to
CFG_SYS previously. Do this now.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc8xxx/srio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c
index dc1bc0db4237..c0b4a1217d33 100644
--- a/arch/powerpc/cpu/mpc8xxx/srio.c
+++ b/arch/powerpc/cpu/mpc8xxx/srio.c
@@ -33,17 +33,17 @@
 	#define _DEVDISR_SRIO2 FSL_CORENET_DEVDISR_SRIO2
 #endif
 	#define _DEVDISR_RMU   FSL_CORENET_DEVDISR_RMU
-	#define CONFIG_SYS_MPC8xxx_GUTS_ADDR CFG_SYS_MPC85xx_GUTS_ADDR
+	#define CFG_SYS_MPC8xxx_GUTS_ADDR CFG_SYS_MPC85xx_GUTS_ADDR
 #elif defined(CONFIG_MPC85xx)
 	#define _DEVDISR_SRIO1 MPC85xx_DEVDISR_SRIO
 	#define _DEVDISR_SRIO2 MPC85xx_DEVDISR_SRIO
 	#define _DEVDISR_RMU   MPC85xx_DEVDISR_RMSG
-	#define CONFIG_SYS_MPC8xxx_GUTS_ADDR CFG_SYS_MPC85xx_GUTS_ADDR
+	#define CFG_SYS_MPC8xxx_GUTS_ADDR CFG_SYS_MPC85xx_GUTS_ADDR
 #elif defined(CONFIG_MPC86xx)
 	#define _DEVDISR_SRIO1 MPC86xx_DEVDISR_SRIO
 	#define _DEVDISR_SRIO2 MPC86xx_DEVDISR_SRIO
 	#define _DEVDISR_RMU   MPC86xx_DEVDISR_RMSG
-	#define CONFIG_SYS_MPC8xxx_GUTS_ADDR \
+	#define CFG_SYS_MPC8xxx_GUTS_ADDR \
 		(&((immap_t *)CONFIG_SYS_IMMR)->im_gur)
 #else
 #error "No defines for DEVDISR_SRIO"
@@ -230,7 +230,7 @@ host_ok:
 
 void srio_init(void)
 {
-	ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC8xxx_GUTS_ADDR;
+	ccsr_gur_t *gur = (void *)CFG_SYS_MPC8xxx_GUTS_ADDR;
 	int srio1_used = 0, srio2_used = 0;
 	u32 *devdisr;
 
-- 
2.25.1

[PATCH 15/41] meson64: Fix missing CFG_SYS_BAUDRATE_TABLE migration

[Tom Rini]

CONFIG_SYS_BAUDRATE_TABLE has already been migrated to CFG_SYS but this
instance was missed, correct.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/meson64.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index 6331b7615db6..a22f7a81b001 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -18,7 +18,7 @@
 
 /* Serial drivers */
 /* The following table includes the supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE  \
+#define CFG_SYS_BAUDRATE_TABLE  \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, \
 		230400, 250000, 460800, 500000, 1000000, 2000000, 4000000, \
 		8000000 }
-- 
2.25.1

[PATCH 16/41] Convert CONFIG_POWER_PCA9450 to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_POWER_PCA9450

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/imx8mp-icore-mx8mp-edimm2.2_defconfig | 1 +
 configs/imx8mp_evk_defconfig                  | 1 +
 configs/phycore-imx8mp_defconfig              | 1 +
 configs/verdin-imx8mp_defconfig               | 1 +
 drivers/power/pmic/Kconfig                    | 3 +++
 include/configs/imx8mp_evk.h                  | 8 --------
 include/configs/imx8mp_icore_mx8mp.h          | 7 -------
 include/configs/phycore_imx8mp.h              | 6 ------
 include/configs/verdin-imx8mp.h               | 3 ---
 9 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig b/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig
index f679fbe25145..e3588473d59f 100644
--- a/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig
+++ b/configs/imx8mp-icore-mx8mp-edimm2.2_defconfig
@@ -99,6 +99,7 @@ CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
+CONFIG_POWER_PCA9450=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig
index 91ec39d02374..10802eb96195 100644
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -99,6 +99,7 @@ CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
+CONFIG_POWER_PCA9450=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig
index 248631b7a8fd..82e4f1ed970a 100644
--- a/configs/phycore-imx8mp_defconfig
+++ b/configs/phycore-imx8mp_defconfig
@@ -107,6 +107,7 @@ CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_IMX8M=y
 CONFIG_SPL_POWER_LEGACY=y
+CONFIG_POWER_PCA9450=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig
index bae8179bfde5..153c7c15197d 100644
--- a/configs/verdin-imx8mp_defconfig
+++ b/configs/verdin-imx8mp_defconfig
@@ -143,6 +143,7 @@ CONFIG_SPL_POWER_LEGACY=y
 CONFIG_POWER_DOMAIN=y
 CONFIG_IMX8M_POWER_DOMAIN=y
 CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y
+CONFIG_POWER_PCA9450=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig
index d94048db5f7e..176fb07c651a 100644
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@ -416,6 +416,9 @@ config POWER_HI6553
 config POWER_LTC3676
 	bool "Enable legacy driver for LTC3676 PMIC"
 
+config POWER_PCA9450
+	bool "Enable legacy driver for PCA9450 PMIC"
+
 config POWER_PFUZE100
 	bool "Enable legacy driver for PFUZE100 PMIC"
 
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 738677ff37cd..137bd3b09527 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -12,14 +12,6 @@
 
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_SPL_BUILD
-/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-
-
-#define CONFIG_POWER_PCA9450
-
-#endif
-
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          1
 
diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h
index d67bad8971dd..b261a81e44a4 100644
--- a/include/configs/imx8mp_icore_mx8mp.h
+++ b/include/configs/imx8mp_icore_mx8mp.h
@@ -13,13 +13,6 @@
 
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_SPL_BUILD
-/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-
-#define CONFIG_POWER_PCA9450
-
-#endif
-
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_FEC_MXC_PHYADDR          1
 
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 11a833bb1276..7a38382034a6 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -13,12 +13,6 @@
 #define CFG_SYS_UBOOT_BASE \
 		(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_SPL_BUILD
-
-#define CONFIG_POWER_PCA9450
-
-#endif
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 88839a6e561a..22dc364223ce 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -19,9 +19,6 @@
 #define CONFIG_MALLOC_F_ADDR				0x184000
 /* For RAW image gives a error info not panic */
 
-#define CONFIG_POWER_PCA9450
-
-#define CONFIG_SYS_I2C
 #endif /* CONFIG_SPL_BUILD */
 
 #define MEM_LAYOUT_ENV_SETTINGS \
-- 
2.25.1

[PATCH 17/41] Convert CONFIG_HOSTNAME et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_GATEWAYIP
   CONFIG_HOSTNAME
   CONFIG_IPADDR
   CONFIG_NETMASK
   CONFIG_ROOTPATH
   CONFIG_SERVERIP
   CONFIG_UBOOTPATH

To do this, we introduce a CONFIG_USE_ form of each of the above and
change include/env_default.h to test for that to be set before setting a
value. Further, we don't want to stringify the IP address related values
as they are now properly strings via Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                        | 32 ------------
 arch/powerpc/Kconfig                          | 12 +++++
 configs/M5208EVBE_defconfig                   | 10 ++++
 configs/M5235EVB_Flash32_defconfig            | 10 ++++
 configs/M5235EVB_defconfig                    | 10 ++++
 configs/M5253DEMO_defconfig                   |  2 +
 configs/M5272C3_defconfig                     | 10 ++++
 configs/M5282EVB_defconfig                    | 10 ++++
 configs/M53017EVB_defconfig                   | 10 ++++
 configs/M5329AFEE_defconfig                   | 10 ++++
 configs/M5329BFEE_defconfig                   | 10 ++++
 configs/M5373EVB_defconfig                    | 10 ++++
 configs/MCR3000_defconfig                     |  6 +++
 configs/MPC837XERDB_defconfig                 |  5 ++
 configs/MPC8548CDS_36BIT_defconfig            | 13 +++++
 configs/MPC8548CDS_defconfig                  | 13 +++++
 configs/MPC8548CDS_legacy_defconfig           | 13 +++++
 configs/P1010RDB-PA_36BIT_NAND_defconfig      |  2 +
 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            |  2 +
 configs/P1010RDB-PA_NOR_defconfig             |  2 +
 configs/P1010RDB-PA_SDCARD_defconfig          |  2 +
 configs/P1010RDB-PA_SPIFLASH_defconfig        |  2 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig      |  2 +
 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            |  2 +
 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    |  3 ++
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig  |  3 ++
 configs/P1020RDB-PC_36BIT_defconfig           |  3 ++
 configs/P1020RDB-PC_NAND_defconfig            |  3 ++
 configs/P1020RDB-PC_SDCARD_defconfig          |  3 ++
 configs/P1020RDB-PC_SPIFLASH_defconfig        |  3 ++
 configs/P1020RDB-PC_defconfig                 |  3 ++
 configs/P1020RDB-PD_NAND_defconfig            |  3 ++
 configs/P1020RDB-PD_SDCARD_defconfig          |  3 ++
 configs/P1020RDB-PD_SPIFLASH_defconfig        |  3 ++
 configs/P1020RDB-PD_defconfig                 |  3 ++
 configs/P2020RDB-PC_36BIT_NAND_defconfig      |  3 ++
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig    |  3 ++
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig  |  3 ++
 configs/P2020RDB-PC_36BIT_defconfig           |  3 ++
 configs/P2020RDB-PC_NAND_defconfig            |  3 ++
 configs/P2020RDB-PC_SDCARD_defconfig          |  3 ++
 configs/P2020RDB-PC_SPIFLASH_defconfig        |  3 ++
 configs/P2020RDB-PC_defconfig                 |  3 ++
 configs/P2041RDB_NAND_defconfig               |  2 +
 configs/P2041RDB_SDCARD_defconfig             |  2 +
 configs/P2041RDB_SPIFLASH_defconfig           |  2 +
 configs/P2041RDB_defconfig                    |  2 +
 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/amcore_defconfig                      |  2 +
 configs/apalis-imx8_defconfig                 |  6 +++
 configs/apalis-tk1_defconfig                  |  6 +++
 configs/apalis_imx6_defconfig                 |  6 +++
 configs/aristainetos2c_defconfig              |  2 +
 configs/aristainetos2ccslb_defconfig          |  2 +
 configs/bayleybay_defconfig                   |  1 +
 configs/bcm_ns3_defconfig                     |  2 +
 configs/cherryhill_defconfig                  |  1 +
 configs/chromebook_coral_defconfig            |  1 +
 configs/chromebook_link64_defconfig           |  1 +
 configs/chromebook_link_defconfig             |  1 +
 configs/chromebook_samus_defconfig            |  1 +
 configs/chromebox_panther_defconfig           |  1 +
 configs/cobra5272_defconfig                   |  4 ++
 configs/colibri-imx6ull-emmc_defconfig        |  6 +++
 configs/colibri-imx6ull_defconfig             |  6 +++
 configs/colibri-imx8x_defconfig               |  6 +++
 configs/colibri_imx6_defconfig                |  6 +++
 configs/colibri_imx7_defconfig                |  6 +++
 configs/colibri_imx7_emmc_defconfig           |  6 +++
 configs/colibri_vf_defconfig                  |  6 +++
 ...-qeval20-qa3-e3845-internal-uart_defconfig |  1 +
 configs/conga-qeval20-qa3-e3845_defconfig     |  1 +
 configs/controlcenterdc_defconfig             |  3 ++
 configs/coreboot64_defconfig                  |  1 +
 configs/coreboot_defconfig                    |  1 +
 configs/cougarcanyon2_defconfig               |  1 +
 configs/crownbay_defconfig                    |  1 +
 configs/dfi-bt700-q7x-151_defconfig           |  1 +
 configs/draco_defconfig                       |  2 +
 configs/efi-x86_app32_defconfig               |  1 +
 configs/efi-x86_app64_defconfig               |  1 +
 configs/efi-x86_payload32_defconfig           |  1 +
 configs/efi-x86_payload64_defconfig           |  1 +
 configs/etamin_defconfig                      |  2 +
 configs/galileo_defconfig                     |  1 +
 configs/gazerbeam_defconfig                   |  3 ++
 configs/gwventana_emmc_defconfig              |  4 ++
 configs/gwventana_gw5904_defconfig            |  4 ++
 configs/gwventana_nand_defconfig              |  4 ++
 configs/imx28_xea_defconfig                   |  2 +
 configs/imx28_xea_sb_defconfig                |  2 +
 configs/integratorcp_cm1136_defconfig         |  4 ++
 configs/integratorcp_cm920t_defconfig         |  4 ++
 configs/integratorcp_cm926ejs_defconfig       |  4 ++
 configs/integratorcp_cm946es_defconfig        |  4 ++
 configs/kmcent2_defconfig                     |  2 +
 configs/kmcoge5ne_defconfig                   |  2 +
 configs/kmeter1_defconfig                     |  2 +
 configs/kmopti2_defconfig                     |  2 +
 configs/kmsupx5_defconfig                     |  2 +
 configs/kmtepr2_defconfig                     |  2 +
 configs/kontron-sl-mx6ul_defconfig            |  2 +
 configs/kontron-sl-mx8mm_defconfig            |  2 +
 configs/m53menlo_defconfig                    |  2 +
 configs/microblaze-generic_defconfig          |  2 +
 configs/minnowmax_defconfig                   |  1 +
 configs/mt7622_rfb_defconfig                  |  4 ++
 configs/mt7623a_unielec_u7623_02_defconfig    |  4 ++
 configs/mt7623n_bpir2_defconfig               |  4 ++
 configs/mt7629_rfb_defconfig                  |  4 ++
 configs/mvebu_ac5_rd_defconfig                | 10 ++++
 configs/novena_defconfig                      |  2 +
 configs/opos6uldev_defconfig                  |  2 +
 configs/pg_wcom_expu1_defconfig               |  2 +
 configs/pg_wcom_expu1_update_defconfig        |  2 +
 configs/pg_wcom_seli8_defconfig               |  2 +
 configs/pg_wcom_seli8_update_defconfig        |  2 +
 configs/poleg_evb_defconfig                   |  6 +++
 configs/pxm2_defconfig                        |  2 +
 configs/qemu-ppce500_defconfig                |  2 +
 configs/qemu-x86_64_defconfig                 |  1 +
 configs/qemu-x86_defconfig                    |  1 +
 configs/rastaban_defconfig                    |  2 +
 configs/rut_defconfig                         |  2 +
 configs/seeed_npi_imx6ull_defconfig           |  2 +
 configs/slimbootloader_defconfig              |  1 +
 configs/socfpga_vining_fpga_defconfig         |  2 +
 configs/som-db5800-som-6867_defconfig         |  1 +
 ...stm32mp15-icore-stm32mp1-ctouch2_defconfig |  2 +
 ...tm32mp15-icore-stm32mp1-edimm2.2_defconfig |  2 +
 ...-microgea-stm32mp1-microdev2-of7_defconfig |  2 +
 ...mp15-microgea-stm32mp1-microdev2_defconfig |  2 +
 configs/stm32mp15_basic_defconfig             |  2 +
 configs/stm32mp15_defconfig                   |  2 +
 configs/stm32mp15_dhcom_basic_defconfig       |  2 +
 configs/stm32mp15_dhcor_basic_defconfig       |  2 +
 configs/stm32mp15_trusted_defconfig           |  2 +
 configs/stmark2_defconfig                     |  2 +
 ...able-x86-conga-qa3-e3845-pcie-x4_defconfig |  1 +
 .../theadorable-x86-conga-qa3-e3845_defconfig |  1 +
 configs/theadorable-x86-dfi-bt700_defconfig   |  1 +
 configs/thuban_defconfig                      |  2 +
 configs/tuge1_defconfig                       |  2 +
 configs/tuxx1_defconfig                       |  2 +
 configs/uniphier_ld4_sld8_defconfig           | 10 ++++
 configs/uniphier_v7_defconfig                 | 10 ++++
 configs/uniphier_v8_defconfig                 | 10 ++++
 configs/usbarmory_defconfig                   |  2 +
 env/Kconfig                                   | 10 ++++
 include/configs/M5208EVBE.h                   |  8 ---
 include/configs/M5235EVB.h                    |  9 +---
 include/configs/M5253DEMO.h                   |  2 -
 include/configs/M5272C3.h                     |  8 ---
 include/configs/M5282EVB.h                    |  8 ---
 include/configs/M53017EVB.h                   |  8 ---
 include/configs/M5329EVB.h                    |  8 ---
 include/configs/M5373EVB.h                    |  8 ---
 include/configs/MCR3000.h                     |  4 --
 include/configs/MPC837XERDB.h                 |  4 --
 include/configs/MPC8548CDS.h                  | 12 +----
 include/configs/P1010RDB.h                    |  5 +-
 include/configs/P2041RDB.h                    |  4 +-
 include/configs/T102xRDB.h                    |  4 +-
 include/configs/T104xRDB.h                    |  4 +-
 include/configs/T208xQDS.h                    |  4 +-
 include/configs/T208xRDB.h                    |  4 +-
 include/configs/T4240RDB.h                    |  4 +-
 include/configs/amcore.h                      |  2 -
 include/configs/apalis-imx8.h                 |  3 --
 include/configs/apalis-tk1.h                  |  6 ---
 include/configs/apalis_imx6.h                 |  6 ---
 include/configs/aristainetos2.h               |  2 -
 include/configs/bcm_ns3.h                     |  2 -
 include/configs/cobra5272.h                   |  3 --
 include/configs/colibri-imx6ull.h             |  4 --
 include/configs/colibri-imx8x.h               |  4 --
 include/configs/colibri_imx6.h                |  6 ---
 include/configs/colibri_imx7.h                |  4 --
 include/configs/colibri_vf.h                  |  4 --
 include/configs/controlcenterdc.h             |  3 --
 include/configs/gazerbeam.h                   |  4 --
 include/configs/gw_ventana.h                  |  2 -
 include/configs/integratorcp.h                |  3 --
 include/configs/kmcent2.h                     |  1 -
 include/configs/kmcoge5ne.h                   |  1 -
 include/configs/kmeter1.h                     |  2 -
 include/configs/kmopti2.h                     |  1 -
 include/configs/kmsupx5.h                     |  1 -
 include/configs/kmtepr2.h                     |  1 -
 include/configs/kontron-sl-mx6ul.h            |  1 -
 include/configs/kontron-sl-mx8mm.h            |  1 -
 include/configs/m53menlo.h                    |  1 -
 include/configs/microblaze-generic.h          |  2 -
 include/configs/mt7622.h                      |  2 -
 include/configs/mt7623.h                      |  2 -
 include/configs/mt7629.h                      |  2 -
 include/configs/mvebu_alleycat-5.h            |  5 --
 include/configs/novena.h                      |  1 -
 include/configs/npi_imx6ull.h                 |  2 -
 include/configs/opos6uldev.h                  |  2 -
 include/configs/p1_p2_rdb_pc.h                |  5 +-
 include/configs/pg-wcom-expu1.h               |  1 -
 include/configs/pg-wcom-seli8.h               |  2 -
 include/configs/poleg.h                       |  3 --
 include/configs/qemu-ppce500.h                |  2 -
 include/configs/siemens-am33x-common.h        |  2 -
 include/configs/socfpga_vining_fpga.h         |  1 -
 include/configs/stm32mp15_common.h            |  3 --
 include/configs/stmark2.h                     |  2 -
 include/configs/tuge1.h                       |  1 -
 include/configs/tuxx1.h                       |  1 -
 include/configs/uniphier.h                    |  6 ---
 include/configs/usbarmory.h                   |  1 -
 include/configs/x86-common.h                  |  2 -
 include/configs/xea.h                         |  1 -
 include/env_default.h                         | 22 ++++----
 net/Kconfig                                   | 52 +++++++++++++++++++
 250 files changed, 660 insertions(+), 260 deletions(-)

diff --git a/README b/README
index b833aca2e582..c0f55b2586cf 100644
--- a/README
+++ b/README
@@ -734,38 +734,6 @@ The following options need to be configured:
 		Some PHY like Intel LXT971A need extra delay after
 		command issued before MII status register can be read
 
-- IP address:
-		CONFIG_IPADDR
-
-		Define a default value for the IP address to use for
-		the default Ethernet interface, in case this is not
-		determined through e.g. bootp.
-		(Environment variable "ipaddr")
-
-- Server IP address:
-		CONFIG_SERVERIP
-
-		Defines a default value for the IP address of a TFTP
-		server to contact when using the "tftboot" command.
-		(Environment variable "serverip")
-
-- Gateway IP address:
-		CONFIG_GATEWAYIP
-
-		Defines a default value for the IP address of the
-		default router where packets to other networks are
-		sent to.
-		(Environment variable "gatewayip")
-
-- Subnet mask:
-		CONFIG_NETMASK
-
-		Defines a default value for the subnet mask (or
-		routing prefix) which is used to determine if an IP
-		address belongs to the local subnet or needs to be
-		forwarded through a router.
-		(Environment variable "netmask")
-
 - BOOTP Recovery Mode:
 		CONFIG_BOOTP_RANDOM_DELAY
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0fc4ceda000d..e0801c25941c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -68,4 +68,16 @@ source "arch/powerpc/cpu/mpc85xx/Kconfig"
 source "arch/powerpc/cpu/mpc8xx/Kconfig"
 source "arch/powerpc/lib/Kconfig"
 
+config USE_UBOOTPATH
+	bool "Set a default 'uboot' value in the environment"
+	help
+	  Many default environment scripts will check the "uboot" variable
+	  to determine the name of the file to load via tftp that will then
+	  be written to flash.
+
+config UBOOTPATH
+	string "Value of the default 'uboot' value in the environment"
+	depends on USE_UBOOTPATH
+	default "u-boot.bin"
+
 endmenu
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index 20250c02a119..263e57f46a07 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -26,8 +26,18 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5208EVBe"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_UDP_CHECKSUM=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index 38c5076d5f84..88c11162111f 100644
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -34,7 +34,17 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="u-boot.bin"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5235EVB"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index cb5bcb7221cb..255f3b9d2f11 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -34,7 +34,17 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="u-boot.bin"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5235EVB"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 2684ce05f267..4de6290b7d31 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5253DEMO"
 # CONFIG_BLOCK_CACHE is not set
 CONFIG_SYS_IDE_MAXBUS=1
 CONFIG_SYS_ATA_STRIDE=4
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index f2d70a4e269f..324daa016efb 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -27,7 +27,17 @@ CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5272C3"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xFFE00201
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 0ef2e7b4ffee..7988d250034d 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -27,7 +27,17 @@ CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5282EVB"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index b6783ab95baa..d7c07aa2ea96 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -28,8 +28,18 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M53017"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_UDP_CHECKSUM=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 6fede625fb82..989af925f740 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -27,8 +27,18 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5329EVB"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_UDP_CHECKSUM=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index fe70245497c9..7be2a27ba2be 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -28,8 +28,18 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5329EVB"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_UDP_CHECKSUM=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index b074cf520ffb..4b278a5b1c85 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -28,8 +28,18 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="M5373EVB"
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_UDP_CHECKSUM=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.162.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.162.1.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.162.1.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index 7d54807e6453..3e16ffc2ef2f 100644
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -55,6 +55,12 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.0.3"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.0.0.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.0.1"
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0x4000801
 CONFIG_SYS_OR0_PRELIM=0xFFC00926
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index fd89e8acc0e1..b1b070da704d 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -148,6 +148,7 @@ CONFIG_SPCR_TSECEP_3=y
 CONFIG_LCRR_DBYP_PLL_BYPASSED=y
 CONFIG_LCRR_CLKDIV_8=y
 CONFIG_FSL_SERDES=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
@@ -178,6 +179,10 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="TSEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="mpc837x_rdb"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfsroot"
 CONFIG_FSL_SATA=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_SYS_BR0_PRELIM_BOOL=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 29072b8a3181..90d5eab00787 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -14,6 +14,8 @@ CONFIG_SRIO1=y
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_USE_UBOOTPATH=y
+CONFIG_UBOOTPATH="8548cds/u-boot.bin"
 CONFIG_PCIE1=y
 CONFIG_PHYS_64BIT=y
 CONFIG_SYS_MONITOR_LEN=524288
@@ -45,6 +47,17 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.168.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.253"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfsroot"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index 08b6b3e3c830..b99a8089b02b 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -14,6 +14,8 @@ CONFIG_SRIO1=y
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_USE_UBOOTPATH=y
+CONFIG_UBOOTPATH="8548cds/u-boot.bin"
 CONFIG_PCIE1=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_OF_BOARD_SETUP=y
@@ -44,6 +46,17 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.168.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.253"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfsroot"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index 3f504189a4c0..bc05e3a7957a 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -15,6 +15,8 @@ CONFIG_TARGET_MPC8548CDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_TARGET_MPC8548CDS_LEGACY=y
+CONFIG_USE_UBOOTPATH=y
+CONFIG_UBOOTPATH="8548cds/u-boot.bin"
 CONFIG_PCIE1=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_OF_BOARD_SETUP=y
@@ -44,6 +46,17 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.168.1.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.253"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfsroot"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 874451900e7e..896da7257d3d 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -81,6 +82,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index 34639e5091ab..395319c65d10 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -11,6 +11,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -49,6 +50,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index 08c185c5f5fe..86b73c10df77 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -71,6 +72,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index dcf4c0d103e5..2d0cfaa3abfb 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -73,6 +74,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index 78c159a3093a..4a743fb79802 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -80,6 +81,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index 0b2c38512278..977ac4d59935 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -11,6 +11,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -48,6 +49,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 012e8f69626e..cac1aba03443 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -70,6 +71,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index b21372458ba3..bc7f68578ea8 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -72,6 +73,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index ab7c4d3e9758..d941e838fcb6 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -82,6 +83,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index f878af0b360d..0ee59995166a 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -11,6 +11,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -50,6 +51,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index 38bdbda7481a..ef61ab4fdf37 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -72,6 +73,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index 956274358ad7..fb54a04d8e71 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -74,6 +75,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 46f53983801b..6ca28baad870 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -81,6 +82,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index 7239747d7e38..cd63855efc9e 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -11,6 +11,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -49,6 +50,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index 529e54c221ac..ebaf3b4aba55 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -71,6 +72,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index e066a9db747d..0304637ccef7 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -73,6 +74,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index b2bd220cf021..c42a5a898484 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -81,6 +82,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index e93f01f65068..2c25ff175d19 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -72,6 +73,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index 59bacba39df2..bfeeee5f696f 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -74,6 +75,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index 17fc9dddad16..9cfd0b5267a5 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -12,6 +12,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -51,6 +52,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index b0f770b11efd..d6ccfd28bca2 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -80,6 +81,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index 2a8637f254f9..b769496384bf 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -71,6 +72,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index b1c30754bb76..a760f4ba3e3c 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -73,6 +74,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index 09493a84ac37..9cf3a6dbed42 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -12,6 +12,7 @@ CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -50,6 +51,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index ccb94cbc955a..642ec54d06dd 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1020RDB_PD=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -83,6 +84,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index 3b813b22bd74..568d208beef6 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P1020RDB_PD=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -74,6 +75,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 225eca2d9763..18850657813d 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P1020RDB_PD=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -76,6 +77,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index b8d3b123928a..271127b4ed1e 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -12,6 +12,7 @@ CONFIG_TARGET_P1020RDB_PD=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -53,6 +54,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index b935d18879c1..e0680186ecb2 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -85,6 +86,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index 247c96183e09..42b1ea635a07 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -76,6 +77,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 733aa5ad5e9c..396ba9905f87 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -78,6 +79,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index 69d25c5f78f5..6eea304dadea 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -12,6 +12,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PHYS_64BIT=y
@@ -55,6 +56,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 4b19800d2097..b1653876012a 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -84,6 +85,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index 85b38a0897c6..f5219eb1bbc5 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -75,6 +76,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index fe763f5e60e9..984185df3b3f 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -77,6 +78,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index 788e8f8abc0d..79f3587507d4 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -12,6 +12,7 @@ CONFIG_TARGET_P2020RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_SYS_MONITOR_LEN=786432
@@ -54,6 +55,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC1"
+CONFIG_USE_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_LBA48=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_SYS_SPD_BUS_NUM=1
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index 38ab9af13b34..f7ddcf1edb82 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -15,6 +15,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -60,6 +61,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index 39f5f8ce6910..9fd309dbfa72 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -15,6 +15,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -60,6 +61,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index b06e6142c4ee..8307e9336f57 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -62,6 +63,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
index 0eb837321aeb..4a40c37b4368 100644
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -57,6 +58,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 8f5d603974df..ade00e2424dd 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -18,6 +18,7 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -87,6 +88,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_DDR_ECC=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 3fb54800d967..e51c2a44763a 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -18,6 +18,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -86,6 +87,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_DDR_ECC=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index ee8667e49c85..7c43275a8835 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -20,6 +20,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -89,6 +90,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_DDR_ECC=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index f8144f07bfde..0e59671e90cb 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -12,6 +12,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -61,6 +62,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_DDR_ECC=y
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index 8a9094b56118..2faaff464e97 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -17,6 +17,7 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -80,6 +81,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_CHIP_SELECTS_PER_CTRL=2
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index 25d18b71bcf3..aea417dd8816 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -79,6 +80,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_CHIP_SELECTS_PER_CTRL=2
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index 8189abb4c5e6..436a1d575246 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -82,6 +83,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_CHIP_SELECTS_PER_CTRL=2
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 9e68b434687b..e34ddce2f07f 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -11,6 +11,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -54,6 +55,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC4"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_CAAM=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_CHIP_SELECTS_PER_CTRL=2
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 9263174db8a1..791e7030b535 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -21,6 +21,7 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -89,6 +90,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 3ea1c30a32c0..f6ba91bfab4c 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -21,6 +21,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -88,6 +89,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index 05f631f7e777..8a99e130afbf 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -13,6 +13,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_NXP_ESBC=y
 CONFIG_BOOTSCRIPT_HDR_ADDR=0xee020000
 CONFIG_PCIE1=y
@@ -63,6 +64,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_DYNAMIC_DDR_CLK_FREQ=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 2bf2d377820c..66b34d1fea2e 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -23,6 +23,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -91,6 +92,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index 31ef6035d50e..c26577460674 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -15,6 +15,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SRIO_PCIE_BOOT_SLAVE=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -60,6 +61,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
index 27bf2496e02e..36fde6a25964 100644
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -15,6 +15,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -63,6 +64,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index 23f6ee6e431c..743db44918bf 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -17,6 +17,7 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -85,6 +86,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index c2d95c10ab0b..b33bd65e235a 100644
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -84,6 +85,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 2194ff6c5171..5120c27196f9 100644
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -87,6 +88,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
index 7f57b004d576..861c00677dd6 100644
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -11,6 +11,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -59,6 +60,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig
index 5d4573a7f9d5..f55d7b6c7b3c 100644
--- a/configs/T2080RDB_revD_NAND_defconfig
+++ b/configs/T2080RDB_revD_NAND_defconfig
@@ -18,6 +18,7 @@ CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -86,6 +87,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig
index 7ca9a8b036ec..c8a86becfb76 100644
--- a/configs/T2080RDB_revD_SDCARD_defconfig
+++ b/configs/T2080RDB_revD_SDCARD_defconfig
@@ -18,6 +18,7 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -85,6 +86,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig
index 39fcd2dad392..000773b5d69a 100644
--- a/configs/T2080RDB_revD_SPIFLASH_defconfig
+++ b/configs/T2080RDB_revD_SPIFLASH_defconfig
@@ -20,6 +20,7 @@ CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -88,6 +89,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig
index 8d1011d06c5d..80fc0e9f869b 100644
--- a/configs/T2080RDB_revD_defconfig
+++ b/configs/T2080RDB_revD_defconfig
@@ -12,6 +12,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_T2080RDB_REV_D=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -60,6 +61,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC3"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index 9b082674d60d..ae6abe9bab3b 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -17,6 +17,7 @@ CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -78,6 +79,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
index 662edc32c619..79b71490a128 100644
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -11,6 +11,7 @@ CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_CACHE_STASHING=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
@@ -53,6 +54,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FM1@DTSEC1"
+CONFIG_USE_ROOTPATH=y
 CONFIG_FSL_SATA_V2=y
 CONFIG_SYS_SATA_MAX_DEVICE=2
 CONFIG_FSL_CAAM=y
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index cebb79f733c4..6775379428f9 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="AMCORE"
 # CONFIG_NET is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index 6226d50c8ace..395202bc29f6 100644
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -48,6 +48,12 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
 CONFIG_MXC_GPIO=y
diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 70ef62a778b6..54b781b9c95a 100644
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -54,6 +54,12 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_SPL_DM=y
 CONFIG_SYS_I2C_TEGRA=y
 CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 68655cf15bf0..28fc03d85ae8 100644
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -79,6 +79,12 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y
diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig
index 4c7ded9d22fd..d7ac13017981 100644
--- a/configs/aristainetos2c_defconfig
+++ b/configs/aristainetos2c_defconfig
@@ -68,6 +68,8 @@ CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="aristainetos2"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARP_TIMEOUT=200
 CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig
index a23c77af8973..562eb104537b 100644
--- a/configs/aristainetos2ccslb_defconfig
+++ b/configs/aristainetos2ccslb_defconfig
@@ -68,6 +68,8 @@ CONFIG_ENV_WRITEABLE_LIST=y
 CONFIG_ENV_ACCESS_IGNORE_FORCE=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="aristainetos2"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_ARP_TIMEOUT=200
 CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 90a734fcdad0..43cf268b55b4 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -53,6 +53,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/bcm_ns3_defconfig b/configs/bcm_ns3_defconfig
index 4928a203d0d7..956e797e43fc 100644
--- a/configs/bcm_ns3_defconfig
+++ b/configs/bcm_ns3_defconfig
@@ -41,6 +41,8 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 # CONFIG_DOS_PARTITION is not set
 CONFIG_OF_CONTROL=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="NS3"
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
 CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig
index 321121e3f729..83d5712e6163 100644
--- a/configs/cherryhill_defconfig
+++ b/configs/cherryhill_defconfig
@@ -43,6 +43,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig
index a38b3b78c08a..401506e2193d 100644
--- a/configs/chromebook_coral_defconfig
+++ b/configs/chromebook_coral_defconfig
@@ -84,6 +84,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_OF_TRANSLATE=y
diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index 570c4e82a473..64ebef4b5009 100644
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -67,6 +67,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index 43cf53045b40..3098857d6e17 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -57,6 +57,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index aa3d6f2b9d19..b933a2352e3f 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -59,6 +59,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index e83f2dfe7f39..96c739cbfbca 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -51,6 +51,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
index 2fdb882dc4ed..377781f0bc91 100644
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -25,6 +25,10 @@ CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_PING=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.100.2"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.100.1"
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xFFE00201
diff --git a/configs/colibri-imx6ull-emmc_defconfig b/configs/colibri-imx6ull-emmc_defconfig
index c0248dca9532..b4de88aeadfa 100644
--- a/configs/colibri-imx6ull-emmc_defconfig
+++ b/configs/colibri-imx6ull-emmc_defconfig
@@ -54,6 +54,12 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index d16b66df7c85..f2a0d79ccca9 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -63,6 +63,12 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index 6896236045bf..e4c418958b23 100644
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -47,6 +47,12 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=4096
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
 CONFIG_FXL6408_GPIO=y
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index aa24dea1f043..bad7b8a54eed 100644
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -79,6 +79,12 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 4428b555036f..7e24dcd40090 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -61,6 +61,12 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index bc9abc82d517..fe785d7e319f 100644
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -52,6 +52,12 @@ CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_BLOCKSIZE=16352
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 3352b8e9235b..2642e8975b59 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -66,6 +66,12 @@ CONFIG_ENV_RANGE=0x80000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_VERSION_VARIABLE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.10.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.10.1"
 CONFIG_DFU_NAND=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000
 CONFIG_VYBRID_GPIO=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 31979f32bc5f..7b007438e264 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -60,6 +60,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 18d58bec2010..08a3b6a8a0c4 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index e8fb032bbaeb..ffa48fcb93f3 100644
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -66,8 +66,11 @@ CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="ccdc.img"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="ccdc"
 CONFIG_ARP_TIMEOUT=200
 CONFIG_NET_RETRY_COUNT=50
+CONFIG_USE_ROOTPATH=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_DM_PCA953X=y
diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig
index e4da59bae927..ec672e59e898 100644
--- a/configs/coreboot64_defconfig
+++ b/configs/coreboot64_defconfig
@@ -50,6 +50,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
index e297494663e0..4db728991692 100644
--- a/configs/coreboot_defconfig
+++ b/configs/coreboot_defconfig
@@ -44,6 +44,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index 8b47f2d89f87..8e53eec74e57 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -47,6 +47,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 038cbbe5b993..69ad017f987d 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -50,6 +50,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index f9b1bae4130c..b32aaa0fb319 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -54,6 +54,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index cc1fb489eb16..8d1c6fd44a77 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -84,6 +84,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/opt/eldk"
 CONFIG_SPL_DM=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig
index 4ae74dbd2e38..905f375a3efe 100644
--- a/configs/efi-x86_app32_defconfig
+++ b/configs/efi-x86_app32_defconfig
@@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_REGEX is not set
diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig
index 3f1e80120c6a..605d49ff8cb1 100644
--- a/configs/efi-x86_app64_defconfig
+++ b/configs/efi-x86_app64_defconfig
@@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_REGEX is not set
diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig
index 8d1fc22eb93c..a5c629b46f37 100644
--- a/configs/efi-x86_payload32_defconfig
+++ b/configs/efi-x86_payload32_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
index 89e6d1febc8b..5cde04a5ac91 100644
--- a/configs/efi-x86_payload64_defconfig
+++ b/configs/efi-x86_payload64_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index ee731f3c0a1b..d42eda2055ae 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -85,6 +85,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/opt/eldk"
 CONFIG_SPL_DM=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 141467bbe358..0d2ebdab9267 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -46,6 +46,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig
index a852b96d4efb..9d09d9c37f21 100644
--- a/configs/gazerbeam_defconfig
+++ b/configs/gazerbeam_defconfig
@@ -162,6 +162,9 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xFE090000
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="gazerbeam"
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_AXI=y
 CONFIG_IHS_AXI=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index f999b4477553..5308a8e3e97c 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -97,6 +97,10 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NETCONSOLE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.146"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 4c6291f0c51a..37fc1e514301 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -97,6 +97,10 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NETCONSOLE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.146"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 4e062e477e8c..f33625b2ca07 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -100,6 +100,10 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NETCONSOLE=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.146"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y
diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig
index 48be3c5f4a6a..b29c62fc59b7 100644
--- a/configs/imx28_xea_defconfig
+++ b/configs/imx28_xea_defconfig
@@ -83,6 +83,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="xea"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_DEVRES=y
diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig
index 26227341d9f8..b7edd3bae48b 100644
--- a/configs/imx28_xea_sb_defconfig
+++ b/configs/imx28_xea_sb_defconfig
@@ -63,6 +63,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="xea"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_DEVRES=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 7417b53e86fb..6d9d0e8999b4 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -31,6 +31,10 @@ CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.104"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.100"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 36b71fc4019f..2d40a5f93749 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -31,6 +31,10 @@ CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.104"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.100"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 947d21ef35e8..4505123d4f2c 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -31,6 +31,10 @@ CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.104"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.100"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index 630fe0d813d9..bbdf86baebd4 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -31,6 +31,10 @@ CONFIG_CMD_ARMFLASH=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.104"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.100"
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig
index ba82a852050a..9386a07d83f8 100644
--- a/configs/kmcent2_defconfig
+++ b/configs/kmcent2_defconfig
@@ -60,6 +60,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xebf00000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="fm1-mac5"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kmcent2"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_FSL_CAAM=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 2348f5e37036..5f4d4d6c5075 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -202,6 +202,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kmcoge5ne"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 6525232b5e3c..f1b887f88115 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -171,6 +171,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kmeter1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index ba9d7b1b9b9b..8ff62fedad4d 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -183,6 +183,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kmopti2"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index b660f6285a84..a617aec2f42f 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -162,6 +162,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kmsupx5"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 2f816b7f62aa..4dc47ee4d954 100644
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -182,6 +182,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kmtepr2"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/kontron-sl-mx6ul_defconfig b/configs/kontron-sl-mx6ul_defconfig
index 7391e597642f..02b963e7c337 100644
--- a/configs/kontron-sl-mx6ul_defconfig
+++ b/configs/kontron-sl-mx6ul_defconfig
@@ -66,6 +66,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kontron-mx6ul"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_ENV=y
 CONFIG_DM_I2C=y
diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig
index 62fd984debda..4b54813415db 100644
--- a/configs/kontron-sl-mx8mm_defconfig
+++ b/configs/kontron-sl-mx8mm_defconfig
@@ -77,6 +77,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="kontron-mx8mm"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index e332de2aa9e0..b70d10433d7d 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -75,6 +75,8 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="boot/fitImage"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="m53menlo"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 186521aac6c8..be3494180500 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -53,6 +53,8 @@ CONFIG_CMD_JFFS2=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="microblaze-generic"
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 52ed763424a8..b3b15d86e179 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -59,6 +59,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig
index 3f18addd5a01..c09c2221a540 100644
--- a/configs/mt7622_rfb_defconfig
+++ b/configs/mt7622_rfb_defconfig
@@ -26,6 +26,10 @@ CONFIG_CMD_SMC=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.3"
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/configs/mt7623a_unielec_u7623_02_defconfig b/configs/mt7623a_unielec_u7623_02_defconfig
index c56b4bb82fe5..8dd65d57e3da 100644
--- a/configs/mt7623a_unielec_u7623_02_defconfig
+++ b/configs/mt7623a_unielec_u7623_02_defconfig
@@ -35,6 +35,10 @@ CONFIG_CMD_READ=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.2"
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig
index e36943b0fc82..cafac4278b38 100644
--- a/configs/mt7623n_bpir2_defconfig
+++ b/configs/mt7623n_bpir2_defconfig
@@ -36,6 +36,10 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.2"
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig
index d7669d557796..76fd135d93cc 100644
--- a/configs/mt7629_rfb_defconfig
+++ b/configs/mt7629_rfb_defconfig
@@ -57,6 +57,10 @@ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent
 CONFIG_ENV_OVERWRITE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.1.1"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.2"
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
diff --git a/configs/mvebu_ac5_rd_defconfig b/configs/mvebu_ac5_rd_defconfig
index 9235a398c553..a27202eb23e2 100644
--- a/configs/mvebu_ac5_rd_defconfig
+++ b/configs/mvebu_ac5_rd_defconfig
@@ -43,6 +43,16 @@ CONFIG_CMD_UBI=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="0.0.0.0"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="0.0.0.0"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/srv/nfs/"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="0.0.0.0"
 CONFIG_CLK=y
 CONFIG_CLK_MVEBU=y
 CONFIG_DM_PCA953X=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 3999ae1c829d..cc74abfcd7ca 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -59,6 +59,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="fitImage"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="novena"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index cdb246fc644a..867b89d3fed6 100644
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -77,6 +77,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=1
 CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/tftpboot/opos6ul-root"
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig
index d21e180d1fc3..a31bedc7fc83 100644
--- a/configs/pg_wcom_expu1_defconfig
+++ b/configs/pg_wcom_expu1_defconfig
@@ -70,6 +70,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0x60040000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="ethernet@2d90000"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="EXPU1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig
index 54773b06339a..0e25a16fff16 100644
--- a/configs/pg_wcom_expu1_update_defconfig
+++ b/configs/pg_wcom_expu1_update_defconfig
@@ -68,6 +68,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0x60200000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="ethernet@2d90000"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="EXPU1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig
index 8311b3a3a00f..b7f0eee6c269 100644
--- a/configs/pg_wcom_seli8_defconfig
+++ b/configs/pg_wcom_seli8_defconfig
@@ -70,6 +70,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0x60040000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="ethernet@2d90000"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="SELI8"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig
index d6f4a0547907..2ebd40c3aa90 100644
--- a/configs/pg_wcom_seli8_update_defconfig
+++ b/configs/pg_wcom_seli8_update_defconfig
@@ -68,6 +68,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0x60200000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="ethernet@2d90000"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="SELI8"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
diff --git a/configs/poleg_evb_defconfig b/configs/poleg_evb_defconfig
index 914fc39a7e34..b7e39eb31fcb 100644
--- a/configs/poleg_evb_defconfig
+++ b/configs/poleg_evb_defconfig
@@ -28,6 +28,12 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_UUID=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.0.2"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.0.1"
 CONFIG_CLK=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 6b361f82116f..e655b18f0274 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -82,6 +82,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/opt/eldk"
 CONFIG_SPL_DM=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index cdad1b099500..a19d555f7d59 100644
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_QEMU_PPCE500=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
+CONFIG_USE_UBOOTPATH=y
 CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -39,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_SIMPLE_BUS_CORRECT_RANGE=y
 CONFIG_LBA48=y
 CONFIG_CHIP_SELECTS_PER_CTRL=0
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 0f4811e5d7a5..9f1cb2675de8 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -58,6 +58,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SYS_IDE_MAXDEVICE=4
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index a8222122fc9d..04528ad7cd2f 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SYS_IDE_MAXDEVICE=4
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 861f0f59bc8b..fe09c34d5b8a 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -84,6 +84,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/opt/eldk"
 CONFIG_SPL_DM=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 30c5d4a5ad5e..6c3ba4cc7242 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -83,6 +83,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/opt/eldk"
 CONFIG_SPL_DM=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
diff --git a/configs/seeed_npi_imx6ull_defconfig b/configs/seeed_npi_imx6ull_defconfig
index 34d23fdb8425..abcd63c7ece7 100644
--- a/configs/seeed_npi_imx6ull_defconfig
+++ b/configs/seeed_npi_imx6ull_defconfig
@@ -49,6 +49,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth0"
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_DM_MTD=y
diff --git a/configs/slimbootloader_defconfig b/configs/slimbootloader_defconfig
index f5d16f64d734..dbfed814ded0 100644
--- a/configs/slimbootloader_defconfig
+++ b/configs/slimbootloader_defconfig
@@ -25,6 +25,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 # CONFIG_ACPIGEN is not set
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index cdad36bbfd8c..6d859b3274bd 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -63,6 +63,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="fitImage"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="socfpga_vining_fpga"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 5b724697123e..c131a46684dd 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -54,6 +54,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
index df90e64cbbf5..41074d50ff4d 100644
--- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
+++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig
@@ -58,6 +58,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_DM_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_STM32=y
 CONFIG_DM_I2C=y
diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
index a242f1b1580e..c9dbd485bcde 100644
--- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
+++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig
@@ -58,6 +58,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_DM_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_STM32=y
 CONFIG_DM_I2C=y
diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
index 5f1fc9011370..6f8293c7ee27 100644
--- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
+++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig
@@ -58,6 +58,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_DM_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_STM32=y
 CONFIG_DM_I2C=y
diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
index 65d9b5a72948..a12a150f3b15 100644
--- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
+++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig
@@ -58,6 +58,8 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_DM_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_STM32=y
 CONFIG_DM_I2C=y
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
index 86ebbef0a6c8..2d4b7cbc7b62 100644
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -94,6 +94,8 @@ CONFIG_SYS_MMC_ENV_DEV=-1
 # CONFIG_SPL_ENV_IS_NOWHERE is not set
 # CONFIG_SPL_ENV_IS_IN_SPI_FLASH is not set
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_STM32_ADC=y
 CONFIG_SET_DFU_ALT_INFO=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
index caa79e68834f..22cf538b4109 100644
--- a/configs/stm32mp15_defconfig
+++ b/configs/stm32mp15_defconfig
@@ -66,6 +66,8 @@ CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=-1
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_STM32_ADC=y
 CONFIG_CLK_SCMI=y
 CONFIG_SET_DFU_ALT_INFO=y
diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig
index 3ba396b96712..242f3575eac5 100644
--- a/configs/stm32mp15_dhcom_basic_defconfig
+++ b/configs/stm32mp15_dhcom_basic_defconfig
@@ -97,6 +97,8 @@ CONFIG_SPL_ENV_IS_NOWHERE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_STM32_ADC=y
 CONFIG_SPL_BLOCK_CACHE=y
 CONFIG_DFU_MMC=y
diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig
index ddd96ac4d295..bb84ddc3e765 100644
--- a/configs/stm32mp15_dhcor_basic_defconfig
+++ b/configs/stm32mp15_dhcor_basic_defconfig
@@ -94,6 +94,8 @@ CONFIG_SPL_ENV_IS_NOWHERE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_IP_DEFRAG=y
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_STM32_ADC=y
 CONFIG_SPL_BLOCK_CACHE=y
 CONFIG_DFU_MMC=y
diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
index 3309c2e79246..e00c00f3746f 100644
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -67,6 +67,8 @@ CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=-1
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.1.1"
 CONFIG_STM32_ADC=y
 CONFIG_CLK_SCMI=y
 CONFIG_SET_DFU_ALT_INFO=y
diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig
index 5ee2edcf5e42..ae7a9cf6da26 100644
--- a/configs/stmark2_defconfig
+++ b/configs/stmark2_defconfig
@@ -37,6 +37,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_ENV_SPI_CS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="stmark2"
 # CONFIG_NET is not set
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
index 440c170c6b1e..654d865fd44a 100644
--- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
index b91c3b135479..5c845a73c038 100644
--- a/configs/theadorable-x86-conga-qa3-e3845_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
@@ -55,6 +55,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 4755b4754f2b..237c978ee3bb 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -53,6 +53,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="bzImage"
 CONFIG_TFTP_TSIZE=y
+CONFIG_USE_ROOTPATH=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_LBA48=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index aef524052bcb..a9e37170f45d 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -84,6 +84,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/opt/eldk"
 CONFIG_SPL_DM=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index fda64643fa4c..fd3dadf0eb2d 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -162,6 +162,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="tuge1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 7df2564dfb60..ec8810e02352 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -184,6 +184,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xF00E0000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="UEC0"
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="tuxx1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig
index 5665cf38798d..b361e3f40349 100644
--- a/configs/uniphier_ld4_sld8_defconfig
+++ b/configs/uniphier_ld4_sld8_defconfig
@@ -50,6 +50,16 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="zImage"
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.168.11.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.11.10"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfs/root/path"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.11.1"
 CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig
index e3087a9109e1..765d42a3e6c8 100644
--- a/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig
@@ -51,6 +51,16 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="zImage"
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.168.11.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.11.10"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfs/root/path"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.11.1"
 CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig
index 1b0e0d0da74c..6a0e2666cf18 100644
--- a/configs/uniphier_v8_defconfig
+++ b/configs/uniphier_v8_defconfig
@@ -38,6 +38,16 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="Image"
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_USE_GATEWAYIP=y
+CONFIG_GATEWAYIP="192.168.11.1"
+CONFIG_USE_IPADDR=y
+CONFIG_IPADDR="192.168.11.10"
+CONFIG_USE_NETMASK=y
+CONFIG_NETMASK="255.255.255.0"
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/nfs/root/path"
+CONFIG_USE_SERVERIP=y
+CONFIG_SERVERIP="192.168.11.1"
 CONFIG_GPIO_UNIPHIER=y
 CONFIG_MISC=y
 CONFIG_I2C_EEPROM=y
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index ed2bcc69fc50..66c969f95e56 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -27,6 +27,8 @@ CONFIG_CMD_USB=y
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_HOSTNAME=y
+CONFIG_HOSTNAME="usbarmory"
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_IIM=y
diff --git a/env/Kconfig b/env/Kconfig
index 4e506ae262b5..c13a5b0d467d 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -866,6 +866,16 @@ config ETHPRIME
 	help
 	  The value to set the "ethprime" variable to.
 
+config USE_HOSTNAME
+	bool "Set a default 'hostname' value in the environment"
+	default y if X86
+
+config HOSTNAME
+	string "Value of the default 'hostname' value in the environment"
+	depends on USE_HOSTNAME
+	default "x86" if X86
+	default "unknown"
+
 config VERSION_VARIABLE
 	bool "Add a 'ver' environment variable with the U-Boot version"
 	help
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index b360238b332a..e14650fe0d40 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -17,14 +17,6 @@
 
 /* I2C */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* CONFIG_MCFFEC */
-
-#define CONFIG_HOSTNAME		"M5208EVBe"
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index ed45eccb62c9..220524bfaed1 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -26,14 +26,7 @@
 #define CFG_SYS_I2C_PINMUX_SET	(GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
 
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* FEC_ENET */
-
-#define CONFIG_HOSTNAME		"M5235EVB"
+
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index ad55938348e5..65a7aa04086e 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -36,8 +36,6 @@
 		""
 #endif
 
-#define CONFIG_HOSTNAME		"M5253DEMO"
-
 /* I2C */
 #define CFG_SYS_I2C_PINMUX_REG	(*(u32 *) (CFG_SYS_MBAR+0x19C))
 #define CFG_SYS_I2C_PINMUX_CLR	(0xFFFFE7FF)
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index a9339e505257..c58d19c810f4 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -29,14 +29,6 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text);
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* CONFIG_MCFFEC */
-
-#define CONFIG_HOSTNAME		"M5272C3"
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index bde9e770e52a..e23439fd7820 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -29,14 +29,6 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text*);
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* CONFIG_MCFFEC */
-
-#define CONFIG_HOSTNAME		"M5282EVB"
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 439ed93a2372..ac2bd0b2241e 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -30,14 +30,6 @@
 
 /* I2C */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* FEC_ENET */
-
-#define CONFIG_HOSTNAME		"M53017"
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 72f0c63a1e21..a86a117fd8f9 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -22,14 +22,6 @@
 
 /* I2C */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* FEC_ENET */
-
-#define CONFIG_HOSTNAME		"M5329EVB"
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 4e8b54e01f4e..b2ad03cc3cb4 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -24,14 +24,6 @@
 
 /* I2C */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
-#	define CONFIG_NETMASK	255.255.255.0
-#	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
-#endif				/* FEC_ENET */
-
-#define CONFIG_HOSTNAME		"M5373EVB"
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 232cf9e99845..f8368823aac6 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -52,10 +52,6 @@
 		"${ofl_args}; "						\
 		"bootm ${loadaddr} - 0xf00000\0"
 
-#define CONFIG_IPADDR			192.168.0.3
-#define CONFIG_SERVERIP			192.168.0.1
-#define CONFIG_NETMASK			255.0.0.0
-
 /* Miscellaneous configurable options */
 
 /* Definitions for initial stack pointer and data area (in DPRAM) */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index dbfcdfb738b0..7dff3cc69136 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -197,10 +197,6 @@
 
 #define CONFIG_NETDEV		"eth1"
 
-#define CONFIG_HOSTNAME		"mpc837x_rdb"
-#define CONFIG_ROOTPATH		"/nfsroot"
-				/* U-Boot image on TFTP server */
-#define CONFIG_UBOOTPATH	"u-boot.bin"
 #define CONFIG_FDTFILE		"mpc8379_rdb.dtb"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 34b876f829e2..1f1eacdb6916 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -298,20 +298,10 @@
  * Environment Configuration
  */
 
-#define CONFIG_IPADDR	 192.168.1.253
-
-#define CONFIG_HOSTNAME	 "unknown"
-#define CONFIG_ROOTPATH	 "/nfsroot"
-#define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
-
-#define CONFIG_SERVERIP	 192.168.1.1
-#define CONFIG_GATEWAYIP 192.168.1.1
-#define CONFIG_NETMASK	 255.255.255.0
-
 #define	CONFIG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
 	"netdev=eth0\0"				\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
+	"uboot=" CONFIG_UBOOTPATH "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot; "	\
 		"protect off " __stringify(CONFIG_TEXT_BASE)	\
 			" +$filesize; "	\
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index f79c62adba30..d83563d6181d 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -380,13 +380,10 @@ extern unsigned long get_sdram_size(void);
  * Environment Configuration
  */
 
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
-
 #define	CONFIG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"	\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" CONFIG_UBOOTPATH "\0"		\
 	"loadaddr=1000000\0"			\
 	"consoledev=ttyS0\0"				\
 	"ramdiskaddr=2000000\0"			\
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 707157e4a9af..0f0cdb3a6815 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -306,8 +306,6 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin
 
 #define __USB_PHY_TYPE	utmi
 
@@ -315,7 +313,7 @@
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"bank_intlv=cs0_cs1\0"					\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"			\
+	"uboot=" CONFIG_UBOOTPATH "\0"			\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"		\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index b590f127392a..e815d9f81a1e 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -421,8 +421,6 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 #define __USB_PHY_TYPE		utmi
 
 #ifdef CONFIG_ARCH_T1024
@@ -441,7 +439,7 @@
 	ARCH_EXTRA_ENV_SETTINGS					\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"  \
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" CONFIG_UBOOTPATH "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"bootargs=root=/dev/ram rw console=ttyS0,115200\0" \
 	"netdev=eth0\0"						\
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 9d805f446b46..6fe0bd682801 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -411,8 +411,6 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
 
 #define __USB_PHY_TYPE	utmi
 #define RAMDISKFILE	"t104xrdb/ramdisk.uboot"
@@ -434,7 +432,7 @@
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
 	"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" CONFIG_UBOOTPATH "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 804b7ec4c1cf..79b3d7af4eac 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -419,8 +419,6 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH	 "/opt/nfsroot"
-#define CONFIG_UBOOTPATH "u-boot.bin"	/* U-Boot image on TFTP server */
 
 #define __USB_PHY_TYPE		utmi
 
@@ -430,7 +428,7 @@
 	"bank_intlv=auto;"					\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" CONFIG_UBOOTPATH "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index d8213b4662fb..2a32fe37aa92 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -385,8 +385,6 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH	 "/opt/nfsroot"
-#define CONFIG_UBOOTPATH "u-boot.bin"	/* U-Boot image on TFTP server */
 
 #define __USB_PHY_TYPE		utmi
 
@@ -396,7 +394,7 @@
 	"bank_intlv=auto;"					\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" CONFIG_UBOOTPATH "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 958933689d38..d8c4de5b3d73 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -138,8 +138,6 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
 
 #define HVBOOT					\
 	"setenv bootargs config-addr=0x60000000; "	\
@@ -386,7 +384,7 @@
 	"bank_intlv=auto;"					\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
 	"netdev=eth0\0"						\
-	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
+	"uboot=" CONFIG_UBOOTPATH "\0"		\
 	"ubootaddr=" __stringify(CONFIG_TEXT_BASE) "\0"	\
 	"tftpflash=tftpboot $loadaddr $uboot && "		\
 	"protect off $ubootaddr +$filesize && "			\
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index ee0be972d243..ca29346fe642 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -8,8 +8,6 @@
 #ifndef __AMCORE_CONFIG_H
 #define __AMCORE_CONFIG_H
 
-#define CONFIG_HOSTNAME			"AMCORE"
-
 #define CFG_SYS_UART_PORT		0
 
 #define CONFIG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index cf23837863be..aa3dcf4a8813 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -14,9 +14,6 @@
 #define USDHC2_BASE_ADDR		0x5b020000
 
 /* Networking */
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
 
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"fdt_addr_r=0x84000000\0" \
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index f0a02ae17953..1d478078b2c3 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -33,12 +33,6 @@
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR		192.168.10.2
-#define CONFIG_NETMASK		255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP		192.168.10.1
-
 #define DFU_ALT_EMMC_INFO	"apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \
 				"boot part 0 1 mmcpart 0; " \
 				"rootfs part 0 2 mmcpart 0; " \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index a3c86545f077..25a84458f553 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -35,12 +35,6 @@
 
 /* Command definition */
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP			192.168.10.1
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
 	func(MMC, mmc, 2) \
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 6faf544d21b6..854135457153 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -11,8 +11,6 @@
 #ifndef __ARISTAINETOS2_CONFIG_H
 #define __ARISTAINETOS2_CONFIG_H
 
-#define CONFIG_HOSTNAME		"aristainetos2"
-
 #if (CONFIG_SYS_BOARD_VERSION == 5)
 #define CONSOLE_DEV	"ttymxc1"
 #elif (CONFIG_SYS_BOARD_VERSION == 6)
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index b5469880fe2f..fc176dc20140 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -9,8 +9,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_HOSTNAME			"NS3"
-
 /* Physical Memory Map */
 #define V2M_BASE			0x80000000
 #define PHYS_SDRAM_1			V2M_BASE
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 6d6e2fc69620..8c83c3ac06a5 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -91,9 +91,6 @@ enter a valid image address in flash */
 
 /* User network settings */
 
-#define CONFIG_IPADDR 192.168.100.2		/* default board IP address */
-#define CONFIG_SERVERIP 192.168.100.1	/* default tftp server IP address */
-
 #endif
 
 /*---*/
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index c0c3b4e0359a..2f09a264cbe0 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -20,10 +20,6 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 #define CFG_SYS_FSL_USDHC_NUM	1
 
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
-
 #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC)
 #define UBOOT_UPDATE \
 	"uboot_hwpart=1\0" \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 6002d8d5c9f0..215c633a4c95 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -14,10 +14,6 @@
 #define USDHC1_BASE_ADDR		0x5b010000
 #define USDHC2_BASE_ADDR		0x5b020000
 
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
-
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"fdt_addr_r=0x83000000\0" \
 	"kernel_addr_r=0x81000000\0" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 60a3862a4d12..19daad21cb56 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -30,12 +30,6 @@
 
 /* Command definition */
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#undef CONFIG_SERVERIP
-#define CONFIG_SERVERIP			192.168.10.1
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 1) \
 	func(MMC, mmc, 0) \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 32a79b025545..48c3f0154739 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -21,10 +21,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_IPADDR			192.168.10.2
-#define CONFIG_NETMASK			255.255.255.0
-#define CONFIG_SERVERIP			192.168.10.1
-
 #if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
 #define UBOOT_UPDATE \
 	"uboot_hwpart=1\0" \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index fa778ec9e2b7..8a790400b46d 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -16,10 +16,6 @@
 
 /* NAND support */
 
-#define CONFIG_IPADDR		192.168.10.2
-#define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_SERVERIP		192.168.10.1
-
 #define CONFIG_FDTADDR			0x84000000
 
 #define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 5da2778b67be..119a834fe742 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -21,9 +21,6 @@
  * Environment Configuration
  */
 
-#define CONFIG_HOSTNAME		"ccdc"
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-
 #define CONFIG_EXTRA_ENV_SETTINGS						\
 	"netdev=eth1\0"						\
 	"consoledev=ttyS1\0"							\
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 36dcee87c5fb..671b75e69861 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -55,10 +55,6 @@
  * Environment Configuration
  */
 
-/* TODO: Turn into string option and migrate to Kconfig */
-#define CONFIG_HOSTNAME		"gazerbeam"
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consoledev=ttyS1\0"						\
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4d0a78c6269c..298a8f5aa2a0 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -57,7 +57,5 @@
 /* Persistent Environment Config */
 
 /* Environment */
-#define CONFIG_IPADDR             192.168.1.1
-#define CONFIG_SERVERIP           192.168.1.146
 
 #endif			       /* __CONFIG_H */
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 25bb41ebc46c..596e4ff8c3bf 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -19,9 +19,6 @@
 /* Integrator CP-specific configuration */
 #define CFG_SYS_HZ_CLOCK		1000000	/* Timer 1 is clocked at 1Mhz */
 
-#define CONFIG_SERVERIP 192.168.1.100
-#define CONFIG_IPADDR 192.168.1.104
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 527f0383bc65..366272d49e86 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -8,7 +8,6 @@
 #ifndef __KMCENT2_H
 #define __KMCENT2_H
 
-#define CONFIG_HOSTNAME		"kmcent2"
 #define KM_BOARD_NAME	CONFIG_HOSTNAME
 
 /*
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 6b30fb4b617e..e4f28935370e 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmcoge5ne"
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 910fc1b2cb25..b2e0422a66d1 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmeter1"
-
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
 #include "km/km-powerpc.h"
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 5050c7030390..43fad7293a11 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmopti2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index e3de6c61e71c..43fad7293a11 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmsupx5"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index a4ceb1c50d6b..43fad7293a11 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME         "kmtepr2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 6fcacdb0c664..7c5f673c0f4d 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -23,7 +23,6 @@
 
 /* Board and environment settings */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
-#define CONFIG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 80a32304606a..beb1926c12aa 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -23,7 +23,6 @@
 #define CFG_SYS_INIT_RAM_SIZE	0x200000
 
 /* Board and environment settings */
-#define CONFIG_HOSTNAME			"kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 66591390d903..189b2113f751 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -84,7 +84,6 @@
 /*
  * Extra Environments
  */
-#define CONFIG_HOSTNAME		"m53menlo"
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index edd2466caa98..b8b08974c7e7 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -16,8 +16,6 @@
 # define CFG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define	CONFIG_HOSTNAME		"microblaze-generic"
-
 /* architecture dependent code */
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
 #define BOOT_TARGET_DEVICES_PXE(func)	func(PXE, pxe, na)
diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h
index 8c297266d8b1..654151295345 100644
--- a/include/configs/mt7622.h
+++ b/include/configs/mt7622.h
@@ -18,7 +18,5 @@
 #define CFG_SYS_SDRAM_BASE		0x40000000
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
-#define CONFIG_SERVERIP			192.168.1.3
 
 #endif
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 39a7ba76633b..93161bd24f02 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -33,8 +33,6 @@
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
-#define CONFIG_SERVERIP			192.168.1.2
 
 #ifdef CONFIG_DISTRO_DEFAULTS
 
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index bfa44aacc726..99b09ad41e74 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -28,7 +28,5 @@
 #define CFG_SYS_SDRAM_BASE		0x40000000
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
-#define CONFIG_SERVERIP			192.168.1.2
 
 #endif
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 5c9620371e3c..3ad3aefa7559 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -15,11 +15,6 @@
 				      115200, 230400, 460800, 921600 }
 
 /* Default Env vars */
-#define CONFIG_IPADDR           0.0.0.0 /* In order to cause an error */
-#define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
-#define CONFIG_NETMASK          255.255.255.0
-#define CONFIG_GATEWAYIP        0.0.0.0
-#define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(USB, usb, 0) \
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 4e46dfc526ce..6e4bdce1c08d 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -25,7 +25,6 @@
  */
 
 /* Booting Linux */
-#define CONFIG_HOSTNAME			"novena"
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 09c4ddb6646b..2eebd0c9a457 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -18,8 +18,6 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-#define CONFIG_NETMASK			255.255.255.0
-
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
 
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index e42a736136bc..5c44b9dcb20d 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -27,6 +27,4 @@
 /* LCD */
 #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
 
-#define CONFIG_ROOTPATH         "/tftpboot/opos6ul-root"
-
 #endif /* __OPOS6ULDEV_CONFIG_H */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index eb2c5a2d8379..ee25990b034f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -396,15 +396,12 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_HOSTNAME		"unknown"
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
 #include "p1_p2_bootsrc.h"
 
 #define	CONFIG_EXTRA_ENV_SETTINGS	\
 "netdev=eth0\0"	\
-"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
+"uboot=" CONFIG_UBOOTPATH "\0"	\
 "loadaddr=1000000\0"	\
 "bootfile=uImage\0"	\
 "tftpflash=tftpboot $loadaddr $uboot; "	\
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 1b72739d143d..66c371336b27 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -7,7 +7,6 @@
 #define __CONFIG_PG_WCOM_EXPU1_H
 
 #define WCOM_EXPU1
-#define CONFIG_HOSTNAME				"EXPU1"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index e4bcae5bb5e1..69829a5c9bd1 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -6,8 +6,6 @@
 #ifndef __CONFIG_PG_WCOM_SELI8_H
 #define __CONFIG_PG_WCOM_SELI8_H
 
-#define CONFIG_HOSTNAME			"SELI8"
-
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index 518d7a3639c5..075729e5d37d 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -14,9 +14,6 @@
 #define CFG_SYS_SDRAM_BASE           0x0
 
 /* Default environemnt variables */
-#define CONFIG_SERVERIP                 192.168.0.1
-#define CONFIG_IPADDR                   192.168.0.2
-#define CONFIG_NETMASK                  255.255.255.0
 #define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 30a9eae8523b..d05618995861 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -58,7 +58,5 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 /*
  * Environment Configuration
  */
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_UBOOTPATH	"u-boot.bin"	/* U-Boot image on TFTP server*/
 
 #endif	/* __QEMU_PPCE500_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5a001716fb01..1b1787a3d3ca 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -17,8 +17,6 @@
 
 /* commands to include */
 
-#define CONFIG_ROOTPATH		"/opt/eldk"
-
 /* Clock Defines */
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 70d9f3607a67..d88b07bc1594 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -13,7 +13,6 @@
 /* Booting Linux */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME			"socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index c9cfadd9ce0b..9715dfad1c97 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -24,9 +24,6 @@
 /* NAND support */
 
 /* Ethernet need */
-#ifdef CONFIG_DWC_ETH_QOS
-#define CONFIG_SERVERIP                 192.168.1.1
-#endif
 
 #define STM32MP_FIP_IMAGE_GUID \
 	EFI_GUID(0x19d5df83, 0x11b0, 0x457b, 0xbe, 0x2c, \
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index f81cef0a2c4d..ce941d832a54 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -8,8 +8,6 @@
 #ifndef __STMARK2_CONFIG_H
 #define __STMARK2_CONFIG_H
 
-#define CONFIG_HOSTNAME			"stmark2"
-
 #define CFG_SYS_UART_PORT		0
 
 #define LDS_BOARD_TEXT						\
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index d43ccbe8dd94..43fad7293a11 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuge1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 7eed31c35f03..43fad7293a11 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -23,7 +23,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuxx1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 8cd81f1cdddc..7fee64029d8d 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -46,10 +46,6 @@
 /*
  * Network Configuration
  */
-#define CONFIG_SERVERIP			192.168.11.1
-#define CONFIG_IPADDR			192.168.11.10
-#define CONFIG_GATEWAYIP		192.168.11.1
-#define CONFIG_NETMASK			255.255.255.0
 
 #if defined(CONFIG_ARM64)
 /* ARM Trusted Firmware */
@@ -62,8 +58,6 @@
 	"third_image=u-boot.bin\0"
 #endif
 
-#define CONFIG_ROOTPATH			"/nfs/root/path"
-
 #ifdef CONFIG_FIT
 #define KERNEL_ADDR_R_OFFSET		"0x05100000"
 #define LINUXBOOT_ENV_SETTINGS \
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index a2bc3cd23a5b..7f79c6342fc3 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -28,7 +28,6 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* Linux boot */
-#define CONFIG_HOSTNAME		"usbarmory"
 
 #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 3e17b53dde2d..9bf2462010de 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -41,8 +41,6 @@
  */
 
 /* Default environment */
-#define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_HOSTNAME		"x86"
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS	"othbootargs=\0"
diff --git a/include/configs/xea.h b/include/configs/xea.h
index b432ab2dc8ef..a3dc0c74ebb1 100644
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -26,7 +26,6 @@
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		"xea"
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"bootmode=update\0"						\
diff --git a/include/env_default.h b/include/env_default.h
index 7c9c00a96926..3b7685ee26c3 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -53,11 +53,11 @@ const char default_environment[] = {
 #ifdef	CONFIG_ETHPRIME
 	"ethprime="	CONFIG_ETHPRIME			"\0"
 #endif
-#ifdef	CONFIG_IPADDR
-	"ipaddr="	__stringify(CONFIG_IPADDR)	"\0"
+#ifdef	CONFIG_USE_IPADDR
+	"ipaddr="	CONFIG_IPADDR			"\0"
 #endif
-#ifdef	CONFIG_SERVERIP
-	"serverip="	__stringify(CONFIG_SERVERIP)	"\0"
+#ifdef	CONFIG_USE_SERVERIP
+	"serverip="	CONFIG_SERVERIP			"\0"
 #endif
 #ifdef	CONFIG_SYS_DISABLE_AUTOLOAD
 	"autoload=0\0"
@@ -65,17 +65,17 @@ const char default_environment[] = {
 #ifdef	CONFIG_PREBOOT_DEFINED
 	"preboot="	CONFIG_PREBOOT			"\0"
 #endif
-#ifdef	CONFIG_ROOTPATH
+#ifdef	CONFIG_USE_ROOTPATH
 	"rootpath="	CONFIG_ROOTPATH			"\0"
 #endif
-#ifdef	CONFIG_GATEWAYIP
-	"gatewayip="	__stringify(CONFIG_GATEWAYIP)	"\0"
+#ifdef	CONFIG_USE_GATEWAYIP
+	"gatewayip="	CONFIG_GATEWAYIP		"\0"
 #endif
-#ifdef	CONFIG_NETMASK
-	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
+#ifdef	CONFIG_USE_NETMASK
+	"netmask="	CONFIG_NETMASK			"\0"
 #endif
-#ifdef	CONFIG_HOSTNAME
-	"hostname="	CONFIG_HOSTNAME	"\0"
+#ifdef	CONFIG_USE_HOSTNAME
+	"hostname="	CONFIG_HOSTNAME			"\0"
 #endif
 #ifdef CONFIG_USE_BOOTFILE
 	"bootfile="	CONFIG_BOOTFILE			"\0"
diff --git a/net/Kconfig b/net/Kconfig
index cb600fe5eb48..603d14f5b03d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -174,6 +174,58 @@ config BOOTP_MAX_ROOT_PATH_LEN
 	help
 	  Select maximal length of option 17 root path.
 
+config USE_GATEWAYIP
+	bool "Set a default 'gateway' value in the environment"
+	help
+	  Defines a default value for the IP address of the default router
+	  where packets to other networks are sent to.  (Environment variable
+	  "gatewayip")
+
+config GATEWAYIP
+	string "Value of the default 'gateway' value in the environment"
+	depends on USE_GATEWAYIP
+
+config USE_IPADDR
+	bool "Set a default 'ipaddr' value in the environment"
+	help
+	  Define a default value for the IP address to use for the default
+	  Ethernet interface, in case this is not determined through e.g.
+	  bootp.  (Environment variable "ipaddr")
+
+config IPADDR
+	string "Value of the default 'ipaddr' value in the environment"
+	depends on USE_IPADDR
+
+config USE_NETMASK
+	bool "Set a default 'netmask' value in the environment"
+	help
+	  Defines a default value for the subnet mask (or routing prefix) which
+	  is used to determine if an IP address belongs to the local subnet or
+	  needs to be forwarded through a router.  (Environment variable "netmask")
+
+config NETMASK
+	string "Value of the default 'netmask' value in the environment"
+	depends on USE_NETMASK
+
+config USE_ROOTPATH
+	bool "Set a default 'rootpath' value in the environment"
+
+config ROOTPATH
+	string "Value of the default 'rootpath' value in the environment"
+	depends on USE_ROOTPATH
+	default "/opt/nfsroot"
+
+config USE_SERVERIP
+	bool "Set a default 'serverip' value in the environment"
+	help
+	  Defines a default value for the IP address of a TFTP server to
+	  contact when using the "tftboot" command.  (Environment variable
+	  "serverip")
+
+config SERVERIP
+	string "Value of the default 'serverip' value in the environment"
+	depends on USE_SERVERIP
+
 config PROT_TCP
 	bool "TCP stack"
 	help
-- 
2.25.1

[PATCH 18/41] arm: samsung: Rename CONFIG_G_DNL_*_NUM variables

[Tom Rini]

Following how g_dnl_bind_fixup is used on other platforms, rename the
unchanging defines used here to be prefixed with EXYNOS rather than
Samsung, and define them here.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/gadget.c    | 14 ++++++++++----
 include/configs/dh_imx6.h        |  4 ----
 include/configs/exynos4-common.h |  6 ------
 include/configs/odroid_xu3.h     |  8 --------
 include/configs/s5p_goni.h       |  7 -------
 include/configs/socfpga_common.h |  4 ----
 6 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
index 6d783e61e0d3..9487f9ec4e0c 100644
--- a/board/samsung/common/gadget.c
+++ b/board/samsung/common/gadget.c
@@ -7,14 +7,20 @@
 #include <common.h>
 #include <linux/usb/ch9.h>
 
+#define EXYNOS_G_DNL_THOR_VENDOR_NUM	0x04E8
+#define EXYNOS_G_DNL_THOR_PRODUCT_NUM	0x685D
+
+#define EXYNOS_G_DNL_UMS_VENDOR_NUM	0x0525
+#define EXYNOS_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	if (!strcmp(name, "usb_dnl_thor")) {
-		put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
+		put_unaligned(EXYNOS_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
+		put_unaligned(EXYNOS_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
-		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
+		put_unaligned(EXYNOS_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
+		put_unaligned(EXYNOS_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
 	} else {
 		put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index f9b3d19480ed..3aed6299ed56 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -38,10 +38,6 @@
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-
-/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 #endif
 
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index bf965e5cedb3..e8c182bc2f39 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -12,12 +12,6 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-/* USB Samsung's IDs */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
-
 /* Common environment variables */
 #define ENV_ITB \
 	"loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 5bbe7aadcb25..bf63a4de0765 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -20,14 +20,6 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
-/* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM	0x685D
-
-/* UMS */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
-
 #define CONFIG_DFU_ALT_SYSTEM               \
 	"uImage fat 0 1;"                   \
 	"zImage fat 0 1;"                   \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 97f5dd0e473a..da83db1f68ab 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -24,13 +24,6 @@
 /* USB Composite download gadget - g_dnl */
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-/* USB Samsung's IDs */
-
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
-
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
 /* partitions definitions */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index bbbdea6664ca..088cd4d4f7f6 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -83,10 +83,6 @@
  */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-
-/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 
 /*
-- 
2.25.1

[PATCH 19/41] env: eeprom: Remove CONFIG_I2C_ENV_EEPROM_BUS support

[Tom Rini]

This functionality is currently unused, and has not been migrated to
using DM_I2C, even. Drop this.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 env/Kconfig  |  7 -------
 env/eeprom.c | 59 +++++++---------------------------------------------
 2 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/env/Kconfig b/env/Kconfig
index c13a5b0d467d..c28d9e89f68b 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -78,13 +78,6 @@ config ENV_IS_IN_EEPROM
 	  still be one byte because the extra address bits are hidden
 	  in the chip address.
 
-	  - CONFIG_I2C_ENV_EEPROM_BUS
-	  if you have an Environment on an EEPROM reached over
-	  I2C muxes, you can define here, how to reach this
-	  EEPROM. For example:
-
-	  #define CONFIG_I2C_ENV_EEPROM_BUS	  1
-
 	  EEPROM which holds the environment, is reached over
 	  a pca9547 i2c mux with address 0x70, channel 3.
 
diff --git a/env/eeprom.c b/env/eeprom.c
index f8556a47213c..7ce7e9972b29 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -15,55 +15,12 @@
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
-#include <i2c.h>
-#endif
 #include <search.h>
 #include <errno.h>
 #include <linux/compiler.h>	/* for BUG_ON */
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
-			   uchar *buffer, unsigned cnt)
-{
-	int rcode;
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
-	int old_bus = i2c_get_bus_num();
-
-	if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS)
-		i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS);
-#endif
-
-	rcode = eeprom_read(dev_addr, offset, buffer, cnt);
-
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
-	i2c_set_bus_num(old_bus);
-#endif
-
-	return rcode;
-}
-
-static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
-			    uchar *buffer, unsigned cnt)
-{
-	int rcode;
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
-	int old_bus = i2c_get_bus_num();
-
-	if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS)
-		i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS);
-#endif
-
-	rcode = eeprom_write(dev_addr, offset, buffer, cnt);
-
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
-	i2c_set_bus_num(old_bus);
-#endif
-
-	return rcode;
-}
-
 static int env_eeprom_load(void)
 {
 	char buf_env[CONFIG_ENV_SIZE];
@@ -82,11 +39,11 @@ static int env_eeprom_load(void)
 
 	for (i = 0; i < 2; i++) {
 		/* read CRC */
-		eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
+		eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR,
 				off_env[i] + offsetof(env_t, crc),
 				(uchar *)&crc[i], sizeof(ulong));
 		/* read FLAGS */
-		eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
+		eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR,
 				off_env[i] + offsetof(env_t, flags),
 				(uchar *)&flags[i], sizeof(uchar));
 
@@ -96,7 +53,7 @@ static int env_eeprom_load(void)
 		while (len > 0) {
 			int n = (len > sizeof(rdbuf)) ? sizeof(rdbuf) : len;
 
-			eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR, off,
+			eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR, off,
 					rdbuf, n);
 
 			crc_tmp = crc32(crc_tmp, rdbuf, n);
@@ -138,7 +95,7 @@ static int env_eeprom_load(void)
 	eeprom_init(-1);	/* prepare for EEPROM read/write */
 
 	/* read old CRC */
-	eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
+	eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR,
 			CONFIG_ENV_OFFSET + offsetof(env_t, crc),
 			(uchar *)&crc, sizeof(ulong));
 
@@ -148,7 +105,7 @@ static int env_eeprom_load(void)
 	while (len > 0) {
 		int n = (len > sizeof(rdbuf)) ? sizeof(rdbuf) : len;
 
-		eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
+		eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR,
 				CONFIG_ENV_OFFSET + off, rdbuf, n);
 		new = crc32(new, rdbuf, n);
 		len -= n;
@@ -168,7 +125,7 @@ static int env_eeprom_load(void)
 		off = CONFIG_ENV_OFFSET_REDUND;
 #endif
 
-	eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
+	eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR,
 		off, (uchar *)buf_env, CONFIG_ENV_SIZE);
 
 	return env_import(buf_env, 1, H_EXTERNAL);
@@ -197,12 +154,12 @@ static int env_eeprom_save(void)
 	env_new.flags = ENV_REDUND_ACTIVE;
 #endif
 
-	rc = eeprom_bus_write(CONFIG_SYS_I2C_EEPROM_ADDR,
+	rc = eeprom_write(CONFIG_SYS_I2C_EEPROM_ADDR,
 			      off, (uchar *)&env_new, CONFIG_ENV_SIZE);
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
 	if (rc == 0) {
-		eeprom_bus_write(CONFIG_SYS_I2C_EEPROM_ADDR,
+		eeprom_write(CONFIG_SYS_I2C_EEPROM_ADDR,
 				 off_red + offsetof(env_t, flags),
 				 (uchar *)&flag_obsolete, 1);
 
-- 
2.25.1

[PATCH 20/41] i2c: Remove CONFIG_I2C_MULTI_BUS

[Tom Rini]

This functionality is part of the legacy I2C subsystem and is currently
unused anywhere.  Remove the remaining references.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                               | 10 +--------
 cmd/i2c.c                            | 15 +++++--------
 drivers/i2c/mv_i2c.c                 | 33 ----------------------------
 include/configs/display5.h           |  3 ---
 include/configs/km/pg-wcom-ls102xa.h |  1 -
 include/configs/novena.h             |  3 ---
 6 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/README b/README
index c0f55b2586cf..120963317608 100644
--- a/README
+++ b/README
@@ -984,21 +984,13 @@ The following options need to be configured:
 		CFG_SYS_I2C_NOPROBES
 
 		This option specifies a list of I2C devices that will be skipped
-		when the 'i2c probe' command is issued.	 If CONFIG_I2C_MULTI_BUS
-		is set, specify a list of bus-device pairs.  Otherwise, specify
-		a 1D array of device addresses
+		when the 'i2c probe' command is issued.
 
 		e.g.
-			#undef	CONFIG_I2C_MULTI_BUS
 			#define CFG_SYS_I2C_NOPROBES {0x50,0x68}
 
 		will skip addresses 0x50 and 0x68 on a board with one I2C bus
 
-			#define CONFIG_I2C_MULTI_BUS
-			#define CFG_SYS_I2C_NOPROBES	{{0,0x50},{0,0x68},{1,0x54}}
-
-		will skip addresses 0x50 and 0x68 on bus 0 and address 0x54 on bus 1
-
 		CFG_SYS_RTC_BUS_NUM
 
 		If defined, then this indicates the I2C bus number for the RTC.
diff --git a/cmd/i2c.c b/cmd/i2c.c
index da8b4c255555..f204061cf09f 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -98,7 +98,7 @@ static uint	i2c_mm_last_alen;
  * pairs.  The following macros take care of this */
 
 #if defined(CFG_SYS_I2C_NOPROBES)
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
 static struct
 {
 	uchar	bus;
@@ -1764,8 +1764,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
  * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
  * on error.
  */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) || \
-		CONFIG_IS_ENABLED(DM_I2C)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || CONFIG_IS_ENABLED(DM_I2C)
 static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
 			  char *const argv[])
 {
@@ -1915,10 +1914,9 @@ static struct cmd_tbl cmd_i2c_sub[] = {
 	U_BOOT_CMD_MKENT(bus, 1, 1, do_i2c_show_bus, "", ""),
 #endif
 	U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""),
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \
-	defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || CONFIG_IS_ENABLED(DM_I2C)
 	U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""),
-#endif  /* CONFIG_I2C_MULTI_BUS */
+#endif
 #if defined(CONFIG_I2C_EDID)
 	U_BOOT_CMD_MKENT(edid, 1, 1, do_edid, "", ""),
 #endif  /* CONFIG_I2C_EDID */
@@ -1992,10 +1990,9 @@ static char i2c_help_text[] =
 	"i2c " /* That's the prefix for the crc32 command below. */
 #endif
 	"crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \
-	defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || CONFIG_IS_ENABLED(DM_I2C)
 	"i2c dev [dev] - show or set current I2C bus\n"
-#endif  /* CONFIG_I2C_MULTI_BUS */
+#endif
 #if defined(CONFIG_I2C_EDID)
 	"i2c edid chip - print EDID configuration information\n"
 #endif  /* CONFIG_I2C_EDID */
diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c
index 8ee17f0a4501..5bc9cd7b295a 100644
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@@ -374,45 +374,12 @@ static int __i2c_write(struct mv_i2c *base, uchar chip, u8 *addr, int alen,
 
 static struct mv_i2c *base_glob;
 
-#ifdef CONFIG_I2C_MULTI_BUS
-static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
-static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
-static unsigned int current_bus;
-
-int i2c_set_bus_num(unsigned int bus)
-{
-	if ((bus < 0) || (bus >= CONFIG_MV_I2C_NUM)) {
-		printf("Bad bus: %d\n", bus);
-		return -1;
-	}
-
-	base_glob = (struct mv_i2c *)i2c_regs[bus];
-	current_bus = bus;
-
-	if (!bus_initialized[current_bus]) {
-		bus_initialized[current_bus] = 1;
-	}
-
-	return 0;
-}
-
-unsigned int i2c_get_bus_num(void)
-{
-	return current_bus;
-}
-#endif
-
 /* API Functions */
 void i2c_init(int speed, int slaveaddr)
 {
 	u32 val;
 
-#ifdef CONFIG_I2C_MULTI_BUS
-	current_bus = 0;
-	base_glob = (struct mv_i2c *)i2c_regs[current_bus];
-#else
 	base_glob = (struct mv_i2c *)CONFIG_MV_I2C_REG;
-#endif
 
 	if (speed > I2C_SPEED_STANDARD_RATE)
 		val = ICR_FM;
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 7636d2869a9f..5cbeb9224c36 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -36,9 +36,6 @@
 
 #define CONFIG_MXC_UART_BASE		UART5_BASE
 
-/* I2C Configs */
-#define CONFIG_I2C_MULTI_BUS
-
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index a8dc41df0088..45997c75128c 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -152,7 +152,6 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
 #define CFG_SYS_I2C_MAX_HOPS		1
 #define CFG_SYS_NUM_I2C_BUSES	3
 #define I2C_MUX_PCA_ADDR		0x70
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 6e4bdce1c08d..79e49c74f856 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -33,9 +33,6 @@
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
-/* I2C */
-#define CONFIG_I2C_MULTI_BUS
-
 /* I2C EEPROM */
 
 /* MMC Configs */
-- 
2.25.1

[PATCH 21/41] global: Remove unused CONFIG symbols

[Tom Rini]

This removes the following unreferenced CONFIG symbols:
   CONFIG_FDTADDR
   CONFIG_FDTFILE
   CONFIG_FLASH_SECTOR_SIZE
   CONFIG_FSL_CPLD
   CONFIG_HDMI_ENCODER_I2C_ADDR
   CONFIG_I2C_MVTWSI
   CONFIG_I2C_RTC_ADDR
   CONFIG_IRAM_END
   CONFIG_IRAM_SIZE
   CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
   CONFIG_L1_INIT_RAM
   CONFIG_MACB_SEARCH_PHY
   CONFIG_MIU_2BIT_21_7_INTERLEAVED
   CONFIG_MTD_NAND_VERIFY_WRITE
   CONFIG_MVGBE_PORTS
   CONFIG_NETDEV
   CONFIG_NUM_DSP_CPUS
   CONFIG_PHY_BASE_ADR
   CONFIG_PHY_INTERFACE_MODE
   CONFIG_PSRAM_SCFG
   CONFIG_RAMBOOT_SPIFLASH
   CONFIG_RAMBOOT_TEXT_BASE
   CONFIG_RD_LVL
   CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
   CONFIG_SETUP_INITRD_TAG
   CONFIG_SH_QSPI_BASE
   CONFIG_SMDK5420
   CONFIG_SOCRATES
   CONFIG_SPI_ADDR
   CONFIG_SPI_FLASH_QUAD
   CONFIG_SPI_FLASH_SIZE
   CONFIG_SPI_HALF_DUPLEX
   CONFIG_SPI_N25Q256A_RESET
   CONFIG_TEGRA_SLINK_CTRLS
   CONFIG_TPM_TIS_BASE_ADDRESS
   CONFIG_UBOOT_SECTOR_COUNT
   CONFIG_UBOOT_SECTOR_START
   CONFIG_VAR_SIZE_SPL
   CONFIG_VERY_BIG_RAM

And also:
   BL1_SIZE
   PHY_NO
   RESERVE_BLOCK_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                     | 11 -----------
 arch/arm/include/asm/arch-ls102xa/config.h |  1 -
 arch/arm/mach-mvebu/include/mach/config.h  |  9 ---------
 arch/powerpc/include/asm/config_mpc85xx.h  |  1 -
 arch/xtensa/include/asm/config.h           |  1 -
 board/Marvell/openrd/openrd.c              |  2 +-
 drivers/net/mvgbe.c                        |  4 ----
 drivers/net/mvgbe.h                        |  7 -------
 drivers/ram/mpc83xx_sdram.c                |  7 +------
 include/configs/MPC837XERDB.h              |  8 +++-----
 include/configs/P1010RDB.h                 |  1 -
 include/configs/P2041RDB.h                 |  9 ++-------
 include/configs/SBx81LIFKW.h               |  9 ---------
 include/configs/SBx81LIFXCAT.h             |  9 ---------
 include/configs/T102xRDB.h                 |  2 --
 include/configs/T104xRDB.h                 |  4 ----
 include/configs/T208xQDS.h                 |  2 --
 include/configs/T208xRDB.h                 |  2 --
 include/configs/T4240RDB.h                 |  3 ---
 include/configs/alt.h                      |  3 ---
 include/configs/ax25-ae350.h               |  3 ---
 include/configs/beaver.h                   |  4 ----
 include/configs/blanche.h                  |  4 +---
 include/configs/cardhu.h                   |  4 ----
 include/configs/cei-tk1-som.h              |  3 ---
 include/configs/colibri_vf.h               |  4 ----
 include/configs/dalmore.h                  |  3 ---
 include/configs/dns325.h                   |  7 -------
 include/configs/dockstar.h                 |  6 ------
 include/configs/dra7xx_evm.h               |  1 -
 include/configs/dreamplug.h                |  6 ------
 include/configs/ds109.h                    |  8 --------
 include/configs/eb_cpu5282.h               |  8 --------
 include/configs/efi-x86_app.h              |  2 --
 include/configs/embestmx6boards.h          |  6 +++---
 include/configs/ethernut5.h                |  1 -
 include/configs/exynos5-common.h           |  2 --
 include/configs/exynos5420-common.h        |  2 --
 include/configs/exynos7420-common.h        |  4 ----
 include/configs/goflexhome.h               |  6 ------
 include/configs/guruplug.h                 |  8 --------
 include/configs/ib62x0.h                   |  8 --------
 include/configs/iconnect.h                 | 10 ----------
 include/configs/jetson-tk1.h               |  5 -----
 include/configs/k2e_evm.h                  |  1 -
 include/configs/k2g_evm.h                  |  1 -
 include/configs/k2l_evm.h                  |  1 -
 include/configs/kmcent2.h                  |  1 -
 include/configs/kontron_sl28.h             |  1 -
 include/configs/lacie_kw.h                 |  7 -------
 include/configs/legoev3.h                  |  1 -
 include/configs/ls1028a_common.h           |  1 -
 include/configs/ls1043a_common.h           |  1 -
 include/configs/ls1043aqds.h               |  1 -
 include/configs/ls1043ardb.h               |  1 -
 include/configs/ls1046a_common.h           |  1 -
 include/configs/ls1046afrwy.h              |  1 -
 include/configs/ls1046aqds.h               |  1 -
 include/configs/ls1046ardb.h               |  1 -
 include/configs/ls1088a_common.h           |  1 -
 include/configs/ls1088aqds.h               |  1 -
 include/configs/ls1088ardb.h               |  1 -
 include/configs/ls2080a_common.h           |  1 -
 include/configs/ls2080aqds.h               |  1 -
 include/configs/ls2080ardb.h               |  1 -
 include/configs/lx2160a_common.h           |  1 -
 include/configs/malta.h                    |  2 --
 include/configs/mt7621.h                   |  1 -
 include/configs/mt7629.h                   |  5 +----
 include/configs/mxs.h                      |  5 -----
 include/configs/nas220.h                   | 12 ------------
 include/configs/nsa310s.h                  |  4 ----
 include/configs/nyan-big.h                 |  3 ---
 include/configs/openrd.h                   | 22 ----------------------
 include/configs/origen.h                   |  6 ------
 include/configs/p2371-0000.h               |  3 ---
 include/configs/p2371-2180.h               |  3 ---
 include/configs/p2571.h                    |  3 ---
 include/configs/p3450-0000.h               |  3 ---
 include/configs/pm9263.h                   |  5 -----
 include/configs/pogo_e02.h                 |  6 ------
 include/configs/pogo_v4.h                  |  6 ------
 include/configs/porter.h                   |  3 ---
 include/configs/qemu-ppce500.h             |  1 -
 include/configs/rcar-gen3-common.h         |  1 -
 include/configs/rk3399_common.h            | 10 ----------
 include/configs/sheevaplug.h               |  6 ------
 include/configs/silk.h                     |  3 ---
 include/configs/smdk5420.h                 |  2 --
 include/configs/smdkv310.h                 |  3 ---
 include/configs/socfpga_sr1500.h           |  6 ------
 include/configs/socrates.h                 |  4 ----
 include/configs/stout.h                    |  3 ---
 include/configs/synquacer.h                |  1 -
 include/configs/tec-ng.h                   |  6 ------
 include/configs/venice2.h                  |  3 ---
 include/configs/vinco.h                    |  3 ---
 include/configs/x86-common.h               | 16 ----------------
 include/configs/xpress.h                   |  7 ++-----
 99 files changed, 14 insertions(+), 391 deletions(-)

diff --git a/README b/README
index 120963317608..9e2627863ce5 100644
--- a/README
+++ b/README
@@ -373,12 +373,6 @@ The following options need to be configured:
 		such as ARM architectural timer initialization.
 
 - Linux Kernel Interface:
-		CONFIG_MEMSIZE_IN_BYTES		[relevant for MIPS only]
-
-		When transferring memsize parameter to Linux, some versions
-		expect it to be in bytes, others in MB.
-		Define CONFIG_MEMSIZE_IN_BYTES to make it in bytes.
-
 		CONFIG_OF_LIBFDT
 
 		New kernel versions are expecting firmware settings to be
@@ -585,11 +579,6 @@ The following options need to be configured:
 		Support for generic parallel port TPM devices. Only one device
 		per system is supported at this time.
 
-			CONFIG_TPM_TIS_BASE_ADDRESS
-			Base address where the generic TPM device is mapped
-			to. Contemporary x86 systems usually map it at
-			0xfed40000.
-
 		CONFIG_TPM
 		Define this to enable the TPM support library which provides
 		functional interfaces to some TPM commands.
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 14f86df5ed5a..4a4d64244148 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -70,7 +70,6 @@
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #ifdef CONFIG_DDR_SPD
-#define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
 #endif
 
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 2e06f2bdaee3..96a08104ff46 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -30,13 +30,4 @@
 /* Needed for SPI NOR booting in SPL */
 #define CONFIG_DM_SEQ_ALIAS		1
 
-/*
- * I2C related stuff
- */
-#ifdef CONFIG_CMD_I2C
-#ifndef CONFIG_SYS_I2C_SOFT
-#define CONFIG_I2C_MVTWSI
-#endif
-#endif
-
 #endif /* __MVEBU_CONFIG_H */
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index edaf8baaaebe..e80599106066 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -133,7 +133,6 @@
 #define CFG_SYS_FM_MURAM_SIZE	0x60000
 
 #ifdef CONFIG_ARCH_B4860
-#define CONFIG_NUM_DSP_CPUS		6
 #define CFG_SYS_FSL_CLUSTER_CLOCKS	{ 1, 4, 4, 4 }
 #define CFG_SYS_NUM_FM1_DTSEC	6
 #define CFG_SYS_NUM_FM1_10GEC	2
diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h
index a1096ab1961b..21b334b93896 100644
--- a/arch/xtensa/include/asm/config.h
+++ b/arch/xtensa/include/asm/config.h
@@ -14,7 +14,6 @@
  * restricting used physical memory to the first 128MB.
  */
 #if XCHAL_HAVE_PTP_MMU
-#define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED (128 << 20)
 #endif
 
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index f44ac3315ebc..581e2e084d6f 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -140,7 +140,7 @@ void mv_phy_init(char *name)
 	/* reset the phy */
 	miiphy_reset(name, devadr);
 
-	printf(PHY_NO" Initialized on %s\n", name);
+	printf("Initialized on %s\n", name);
 }
 
 void reset_phy(void)
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 58363fce0570..3587ca2124e3 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -37,10 +37,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_MVGBE_PORTS
-# define CONFIG_MVGBE_PORTS {0, 0}
-#endif
-
 #define MV_PHY_ADR_REQUEST 0xee
 #define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)
 #define MVGBE_PGADR_REG	22
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index e3f5ac06399d..6514ab67bab9 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -11,13 +11,6 @@
 #ifndef __MVGBE_H__
 #define __MVGBE_H__
 
-/* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
-#else
-#define PHY_BASE_ADR		0x08	/* default phy base addr */
-#endif
-
 /* Constants */
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c
index a53ff93a6b06..11676d4fae7e 100644
--- a/drivers/ram/mpc83xx_sdram.c
+++ b/drivers/ram/mpc83xx_sdram.c
@@ -118,12 +118,7 @@ int dram_init(void)
 
 phys_size_t get_effective_memsize(void)
 {
-	if (!IS_ENABLED(CONFIG_VERY_BIG_RAM))
-		return gd->ram_size;
-
-	/* Limit stack to what we can reasonable map */
-	return ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : gd->ram_size);
+	return gd->ram_size;
 }
 
 /**
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 7dff3cc69136..7b932eb38901 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -195,12 +195,10 @@
  * Environment Configuration
  */
 
-#define CONFIG_NETDEV		"eth1"
-
-#define CONFIG_FDTFILE		"mpc8379_rdb.dtb"
+#define FDTFILE			"mpc8379_rdb.dtb"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"netdev=" CONFIG_NETDEV "\0"				\
+	"netdev=eth1\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
 		"protect off " __stringify(CONFIG_TEXT_BASE)	\
@@ -214,7 +212,7 @@
 		"cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE)	\
 			" $filesize\0"	\
 	"fdtaddr=780000\0"						\
-	"fdtfile=" CONFIG_FDTFILE "\0"					\
+	"fdtfile=" FDTFILE "\0"					\
 	"ramdiskaddr=1000000\0"						\
 	"ramdiskfile=rootfs.ext2.gz.uboot\0"				\
 	"console=ttyS0\0"						\
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index d83563d6181d..02d49c3d3407 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -24,7 +24,6 @@
 
 #ifdef CONFIG_SPIFLASH
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_RAMBOOT_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(512 << 10)
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 0f0cdb3a6815..1a157a7da05d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -12,7 +12,6 @@
 #define __CONFIG_H
 
 #ifdef CONFIG_RAMBOOT_PBL
-#define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 
@@ -46,10 +45,9 @@
 /*
  *  Config the L3 Cache as L3 SRAM
  */
-#define CFG_SYS_INIT_L3_ADDR		CONFIG_RAMBOOT_TEXT_BASE
+#define CFG_SYS_INIT_L3_ADDR		CONFIG_TEXT_BASE
 #ifdef CONFIG_PHYS_64BIT
-#define CFG_SYS_INIT_L3_ADDR_PHYS	(0xf00000000ull | \
-		CONFIG_RAMBOOT_TEXT_BASE)
+#define CFG_SYS_INIT_L3_ADDR_PHYS	(0xf00000000ull | CONFIG_TEXT_BASE)
 #else
 #define CFG_SYS_INIT_L3_ADDR_PHYS	CFG_SYS_INIT_L3_ADDR
 #endif
@@ -62,7 +60,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
@@ -88,7 +85,6 @@
 #define CFG_SYS_FLASH_BASE_PHYS	CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_FSL_CPLD
 #define CPLD_BASE		0xffdf0000	/* CPLD registers */
 #ifdef CONFIG_PHYS_64BIT
 #define CPLD_BASE_PHYS		0xfffdf0000ull
@@ -131,7 +127,6 @@
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xffd00000	/* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index bad34d9771ec..eb302348800b 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -37,14 +37,5 @@
 /* size in bytes reserved for initial data */
 
 #include <asm/arch/config.h>
-/* There is no PHY directly connected so don't ask it for link status */
-
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable a single port */
-#define CONFIG_PHY_BASE_ADR	0x01
-#endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_SBX81LIFKW_H */
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 9a9663b34ba8..8c5e81aebd9b 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -42,14 +42,5 @@
 /* size in bytes reserved for initial data */
 
 #include <asm/arch/config.h>
-/* There is no PHY directly connected so don't ask it for link status */
-
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable a single port */
-#define CONFIG_PHY_BASE_ADR	0x01
-#endif /* CONFIG_CMD_NET */
 
 #endif /* _CONFIG_SBX81LIFXCAT_H */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index e815d9f81a1e..4b443c750425 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -112,7 +112,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 #if defined(CONFIG_TARGET_T1024RDB)
@@ -269,7 +268,6 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #ifdef CONFIG_PHYS_64BIT
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 6fe0bd682801..dfad76e16f11 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -86,7 +86,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
@@ -247,7 +246,6 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
@@ -285,8 +283,6 @@
  */
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
-/*DVI encoder*/
-#define CONFIG_HDMI_ENCODER_I2C_ADDR  0x75
 #endif
 
 /*
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 79b3d7af4eac..24c1daf9985f 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -78,7 +78,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE	2048	/* for fixed parameter use */
@@ -245,7 +244,6 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 2a32fe37aa92..c825e7fa0c65 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -78,7 +78,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 #define CFG_SYS_SDRAM_SIZE	2048	/* for fixed parameter use */
@@ -210,7 +209,6 @@
 #endif
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000 /* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index d8c4de5b3d73..95735f3fcb1e 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -16,7 +16,6 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
-#define CONFIG_RAMBOOT_TEXT_BASE        CONFIG_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
 #define RESET_VECTOR_OFFSET		0x27FFC
@@ -60,7 +59,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
@@ -71,7 +69,6 @@
 #define CFG_SYS_FLASH_BASE_PHYS	(0xf00000000ull | CFG_SYS_FLASH_BASE)
 
 /* define to use L1 as initial stack */
-#define CONFIG_L1_INIT_RAM
 #define CFG_SYS_INIT_RAM_ADDR	0xfdd00000	/* Initial L1 address */
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH	0xf
 #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW	0xfe03c000
diff --git a/include/configs/alt.h b/include/configs/alt.h
index fe303fda78a0..f27740016927 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -20,9 +20,6 @@
 #define RCAR_GEN2_SDRAM_SIZE		(1024u * 1024 * 1024)
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
-/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
-
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index 03e04e6e6805..d70f0382300f 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -49,9 +49,6 @@
 */
 #define CFG_SYS_FLASH_BANKS_SIZES {0x4000000}
 
-/* max number of sectors on one chip */
-#define CONFIG_FLASH_SECTOR_SIZE	(0x10000*2)
-
 /* environments */
 
 /* SPI FLASH */
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6b5f650811b8..7078c2745c8e 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -20,10 +20,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index fe09997e1784..d4e0f677e67b 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -22,9 +22,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* FLASH */
-#if !defined(CONFIG_MTD_NOR_FLASH)
-#define CONFIG_SH_QSPI_BASE	0xE6B10000
-#else
+#if defined(CONFIG_MTD_NOR_FLASH)
 #define CFG_SYS_FLASH_BASE		0x00000000
 #define CFG_SYS_FLASH_SIZE		0x04000000	/* 64 MB */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 35c5a4f12261..5cca1e18348d 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -24,10 +24,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 55e2d744c4a0..e3519ed75169 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -22,9 +22,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 8a790400b46d..e8918df69e05 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -14,10 +14,6 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-/* NAND support */
-
-#define CONFIG_FDTADDR			0x84000000
-
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"fdt_addr_r=0x82000000\0" \
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 24cf554649ba..82b2efdfe897 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -19,9 +19,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 015bc78648f3..1bfb741346a7 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -16,13 +16,6 @@
 
 /* Remove or override few declarations from mv-common.h */
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
-#endif
-
 /*
  * Enable GPI0 support
  */
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 33ae7d654b0b..a6c1e9c6d029 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -28,10 +28,4 @@
 	"initrd=/boot/uInitrd\0" \
 	"bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
-
 #endif /* _CONFIG_DOCKSTAR_H */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index b8f518612ee3..f8afcc7826e9 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -13,7 +13,6 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED		0x80000000
 
 #ifndef CONFIG_QSPI_BOOT
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index fbd83d629c02..98322a54f631 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -24,10 +24,4 @@
 	"x_bootargs=console=ttyS0,115200\0"	\
 	"x_bootargs_root=root=/dev/sda2 rootdelay=10\0"
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-#define CONFIG_PHY_BASE_ADR	0
-
 #endif /* _CONFIG_DREAMPLUG_H */
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 8553ea0b95f2..8e7a86e06262 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -35,12 +35,4 @@
 	"ipaddr=192.168.1.5\0"		\
 	"usb0Mode=host\0"
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable one port */
-#define CONFIG_PHY_BASE_ADR	8
-#endif /* CONFIG_CMD_NET */
-
 #endif /* _CONFIG_DS109_H */
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 717f49ca29d8..029f13dad36f 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -144,13 +144,5 @@
 #define CFG_SYS_DDRUA		0x05
 #define CFG_SYS_PJPAR		0xFF
 
-/*-----------------------------------------------------------------------
- * I2C
- */
-
-#ifdef CONFIG_CMD_DATE
-#define CONFIG_I2C_RTC_ADDR		0x68
-#endif
-
 #endif	/* _CONFIG_M5282EVB_H */
 /*---------------------------------------------------------------------*/
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 6061a6db0a40..17a785140262 100644
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,8 +8,6 @@
 
 #include <configs/x86-common.h>
 
-#undef CONFIG_TPM_TIS_BASE_ADDRESS
-
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=vidconsole\0" \
 					"stderr=vidconsole\0"
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 22e0fa5aabfd..1742b1192fb4 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -35,11 +35,11 @@
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* RiOTboard */
-#define CONFIG_FDTFILE	"imx6dl-riotboard.dtb"
+#define FDTFILE	"imx6dl-riotboard.dtb"
 #define CFG_SYS_FSL_USDHC_NUM	3
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
-#define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
+#define FDTFILE	"imx6q-marsboard.dtb"
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
@@ -79,7 +79,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
-	"fdtfile=" CONFIG_FDTFILE "\0" \
+	"fdtfile=" FDTFILE "\0" \
 	"finduuid=part uuid mmc 0:1 uuid\0" \
 	BOOTENV
 
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 52eb0be67611..3fd58d6bd4a7 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -49,7 +49,6 @@
 
 /* Ethernet */
 #define CONFIG_PHY_ID			0
-#define CONFIG_MACB_SEARCH_PHY
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 9b5c329bda18..8e277ce7ff26 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -27,8 +27,6 @@
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 
-#define CONFIG_RD_LVL
-
 #define PHYS_SDRAM_1		CFG_SYS_SDRAM_BASE
 #define PHYS_SDRAM_1_SIZE	SDRAM_BANK_SIZE
 #define PHYS_SDRAM_2		(CFG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 7a9307ccc3db..934a4ef9d1f1 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_EXYNOS5420_H
 #define __CONFIG_EXYNOS5420_H
 
-#define CONFIG_VAR_SIZE_SPL
-
 #define CONFIG_IRAM_TOP			0x02074000
 
 #define CONFIG_PHY_IRAM_BASE		0x02020000
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index cff910c1bd5b..e22dd036ccb8 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -15,10 +15,6 @@
 
 /* select serial console configuration */
 
-/* IRAM Layout */
-#define CONFIG_IRAM_BASE		0x02100000
-#define CONFIG_IRAM_SIZE		0x58000
-#define CONFIG_IRAM_END			(CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 66eed9e14f81..1c86dcb1f6dd 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -36,10 +36,4 @@
 	"kernel=/boot/uImage\0" \
 	"bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
-
 #endif /* _CONFIG_GOFLEXHOME_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 4954c5ca0800..d196c4eda535 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -30,12 +30,4 @@
 	"fdt=/boot/guruplug-server-plus.dtb\0"				\
 	"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-#define CONFIG_PHY_BASE_ADR	0
-#endif /* CONFIG_CMD_NET */
-
 #endif /* _CONFIG_GURUPLUG_H */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 05192218d225..76fc4ac8b66c 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -24,14 +24,6 @@
 	"fdt=/boot/ib62x0.dtb\0"					\
 	"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
 
-/*
- * Ethernet driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
-#endif /* CONFIG_CMD_NET */
-
 /*
  * SATA driver configuration
  */
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index f2e3608d3a3f..6d2104b3a1cd 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -16,14 +16,4 @@
 	"kernel=/boot/uImage\0"			\
 	"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
 
-/*
- * Ethernet driver configuration
- *
- * This board has PCIe Wifi card, so allow Ethernet to be disabled
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	11
-#endif /* CONFIG_CMD_NET */
-
 #endif /* _CONFIG_ICONNECT_H */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index b846889541c7..ea4964b13d67 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -18,11 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index bbc58be511e4..174a91c83e19 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -39,6 +39,5 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS	9
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2E_EVM_H */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index bb91751d5d90..dc06d5943e5c 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -53,7 +53,6 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS	2
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
 #define SPI_MTD_PARTS	KEYSTONE_SPI1_MTD_PARTS
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index a18158a7eb33..5d629452bae4 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -39,6 +39,5 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS	5
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2L_EVM_H */
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 366272d49e86..580d3a0faf01 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -160,7 +160,6 @@
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 9c3174d0e02c..f7bb97aa0e6c 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -18,7 +18,6 @@
 /* DDR */
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 828f91096344..7a66df548a3b 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -14,13 +14,6 @@
  * Enable platform initialisation via misc_init_r() function
  */
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
-#endif
-
 /*
  * Enable GPI0 support
  */
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index abe470fe890b..794c1fcbed06 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -48,7 +48,6 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_SETUP_INITRD_TAG
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
 	"fdtfile=da850-lego-ev3.dtb\0" \
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index b190bfe9c8e0..2ccb20192d4f 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -12,7 +12,6 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e54e903a8a94..d0380b33732d 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -31,7 +31,6 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index dab57382eddf..1dca7f0aa6b9 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -107,7 +107,6 @@
 #define CFG_SYS_NAND_FTIM3           0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 #endif
 
 #ifdef CONFIG_NAND_BOOT
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 12c4853ea963..043904197f01 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -82,7 +82,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 #ifdef CONFIG_NAND_BOOT
 #define CFG_SYS_NAND_U_BOOT_SIZE	(1024 << 10)
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 4ed5481c3e74..250891e9e301 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -31,7 +31,6 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h
index 1759d25f3a39..5e03a962d10e 100644
--- a/include/configs/ls1046afrwy.h
+++ b/include/configs/ls1046afrwy.h
@@ -45,7 +45,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 /* IFC Timing Params */
 #define CFG_SYS_CSPR0_EXT		CFG_SYS_NAND_CSPR_EXT
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index e9b8ad0c0b7f..c4e5f4928d22 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -123,7 +123,6 @@
 #define CFG_SYS_NAND_FTIM3           0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 #endif
 
 #ifdef CONFIG_NAND_BOOT
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index f3904e7b3f7b..ad766b034b16 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -50,7 +50,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 /*
  * CPLD
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 57429d4bbe32..bcba8d81c04c 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -29,7 +29,6 @@
 /* Link Definitions */
 #define CFG_SYS_FSL_QSPI_BASE	0x20000000
 
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index dc9cded49fdf..49ad14692623 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -97,7 +97,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_LBMAP_SWITCH		6
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index e2444cd8eb4b..9033f6e937c2 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -81,7 +81,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define QIXIS_BRDCFG4_OFFSET            0x54
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index e82456fd8148..bd78bdb793a6 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -16,7 +16,6 @@
 
 /* Link Definitions */
 
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 4e6d40afbf1c..7d3e8912c3b0 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -98,7 +98,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 #define QIXIS_LBMAP_SWITCH		0x06
 #define QIXIS_LBMAP_MASK		0x0f
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 8f36958f7103..4573906115eb 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -95,7 +95,6 @@
 #define CFG_SYS_NAND_FTIM3		0x0
 
 #define CFG_SYS_NAND_BASE_LIST	{ CFG_SYS_NAND_BASE }
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 
 #define QIXIS_LBMAP_SWITCH		0x06
 #define QIXIS_LBMAP_MASK		0x0f
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index a469c83fa4eb..3347920f03f7 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -13,7 +13,6 @@
 #define CFG_SYS_FLASH_BASE		0x20000000
 
 /* DDR */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE		0x80000000UL
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_DDR_BLOCK2_BASE		0x2080000000ULL
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 65f4b05649b2..8ba04b4e6c31 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -11,8 +11,6 @@
  */
 #define CONFIG_MALTA
 
-#define CONFIG_MEMSIZE_IN_BYTES
-
 /*
  * CPU Configuration
  */
diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h
index 7c8c67f44697..b6e680bcc78e 100644
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -10,7 +10,6 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED		0x1c000000
 
 #define CFG_SYS_INIT_SP_OFFSET	0x800000
diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 99b09ad41e74..f6ab486fa292 100644
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -15,10 +15,7 @@
 
 /* Environment */
 
-/* Defines for SPL */
-
-#define CONFIG_SPI_ADDR			0x30000000
-#define CFG_SYS_UBOOT_BASE		(CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
+#define CFG_SYS_UBOOT_BASE		(0x30000000 + CONFIG_SPL_PAD_TO)
 
 /* SPL -> Uboot */
 
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 30f27e7f0c19..32e0e06617e5 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -86,9 +86,4 @@
 #define CFG_SYS_NAND_BASE		0x60000000
 #endif
 
-/* SPI */
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_SPI_HALF_DUPLEX
-#endif
-
 #endif	/* __CONFIGS_MXS_H__ */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 1b7eb3433483..85691ca94f08 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -39,16 +39,4 @@
 	"bootargs=console=ttyS0,115200\0" \
 	"autostart=no\0"
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR 8
-#endif /* CONFIG_CMD_NET */
-
-/*
- * EFI partition
- */
-
 #endif /* _CONFIG_NAS220_H */
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 62f07011809c..e2ad77072cd5 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -46,8 +46,4 @@
 
 #endif /* CONFIG_SPL_BUILD */
 
-/* Ethernet driver configuration */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	1
-
 #endif /* _CONFIG_NSA310S_H */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index baa452156ecd..21002f99dc88 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -18,9 +18,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 006f06e6af5c..2cec20ca4259 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -33,26 +33,4 @@
 	"x_bootcmd_usb=usb start\0"					\
 	"x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0"
 
-/*
- * Ethernet Driver configuration
- */
-#ifdef CONFIG_CMD_NET
-# ifdef CONFIG_BOARD_IS_OPENRD_BASE
-#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-# else
-#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
-# endif
-# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
-#  define CONFIG_PHY_BASE_ADR	0x0
-#  define PHY_NO		"88E1121"
-# else
-#  define CONFIG_PHY_BASE_ADR	0x8
-#  define PHY_NO		"88E1116"
-# endif
-#endif /* CONFIG_CMD_NET */
-
-/*
- * SATA Driver configuration
- */
-
 #endif /* _CONFIG_OPENRD_BASE_H */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 6633d541a31b..a608df44e80e 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -38,10 +38,4 @@
         "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
                 "source ${loadaddr}\0"
 
-/* MIU (Memory Interleaving Unit) */
-#define CONFIG_MIU_2BIT_21_7_INTERLEAVED
-
-#define RESERVE_BLOCK_SIZE		(512)
-#define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index ecd0405d297b..653b4c583ad2 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -19,9 +19,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* _P2371_0000_H */
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7f942888e74d..2913d5304be7 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -19,9 +19,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* _P2371_2180_H */
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 50cddb4a4acb..e78e3c4d6b09 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -19,9 +19,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* _P2571_H */
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index ec1a8634e718..bab02dc2d6ed 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -23,9 +23,6 @@
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
 
-/* Environment at end of QSPI, in the VER partition */
-#define CONFIG_SPI_FLASH_SIZE		(4 << 20)
-
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"preboot=if test -e mmc 1:1 /u-boot-preboot.scr; then " \
 		"load mmc 1:1 ${scriptaddr} /u-boot-preboot.scr; " \
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 9fd897958a4f..fa08744b6feb 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -159,11 +159,6 @@
 /* PSRAM */
 #define	PHYS_PSRAM			0x70000000
 #define	PHYS_PSRAM_SIZE			0x00400000	/* 4MB */
-/* Slave EBI1, PSRAM connected */
-#define CONFIG_PSRAM_SCFG		(AT91_MATRIX_SCFG_ARBT_FIXED_PRIORITY	| \
-					 AT91_MATRIX_SCFG_FIXED_DEFMSTR(5)	| \
-					 AT91_MATRIX_SCFG_DEFMSTR_TYPE_FIXED	| \
-					 AT91_MATRIX_SCFG_SLOT_CYCLE(255))
 
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 085732214e50..fc9f113dee66 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -23,10 +23,4 @@
 	"bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
 	"ext2load usb 0:1 0x01100000 /uInitrd\0"
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
-
 #endif /* _CONFIG_POGO_E02_H */
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index b5ce2dd13d08..239d33d8e9de 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -69,10 +69,4 @@
 	BOOTENV
 #endif /* CONFIG_SPL_BUILD */
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
-
 #endif /* _CONFIG_POGO_V4_H */
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 88fa65e0ffc1..e0f77f358b95 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -21,9 +21,6 @@
 #define RCAR_GEN2_SDRAM_SIZE		(2048u * 1024 * 1024)
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(1024u * 1024 * 1024)
 
-/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
-
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index d05618995861..20be4af4628f 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -29,7 +29,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 /*
  * DDR Setup
  */
-#define CONFIG_VERY_BIG_RAM
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index e9cbd2538240..86012adfb36f 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -28,7 +28,6 @@
 #define DRAM_RSV_SIZE			0x08000000
 #define CFG_SYS_SDRAM_BASE		(0x40000000 + DRAM_RSV_SIZE)
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
-#define CONFIG_VERY_BIG_RAM
 #define CONFIG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
 /* ENV setting */
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 78f624d31ca2..67e0c20dca29 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -10,16 +10,6 @@
 
 #define CONFIG_IRAM_BASE		0xff8c0000
 
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
-#else
-/*  BSS setup */
-#endif
-
-/* MMC/SD IP block */
-#define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ	200000000
-
-/* RAW SD card / eMMC locations. */
-
 /* FAT sd card locations. */
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xf8000000
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 19701ccce22e..d7923967a721 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -21,10 +21,4 @@
 	"x_bootcmd_usb=usb start\0" \
 	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0
-
 #endif /* _CONFIG_SHEEVAPLUG_H */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 58613effaf47..6d605edf7886 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -21,9 +21,6 @@
 #define RCAR_GEN2_SDRAM_SIZE		(1024u * 1024 * 1024)
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
-/* FLASH */
-#define CONFIG_SPI_FLASH_QUAD
-
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 0392530c0adf..0cb70762d925 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -12,8 +12,6 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_SMDK5420			/* which is in a SMDK5420 */
-
 #define CFG_SYS_SDRAM_BASE	0x20000000
 
 /* DRAM Memory Banks */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 601c16ea4538..38de1fa9849f 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -34,9 +34,6 @@
 
 /* FLASH and environment organization */
 
-#define RESERVE_BLOCK_SIZE		(512)
-#define BL1_SIZE			(16 << 10) /*16 K reserved for BL1*/
-
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_ENV_SROM_BANK		1
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 432144cb40ce..caff0cf25234 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -11,15 +11,9 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB on SR1500 */
 
 /* Ethernet on SoC (EMAC) */
-#define CONFIG_PHY_INTERFACE_MODE	PHY_INTERFACE_MODE_RGMII
 /* The PHY is autodetected, so no MII PHY address is needed here */
 #define PHY_ANEG_TIMEOUT	8000
 
-/* Enable SPI NOR flash reset, needed for SPI booting */
-#define CONFIG_SPI_N25Q256A_RESET
-
-/* Environment setting for SPI flash */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 2a076716023f..11d840223312 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -16,9 +16,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* High Level Configuration Options */
-#define CONFIG_SOCRATES		1
-
 /*
  * Only possible on E500 Version 2 or newer cores.
  */
@@ -55,7 +52,6 @@
 
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
-#define CONFIG_VERY_BIG_RAM
 
 /* I2C addresses of SPD EEPROMs */
 #define SPD_EEPROM_ADDRESS	0x50	/* CTLR 0 DIMM 0 */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index f49e88cb17cb..977c0adc5f02 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -25,9 +25,6 @@
 /* SCIF */
 #define CONFIG_SCIF_A
 
-/* SPI */
-#define CONFIG_SPI_FLASH_QUAD
-
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 699268900109..a2b6a1f57d7c 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -14,7 +14,6 @@
 #define CFG_SYS_SDRAM_BASE		(0x80000000)	/* Start address of DDR3 */
 #define PHYS_SDRAM_SIZE			(0x7c000000)	/* Default size (2GB - Secure memory) */
 
-#define CONFIG_VERY_BIG_RAM				/* SynQuacer supports up to 64GB */
 #define CONFIG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
 
 #define SQ_DRAMINFO_BASE		(0x2e00ffc0)	/* DRAM info from TF-A */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 098796637010..c98322cf0845 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -16,12 +16,6 @@
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
-/* Environment in eMMC, at the end of 2nd "boot sector" */
-
-/* SPI */
-#define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b2dc04a975ad..a4eb4bf4aaf3 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -20,9 +20,6 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-/* SPI */
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 9f72bdde8167..1c1789ac3fb8 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -39,9 +39,6 @@
 
 /* USB device */
 
-/* Ethernet Hardware */
-#define CONFIG_MACB_SEARCH_PHY
-
 #ifdef CONFIG_SPI_BOOT
 /* bootstrap + u-boot + env + linux in serial flash */
 /* Use our own mapping for the VInCo platform */
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 9bf2462010de..d71108dd3186 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -10,22 +10,6 @@
 #ifndef __CONFIG_X86_COMMON_H
 #define __CONFIG_X86_COMMON_H
 
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-
-/* Generic TPM interfaced through LPC bus */
-#define CONFIG_TPM_TIS_BASE_ADDRESS        0xfed40000
-
-/*-----------------------------------------------------------------------
- * Serial Configuration
- */
-
-/*
- * Miscellaneous configurable options
- */
-
 /*-----------------------------------------------------------------------
  * CPU Features
  */
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 3e604894ad48..9f1f2d90dbe1 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -34,9 +34,6 @@
 #define CONFIG_FEC_ENET_DEV		0
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_UBOOT_SECTOR_START	0x2
-#define CONFIG_UBOOT_SECTOR_COUNT	0x3fe
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
@@ -75,8 +72,8 @@
 			"bootz; " \
 		"fi;\0" \
 	"uboot=ccv/u-boot.imx\0"					\
-	"uboot_start="__stringify(CONFIG_UBOOT_SECTOR_START)"\0"	\
-	"uboot_size="__stringify(CONFIG_UBOOT_SECTOR_COUNT)"\0"		\
+	"uboot_start=0x2\0"						\
+	"uboot_size=0x3fe\0"						\
 	"update_uboot=if tftp ${uboot}; then "				\
 		"if itest ${filesize} > 0; then "			\
 			"mmc dev 0 1;"					\
-- 
2.25.1

[PATCH 22/41] Convert CONFIG_KSNET_NETCP_V1_0 et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_KSNET_NETCP_V1_0
   CONFIG_KSNET_NETCP_V1_5

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/k2hk_evm_defconfig    |  1 +
 configs/k2hk_hs_evm_defconfig |  1 +
 drivers/net/ti/Kconfig        | 13 +++++++++++++
 include/configs/k2e_evm.h     |  1 -
 include/configs/k2g_evm.h     |  1 -
 include/configs/k2hk_evm.h    |  1 -
 include/configs/k2l_evm.h     |  1 -
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index b0069fd60b01..2bcf2265c7ea 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -87,6 +87,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y
+CONFIG_KSNET_NETCP_V1_0=y
 CONFIG_PHY=y
 CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig
index 9ca26ae61f51..94ab680343b9 100644
--- a/configs/k2hk_hs_evm_defconfig
+++ b/configs/k2hk_hs_evm_defconfig
@@ -62,6 +62,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y
+CONFIG_KSNET_NETCP_V1_0=y
 CONFIG_PHY=y
 CONFIG_NOP_PHY=y
 CONFIG_KEYSTONE_USB_PHY=y
diff --git a/drivers/net/ti/Kconfig b/drivers/net/ti/Kconfig
index 59c96d862ddc..e13dbc940182 100644
--- a/drivers/net/ti/Kconfig
+++ b/drivers/net/ti/Kconfig
@@ -25,6 +25,19 @@ config DRIVER_TI_KEYSTONE_NET
 	help
 	   This driver supports the TI Keystone 2 Ethernet subsystem
 
+choice
+	prompt "TI Keystone 2 Ethernet NETCP IP revision"
+	depends on DRIVER_TI_KEYSTONE_NET
+	default KSNET_NETCP_V1_5
+
+config KSNET_NETCP_V1_0
+	bool "NETCP version 1.0"
+
+config KSNET_NETCP_V1_5
+	bool "NETCP version 1.5"
+
+endchoice
+
 config TI_AM65_CPSW_NUSS
 	bool "TI K3 AM65x MCU CPSW Nuss Ethernet controller driver"
 	depends on ARCH_K3
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 174a91c83e19..1283f450b32c 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -37,7 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS	9
 
 #endif /* __CONFIG_K2E_EVM_H */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index dc06d5943e5c..fd3708ba81a7 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -51,7 +51,6 @@
 	"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS	2
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 68cbe98b553b..36e3c59d1c58 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -37,7 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_0
 #define CONFIG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2HK_EVM_H */
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 5d629452bae4..cb7b0367810c 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -37,7 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
 #define CONFIG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2L_EVM_H */
-- 
2.25.1

[PATCH 23/41] Convert CONFIG_L2_CACHE to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_L2_CACHE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/Kconfig             | 3 +++
 configs/MPC8548CDS_36BIT_defconfig           | 1 +
 configs/MPC8548CDS_defconfig                 | 1 +
 configs/MPC8548CDS_legacy_defconfig          | 1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig     | 1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig      | 1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig   | 1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1010RDB-PA_NAND_defconfig           | 1 +
 configs/P1010RDB-PA_NOR_defconfig            | 1 +
 configs/P1010RDB-PA_SDCARD_defconfig         | 1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig       | 1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig     | 1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig      | 1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig   | 1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1010RDB-PB_NAND_defconfig           | 1 +
 configs/P1010RDB-PB_NOR_defconfig            | 1 +
 configs/P1010RDB-PB_SDCARD_defconfig         | 1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig     | 1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig   | 1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P1020RDB-PC_36BIT_defconfig          | 1 +
 configs/P1020RDB-PC_NAND_defconfig           | 1 +
 configs/P1020RDB-PC_SDCARD_defconfig         | 1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PC_defconfig                | 1 +
 configs/P1020RDB-PD_NAND_defconfig           | 1 +
 configs/P1020RDB-PD_SDCARD_defconfig         | 1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig       | 1 +
 configs/P1020RDB-PD_defconfig                | 1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig     | 1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig   | 1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 +
 configs/P2020RDB-PC_36BIT_defconfig          | 1 +
 configs/P2020RDB-PC_NAND_defconfig           | 1 +
 configs/P2020RDB-PC_SDCARD_defconfig         | 1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig       | 1 +
 configs/P2020RDB-PC_defconfig                | 1 +
 configs/socrates_defconfig                   | 1 +
 include/configs/MPC8548CDS.h                 | 5 -----
 include/configs/P1010RDB.h                   | 5 -----
 include/configs/p1_p2_rdb_pc.h               | 5 -----
 include/configs/socrates.h                   | 5 -----
 45 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 721dafc5ab16..36519613a2cc 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -1297,6 +1297,9 @@ config SYS_NUM_TLBCAMS
 		Number of TLB CAM entries for Book-E chips. 64 for E500MC,
 		16 for other E500 SoCs.
 
+config L2_CACHE
+	bool "Enable L2 cache support"
+
 if HETROGENOUS_CLUSTERS
 
 config SYS_MAPLE
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 90d5eab00787..f5e2a04647d1 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -13,6 +13,7 @@ CONFIG_SRIO1=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_USE_UBOOTPATH=y
 CONFIG_UBOOTPATH="8548cds/u-boot.bin"
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index b99a8089b02b..3bcab0a91591 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -13,6 +13,7 @@ CONFIG_SRIO1=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_USE_UBOOTPATH=y
 CONFIG_UBOOTPATH="8548cds/u-boot.bin"
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index bc05e3a7957a..4236fa5947f7 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -13,6 +13,7 @@ CONFIG_SRIO1=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_TARGET_MPC8548CDS_LEGACY=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 896da7257d3d..0a7d34a77d29 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index 395319c65d10..b31d4eafb2be 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index 86b73c10df77..5520f5aafda5 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index 2d0cfaa3abfb..c2ba10afba9a 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index 4a743fb79802..1fbae8b195fe 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index 977ac4d59935..85f42eff86c4 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index cac1aba03443..2d2261060fec 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index bc7f68578ea8..21060ff02a11 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PA=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index d941e838fcb6..7cb8a3ff2827 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index 0ee59995166a..d70690e1a60a 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index ef61ab4fdf37..ee5a674897c2 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index fb54a04d8e71..79ac13d10cd1 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 6ca28baad870..38703972c8c1 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_TPL_MAX_SIZE=0x20000
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index cd63855efc9e..b1b301f6513c 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index ebaf3b4aba55..d47f2a4fdee4 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index 0304637ccef7..0b908a78265e 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 CONFIG_TARGET_P1010RDB_PB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index c42a5a898484..d79a7c3be4df 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 2c25ff175d19..100af5bb1962 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index bfeeee5f696f..bee02a1f1cbd 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index 9cfd0b5267a5..53d2ee641584 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index d6ccfd28bca2..95420a13552b 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index b769496384bf..733e452947d5 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index a760f4ba3e3c..c9fd7babf5b7 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index 9cf3a6dbed42..a92fd4b3dccd 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PC=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 642ec54d06dd..c4cede9c673a 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PD=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index 568d208beef6..515b16e93edd 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PD=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 18850657813d..96ed2ace4ee8 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PD=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index 271127b4ed1e..88546386c4e0 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P1020RDB_PD=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index e0680186ecb2..396f628a1651 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index 42b1ea635a07..b7452e23022b 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 396ba9905f87..112bbc3328e1 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index 6eea304dadea..b69738506df2 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index b1653876012a..0d92950c6b6e 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_TPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index f5219eb1bbc5..aa5b5ad2cc36 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 984185df3b3f..02577f552f86 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index 79f3587507d4..d6225a13ebd9 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_P2020RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_USE_UBOOTPATH=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 4cc50d355896..46be662037e7 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -10,6 +10,7 @@ CONFIG_MPC85xx=y
 CONFIG_SYS_INIT_RAM_LOCK=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_SOCRATES=y
+CONFIG_L2_CACHE=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_MONITOR_LEN=393216
 CONFIG_FIT=y
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 1f1eacdb6916..3d0c2192ee14 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -17,11 +17,6 @@
 #include <linux/stringify.h>
 #endif
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
-
 /*
  * Only possible on E500 Version 2 or newer cores.
  */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 02d49c3d3407..c398ece78459 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -95,11 +95,6 @@
 #endif
 #endif
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE			/* toggle L2 cache */
-
 /* DDR Setup */
 #define SPD_EEPROM_ADDRESS		0x52
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index ee25990b034f..c05904a813d0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -109,11 +109,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE
-
 #define CFG_SYS_CCSRBAR		0xffe00000
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
 
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 11d840223312..0547ed02563e 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -34,11 +34,6 @@
  * in the README.mpc85xxads.
  */
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#define CONFIG_L2_CACHE			/* toggle L2 cache		*/
-
 #define CFG_SYS_INIT_DBCR DBCR_IDM		/* Enable Debug Exceptions	*/
 
 #undef	CFG_SYS_DRAM_TEST			/* memory test, takes time	*/
-- 
2.25.1

[PATCH 24/41] malta: Rename CONFIG_MALTA to CONFIG_TARGET_MALTA

[Tom Rini]

Fixup this last remnant of CONFIG_MALTA.

Cc: Paul Burton <paul.burton@mips.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/rtc/mc146818.c  | 2 +-
 include/configs/malta.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 122691b97842..03ce081d5764 100644
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -13,7 +13,7 @@
 #include <dm.h>
 #include <rtc.h>
 
-#if defined(CONFIG_X86) || defined(CONFIG_MALTA)
+#if defined(CONFIG_X86) || defined(CONFIG_TARGET_MALTA)
 #include <asm/io.h>
 #define in8(p) inb(p)
 #define out8(p, v) outb(v, p)
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 8ba04b4e6c31..c17a4a4a8e5e 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -9,7 +9,6 @@
 /*
  * System configuration
  */
-#define CONFIG_MALTA
 
 /*
  * CPU Configuration
-- 
2.25.1

[PATCH 25/41] ddr: fsl: Remove CONFIG_MEM_INIT_VALUE

[Tom Rini]

The way all of the memory init code here works is that we pass
0xDEADBEEF around for the initial value (as it's a well known 'poison'
value and so easily recognized in debuggers, etc). The only point of
this CONFIG symbol was to pass in a different value for that purpose.
Drop this symbol and cleanup the code slightly.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/include/asm/fsl_dma.h |  2 +-
 drivers/ddr/fsl/ctrl_regs.c        | 17 ++---------------
 drivers/ddr/fsl/mpc85xx_ddr_gen1.c |  2 +-
 drivers/dma/fsl_dma.c              |  4 ++--
 include/configs/MPC8548CDS.h       |  2 --
 include/configs/P1010RDB.h         |  2 --
 include/configs/T102xRDB.h         |  3 ---
 include/configs/T104xRDB.h         |  3 ---
 include/configs/T208xQDS.h         |  7 -------
 include/configs/T208xRDB.h         |  7 -------
 include/configs/T4240RDB.h         |  7 -------
 include/configs/kontron_sl28.h     |  3 ---
 include/configs/ls1021aqds.h       |  4 ----
 include/configs/ls1043aqds.h       |  4 ----
 include/configs/ls1043ardb.h       |  6 ------
 include/configs/ls1046aqds.h       |  4 ----
 include/configs/ls1046ardb.h       |  2 --
 include/configs/ls1088aqds.h       |  1 -
 include/configs/ls1088ardb.h       |  1 -
 include/configs/ls2080aqds.h       |  1 -
 include/configs/ls2080ardb.h       |  1 -
 include/configs/lx2160a_common.h   |  1 -
 include/configs/socrates.h         |  3 ---
 23 files changed, 6 insertions(+), 81 deletions(-)

diff --git a/arch/powerpc/include/asm/fsl_dma.h b/arch/powerpc/include/asm/fsl_dma.h
index 727f4a7e92c2..1459db74beea 100644
--- a/arch/powerpc/include/asm/fsl_dma.h
+++ b/arch/powerpc/include/asm/fsl_dma.h
@@ -117,7 +117,7 @@ typedef struct fsl_dma {
 void dma_init(void);
 int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t n);
 #if (defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER))
-void dma_meminit(uint val, uint size);
+void dma_meminit(uint size);
 #endif
 #endif
 
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index df7ec484651a..759921bc5824 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -938,7 +938,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
 #if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
 	/* Use the DDR controller to auto initialize memory. */
 	d_init = popts->ecc_init_using_memctl;
-	ddr->ddr_data_init = CONFIG_MEM_INIT_VALUE;
+	ddr->ddr_data_init = 0xDEADBEEF;
 	debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init);
 #else
 	/* Memory will be initialized via DMA, or not at all. */
@@ -1842,19 +1842,6 @@ static void set_ddr_sdram_mode(const unsigned int ctrl_num,
 }
 #endif
 
-/* DDR SDRAM Data Initialization (DDR_DATA_INIT) */
-static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr)
-{
-	unsigned int init_value;	/* Initialization value */
-
-#ifdef CONFIG_MEM_INIT_VALUE
-	init_value = CONFIG_MEM_INIT_VALUE;
-#else
-	init_value = 0xDEADBEEF;
-#endif
-	ddr->ddr_data_init = init_value;
-}
-
 /*
  * DDR SDRAM Clock Control (DDR_SDRAM_CLK_CNTL)
  * The old controller on the 8540/60 doesn't have this register.
@@ -2537,7 +2524,7 @@ compute_fsl_memctl_config_regs(const unsigned int ctrl_num,
 	set_ddr_sdram_rcw(ctrl_num, ddr, popts, common_dimm);
 
 	set_ddr_sdram_interval(ctrl_num, ddr, popts, common_dimm);
-	set_ddr_data_init(ddr);
+	ddr->ddr_data_init = 0xDEADBEEF;
 	set_ddr_sdram_clk_cntl(ddr, popts);
 	set_ddr_init_addr(ddr);
 	set_ddr_init_ext_addr(ddr);
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index 0f1e99eeb039..16186bdbae72 100644
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -73,7 +73,7 @@ ddr_enable_ecc(unsigned int dram_size)
 	struct ccsr_ddr __iomem *ddr =
 		(struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR);
 
-	dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size);
+	dma_meminit(dram_size);
 
 	/*
 	 * Enable errors for ECC.
diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index cd78e45d888a..700df2236bd1 100644
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -133,7 +133,7 @@ int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t count) {
  */
 #if ((!defined CONFIG_MPC83xx && defined(CONFIG_DDR_ECC) &&	\
 	!defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)))
-void dma_meminit(uint val, uint size)
+void dma_meminit(uint size)
 {
 	uint *p = 0;
 	uint i = 0;
@@ -142,7 +142,7 @@ void dma_meminit(uint val, uint size)
 		if (((uint)p & 0x1f) == 0)
 			ppcDcbz((ulong)p);
 
-		*p = (uint)CONFIG_MEM_INIT_VALUE;
+		*p = (uint)0xDEADBEEF;
 
 		if (((uint)p & 0x1c) == 0x1c)
 			ppcDcbf((ulong)p);
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 3d0c2192ee14..1e3ba6de6e70 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -26,8 +26,6 @@
 
 /* DDR Setup */
 
-#define CONFIG_MEM_INIT_VALUE	0xDeadBeef
-
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000	/* DDR is system memory*/
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index c398ece78459..2267a7a9c8b8 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -98,8 +98,6 @@
 /* DDR Setup */
 #define SPD_EEPROM_ADDRESS		0x52
 
-#define CONFIG_MEM_INIT_VALUE		0xDeadBeef
-
 #ifndef __ASSEMBLY__
 extern unsigned long get_sdram_size(void);
 #endif
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 4b443c750425..4794c5a84d1e 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -94,9 +94,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
-#endif
 
 /*
  *  Config the L3 Cache as L3 SRAM
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index dfad76e16f11..5bdc2105f563 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -64,9 +64,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CFG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
-#endif
 
 /*
  *  Config the L3 Cache as L3 SRAM
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 24c1daf9985f..4b6bdaa3440d 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -59,13 +59,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
-#endif
-
 /*
  * Config the L3 Cache as L3 SRAM
  */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index c825e7fa0c65..fab40f792af7 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -59,13 +59,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
-#endif
-
 /*
  * Config the L3 Cache as L3 SRAM
  */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 95735f3fcb1e..41565f284c6f 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -40,13 +40,6 @@
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
-/*
- * These can be toggled for performance analysis, otherwise use default.
- */
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
-#endif
-
 /*
  *  Config the L3 Cache as L3 SRAM
  */
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index f7bb97aa0e6c..a073a06c8275 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -15,9 +15,6 @@
 #undef CFG_SYS_MEM_RESERVE_SECURE
 #endif
 
-/* DDR */
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
-
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000
 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY	0
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index e49588489c11..fead9edeccdc 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -22,10 +22,6 @@
 #define CFG_SYS_DDR_SDRAM_BASE	0x80000000UL
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
-#endif
-
 /*
  * IFC Definitions
  */
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 1dca7f0aa6b9..7ccbb20bf2ea 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -12,10 +12,6 @@
 
 #define SPD_EEPROM_ADDRESS		0x51
 
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
-#endif
-
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define RGMII_PHY1_ADDR		0x1
 #define RGMII_PHY2_ADDR		0x2
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 043904197f01..c8a6f0146aac 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -9,12 +9,6 @@
 
 #include "ls1043a_common.h"
 
-/* Physical Memory Map */
-
-#ifndef CONFIG_SPL
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
-#endif
-
 /*
  * NOR Flash Definitions
  */
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index c4e5f4928d22..4b4bd7cbe486 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -12,10 +12,6 @@
 
 #define SPD_EEPROM_ADDRESS		0x51
 
-#ifdef CONFIG_DDR_ECC
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
-#endif
-
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define RGMII_PHY1_ADDR		0x1
 #define RGMII_PHY2_ADDR		0x2
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index ad766b034b16..0e42a51fc599 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -13,8 +13,6 @@
 
 #define SPD_EEPROM_ADDRESS		0x51
 
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
-
 #if defined(CONFIG_QSPI_BOOT)
 #define CFG_SYS_UBOOT_BASE		0x40100000
 #endif
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 49ad14692623..3391540c6e36 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -14,7 +14,6 @@
 
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk()/4)
 
-#define CONFIG_MEM_INIT_VALUE           0xdeadbeef
 #define SPD_EEPROM_ADDRESS		0x51
 
 
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 9033f6e937c2..1ddf0687f43c 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -15,7 +15,6 @@
 
 #define COUNTER_FREQUENCY_REAL		25000000	/* 25MHz */
 
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS	0x51
 
 
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 7d3e8912c3b0..4a52fcdfddb4 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -16,7 +16,6 @@
 #define CFG_SYS_I2C_FPGA_ADDR	0x66
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk()/4)
 
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS1	0x51
 #define SPD_EEPROM_ADDRESS2	0x52
 #define SPD_EEPROM_ADDRESS3	0x53
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 4573906115eb..b8ab501c98e4 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -21,7 +21,6 @@
 
 #define COUNTER_FREQUENCY_REAL		(get_board_sys_clk()/4)
 
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS1	0x51
 #define SPD_EEPROM_ADDRESS2	0x52
 #define SPD_EEPROM_ADDRESS3	0x53
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 3347920f03f7..c1a98fd3e4cb 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -18,7 +18,6 @@
 #define CFG_SYS_DDR_BLOCK2_BASE		0x2080000000ULL
 #define CFG_SYS_SDRAM_SIZE			0x200000000UL
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #define SPD_EEPROM_ADDRESS1		0x51
 #define SPD_EEPROM_ADDRESS2		0x52
 #define SPD_EEPROM_ADDRESS3		0x53
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 0547ed02563e..4c752091fb5e 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -42,9 +42,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW	CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-
-#define CONFIG_MEM_INIT_VALUE	0xDeadBeef
-
 #define CFG_SYS_DDR_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_BASE		CFG_SYS_DDR_SDRAM_BASE
 
-- 
2.25.1

[PATCH 26/41] Convert CONFIG_MONITOR_IS_IN_RAM to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_MONITOR_IS_IN_RAM

As part of this, reword some of the documentation slightly to reflect
that this is in Kconfig and not a define now.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/Kconfig                     |  4 ++++
 board/cobra5272/README           | 27 +++++++++------------------
 configs/10m50_defconfig          |  1 +
 configs/3c120_defconfig          |  1 +
 doc/arch/m68k.rst                |  4 ++--
 include/configs/10m50_devboard.h |  1 -
 include/configs/3c120_devboard.h |  1 -
 include/configs/M5249EVB.h       |  2 --
 include/configs/M5272C3.h        |  2 --
 include/configs/M5282EVB.h       |  2 --
 include/configs/astro_mcf5373l.h | 25 -------------------------
 include/configs/cobra5272.h      | 21 ---------------------
 include/configs/eb_cpu5282.h     |  2 --
 13 files changed, 17 insertions(+), 76 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index b074cc6c51eb..026d6b5ad789 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -380,6 +380,10 @@ config SYS_IMMR
 	  Address for the Internal Memory-Mapped Registers (IMMR) window used
 	  to configure the features of many Freescale / NXP SoCs.
 
+config MONITOR_IS_IN_RAM
+	bool "U-Boot is loaded in to RAM by a pre-loader"
+	depends on M68K || NIOS2
+
 config SKIP_LOWLEVEL_INIT
 	bool "Skip the calls to certain low level initialization functions"
 	depends on ARM || MIPS || RISCV
diff --git a/board/cobra5272/README b/board/cobra5272/README
index ac62e557a075..11abcfacdb6e 100644
--- a/board/cobra5272/README
+++ b/board/cobra5272/README
@@ -77,21 +77,16 @@ in dir ./u-boot-x-x-x/
 
 please first check:
 
-	in ./include/configs/cobra5272.h
+	in ./configs/cobra5272_defconfig
 
-		CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
-
-		#if 0
-			#define CONFIG_MONITOR_IS_IN_RAM
-			/* define if monitor is started from a pre-loader */
-		#endif
+		CONFIG_MONITOR_IS_IN_RAM has to be not present in the file
 
 	=> u-boot as single bootloader starting from flash
 
 
-	in board/cobra5272/config.mk CONFIG_TEXT_BASE should be
+	in configs/cobra5272_defconfig CONFIG_TEXT_BASE should be
 
-		CONFIG_TEXT_BASE = 0xffe00000
+		CONFIG_TEXT_BASE=0xffe00000
 
 	=> linking address for u-boot as single bootloader stored in flash
 
@@ -115,22 +110,18 @@ in dir ./u-boot-x-x-x/
 	host> make distclean
 
 please modify the settings:
+	in ./configs/cobra5272_defconfig
 
-	in ./include/configs/cobra5272.h
-
-		CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
+		CONFIG_MONITOR_IS_IN_RAM now has to be enabled, e. g. as follows:
 
-		#if 1
-			#define CONFIG_MONITOR_IS_IN_RAM
-			/*define if monitor is started from a pre-loader */
-		#endif
+		CONFIG_MONITOR_IS_IN_RAM=y
 
 	=> u-boot as RAM version, chainloaded by another bootloader or using bdm cable
 
 
-	in board/cobra5272/config.mk CONFIG_TEXT_BASE should be
+	in configs/cobra5272_defconfig CONFIG_TEXT_BASE should be
 
-		CONFIG_TEXT_BASE = 0x00020000
+		CONFIG_TEXT_BASE=0x00020000
 
 	=> target linking address for RAM
 
diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig
index 28966e0d0a41..7dc9d2ed27be 100644
--- a/configs/10m50_defconfig
+++ b/configs/10m50_defconfig
@@ -1,5 +1,6 @@
 CONFIG_NIOS2=y
 CONFIG_SYS_CONFIG_NAME="10m50_devboard"
+CONFIG_MONITOR_IS_IN_RAM=y
 CONFIG_SYS_MALLOC_LEN=0x20000
 CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_NR_DRAM_BANKS=1
diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig
index 8c421f099be8..46dfaf827ac2 100644
--- a/configs/3c120_defconfig
+++ b/configs/3c120_defconfig
@@ -1,5 +1,6 @@
 CONFIG_NIOS2=y
 CONFIG_SYS_CONFIG_NAME="3c120_devboard"
+CONFIG_MONITOR_IS_IN_RAM=y
 CONFIG_SYS_MALLOC_LEN=0x20000
 CONFIG_SYS_MALLOC_F_LEN=0x400
 CONFIG_NR_DRAM_BANKS=1
diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst
index 770327fea21a..a9180fd7850b 100644
--- a/doc/arch/m68k.rst
+++ b/doc/arch/m68k.rst
@@ -93,10 +93,10 @@ Configuration to use a pre-loader
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If U-Boot should be loaded to RAM and started by a pre-loader
-CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the
+CONFIG_MONITOR_IS_IN_RAM must be enabled. If it is enabled the
 initial vector table and basic processor initialization will not
 be compiled in. The start address of U-Boot must be adjusted in
-the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile
+the boards defconfig file (CONFIG_SYS_MONITOR_BASE) and Makefile
 (CONFIG_TEXT_BASE) to the load address.
 
 ColdFire CPU specific options/settings
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 3a4fbc6eab83..b898ec0cc3e3 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -32,6 +32,5 @@
  */
 #define CFG_SYS_SDRAM_BASE		0xc8000000
 #define CFG_SYS_SDRAM_SIZE		0x08000000
-#define CONFIG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index ab889180eede..e67338c202c9 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -28,6 +28,5 @@
  */
 #define CFG_SYS_SDRAM_BASE		0xD0000000
 #define CFG_SYS_SDRAM_SIZE		0x08000000
-#define CONFIG_MONITOR_IS_IN_RAM
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 0e38eeb4a365..c71130909fca 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -20,8 +20,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM		/* no pre-loader required!!! ;-) */
-
 /*
  * Clock configuration: enable only one of the following options
  */
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index c58d19c810f4..6aae584afda9 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -19,8 +19,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
-
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index e23439fd7820..7cfe7a2da3e3 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -19,8 +19,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef	CONFIG_MONITOR_IS_IN_RAM	/* define if monitor is started from a pre-loader */
-
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 62aa99342a0e..6aef3bd86f74 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -38,16 +38,6 @@
 #error No card type defined!
 #endif
 
-/*
- * CONFIG_RAM defines if u-boot is loaded via BDM (or started from
- * a different bootloader that has already performed RAM setup) or
- * started directly from flash, which is the regular case for production
- * boards.
- */
-#ifdef CONFIG_RAM
-#define CONFIG_MONITOR_IS_IN_RAM
-#endif
-
 /* I2C */
 
 /*
@@ -69,21 +59,6 @@
 #define CFG_SYS_UART_PORT		(2)
 #define CFG_SYS_UART2_ALT3_GPIO
 
-/*
- * Configuration for environment
- * Environment is located in the last sector of the flash
- */
-
-#ifndef CONFIG_MONITOR_IS_IN_RAM
-#else
-/*
- * environment in RAM - This is used to use a single PC-based application
- * to load an image, load U-Boot, load an environment and then start U-Boot
- * to execute the commands from the environment. Feedback is done via setting
- * and reading memory locations.
- */
-#endif
-
 /* here we put our FPGA configuration... */
 
 /* Define user parameters that have to be customized most likely */
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 8c83c3ac06a5..cd50ffe98d0d 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -42,27 +42,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-/* ---
- * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different
- * bootloader residing in flash ('chainloading'); if you want to use
- * chainloading or want to compile a u-boot binary that can be loaded into
- * RAM via BDM set
- *	"#if 0" to "#if 1"
- * You will need a first stage bootloader then, e. g. colilo or a working BDM
- * cable (Background Debug Mode)
- *
- * Setting #if 0: u-boot will start from flash and relocate itself to RAM
- *
- * Please do not forget to modify the setting of CONFIG_TEXT_BASE
- * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000)
- *
- * ---
- */
-
-#if 0
-#define CONFIG_MONITOR_IS_IN_RAM /* monitor is started from a preloader */
-#endif
-
 /* ---
  * Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 029f13dad36f..b267b74b1595 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -14,8 +14,6 @@
 
 #define CFG_SYS_UART_PORT		(0)
 
-#undef	CONFIG_MONITOR_IS_IN_RAM		/* starts uboot direct */
-
 /*----------------------------------------------------------------------*
  * Options								*
  *----------------------------------------------------------------------*/
-- 
2.25.1

[PATCH 27/41] Convert CONFIG_MXC_NAND_HWECC to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_MXC_NAND_HWECC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/m53menlo_defconfig   | 1 +
 drivers/mtd/nand/raw/Kconfig | 4 ++++
 include/configs/m53menlo.h   | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index b70d10433d7d..70df2b5fd243 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -88,6 +88,7 @@ CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_USE_FLASH_BBT=y
 CONFIG_NAND_MXC=y
+CONFIG_MXC_NAND_HWECC=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
 CONFIG_SYS_NAND_PAGE_COUNT=0x40
 CONFIG_SYS_NAND_PAGE_SIZE=0x800
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index 338a3562a4ac..c98230ed35b2 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -479,6 +479,10 @@ config SYS_NAND_SIZE
 	depends on NAND_MXC && SPL_NAND_SUPPORT
 	default 268435456
 
+config MXC_NAND_HWECC
+	bool "Hardware ECC support in MXC NAND"
+	depends on NAND_MXC
+
 config NAND_MXS
 	bool "MXS NAND support"
 	depends on MX23 || MX28 || MX6 || MX7 || IMX8 || IMX8M
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 189b2113f751..d42ad9acb40d 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -48,7 +48,6 @@
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
-#define CONFIG_MXC_NAND_HWECC
 #endif
 
 /*
-- 
2.25.1

[PATCH 28/41] etamin: Rework CONFIG_NAND_CS_INIT

[Tom Rini]

Enable this in the board Kconfig file, but then check for it via
CONFIG_IS_ENABLED so that it will only be true in the non-SPL case, as
is done today.  As part of this we move some defines local to where
they are used as it's board specific.

Cc: Samuel Egli <samuel.egli@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/siemens/common/board.c |  2 +-
 board/siemens/draco/Kconfig  |  2 ++
 board/siemens/draco/board.c  |  9 ++++++++-
 include/configs/etamin.h     | 12 +-----------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 2efede62aa5d..8fa9197a6dfb 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -93,7 +93,7 @@ int board_init(void)
 
 	gpmc_init();
 
-#ifdef CONFIG_NAND_CS_INIT
+#if CONFIG_IS_ENABLED(NAND_CS_INIT)
 	board_nand_cs_init();
 #endif
 
diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig
index a699c7d46f79..1eb8a4886f4c 100644
--- a/board/siemens/draco/Kconfig
+++ b/board/siemens/draco/Kconfig
@@ -60,4 +60,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
         default "etamin"
 
+config NAND_CS_INIT
+	def_bool y
 endif
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index f898bba4b0ee..8874659013fc 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -370,7 +370,14 @@ U_BOOT_CMD(
 #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
 #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
 
-#ifdef CONFIG_NAND_CS_INIT
+#if CONFIG_IS_ENABLED(NAND_CS_INIT)
+#define ETAMIN_NAND_GPMC_CONFIG1	0x00000800
+#define ETAMIN_NAND_GPMC_CONFIG2	0x001e1e00
+#define ETAMIN_NAND_GPMC_CONFIG3	0x001e1e00
+#define ETAMIN_NAND_GPMC_CONFIG4	0x16051807
+#define ETAMIN_NAND_GPMC_CONFIG5	0x00151e1e
+#define ETAMIN_NAND_GPMC_CONFIG6	0x16000f80
+
 /* GPMC definitions for second nand cs1 */
 static const u32 gpmc_nand_config[] = {
 	ETAMIN_NAND_GPMC_CONFIG1,
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 6647148c96f4..811c7cb96188 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -127,16 +127,6 @@
 		"bootm ${kloadaddr} - ${loadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#ifndef CONFIG_SPL_BUILD
-
-#define CONFIG_NAND_CS_INIT
-#define ETAMIN_NAND_GPMC_CONFIG1	0x00000800
-#define ETAMIN_NAND_GPMC_CONFIG2	0x001e1e00
-#define ETAMIN_NAND_GPMC_CONFIG3	0x001e1e00
-#define ETAMIN_NAND_GPMC_CONFIG4	0x16051807
-#define ETAMIN_NAND_GPMC_CONFIG5	0x00151e1e
-#define ETAMIN_NAND_GPMC_CONFIG6	0x16000f80
-
 /* Default env settings */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"hostname=etamin\0" \
@@ -147,5 +137,5 @@
 	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
-#endif	/* CONFIG_SPL_BUILD */
+
 #endif	/* ! __CONFIG_ETAMIN_H */
-- 
2.25.1

[PATCH 29/41] Convert CONFIG_OVERWRITE_ETHADDR_ONCE to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_OVERWRITE_ETHADDR_ONCE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                | 7 -------
 configs/M5253DEMO_defconfig           | 1 +
 configs/M5275EVB_defconfig            | 1 +
 configs/eb_cpu5282_defconfig          | 1 +
 configs/eb_cpu5282_internal_defconfig | 1 +
 env/Kconfig                           | 9 +++++++++
 include/configs/M5253DEMO.h           | 2 --
 include/configs/M5275EVB.h            | 4 ----
 include/configs/eb_cpu5282.h          | 4 ----
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/README b/README
index 9e2627863ce5..3ebee1cb3755 100644
--- a/README
+++ b/README
@@ -1071,13 +1071,6 @@ The following options need to be configured:
 		completely disabled. Anybody can change or delete
 		these parameters.
 
-		Alternatively, if you define _both_ an ethaddr in the
-		default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
-		Ethernet address is installed in the environment,
-		which can be changed exactly ONCE by the user. [The
-		serial# is unaffected by this, i. e. it remains
-		read-only.]
-
 		The same can be accomplished in a more flexible way
 		for any variable by configuring the type of access
 		to allow for those variables in the ".flags" variable
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 4de6290b7d31..ea079972c9bc 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
+CONFIG_OVERWRITE_ETHADDR_ONCE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_HOSTNAME=y
 CONFIG_HOSTNAME="M5253DEMO"
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index 01961e5ae27f..d84d9d98c5ac 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_MII=y
 CONFIG_MII_INIT=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_OVERWRITE_ETHADDR_ONCE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_SYS_RX_ETH_BUFFER=8
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index a831c1c5d2aa..7304b4938725 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -32,6 +32,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
 CONFIG_MII_INIT=y
 CONFIG_CMD_DATE=y
+CONFIG_OVERWRITE_ETHADDR_ONCE=y
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 6a673c918110..5ecdda418aad 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -30,6 +30,7 @@ CONFIG_BOOTP_BOOTFILESIZE=y
 CONFIG_CMD_MII=y
 CONFIG_MII_INIT=y
 CONFIG_CMD_DATE=y
+CONFIG_OVERWRITE_ETHADDR_ONCE=y
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
 CONFIG_SYS_RX_ETH_BUFFER=8
 CONFIG_SYS_I2C_LEGACY=y
diff --git a/env/Kconfig b/env/Kconfig
index c28d9e89f68b..7ca992aa1d40 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -30,6 +30,15 @@ config ENV_OVERWRITE
 	  Use this to permit overriding of certain environmental variables
 	  like Ethernet and Serial
 
+config OVERWRITE_ETHADDR_ONCE
+	bool "Enable overwriting ethaddr environment variables once"
+	depends on !ENV_OVERWRITE
+	help
+	  Enable this to allow for the ethaddr environment variables to be
+	  overwritten one time per boot, only. This allows for a default
+	  to be installed in the environment, which can be changed exactly ONCE
+	  by the user.
+
 config ENV_MIN_ENTRIES
 	int "Minimum number of entries in the environment hashtable"
 	default 64
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 65a7aa04086e..bc156df20d51 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -20,8 +20,6 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
-
 #	define CONFIG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
 		"inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0"	\
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index ff9f85358963..41974cff410d 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -38,10 +38,6 @@
 #define CFG_SYS_I2C_PINMUX_CLR	(0xFFF0)
 #define CFG_SYS_I2C_PINMUX_SET	(0x000F)
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
-#endif				/* FEC_ENET */
-
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index b267b74b1595..26e4ade34ee7 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -42,10 +42,6 @@
  * Network								*
  *----------------------------------------------------------------------*/
 
-#ifdef CONFIG_MCFFEC
-#define CONFIG_OVERWRITE_ETHADDR_ONCE
-#endif
-
 /*-------------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
-- 
2.25.1

[PATCH 30/41] Convert CONFIG_PEN_ADDR_BIG_ENDIAN to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_PEN_ADDR_BIG_ENDIAN

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig                   | 3 +++
 arch/arm/cpu/armv7/ls102xa/Kconfig | 3 +++
 include/configs/ls1021aiot.h       | 1 -
 include/configs/ls1021aqds.h       | 1 -
 include/configs/ls1021atwr.h       | 1 -
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5eb382ea1d70..42576e503a4a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1645,6 +1645,7 @@ config TARGET_LS1021AQDS
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
 	select LS1_DEEP_SLEEP
+	select PEN_ADDR_BIG_ENDIAN
 	select SUPPORT_SPL
 	select SYS_FSL_DDR
 	select FSL_DDR_INTERACTIVE
@@ -1663,6 +1664,7 @@ config TARGET_LS1021ATWR
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
 	select LS1_DEEP_SLEEP
+	select PEN_ADDR_BIG_ENDIAN
 	select SUPPORT_SPL
 	select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
 	select GPIO_EXTRA_HEADER
@@ -1727,6 +1729,7 @@ config TARGET_LS1021AIOT
 	select CPU_V7A
 	select CPU_V7_HAS_NONSEC
 	select CPU_V7_HAS_VIRT
+	select PEN_ADDR_BIG_ENDIAN
 	select SUPPORT_SPL
 	select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI
 	select GPIO_EXTRA_HEADER
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig
index 7e138e0cc5be..a83eb7e8fdd1 100644
--- a/arch/arm/cpu/armv7/ls102xa/Kconfig
+++ b/arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -51,6 +51,9 @@ config MAX_CPUS
 	  cores, count the reserved ports. This will allocate enough memory
 	  in spin table to properly handle all cores.
 
+config PEN_ADDR_BIG_ENDIAN
+	bool
+
 config SYS_CCI400_OFFSET
 	hex "Offset for CCI400 base"
 	depends on SYS_FSL_HAS_CCI400
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 179c5128e3b1..0e3ff3c5b7a4 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -68,7 +68,6 @@
 
 #define FSL_PCIE_COMPAT		"fsl,ls1021a-pcie"
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index fead9edeccdc..76e75335c588 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -242,7 +242,6 @@
  * MMC
  */
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index b07978a999e2..281b26fa2ba0 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -152,7 +152,6 @@
 
 /* GPIO */
 
-#define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
-- 
2.25.1

[PATCH 31/41] arm: ti814x: Remove remaining support code

[Tom Rini]

When the ti814x_evm config was removed most, but not all, of the
relevant support code was remove.  Get rid of what was missed.

Fixes: 50b532686849 ("ti814x: Remove platform")
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-am33xx/clock.h      |   2 +-
 .../include/asm/arch-am33xx/clock_ti81xx.h    |  36 +-
 arch/arm/include/asm/arch-am33xx/hardware.h   |   2 -
 .../include/asm/arch-am33xx/hardware_ti814x.h |  60 ---
 .../include/asm/arch-am33xx/mmc_host_def.h    |   5 +-
 arch/arm/include/asm/arch-am33xx/mux.h        |   2 -
 arch/arm/include/asm/arch-am33xx/mux_ti814x.h | 311 -------------
 arch/arm/include/asm/arch-am33xx/omap.h       |   2 +-
 arch/arm/include/asm/arch-am33xx/spl.h        |  16 +-
 arch/arm/mach-omap2/Kconfig                   |   8 -
 arch/arm/mach-omap2/am33xx/Kconfig            |  10 -
 arch/arm/mach-omap2/am33xx/Makefile           |   1 -
 arch/arm/mach-omap2/am33xx/clock_ti814x.c     | 410 ------------------
 arch/arm/mach-omap2/am33xx/emif4.c            |  20 -
 arch/arm/mach-omap2/boot-common.c             |   2 +-
 drivers/i2c/Kconfig                           |   2 +-
 drivers/net/ti/cpsw.c                         |   4 -
 include/configs/ti814x_evm.h                  | 102 -----
 18 files changed, 12 insertions(+), 983 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
 delete mode 100644 arch/arm/include/asm/arch-am33xx/mux_ti814x.h
 delete mode 100644 arch/arm/mach-omap2/am33xx/clock_ti814x.c
 delete mode 100644 include/configs/ti814x_evm.h

diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h
index 79e3b8c7d9f9..ad25b3e8aa0f 100644
--- a/arch/arm/include/asm/arch-am33xx/clock.h
+++ b/arch/arm/include/asm/arch-am33xx/clock.h
@@ -13,7 +13,7 @@
 #include <asm/arch/clocks_am33xx.h>
 #include <asm/arch/hardware.h>
 
-#if defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
+#if defined(CONFIG_TI816X)
 #include <asm/arch/clock_ti81xx.h>
 #endif
 
diff --git a/arch/arm/include/asm/arch-am33xx/clock_ti81xx.h b/arch/arm/include/asm/arch-am33xx/clock_ti81xx.h
index f0699229a338..d22d95870631 100644
--- a/arch/arm/include/asm/arch-am33xx/clock_ti81xx.h
+++ b/arch/arm/include/asm/arch-am33xx/clock_ti81xx.h
@@ -44,9 +44,7 @@ struct cm_alwon {
 	unsigned int mmu_clkstctrl;
 	unsigned int mmucfg_clkstctrl;
 	unsigned int ocmc0clkstctrl;
-#if defined(CONFIG_TI814X)
-	unsigned int vcpclkstctrl;
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 	unsigned int ocmc1clkstctrl;
 #endif
 	unsigned int mpuclkstctrl;
@@ -67,16 +65,7 @@ struct cm_alwon {
 	unsigned int gpio1clkctrl;
 	unsigned int i2c0clkctrl;
 	unsigned int i2c1clkctrl;
-#if defined(CONFIG_TI814X)
-	unsigned int mcasp345clkctrl;
-	unsigned int atlclkctrl;
-	unsigned int mlbclkctrl;
-	unsigned int pataclkctrl;
-	unsigned int resv1[1];
-	unsigned int uart3clkctrl;
-	unsigned int uart4clkctrl;
-	unsigned int uart5clkctrl;
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 	unsigned int resv1[1];
 	unsigned int timer1clkctrl;
 	unsigned int timer2clkctrl;
@@ -93,16 +82,12 @@ struct cm_alwon {
 	unsigned int mmudataclkctrl;
 	unsigned int resv2[2];
 	unsigned int mmucfgclkctrl;
-#if defined(CONFIG_TI814X)
-	unsigned int resv3[2];
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 	unsigned int resv3[1];
 	unsigned int sdioclkctrl;
 #endif
 	unsigned int ocmc0clkctrl;
-#if defined(CONFIG_TI814X)
-	unsigned int vcpclkctrl;
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 	unsigned int ocmc1clkctrl;
 #endif
 	unsigned int resv4[2];
@@ -112,9 +97,7 @@ struct cm_alwon {
 	unsigned int ethernet0clkctrl;
 	unsigned int ethernet1clkctrl;
 	unsigned int mpuclkctrl;
-#if defined(CONFIG_TI814X)
-	unsigned int debugssclkctrl;
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 	unsigned int resv6[1];
 #endif
 	unsigned int l3clkctrl;
@@ -126,14 +109,7 @@ struct cm_alwon {
 	unsigned int tptc1clkctrl;
 	unsigned int tptc2clkctrl;
 	unsigned int tptc3clkctrl;
-#if defined(CONFIG_TI814X)
-	unsigned int resv6[4];
-	unsigned int dcan01clkctrl;
-	unsigned int mmchs0clkctrl;
-	unsigned int mmchs1clkctrl;
-	unsigned int mmchs2clkctrl;
-	unsigned int custefuseclkctrl;
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 	unsigned int sr0clkctrl;
 	unsigned int sr1clkctrl;
 #endif
diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h
index 0508b8c912ab..2d7f9da3652c 100644
--- a/arch/arm/include/asm/arch-am33xx/hardware.h
+++ b/arch/arm/include/asm/arch-am33xx/hardware.h
@@ -16,8 +16,6 @@
 #include <asm/arch/hardware_am33xx.h>
 #elif defined(CONFIG_TI816X)
 #include <asm/arch/hardware_ti816x.h>
-#elif defined(CONFIG_TI814X)
-#include <asm/arch/hardware_ti814x.h>
 #elif defined(CONFIG_AM43XX)
 #include <asm/arch/hardware_am43xx.h>
 #endif
diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
deleted file mode 100644
index b00d592bc31a..000000000000
--- a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * hardware_ti814x.h
- *
- * TI814x hardware specific header
- *
- * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/
- */
-
-#ifndef __AM33XX_HARDWARE_TI814X_H
-#define __AM33XX_HARDWARE_TI814X_H
-
-/* Module base addresses */
-
-/* UART Base Address */
-#define UART0_BASE			0x48020000
-
-/* Watchdog Timer */
-#define WDT_BASE			0x481C7000
-
-/* Control Module Base Address */
-#define CTRL_BASE			0x48140000
-#define CTRL_DEVICE_BASE		0x48140600
-
-/* PRCM Base Address */
-#define PRCM_BASE			0x48180000
-#define CM_PER				0x44E00000
-#define CM_WKUP				0x44E00400
-
-#define PRM_RSTCTRL			(PRCM_BASE + 0x00A0)
-#define PRM_RSTST			(PRM_RSTCTRL + 8)
-
-/* PLL Subsystem Base Address */
-#define PLL_SUBSYS_BASE			0x481C5000
-
-/* VTP Base address */
-#define VTP0_CTRL_ADDR			0x48140E0C
-#define VTP1_CTRL_ADDR			0x48140E10
-
-/* DDR Base address */
-#define DDR_PHY_CMD_ADDR		0x47C0C400
-#define DDR_PHY_DATA_ADDR		0x47C0C4C8
-#define DDR_PHY_CMD_ADDR2		0x47C0C800
-#define DDR_PHY_DATA_ADDR2		0x47C0C8C8
-#define DDR_DATA_REGS_NR		4
-
-#define DDRPHY_0_CONFIG_BASE		(CTRL_BASE + 0x1400)
-#define DDRPHY_CONFIG_BASE		DDRPHY_0_CONFIG_BASE
-
-/* CPSW Config space */
-#define CPSW_MDIO_BASE			0x4A100800
-
-/* RTC base address */
-#define RTC_BASE			0x480C0000
-
-/* OTG */
-#define USB0_OTG_BASE			0x47401000
-#define USB1_OTG_BASE			0x47401800
-
-#endif /* __AM33XX_HARDWARE_TI814X_H */
diff --git a/arch/arm/include/asm/arch-am33xx/mmc_host_def.h b/arch/arm/include/asm/arch-am33xx/mmc_host_def.h
index 5a2ea8faefdc..ed15d15c5b30 100644
--- a/arch/arm/include/asm/arch-am33xx/mmc_host_def.h
+++ b/arch/arm/include/asm/arch-am33xx/mmc_host_def.h
@@ -24,10 +24,7 @@
 #define OMAP_HSMMC1_BASE		0x48060000
 #define OMAP_HSMMC2_BASE		0x481D8000
 
-#if defined(CONFIG_TI814X)
-#undef MMC_CLOCK_REFERENCE
-#define MMC_CLOCK_REFERENCE	192 /* MHz */
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 #undef MMC_CLOCK_REFERENCE
 #define MMC_CLOCK_REFERENCE	48 /* MHz */
 #endif
diff --git a/arch/arm/include/asm/arch-am33xx/mux.h b/arch/arm/include/asm/arch-am33xx/mux.h
index b16b18473361..7cf973710d15 100644
--- a/arch/arm/include/asm/arch-am33xx/mux.h
+++ b/arch/arm/include/asm/arch-am33xx/mux.h
@@ -20,8 +20,6 @@
 
 #ifdef CONFIG_AM33XX
 #include <asm/arch/mux_am33xx.h>
-#elif defined(CONFIG_TI814X)
-#include <asm/arch/mux_ti814x.h>
 #elif defined(CONFIG_TI816X)
 #include <asm/arch/mux_ti816x.h>
 #elif defined(CONFIG_AM43XX)
diff --git a/arch/arm/include/asm/arch-am33xx/mux_ti814x.h b/arch/arm/include/asm/arch-am33xx/mux_ti814x.h
deleted file mode 100644
index a26e5038f710..000000000000
--- a/arch/arm/include/asm/arch-am33xx/mux_ti814x.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * mux_ti814x.h
- *
- * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef _MUX_TI814X_H_
-#define _MUX_TI814X_H_
-
-/* PAD Control Fields */
-#define PINCNTL_RSV_MSK	(0x3 << 18) /* Reserved bitmask */
-#define PULLUP_EN	(0x1 << 17) /* Pull UP Selection */
-#define PULLUDEN	(0x0 << 16) /* Pull up enabled */
-#define PULLUDDIS	(0x1 << 16) /* Pull up disabled */
-#define MODE(val)	val	/* used for Readability */
-
-#define MUX_CFG(value, offset)				\
-{							\
-	int tmp;					\
-	tmp = __raw_readl(CTRL_BASE + offset);		\
-	tmp &= PINCNTL_RSV_MSK;				\
-	__raw_writel(tmp | value, (CTRL_BASE + offset));\
-}
-
-/*
- * PAD CONTROL OFFSETS
- * Field names corresponds to the pad signal name
- */
-struct pad_signals {
-	int pincntl1;
-	int pincntl2;
-	int pincntl3;
-	int pincntl4;
-	int pincntl5;
-	int pincntl6;
-	int pincntl7;
-	int pincntl8;
-	int pincntl9;
-	int pincntl10;
-	int pincntl11;
-	int pincntl12;
-	int pincntl13;
-	int pincntl14;
-	int pincntl15;
-	int pincntl16;
-	int pincntl17;
-	int pincntl18;
-	int pincntl19;
-	int pincntl20;
-	int pincntl21;
-	int pincntl22;
-	int pincntl23;
-	int pincntl24;
-	int pincntl25;
-	int pincntl26;
-	int pincntl27;
-	int pincntl28;
-	int pincntl29;
-	int pincntl30;
-	int pincntl31;
-	int pincntl32;
-	int pincntl33;
-	int pincntl34;
-	int pincntl35;
-	int pincntl36;
-	int pincntl37;
-	int pincntl38;
-	int pincntl39;
-	int pincntl40;
-	int pincntl41;
-	int pincntl42;
-	int pincntl43;
-	int pincntl44;
-	int pincntl45;
-	int pincntl46;
-	int pincntl47;
-	int pincntl48;
-	int pincntl49;
-	int pincntl50;
-	int pincntl51;
-	int pincntl52;
-	int pincntl53;
-	int pincntl54;
-	int pincntl55;
-	int pincntl56;
-	int pincntl57;
-	int pincntl58;
-	int pincntl59;
-	int pincntl60;
-	int pincntl61;
-	int pincntl62;
-	int pincntl63;
-	int pincntl64;
-	int pincntl65;
-	int pincntl66;
-	int pincntl67;
-	int pincntl68;
-	int pincntl69;
-	int pincntl70;
-	int pincntl71;
-	int pincntl72;
-	int pincntl73;
-	int pincntl74;
-	int pincntl75;
-	int pincntl76;
-	int pincntl77;
-	int pincntl78;
-	int pincntl79;
-	int pincntl80;
-	int pincntl81;
-	int pincntl82;
-	int pincntl83;
-	int pincntl84;
-	int pincntl85;
-	int pincntl86;
-	int pincntl87;
-	int pincntl88;
-	int pincntl89;
-	int pincntl90;
-	int pincntl91;
-	int pincntl92;
-	int pincntl93;
-	int pincntl94;
-	int pincntl95;
-	int pincntl96;
-	int pincntl97;
-	int pincntl98;
-	int pincntl99;
-	int pincntl100;
-	int pincntl101;
-	int pincntl102;
-	int pincntl103;
-	int pincntl104;
-	int pincntl105;
-	int pincntl106;
-	int pincntl107;
-	int pincntl108;
-	int pincntl109;
-	int pincntl110;
-	int pincntl111;
-	int pincntl112;
-	int pincntl113;
-	int pincntl114;
-	int pincntl115;
-	int pincntl116;
-	int pincntl117;
-	int pincntl118;
-	int pincntl119;
-	int pincntl120;
-	int pincntl121;
-	int pincntl122;
-	int pincntl123;
-	int pincntl124;
-	int pincntl125;
-	int pincntl126;
-	int pincntl127;
-	int pincntl128;
-	int pincntl129;
-	int pincntl130;
-	int pincntl131;
-	int pincntl132;
-	int pincntl133;
-	int pincntl134;
-	int pincntl135;
-	int pincntl136;
-	int pincntl137;
-	int pincntl138;
-	int pincntl139;
-	int pincntl140;
-	int pincntl141;
-	int pincntl142;
-	int pincntl143;
-	int pincntl144;
-	int pincntl145;
-	int pincntl146;
-	int pincntl147;
-	int pincntl148;
-	int pincntl149;
-	int pincntl150;
-	int pincntl151;
-	int pincntl152;
-	int pincntl153;
-	int pincntl154;
-	int pincntl155;
-	int pincntl156;
-	int pincntl157;
-	int pincntl158;
-	int pincntl159;
-	int pincntl160;
-	int pincntl161;
-	int pincntl162;
-	int pincntl163;
-	int pincntl164;
-	int pincntl165;
-	int pincntl166;
-	int pincntl167;
-	int pincntl168;
-	int pincntl169;
-	int pincntl170;
-	int pincntl171;
-	int pincntl172;
-	int pincntl173;
-	int pincntl174;
-	int pincntl175;
-	int pincntl176;
-	int pincntl177;
-	int pincntl178;
-	int pincntl179;
-	int pincntl180;
-	int pincntl181;
-	int pincntl182;
-	int pincntl183;
-	int pincntl184;
-	int pincntl185;
-	int pincntl186;
-	int pincntl187;
-	int pincntl188;
-	int pincntl189;
-	int pincntl190;
-	int pincntl191;
-	int pincntl192;
-	int pincntl193;
-	int pincntl194;
-	int pincntl195;
-	int pincntl196;
-	int pincntl197;
-	int pincntl198;
-	int pincntl199;
-	int pincntl200;
-	int pincntl201;
-	int pincntl202;
-	int pincntl203;
-	int pincntl204;
-	int pincntl205;
-	int pincntl206;
-	int pincntl207;
-	int pincntl208;
-	int pincntl209;
-	int pincntl210;
-	int pincntl211;
-	int pincntl212;
-	int pincntl213;
-	int pincntl214;
-	int pincntl215;
-	int pincntl216;
-	int pincntl217;
-	int pincntl218;
-	int pincntl219;
-	int pincntl220;
-	int pincntl221;
-	int pincntl222;
-	int pincntl223;
-	int pincntl224;
-	int pincntl225;
-	int pincntl226;
-	int pincntl227;
-	int pincntl228;
-	int pincntl229;
-	int pincntl230;
-	int pincntl231;
-	int pincntl232;
-	int pincntl233;
-	int pincntl234;
-	int pincntl235;
-	int pincntl236;
-	int pincntl237;
-	int pincntl238;
-	int pincntl239;
-	int pincntl240;
-	int pincntl241;
-	int pincntl242;
-	int pincntl243;
-	int pincntl244;
-	int pincntl245;
-	int pincntl246;
-	int pincntl247;
-	int pincntl248;
-	int pincntl249;
-	int pincntl250;
-	int pincntl251;
-	int pincntl252;
-	int pincntl253;
-	int pincntl254;
-	int pincntl255;
-	int pincntl256;
-	int pincntl257;
-	int pincntl258;
-	int pincntl259;
-	int pincntl260;
-	int pincntl261;
-	int pincntl262;
-	int pincntl263;
-	int pincntl264;
-	int pincntl265;
-	int pincntl266;
-	int pincntl267;
-	int pincntl268;
-	int pincntl269;
-	int pincntl270;
-};
-
-#endif /* endif _MUX_TI814X_H_ */
diff --git a/arch/arm/include/asm/arch-am33xx/omap.h b/arch/arm/include/asm/arch-am33xx/omap.h
index bc9f0a1146a0..4c71dbf3ab60 100644
--- a/arch/arm/include/asm/arch-am33xx/omap.h
+++ b/arch/arm/include/asm/arch-am33xx/omap.h
@@ -20,7 +20,7 @@
 #define NON_SECURE_SRAM_START	0x402F0400
 #define NON_SECURE_SRAM_END	0x40310000
 #define NON_SECURE_SRAM_IMG_END	0x4030B800
-#elif defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
+#elif defined(CONFIG_TI816X)
 #define NON_SECURE_SRAM_START	0x40300000
 #define NON_SECURE_SRAM_END	0x40320000
 #define NON_SECURE_SRAM_IMG_END	0x4031B800
diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h
index f3910c2123a0..6bd3ca0d076a 100644
--- a/arch/arm/include/asm/arch-am33xx/spl.h
+++ b/arch/arm/include/asm/arch-am33xx/spl.h
@@ -9,21 +9,7 @@
 #define BOOT_DEVICE_NONE	0x00
 #define BOOT_DEVICE_MMC2_2	0xFF
 
-#if defined(CONFIG_TI814X)
-#define BOOT_DEVICE_XIP		0x01
-#define BOOT_DEVICE_XIPWAIT	0x02
-#define BOOT_DEVICE_NAND	0x05
-#define BOOT_DEVICE_NAND_I2C	0x06
-#define BOOT_DEVICE_MMC2	0x08 /* ROM only supports 2nd instance. */
-#define BOOT_DEVICE_MMC1	0x09
-#define BOOT_DEVICE_SPI		0x15
-#define BOOT_DEVICE_UART	0x41
-#define BOOT_DEVICE_USBETH	0x44
-#define BOOT_DEVICE_CPGMAC	0x46
-
-#define MMC_BOOT_DEVICES_START	BOOT_DEVICE_MMC2
-#define MMC_BOOT_DEVICES_END	BOOT_DEVICE_MMC1
-#elif defined(CONFIG_TI816X)
+#if defined(CONFIG_TI816X)
 #define BOOT_DEVICE_XIP		0x01
 #define BOOT_DEVICE_XIPWAIT	0x02
 #define BOOT_DEVICE_NAND	0x03
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 3bf972052260..1db71df27212 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -75,14 +75,6 @@ config OMAP54XX
 	imply SPL_SERIAL
 	imply SYS_I2C_OMAP24XX
 
-config TI814X
-	bool "TI814X SoC"
-	select SPECIFY_CONSOLE_INDEX
-	help
-	  Support for AM335x SOC from Texas Instruments.
-	  The AM335x high performance SOC features a Cortex-A8
-	  ARM core and more.
-
 config TI816X
 	bool "TI816X SoC"
 	select SPECIFY_CONSOLE_INDEX
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index b666e8111040..1299aec055ec 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -8,16 +8,6 @@ config TARGET_TI816X_EVM
 
 endif
 
-if TI814X
-
-config TARGET_TI814X_EVM
-	bool "Support ti814x_evm"
-	help
-	  This option specifies support for the TI8148
-	  EVM development platform.
-
-endif
-
 if AM33XX
 
 config AM33XX_CHILISOM
diff --git a/arch/arm/mach-omap2/am33xx/Makefile b/arch/arm/mach-omap2/am33xx/Makefile
index 4e4f98ea9037..bf94d345dae5 100644
--- a/arch/arm/mach-omap2/am33xx/Makefile
+++ b/arch/arm/mach-omap2/am33xx/Makefile
@@ -3,7 +3,6 @@
 # Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
 
 obj-$(CONFIG_AM33XX)	+= clock_am33xx.o
-obj-$(CONFIG_TI814X)	+= clock_ti814x.o
 obj-$(CONFIG_AM43XX)	+= clock_am43xx.o
 
 ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX),)
diff --git a/arch/arm/mach-omap2/am33xx/clock_ti814x.c b/arch/arm/mach-omap2/am33xx/clock_ti814x.c
deleted file mode 100644
index 27abaff48fce..000000000000
--- a/arch/arm/mach-omap2/am33xx/clock_ti814x.c
+++ /dev/null
@@ -1,410 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * clock_ti814x.c
- *
- * Clocks for TI814X based boards
- *
- * Copyright (C) 2013, Texas Instruments, Incorporated
- */
-
-#include <common.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/hardware.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-
-/* PRCM */
-#define PRCM_MOD_EN		0x2
-
-/* CLK_SRC */
-#define OSC_SRC0		0
-#define OSC_SRC1		1
-
-#define L3_OSC_SRC		OSC_SRC0
-
-#define OSC_0_FREQ		20
-
-#define DCO_HS2_MIN		500
-#define DCO_HS2_MAX		1000
-#define DCO_HS1_MIN		1000
-#define DCO_HS1_MAX		2000
-
-#define SELFREQDCO_HS2		0x00000801
-#define SELFREQDCO_HS1		0x00001001
-
-#define MPU_N			0x1
-#define MPU_M			0x3C
-#define MPU_M2			1
-#define MPU_CLKCTRL		0x1
-
-#define L3_N			19
-#define L3_M			880
-#define L3_M2			4
-#define L3_CLKCTRL		0x801
-
-#define DDR_N			19
-#define DDR_M			666
-#define DDR_M2			2
-#define DDR_CLKCTRL		0x801
-
-/* ADPLLJ register values */
-#define ADPLLJ_CLKCTRL_HS2	0x00000801 /* HS2 mode, TINT2 = 1 */
-#define ADPLLJ_CLKCTRL_HS1	0x00001001 /* HS1 mode, TINT2 = 1 */
-#define ADPLLJ_CLKCTRL_CLKDCOLDOEN	(1 << 29)
-#define ADPLLJ_CLKCTRL_IDLE		(1 << 23)
-#define ADPLLJ_CLKCTRL_CLKOUTEN		(1 << 20)
-#define ADPLLJ_CLKCTRL_CLKOUTLDOEN	(1 << 19)
-#define ADPLLJ_CLKCTRL_CLKDCOLDOPWDNZ	(1 << 17)
-#define ADPLLJ_CLKCTRL_LPMODE		(1 << 12)
-#define ADPLLJ_CLKCTRL_DRIFTGUARDIAN	(1 << 11)
-#define ADPLLJ_CLKCTRL_REGM4XEN		(1 << 10)
-#define ADPLLJ_CLKCTRL_TINITZ		(1 << 0)
-#define ADPLLJ_CLKCTRL_CLKDCO		(ADPLLJ_CLKCTRL_CLKDCOLDOEN | \
-					 ADPLLJ_CLKCTRL_CLKOUTEN | \
-					 ADPLLJ_CLKCTRL_CLKOUTLDOEN | \
-					 ADPLLJ_CLKCTRL_CLKDCOLDOPWDNZ)
-
-#define ADPLLJ_STATUS_PHASELOCK		(1 << 10)
-#define ADPLLJ_STATUS_FREQLOCK		(1 << 9)
-#define ADPLLJ_STATUS_PHSFRQLOCK	(ADPLLJ_STATUS_PHASELOCK | \
-					 ADPLLJ_STATUS_FREQLOCK)
-#define ADPLLJ_STATUS_BYPASSACK		(1 << 8)
-#define ADPLLJ_STATUS_BYPASS		(1 << 0)
-#define ADPLLJ_STATUS_BYPASSANDACK	(ADPLLJ_STATUS_BYPASSACK | \
-					 ADPLLJ_STATUS_BYPASS)
-
-#define ADPLLJ_TENABLE_ENB		(1 << 0)
-#define ADPLLJ_TENABLEDIV_ENB		(1 << 0)
-
-#define ADPLLJ_M2NDIV_M2SHIFT		16
-
-#define MPU_PLL_BASE			(PLL_SUBSYS_BASE + 0x048)
-#define L3_PLL_BASE			(PLL_SUBSYS_BASE + 0x110)
-#define DDR_PLL_BASE			(PLL_SUBSYS_BASE + 0x290)
-
-struct ad_pll {
-	unsigned int pwrctrl;
-	unsigned int clkctrl;
-	unsigned int tenable;
-	unsigned int tenablediv;
-	unsigned int m2ndiv;
-	unsigned int mn2div;
-	unsigned int fracdiv;
-	unsigned int bwctrl;
-	unsigned int fracctrl;
-	unsigned int status;
-	unsigned int m3div;
-	unsigned int rampctrl;
-};
-
-#define OSC_SRC_CTRL			(PLL_SUBSYS_BASE + 0x2C0)
-
-#define ENET_CLKCTRL_CMPL		0x30000
-
-#define SATA_PLL_BASE			(CTRL_BASE + 0x0720)
-
-struct sata_pll {
-	unsigned int pllcfg0;
-	unsigned int pllcfg1;
-	unsigned int pllcfg2;
-	unsigned int pllcfg3;
-	unsigned int pllcfg4;
-	unsigned int pllstatus;
-	unsigned int rxstatus;
-	unsigned int txstatus;
-	unsigned int testcfg;
-};
-
-#define SEL_IN_FREQ		(0x1 << 31)
-#define DIGCLRZ			(0x1 << 30)
-#define ENDIGLDO		(0x1 << 4)
-#define APLL_CP_CURR		(0x1 << 3)
-#define ENBGSC_REF		(0x1 << 2)
-#define ENPLLLDO		(0x1 << 1)
-#define ENPLL			(0x1 << 0)
-
-#define SATA_PLLCFG0_1 (SEL_IN_FREQ | ENBGSC_REF)
-#define SATA_PLLCFG0_2 (SEL_IN_FREQ | ENDIGLDO | ENBGSC_REF)
-#define SATA_PLLCFG0_3 (SEL_IN_FREQ | ENDIGLDO | ENBGSC_REF | ENPLLLDO)
-#define SATA_PLLCFG0_4 (SEL_IN_FREQ | DIGCLRZ | ENDIGLDO | ENBGSC_REF | \
-			ENPLLLDO | ENPLL)
-
-#define PLL_LOCK		(0x1 << 0)
-
-#define ENSATAMODE		(0x1 << 31)
-#define PLLREFSEL		(0x1 << 30)
-#define MDIVINT			(0x4b << 18)
-#define EN_CLKAUX		(0x1 << 5)
-#define EN_CLK125M		(0x1 << 4)
-#define EN_CLK100M		(0x1 << 3)
-#define EN_CLK50M		(0x1 << 2)
-
-#define SATA_PLLCFG1 (ENSATAMODE |	\
-		      PLLREFSEL |	\
-		      MDIVINT |		\
-		      EN_CLKAUX |	\
-		      EN_CLK125M |	\
-		      EN_CLK100M |	\
-		      EN_CLK50M)
-
-#define DIGLDO_EN_CAPLESSMODE	(0x1 << 22)
-#define PLLDO_EN_LDO_STABLE	(0x1 << 11)
-#define PLLDO_EN_BUF_CUR	(0x1 << 7)
-#define PLLDO_EN_LP		(0x1 << 6)
-#define PLLDO_CTRL_TRIM_1_4V	(0x10 << 1)
-
-#define SATA_PLLCFG3 (DIGLDO_EN_CAPLESSMODE |	\
-		      PLLDO_EN_LDO_STABLE |	\
-		      PLLDO_EN_BUF_CUR |	\
-		      PLLDO_EN_LP |		\
-		      PLLDO_CTRL_TRIM_1_4V)
-
-const struct cm_alwon *cmalwon = (struct cm_alwon *)CM_ALWON_BASE;
-const struct cm_def *cmdef = (struct cm_def *)CM_DEFAULT_BASE;
-const struct sata_pll *spll = (struct sata_pll *)SATA_PLL_BASE;
-
-/*
- * Enable the peripheral clock for required peripherals
- */
-static void enable_per_clocks(void)
-{
-	/* HSMMC1 */
-	writel(PRCM_MOD_EN, &cmalwon->mmchs1clkctrl);
-	while (readl(&cmalwon->mmchs1clkctrl) != PRCM_MOD_EN)
-		;
-
-	/* Ethernet */
-	writel(PRCM_MOD_EN, &cmalwon->ethclkstctrl);
-	writel(PRCM_MOD_EN, &cmalwon->ethernet0clkctrl);
-	while ((readl(&cmalwon->ethernet0clkctrl) & ENET_CLKCTRL_CMPL) != 0)
-		;
-	writel(PRCM_MOD_EN, &cmalwon->ethernet1clkctrl);
-	while ((readl(&cmalwon->ethernet1clkctrl) & ENET_CLKCTRL_CMPL) != 0)
-		;
-
-	/* RTC clocks */
-	writel(PRCM_MOD_EN, &cmalwon->rtcclkstctrl);
-	writel(PRCM_MOD_EN, &cmalwon->rtcclkctrl);
-	while (readl(&cmalwon->rtcclkctrl) != PRCM_MOD_EN)
-		;
-}
-
-/*
- * select the HS1 or HS2 for DCO Freq
- * return : CLKCTRL
- */
-static u32 pll_dco_freq_sel(u32 clkout_dco)
-{
-	if (clkout_dco >= DCO_HS2_MIN && clkout_dco < DCO_HS2_MAX)
-		return SELFREQDCO_HS2;
-	else if (clkout_dco >= DCO_HS1_MIN && clkout_dco < DCO_HS1_MAX)
-		return SELFREQDCO_HS1;
-	else
-		return -1;
-}
-
-/*
- * select the sigma delta config
- * return: sigma delta val
- */
-static u32 pll_sigma_delta_val(u32 clkout_dco)
-{
-	u32 sig_val = 0;
-
-	sig_val = (clkout_dco + 225) / 250;
-	sig_val = sig_val << 24;
-
-	return sig_val;
-}
-
-/*
- * configure individual ADPLLJ
- */
-static void pll_config(u32 base, u32 n, u32 m, u32 m2,
-		       u32 clkctrl_val, int adpllj)
-{
-	const struct ad_pll *adpll = (struct ad_pll *)base;
-	u32 m2nval, mn2val, read_clkctrl = 0, clkout_dco = 0;
-	u32 sig_val = 0, hs_mod = 0;
-
-	m2nval = (m2 << ADPLLJ_M2NDIV_M2SHIFT) | n;
-	mn2val = m;
-
-	/* calculate clkout_dco */
-	clkout_dco = ((OSC_0_FREQ / (n+1)) * m);
-
-	/* sigma delta & Hs mode selection skip for ADPLLS*/
-	if (adpllj) {
-		sig_val = pll_sigma_delta_val(clkout_dco);
-		hs_mod = pll_dco_freq_sel(clkout_dco);
-	}
-
-	/* by-pass pll */
-	read_clkctrl = readl(&adpll->clkctrl);
-	writel((read_clkctrl | ADPLLJ_CLKCTRL_IDLE), &adpll->clkctrl);
-	while ((readl(&adpll->status) & ADPLLJ_STATUS_BYPASSANDACK)
-		!= ADPLLJ_STATUS_BYPASSANDACK)
-		;
-
-	/* clear TINITZ */
-	read_clkctrl = readl(&adpll->clkctrl);
-	writel((read_clkctrl & ~ADPLLJ_CLKCTRL_TINITZ), &adpll->clkctrl);
-
-	/*
-	 * ref_clk = 20/(n + 1);
-	 * clkout_dco = ref_clk * m;
-	 * clk_out = clkout_dco/m2;
-	*/
-	read_clkctrl = readl(&adpll->clkctrl) &
-			     ~(ADPLLJ_CLKCTRL_LPMODE |
-			     ADPLLJ_CLKCTRL_DRIFTGUARDIAN |
-			     ADPLLJ_CLKCTRL_REGM4XEN);
-	writel(m2nval, &adpll->m2ndiv);
-	writel(mn2val, &adpll->mn2div);
-
-	/* Skip for modena(ADPLLS) */
-	if (adpllj) {
-		writel(sig_val, &adpll->fracdiv);
-		writel((read_clkctrl | hs_mod), &adpll->clkctrl);
-	}
-
-	/* Load M2, N2 dividers of ADPLL */
-	writel(ADPLLJ_TENABLEDIV_ENB, &adpll->tenablediv);
-	writel(~ADPLLJ_TENABLEDIV_ENB, &adpll->tenablediv);
-
-	/* Load M, N dividers of ADPLL */
-	writel(ADPLLJ_TENABLE_ENB, &adpll->tenable);
-	writel(~ADPLLJ_TENABLE_ENB, &adpll->tenable);
-
-	/* Configure CLKDCOLDOEN,CLKOUTLDOEN,CLKOUT Enable BITS */
-	read_clkctrl = readl(&adpll->clkctrl) & ~ADPLLJ_CLKCTRL_CLKDCO;
-	if (adpllj)
-		writel((read_clkctrl | ADPLLJ_CLKCTRL_CLKDCO),
-						&adpll->clkctrl);
-
-	/* Enable TINTZ and disable IDLE(PLL in Active & Locked Mode */
-	read_clkctrl = readl(&adpll->clkctrl) & ~ADPLLJ_CLKCTRL_IDLE;
-	writel((read_clkctrl | ADPLLJ_CLKCTRL_TINITZ), &adpll->clkctrl);
-
-	/* Wait for phase and freq lock */
-	while ((readl(&adpll->status) & ADPLLJ_STATUS_PHSFRQLOCK) !=
-	       ADPLLJ_STATUS_PHSFRQLOCK)
-		;
-}
-
-static void unlock_pll_control_mmr(void)
-{
-	/* TRM 2.10.1.4 and 3.2.7-3.2.11 */
-	writel(0x1EDA4C3D, 0x481C5040);
-	writel(0x2FF1AC2B, 0x48140060);
-	writel(0xF757FDC0, 0x48140064);
-	writel(0xE2BC3A6D, 0x48140068);
-	writel(0x1EBF131D, 0x4814006c);
-	writel(0x6F361E05, 0x48140070);
-}
-
-static void mpu_pll_config(void)
-{
-	pll_config(MPU_PLL_BASE, MPU_N, MPU_M, MPU_M2, MPU_CLKCTRL, 0);
-}
-
-static void l3_pll_config(void)
-{
-	u32 l3_osc_src, rd_osc_src = 0;
-
-	l3_osc_src = L3_OSC_SRC;
-	rd_osc_src = readl(OSC_SRC_CTRL);
-
-	if (OSC_SRC0 == l3_osc_src)
-		writel((rd_osc_src & 0xfffffffe)|0x0, OSC_SRC_CTRL);
-	else
-		writel((rd_osc_src & 0xfffffffe)|0x1, OSC_SRC_CTRL);
-
-	pll_config(L3_PLL_BASE, L3_N, L3_M, L3_M2, L3_CLKCTRL, 1);
-}
-
-void ddr_pll_config(unsigned int ddrpll_m)
-{
-	pll_config(DDR_PLL_BASE, DDR_N, DDR_M, DDR_M2, DDR_CLKCTRL, 1);
-}
-
-void sata_pll_config(void)
-{
-	/*
-	 * This sequence for configuring the SATA PLL
-	 * resident in the control module is documented
-	 * in TI8148 TRM section 21.3.1
-	 */
-	writel(SATA_PLLCFG1, &spll->pllcfg1);
-	udelay(50);
-
-	writel(SATA_PLLCFG3, &spll->pllcfg3);
-	udelay(50);
-
-	writel(SATA_PLLCFG0_1, &spll->pllcfg0);
-	udelay(50);
-
-	writel(SATA_PLLCFG0_2, &spll->pllcfg0);
-	udelay(50);
-
-	writel(SATA_PLLCFG0_3, &spll->pllcfg0);
-	udelay(50);
-
-	writel(SATA_PLLCFG0_4, &spll->pllcfg0);
-	udelay(50);
-
-	while (((readl(&spll->pllstatus) & PLL_LOCK) == 0))
-		;
-}
-
-void enable_dmm_clocks(void)
-{
-	writel(PRCM_MOD_EN, &cmdef->fwclkctrl);
-	writel(PRCM_MOD_EN, &cmdef->l3fastclkstctrl);
-	writel(PRCM_MOD_EN, &cmdef->emif0clkctrl);
-	while ((readl(&cmdef->emif0clkctrl)) != PRCM_MOD_EN)
-		;
-	writel(PRCM_MOD_EN, &cmdef->emif1clkctrl);
-	while ((readl(&cmdef->emif1clkctrl)) != PRCM_MOD_EN)
-		;
-	while ((readl(&cmdef->l3fastclkstctrl) & 0x300) != 0x300)
-		;
-	writel(PRCM_MOD_EN, &cmdef->dmmclkctrl);
-	while ((readl(&cmdef->dmmclkctrl)) != PRCM_MOD_EN)
-		;
-	writel(PRCM_MOD_EN, &cmalwon->l3slowclkstctrl);
-	while ((readl(&cmalwon->l3slowclkstctrl) & 0x2100) != 0x2100)
-		;
-}
-
-void setup_clocks_for_console(void)
-{
-	unlock_pll_control_mmr();
-	/* UART0 */
-	writel(PRCM_MOD_EN, &cmalwon->uart0clkctrl);
-	while (readl(&cmalwon->uart0clkctrl) != PRCM_MOD_EN)
-		;
-}
-
-void setup_early_clocks(void)
-{
-	setup_clocks_for_console();
-}
-
-/*
- * Configure the PLL/PRCM for necessary peripherals
- */
-void prcm_init(void)
-{
-	/* Enable the control module */
-	writel(PRCM_MOD_EN, &cmalwon->controlclkctrl);
-
-	/* Configure PLLs */
-	mpu_pll_config();
-	l3_pll_config();
-	sata_pll_config();
-
-	/* Enable the required peripherals */
-	enable_per_clocks();
-}
diff --git a/arch/arm/mach-omap2/am33xx/emif4.c b/arch/arm/mach-omap2/am33xx/emif4.c
index a5fdb0433dc7..bf3da43ed982 100644
--- a/arch/arm/mach-omap2/am33xx/emif4.c
+++ b/arch/arm/mach-omap2/am33xx/emif4.c
@@ -28,26 +28,6 @@ static struct cm_device_inst *cm_device =
 				(struct cm_device_inst *)CM_DEVICE_INST;
 #endif
 
-#ifdef CONFIG_TI814X
-void config_dmm(const struct dmm_lisa_map_regs *regs)
-{
-	struct dmm_lisa_map_regs *hw_lisa_map_regs =
-				(struct dmm_lisa_map_regs *)DMM_BASE;
-
-	enable_dmm_clocks();
-
-	writel(0, &hw_lisa_map_regs->dmm_lisa_map_3);
-	writel(0, &hw_lisa_map_regs->dmm_lisa_map_2);
-	writel(0, &hw_lisa_map_regs->dmm_lisa_map_1);
-	writel(0, &hw_lisa_map_regs->dmm_lisa_map_0);
-
-	writel(regs->dmm_lisa_map_3, &hw_lisa_map_regs->dmm_lisa_map_3);
-	writel(regs->dmm_lisa_map_2, &hw_lisa_map_regs->dmm_lisa_map_2);
-	writel(regs->dmm_lisa_map_1, &hw_lisa_map_regs->dmm_lisa_map_1);
-	writel(regs->dmm_lisa_map_0, &hw_lisa_map_regs->dmm_lisa_map_0);
-}
-#endif
-
 static void config_vtp(int nr)
 {
 	writel(readl(&vtpreg[nr]->vtp0ctrlreg) | VTP_CTRL_ENABLE,
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index c463c96c74c8..408159fde810 100644
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -181,7 +181,7 @@ void save_omap_boot_params(void)
 
 	gd->arch.omap_boot_mode = boot_mode;
 
-#if !defined(CONFIG_TI814X) && !defined(CONFIG_TI816X) && \
+#if !defined(CONFIG_TI816X) && \
     !defined(CONFIG_AM33XX) && !defined(CONFIG_AM43XX)
 
 	/* CH flags */
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 08b6c7bdcc42..76e19918aadc 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -704,7 +704,7 @@ config SYS_I2C_BUS_MAX
 	depends on ARCH_OMAP2PLUS || ARCH_SOCFPGA
 	default 2 if TI816X
 	default 3 if OMAP34XX || AM33XX || AM43XX
-	default 4 if ARCH_SOCFPGA || OMAP44XX || TI814X
+	default 4 if ARCH_SOCFPGA || OMAP44XX
 	default 5 if OMAP54XX
 	help
 	  Define the maximum number of available I2C buses.
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index a19dc38e5251..3a8cc9c52a51 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -79,10 +79,6 @@ struct cpsw_slave_regs {
 	u32	tx_pri_map;
 #ifdef CONFIG_AM33XX
 	u32	gap_thresh;
-#elif defined(CONFIG_TI814X)
-	u32	ts_ctl;
-	u32	ts_seq_ltype;
-	u32	ts_vlan;
 #endif
 	u32	sa_lo;
 	u32	sa_hi;
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
deleted file mode 100644
index 03849adb5abe..000000000000
--- a/include/configs/ti814x_evm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * ti814x_evm.h
- *
- * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __CONFIG_TI814X_EVM_H
-#define __CONFIG_TI814X_EVM_H
-
-#include <asm/arch/omap.h>
-
-/* commands to include */
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=0x80200000\0" \
-	"fdtaddr=0x80F80000\0" \
-	"rdaddr=0x81000000\0" \
-	"bootfile=/boot/uImage\0" \
-	"fdtfile=\0" \
-	"console=ttyO0,115200n8\0" \
-	"optargs=\0" \
-	"mmcdev=0\0" \
-	"mmcroot=/dev/mmcblk0p2 ro\0" \
-	"mmcrootfstype=ext4 rootwait\0" \
-	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
-	"ramrootfstype=ext2\0" \
-	"mmcargs=setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=${mmcroot} " \
-		"rootfstype=${mmcrootfstype}\0" \
-	"bootenv=uEnv.txt\0" \
-	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-	"importbootenv=echo Importing environment from mmc ...; " \
-		"env import -t $loadaddr $filesize\0" \
-	"ramargs=setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=${ramroot} " \
-		"rootfstype=${ramrootfstype}\0" \
-	"loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-	"loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
-	"loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"bootm ${loadaddr}\0" \
-	"ramboot=echo Booting from ramdisk ...; " \
-		"run ramargs; " \
-		"bootm ${loadaddr}\0" \
-	"fdtfile=ti814x-evm.dtb\0" \
-
-/* Clock Defines */
-#define V_OSCK			24000000	/* Clock output from T2 */
-#define V_SCLK			(V_OSCK >> 1)
-
-
-/* Console I/O Buffer Size */
-
-/**
- * Physical Memory Map
- */
-#define PHYS_DRAM_1_SIZE		0x20000000	/* 512MB */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1024MB */
-
-#define CFG_SYS_SDRAM_BASE		0x80000000
-
-/**
- * Platform/Board specific defs
- */
-#define CFG_SYS_TIMERBASE		0x4802E000
-
-/* NS16550 Configuration */
-#define CFG_SYS_NS16550_CLK		(48000000)
-#define CFG_SYS_NS16550_COM1		0x48020000	/* Base EVM has UART0 */
-
-/* CPU */
-
-/* Defines for SPL */
-
-/*
- * 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
- * header. That is 0x800FFFC0--0x80800000 should not be used for any
- * other needs.
- */
-
-/*
- * Since SPL did pll and ddr initialization for us,
- * we don't need to do it twice.
- */
-
-/* Ethernet */
-#define CONFIG_PHY_ET1011C_TX_CLK_FIX
-
-#endif	/* ! __CONFIG_TI814X_EVM_H */
-- 
2.25.1

[PATCH 32/41] powerpc: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to Kconfig

[Tom Rini]

Move this symbol to Kconfig, and preserve the current behavior. The
help text here comes from where the relevant code is implemented and it
is quite likely at this point in time we could either disable this
option or at least make it configurable.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/Kconfig          | 13 +++++++++++++
 arch/powerpc/include/asm/config_mpc85xx.h |  6 ------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 36519613a2cc..03373bf86926 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -1,6 +1,19 @@
 menu "mpc85xx CPU"
 	depends on MPC85xx
 
+config PPC_SPINTABLE_COMPATIBLE
+	depends on MP
+	def_bool y
+	help
+	  To comply with ePAPR 1.1, the spin table has been moved to
+	  cache-enabled memory. Old OS may not work with this change. A patch
+	  is waiting to be accepted for Linux kernel. Other OS needs similar
+	  fix to spin table.  For OSes with old spin table code, we can enable
+	  this temporary fix by setting environmental variable
+	  "spin_table_compat". For new OSes, set "spin_table_compat=no". After
+	  Linux is fixed, we can remove this macro and related code. For now,
+	  it is enabled by default.
+
 config SYS_CPU
 	default "mpc85xx"
 
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index e80599106066..246bcb9fe498 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -8,12 +8,6 @@
 
 /* SoC specific defines for Freescale MPC85xx (PQ3) and QorIQ processors */
 
-/*
- * This macro should be removed when we no longer care about backwards
- * compatibility with older operating systems.
- */
-#define CONFIG_PPC_SPINTABLE_COMPATIBLE
-
 #include <fsl_ddrc_version.h>
 
 #if defined(CONFIG_ARCH_MPC8548)
-- 
2.25.1

[PATCH 33/41] sandbox: Finish migration to Kconfig

[Tom Rini]

Stop using CONFIG_SANDBOX_ARCH and use CONFIG_SANDBOX instead. For the
SPI related defines, set them directly in Kconfig. This now empties
arch/sandbox/include/asm/config.h.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sandbox/include/asm/config.h | 10 ----------
 drivers/adc/adc-uclass.c          |  2 +-
 drivers/spi/Kconfig               | 10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/sandbox/include/asm/config.h b/arch/sandbox/include/asm/config.h
index 50215b35d777..87b9d23b37d2 100644
--- a/arch/sandbox/include/asm/config.h
+++ b/arch/sandbox/include/asm/config.h
@@ -6,14 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SANDBOX_ARCH
-
-/* Used by drivers/spi/sandbox_spi.c and arch/sandbox/include/asm/state.h */
-#ifndef CONFIG_SANDBOX_SPI_MAX_BUS
-#define CONFIG_SANDBOX_SPI_MAX_BUS 1
-#endif
-#ifndef CONFIG_SANDBOX_SPI_MAX_CS
-#define CONFIG_SANDBOX_SPI_MAX_CS 10
-#endif
-
 #endif
diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c
index 67137ffb3414..9646e4d70627 100644
--- a/drivers/adc/adc-uclass.c
+++ b/drivers/adc/adc-uclass.c
@@ -22,7 +22,7 @@
 #define CHECK_MASK			(!CHECK_NUMBER)
 
 /* TODO: add support for timer uclass (for early calls) */
-#ifdef CONFIG_SANDBOX_ARCH
+#ifdef CONFIG_SANDBOX
 #define sdelay(x)	udelay(x)
 #else
 extern void sdelay(unsigned long loops);
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c6900f449d5f..64ceed12ce48 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -429,6 +429,16 @@ config SANDBOX_SPI
 		};
 	  };
 
+config SANDBOX_SPI_MAX_BUS
+	int
+	depends on SANDBOX
+	default 1
+
+config SANDBOX_SPI_MAX_CS
+	int
+	depends on SANDBOX
+	default 10
+
 config SPI_ASPEED_SMC
 	bool "ASPEED SPI flash controller driver"
 	depends on DM_SPI && SPI_MEM
-- 
2.25.1

[PATCH 34/41] Convert CONFIG_STANDALONE_LOAD_ADDR to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_STANDALONE_LOAD_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                        |  7 -------
 api/Kconfig                                   | 19 +++++++++++++++++++
 arch/arc/config.mk                            |  3 ---
 arch/arm/config.mk                            |  8 --------
 .../include/asm/arch-fsl-layerscape/config.h  |  2 --
 arch/m68k/config.mk                           |  2 --
 arch/microblaze/config.mk                     |  2 --
 arch/mips/config.mk                           |  2 --
 arch/nios2/config.mk                          |  2 --
 arch/powerpc/config.mk                        |  1 -
 arch/riscv/config.mk                          |  2 --
 arch/sh/config.mk                             |  1 -
 arch/x86/config.mk                            |  2 --
 configs/display5_defconfig                    |  1 +
 configs/display5_factory_defconfig            |  1 +
 configs/microchip_mpfs_icicle_defconfig       |  1 +
 configs/qemu-riscv32_defconfig                |  1 +
 configs/qemu-riscv32_smode_defconfig          |  1 +
 configs/qemu-riscv32_spl_defconfig            |  1 +
 configs/qemu-riscv64_defconfig                |  1 +
 configs/qemu-riscv64_smode_defconfig          |  1 +
 configs/qemu-riscv64_spl_defconfig            |  1 +
 configs/sifive_unleashed_defconfig            |  1 +
 configs/sifive_unmatched_defconfig            |  1 +
 configs/xtfpga_defconfig                      |  1 +
 include/configs/display5.h                    |  2 --
 include/configs/microchip_mpfs_icicle.h       |  2 --
 include/configs/opos6uldev.h                  |  1 -
 include/configs/qemu-riscv.h                  |  2 --
 include/configs/sifive-unleashed.h            |  2 --
 include/configs/sifive-unmatched.h            |  2 --
 include/configs/sunxi-common.h                |  3 ---
 include/configs/xtfpga.h                      | 16 ----------------
 33 files changed, 31 insertions(+), 64 deletions(-)

diff --git a/README b/README
index 3ebee1cb3755..c8f6b21e2d96 100644
--- a/README
+++ b/README
@@ -1166,13 +1166,6 @@ The following options need to be configured:
 		this is instead controlled by the value of
 		/config/load-environment.
 
-		CONFIG_STANDALONE_LOAD_ADDR
-
-		This option defines a board specific value for the
-		address where standalone program gets loaded, thus
-		overwriting the architecture dependent default
-		settings.
-
 - Automatic software updates via TFTP server
 		CONFIG_UPDATE_TFTP
 		CONFIG_UPDATE_TFTP_CNT_MAX
diff --git a/api/Kconfig b/api/Kconfig
index eb8d5d0596a7..d9362724e5f6 100644
--- a/api/Kconfig
+++ b/api/Kconfig
@@ -11,3 +11,22 @@ config SYS_MMC_MAX_DEVICE
 	default 1
 
 endmenu
+
+config STANDALONE_LOAD_ADDR
+	hex "Address in memory to link standalone applications to"
+	default 0xffffffff80200000 if MIPS && 64BIT
+	default 0x8c000000 if SH
+	default 0x82000000 if ARC
+	default 0x80f00000 if MICROBLAZE
+	default 0x80300000 if ARCH_OMAP2PLUS || FSL_LSCH2 || FSL_LSCH3
+	default 0x80200000 if MIPS && 32BIT
+	default 0x0c100000 if ARM
+	default 0x02000000 if NIOS2
+	default 0x00040000 if PPC || X86
+	default 0x00020000 if M68K
+	default 0x0 if RISCV
+	default SYS_LOAD_ADDR
+	help
+	  This option defines a board specific value for the address where
+	  standalone program gets loaded, thus overwriting the architecture
+	  dependent default settings.
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index 2b70945ac342..b713fa3054c0 100644
--- a/arch/arc/config.mk
+++ b/arch/arc/config.mk
@@ -21,6 +21,3 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common
 
 # Needed for relocation
 LDFLAGS_FINAL += -pie --gc-sections
-
-# Load address for standalone apps
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 2065438d0530..bf781f102620 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -3,14 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
-CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
-else
-CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
-endif
-endif
-
 CFLAGS_NON_EFI := -fno-pic -ffixed-r9 -ffunction-sections -fdata-sections \
 		  -fstack-protector-strong
 CFLAGS_EFI := -fpic -fshort-wchar
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index c9c72e327172..57d92f65520d 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -14,8 +14,6 @@
 #include <linux/bitops.h>
 #endif
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80300000
-
 /*
  * Reserve secure memory
  * To be aligned with MMU block size
diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
index ed592334af2e..3ccbe4922021 100644
--- a/arch/m68k/config.mk
+++ b/arch/m68k/config.mk
@@ -3,8 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
-
 PLATFORM_CPPFLAGS += -D__M68K__
 KBUILD_LDFLAGS  += -n
 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk
index d35b4f6db7a1..467c5ca1b12f 100644
--- a/arch/microblaze/config.mk
+++ b/arch/microblaze/config.mk
@@ -6,8 +6,6 @@
 # (C) Copyright 2004 Atmark Techno, Inc.
 # Yasushi SHOJI <yashi@atmark-techno.com>
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
-
 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
 PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections
 
diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 04f362780580..745f03190e98 100644
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -25,14 +25,12 @@ ifdef CONFIG_32BIT
 PLATFORM_CPPFLAGS	+= -mabi=32
 KBUILD_LDFLAGS		+= -m $(32bit-emul)
 OBJCOPYFLAGS		+= -O $(32bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR	?= 0x80200000
 endif
 
 ifdef CONFIG_64BIT
 PLATFORM_CPPFLAGS	+= -mabi=64
 KBUILD_LDFLAGS		+= -m$(64bit-emul)
 OBJCOPYFLAGS		+= -O $(64bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR	?= 0xffffffff80200000
 endif
 
 PLATFORM_CPPFLAGS += -D__MIPS__
diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index 44260b1431cb..b18b9b78ab6d 100644
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -4,8 +4,6 @@
 # Psyent Corporation <www.psyent.com>
 # Scott McNutt <smcnutt@psyent.com>
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
-
 PLATFORM_CPPFLAGS += -D__NIOS2__
 PLATFORM_CPPFLAGS += -G0
 
diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index 307ca65745c8..725a4f48aad6 100644
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -3,7 +3,6 @@
 # (C) Copyright 2000-2010
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
 LDFLAGS_FINAL += --gc-sections
 LDFLAGS_FINAL += --bss-plt
 PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index 1ebce5bd6748..a8ed3faf28cd 100644
--- a/arch/riscv/config.mk
+++ b/arch/riscv/config.mk
@@ -23,8 +23,6 @@ KBUILD_LDFLAGS		+= -m $(64bit-emul)
 EFI_LDS			:= elf_riscv64_efi.lds
 endif
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
-
 PLATFORM_CPPFLAGS	+= -ffixed-gp -fpic
 PLATFORM_RELFLAGS	+= -fno-common -gdwarf-2 -ffunction-sections \
 			   -fdata-sections
diff --git a/arch/sh/config.mk b/arch/sh/config.mk
index 78bb2660e1e3..a408264d4b11 100644
--- a/arch/sh/config.mk
+++ b/arch/sh/config.mk
@@ -3,7 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
 ifeq ($(CPU),sh2)
 LDFLAGS_STANDALONE += -EB
 endif
diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index 889497b6bd75..a4a694ddf313 100644
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -3,8 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
-
 PLATFORM_CPPFLAGS += -fomit-frame-pointer
 PF_CPPFLAGS_X86   := $(call cc-option, -fno-toplevel-reorder, \
 		     $(call cc-option, -fno-unit-at-a-time))
diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index dbd917b4ddb9..c46a0a0b6992 100644
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -30,6 +30,7 @@ CONFIG_ENV_OFFSET_REDUND=0x130000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_MONITOR_LEN=409600
+CONFIG_STANDALONE_LOAD_ADDR=0x10001000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index 7508702eb95a..cacdf33d53e6 100644
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -27,6 +27,7 @@ CONFIG_ENV_OFFSET_REDUND=0x130000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_MONITOR_LEN=409600
+CONFIG_STANDALONE_LOAD_ADDR=0x10001000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig
index fbb2df4a749c..c2b938e7e7e9 100644
--- a/configs/microchip_mpfs_icicle_defconfig
+++ b/configs/microchip_mpfs_icicle_defconfig
@@ -12,6 +12,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig
index 425bb37c9883..844c95380e64 100644
--- a/configs/qemu-riscv32_defconfig
+++ b/configs/qemu-riscv32_defconfig
@@ -9,6 +9,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_SYS_MONITOR_LEN=786432
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv32_smode_defconfig b/configs/qemu-riscv32_smode_defconfig
index eeb90360cdbb..2be349ada768 100644
--- a/configs/qemu-riscv32_smode_defconfig
+++ b/configs/qemu-riscv32_smode_defconfig
@@ -10,6 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_SYS_MONITOR_LEN=786432
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig
index 04447e5ed3ca..894b6d5d1742 100644
--- a/configs/qemu-riscv32_spl_defconfig
+++ b/configs/qemu-riscv32_spl_defconfig
@@ -12,6 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_SYS_MONITOR_LEN=786432
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_DISPLAY_CPUINFO=y
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
index 7430fa075d71..8b558e6bc27c 100644
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -9,6 +9,7 @@ CONFIG_ARCH_RV64I=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 03ef58ba4751..6ed88de2342c 100644
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -10,6 +10,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
index 840e0ff151ca..adc6f730d2ae 100644
--- a/configs/qemu-riscv64_spl_defconfig
+++ b/configs/qemu-riscv64_spl_defconfig
@@ -11,6 +11,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_DISPLAY_CPUINFO=y
diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
index 99faabaa2ff2..6c85962cbb2e 100644
--- a/configs/sifive_unleashed_defconfig
+++ b/configs/sifive_unleashed_defconfig
@@ -16,6 +16,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
 CONFIG_USE_PREBOOT=y
diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
index c390af26897f..3d96aa541191 100644
--- a/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@ -19,6 +19,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
 CONFIG_USE_PREBOOT=y
diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig
index e1f1f9517eff..0a853fc9d817 100644
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_LOAD_ADDR=0x02000000
 CONFIG_ENV_ADDR=0xF7FE0000
 CONFIG_XTFPGA_KC705=y
 CONFIG_SYS_MONITOR_LEN=262144
+CONFIG_STANDALONE_LOAD_ADDR=0x00800000
 CONFIG_SYS_MONITOR_BASE=0xF6000000
 CONFIG_DYNAMIC_SYS_CLK_FREQ=y
 CONFIG_SHOW_BOOT_PROGRESS=y
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 5cbeb9224c36..4401515a65eb 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -276,8 +276,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x10001000
-
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM
diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index 3def93d61e8a..c73c5a1d9fe0 100644
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -11,8 +11,6 @@
 
 #define CFG_SYS_SDRAM_BASE       0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
-
 /* Environment options */
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 5c44b9dcb20d..459134b93f83 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -11,7 +11,6 @@
 #include "mx6_common.h"
 
 /* Miscellaneous configurable options */
-#define CONFIG_STANDALONE_LOAD_ADDR	CONFIG_SYS_LOAD_ADDR
 
 /* Physical Memory Map */
 #define CFG_SYS_SDRAM_BASE		MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 72f35cc05420..35172da3ff1e 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -10,8 +10,6 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80200000
-
 #define RISCV_MMODE_TIMERBASE		0x2000000
 #define RISCV_MMODE_TIMER_FREQ		1000000
 
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 5ad2124bddab..4a453a9df407 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -13,8 +13,6 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80200000
-
 #define RISCV_MMODE_TIMERBASE		0x2000000
 #define RISCV_MMODE_TIMER_FREQ		1000000
 
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index f4b1a16019ec..ac42108620fa 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -13,8 +13,6 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR	0x80200000
-
 /* Environment options */
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 496139f34635..5d82e7e560f6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -73,9 +73,6 @@
  * Miscellaneous configurable options
  */
 
-/* standalone support */
-#define CONFIG_STANDALONE_LOAD_ADDR	CONFIG_SYS_LOAD_ADDR
-
 /* FLASH and environment organization */
 
 /*
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 9201dac7abce..e0189c58f042 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -53,22 +53,6 @@
 
 /* Memory test is destructive so default must not overlap vectors or U-Boot*/
 
-/* Load address for stand-alone applications.
- * MEMADDR cannot be used here, because the definition needs to be
- * a plain number as it's used as -Ttext argument for ld in standalone
- * example makefile.
- * Handle noMMU vs MMUv2 vs MMUv3 distinction here manually.
- */
-#if XCHAL_HAVE_PTP_MMU
-#if XCHAL_VECBASE_RESET_VADDR == XCHAL_VECBASE_RESET_PADDR
-#define CONFIG_STANDALONE_LOAD_ADDR	0x00800000
-#else
-#define CONFIG_STANDALONE_LOAD_ADDR	0xd0800000
-#endif
-#else
-#define CONFIG_STANDALONE_LOAD_ADDR	0x60800000
-#endif
-
 #if defined(CONFIG_MAX_MEM_MAPPED) && \
 	CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR		\
-- 
2.25.1

[PATCH 35/41] Convert CONFIG_TEGRA_ENABLE_UARTA et al to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_TEGRA_ENABLE_UARTA
   CONFIG_TEGRA_ENABLE_UARTB
   CONFIG_TEGRA_ENABLE_UARTC
   CONFIG_TEGRA_ENABLE_UARTD
   CONFIG_TEGRA_SPI
   CONFIG_TEGRA_UARTA_GPU
   CONFIG_TEGRA_UARTA_SDIO1
   CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
   CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/Kconfig         | 23 +++++++++++++++++++++++
 arch/arm/mach-tegra/tegra20/Kconfig |  8 ++++++++
 arch/arm/mach-tegra/tegra30/Kconfig |  8 ++++++++
 configs/cei-tk1-som_defconfig       |  1 +
 configs/dalmore_defconfig           |  1 +
 configs/harmony_defconfig           |  1 +
 configs/jetson-tk1_defconfig        |  1 +
 configs/medcom-wide_defconfig       |  1 +
 configs/plutux_defconfig            |  1 +
 configs/seaboard_defconfig          |  1 +
 configs/tec-ng_defconfig            |  1 +
 configs/tec_defconfig               |  1 +
 configs/ventana_defconfig           |  1 +
 include/configs/apalis-tk1.h        |  1 -
 include/configs/apalis_t30.h        |  1 -
 include/configs/beaver.h            |  4 ----
 include/configs/cardhu.h            |  4 ----
 include/configs/cei-tk1-som.h       |  1 -
 include/configs/colibri_t20.h       |  2 --
 include/configs/colibri_t30.h       |  1 -
 include/configs/dalmore.h           |  1 -
 include/configs/harmony.h           |  1 -
 include/configs/jetson-tk1.h        |  1 -
 include/configs/medcom-wide.h       |  1 -
 include/configs/nyan-big.h          |  1 -
 include/configs/p2371-0000.h        |  1 -
 include/configs/p2371-2180.h        |  1 -
 include/configs/p2571.h             |  1 -
 include/configs/p3450-0000.h        |  1 -
 include/configs/paz00.h             |  1 -
 include/configs/plutux.h            |  1 -
 include/configs/seaboard.h          |  1 -
 include/configs/tec-ng.h            |  1 -
 include/configs/tec.h               |  1 -
 include/configs/tegra-common-post.h |  4 ----
 include/configs/trimslice.h         |  2 --
 include/configs/venice2.h           |  1 -
 include/configs/ventana.h           |  1 -
 38 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index edcf967afd96..1b575cc0f456 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -177,6 +177,29 @@ source "arch/arm/mach-tegra/tegra124/Kconfig"
 source "arch/arm/mach-tegra/tegra210/Kconfig"
 source "arch/arm/mach-tegra/tegra186/Kconfig"
 
+config TEGRA_SPI
+	def_bool y
+	depends on TEGRA20_SFLASH || TEGRA20_SLINK || TEGRA114_SPI
+
+choice
+	prompt "UART to use for console"
+	depends on TEGRA_PINCTRL
+	default TEGRA_ENABLE_UARTA
+
+config TEGRA_ENABLE_UARTA
+	bool "Use UARTA"
+
+config TEGRA_ENABLE_UARTB
+	bool "Use UARTB"
+
+config TEGRA_ENABLE_UARTC
+	bool "Use UARTC"
+
+config TEGRA_ENABLE_UARTD
+	bool "Use UARTD"
+
+endchoice
+
 config TEGRA_GPU
 	bool "Enable setting up the GPU"
 	depends on TEGRA124 || TEGRA210
diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
index 345563fc789e..955786c0c484 100644
--- a/arch/arm/mach-tegra/tegra20/Kconfig
+++ b/arch/arm/mach-tegra/tegra20/Kconfig
@@ -10,6 +10,12 @@ config TEGRA_PMU
 config TEGRA_CLOCK_SCALING
 	bool
 
+config TEGRA_UARTA_GPU
+	bool
+
+config TEGRA_UARTA_SDIO1
+	bool
+
 choice
 	prompt "Tegra20 board select"
 	optional
@@ -43,6 +49,7 @@ config TARGET_TEC
 config TARGET_TRIMSLICE
 	bool "Compulab TrimSlice board"
 	select BOARD_LATE_INIT
+	select TEGRA_UARTA_GPU
 
 config TARGET_VENTANA
 	bool "NVIDIA Tegra20 Ventana evaluation board"
@@ -51,6 +58,7 @@ config TARGET_VENTANA
 config TARGET_COLIBRI_T20
 	bool "Toradex Colibri T20 board"
 	select BOARD_LATE_INIT
+	select TEGRA_UARTA_SDIO1
 
 endchoice
 
diff --git a/arch/arm/mach-tegra/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig
index 85b8ce294f27..5619d1cd42f7 100644
--- a/arch/arm/mach-tegra/tegra30/Kconfig
+++ b/arch/arm/mach-tegra/tegra30/Kconfig
@@ -1,5 +1,11 @@
 if TEGRA30
 
+config TEGRA_VDD_CORE_TPS62361B_SET3
+	bool
+
+config TEGRA_VDD_CORE_TPS62366A_SET1
+	bool
+
 choice
 	prompt "Tegra30 board select"
 	optional
@@ -11,10 +17,12 @@ config TARGET_APALIS_T30
 config TARGET_BEAVER
 	bool "NVIDIA Tegra30 Beaver evaluation board"
 	select BOARD_LATE_INIT
+	select TEGRA_VDD_CORE_TPS62366A_SET1
 
 config TARGET_CARDHU
 	bool "NVIDIA Tegra30 Cardhu evaluation board"
 	select BOARD_LATE_INIT
+	select TEGRA_VDD_CORE_TPS62361B_SET3
 
 config TARGET_COLIBRI_T30
 	bool "Toradex Colibri T30 board"
diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
index 58d75a52a08d..0c4627aff054 100644
--- a/configs/cei-tk1-som_defconfig
+++ b/configs/cei-tk1-som_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_SYS_PROMPT="Tegra124 (TK1-SOM) # "
 CONFIG_TEGRA124=y
 CONFIG_TARGET_CEI_TK1_SOM=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_TEGRA_GPU=y
 CONFIG_ARMV7_PSCI_0_1=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index cc46f4eda419..5d29dae3411a 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
 CONFIG_TEGRA114=y
 CONFIG_TARGET_DALMORE=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_CONSOLE_MUX=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index 353d1a33fabe..c8694bba6819 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
 CONFIG_TEGRA20=y
 CONFIG_TARGET_HARMONY=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x1000000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_SYS_STDIO_DEREGISTER=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index b391a86c0225..d935e784ab42 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
 CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_TEGRA_GPU=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 76e4eb3078c8..563e01459af6 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
 CONFIG_TEGRA20=y
 CONFIG_TARGET_MEDCOM_WIDE=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x1000000
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 170ac86468d7..789b5d939822 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
 CONFIG_TEGRA20=y
 CONFIG_TARGET_PLUTUX=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x1000000
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 2375040a9ec5..dc9225188fa2 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
 CONFIG_TEGRA20=y
 CONFIG_TARGET_SEABOARD=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x1000000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_USE_PREBOOT=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 02d6b496f967..8c3f8d5e0657 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000
 CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
 CONFIG_TEGRA30=y
 CONFIG_TARGET_TEC_NG=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x81000000
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 967d3050eff6..a1900f0181d5 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_SYS_PROMPT="Tegra20 (TEC) # "
 CONFIG_TEGRA20=y
 CONFIG_TARGET_TEC=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x1000000
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 3c924ec9eae3..3d94f454be23 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x00108000
 CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
 CONFIG_TEGRA20=y
 CONFIG_TARGET_VENTANA=y
+CONFIG_TEGRA_ENABLE_UARTD=y
 CONFIG_SYS_LOAD_ADDR=0x1000000
 CONFIG_OF_SYSTEM_SETUP=y
 CONFIG_USE_PREBOOT=y
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 1d478078b2c3..71d4727ca98d 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -13,7 +13,6 @@
 #include "tegra124-common.h"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #define FDT_MODULE			"apalis-v1.2"
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 4f00b3bad3f4..80204d706d1f 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -20,7 +20,6 @@
  * Apalis UART3: NVIDIA UARTB
  * Apalis UART4: NVIDIA UARTC
  */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #define UBOOT_UPDATE \
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 7078c2745c8e..7e0e47796073 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -10,14 +10,10 @@
 
 #include "tegra30-common.h"
 
-/* VDD core PMIC */
-#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
-
 /* High-level configuration options */
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #include "tegra-common-post.h"
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 5cca1e18348d..64d713a19691 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -10,9 +10,6 @@
 
 #include "tegra30-common.h"
 
-/* VDD core PMIC */
-#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
-
 /* High-level configuration options */
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
 
@@ -21,7 +18,6 @@
 	"fdtfile=tegra30-cardhu-a04.dtb\0"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #include "tegra-common-post.h"
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index e3519ed75169..e49eb602081d 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -19,7 +19,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"CEI tk1-som"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 #include "tegra-common-post.h"
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 2ba3c3bc87db..ea7d648eb6a4 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -11,8 +11,6 @@
 #include "tegra20-common.h"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_TEGRA_UARTA_SDIO1
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* NAND support */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index ffed71a2e828..7edb2c0b26d4 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -21,7 +21,6 @@
  * Colibri UART-B: NVIDIA UARTD
  * Colibri UART-C: NVIDIA UARTB
  */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #define UBOOT_UPDATE \
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 82b2efdfe897..c9009e396237 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -14,7 +14,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 211dab4d2337..a1a66bfb64e0 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -14,7 +14,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 
 /* UARTD: keyboard satellite board UART, default */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index ea4964b13d67..aa9e1d811a50 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 #include "tegra-common-post.h"
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index a8d8d8b09e02..efac0febdf81 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* NAND support */
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 21002f99dc88..e885526e625f 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 #include "tegra-common-post.h"
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 653b4c583ad2..f426889e1c41 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 2913d5304be7..24adf4e13f05 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index e78e3c4d6b09..8a1e7d9b9680 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2571"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index bab02dc2d6ed..078d35dde2c9 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -14,7 +14,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Only MMC/PXE/DHCP for now, add USB back in later when supported */
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index a945f4e9b289..898167009f6a 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -16,7 +16,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Compal Paz00"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 99db59c489e0..1d8ac618c0b2 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* NAND support */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index f272fe9bf8f1..e5d672746b12 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index c98322cf0845..ae879abe3f86 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -13,7 +13,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 #include "tegra-common-post.h"
diff --git a/include/configs/tec.h b/include/configs/tec.h
index ddf753da4a9f..e8a9df756d52 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD	/* UARTD: debug UART */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* NAND support */
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 69acabf19fdd..2c668e0611ba 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -73,8 +73,4 @@
 	BOOTENV \
 	BOARD_EXTRA_ENV_SETTINGS
 
-#if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
-#define CONFIG_TEGRA_SPI
-#endif
-
 #endif /* __TEGRA_COMMON_POST_H */
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index e4cbc7da843e..b5bf99122019 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -14,8 +14,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"Compulab Trimslice"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_TEGRA_UARTA_GPU
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* SPI */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index a4eb4bf4aaf3..970893ca17bb 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -15,7 +15,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTA
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index f7a507768ec1..e7b7b911d9b6 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -14,7 +14,6 @@
 #define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
 
 /* Board-specific serial config */
-#define CONFIG_TEGRA_ENABLE_UARTD
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-- 
2.25.1

[PATCH 36/41] Convert CONFIG_THOR_RESET_OFF to Kconfig

[Tom Rini]

This converts the following to Kconfig:
   CONFIG_THOR_RESET_OFF

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 cmd/Kconfig                          | 4 ++++
 configs/topic_miami_defconfig        | 1 +
 configs/topic_miamilite_defconfig    | 1 +
 configs/topic_miamiplus_defconfig    | 1 +
 configs/xilinx_zynq_virt_defconfig   | 1 +
 configs/xilinx_zynqmp_virt_defconfig | 1 +
 include/configs/xilinx_versal.h      | 1 -
 include/configs/xilinx_versal_net.h  | 1 -
 include/configs/xilinx_zynqmp.h      | 1 -
 include/configs/zynq-common.h        | 1 -
 10 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index a4b6fc6a5da0..af12ffba5b7d 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -526,6 +526,10 @@ config CMD_THOR_DOWNLOAD
 	  There is no documentation about this within the U-Boot source code
 	  but you should be able to find something on the interwebs.
 
+config THOR_RESET_OFF
+	bool "thor: Disable reset on completion"
+	depends on CMD_THOR_DOWNLOAD
+
 config CMD_ZBOOT
 	bool "zboot - x86 boot command"
 	help
diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
index ece625f62924..2ae1fb82797b 100644
--- a/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_I2C=y
diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
index 693a602ea395..510ff2ebd877 100644
--- a/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_I2C=y
diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index 97624e69e722..0b708cccf6e9 100644
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_I2C=y
diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig
index 506856576904..610d9de2a637 100644
--- a/configs/xilinx_zynq_virt_defconfig
+++ b/configs/xilinx_zynq_virt_defconfig
@@ -51,6 +51,7 @@ CONFIG_SYS_PBSIZE=2071
 CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index 9696e418daf5..07e61dc2f17e 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -57,6 +57,7 @@ CONFIG_SYS_PBSIZE=2073
 CONFIG_SYS_BOOTM_LEN=0x6400000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_THOR_RESET_OFF=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_MEMTEST=y
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index ee3130ed3277..6ee6786e054a 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -25,7 +25,6 @@
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define CONFIG_THOR_RESET_OFF
 #endif
 
 /* Ethernet driver */
diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index 7d77189693e2..37bdb214629d 100644
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -25,7 +25,6 @@
 
 #if defined(CONFIG_CMD_DFU)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define CONFIG_THOR_RESET_OFF
 #define DFU_ALT_INFO_RAM \
 	"dfu_ram_info=" \
 	"setenv dfu_alt_info " \
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index efe241df97eb..f71cd6609932 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -31,7 +31,6 @@
 
 #if defined(CONFIG_ZYNQMP_USB)
 #define DFU_DEFAULT_POLL_TIMEOUT	300
-#define CONFIG_THOR_RESET_OFF
 
 # define PARTS_DEFAULT \
 	"partitions=uuid_disk=${uuid_gpt_disk};" \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 37b54289073b..d95178eb6422 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -38,7 +38,6 @@
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
 # define DFU_DEFAULT_POLL_TIMEOUT	300
-# define CONFIG_THOR_RESET_OFF
 #endif
 
 /* enable preboot to be loaded before CONFIG_BOOTDELAY */
-- 
2.25.1

[PATCH 37/41] net: Remove more legacy functions

[Tom Rini]

Remove some of the board and arch specific non-DM_ETH helper code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/ls102xa/cpu.c        |  9 ---------
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c |  3 ---
 arch/powerpc/cpu/mpc83xx/cpu.c          | 18 -----------------
 arch/powerpc/cpu/mpc8xxx/cpu.c          | 26 -------------------------
 drivers/net/qe/uec.h                    |  1 -
 include/configs/km/km-mpc83xx.h         |  5 -----
 include/fm_eth.h                        |  1 -
 include/netdev.h                        |  1 -
 8 files changed, 64 deletions(-)

diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index 25e4b49c70e5..c455969609f6 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -302,15 +302,6 @@ int cpu_mmc_init(struct bd_info *bis)
 }
 #endif
 
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_TSEC_ENET) && !defined(CONFIG_DM_ETH)
-	tsec_standard_init(bis);
-#endif
-
-	return 0;
-}
-
 int arch_cpu_init(void)
 {
 	void *epu_base = (void *)(CFG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 99413ef52e22..2aeec7dea7bf 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -1057,9 +1057,6 @@ int cpu_eth_init(struct bd_info *bis)
 
 #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD)
 	error = fsl_mc_ldpaa_init(bis);
-#endif
-#ifdef CONFIG_FMAN_ENET
-	fm_standard_init(bis);
 #endif
 	return error;
 }
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d531898bd89..a6c063556e83 100644
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -180,24 +180,6 @@ void watchdog_reset (void)
 }
 #endif
 
-#ifndef CONFIG_DM_ETH
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_UEC_ETH)
-	uec_standard_init(bis);
-#endif
-
-#if defined(CONFIG_TSEC_ENET)
-	tsec_standard_init(bis);
-#endif
-	return 0;
-}
-#endif /* !CONFIG_DM_ETH */
-
 /*
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 7f2019092296..73d28f2a4e28 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -343,29 +343,3 @@ int fixup_cpu(void)
 #endif
 	return 0;
 }
-
-#ifndef CONFIG_DM_ETH
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_UEC_ETH)
-	uec_standard_init(bis);
-#endif
-
-#if defined(CONFIG_TSEC_ENET) || defined(CONFIG_MPC85XX_FEC)
-	tsec_standard_init(bis);
-#endif
-
-#ifdef CONFIG_FMAN_ENET
-	fm_standard_init(bis);
-#endif
-
-#ifdef CONFIG_VSC9953
-	vsc9953_init(bis);
-#endif
-	return 0;
-}
-#endif
diff --git a/drivers/net/qe/uec.h b/drivers/net/qe/uec.h
index 551d7061ccc3..4510205da32a 100644
--- a/drivers/net/qe/uec.h
+++ b/drivers/net/qe/uec.h
@@ -689,5 +689,4 @@ struct uec_priv {
 
 int uec_initialize(struct bd_info *bis, struct uec_inf *uec_info);
 int uec_eth_init(struct bd_info *bis, struct uec_inf *uecs, int num);
-int uec_standard_init(struct bd_info *bis);
 #endif /* __UEC_H__ */
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 840a4d5401f5..0f5387866239 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -90,8 +90,3 @@
 		"era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0"	 \
 	"unlock=yes\0"							 \
 	""
-
-/*
- * QE UEC ethernet configuration
- */
-#define CONFIG_UEC_ETH
diff --git a/include/fm_eth.h b/include/fm_eth.h
index aeb640925ee2..6012a449fd23 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -202,7 +202,6 @@ struct memac_mdio_info {
 int fm_tgec_mdio_init(struct bd_info *bis, struct tgec_mdio_info *info);
 int fm_memac_mdio_init(struct bd_info *bis, struct memac_mdio_info *info);
 
-int fm_standard_init(struct bd_info *bis);
 void fman_enet_init(void);
 void fdt_fixup_fman_ethernet(void *fdt);
 phy_interface_t fm_info_get_enet_if(enum fm_port port);
diff --git a/include/netdev.h b/include/netdev.h
index b3f8584e9006..2b4e474ed084 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -70,7 +70,6 @@ int sh_eth_initialize(struct bd_info *bis);
 int skge_initialize(struct bd_info *bis);
 int smc91111_initialize(u8 dev_num, phys_addr_t base_addr);
 int smc911x_initialize(u8 dev_num, phys_addr_t base_addr);
-int uec_standard_init(struct bd_info *bis);
 int uli526x_initialize(struct bd_info *bis);
 int armada100_fec_register(unsigned long base_addr);
 
-- 
2.25.1

[PATCH 38/41] net: vsc9953: Remove this driver

[Tom Rini]

No platforms enable this driver as there's no T1040D4RDB nor T1040RDB
support at this time.  Remove.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/t104xrdb/eth.c |   46 -
 drivers/net/Kconfig            |    3 -
 drivers/net/Makefile           |    1 -
 drivers/net/vsc9953.c          | 2754 --------------------------------
 4 files changed, 2804 deletions(-)
 delete mode 100644 drivers/net/vsc9953.c

diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index fe51d68c7bb6..c011aa96fbef 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -22,10 +22,6 @@ int board_eth_init(struct bd_info *bis)
 	struct memac_mdio_info memac_mdio_info;
 	unsigned int i;
 	int phy_addr = 0;
-#ifdef CONFIG_VSC9953
-	phy_interface_t phy_int;
-	struct mii_dev *bus;
-#endif
 
 	printf("Initializing Fman\n");
 
@@ -107,48 +103,6 @@ int board_eth_init(struct bd_info *bis)
 							DEFAULT_FM_MDIO_NAME));
 	}
 
-#ifdef CONFIG_VSC9953
-	/* SerDes configured for QSGMII */
-	if (serdes_get_first_lane(FSL_SRDS_1, QSGMII_SW1_A) >= 0) {
-		for (i = 0; i < 4; i++) {
-			bus = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-			phy_addr = CFG_SYS_FM1_QSGMII11_PHY_ADDR + i;
-			phy_int = PHY_INTERFACE_MODE_QSGMII;
-
-			vsc9953_port_info_set_mdio(i, bus);
-			vsc9953_port_info_set_phy_address(i, phy_addr);
-			vsc9953_port_info_set_phy_int(i, phy_int);
-			vsc9953_port_enable(i);
-		}
-	}
-	if (serdes_get_first_lane(FSL_SRDS_1, QSGMII_SW1_B) >= 0) {
-		for (i = 4; i < 8; i++) {
-			bus = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-			phy_addr = CFG_SYS_FM1_QSGMII21_PHY_ADDR + i - 4;
-			phy_int = PHY_INTERFACE_MODE_QSGMII;
-
-			vsc9953_port_info_set_mdio(i, bus);
-			vsc9953_port_info_set_phy_address(i, phy_addr);
-			vsc9953_port_info_set_phy_int(i, phy_int);
-			vsc9953_port_enable(i);
-		}
-	}
-
-	/* Connect DTSEC1 to L2 switch if it doesn't have a PHY */
-	if (serdes_get_first_lane(FSL_SRDS_1, SGMII_FM1_DTSEC1) < 0)
-		vsc9953_port_enable(8);
-
-	/* Connect DTSEC2 to L2 switch if it doesn't have a PHY */
-	if (serdes_get_first_lane(FSL_SRDS_1, SGMII_FM1_DTSEC2) < 0) {
-		/* Enable L2 On MAC2 using SCFG */
-		struct ccsr_scfg *scfg = (struct ccsr_scfg *)
-				CFG_SYS_MPC85xx_SCFG;
-
-		out_be32(&scfg->esgmiiselcr, in_be32(&scfg->esgmiiselcr) |
-			 (0x80000000));
-		vsc9953_port_enable(9);
-	}
-#endif
 
 	cpu_eth_init(bis);
 #endif
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 53fb69f52607..7873538cc2df 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -709,9 +709,6 @@ config XILINX_AXIMRMAC
 config VSC7385_ENET
 	bool "Vitesse 7385 Switch Firmware Upload driver"
 
-config VSC9953
-	bool "Vitesse VSC9953 L2 Switch driver"
-
 config XILINX_EMACLITE
 	select PHYLIB
 	select MII
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d3fc6b7d3ee4..5b4e60eea3eb 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -87,7 +87,6 @@ obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o
 obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o
 obj-$(CONFIG_TULIP) += dc2114x.o
 obj-$(CONFIG_VSC7385_ENET) += vsc7385.o
-obj-$(CONFIG_VSC9953) += vsc9953.o
 obj-$(CONFIG_XILINX_AXIEMAC) += xilinx_axi_emac.o
 obj-$(CONFIG_XILINX_AXIMRMAC) += xilinx_axi_mrmac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c
deleted file mode 100644
index 29f26b4b3320..000000000000
--- a/drivers/net/vsc9953.c
+++ /dev/null
@@ -1,2754 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  Copyright 2014 - 2015 Freescale Semiconductor, Inc.
- *
- *  Driver for the Vitesse VSC9953 L2 Switch
- */
-
-#include <common.h>
-#include <command.h>
-#include <log.h>
-#include <asm/io.h>
-#include <asm/fsl_serdes.h>
-#include <fm_eth.h>
-#include <fsl_memac.h>
-#include <bitfield.h>
-#include <errno.h>
-#include <malloc.h>
-#include <vsc9953.h>
-#include <ethsw.h>
-#include <linux/delay.h>
-
-static struct vsc9953_info vsc9953_l2sw = {
-		.port[0] = VSC9953_PORT_INFO_INITIALIZER(0),
-		.port[1] = VSC9953_PORT_INFO_INITIALIZER(1),
-		.port[2] = VSC9953_PORT_INFO_INITIALIZER(2),
-		.port[3] = VSC9953_PORT_INFO_INITIALIZER(3),
-		.port[4] = VSC9953_PORT_INFO_INITIALIZER(4),
-		.port[5] = VSC9953_PORT_INFO_INITIALIZER(5),
-		.port[6] = VSC9953_PORT_INFO_INITIALIZER(6),
-		.port[7] = VSC9953_PORT_INFO_INITIALIZER(7),
-		.port[8] = VSC9953_PORT_INFO_INITIALIZER(8),
-		.port[9] = VSC9953_PORT_INFO_INITIALIZER(9),
-};
-
-void vsc9953_port_info_set_mdio(int port_no, struct mii_dev *bus)
-{
-	if (!VSC9953_PORT_CHECK(port_no))
-		return;
-
-	vsc9953_l2sw.port[port_no].bus = bus;
-}
-
-void vsc9953_port_info_set_phy_address(int port_no, int address)
-{
-	if (!VSC9953_PORT_CHECK(port_no))
-		return;
-
-	vsc9953_l2sw.port[port_no].phyaddr = address;
-}
-
-void vsc9953_port_info_set_phy_int(int port_no, phy_interface_t phy_int)
-{
-	if (!VSC9953_PORT_CHECK(port_no))
-		return;
-
-	vsc9953_l2sw.port[port_no].enet_if = phy_int;
-}
-
-void vsc9953_port_enable(int port_no)
-{
-	if (!VSC9953_PORT_CHECK(port_no))
-		return;
-
-	vsc9953_l2sw.port[port_no].enabled = 1;
-}
-
-void vsc9953_port_disable(int port_no)
-{
-	if (!VSC9953_PORT_CHECK(port_no))
-		return;
-
-	vsc9953_l2sw.port[port_no].enabled = 0;
-}
-
-static void vsc9953_mdio_write(struct vsc9953_mii_mng *phyregs, int port_addr,
-		int regnum, int value)
-{
-	int timeout = 50000;
-
-	out_le32(&phyregs->miimcmd, (0x1 << 31) | ((port_addr & 0x1f) << 25) |
-			((regnum & 0x1f) << 20) | ((value & 0xffff) << 4) |
-			(0x1 << 1));
-	asm("sync");
-
-	while ((in_le32(&phyregs->miimstatus) & 0x8) && --timeout)
-		udelay(1);
-
-	if (timeout == 0)
-		debug("Timeout waiting for MDIO write\n");
-}
-
-static int vsc9953_mdio_read(struct vsc9953_mii_mng *phyregs, int port_addr,
-		int regnum)
-{
-	int value = 0xFFFF;
-	int timeout = 50000;
-
-	while ((in_le32(&phyregs->miimstatus) & MIIMIND_OPR_PEND) && --timeout)
-		udelay(1);
-	if (timeout == 0) {
-		debug("Timeout waiting for MDIO operation to finish\n");
-		return value;
-	}
-
-	/* Put the address of the phy, and the register
-	 * number into MIICMD
-	 */
-	out_le32(&phyregs->miimcmd, (0x1 << 31) | ((port_addr & 0x1f) << 25) |
-			((regnum & 0x1f) << 20) | ((value & 0xffff) << 4) |
-			(0x2 << 1));
-
-	timeout = 50000;
-	/* Wait for the the indication that the read is done */
-	while ((in_le32(&phyregs->miimstatus) & 0x8) && --timeout)
-		udelay(1);
-	if (timeout == 0)
-		debug("Timeout waiting for MDIO read\n");
-
-	/* Grab the value read from the PHY */
-	value = in_le32(&phyregs->miimdata);
-
-	if ((value & 0x00030000) == 0)
-		return value & 0x0000ffff;
-
-	return value;
-}
-
-static int init_phy(struct eth_device *dev)
-{
-	struct vsc9953_port_info *l2sw_port = dev->priv;
-	struct phy_device *phydev = NULL;
-
-#ifdef CONFIG_PHYLIB
-	if (!l2sw_port->bus)
-		return 0;
-	phydev = phy_connect(l2sw_port->bus, l2sw_port->phyaddr, dev,
-			l2sw_port->enet_if);
-	if (!phydev) {
-		printf("Failed to connect\n");
-		return -1;
-	}
-
-	phydev->supported &= SUPPORTED_10baseT_Half |
-			SUPPORTED_10baseT_Full |
-			SUPPORTED_100baseT_Half |
-			SUPPORTED_100baseT_Full |
-			SUPPORTED_1000baseT_Full;
-	phydev->advertising = phydev->supported;
-
-	l2sw_port->phydev = phydev;
-
-	phy_config(phydev);
-#endif
-
-	return 0;
-}
-
-static int vsc9953_port_init(int port_no)
-{
-	struct eth_device *dev;
-
-	/* Internal ports never have a PHY */
-	if (VSC9953_INTERNAL_PORT_CHECK(port_no))
-		return 0;
-
-	/* alloc eth device */
-	dev = (struct eth_device *)calloc(1, sizeof(struct eth_device));
-	if (!dev)
-		return -ENOMEM;
-
-	sprintf(dev->name, "SW@PORT%d", port_no);
-	dev->priv = &vsc9953_l2sw.port[port_no];
-	dev->init = NULL;
-	dev->halt = NULL;
-	dev->send = NULL;
-	dev->recv = NULL;
-
-	if (init_phy(dev)) {
-		free(dev);
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static int vsc9953_vlan_table_poll_idle(void)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-	int timeout;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	timeout = 50000;
-	while (((in_le32(&l2ana_reg->ana_tables.vlan_access) &
-		 VSC9953_VLAN_CMD_MASK) != VSC9953_VLAN_CMD_IDLE) && --timeout)
-		udelay(1);
-
-	return timeout ? 0 : -EBUSY;
-}
-
-#ifdef CONFIG_CMD_ETHSW
-/* Add/remove a port to/from a VLAN */
-static void vsc9953_vlan_table_membership_set(int vid, u32 port_no, u8 add)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	if (vsc9953_vlan_table_poll_idle() < 0) {
-		debug("VLAN table timeout\n");
-		return;
-	}
-
-	val = in_le32(&l2ana_reg->ana_tables.vlan_tidx);
-	val = bitfield_replace_by_mask(val, VSC9953_ANA_TBL_VID_MASK, vid);
-	out_le32(&l2ana_reg->ana_tables.vlan_tidx, val);
-
-	clrsetbits_le32(&l2ana_reg->ana_tables.vlan_access,
-			VSC9953_VLAN_CMD_MASK, VSC9953_VLAN_CMD_READ);
-
-	if (vsc9953_vlan_table_poll_idle() < 0) {
-		debug("VLAN table timeout\n");
-		return;
-	}
-
-	val = in_le32(&l2ana_reg->ana_tables.vlan_tidx);
-	val = bitfield_replace_by_mask(val, VSC9953_ANA_TBL_VID_MASK, vid);
-	out_le32(&l2ana_reg->ana_tables.vlan_tidx, val);
-
-	val = in_le32(&l2ana_reg->ana_tables.vlan_access);
-	if (!add) {
-		val = bitfield_replace_by_mask(val, VSC9953_VLAN_CMD_MASK,
-						VSC9953_VLAN_CMD_WRITE) &
-		      ~(bitfield_replace_by_mask(0, VSC9953_VLAN_PORT_MASK,
-						 (1 << port_no)));
-		 ;
-	} else {
-		val = bitfield_replace_by_mask(val, VSC9953_VLAN_CMD_MASK,
-						VSC9953_VLAN_CMD_WRITE) |
-		      bitfield_replace_by_mask(0, VSC9953_VLAN_PORT_MASK,
-					       (1 << port_no));
-	}
-	out_le32(&l2ana_reg->ana_tables.vlan_access, val);
-
-	/* wait for VLAN table command to flush */
-	if (vsc9953_vlan_table_poll_idle() < 0) {
-		debug("VLAN table timeout\n");
-		return;
-	}
-}
-
-/* show VLAN membership for a port */
-static void vsc9953_vlan_membership_show(int port_no)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-	u32 vid;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	printf("Port %d VLAN membership: ", port_no);
-
-	for (vid = 0; vid < VSC9953_MAX_VLAN; vid++) {
-		if (vsc9953_vlan_table_poll_idle() < 0) {
-			debug("VLAN table timeout\n");
-			return;
-		}
-
-		val = in_le32(&l2ana_reg->ana_tables.vlan_tidx);
-		val = bitfield_replace_by_mask(val, VSC9953_ANA_TBL_VID_MASK,
-					       vid);
-		out_le32(&l2ana_reg->ana_tables.vlan_tidx, val);
-
-		clrsetbits_le32(&l2ana_reg->ana_tables.vlan_access,
-				VSC9953_VLAN_CMD_MASK, VSC9953_VLAN_CMD_READ);
-
-		if (vsc9953_vlan_table_poll_idle() < 0) {
-			debug("VLAN table timeout\n");
-			return;
-		}
-
-		val = in_le32(&l2ana_reg->ana_tables.vlan_access);
-
-		if (bitfield_extract_by_mask(val, VSC9953_VLAN_PORT_MASK) &
-		    (1 << port_no))
-			printf("%d ", vid);
-	}
-	printf("\n");
-}
-#endif
-
-/* vlan table set/clear all membership of vid */
-static void vsc9953_vlan_table_membership_all_set(int vid, int set_member)
-{
-	uint val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	if (vsc9953_vlan_table_poll_idle() < 0) {
-		debug("VLAN table timeout\n");
-		return;
-	}
-
-	/* read current vlan configuration */
-	val = in_le32(&l2ana_reg->ana_tables.vlan_tidx);
-	out_le32(&l2ana_reg->ana_tables.vlan_tidx,
-		 bitfield_replace_by_mask(val, VSC9953_ANA_TBL_VID_MASK, vid));
-
-	clrsetbits_le32(&l2ana_reg->ana_tables.vlan_access,
-			VSC9953_VLAN_CMD_MASK, VSC9953_VLAN_CMD_READ);
-
-	if (vsc9953_vlan_table_poll_idle() < 0) {
-		debug("VLAN table timeout\n");
-		return;
-	}
-
-	val = in_le32(&l2ana_reg->ana_tables.vlan_tidx);
-	out_le32(&l2ana_reg->ana_tables.vlan_tidx,
-		 bitfield_replace_by_mask(val, VSC9953_ANA_TBL_VID_MASK, vid));
-
-	clrsetbits_le32(&l2ana_reg->ana_tables.vlan_access,
-			VSC9953_VLAN_PORT_MASK | VSC9953_VLAN_CMD_MASK,
-			VSC9953_VLAN_CMD_WRITE |
-			(set_member ? VSC9953_VLAN_PORT_MASK : 0));
-}
-
-#ifdef CONFIG_CMD_ETHSW
-/* Get PVID of a VSC9953 port */
-static int vsc9953_port_vlan_pvid_get(int port_nr, int *pvid)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_nr].enabled) {
-		printf("Port %d is administrative down\n", port_nr);
-		return -1;
-	}
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-				VSC9953_ANA_OFFSET);
-
-	/* Get ingress PVID */
-	val = in_le32(&l2ana_reg->port[port_nr].vlan_cfg);
-	*pvid = bitfield_extract_by_mask(val, VSC9953_VLAN_CFG_VID_MASK);
-
-	return 0;
-}
-#endif
-
-/* Set PVID for a VSC9953 port */
-static void vsc9953_port_vlan_pvid_set(int port_no, int pvid)
-{
-	uint val;
-	struct vsc9953_analyzer *l2ana_reg;
-	struct vsc9953_rew_reg *l2rew_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-	l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET +
-			VSC9953_REW_OFFSET);
-
-	/* Set PVID on ingress */
-	val = in_le32(&l2ana_reg->port[port_no].vlan_cfg);
-	val = bitfield_replace_by_mask(val, VSC9953_VLAN_CFG_VID_MASK, pvid);
-	out_le32(&l2ana_reg->port[port_no].vlan_cfg, val);
-
-	/* Set PVID on egress */
-	val = in_le32(&l2rew_reg->port[port_no].port_vlan_cfg);
-	val = bitfield_replace_by_mask(val, VSC9953_PORT_VLAN_CFG_VID_MASK,
-				       pvid);
-	out_le32(&l2rew_reg->port[port_no].port_vlan_cfg, val);
-}
-
-static void vsc9953_port_all_vlan_pvid_set(int pvid)
-{
-	int i;
-
-	for (i = 0; i < VSC9953_MAX_PORTS; i++)
-		vsc9953_port_vlan_pvid_set(i, pvid);
-}
-
-/* Enable/disable vlan aware of a VSC9953 port */
-static void vsc9953_port_vlan_aware_set(int port_no, int enabled)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	if (enabled)
-		setbits_le32(&l2ana_reg->port[port_no].vlan_cfg,
-			     VSC9953_VLAN_CFG_AWARE_ENA);
-	else
-		clrbits_le32(&l2ana_reg->port[port_no].vlan_cfg,
-			     VSC9953_VLAN_CFG_AWARE_ENA);
-}
-
-/* Set all VSC9953 ports' vlan aware  */
-static void vsc9953_port_all_vlan_aware_set(int enabled)
-{
-	int i;
-
-	for (i = 0; i < VSC9953_MAX_PORTS; i++)
-		vsc9953_port_vlan_aware_set(i, enabled);
-}
-
-/* Enable/disable vlan pop count of a VSC9953 port */
-static void vsc9953_port_vlan_popcnt_set(int port_no, int popcnt)
-{
-	uint val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	if (popcnt > 3 || popcnt < 0) {
-		printf("Invalid pop count value: %d\n", port_no);
-		return;
-	}
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	val = in_le32(&l2ana_reg->port[port_no].vlan_cfg);
-	val = bitfield_replace_by_mask(val, VSC9953_VLAN_CFG_POP_CNT_MASK,
-				       popcnt);
-	out_le32(&l2ana_reg->port[port_no].vlan_cfg, val);
-}
-
-/* Set all VSC9953 ports' pop count  */
-static void vsc9953_port_all_vlan_poncnt_set(int popcnt)
-{
-	int i;
-
-	for (i = 0; i < VSC9953_MAX_PORTS; i++)
-		vsc9953_port_vlan_popcnt_set(i, popcnt);
-}
-
-/* Enable/disable learning for frames dropped due to ingress filtering */
-static void vsc9953_vlan_ingr_fltr_learn_drop(int enable)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	if (enable)
-		setbits_le32(&l2ana_reg->ana.adv_learn, VSC9953_VLAN_CHK);
-	else
-		clrbits_le32(&l2ana_reg->ana.adv_learn, VSC9953_VLAN_CHK);
-}
-
-enum aggr_code_mode {
-	AGGR_CODE_RAND = 0,
-	AGGR_CODE_ALL,	/* S/D MAC, IPv4 S/D IP, IPv6 Flow Label, S/D PORT */
-};
-
-/* Set aggregation code generation mode */
-static int vsc9953_aggr_code_set(enum aggr_code_mode ac)
-{
-	int rc;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	switch (ac) {
-	case AGGR_CODE_RAND:
-		clrsetbits_le32(&l2ana_reg->common.aggr_cfg,
-				VSC9953_AC_DMAC_ENA | VSC9953_AC_SMAC_ENA |
-				VSC9953_AC_IP6_LBL_ENA |
-				VSC9953_AC_IP6_TCPUDP_ENA |
-				VSC9953_AC_IP4_SIPDIP_ENA |
-				VSC9953_AC_IP4_TCPUDP_ENA, VSC9953_AC_RND_ENA);
-		rc = 0;
-		break;
-	case AGGR_CODE_ALL:
-		clrsetbits_le32(&l2ana_reg->common.aggr_cfg, VSC9953_AC_RND_ENA,
-				VSC9953_AC_DMAC_ENA | VSC9953_AC_SMAC_ENA |
-				VSC9953_AC_IP6_LBL_ENA |
-				VSC9953_AC_IP6_TCPUDP_ENA |
-				VSC9953_AC_IP4_SIPDIP_ENA |
-				VSC9953_AC_IP4_TCPUDP_ENA);
-		rc = 0;
-		break;
-	default:
-		/* unknown mode for aggregation code */
-		rc = -EINVAL;
-	}
-
-	return rc;
-}
-
-/* Egress untag modes of a VSC9953 port */
-enum egress_untag_mode {
-	EGRESS_UNTAG_ALL = 0,
-	EGRESS_UNTAG_PVID_AND_ZERO,
-	EGRESS_UNTAG_ZERO,
-	EGRESS_UNTAG_NONE,
-};
-
-#ifdef CONFIG_CMD_ETHSW
-/* Get egress tagging configuration for a VSC9953 port */
-static int vsc9953_port_vlan_egr_untag_get(int port_no,
-					   enum egress_untag_mode *mode)
-{
-	u32 val;
-	struct vsc9953_rew_reg *l2rew_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return -1;
-	}
-
-	l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET +
-			VSC9953_REW_OFFSET);
-
-	val = in_le32(&l2rew_reg->port[port_no].port_tag_cfg);
-
-	switch (val & VSC9953_TAG_CFG_MASK) {
-	case VSC9953_TAG_CFG_NONE:
-		*mode = EGRESS_UNTAG_ALL;
-		return 0;
-	case VSC9953_TAG_CFG_ALL_BUT_PVID_ZERO:
-		*mode = EGRESS_UNTAG_PVID_AND_ZERO;
-		return 0;
-	case VSC9953_TAG_CFG_ALL_BUT_ZERO:
-		*mode = EGRESS_UNTAG_ZERO;
-		return 0;
-	case VSC9953_TAG_CFG_ALL:
-		*mode = EGRESS_UNTAG_NONE;
-		return 0;
-	default:
-		printf("Unknown egress tagging configuration for port %d\n",
-		       port_no);
-		return -1;
-	}
-}
-
-/* Show egress tagging configuration for a VSC9953 port */
-static void vsc9953_port_vlan_egr_untag_show(int port_no)
-{
-	enum egress_untag_mode mode;
-
-	if (vsc9953_port_vlan_egr_untag_get(port_no, &mode)) {
-		printf("%7d\t%17s\n", port_no, "-");
-		return;
-	}
-
-	printf("%7d\t", port_no);
-	switch (mode) {
-	case EGRESS_UNTAG_ALL:
-		printf("%17s\n", "all");
-		break;
-	case EGRESS_UNTAG_NONE:
-		printf("%17s\n", "none");
-		break;
-	case EGRESS_UNTAG_PVID_AND_ZERO:
-		printf("%17s\n", "PVID and 0");
-		break;
-	case EGRESS_UNTAG_ZERO:
-		printf("%17s\n", "0");
-		break;
-	default:
-		printf("%17s\n", "-");
-	}
-}
-#endif
-
-static void vsc9953_port_vlan_egr_untag_set(int port_no,
-					    enum egress_untag_mode mode)
-{
-	struct vsc9953_rew_reg *l2rew_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET +
-			VSC9953_REW_OFFSET);
-
-	switch (mode) {
-	case EGRESS_UNTAG_ALL:
-		clrsetbits_le32(&l2rew_reg->port[port_no].port_tag_cfg,
-				VSC9953_TAG_CFG_MASK, VSC9953_TAG_CFG_NONE);
-		break;
-	case EGRESS_UNTAG_PVID_AND_ZERO:
-		clrsetbits_le32(&l2rew_reg->port[port_no].port_tag_cfg,
-				VSC9953_TAG_CFG_MASK,
-				VSC9953_TAG_CFG_ALL_BUT_PVID_ZERO);
-		break;
-	case EGRESS_UNTAG_ZERO:
-		clrsetbits_le32(&l2rew_reg->port[port_no].port_tag_cfg,
-				VSC9953_TAG_CFG_MASK,
-				VSC9953_TAG_CFG_ALL_BUT_ZERO);
-		break;
-	case EGRESS_UNTAG_NONE:
-		clrsetbits_le32(&l2rew_reg->port[port_no].port_tag_cfg,
-				VSC9953_TAG_CFG_MASK, VSC9953_TAG_CFG_ALL);
-		break;
-	default:
-		printf("Unknown untag mode for port %d\n", port_no);
-	}
-}
-
-static void vsc9953_port_all_vlan_egress_untagged_set(
-		enum egress_untag_mode mode)
-{
-	int i;
-
-	for (i = 0; i < VSC9953_MAX_PORTS; i++)
-		vsc9953_port_vlan_egr_untag_set(i, mode);
-}
-
-static int vsc9953_autoage_time_set(int age_period)
-{
-	u32 autoage;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	if (age_period < 0 || age_period > VSC9953_AUTOAGE_PERIOD_MASK)
-		return -EINVAL;
-
-	autoage = bitfield_replace_by_mask(in_le32(&l2ana_reg->ana.auto_age),
-					   VSC9953_AUTOAGE_PERIOD_MASK,
-					   age_period);
-	out_le32(&l2ana_reg->ana.auto_age, autoage);
-
-	return 0;
-}
-
-#ifdef CONFIG_CMD_ETHSW
-
-/* Enable/disable status of a VSC9953 port */
-static void vsc9953_port_status_set(int port_no, u8 enabled)
-{
-	struct vsc9953_qsys_reg *l2qsys_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled)
-		return;
-
-	l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET +
-			VSC9953_QSYS_OFFSET);
-
-	if (enabled)
-		setbits_le32(&l2qsys_reg->sys.switch_port_mode[port_no],
-			     VSC9953_PORT_ENA);
-	else
-		clrbits_le32(&l2qsys_reg->sys.switch_port_mode[port_no],
-			     VSC9953_PORT_ENA);
-}
-
-/* Start autonegotiation for a VSC9953 PHY */
-static void vsc9953_phy_autoneg(int port_no)
-{
-	if (!vsc9953_l2sw.port[port_no].phydev)
-		return;
-
-	if (vsc9953_l2sw.port[port_no].phydev->drv->startup(
-			vsc9953_l2sw.port[port_no].phydev))
-		printf("Failed to start PHY for port %d\n", port_no);
-}
-
-/* Print a VSC9953 port's configuration */
-static void vsc9953_port_config_show(int port_no)
-{
-	int speed;
-	int duplex;
-	int link;
-	u8 enabled;
-	u32 val;
-	struct vsc9953_qsys_reg *l2qsys_reg;
-
-	l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET +
-			VSC9953_QSYS_OFFSET);
-
-	val = in_le32(&l2qsys_reg->sys.switch_port_mode[port_no]);
-	enabled = vsc9953_l2sw.port[port_no].enabled &&
-		  (val & VSC9953_PORT_ENA);
-
-	/* internal ports (8 and 9) are fixed */
-	if (VSC9953_INTERNAL_PORT_CHECK(port_no)) {
-		link = 1;
-		speed = SPEED_2500;
-		duplex = DUPLEX_FULL;
-	} else {
-		if (vsc9953_l2sw.port[port_no].phydev) {
-			link = vsc9953_l2sw.port[port_no].phydev->link;
-			speed = vsc9953_l2sw.port[port_no].phydev->speed;
-			duplex = vsc9953_l2sw.port[port_no].phydev->duplex;
-		} else {
-			link = -1;
-			speed = -1;
-			duplex = -1;
-		}
-	}
-
-	printf("%8d ", port_no);
-	printf("%8s ", enabled == 1 ? "enabled" : "disabled");
-	printf("%8s ", link == 1 ? "up" : "down");
-
-	switch (speed) {
-	case SPEED_10:
-		printf("%8d ", 10);
-		break;
-	case SPEED_100:
-		printf("%8d ", 100);
-		break;
-	case SPEED_1000:
-		printf("%8d ", 1000);
-		break;
-	case SPEED_2500:
-		printf("%8d ", 2500);
-		break;
-	case SPEED_10000:
-		printf("%8d ", 10000);
-		break;
-	default:
-		printf("%8s ", "-");
-	}
-
-	printf("%8s\n", duplex == DUPLEX_FULL ? "full" : "half");
-}
-
-/* Show VSC9953 ports' statistics */
-static void vsc9953_port_statistics_show(int port_no)
-{
-	u32 rx_val;
-	u32 tx_val;
-	struct vsc9953_system_reg *l2sys_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	l2sys_reg = (struct vsc9953_system_reg *)(VSC9953_OFFSET +
-			VSC9953_SYS_OFFSET);
-
-	printf("Statistics for L2 Switch port %d:\n", port_no);
-
-	/* Set counter view for our port */
-	out_le32(&l2sys_reg->sys.stat_cfg, port_no);
-
-#define VSC9953_STATS_PRINTF "%-15s %10u"
-
-	/* Get number of Rx and Tx frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_short) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_frag) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_jabber) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_long) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_64) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_65_127) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_128_255) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_256_511) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_512_1023) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_1024_1526) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_jumbo);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_64) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_65_127) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_128_255) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_256_511) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_512_1023) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_1024_1526) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_jumbo);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx frames:", rx_val, "Tx frames:", tx_val);
-
-	/* Get number of Rx and Tx bytes */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_oct);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_oct);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx bytes:", rx_val, "Tx bytes:", tx_val);
-
-	/* Get number of Rx frames received ok and Tx frames sent ok */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_0) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_1) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_2) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_3) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_4) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_5) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_6) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_yellow_prio_7) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_0) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_1) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_2) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_3) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_4) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_5) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_6) +
-		 in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_green_prio_7);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_64) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_65_127) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_128_255) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_256_511) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_512_1023) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_1024_1526) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_jumbo);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx frames ok:", rx_val, "Tx frames ok:", tx_val);
-
-	/* Get number of Rx and Tx unicast frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_uc);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_uc);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx unicast:", rx_val, "Tx unicast:", tx_val);
-
-	/* Get number of Rx and Tx broadcast frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_bc);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_bc);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx broadcast:", rx_val, "Tx broadcast:", tx_val);
-
-	/* Get number of Rx and Tx frames of 64B */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_64);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_64);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx 64B:", rx_val, "Tx 64B:", tx_val);
-
-	/* Get number of Rx and Tx frames with sizes between 65B and 127B */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_65_127);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_65_127);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx 65B-127B:", rx_val, "Tx 65B-127B:", tx_val);
-
-	/* Get number of Rx and Tx frames with sizes between 128B and 255B */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_128_255);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_128_255);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx 128B-255B:", rx_val, "Tx 128B-255B:", tx_val);
-
-	/* Get number of Rx and Tx frames with sizes between 256B and 511B */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_256_511);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_256_511);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx 256B-511B:", rx_val, "Tx 256B-511B:", tx_val);
-
-	/* Get number of Rx and Tx frames with sizes between 512B and 1023B */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_512_1023);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_512_1023);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx 512B-1023B:", rx_val, "Tx 512B-1023B:", tx_val);
-
-	/* Get number of Rx and Tx frames with sizes between 1024B and 1526B */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_1024_1526);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_1024_1526);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx 1024B-1526B:", rx_val, "Tx 1024B-1526B:", tx_val);
-
-	/* Get number of Rx and Tx jumbo frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_sz_jumbo);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_sz_jumbo);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx jumbo:", rx_val, "Tx jumbo:", tx_val);
-
-	/* Get number of Rx and Tx dropped frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_cat_drop) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_tail) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_0) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_1) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_2) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_3) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_4) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_5) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_6) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_yellow_prio_7) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_0) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_1) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_2) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_3) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_4) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_5) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_6) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_green_prio_7);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_drop) +
-		 in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_aged);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx drops:", rx_val, "Tx drops:", tx_val);
-
-	/*
-	 * Get number of Rx frames with CRC or alignment errors
-	 * and number of detected Tx collisions
-	 */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_crc);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_col);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx CRC&align:", rx_val, "Tx coll:", tx_val);
-
-	/*
-	 * Get number of Rx undersized frames and
-	 * number of Tx aged frames
-	 */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_short);
-	tx_val = in_le32(&l2sys_reg->stat.tx_cntrs.c_tx_aged);
-	printf(VSC9953_STATS_PRINTF"\t\t"VSC9953_STATS_PRINTF"\n",
-	       "Rx undersize:", rx_val, "Tx aged:", tx_val);
-
-	/* Get number of Rx oversized frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_long);
-	printf(VSC9953_STATS_PRINTF"\n", "Rx oversized:", rx_val);
-
-	/* Get number of Rx fragmented frames */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_frag);
-	printf(VSC9953_STATS_PRINTF"\n", "Rx fragments:", rx_val);
-
-	/* Get number of Rx jabber errors */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_jabber);
-	printf(VSC9953_STATS_PRINTF"\n", "Rx jabbers:", rx_val);
-
-	/*
-	 * Get number of Rx frames filtered due to classification rules or
-	 * no destination ports
-	 */
-	rx_val = in_le32(&l2sys_reg->stat.rx_cntrs.c_rx_cat_drop) +
-		 in_le32(&l2sys_reg->stat.drop_cntrs.c_dr_local);
-	printf(VSC9953_STATS_PRINTF"\n", "Rx filtered:", rx_val);
-
-	printf("\n");
-}
-
-/* Clear statistics for a VSC9953 port */
-static void vsc9953_port_statistics_clear(int port_no)
-{
-	struct vsc9953_system_reg *l2sys_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	l2sys_reg = (struct vsc9953_system_reg *)(VSC9953_OFFSET +
-			VSC9953_SYS_OFFSET);
-
-	/* Clear all counter groups for our ports */
-	out_le32(&l2sys_reg->sys.stat_cfg, port_no |
-		 VSC9953_STAT_CLEAR_RX | VSC9953_STAT_CLEAR_TX |
-		 VSC9953_STAT_CLEAR_DR);
-}
-
-enum port_learn_mode {
-	PORT_LEARN_NONE,
-	PORT_LEARN_AUTO
-};
-
-/* Set learning configuration for a VSC9953 port */
-static void vsc9953_port_learn_mode_set(int port_no, enum port_learn_mode mode)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return;
-	}
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	switch (mode) {
-	case PORT_LEARN_NONE:
-		clrbits_le32(&l2ana_reg->port[port_no].port_cfg,
-			     VSC9953_PORT_CFG_LEARN_DROP |
-			     VSC9953_PORT_CFG_LEARN_CPU |
-			     VSC9953_PORT_CFG_LEARN_AUTO |
-			     VSC9953_PORT_CFG_LEARN_ENA);
-		break;
-	case PORT_LEARN_AUTO:
-		clrsetbits_le32(&l2ana_reg->port[port_no].port_cfg,
-				VSC9953_PORT_CFG_LEARN_DROP |
-				VSC9953_PORT_CFG_LEARN_CPU,
-				VSC9953_PORT_CFG_LEARN_ENA |
-				VSC9953_PORT_CFG_LEARN_AUTO);
-		break;
-	default:
-		printf("Unknown learn mode for port %d\n", port_no);
-	}
-}
-
-/* Get learning configuration for a VSC9953 port */
-static int vsc9953_port_learn_mode_get(int port_no, enum port_learn_mode *mode)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	/* Administrative down */
-	if (!vsc9953_l2sw.port[port_no].enabled) {
-		printf("Port %d is administrative down\n", port_no);
-		return -1;
-	}
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	/* For now we only support HW learning (auto) and no learning */
-	val = in_le32(&l2ana_reg->port[port_no].port_cfg);
-	if ((val & (VSC9953_PORT_CFG_LEARN_ENA |
-		    VSC9953_PORT_CFG_LEARN_AUTO)) ==
-	    (VSC9953_PORT_CFG_LEARN_ENA | VSC9953_PORT_CFG_LEARN_AUTO))
-		*mode = PORT_LEARN_AUTO;
-	else
-		*mode = PORT_LEARN_NONE;
-
-	return 0;
-}
-
-/* wait for FDB to become available */
-static int vsc9953_mac_table_poll_idle(void)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-	u32 timeout;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	timeout = 50000;
-	while (((in_le32(&l2ana_reg->ana_tables.mac_access) &
-			 VSC9953_MAC_CMD_MASK) !=
-		VSC9953_MAC_CMD_IDLE) && --timeout)
-		udelay(1);
-
-	return timeout ? 0 : -EBUSY;
-}
-
-/* enum describing available commands for the MAC table */
-enum mac_table_cmd {
-	MAC_TABLE_READ,
-	MAC_TABLE_LOOKUP,
-	MAC_TABLE_WRITE,
-	MAC_TABLE_LEARN,
-	MAC_TABLE_FORGET,
-	MAC_TABLE_GET_NEXT,
-	MAC_TABLE_AGE,
-};
-
-/* Issues a command to the FDB table */
-static int vsc9953_mac_table_cmd(enum mac_table_cmd cmd)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	switch (cmd) {
-	case MAC_TABLE_READ:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK | VSC9953_MAC_CMD_VALID,
-				VSC9953_MAC_CMD_READ);
-		break;
-	case MAC_TABLE_LOOKUP:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK, VSC9953_MAC_CMD_READ |
-				VSC9953_MAC_CMD_VALID);
-		break;
-	case MAC_TABLE_WRITE:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK |
-				VSC9953_MAC_ENTRYTYPE_MASK,
-				VSC9953_MAC_CMD_WRITE |
-				VSC9953_MAC_ENTRYTYPE_LOCKED);
-		break;
-	case MAC_TABLE_LEARN:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK |
-				VSC9953_MAC_ENTRYTYPE_MASK,
-				VSC9953_MAC_CMD_LEARN |
-				VSC9953_MAC_ENTRYTYPE_LOCKED |
-				VSC9953_MAC_CMD_VALID);
-		break;
-	case MAC_TABLE_FORGET:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK |
-				VSC9953_MAC_ENTRYTYPE_MASK,
-				VSC9953_MAC_CMD_FORGET);
-		break;
-	case MAC_TABLE_GET_NEXT:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK |
-				VSC9953_MAC_ENTRYTYPE_MASK,
-				VSC9953_MAC_CMD_NEXT);
-		break;
-	case MAC_TABLE_AGE:
-		clrsetbits_le32(&l2ana_reg->ana_tables.mac_access,
-				VSC9953_MAC_CMD_MASK |
-				VSC9953_MAC_ENTRYTYPE_MASK,
-				VSC9953_MAC_CMD_AGE);
-		break;
-	default:
-		printf("Unknown MAC table command\n");
-	}
-
-	if (vsc9953_mac_table_poll_idle() < 0) {
-		debug("MAC table timeout\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-/* show the FDB entries that correspond to a port and a VLAN */
-static void vsc9953_mac_table_show(int port_no, int vid)
-{
-	int rc[VSC9953_MAX_PORTS];
-	enum port_learn_mode mode[VSC9953_MAX_PORTS];
-	int i;
-	u32 val;
-	u32 vlan;
-	u32 mach;
-	u32 macl;
-	u32 dest_indx;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	/* disable auto learning */
-	if (port_no == ETHSW_CMD_PORT_ALL) {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			rc[i] = vsc9953_port_learn_mode_get(i, &mode[i]);
-			if (!rc[i] && mode[i] != PORT_LEARN_NONE)
-				vsc9953_port_learn_mode_set(i, PORT_LEARN_NONE);
-		}
-	} else {
-		rc[port_no] = vsc9953_port_learn_mode_get(port_no,
-							  &mode[port_no]);
-		if (!rc[port_no] && mode[port_no] != PORT_LEARN_NONE)
-			vsc9953_port_learn_mode_set(port_no, PORT_LEARN_NONE);
-	}
-
-	/* write port and vid to get selected FDB entries */
-	val = in_le32(&l2ana_reg->ana.anag_efil);
-	if (port_no != ETHSW_CMD_PORT_ALL) {
-		val = bitfield_replace_by_mask(val, VSC9953_AGE_PORT_MASK,
-					       port_no) | VSC9953_AGE_PORT_EN;
-	}
-	if (vid != ETHSW_CMD_VLAN_ALL) {
-		val = bitfield_replace_by_mask(val, VSC9953_AGE_VID_MASK,
-					       vid) | VSC9953_AGE_VID_EN;
-	}
-	out_le32(&l2ana_reg->ana.anag_efil, val);
-
-	/* set MAC and VLAN to 0 to look from beginning */
-	clrbits_le32(&l2ana_reg->ana_tables.mach_data,
-		     VSC9953_MAC_VID_MASK | VSC9953_MAC_MACH_MASK);
-	out_le32(&l2ana_reg->ana_tables.macl_data, 0);
-
-	/* get entries */
-	printf("%10s %17s %5s %4s\n", "EntryType", "MAC", "PORT", "VID");
-	do {
-		if (vsc9953_mac_table_cmd(MAC_TABLE_GET_NEXT) < 0) {
-			debug("GET NEXT MAC table command failed\n");
-			break;
-		}
-
-		val = in_le32(&l2ana_reg->ana_tables.mac_access);
-
-		/* get out when an invalid entry is found */
-		if (!(val & VSC9953_MAC_CMD_VALID))
-			break;
-
-		switch (val & VSC9953_MAC_ENTRYTYPE_MASK) {
-		case VSC9953_MAC_ENTRYTYPE_NORMAL:
-			printf("%10s ", "Dynamic");
-			break;
-		case VSC9953_MAC_ENTRYTYPE_LOCKED:
-			printf("%10s ", "Static");
-			break;
-		case VSC9953_MAC_ENTRYTYPE_IPV4MCAST:
-			printf("%10s ", "IPv4 Mcast");
-			break;
-		case VSC9953_MAC_ENTRYTYPE_IPV6MCAST:
-			printf("%10s ", "IPv6 Mcast");
-			break;
-		default:
-			printf("%10s ", "Unknown");
-		}
-
-		dest_indx = bitfield_extract_by_mask(val,
-						     VSC9953_MAC_DESTIDX_MASK);
-
-		val = in_le32(&l2ana_reg->ana_tables.mach_data);
-		vlan = bitfield_extract_by_mask(val, VSC9953_MAC_VID_MASK);
-		mach = bitfield_extract_by_mask(val, VSC9953_MAC_MACH_MASK);
-		macl = in_le32(&l2ana_reg->ana_tables.macl_data);
-
-		printf("%02x:%02x:%02x:%02x:%02x:%02x ", (mach >> 8) & 0xff,
-		       mach & 0xff, (macl >> 24) & 0xff, (macl >> 16) & 0xff,
-		       (macl >> 8) & 0xff, macl & 0xff);
-		printf("%5d ", dest_indx);
-		printf("%4d\n", vlan);
-	} while (1);
-
-	/* set learning mode to previous value */
-	if (port_no == ETHSW_CMD_PORT_ALL) {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			if (!rc[i] && mode[i] != PORT_LEARN_NONE)
-				vsc9953_port_learn_mode_set(i, mode[i]);
-		}
-	} else {
-		/* If administrative down, skip */
-		if (!rc[port_no] && mode[port_no] != PORT_LEARN_NONE)
-			vsc9953_port_learn_mode_set(port_no, mode[port_no]);
-	}
-
-	/* reset FDB port and VLAN FDB selection */
-	clrbits_le32(&l2ana_reg->ana.anag_efil, VSC9953_AGE_PORT_EN |
-		     VSC9953_AGE_PORT_MASK | VSC9953_AGE_VID_EN |
-		     VSC9953_AGE_VID_MASK);
-}
-
-/* Add a static FDB entry */
-static int vsc9953_mac_table_add(u8 port_no, uchar mac[6], int vid)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	val = in_le32(&l2ana_reg->ana_tables.mach_data);
-	val = bitfield_replace_by_mask(val, VSC9953_MACHDATA_VID_MASK, vid) |
-	      (mac[0] << 8) | (mac[1] << 0);
-	out_le32(&l2ana_reg->ana_tables.mach_data, val);
-
-	out_le32(&l2ana_reg->ana_tables.macl_data,
-		 (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) |
-		 (mac[5] << 0));
-
-	/* set on which port is the MAC address added */
-	val = in_le32(&l2ana_reg->ana_tables.mac_access);
-	val = bitfield_replace_by_mask(val, VSC9953_MAC_DESTIDX_MASK, port_no);
-	out_le32(&l2ana_reg->ana_tables.mac_access, val);
-
-	if (vsc9953_mac_table_cmd(MAC_TABLE_LEARN) < 0)
-		return -1;
-
-	/* check if the MAC address was indeed added */
-	val = in_le32(&l2ana_reg->ana_tables.mach_data);
-	val = bitfield_replace_by_mask(val, VSC9953_MACHDATA_VID_MASK, vid) |
-	      (mac[0] << 8) | (mac[1] << 0);
-	out_le32(&l2ana_reg->ana_tables.mach_data, val);
-
-	out_le32(&l2ana_reg->ana_tables.macl_data,
-		 (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) |
-		 (mac[5] << 0));
-
-	if (vsc9953_mac_table_cmd(MAC_TABLE_READ) < 0)
-		return -1;
-
-	val = in_le32(&l2ana_reg->ana_tables.mac_access);
-
-	if ((port_no != bitfield_extract_by_mask(val,
-						 VSC9953_MAC_DESTIDX_MASK))) {
-		printf("Failed to add MAC address\n");
-		return -1;
-	}
-	return 0;
-}
-
-/* Delete a FDB entry */
-static int vsc9953_mac_table_del(uchar mac[6], u16 vid)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	/* check first if MAC entry is present */
-	val = in_le32(&l2ana_reg->ana_tables.mach_data);
-	val = bitfield_replace_by_mask(val, VSC9953_MACHDATA_VID_MASK, vid) |
-	      (mac[0] << 8) | (mac[1] << 0);
-	out_le32(&l2ana_reg->ana_tables.mach_data, val);
-
-	out_le32(&l2ana_reg->ana_tables.macl_data,
-		 (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) |
-		 (mac[5] << 0));
-
-	if (vsc9953_mac_table_cmd(MAC_TABLE_LOOKUP) < 0) {
-		debug("Lookup in the MAC table failed\n");
-		return -1;
-	}
-
-	if (!(in_le32(&l2ana_reg->ana_tables.mac_access) &
-	      VSC9953_MAC_CMD_VALID)) {
-		printf("The MAC address: %02x:%02x:%02x:%02x:%02x:%02x ",
-		       mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-		printf("VLAN: %d does not exist.\n", vid);
-		return -1;
-	}
-
-	/* FDB entry found, proceed to delete */
-	val = in_le32(&l2ana_reg->ana_tables.mach_data);
-	val = bitfield_replace_by_mask(val, VSC9953_MACHDATA_VID_MASK, vid) |
-	      (mac[0] << 8) | (mac[1] << 0);
-	out_le32(&l2ana_reg->ana_tables.mach_data, val);
-
-	out_le32(&l2ana_reg->ana_tables.macl_data, (mac[2] << 24) |
-		 (mac[3] << 16) | (mac[4] << 8) | (mac[5] << 0));
-
-	if (vsc9953_mac_table_cmd(MAC_TABLE_FORGET) < 0)
-		return -1;
-
-	/* check if the MAC entry is still in FDB */
-	val = in_le32(&l2ana_reg->ana_tables.mach_data);
-	val = bitfield_replace_by_mask(val, VSC9953_MACHDATA_VID_MASK, vid) |
-	      (mac[0] << 8) | (mac[1] << 0);
-	out_le32(&l2ana_reg->ana_tables.mach_data, val);
-
-	out_le32(&l2ana_reg->ana_tables.macl_data, (mac[2] << 24) |
-		 (mac[3] << 16) | (mac[4] << 8) | (mac[5] << 0));
-
-	if (vsc9953_mac_table_cmd(MAC_TABLE_LOOKUP) < 0) {
-		debug("Lookup in the MAC table failed\n");
-		return -1;
-	}
-	if (in_le32(&l2ana_reg->ana_tables.mac_access) &
-	    VSC9953_MAC_CMD_VALID) {
-		printf("Failed to delete MAC address\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-/* age the unlocked entries in FDB */
-static void vsc9953_mac_table_age(int port_no, int vid)
-{
-	int rc[VSC9953_MAX_PORTS];
-	enum port_learn_mode mode[VSC9953_MAX_PORTS];
-	u32 val;
-	int i;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	/* set port and VID for selective aging */
-	val = in_le32(&l2ana_reg->ana.anag_efil);
-	if (port_no != ETHSW_CMD_PORT_ALL) {
-		/* disable auto learning */
-		rc[port_no] = vsc9953_port_learn_mode_get(port_no,
-							  &mode[port_no]);
-		if (!rc[port_no] && mode[port_no] != PORT_LEARN_NONE)
-			vsc9953_port_learn_mode_set(port_no, PORT_LEARN_NONE);
-
-		val = bitfield_replace_by_mask(val, VSC9953_AGE_PORT_MASK,
-					       port_no) | VSC9953_AGE_PORT_EN;
-	} else {
-		/* disable auto learning on all ports */
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			rc[i] = vsc9953_port_learn_mode_get(i, &mode[i]);
-			if (!rc[i] && mode[i] != PORT_LEARN_NONE)
-				vsc9953_port_learn_mode_set(i, PORT_LEARN_NONE);
-		}
-	}
-
-	if (vid != ETHSW_CMD_VLAN_ALL) {
-		val = bitfield_replace_by_mask(val, VSC9953_AGE_VID_MASK, vid) |
-		      VSC9953_AGE_VID_EN;
-	}
-	out_le32(&l2ana_reg->ana.anag_efil, val);
-
-	/* age the dynamic FDB entries */
-	vsc9953_mac_table_cmd(MAC_TABLE_AGE);
-
-	/* clear previously set port and VID */
-	clrbits_le32(&l2ana_reg->ana.anag_efil, VSC9953_AGE_PORT_EN |
-		     VSC9953_AGE_PORT_MASK | VSC9953_AGE_VID_EN |
-		     VSC9953_AGE_VID_MASK);
-
-	if (port_no != ETHSW_CMD_PORT_ALL) {
-		if (!rc[port_no] && mode[port_no] != PORT_LEARN_NONE)
-			vsc9953_port_learn_mode_set(port_no, mode[port_no]);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			if (!rc[i] && mode[i] != PORT_LEARN_NONE)
-				vsc9953_port_learn_mode_set(i, mode[i]);
-		}
-	}
-}
-
-/* Delete all the dynamic FDB entries */
-static void vsc9953_mac_table_flush(int port, int vid)
-{
-	vsc9953_mac_table_age(port, vid);
-	vsc9953_mac_table_age(port, vid);
-}
-
-enum egress_vlan_tag {
-	EGR_TAG_CLASS = 0,
-	EGR_TAG_PVID,
-};
-
-/* Set egress tag mode for a VSC9953 port */
-static void vsc9953_port_vlan_egress_tag_set(int port_no,
-					     enum egress_vlan_tag mode)
-{
-	struct vsc9953_rew_reg *l2rew_reg;
-
-	l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET +
-			VSC9953_REW_OFFSET);
-
-	switch (mode) {
-	case EGR_TAG_CLASS:
-		clrbits_le32(&l2rew_reg->port[port_no].port_tag_cfg,
-			     VSC9953_TAG_VID_PVID);
-		break;
-	case EGR_TAG_PVID:
-		setbits_le32(&l2rew_reg->port[port_no].port_tag_cfg,
-			     VSC9953_TAG_VID_PVID);
-		break;
-	default:
-		printf("Unknown egress VLAN tag mode for port %d\n", port_no);
-	}
-}
-
-/* Get egress tag mode for a VSC9953 port */
-static void vsc9953_port_vlan_egress_tag_get(int port_no,
-					     enum egress_vlan_tag *mode)
-{
-	u32 val;
-	struct vsc9953_rew_reg *l2rew_reg;
-
-	l2rew_reg = (struct vsc9953_rew_reg *)(VSC9953_OFFSET +
-			VSC9953_REW_OFFSET);
-
-	val = in_le32(&l2rew_reg->port[port_no].port_tag_cfg);
-	if (val & VSC9953_TAG_VID_PVID)
-		*mode = EGR_TAG_PVID;
-	else
-		*mode = EGR_TAG_CLASS;
-}
-
-/* VSC9953 VLAN learning modes */
-enum vlan_learning_mode {
-	SHARED_VLAN_LEARNING,
-	PRIVATE_VLAN_LEARNING,
-};
-
-/* Set VLAN learning mode for VSC9953 */
-static void vsc9953_vlan_learning_set(enum vlan_learning_mode lrn_mode)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	switch (lrn_mode) {
-	case SHARED_VLAN_LEARNING:
-		setbits_le32(&l2ana_reg->ana.agen_ctrl, VSC9953_FID_MASK_ALL);
-		break;
-	case PRIVATE_VLAN_LEARNING:
-		clrbits_le32(&l2ana_reg->ana.agen_ctrl, VSC9953_FID_MASK_ALL);
-		break;
-	default:
-		printf("Unknown VLAN learn mode\n");
-	}
-}
-
-/* Get VLAN learning mode for VSC9953 */
-static int vsc9953_vlan_learning_get(enum vlan_learning_mode *lrn_mode)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	val = in_le32(&l2ana_reg->ana.agen_ctrl);
-
-	if (!(val & VSC9953_FID_MASK_ALL)) {
-		*lrn_mode = PRIVATE_VLAN_LEARNING;
-	} else if ((val & VSC9953_FID_MASK_ALL) == VSC9953_FID_MASK_ALL) {
-		*lrn_mode = SHARED_VLAN_LEARNING;
-	} else {
-		printf("Unknown VLAN learning mode\n");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-/* Enable/disable VLAN ingress filtering on a VSC9953 port */
-static void vsc9953_port_ingress_filtering_set(int port_no, int enabled)
-{
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	if (enabled)
-		setbits_le32(&l2ana_reg->ana.vlan_mask, 1 << port_no);
-	else
-		clrbits_le32(&l2ana_reg->ana.vlan_mask, 1 << port_no);
-}
-
-/* Return VLAN ingress filtering on a VSC9953 port */
-static int vsc9953_port_ingress_filtering_get(int port_no)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	val = in_le32(&l2ana_reg->ana.vlan_mask);
-	return !!(val & (1 << port_no));
-}
-
-/* Get the aggregation group of a port */
-static int vsc9953_port_aggr_grp_get(int port_no, int *aggr_grp)
-{
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	if (!VSC9953_PORT_CHECK(port_no))
-		return -EINVAL;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	val = in_le32(&l2ana_reg->port[port_no].port_cfg);
-	*aggr_grp = bitfield_extract_by_mask(val,
-					     VSC9953_PORT_CFG_PORTID_MASK);
-
-	return 0;
-}
-
-static void vsc9953_aggr_grp_members_get(int aggr_grp,
-					 u8 aggr_membr[VSC9953_MAX_PORTS])
-{
-	int port_no;
-	int aggr_membr_grp;
-
-	for (port_no = 0; port_no < VSC9953_MAX_PORTS; port_no++) {
-		aggr_membr[port_no] = 0;
-
-		if (vsc9953_port_aggr_grp_get(port_no, &aggr_membr_grp))
-			continue;
-
-		if (aggr_grp == aggr_membr_grp)
-			aggr_membr[port_no] = 1;
-	}
-}
-
-static void vsc9953_update_dest_members_masks(int port_no, u32 membr_bitfld_old,
-					      u32 membr_bitfld_new)
-{
-	int i;
-	u32 pgid;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	/*
-	 * NOTE: Only the unicast destination masks are updated, since
-	 * we do not support for now Layer-2 multicast entries
-	 */
-	for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-		if (i == port_no) {
-			clrsetbits_le32(&l2ana_reg->port_id_tbl.port_grp_id[i],
-					VSC9953_PGID_PORT_MASK,
-					membr_bitfld_new);
-			continue;
-		}
-
-		pgid = in_le32(&l2ana_reg->port_id_tbl.port_grp_id[i]);
-		if ((u32)(1 << i) & membr_bitfld_old & VSC9953_PGID_PORT_MASK)
-			pgid &= ~((u32)(1 << port_no));
-		if ((u32)(1 << i) & membr_bitfld_new & VSC9953_PGID_PORT_MASK)
-			pgid |= ((u32)(1 << port_no));
-
-		out_le32(&l2ana_reg->port_id_tbl.port_grp_id[i], pgid);
-	}
-}
-
-static void vsc9953_update_source_members_masks(int port_no,
-						u32 membr_bitfld_old,
-						u32 membr_bitfld_new)
-{
-	int i;
-	int index;
-	u32 pgid;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	for (i = 0; i < VSC9953_MAX_PORTS + 1; i++) {
-		index = PGID_SRC_START + i;
-		pgid = in_le32(&l2ana_reg->port_id_tbl.port_grp_id[index]);
-		if (i == port_no) {
-			pgid = (pgid | VSC9953_PGID_PORT_MASK) &
-			       ~membr_bitfld_new;
-			out_le32(&l2ana_reg->port_id_tbl.port_grp_id[index],
-				 pgid);
-			continue;
-		}
-
-		if ((u32)(1 << i) & membr_bitfld_old & VSC9953_PGID_PORT_MASK)
-			pgid |= (u32)(1 << port_no);
-
-		if ((u32)(1 << i) & membr_bitfld_new & VSC9953_PGID_PORT_MASK)
-			pgid &= ~(u32)(1 << port_no);
-		out_le32(&l2ana_reg->port_id_tbl.port_grp_id[index], pgid);
-	}
-}
-
-static u32 vsc9953_aggr_mask_get_next(u32 aggr_mask, u32 member_bitfield)
-{
-	if (!member_bitfield)
-		return 0;
-
-	if (!(aggr_mask & VSC9953_PGID_PORT_MASK))
-		aggr_mask = 1;
-	else
-		aggr_mask <<= 1;
-
-	while (!(aggr_mask & member_bitfield)) {
-		aggr_mask <<= 1;
-		if (!(aggr_mask & VSC9953_PGID_PORT_MASK))
-			aggr_mask = 1;
-	}
-
-	return aggr_mask;
-}
-
-static void vsc9953_update_aggr_members_masks(int port_no, u32 membr_bitfld_old,
-					      u32 membr_bitfld_new)
-{
-	int i;
-	u32 pgid;
-	u32 aggr_mask_old = 0;
-	u32 aggr_mask_new = 0;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	/* Update all the PGID aggregation masks */
-	for (i = PGID_AGGR_START; i < PGID_SRC_START; i++) {
-		pgid = in_le32(&l2ana_reg->port_id_tbl.port_grp_id[i]);
-
-		aggr_mask_old = vsc9953_aggr_mask_get_next(aggr_mask_old,
-							   membr_bitfld_old);
-		pgid = (pgid & ~membr_bitfld_old) | aggr_mask_old;
-
-		aggr_mask_new = vsc9953_aggr_mask_get_next(aggr_mask_new,
-							   membr_bitfld_new);
-		pgid = (pgid & ~membr_bitfld_new) | aggr_mask_new;
-
-		out_le32(&l2ana_reg->port_id_tbl.port_grp_id[i], pgid);
-	}
-}
-
-static u32 vsc9953_aggr_membr_bitfield_get(u8 member[VSC9953_MAX_PORTS])
-{
-	int i;
-	u32 member_bitfield = 0;
-
-	for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-		if (member[i])
-			member_bitfield |= 1 << i;
-	}
-	member_bitfield &= VSC9953_PGID_PORT_MASK;
-
-	return member_bitfield;
-}
-
-static void vsc9953_update_members_masks(int port_no,
-					 u8 member_old[VSC9953_MAX_PORTS],
-					 u8 member_new[VSC9953_MAX_PORTS])
-{
-	u32 membr_bitfld_old = vsc9953_aggr_membr_bitfield_get(member_old);
-	u32 membr_bitfld_new = vsc9953_aggr_membr_bitfield_get(member_new);
-
-	vsc9953_update_dest_members_masks(port_no, membr_bitfld_old,
-					  membr_bitfld_new);
-	vsc9953_update_source_members_masks(port_no, membr_bitfld_old,
-					    membr_bitfld_new);
-	vsc9953_update_aggr_members_masks(port_no, membr_bitfld_old,
-					  membr_bitfld_new);
-}
-
-/* Set the aggregation group of a port */
-static int vsc9953_port_aggr_grp_set(int port_no, int aggr_grp)
-{
-	u8 aggr_membr_old[VSC9953_MAX_PORTS];
-	u8 aggr_membr_new[VSC9953_MAX_PORTS];
-	int rc;
-	int aggr_grp_old;
-	u32 val;
-	struct vsc9953_analyzer *l2ana_reg;
-
-	if (!VSC9953_PORT_CHECK(port_no) || !VSC9953_PORT_CHECK(aggr_grp))
-		return -EINVAL;
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-						VSC9953_ANA_OFFSET);
-
-	rc = vsc9953_port_aggr_grp_get(port_no, &aggr_grp_old);
-	if (rc)
-		return rc;
-
-	/* get all the members of the old aggregation group */
-	vsc9953_aggr_grp_members_get(aggr_grp_old, aggr_membr_old);
-
-	/* get all the members of the same aggregation group */
-	vsc9953_aggr_grp_members_get(aggr_grp, aggr_membr_new);
-
-	/* add current port as member to the new aggregation group */
-	aggr_membr_old[port_no] = 0;
-	aggr_membr_new[port_no] = 1;
-
-	/* update masks */
-	vsc9953_update_members_masks(port_no, aggr_membr_old, aggr_membr_new);
-
-	/* Change logical port number */
-	val = in_le32(&l2ana_reg->port[port_no].port_cfg);
-	val = bitfield_replace_by_mask(val,
-				       VSC9953_PORT_CFG_PORTID_MASK, aggr_grp);
-	out_le32(&l2ana_reg->port[port_no].port_cfg, val);
-
-	return 0;
-}
-
-static int vsc9953_port_status_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	u8 enabled;
-
-	/* Last keyword should tell us if we should enable/disable the port */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-	    ethsw_id_enable)
-		enabled = 1;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_disable)
-		enabled = 0;
-	else
-		return CMD_RET_USAGE;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_status_set(parsed_cmd->port, enabled);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_status_set(i, enabled);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_port_config_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_phy_autoneg(parsed_cmd->port);
-		printf("%8s %8s %8s %8s %8s\n",
-		       "Port", "Status", "Link", "Speed",
-		       "Duplex");
-		vsc9953_port_config_show(parsed_cmd->port);
-
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_phy_autoneg(i);
-		printf("%8s %8s %8s %8s %8s\n",
-		       "Port", "Status", "Link", "Speed", "Duplex");
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_config_show(i);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_port_stats_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_statistics_show(parsed_cmd->port);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_statistics_show(i);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_port_stats_clear_key_func(struct ethsw_command_def
-					     *parsed_cmd)
-{
-	int i;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_statistics_clear(parsed_cmd->port);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_statistics_clear(i);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_learn_show_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	enum port_learn_mode mode;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		if (vsc9953_port_learn_mode_get(parsed_cmd->port, &mode))
-			return CMD_RET_FAILURE;
-		printf("%7s %11s\n", "Port", "Learn mode");
-		switch (mode) {
-		case PORT_LEARN_NONE:
-			printf("%7d %11s\n", parsed_cmd->port, "disable");
-			break;
-		case PORT_LEARN_AUTO:
-			printf("%7d %11s\n", parsed_cmd->port, "auto");
-			break;
-		default:
-			printf("%7d %11s\n", parsed_cmd->port, "-");
-		}
-	} else {
-		printf("%7s %11s\n", "Port", "Learn mode");
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			if (vsc9953_port_learn_mode_get(i, &mode))
-				continue;
-			switch (mode) {
-			case PORT_LEARN_NONE:
-				printf("%7d %11s\n", i, "disable");
-				break;
-			case PORT_LEARN_AUTO:
-				printf("%7d %11s\n", i, "auto");
-				break;
-			default:
-				printf("%7d %11s\n", i, "-");
-			}
-		}
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_learn_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	enum port_learn_mode mode;
-
-	/* Last keyword should tell us the learn mode */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-	    ethsw_id_auto)
-		mode = PORT_LEARN_AUTO;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_disable)
-		mode = PORT_LEARN_NONE;
-	else
-		return CMD_RET_USAGE;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_learn_mode_set(parsed_cmd->port, mode);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_learn_mode_set(i, mode);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_fdb_show_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL &&
-	    !VSC9953_PORT_CHECK(parsed_cmd->port)) {
-		printf("Invalid port number: %d\n", parsed_cmd->port);
-		return CMD_RET_FAILURE;
-	}
-
-	if (parsed_cmd->vid != ETHSW_CMD_VLAN_ALL &&
-	    !VSC9953_VLAN_CHECK(parsed_cmd->vid)) {
-		printf("Invalid VID number: %d\n", parsed_cmd->vid);
-		return CMD_RET_FAILURE;
-	}
-
-	vsc9953_mac_table_show(parsed_cmd->port, parsed_cmd->vid);
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_fdb_flush_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL &&
-	    !VSC9953_PORT_CHECK(parsed_cmd->port)) {
-		printf("Invalid port number: %d\n", parsed_cmd->port);
-		return CMD_RET_FAILURE;
-	}
-
-	if (parsed_cmd->vid != ETHSW_CMD_VLAN_ALL &&
-	    !VSC9953_VLAN_CHECK(parsed_cmd->vid)) {
-		printf("Invalid VID number: %d\n", parsed_cmd->vid);
-		return CMD_RET_FAILURE;
-	}
-
-	vsc9953_mac_table_flush(parsed_cmd->port, parsed_cmd->vid);
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_fdb_entry_add_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int vid;
-
-	/* a port number must be present */
-	if (parsed_cmd->port == ETHSW_CMD_PORT_ALL) {
-		printf("Please specify a port\n");
-		return CMD_RET_FAILURE;
-	}
-
-	if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-		printf("Invalid port number: %d\n", parsed_cmd->port);
-		return CMD_RET_FAILURE;
-	}
-
-	/* Use VLAN 1 if VID is not set */
-	vid = (parsed_cmd->vid == ETHSW_CMD_VLAN_ALL ? 1 : parsed_cmd->vid);
-
-	if (!VSC9953_VLAN_CHECK(vid)) {
-		printf("Invalid VID number: %d\n", vid);
-		return CMD_RET_FAILURE;
-	}
-
-	if (vsc9953_mac_table_add(parsed_cmd->port, parsed_cmd->ethaddr, vid))
-		return CMD_RET_FAILURE;
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_fdb_entry_del_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int vid;
-
-	/* Use VLAN 1 if VID is not set */
-	vid = (parsed_cmd->vid == ETHSW_CMD_VLAN_ALL ? 1 : parsed_cmd->vid);
-
-	if (!VSC9953_VLAN_CHECK(vid)) {
-		printf("Invalid VID number: %d\n", vid);
-		return CMD_RET_FAILURE;
-	}
-
-	if (vsc9953_mac_table_del(parsed_cmd->ethaddr, vid))
-		return CMD_RET_FAILURE;
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_pvid_show_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	int pvid;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-
-		if (vsc9953_port_vlan_pvid_get(parsed_cmd->port, &pvid))
-			return CMD_RET_FAILURE;
-		printf("%7s %7s\n", "Port", "PVID");
-		printf("%7d %7d\n", parsed_cmd->port, pvid);
-	} else {
-		printf("%7s %7s\n", "Port", "PVID");
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			if (vsc9953_port_vlan_pvid_get(i, &pvid))
-				continue;
-			printf("%7d %7d\n", i, pvid);
-		}
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_pvid_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	/* PVID number should be set in parsed_cmd->vid */
-	if (parsed_cmd->vid == ETHSW_CMD_VLAN_ALL) {
-		printf("Please set a pvid value\n");
-		return CMD_RET_FAILURE;
-	}
-
-	if (!VSC9953_VLAN_CHECK(parsed_cmd->vid)) {
-		printf("Invalid VID number: %d\n", parsed_cmd->vid);
-		return CMD_RET_FAILURE;
-	}
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_vlan_pvid_set(parsed_cmd->port, parsed_cmd->vid);
-	} else {
-		vsc9953_port_all_vlan_pvid_set(parsed_cmd->vid);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_vlan_show_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_vlan_membership_show(parsed_cmd->port);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_vlan_membership_show(i);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_vlan_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	int add;
-
-	/* VLAN should be set in parsed_cmd->vid */
-	if (parsed_cmd->vid == ETHSW_CMD_VLAN_ALL) {
-		printf("Please set a vlan value\n");
-		return CMD_RET_FAILURE;
-	}
-
-	if (!VSC9953_VLAN_CHECK(parsed_cmd->vid)) {
-		printf("Invalid VID number: %d\n", parsed_cmd->vid);
-		return CMD_RET_FAILURE;
-	}
-
-	/* keywords add/delete should be the last but one in array */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 2] ==
-	    ethsw_id_add)
-		add = 1;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 2] ==
-		 ethsw_id_del)
-		add = 0;
-	else
-		return CMD_RET_USAGE;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_vlan_table_membership_set(parsed_cmd->vid,
-						  parsed_cmd->port, add);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_vlan_table_membership_set(parsed_cmd->vid, i,
-							  add);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-static int vsc9953_port_untag_show_key_func(
-		struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-
-	printf("%7s\t%17s\n", "Port", "Untag");
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_vlan_egr_untag_show(parsed_cmd->port);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_vlan_egr_untag_show(i);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_port_untag_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	enum egress_untag_mode mode;
-
-	/* keywords for the untagged mode are the last in the array */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-	    ethsw_id_all)
-		mode = EGRESS_UNTAG_ALL;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_none)
-		mode = EGRESS_UNTAG_NONE;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_pvid)
-		mode = EGRESS_UNTAG_PVID_AND_ZERO;
-	else
-		return CMD_RET_USAGE;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_vlan_egr_untag_set(parsed_cmd->port, mode);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_vlan_egr_untag_set(i, mode);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_egr_vlan_tag_show_key_func(
-		struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	enum egress_vlan_tag mode;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_vlan_egress_tag_get(parsed_cmd->port, &mode);
-		printf("%7s\t%12s\n", "Port", "Egress VID");
-		printf("%7d\t", parsed_cmd->port);
-		switch (mode) {
-		case EGR_TAG_CLASS:
-			printf("%12s\n", "classified");
-			break;
-		case EGR_TAG_PVID:
-			printf("%12s\n", "pvid");
-			break;
-		default:
-			printf("%12s\n", "-");
-		}
-	} else {
-		printf("%7s\t%12s\n", "Port", "Egress VID");
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			vsc9953_port_vlan_egress_tag_get(i, &mode);
-			switch (mode) {
-			case EGR_TAG_CLASS:
-				printf("%7d\t%12s\n", i, "classified");
-				break;
-			case EGR_TAG_PVID:
-				printf("%7d\t%12s\n", i, "pvid");
-				break;
-			default:
-				printf("%7d\t%12s\n", i, "-");
-			}
-		}
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_egr_vlan_tag_set_key_func(
-		struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	enum egress_vlan_tag mode;
-
-	/* keywords for the egress vlan tag mode are the last in the array */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-	    ethsw_id_pvid)
-		mode = EGR_TAG_PVID;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_classified)
-		mode = EGR_TAG_CLASS;
-	else
-		return CMD_RET_USAGE;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_vlan_egress_tag_set(parsed_cmd->port, mode);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_vlan_egress_tag_set(i, mode);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_vlan_learn_show_key_func(
-		struct ethsw_command_def *parsed_cmd)
-{
-	int rc;
-	enum vlan_learning_mode mode;
-
-	rc = vsc9953_vlan_learning_get(&mode);
-	if (rc)
-		return CMD_RET_FAILURE;
-
-	switch (mode) {
-	case SHARED_VLAN_LEARNING:
-		printf("VLAN learning mode: shared\n");
-		break;
-	case PRIVATE_VLAN_LEARNING:
-		printf("VLAN learning mode: private\n");
-		break;
-	default:
-		printf("Unknown VLAN learning mode\n");
-		rc = CMD_RET_FAILURE;
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_vlan_learn_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	enum vlan_learning_mode mode;
-
-	/* keywords for shared/private are the last in the array */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-	    ethsw_id_shared)
-		mode = SHARED_VLAN_LEARNING;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_private)
-		mode = PRIVATE_VLAN_LEARNING;
-	else
-		return CMD_RET_USAGE;
-
-	vsc9953_vlan_learning_set(mode);
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_ingr_fltr_show_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	int enabled;
-
-	printf("%7s\t%18s\n", "Port", "Ingress filtering");
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		enabled = vsc9953_port_ingress_filtering_get(parsed_cmd->port);
-		printf("%7d\t%18s\n", parsed_cmd->port, enabled ? "enable" :
-								  "disable");
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			enabled = vsc9953_port_ingress_filtering_get(i);
-			printf("%7d\t%18s\n", parsed_cmd->port, enabled ?
-								"enable" :
-								"disable");
-		}
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_ingr_fltr_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	int enable;
-
-	/* keywords for enabling/disabling ingress filtering
-	 * are the last in the array
-	 */
-	if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-	    ethsw_id_enable)
-		enable = 1;
-	else if (parsed_cmd->cmd_to_keywords[parsed_cmd->cmd_keywords_nr - 1] ==
-		 ethsw_id_disable)
-		enable = 0;
-	else
-		return CMD_RET_USAGE;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		vsc9953_port_ingress_filtering_set(parsed_cmd->port, enable);
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++)
-			vsc9953_port_ingress_filtering_set(i, enable);
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_port_aggr_show_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-	int aggr_grp;
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-
-		if (vsc9953_port_aggr_grp_get(parsed_cmd->port, &aggr_grp))
-			return CMD_RET_FAILURE;
-		printf("%7s %10s\n", "Port", "Aggr grp");
-		printf("%7d %10d\n", parsed_cmd->port, aggr_grp);
-	} else {
-		printf("%7s %10s\n", "Port", "Aggr grp");
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			if (vsc9953_port_aggr_grp_get(i, &aggr_grp))
-				continue;
-			printf("%7d %10d\n", i, aggr_grp);
-		}
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static int vsc9953_port_aggr_set_key_func(struct ethsw_command_def *parsed_cmd)
-{
-	int i;
-
-	/* Aggregation group number should be set in parsed_cmd->aggr_grp */
-	if (parsed_cmd->aggr_grp == ETHSW_CMD_AGGR_GRP_NONE) {
-		printf("Please set an aggregation group value\n");
-		return CMD_RET_FAILURE;
-	}
-
-	if (!VSC9953_PORT_CHECK(parsed_cmd->aggr_grp)) {
-		printf("Invalid aggregation group number: %d\n",
-		       parsed_cmd->aggr_grp);
-		return CMD_RET_FAILURE;
-	}
-
-	if (parsed_cmd->port != ETHSW_CMD_PORT_ALL) {
-		if (!VSC9953_PORT_CHECK(parsed_cmd->port)) {
-			printf("Invalid port number: %d\n", parsed_cmd->port);
-			return CMD_RET_FAILURE;
-		}
-		if (vsc9953_port_aggr_grp_set(parsed_cmd->port,
-					      parsed_cmd->aggr_grp)) {
-			printf("Port %d: failed to set aggr group %d\n",
-			       parsed_cmd->port, parsed_cmd->aggr_grp);
-		}
-	} else {
-		for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-			if (vsc9953_port_aggr_grp_set(i,
-						      parsed_cmd->aggr_grp)) {
-				printf("Port %d: failed to set aggr group %d\n",
-				       i, parsed_cmd->aggr_grp);
-			}
-		}
-	}
-
-	return CMD_RET_SUCCESS;
-}
-
-static struct ethsw_command_func vsc9953_cmd_func = {
-		.ethsw_name = "L2 Switch VSC9953",
-		.port_enable = &vsc9953_port_status_key_func,
-		.port_disable = &vsc9953_port_status_key_func,
-		.port_show = &vsc9953_port_config_key_func,
-		.port_stats = &vsc9953_port_stats_key_func,
-		.port_stats_clear = &vsc9953_port_stats_clear_key_func,
-		.port_learn = &vsc9953_learn_set_key_func,
-		.port_learn_show = &vsc9953_learn_show_key_func,
-		.fdb_show = &vsc9953_fdb_show_key_func,
-		.fdb_flush = &vsc9953_fdb_flush_key_func,
-		.fdb_entry_add = &vsc9953_fdb_entry_add_key_func,
-		.fdb_entry_del = &vsc9953_fdb_entry_del_key_func,
-		.pvid_show = &vsc9953_pvid_show_key_func,
-		.pvid_set = &vsc9953_pvid_set_key_func,
-		.vlan_show = &vsc9953_vlan_show_key_func,
-		.vlan_set = &vsc9953_vlan_set_key_func,
-		.port_untag_show = &vsc9953_port_untag_show_key_func,
-		.port_untag_set = &vsc9953_port_untag_set_key_func,
-		.port_egr_vlan_show = &vsc9953_egr_vlan_tag_show_key_func,
-		.port_egr_vlan_set = &vsc9953_egr_vlan_tag_set_key_func,
-		.vlan_learn_show = &vsc9953_vlan_learn_show_key_func,
-		.vlan_learn_set = &vsc9953_vlan_learn_set_key_func,
-		.port_ingr_filt_show = &vsc9953_ingr_fltr_show_key_func,
-		.port_ingr_filt_set = &vsc9953_ingr_fltr_set_key_func,
-		.port_aggr_show = &vsc9953_port_aggr_show_key_func,
-		.port_aggr_set = &vsc9953_port_aggr_set_key_func,
-};
-
-#endif /* CONFIG_CMD_ETHSW */
-
-/*****************************************************************************
-At startup, the default configuration would be:
-	- HW learning enabled on all ports; (HW default)
-	- All ports are in VLAN 1;
-	- All ports are VLAN aware;
-	- All ports have POP_COUNT 1;
-	- All ports have PVID 1;
-	- All ports have TPID 0x8100; (HW default)
-	- All ports tag frames classified to all VLANs that are not PVID;
-*****************************************************************************/
-void vsc9953_default_configuration(void)
-{
-	int i;
-
-	if (vsc9953_autoage_time_set(VSC9953_DEFAULT_AGE_TIME))
-		debug("VSC9953: failed to set AGE time to %d\n",
-		      VSC9953_DEFAULT_AGE_TIME);
-
-	for (i = 0; i < VSC9953_MAX_VLAN; i++)
-		vsc9953_vlan_table_membership_all_set(i, 0);
-	vsc9953_port_all_vlan_aware_set(1);
-	vsc9953_port_all_vlan_pvid_set(1);
-	vsc9953_port_all_vlan_poncnt_set(1);
-	vsc9953_vlan_table_membership_all_set(1, 1);
-	vsc9953_vlan_ingr_fltr_learn_drop(1);
-	vsc9953_port_all_vlan_egress_untagged_set(EGRESS_UNTAG_PVID_AND_ZERO);
-	if (vsc9953_aggr_code_set(AGGR_CODE_ALL))
-		debug("VSC9953: failed to set default aggregation code mode\n");
-}
-
-static void vcap_entry2cache_init(u32 target, u32 entry_words)
-{
-	int i;
-
-	for (i = 0; i < entry_words; i++) {
-		out_le32((unsigned int *)(VSC9953_OFFSET +
-				VSC9953_VCAP_CACHE_ENTRY_DAT(target, i)), 0x00);
-		out_le32((unsigned int *)(VSC9953_OFFSET +
-				VSC9953_VCAP_CACHE_MASK_DAT(target, i)), 0xFF);
-	}
-
-	out_le32((unsigned int *)(VSC9953_OFFSET +
-				VSC9953_VCAP_CACHE_TG_DAT(target)), 0x00);
-	out_le32((unsigned int *)(VSC9953_OFFSET +
-				  VSC9953_VCAP_CFG_MV_CFG(target)),
-		 VSC9953_VCAP_CFG_MV_CFG_SIZE(entry_words));
-}
-
-static void vcap_action2cache_init(u32 target, u32 action_words,
-				   u32 counter_words)
-{
-	int i;
-
-	for (i = 0; i < action_words; i++)
-		out_le32((unsigned int *)(VSC9953_OFFSET +
-			       VSC9953_VCAP_CACHE_ACTION_DAT(target, i)), 0x00);
-
-	for (i = 0; i < counter_words; i++)
-		out_le32((unsigned int *)(VSC9953_OFFSET +
-				  VSC9953_VCAP_CACHE_CNT_DAT(target, i)), 0x00);
-}
-
-static int vcap_cmd(u32 target, u16 ix, int cmd, int sel, int entry_count)
-{
-	u32 tgt = target;
-	u32 value = (VSC9953_VCAP_UPDATE_CTRL_UPDATE_CMD(cmd) |
-		     VSC9953_VCAP_UPDATE_CTRL_UPDATE_ADDR(ix) |
-		     VSC9953_VCAP_UPDATE_CTRL_UPDATE_SHOT);
-
-	if ((sel & TCAM_SEL_ENTRY) && ix >= entry_count)
-		return CMD_RET_FAILURE;
-
-	if (!(sel & TCAM_SEL_ENTRY))
-		value |= VSC9953_VCAP_UPDATE_CTRL_UPDATE_ENTRY_DIS;
-
-	if (!(sel & TCAM_SEL_ACTION))
-		value |= VSC9953_VCAP_UPDATE_CTRL_UPDATE_ACTION_DIS;
-
-	if (!(sel & TCAM_SEL_COUNTER))
-		value |= VSC9953_VCAP_UPDATE_CTRL_UPDATE_CNT_DIS;
-
-	out_le32((unsigned int *)(VSC9953_OFFSET +
-				VSC9953_VCAP_CFG_UPDATE_CTRL(tgt)), value);
-
-	do {
-		value = in_le32((unsigned int *)(VSC9953_OFFSET +
-				VSC9953_VCAP_CFG_UPDATE_CTRL(tgt)));
-
-	} while (value & VSC9953_VCAP_UPDATE_CTRL_UPDATE_SHOT);
-
-	return CMD_RET_SUCCESS;
-}
-
-static void vsc9953_vcap_init(void)
-{
-	u32 tgt = VSC9953_ES0;
-	int cmd_ret;
-
-	/* write entries */
-	vcap_entry2cache_init(tgt, ENTRY_WORDS_ES0);
-	cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE, TCAM_SEL_ENTRY,
-			   ENTRY_WORDS_ES0);
-	if (cmd_ret != CMD_RET_SUCCESS)
-		debug("VSC9953:%d invalid TCAM_SEL_ENTRY\n",
-		      __LINE__);
-
-	/* write actions and counters */
-	vcap_action2cache_init(tgt, BITS_TO_DWORD(ES0_ACT_WIDTH),
-			       BITS_TO_DWORD(ES0_CNT_WIDTH));
-	out_le32((unsigned int *)(VSC9953_OFFSET +
-				  VSC9953_VCAP_CFG_MV_CFG(tgt)),
-		 VSC9953_VCAP_CFG_MV_CFG_SIZE(ES0_ACT_COUNT));
-	cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE,
-			   TCAM_SEL_ACTION | TCAM_SEL_COUNTER, ENTRY_WORDS_ES0);
-	if (cmd_ret != CMD_RET_SUCCESS)
-		debug("VSC9953:%d invalid TCAM_SEL_ACTION | TCAM_SEL_COUNTER\n",
-		      __LINE__);
-
-	tgt = VSC9953_IS1;
-
-	/* write entries */
-	vcap_entry2cache_init(tgt, ENTRY_WORDS_IS1);
-	cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE, TCAM_SEL_ENTRY,
-			   ENTRY_WORDS_IS1);
-	if (cmd_ret != CMD_RET_SUCCESS)
-		debug("VSC9953:%d invalid TCAM_SEL_ENTRY\n",
-		      __LINE__);
-
-	/* write actions and counters */
-	vcap_action2cache_init(tgt, BITS_TO_DWORD(IS1_ACT_WIDTH),
-			       BITS_TO_DWORD(IS1_CNT_WIDTH));
-	out_le32((unsigned int *)(VSC9953_OFFSET +
-				  VSC9953_VCAP_CFG_MV_CFG(tgt)),
-		 VSC9953_VCAP_CFG_MV_CFG_SIZE(IS1_ACT_COUNT));
-	cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE,
-			   TCAM_SEL_ACTION | TCAM_SEL_COUNTER, ENTRY_WORDS_IS1);
-	if (cmd_ret != CMD_RET_SUCCESS)
-		debug("VSC9953:%d invalid TCAM_SEL_ACTION | TCAM_SEL_COUNTER\n",
-		      __LINE__);
-
-	tgt = VSC9953_IS2;
-
-	/* write entries */
-	vcap_entry2cache_init(tgt, ENTRY_WORDS_IS2);
-	cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE, TCAM_SEL_ENTRY,
-			   ENTRY_WORDS_IS2);
-	if (cmd_ret != CMD_RET_SUCCESS)
-		debug("VSC9953:%d invalid selection: TCAM_SEL_ENTRY\n",
-		      __LINE__);
-
-	/* write actions and counters */
-	vcap_action2cache_init(tgt, BITS_TO_DWORD(IS2_ACT_WIDTH),
-			       BITS_TO_DWORD(IS2_CNT_WIDTH));
-	out_le32((unsigned int *)(VSC9953_OFFSET +
-				  VSC9953_VCAP_CFG_MV_CFG(tgt)),
-		 VSC9953_VCAP_CFG_MV_CFG_SIZE(IS2_ACT_COUNT));
-	cmd_ret = vcap_cmd(tgt, 0, TCAM_CMD_INITIALIZE,
-			   TCAM_SEL_ACTION | TCAM_SEL_COUNTER, ENTRY_WORDS_IS2);
-	if (cmd_ret != CMD_RET_SUCCESS)
-		debug("VSC9953:%d invalid TCAM_SEL_ACTION | TCAM_SEL_COUNTER\n",
-		      __LINE__);
-}
-
-void vsc9953_init(struct bd_info *bis)
-{
-	u32 i;
-	u32 hdx_cfg = 0;
-	u32 phy_addr = 0;
-	int timeout;
-	struct vsc9953_system_reg *l2sys_reg;
-	struct vsc9953_qsys_reg *l2qsys_reg;
-	struct vsc9953_dev_gmii *l2dev_gmii_reg;
-	struct vsc9953_analyzer *l2ana_reg;
-	struct vsc9953_devcpu_gcb *l2dev_gcb;
-
-	l2dev_gmii_reg = (struct vsc9953_dev_gmii *)(VSC9953_OFFSET +
-			VSC9953_DEV_GMII_OFFSET);
-
-	l2ana_reg = (struct vsc9953_analyzer *)(VSC9953_OFFSET +
-			VSC9953_ANA_OFFSET);
-
-	l2sys_reg = (struct vsc9953_system_reg *)(VSC9953_OFFSET +
-			VSC9953_SYS_OFFSET);
-
-	l2qsys_reg = (struct vsc9953_qsys_reg *)(VSC9953_OFFSET +
-			VSC9953_QSYS_OFFSET);
-
-	l2dev_gcb = (struct vsc9953_devcpu_gcb *)(VSC9953_OFFSET +
-			VSC9953_DEVCPU_GCB);
-
-	out_le32(&l2dev_gcb->chip_regs.soft_rst,
-		 VSC9953_SOFT_SWC_RST_ENA);
-	timeout = 50000;
-	while ((in_le32(&l2dev_gcb->chip_regs.soft_rst) &
-			VSC9953_SOFT_SWC_RST_ENA) && --timeout)
-		udelay(1); /* busy wait for vsc9953 soft reset */
-	if (timeout == 0)
-		debug("Timeout waiting for VSC9953 to reset\n");
-
-	out_le32(&l2sys_reg->sys.reset_cfg, VSC9953_MEM_ENABLE |
-		 VSC9953_MEM_INIT);
-
-	timeout = 50000;
-	while ((in_le32(&l2sys_reg->sys.reset_cfg) &
-		VSC9953_MEM_INIT) && --timeout)
-		udelay(1); /* busy wait for vsc9953 memory init */
-	if (timeout == 0)
-		debug("Timeout waiting for VSC9953 memory to initialize\n");
-
-	out_le32(&l2sys_reg->sys.reset_cfg, (in_le32(&l2sys_reg->sys.reset_cfg)
-			| VSC9953_CORE_ENABLE));
-
-	/* VSC9953 Setting to be done once only */
-	out_le32(&l2qsys_reg->sys.ext_cpu_cfg, 0x00000b00);
-
-	for (i = 0; i < VSC9953_MAX_PORTS; i++) {
-		if (vsc9953_port_init(i))
-			printf("Failed to initialize l2switch port %d\n", i);
-
-		if (!vsc9953_l2sw.port[i].enabled)
-			continue;
-
-		/* Enable VSC9953 GMII Ports Port ID 0 - 7 */
-		if (VSC9953_INTERNAL_PORT_CHECK(i)) {
-			out_le32(&l2ana_reg->pfc[i].pfc_cfg,
-				 VSC9953_PFC_FC_QSGMII);
-			out_le32(&l2sys_reg->pause_cfg.mac_fc_cfg[i],
-				 VSC9953_MAC_FC_CFG_QSGMII);
-		} else {
-			out_le32(&l2ana_reg->pfc[i].pfc_cfg,
-				 VSC9953_PFC_FC);
-			out_le32(&l2sys_reg->pause_cfg.mac_fc_cfg[i],
-				 VSC9953_MAC_FC_CFG);
-		}
-
-		l2dev_gmii_reg = (struct vsc9953_dev_gmii *)
-				 (VSC9953_OFFSET + VSC9953_DEV_GMII_OFFSET +
-				 T1040_SWITCH_GMII_DEV_OFFSET * i);
-
-		out_le32(&l2dev_gmii_reg->port_mode.clock_cfg,
-			 VSC9953_CLOCK_CFG);
-		out_le32(&l2dev_gmii_reg->mac_cfg_status.mac_ena_cfg,
-			 VSC9953_MAC_ENA_CFG);
-		out_le32(&l2dev_gmii_reg->mac_cfg_status.mac_mode_cfg,
-			 VSC9953_MAC_MODE_CFG);
-		out_le32(&l2dev_gmii_reg->mac_cfg_status.mac_ifg_cfg,
-			 VSC9953_MAC_IFG_CFG);
-		/* mac_hdx_cfg varies with port id*/
-		hdx_cfg = VSC9953_MAC_HDX_CFG | (i << 16);
-		out_le32(&l2dev_gmii_reg->mac_cfg_status.mac_hdx_cfg, hdx_cfg);
-		out_le32(&l2sys_reg->sys.front_port_mode[i],
-			 VSC9953_FRONT_PORT_MODE);
-		setbits_le32(&l2qsys_reg->sys.switch_port_mode[i],
-			     VSC9953_PORT_ENA);
-		out_le32(&l2dev_gmii_reg->mac_cfg_status.mac_maxlen_cfg,
-			 VSC9953_MAC_MAX_LEN);
-		out_le32(&l2sys_reg->pause_cfg.pause_cfg[i],
-			 VSC9953_PAUSE_CFG);
-		/* WAIT FOR 2 us*/
-		udelay(2);
-
-		/* Initialize Lynx PHY Wrappers */
-		phy_addr = 0;
-		if (vsc9953_l2sw.port[i].enet_if ==
-				PHY_INTERFACE_MODE_QSGMII)
-			phy_addr = (i + 0x4) & 0x1F;
-		else if (vsc9953_l2sw.port[i].enet_if ==
-				PHY_INTERFACE_MODE_SGMII)
-			phy_addr = (i + 1) & 0x1F;
-
-		if (phy_addr) {
-			/* SGMII IF mode + AN enable */
-			vsc9953_mdio_write(&l2dev_gcb->mii_mng[0], phy_addr,
-					   0x14, PHY_SGMII_IF_MODE_AN |
-					   PHY_SGMII_IF_MODE_SGMII);
-			/* Dev ability according to SGMII specification */
-			vsc9953_mdio_write(&l2dev_gcb->mii_mng[0], phy_addr,
-					   0x4, PHY_SGMII_DEV_ABILITY_SGMII);
-			/* Adjust link timer for SGMII
-			 * 1.6 ms in units of 8 ns = 2 * 10^5 = 0x30d40
-			 */
-			vsc9953_mdio_write(&l2dev_gcb->mii_mng[0], phy_addr,
-					   0x13, 0x0003);
-			vsc9953_mdio_write(&l2dev_gcb->mii_mng[0], phy_addr,
-					   0x12, 0x0d40);
-			/* Restart AN */
-			vsc9953_mdio_write(&l2dev_gcb->mii_mng[0], phy_addr,
-					   0x0, PHY_SGMII_CR_DEF_VAL |
-					   PHY_SGMII_CR_RESET_AN);
-
-			timeout = 50000;
-			while ((vsc9953_mdio_read(&l2dev_gcb->mii_mng[0],
-					phy_addr, 0x01) & 0x0020) && --timeout)
-				udelay(1); /* wait for AN to complete */
-			if (timeout == 0)
-				debug("Timeout waiting for AN to complete\n");
-		}
-	}
-
-	vsc9953_vcap_init();
-	vsc9953_default_configuration();
-
-#ifdef CONFIG_CMD_ETHSW
-	if (ethsw_define_functions(&vsc9953_cmd_func) < 0)
-		debug("Unable to use \"ethsw\" commands\n");
-#endif
-
-	printf("VSC9953 L2 switch initialized\n");
-	return;
-}
-- 
2.25.1

[PATCH 39/41] usb: Remove CONFIG_USBD_HS

[Tom Rini]

This define is not enabled by the only platform which currently enables
the legacy option of CONFIG_USB_DEVICE. We can drop this code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                 |  8 -----
 drivers/serial/usbtty.c                | 50 --------------------------
 drivers/serial/usbtty.h                |  4 ---
 drivers/usb/gadget/ep0.c               | 19 ----------
 include/configs/apalis_imx6.h          |  2 --
 include/configs/colibri-imx6ull.h      |  2 --
 include/configs/colibri_imx6.h         |  2 --
 include/configs/colibri_imx7.h         |  2 --
 include/configs/ge_b1x5v2.h            |  1 -
 include/configs/gw_ventana.h           |  1 -
 include/configs/imx7-cm.h              |  2 --
 include/configs/librem5.h              |  2 --
 include/configs/mx6sabre_common.h      |  2 --
 include/configs/mx7dsabresd.h          |  2 --
 include/configs/nitrogen6x.h           |  2 --
 include/configs/novena.h               |  2 --
 include/configs/pico-imx6ul.h          |  2 --
 include/configs/siemens-am33x-common.h |  3 --
 include/configs/tbs2910.h              |  3 --
 include/configs/warp7.h                |  2 --
 include/usbdescriptors.h               | 15 --------
 include/usbdevice.h                    | 19 ----------
 22 files changed, 147 deletions(-)

diff --git a/README b/README
index c8f6b21e2d96..2944646665a8 100644
--- a/README
+++ b/README
@@ -618,14 +618,6 @@ The following options need to be configured:
 		variable usbtty to be cdc_acm should suffice. The following
 		might be defined in YourBoardName.h
 
-			CONFIG_USBD_HS
-			Define this to enable the high speed support for usb
-			device and usbtty. If this feature is enabled, a routine
-			int is_usbd_high_speed(void)
-			also needs to be defined by the driver to dynamically poll
-			whether the enumeration has succeded at high speed or full
-			speed.
-
 		If you have a USB-IF assigned VendorID then you may wish to
 		define your own vendor specific values either in BoardName.h
 		or directly in usbd_vendor_info.h. If you don't define
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index 4f4eb02de083..07a59ec9607a 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -120,20 +120,6 @@ static struct usb_device_descriptor device_descriptor = {
 	.bNumConfigurations =	NUM_CONFIGS
 };
 
-
-#if defined(CONFIG_USBD_HS)
-static struct usb_qualifier_descriptor qualifier_descriptor = {
-	.bLength = sizeof(struct usb_qualifier_descriptor),
-	.bDescriptorType =	USB_DT_QUAL,
-	.bcdUSB =		cpu_to_le16(USB_BCD_VERSION),
-	.bDeviceClass =		COMMUNICATIONS_DEVICE_CLASS,
-	.bDeviceSubClass =	0x00,
-	.bDeviceProtocol =	0x00,
-	.bMaxPacketSize0 =	EP0_MAX_PACKET_SIZE,
-	.bNumConfigurations =	NUM_CONFIGS
-};
-#endif
-
 /*
  * Static CDC ACM specific descriptors
  */
@@ -639,9 +625,6 @@ static void usbtty_init_instances (void)
 	memset (device_instance, 0, sizeof (struct usb_device_instance));
 	device_instance->device_state = STATE_INIT;
 	device_instance->device_descriptor = &device_descriptor;
-#if defined(CONFIG_USBD_HS)
-	device_instance->qualifier_descriptor = &qualifier_descriptor;
-#endif
 	device_instance->event = usbtty_event_handler;
 	device_instance->cdc_recv_setup = usbtty_cdc_setup;
 	device_instance->bus = bus_instance;
@@ -755,10 +738,6 @@ static void usbtty_init_terminal_type(short type)
 			device_descriptor.idProduct =
 				cpu_to_le16(CONFIG_USBD_PRODUCTID_CDCACM);
 
-#if defined(CONFIG_USBD_HS)
-			qualifier_descriptor.bDeviceClass =
-				COMMUNICATIONS_DEVICE_CLASS;
-#endif
 			/* Assign endpoint indices */
 			tx_endpoint = ACM_TX_ENDPOINT;
 			rx_endpoint = ACM_RX_ENDPOINT;
@@ -787,9 +766,6 @@ static void usbtty_init_terminal_type(short type)
 			device_descriptor.bDeviceClass = 0xFF;
 			device_descriptor.idProduct =
 				cpu_to_le16(CONFIG_USBD_PRODUCTID_GSERIAL);
-#if defined(CONFIG_USBD_HS)
-			qualifier_descriptor.bDeviceClass = 0xFF;
-#endif
 			/* Assign endpoint indices */
 			tx_endpoint = GSERIAL_TX_ENDPOINT;
 			rx_endpoint = GSERIAL_RX_ENDPOINT;
@@ -937,9 +913,6 @@ static int usbtty_configured (void)
 static void usbtty_event_handler (struct usb_device_instance *device,
 				  usb_device_event_t event, int data)
 {
-#if defined(CONFIG_USBD_HS)
-	int i;
-#endif
 	switch (event) {
 	case DEVICE_RESET:
 	case DEVICE_BUS_INACTIVE:
@@ -950,29 +923,6 @@ static void usbtty_event_handler (struct usb_device_instance *device,
 		break;
 
 	case DEVICE_ADDRESS_ASSIGNED:
-#if defined(CONFIG_USBD_HS)
-		/*
-		 * is_usbd_high_speed routine needs to be defined by
-		 * specific gadget driver
-		 * It returns true if device enumerates at High speed
-		 * Retuns false otherwise
-		 */
-		for (i = 0; i < NUM_ENDPOINTS; i++) {
-			if (((ep_descriptor_ptrs[i]->bmAttributes &
-			      USB_ENDPOINT_XFERTYPE_MASK) ==
-			      USB_ENDPOINT_XFER_BULK)
-			    && is_usbd_high_speed()) {
-
-				ep_descriptor_ptrs[i]->wMaxPacketSize =
-					CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE;
-			}
-
-			endpoint_instance[i + 1].tx_packetSize =
-				ep_descriptor_ptrs[i]->wMaxPacketSize;
-			endpoint_instance[i + 1].rcv_packetSize =
-				ep_descriptor_ptrs[i]->wMaxPacketSize;
-		}
-#endif
 		usbtty_init_endpoints ();
 
 	default:
diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h
index e27aa368c9af..ac4d22044d3d 100644
--- a/drivers/serial/usbtty.h
+++ b/drivers/serial/usbtty.h
@@ -51,10 +51,6 @@
 #define CONFIG_USBD_SERIAL_INT_PKTSIZE	UDC_INT_PACKET_SIZE
 #define CONFIG_USBD_SERIAL_BULK_PKTSIZE	UDC_BULK_PACKET_SIZE
 
-#if defined(CONFIG_USBD_HS)
-#define CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE	UDC_BULK_HS_PACKET_SIZE
-#endif
-
 #define USBTTY_DEVICE_CLASS	COMMUNICATIONS_DEVICE_CLASS
 
 #define USBTTY_BCD_DEVICE	0x00
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c
index 6624f61b763c..c256cc31fbd2 100644
--- a/drivers/usb/gadget/ep0.c
+++ b/drivers/usb/gadget/ep0.c
@@ -371,26 +371,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device,
 		}
 		break;
 	case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER:
-#if defined(CONFIG_USBD_HS)
-		{
-			struct usb_qualifier_descriptor *qualifier_descriptor =
-				device->qualifier_descriptor;
-
-			if (!qualifier_descriptor)
-				return -1;
-
-			/* copy descriptor for this device */
-			copy_config(urb, qualifier_descriptor,
-					sizeof(struct usb_qualifier_descriptor),
-					max);
-
-		}
-		dbg_ep0(3, "copied qualifier descriptor, actual_length: 0x%x",
-				urb->actual_length);
-#else
 		return -1;
-#endif
-		break;
 
 	default:
 		return -1;
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 25a84458f553..07587c7609be 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -28,8 +28,6 @@
 /* Host */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
-/* Client */
-#define CONFIG_USBD_HS
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 2f09a264cbe0..6f3524deb561 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -126,8 +126,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_USBD_HS
-
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 19daad21cb56..4e51df123a64 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -25,8 +25,6 @@
 /* Host */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
-/* Client */
-#define CONFIG_USBD_HS
 
 /* Command definition */
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 48c3f0154739..89546b857fee 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -170,6 +170,4 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_USBD_HS
-
 #endif
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 1458b187de28..1aaa3e67d608 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -26,7 +26,6 @@
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
-#define CONFIG_USBD_HS
 
 /* Memory */
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 298a8f5aa2a0..5a78c68e2fcc 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -38,7 +38,6 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS      0
-#define CONFIG_USBD_HS
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 76771fd66ce9..8e9dbefc4969 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -81,6 +81,4 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 11b3fa6c857d..377e3e7b3fa8 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -27,8 +27,6 @@
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_USBD_HS
-
 #define CONSOLE_ON_UART1
 
 #ifdef CONSOLE_ON_UART1
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 6294fd1e2c42..96a48a97a306 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -145,6 +145,4 @@
 
 /* Environment organization */
 
-#define CONFIG_USBD_HS
-
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 6c165521f7a0..bd70b62bd209 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -101,6 +101,4 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 5020b3bb71db..1d101977c281 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -11,8 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_USBD_HS
-
 #define CONFIG_MXC_UART_BASE	       UART2_BASE
 
 /* MMC Configs */
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 79e49c74f856..b0d473eeee37 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -55,8 +55,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
-/* Gadget part */
-#define CONFIG_USBD_HS
 #endif
 
 /* Extra U-Boot environment. */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 8af8883fad64..faf11d5a72ad 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -26,8 +26,6 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_USBD_HS
-
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 #define CONFIG_DFU_ENV_SETTINGS \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 1b1787a3d3ca..406a179842e2 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -70,9 +70,6 @@
  * we don't need to do it twice.
  */
 
-/* USB DRACO ID as default */
-#define CONFIG_USBD_HS
-
 /* USB Device Firmware Update support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index fcc967494220..689914cb1873 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -28,9 +28,6 @@
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#ifdef CONFIG_CMD_USB_MASS_STORAGE
-#define CONFIG_USBD_HS
-#endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #endif /* CONFIG_CMD_USB      */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 56c90aa1032e..a985c6f28f30 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -95,8 +95,6 @@
 
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
-#define CONFIG_USBD_HS
-
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h
index 9a5038745116..641b4a3e6f29 100644
--- a/include/usbdescriptors.h
+++ b/include/usbdescriptors.h
@@ -227,21 +227,6 @@ struct usb_device_descriptor {
 	u8 bNumConfigurations;
 } __attribute__ ((packed));
 
-#if defined(CONFIG_USBD_HS)
-struct usb_qualifier_descriptor {
-	u8 bLength;
-	u8 bDescriptorType;
-
-	u16 bcdUSB;
-	u8 bDeviceClass;
-	u8 bDeviceSubClass;
-	u8 bDeviceProtocol;
-	u8 bMaxPacketSize0;
-	u8 bNumConfigurations;
-	u8 breserved;
-} __attribute__ ((packed));
-#endif
-
 struct usb_string_descriptor {
 	u8 bLength;
 	u8 bDescriptorType;	/* 0x03 */
diff --git a/include/usbdevice.h b/include/usbdevice.h
index 611cd6e4abf7..80c5af0cbcd2 100644
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -196,10 +196,6 @@ struct usb_bus_instance;
 #define USB_DT_INTERFACE		0x04
 #define USB_DT_ENDPOINT			0x05
 
-#if defined(CONFIG_USBD_HS)
-#define USB_DT_QUAL			0x06
-#endif
-
 #define USB_DT_HID			(USB_TYPE_CLASS | 0x01)
 #define USB_DT_REPORT			(USB_TYPE_CLASS | 0x02)
 #define USB_DT_PHYSICAL			(USB_TYPE_CLASS | 0x03)
@@ -279,11 +275,7 @@ struct usb_bus_instance;
  * USB Spec Release number
  */
 
-#if defined(CONFIG_USBD_HS)
-#define USB_BCD_VERSION			0x0200
-#else
 #define USB_BCD_VERSION			0x0110
-#endif
 
 
 /*
@@ -552,9 +544,6 @@ struct usb_device_instance {
 	/* generic */
 	char *name;
 	struct usb_device_descriptor *device_descriptor;	/* per device descriptor */
-#if defined(CONFIG_USBD_HS)
-	struct usb_qualifier_descriptor *qualifier_descriptor;
-#endif
 
 	void (*event) (struct usb_device_instance *device, usb_device_event_t event, int data);
 
@@ -644,14 +633,6 @@ struct usb_string_descriptor *usbd_get_string (u8);
 struct usb_device_descriptor *usbd_device_device_descriptor(struct
 		usb_device_instance *, int);
 
-#if defined(CONFIG_USBD_HS)
-/*
- * is_usbd_high_speed routine needs to be defined by specific gadget driver
- * It returns true if device enumerates at High speed
- * Retuns false otherwise
- */
-int is_usbd_high_speed(void);
-#endif
 int usbd_endpoint_halted (struct usb_device_instance *device, int endpoint);
 void usbd_rcv_complete(struct usb_endpoint_instance *endpoint, int len, int urb_bad);
 void usbd_tx_complete (struct usb_endpoint_instance *endpoint);
-- 
2.25.1

[PATCH 40/41] nxp: Rename CONFIG_U_BOOT_HDR_SIZE to FSL_U_BOOT_HDR_SIZE

[Tom Rini]

This is always defined to 16K, so we move this over to
include/fsl_validate.h to start with. Next, we rename this from CONFIG_
to FSL_. Coalesce the various comments around this definition to be in
fsl_validate.h as well to explain the usage.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/fsl_chain_of_trust.c |  2 +-
 drivers/mtd/nand/raw/fsl_ifc_spl.c          |  6 ++---
 include/configs/T104xRDB.h                  |  8 +-----
 include/configs/ls1021atsn.h                | 15 ------------
 include/configs/ls1021atwr.h                | 19 ---------------
 include/configs/ls1043a_common.h            | 27 ---------------------
 include/configs/ls1046a_common.h            | 13 ----------
 include/configs/ls1088a_common.h            | 13 ----------
 include/fsl_validate.h                      |  7 ++++++
 9 files changed, 12 insertions(+), 98 deletions(-)

diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c
index 9ca350ed4689..029d06bbf9d6 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/freescale/common/fsl_chain_of_trust.c
@@ -143,7 +143,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 		(image_entry_noargs_t)(unsigned long)spl_image->entry_point;
 
 	hdr_addr = (spl_image->entry_point + spl_image->size -
-			CONFIG_U_BOOT_HDR_SIZE);
+			FSL_U_BOOT_HDR_SIZE);
 	spl_validate_uboot(hdr_addr, (uintptr_t)spl_image->entry_point);
 	/*
 	 * In case of failure in validation, spl_validate_uboot would
diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c
index 3b464ce10ce9..60a865b56673 100644
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@@ -278,11 +278,11 @@ void nand_boot(void)
 	 * U-Boot header is appended at end of U-boot image, so
 	 * calculate U-boot header address using U-boot header size.
 	 */
-#define CONFIG_U_BOOT_HDR_ADDR \
+#define FSL_U_BOOT_HDR_ADDR \
 		((CFG_SYS_NAND_U_BOOT_START + \
 		  CFG_SYS_NAND_U_BOOT_SIZE) - \
-		 CONFIG_U_BOOT_HDR_SIZE)
-	spl_validate_uboot(CONFIG_U_BOOT_HDR_ADDR,
+		 FSL_U_BOOT_HDR_SIZE)
+	spl_validate_uboot(FSL_U_BOOT_HDR_ADDR,
 			   CFG_SYS_NAND_U_BOOT_START);
 	/*
 	 * In case of failure in validation, spl_validate_uboot would
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 5bdc2105f563..7a5bf937e4c3 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -20,13 +20,7 @@
 
 #ifdef CONFIG_MTD_RAW_NAND
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image.
- */
-#define CFG_SYS_NAND_U_BOOT_SIZE	((768 << 10) + \
-					 CONFIG_U_BOOT_HDR_SIZE)
+#define CFG_SYS_NAND_U_BOOT_SIZE	((768 << 10) + (16 << 10))
 #else
 #define CFG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
 #endif
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 5612c60ae904..b15c4a238bca 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -38,21 +38,6 @@
 #define SDRAM_CFG2_FRC_SR		0x80000000
 #define SDRAM_CFG_BI			0x00000001
 
-#ifdef CONFIG_SD_BOOT
-#ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
-#endif /* ifdef CONFIG_NXP_ESBC */
-
-#ifdef CONFIG_U_BOOT_HDR_SIZE
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image. Here u-boot max. size is 512K. So if binary
- * size increases then increase this size in case of secure boot as
- * it uses raw U-Boot image instead of FIT image.
- */
-#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
-#endif
-
 #define PHYS_SDRAM			0x80000000
 #define PHYS_SDRAM_SIZE			(1u * 1024 * 1024 * 1024)
 
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 281b26fa2ba0..9b22a2db21a0 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -37,25 +37,6 @@
 #define SDRAM_CFG2_FRC_SR		0x80000000
 #define SDRAM_CFG_BI			0x00000001
 
-#ifdef CONFIG_SD_BOOT
-#ifdef CONFIG_NXP_ESBC
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image.
- */
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
-#endif /* ifdef CONFIG_NXP_ESBC */
-
-#ifdef CONFIG_U_BOOT_HDR_SIZE
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image. Here u-boot max. size is 512K. So if binary
- * size increases then increase this size in case of secure boot as
- * it uses raw u-boot image instead of fit image.
- */
-#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
-#endif
-
 #define PHYS_SDRAM			0x80000000
 #define PHYS_SDRAM_SIZE			(1u * 1024 * 1024 * 1024)
 
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index d0380b33732d..685e7e65d154 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -41,37 +41,10 @@
 /* Serial Port */
 #define CFG_SYS_NS16550_CLK          (get_serial_clock())
 
-/* SD boot SPL */
-#ifdef CONFIG_SD_BOOT
-#ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image. Here u-boot max. size is 512K. So if binary
- * size increases then increase this size in case of secure boot as
- * it uses raw u-boot image instead of fit image.
- */
-#endif /* ifdef CONFIG_NXP_ESBC */
-#endif
-
 /* NAND SPL */
 #ifdef CONFIG_NAND_BOOT
 #define CFG_SYS_NAND_U_BOOT_DST	CONFIG_TEXT_BASE
 #define CFG_SYS_NAND_U_BOOT_START	CONFIG_TEXT_BASE
-
-#ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
-#endif /* ifdef CONFIG_NXP_ESBC */
-
-#ifdef CONFIG_U_BOOT_HDR_SIZE
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image. Here u-boot max. size is 512K. So if binary
- * size increases then increase this size in case of secure boot as
- * it uses raw u-boot image instead of fit image.
- */
-#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */
-
 #endif
 
 /* GPIO */
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 250891e9e301..ae9dc0c73b05 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -41,19 +41,6 @@
 /* Serial Port */
 #define CFG_SYS_NS16550_CLK          (get_serial_clock())
 
-/* SD boot SPL */
-#ifdef CONFIG_SD_BOOT
-#ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE				(16 << 10)
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image. Here u-boot max. size is 512K. So if binary
- * size increases then increase this size in case of secure boot as
- * it uses raw u-boot image instead of fit image.
- */
-#endif /* ifdef CONFIG_NXP_ESBC */
-#endif
-
 /* NAND SPL */
 #ifdef CONFIG_NAND_BOOT
 #define CFG_SYS_NAND_U_BOOT_DST	CONFIG_TEXT_BASE
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index bcba8d81c04c..86c5d48c0de4 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -133,17 +133,4 @@ unsigned long long get_qixis_addr(void);
 	" 0x580e00000 \0"
 #endif
 
-#ifdef CONFIG_SPL
-#ifdef CONFIG_NXP_ESBC
-#define CONFIG_U_BOOT_HDR_SIZE		(16 << 10)
-/*
- * HDR would be appended at end of image and copied to DDR along
- * with U-Boot image. Here u-boot max. size is 512K. So if binary
- * size increases then increase this size in case of secure boot as
- * it uses raw u-boot image instead of fit image.
- */
-#endif /* ifdef CONFIG_NXP_ESBC */
-
-#endif
-
 #endif /* __LS1088_COMMON_H */
diff --git a/include/fsl_validate.h b/include/fsl_validate.h
index 252d499e7b1a..fbcbd4249677 100644
--- a/include/fsl_validate.h
+++ b/include/fsl_validate.h
@@ -280,4 +280,11 @@ int fsl_setenv_chain_of_trust(void);
  * Architecture header (appended to U-boot image).
  */
 void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr);
+
+/*
+ * This header is appended at end of image and copied to DDR along
+ * with the U-Boot image and later used as part of the validation
+ * flow
+ */
+#define FSL_U_BOOT_HDR_SIZE				(16 << 10)
 #endif
-- 
2.25.1

[PATCH 41/41] T104xRDB: Remove non-TARGET_T1042D4RDB variants

[Tom Rini]

At this point only the TARGET_T1042D4RDB variant of this is supported in
tree, so remove the remaining parts of the other platforms.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/Kconfig           | 17 -------
 arch/powerpc/include/asm/fsl_secure_boot.h |  2 -
 board/freescale/t104xrdb/Kconfig           |  4 +-
 board/freescale/t104xrdb/cpld.h            |  2 +-
 board/freescale/t104xrdb/eth.c             | 19 --------
 board/freescale/t104xrdb/t104xrdb.c        | 19 +-------
 include/configs/T104xRDB.h                 | 52 ++--------------------
 7 files changed, 7 insertions(+), 108 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 03373bf86926..3275d4fa9b88 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -200,14 +200,6 @@ config TARGET_T1024RDB
 	imply CMD_EEPROM
 	imply PANIC_HANG
 
-config TARGET_T1042RDB
-	bool "Support T1042RDB"
-	select ARCH_T1042
-	select BOARD_LATE_INIT if CHAIN_OF_TRUST
-	select SUPPORT_SPL
-	select PHYS_64BIT
-	select SYS_L3_SIZE_256KB
-
 config TARGET_T1042D4RDB
 	bool "Support T1042D4RDB"
 	select ARCH_T1042
@@ -217,15 +209,6 @@ config TARGET_T1042D4RDB
 	select SYS_L3_SIZE_256KB
 	imply PANIC_HANG
 
-config TARGET_T1042RDB_PI
-	bool "Support T1042RDB_PI"
-	select ARCH_T1042
-	select BOARD_LATE_INIT if CHAIN_OF_TRUST
-	select SUPPORT_SPL
-	select PHYS_64BIT
-	select SYS_L3_SIZE_256KB
-	imply PANIC_HANG
-
 config TARGET_T2080QDS
 	bool "Support T2080QDS"
 	select ARCH_T2080
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index 09f37ec3e49a..236098e718ef 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -17,9 +17,7 @@
 
 #if defined(CONFIG_TARGET_T2080QDS) || \
 	defined(CONFIG_TARGET_T2080RDB) || \
-	defined(CONFIG_TARGET_T1042RDB) || \
 	defined(CONFIG_TARGET_T1042D4RDB) || \
-	defined(CONFIG_TARGET_T1042RDB_PI) || \
 	defined(CONFIG_ARCH_T1024)
 #undef CFG_SYS_INIT_L3_ADDR
 #define CFG_SYS_INIT_L3_ADDR			0xbff00000
diff --git a/board/freescale/t104xrdb/Kconfig b/board/freescale/t104xrdb/Kconfig
index e33d3173650c..e4814915e332 100644
--- a/board/freescale/t104xrdb/Kconfig
+++ b/board/freescale/t104xrdb/Kconfig
@@ -1,6 +1,4 @@
-if TARGET_T1040RDB || TARGET_T1040D4RDB || \
-	TARGET_T1042RDB || TARGET_T1042D4RDB || \
-	TARGET_T1042RDB_PI
+if TARGET_T1042D4RDB
 
 config SYS_BOARD
 	default "t104xrdb"
diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h
index 769883f9461f..0384202fbcb8 100644
--- a/board/freescale/t104xrdb/cpld.h
+++ b/board/freescale/t104xrdb/cpld.h
@@ -20,7 +20,7 @@ struct cpld_data {
 	u8 int_status;		/* 0x12 - Interrupt status Register */
 	u8 flash_ctl_status;	/* 0x13 - Flash control and status register */
 	u8 fan_ctl_status;	/* 0x14 - Fan control and status register  */
-#if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
+#if defined(CONFIG_TARGET_T1042D4RDB)
 	u8 int_mask;		/* 0x15 - Interrupt mask Register */
 #else
 	u8 led_ctl_status;	/* 0x15 - LED control and status register */
diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c
index c011aa96fbef..3906c8381e01 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/freescale/t104xrdb/eth.c
@@ -39,25 +39,6 @@ int board_eth_init(struct bd_info *bis)
 		int idx = i - FM1_DTSEC1;
 
 		switch (fm_info_get_enet_if(i)) {
-#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB)
-		case PHY_INTERFACE_MODE_SGMII:
-			/* T1040RDB & T1040D4RDB only supports SGMII on
-			 * DTSEC3
-			 */
-			fm_info_set_phy_address(FM1_DTSEC3,
-						CFG_SYS_SGMII1_PHY_ADDR);
-			break;
-#endif
-#ifdef CONFIG_TARGET_T1042RDB
-		case PHY_INTERFACE_MODE_SGMII:
-			/* T1042RDB doesn't supports SGMII on DTSEC1 & DTSEC2 */
-			if ((FM1_DTSEC1 == i) || (FM1_DTSEC2 == i))
-				fm_info_set_phy_address(i, 0);
-			/* T1042RDB only supports SGMII on DTSEC3 */
-			fm_info_set_phy_address(FM1_DTSEC3,
-						CFG_SYS_SGMII1_PHY_ADDR);
-			break;
-#endif
 #ifdef CONFIG_TARGET_T1042D4RDB
 		case PHY_INTERFACE_MODE_SGMII:
 			/* T1042D4RDB supports SGMII on DTSEC1, DTSEC2
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index 45ebdd30004c..8cec71217a72 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/freescale/t104xrdb/t104xrdb.c
@@ -34,7 +34,7 @@ int checkboard(void)
 	struct cpu_type *cpu = gd->arch.cpu;
 	u8 sw;
 
-#if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
+#if defined(CONFIG_TARGET_T1042D4RDB)
 	printf("Board: %sD4RDB\n", cpu->name);
 #else
 	printf("Board: %sRDB\n", cpu->name);
@@ -110,23 +110,6 @@ int misc_init_r(void)
 		CPLD_WRITE(misc_ctl_status, CPLD_READ(misc_ctl_status) |
 					 MISC_CTL_SG_SEL | MISC_CTL_AURORA_SEL);
 
-#if defined(CONFIG_TARGET_T1040D4RDB)
-	if (hwconfig("qe-tdm")) {
-		CPLD_WRITE(sfp_ctl_status, CPLD_READ(sfp_ctl_status) |
-			   MISC_MUX_QE_TDM);
-		printf("QECSR : 0x%02x, mux to qe-tdm\n",
-		       CPLD_READ(sfp_ctl_status));
-	}
-	/* Mask all CPLD interrupt sources, except QSGMII interrupts */
-	if (CPLD_READ(sw_ver) < 0x03) {
-		debug("CPLD SW version 0x%02x doesn't support int_mask\n",
-		      CPLD_READ(sw_ver));
-	} else {
-		CPLD_WRITE(int_mask, CPLD_INT_MASK_ALL &
-			   ~(CPLD_INT_MASK_QSGMII1 | CPLD_INT_MASK_QSGMII2));
-	}
-#endif
-
 	return 0;
 }
 
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7a5bf937e4c3..cfde8ecf9c63 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -127,24 +127,10 @@
 #define CPLD_LBMAP_RESET		0xFF
 #define CPLD_LBMAP_SHIFT		0x03
 
-#if defined(CONFIG_TARGET_T1042RDB_PI)
-#define CPLD_DIU_SEL_DFP		0x80
-#elif defined(CONFIG_TARGET_T1042D4RDB)
+#if defined(CONFIG_TARGET_T1042D4RDB)
 #define CPLD_DIU_SEL_DFP		0xc0
 #endif
 
-#if defined(CONFIG_TARGET_T1040D4RDB)
-#define CPLD_INT_MASK_ALL		0xFF
-#define CPLD_INT_MASK_THERM		0x80
-#define CPLD_INT_MASK_DVI_DFP		0x40
-#define CPLD_INT_MASK_QSGMII1		0x20
-#define CPLD_INT_MASK_QSGMII2		0x10
-#define CPLD_INT_MASK_SGMI1		0x08
-#define CPLD_INT_MASK_SGMI2		0x04
-#define CPLD_INT_MASK_TDMR1		0x02
-#define CPLD_INT_MASK_TDMR2		0x01
-#endif
-
 #define CFG_SYS_CPLD_BASE	0xffdf0000
 #define CFG_SYS_CPLD_BASE_PHYS	(0xf00000000ull | CFG_SYS_CPLD_BASE)
 #define CFG_SYS_CSPR2_EXT	(0xf)
@@ -266,9 +252,7 @@
 #define I2C_MUX_PCA_ADDR                0x70
 #define I2C_MUX_CH_DEFAULT      0x8
 
-#if defined(CONFIG_TARGET_T1042RDB_PI)	|| \
-	defined(CONFIG_TARGET_T1040D4RDB)	|| \
-	defined(CONFIG_TARGET_T1042D4RDB)
+#if defined(CONFIG_TARGET_T1042D4RDB)
 /*
  * RTC configuration
  */
@@ -350,36 +334,16 @@
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_FMAN_ENET
-#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1042RDB)
-#define CFG_SYS_SGMII1_PHY_ADDR             0x03
-#elif defined(CONFIG_TARGET_T1040D4RDB)
-#define CFG_SYS_SGMII1_PHY_ADDR             0x01
-#elif defined(CONFIG_TARGET_T1042D4RDB)
+#if defined(CONFIG_TARGET_T1042D4RDB)
 #define CFG_SYS_SGMII1_PHY_ADDR             0x02
 #define CFG_SYS_SGMII2_PHY_ADDR             0x03
 #define CFG_SYS_SGMII3_PHY_ADDR             0x01
 #endif
 
-#if defined(CONFIG_TARGET_T1040D4RDB) || defined(CONFIG_TARGET_T1042D4RDB)
-#define CFG_SYS_RGMII1_PHY_ADDR             0x04
-#define CFG_SYS_RGMII2_PHY_ADDR             0x05
-#else
 #define CFG_SYS_RGMII1_PHY_ADDR             0x01
 #define CFG_SYS_RGMII2_PHY_ADDR             0x02
 #endif
 
-/* Enable VSC9953 L2 Switch driver on T1040 SoC */
-#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB)
-#ifdef CONFIG_TARGET_T1040RDB
-#define CFG_SYS_FM1_QSGMII11_PHY_ADDR	0x04
-#define CFG_SYS_FM1_QSGMII21_PHY_ADDR	0x08
-#else
-#define CFG_SYS_FM1_QSGMII11_PHY_ADDR	0x08
-#define CFG_SYS_FM1_QSGMII21_PHY_ADDR	0x0c
-#endif
-#endif
-#endif
-
 /*
  * Miscellaneous configurable options
  */
@@ -402,15 +366,7 @@
 #define __USB_PHY_TYPE	utmi
 #define RAMDISKFILE	"t104xrdb/ramdisk.uboot"
 
-#ifdef CONFIG_TARGET_T1040RDB
-#define FDTFILE		"t1040rdb/t1040rdb.dtb"
-#elif defined(CONFIG_TARGET_T1042RDB_PI)
-#define FDTFILE		"t1042rdb_pi/t1042rdb_pi.dtb"
-#elif defined(CONFIG_TARGET_T1042RDB)
-#define FDTFILE		"t1042rdb/t1042rdb.dtb"
-#elif defined(CONFIG_TARGET_T1040D4RDB)
-#define FDTFILE		"t1042rdb/t1040d4rdb.dtb"
-#elif defined(CONFIG_TARGET_T1042D4RDB)
+#if defined(CONFIG_TARGET_T1042D4RDB)
 #define FDTFILE		"t1042rdb/t1042d4rdb.dtb"
 #endif
 
-- 
2.25.1

[PATCH 001/149] exynos: Rework legacy PWM usage

[Tom Rini]

The way that the timer support is currently done for exynos/nexell
platforms relies on the legacy PWM infrastructure, and that needs to be
updated. However, we really cannot safely undef CONFIG_DM_PWM to build
the timer.c file without warnings. For now, rename the relevant legacy
functions to be prefixed with s5p_ and add prototypes to the arch pwm.h
files.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Dzmitry Sankouski <dsankouski@gmail.com>
Cc: Stefan Bosch <stefan_b@posteo.net>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/s5p-common/pwm.c      | 11 +++++------
 arch/arm/cpu/armv7/s5p-common/timer.c    | 10 +++-------
 arch/arm/mach-exynos/include/mach/pwm.h  |  5 +++++
 arch/arm/mach-nexell/include/mach/pwm.h  |  5 +++++
 arch/arm/mach-s5pc1xx/include/mach/pwm.h |  5 +++++
 board/friendlyarm/nanopi2/board.c        |  4 ++--
 board/friendlyarm/nanopi2/onewire.c      |  4 ++--
 7 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c
index aef2e5574b41..5068327d3c5f 100644
--- a/arch/arm/cpu/armv7/s5p-common/pwm.c
+++ b/arch/arm/cpu/armv7/s5p-common/pwm.c
@@ -7,12 +7,11 @@
 
 #include <common.h>
 #include <errno.h>
-#include <pwm.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
 #include <asm/arch/clk.h>
 
-int pwm_enable(int pwm_id)
+int s5p_pwm_enable(int pwm_id)
 {
 	const struct s5p_timer *pwm =
 #if defined(CONFIG_ARCH_NEXELL)
@@ -30,7 +29,7 @@ int pwm_enable(int pwm_id)
 	return 0;
 }
 
-void pwm_disable(int pwm_id)
+void s5p_pwm_disable(int pwm_id)
 {
 	const struct s5p_timer *pwm =
 #if defined(CONFIG_ARCH_NEXELL)
@@ -92,7 +91,7 @@ static unsigned long pwm_calc_tin(int pwm_id, unsigned long freq)
 
 #define NS_IN_SEC 1000000000UL
 
-int pwm_config(int pwm_id, int duty_ns, int period_ns)
+int s5p_pwm_config(int pwm_id, int duty_ns, int period_ns)
 {
 	const struct s5p_timer *pwm =
 #if defined(CONFIG_ARCH_NEXELL)
@@ -157,7 +156,7 @@ int pwm_config(int pwm_id, int duty_ns, int period_ns)
 	return 0;
 }
 
-int pwm_init(int pwm_id, int div, int invert)
+int s5p_pwm_init(int pwm_id, int div, int invert)
 {
 	u32 val;
 	const struct s5p_timer *pwm =
@@ -219,7 +218,7 @@ int pwm_init(int pwm_id, int div, int invert)
 		val |= TCON_INVERTER(pwm_id);
 	writel(val, &pwm->tcon);
 
-	pwm_enable(pwm_id);
+	s5p_pwm_enable(pwm_id);
 
 	return 0;
 }
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 8533d04878c2..f4a045e2f0d2 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -16,10 +16,6 @@
 #include <asm/arch/clk.h>
 #include <linux/delay.h>
 
-/* Use the old PWM interface for now */
-#undef CONFIG_DM_PWM
-#include <pwm.h>
-
 DECLARE_GLOBAL_DATA_PTR;
 
 unsigned long get_current_tick(void);
@@ -49,9 +45,9 @@ static unsigned long timer_get_us_down(void)
 int timer_init(void)
 {
 	/* PWM Timer 4 */
-	pwm_init(4, MUX_DIV_4, 0);
-	pwm_config(4, 100000, 100000);
-	pwm_enable(4);
+	s5p_pwm_init(4, MUX_DIV_4, 0);
+	s5p_pwm_config(4, 100000, 100000);
+	s5p_pwm_enable(4);
 
 	/* Use this as the current monotonic time in us */
 	gd->arch.timer_reset_value = 0;
diff --git a/arch/arm/mach-exynos/include/mach/pwm.h b/arch/arm/mach-exynos/include/mach/pwm.h
index 417fc15551d5..17372492d586 100644
--- a/arch/arm/mach-exynos/include/mach/pwm.h
+++ b/arch/arm/mach-exynos/include/mach/pwm.h
@@ -49,6 +49,11 @@ struct s5p_timer {
 	unsigned int	tcnto4;
 	unsigned int	tintcstat;
 };
+
+int s5p_pwm_init (int pwm_id, int div, int invert);
+int s5p_pwm_config (int pwm_id, int duty_ns, int period_ns);
+int s5p_pwm_enable (int pwm_id);
+void s5p_pwm_disable (int pwm_id);
 #endif	/* __ASSEMBLY__ */
 
 #endif
diff --git a/arch/arm/mach-nexell/include/mach/pwm.h b/arch/arm/mach-nexell/include/mach/pwm.h
index 08a287d308ff..1e12058dd534 100644
--- a/arch/arm/mach-nexell/include/mach/pwm.h
+++ b/arch/arm/mach-nexell/include/mach/pwm.h
@@ -49,6 +49,11 @@ struct s5p_timer {
 	unsigned int	tcnto4;
 	unsigned int	tintcstat;
 };
+
+int s5p_pwm_init (int pwm_id, int div, int invert);
+int s5p_pwm_config (int pwm_id, int duty_ns, int period_ns);
+int s5p_pwm_enable (int pwm_id);
+void s5p_pwm_disable (int pwm_id);
 #endif	/* __ASSEMBLY__ */
 
 #endif
diff --git a/arch/arm/mach-s5pc1xx/include/mach/pwm.h b/arch/arm/mach-s5pc1xx/include/mach/pwm.h
index 1a531beddc63..6d53e52f6497 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/pwm.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/pwm.h
@@ -49,6 +49,11 @@ struct s5p_timer {
 	unsigned int	tcnto4;
 	unsigned int	tintcstat;
 };
+
+int s5p_pwm_init (int pwm_id, int div, int invert);
+int s5p_pwm_config (int pwm_id, int duty_ns, int period_ns);
+int s5p_pwm_enable (int pwm_id);
+void s5p_pwm_disable (int pwm_id);
 #endif	/* __ASSEMBLY__ */
 
 #endif
diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c
index 954197282e6b..393c5a447d6f 100644
--- a/board/friendlyarm/nanopi2/board.c
+++ b/board/friendlyarm/nanopi2/board.c
@@ -80,9 +80,9 @@ static void bd_backlight_on(void)
 
 #elif defined(BACKLIGHT_CH)
 	/* pwm backlight ON: HIGH, ON: LOW */
-	pwm_init(BACKLIGHT_CH,
+	s5p_pwm_init(BACKLIGHT_CH,
 		 BACKLIGHT_DIV, BACKLIGHT_INV);
-	pwm_config(BACKLIGHT_CH,
+	s5p_pwm_config(BACKLIGHT_CH,
 		   TO_DUTY_NS(BACKLIGHT_DUTY, BACKLIGHT_HZ),
 		   TO_PERIOD_NS(BACKLIGHT_HZ));
 #endif
diff --git a/board/friendlyarm/nanopi2/onewire.c b/board/friendlyarm/nanopi2/onewire.c
index fb356639be2f..56f0f2dfceba 100644
--- a/board/friendlyarm/nanopi2/onewire.c
+++ b/board/friendlyarm/nanopi2/onewire.c
@@ -9,8 +9,8 @@
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/pwm.h>
 #include <i2c.h>
-#include <pwm.h>
 
 #include <irq_func.h>
 
@@ -102,7 +102,7 @@ static int onewire_init_timer(void)
 	/* range: 1080~1970 */
 	period_ns -= 1525;
 
-	return pwm_config(PWM_CH, period_ns >> 1, period_ns);
+	return s5p_pwm_config(PWM_CH, period_ns >> 1, period_ns);
 }
 
 static void wait_one_tick(void)
-- 
2.25.1

[PATCH 002/149] rk32xx: Use standard TPL linker script

[Tom Rini]

As of 2f41ade79e59 ("linker: Modify linker scripts to be more generic")
we can use the same linker script for SPL and TPL and not have to make
use of #undef tricks. Remove these last remnants.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-rockchip/rk3288/Kconfig |  3 ---
 arch/arm/mach-rockchip/u-boot-tpl.lds | 12 ------------
 configs/evb-rk3229_defconfig          |  1 -
 3 files changed, 16 deletions(-)
 delete mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index 1be2b585212e..ea94ad114247 100644
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -168,9 +168,6 @@ config SPL_LIBGENERIC_SUPPORT
 config SPL_SERIAL
 	default y
 
-config TPL_LDSCRIPT
-	default "arch/arm/mach-rockchip/u-boot-tpl.lds"
-
 config TPL_STACK
         default 0xff718000
 
diff --git a/arch/arm/mach-rockchip/u-boot-tpl.lds b/arch/arm/mach-rockchip/u-boot-tpl.lds
deleted file mode 100644
index f5a89721ce82..000000000000
--- a/arch/arm/mach-rockchip/u-boot-tpl.lds
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier:	GPL-2.0+
-/*
- * Copyright (C) 2019 Rockchip Electronic Co.,Ltd
- */
-
-#undef CONFIG_SPL_TEXT_BASE
-#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE
-
-#undef CONFIG_SPL_MAX_SIZE
-#define CONFIG_SPL_MAX_SIZE CONFIG_TPL_MAX_SIZE
-
-#include "../cpu/u-boot-spl.lds"
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index 33202e48fe76..8b4da5b3e7dd 100644
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -11,7 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb"
 CONFIG_SPL_TEXT_BASE=0x60000000
 CONFIG_ROCKCHIP_RK322X=y
 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
-CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds"
 CONFIG_TARGET_EVB_RK3229=y
 CONFIG_SPL_STACK_R_ADDR=0x60600000
 CONFIG_DEBUG_UART_BASE=0x11030000
-- 
2.25.1

[PATCH 003/149] Convert CONFIG_NEVER_ASSERT_ODT_TO_CPU to Kconfig

[Tom Rini]

This converts the following to Kconfig:
    CONFIG_NEVER_ASSERT_ODT_TO_CPU

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/Kconfig | 3 +++
 include/configs/MPC837XERDB.h    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 563f52c5fdb3..b695c7e4d811 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -200,6 +200,9 @@ config FSL_SERDES
 	bool "SerDes initialization"
 	depends on !MPC83XX_SERDES
 
+config NEVER_ASSERT_ODT_TO_CPU
+	bool "Never assert ODT to internal IOs"
+
 source "board/freescale/mpc837xerdb/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 7b932eb38901..e0ac9338d322 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -55,8 +55,6 @@
 
 #define CFG_SYS_DDRCDR_VALUE	(DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
 
-#undef CONFIG_NEVER_ASSERT_ODT_TO_CPU	/* Never assert ODT to internal IOs */
-
 /*
  * Manually set up DDR parameters
  */
-- 
2.25.1

[PATCH 004/149] Convert CONFIG_SYS_FPGA_CHECK_BUSY to Kconfig

[Tom Rini]

This converts the following to Kconfig:
    CONFIG_SYS_FPGA_CHECK_BUSY

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/fpga/Kconfig    | 4 ++++
 drivers/fpga/spartan2.c | 2 --
 drivers/fpga/spartan3.c | 2 --
 drivers/fpga/virtex2.c  | 7 ++-----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 813d6a836d97..11b742eeebfe 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -96,6 +96,10 @@ config FPGA_VIRTEX2
 	  Enable Virtex-II FPGA driver for loading in BIT format. This driver
 	  also supports many newer Xilinx FPGA families.
 
+config SYS_FPGA_CHECK_BUSY
+	bool "Perform busy check during load from FPGA"
+	depends on FPGA_SPARTAN2 || FPGA_SPARTAN3 || FPGA_VIRTEX2
+
 config FPGA_ZYNQPL
 	bool "Enable Xilinx FPGA for Zynq"
 	depends on ARCH_ZYNQ
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 57a4532f736e..68971d934702 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -10,8 +10,6 @@
 #include <log.h>
 #include <spartan2.h>		/* Spartan-II device family */
 
-#undef CONFIG_SYS_FPGA_CHECK_BUSY
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index fdec89bb815f..1d5073cb59d4 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -15,8 +15,6 @@
 #include <log.h>
 #include <spartan3.h>		/* Spartan-II device family */
 
-#undef CONFIG_SYS_FPGA_CHECK_BUSY
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index 8871deaea6f6..ed2a4163f6eb 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -21,14 +21,11 @@
 #include <linux/delay.h>
 
 /*
- * If the SelectMap interface can be overrun by the processor, define
- * CONFIG_SYS_FPGA_CHECK_BUSY and/or CONFIG_FPGA_DELAY in the board
+ * If the SelectMap interface can be overrun by the processor, enable
+ * CONFIG_SYS_FPGA_CHECK_BUSY and/or define CONFIG_FPGA_DELAY in the board
  * configuration file and add board-specific support for checking BUSY status.
  * By default, assume that the SelectMap interface cannot be overrun.
  */
-#ifndef CONFIG_SYS_FPGA_CHECK_BUSY
-#undef CONFIG_SYS_FPGA_CHECK_BUSY
-#endif
 
 #ifndef CONFIG_FPGA_DELAY
 #define CONFIG_FPGA_DELAY()
-- 
2.25.1

[PATCH 005/149] mtd: ubi: Finish moving configuration to Kconfig

[Tom Rini]

We have some unused and undefined symbols to remove references to, so do
that. Move the final things that we do set (or need to keep unset) to
Kconfig instead.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/ubi/Kconfig | 12 ++++++++++++
 include/ubi_uboot.h     | 22 ----------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 67a3cf1d7a50..5783d36c048f 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -20,6 +20,18 @@ config MTD_UBI
 
 if MTD_UBI
 
+config MTD_UBI_BLOCK
+	def_bool n
+
+config MTD_UBI_MODULE
+	def_bool y
+	help
+	  ubi_init() disables returning error codes when built into the Linux
+	  kernel so that it doesn't hang the Linux kernel boot process.  Since
+	  the U-Boot driver code depends on getting valid error codes from this
+	  function we just tell the UBI layer that we are building as a module
+	  (which only enables the additional error reporting).
+
 config MTD_UBI_WL_THRESHOLD
 	int "UBI wear-leveling threshold"
 	default 4096
diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index 0770228cd895..6da348eb6285 100644
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -34,28 +34,6 @@
 
 #include <linux/errno.h>
 
-/* configurable */
-#define CONFIG_MTD_UBI_BEB_RESERVE	1
-
-/* debug options (Linux: drivers/mtd/ubi/Kconfig.debug) */
-#undef CONFIG_MTD_UBI_DEBUG
-#undef CONFIG_MTD_UBI_DEBUG_PARANOID
-#undef CONFIG_MTD_UBI_DEBUG_MSG
-#undef CONFIG_MTD_UBI_DEBUG_MSG_EBA
-#undef CONFIG_MTD_UBI_DEBUG_MSG_WL
-#undef CONFIG_MTD_UBI_DEBUG_MSG_IO
-#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD
-
-#undef CONFIG_MTD_UBI_BLOCK
-
-/* ubi_init() disables returning error codes when built into the Linux
- * kernel so that it doesn't hang the Linux kernel boot process.  Since
- * the U-Boot driver code depends on getting valid error codes from this
- * function we just tell the UBI layer that we are building as a module
- * (which only enables the additional error reporting).
- */
-#define CONFIG_MTD_UBI_MODULE
-
 /* build.c */
 #define get_device(...)
 #define put_device(...)
-- 
2.25.1

[PATCH 006/149] atmel_nand: Remove undef during SPL_BUILD

[Tom Rini]

We cannot disable features in SPL in this manner, remove the undef here.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/atmel_nand.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c
index 9fbb0b57cf1d..b7e473c598d0 100644
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@@ -38,10 +38,6 @@
 
 #ifdef CONFIG_ATMEL_NAND_HW_PMECC
 
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_SYS_NAND_ONFI_DETECTION
-#endif
-
 struct atmel_nand_host {
 	struct pmecc_regs __iomem *pmecc;
 	struct pmecc_errloc_regs __iomem *pmerrloc;
-- 
2.25.1

[PATCH 007/149] valgrind: Rework test for unsupported platforms

[Tom Rini]

Change things so that on an unsupported platform we will #error rather
than undef the feature.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/valgrind/valgrind.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/valgrind/valgrind.h b/include/valgrind/valgrind.h
index e59a7fde3211..5d4fa5f43b47 100644
--- a/include/valgrind/valgrind.h
+++ b/include/valgrind/valgrind.h
@@ -121,7 +121,9 @@
 #else
 /* If we're not compiling for our target platform, don't generate
    any inline asms.  */
-#  undef CONFIG_VALGRIND
+#  if IS_ENABLED(CONFIG_VALGRIND)
+#    error "Unsupported platform for valgrind"
+#  endif
 #endif
 
 
-- 
2.25.1

[PATCH 008/149] log: Remove some places where we redefine LOGLEVEL

[Tom Rini]

We cannot redefine a CONFIG value per file in this manner.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/octeontx_bch.c  | 5 -----
 drivers/mtd/nand/raw/octeontx_nand.c | 5 -----
 test/log/pr_cont_test.c              | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/drivers/mtd/nand/raw/octeontx_bch.c b/drivers/mtd/nand/raw/octeontx_bch.c
index c1d721cabfc6..fc16b77416bb 100644
--- a/drivers/mtd/nand/raw/octeontx_bch.c
+++ b/drivers/mtd/nand/raw/octeontx_bch.c
@@ -27,11 +27,6 @@
 #include <asm/arch/clock.h>
 #include "octeontx_bch.h"
 
-#ifdef DEBUG
-# undef CONFIG_LOGLEVEL
-# define CONFIG_LOGLEVEL 8
-#endif
-
 LIST_HEAD(octeontx_bch_devices);
 static unsigned int num_vfs = BCH_NR_VF;
 static void *bch_pf;
diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c
index b338b204f343..1ffadad9cae7 100644
--- a/drivers/mtd/nand/raw/octeontx_nand.c
+++ b/drivers/mtd/nand/raw/octeontx_nand.c
@@ -31,11 +31,6 @@
 #include <asm/arch/clock.h>
 #include "octeontx_bch.h"
 
-#ifdef DEBUG
-# undef CONFIG_LOGLEVEL
-# define CONFIG_LOGLEVEL 8
-#endif
-
 /*
  * The NDF_CMD queue takes commands between 16 - 128 bit.
  * All commands must be 16 bit aligned and are little endian.
diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c
index 6abddf7a1195..df4520d28075 100644
--- a/test/log/pr_cont_test.c
+++ b/test/log/pr_cont_test.c
@@ -16,9 +16,6 @@
 
 #define BUFFSIZE 64
 
-#undef CONFIG_LOGLEVEL
-#define CONFIG_LOGLEVEL 4
-
 DECLARE_GLOBAL_DATA_PTR;
 
 static int log_test_pr_cont(struct unit_test_state *uts)
-- 
2.25.1

[PATCH 009/149] global: Remove undef CONFIG_... for unused values

[Tom Rini]

We have a number of places that undef CONFIG_... while we never
reference CONFIG_... in the first place. Remove these lines.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 common/cli_hush.c                         | 1 -
 drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 --
 include/configs/P1010RDB.h                | 1 -
 include/configs/p1_p2_rdb_pc.h            | 1 -
 include/configs/s5p4418_nanopi2.h         | 2 --
 5 files changed, 7 deletions(-)

diff --git a/common/cli_hush.c b/common/cli_hush.c
index 1467ff81b35b..a80b84756bbe 100644
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -112,7 +112,6 @@
 #define applet_name "hush"
 #include "standalone.h"
 #define hush_main main
-#undef CONFIG_FEATURE_SH_FANCY_PROMPT
 #define BB_BANNER
 #endif
 #endif
diff --git a/drivers/ddr/marvell/axp/ddr3_axp_config.h b/drivers/ddr/marvell/axp/ddr3_axp_config.h
index ab09e72623a0..04bb4ed8f344 100644
--- a/drivers/ddr/marvell/axp/ddr3_axp_config.h
+++ b/drivers/ddr/marvell/axp/ddr3_axp_config.h
@@ -59,12 +59,10 @@
 
 /* Marvell boards specific configurations */
 #if defined(DB_78X60_PCAC)
-#undef CONFIG_SPD_EEPROM
 #define STATIC_TRAINING
 #endif
 
 #if defined(DB_78X60_AMC)
-#undef CONFIG_SPD_EEPROM
 #undef  DRAM_ECC
 #define DRAM_ECC				1
 #endif
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 2267a7a9c8b8..afb602c5bce9 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -309,7 +309,6 @@ extern unsigned long get_sdram_size(void);
 #endif
 
 /* Serial Port */
-#undef	CONFIG_SERIAL_SOFTWARE_FIFO
 #define CFG_SYS_NS16550_CLK		get_bus_freq(0)
 
 #define CFG_SYS_BAUDRATE_TABLE	\
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c05904a813d0..74627b2e6302 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -302,7 +302,6 @@
  * open - index 2
  * shorted - index 1
  */
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
 #define CFG_SYS_NS16550_CLK		get_bus_freq(0)
 
 #define CFG_SYS_BAUDRATE_TABLE	\
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index e071d4da5e86..b4b2dbd03867 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -66,8 +66,6 @@
 /*-----------------------------------------------------------------------
  *  High Level System Configuration
  */
-/* Not used: not need IRQ/FIQ stuff */
-#undef  CONFIG_USE_IRQ
 /* decrementer freq: 1ms ticks */
 
 /*-----------------------------------------------------------------------
-- 
2.25.1

[PATCH 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[Tom Rini]

While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
cannot undef the symbol in this manner. As this ends up only being a
single location in a file that already has other checks for HOST_CC, add
one more HOST_CC check instead.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 lib/rsa/rsa-verify.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 9605c376390a..0662235be6f1 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -23,18 +23,13 @@
 #include <u-boot/rsa-mod-exp.h>
 #include <u-boot/rsa.h>
 
-#ifndef __UBOOT__
 /*
  * NOTE:
  * Since host tools, like mkimage, make use of openssl library for
  * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are
  * of no use and should not be compiled in.
- * So just turn off CONFIG_RSA_VERIFY_WITH_PKEY.
  */
 
-#undef CONFIG_RSA_VERIFY_WITH_PKEY
-#endif
-
 /* Default public exponent for backward compatibility */
 #define RSA_DEFAULT_PUBEXP	65537
 
@@ -506,6 +501,7 @@ int rsa_verify_hash(struct image_sign_info *info,
 {
 	int ret = -EACCES;
 
+#if !defined(USE_HOSTCC)
 	if (CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && !info->fdt_blob) {
 		/* don't rely on fdt properties */
 		ret = rsa_verify_with_pkey(info, hash, sig, sig_len);
@@ -513,6 +509,7 @@ int rsa_verify_hash(struct image_sign_info *info,
 			debug("%s: rsa_verify_with_pkey() failed\n", __func__);
 		return ret;
 	}
+#endif
 
 	if (CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
 		const void *blob = info->fdt_blob;
-- 
2.25.1

[PATCH 011/149] global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ARM_GIC_BASE_ADDRESS to CFG_ARM_GIC_BASE_ADDRESS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
 arch/arm/cpu/armv7/virt-v7.c     | 4 ++--
 include/configs/arndale.h        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 39aeeb423f08..b6d144f065d2 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry)
 ENDPROC(_do_nonsec_entry)
 
 .macro get_cbar_addr	addr
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
-	ldr	\addr, =CONFIG_ARM_GIC_BASE_ADDRESS
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+	ldr	\addr, =CFG_ARM_GIC_BASE_ADDRESS
 #else
 	mrc	p15, 4, \addr, c15, c0, 0	@ read CBAR
 	bfc	\addr, #0, #15			@ clear reserved bits
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 5ffeca13d913..c82b215b6f9c 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)
 
 static unsigned long get_gicd_base_address(void)
 {
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
-	return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+	return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
 #else
 	unsigned periphbase;
 
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 7a244769e30a..8acc525b11c9 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -19,6 +19,6 @@
 #define CONFIG_SMP_PEN_ADDR	0x02020000
 
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
-#define CONFIG_ARM_GIC_BASE_ADDRESS	0x10480000
+#define CFG_ARM_GIC_BASE_ADDRESS	0x10480000
 
 #endif	/* __CONFIG_H */
-- 
2.25.1

[PATCH 012/149] global: Migrate CONFIG_BOARDDIR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_BOARDDIR to CFG_BOARDDIR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sh/cpu/u-boot.lds    | 2 +-
 doc/README.kwbimage       | 2 +-
 scripts/Makefile.autoconf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
index d360eea7eba3..c31deecec659 100644
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -35,7 +35,7 @@ SECTIONS
 	.text :
 	{
 		KEEP(*/start.o		(.text))
-		KEEP(CONFIG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
+		KEEP(CFG_BOARDDIR/lowlevel_init.o	(.text .spiboot1.text))
 		KEEP(*(.spiboot2.text))
 		. = ALIGN(8192);
 #ifdef CONFIG_ENV_IS_IN_FLASH
diff --git a/doc/README.kwbimage b/doc/README.kwbimage
index 762b2e3acb71..a1d247c32dd1 100644
--- a/doc/README.kwbimage
+++ b/doc/README.kwbimage
@@ -42,7 +42,7 @@ Board specific configuration file specifications:
 	kwbimage.cfg.  The name can be set as part of the full path
 	to the file using CONFIG_SYS_KWD_CONFIG (probably in
 	include/configs/<yourboard>.h).   The path should look like:
-	$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg
+	$(CFG_BOARDDIR)/<yourkwbimagename>.cfg
 2. This file can have empty lines and lines starting with "#" as first
 	character to put comments
 3. This file can have configuration command lines as mentioned below,
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 5a4a14895538..f5f5e4a4d540 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
-	echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
+	echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
-- 
2.25.1

[PATCH 013/149] global: Migrate CONFIG_DFU_ALT et al to CFG

[Tom Rini]

Perform simple renames of:
   CONFIG_DFU_ALT to CFG_DFU_ALT
   CONFIG_DFU_ALT_BOOT_EMMC to CFG_DFU_ALT_BOOT_EMMC
   CONFIG_DFU_ALT_BOOT_SD to CFG_DFU_ALT_BOOT_SD
   CONFIG_DFU_ALT_SYSTEM to CFG_DFU_ALT_SYSTEM
   CONFIG_DFU_ENV_SETTINGS to CFG_DFU_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/exynos5-dt.c | 4 ++--
 board/samsung/odroid/odroid.c     | 4 ++--
 include/configs/mx7dsabresd.h     | 4 ++--
 include/configs/odroid.h          | 8 ++++----
 include/configs/odroid_xu3.h      | 8 ++++----
 include/configs/pico-imx6.h       | 4 ++--
 include/configs/pico-imx6ul.h     | 4 ++--
 include/configs/pico-imx7d.h      | 4 ++--
 include/configs/s5p_goni.h        | 4 ++--
 include/configs/trats.h           | 4 ++--
 include/configs/trats2.h          | 4 ++--
 include/configs/warp7.h           | 4 ++--
 12 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 0d77a57f8082..cde77d79a0f6 100644
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
 		return NULL;
 
 	if (IS_SD(mmc))
-		alt_boot = CONFIG_DFU_ALT_BOOT_SD;
+		alt_boot = CFG_DFU_ALT_BOOT_SD;
 	else
-		alt_boot = CONFIG_DFU_ALT_BOOT_EMMC;
+		alt_boot = CFG_DFU_ALT_BOOT_EMMC;
 
 	return alt_boot;
 }
diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c
index 35e4cee74f44..39a60e4ad295 100644
--- a/board/samsung/odroid/odroid.c
+++ b/board/samsung/odroid/odroid.c
@@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
 	if (mmc_init(mmc))
 		return NULL;
 
-	alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD :
-				CONFIG_DFU_ALT_BOOT_EMMC;
+	alt_boot = IS_SD(mmc) ? CFG_DFU_ALT_BOOT_SD :
+				CFG_DFU_ALT_BOOT_EMMC;
 
 	return alt_boot;
 }
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index bd70b62bd209..e56b6101af43 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -44,7 +44,7 @@
 	"initrd_high=0xffffffff\0" \
 	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=image raw 0 0x800000;"\
 		"u-boot raw 0 0x4000;"\
 		"bootimg part 0 1;"\
@@ -53,7 +53,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index f252b349437c..e2331e45cdfe 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -27,7 +27,7 @@
 #define PARTS_BOOT		"boot"
 #define PARTS_ROOT		"platform"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"uImage fat 0 1;" \
 	"zImage fat 0 1;" \
 	"Image.itb fat 0 1;" \
@@ -39,13 +39,13 @@
 
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
-#define CONFIG_DFU_ALT_BOOT_EMMC \
+#define CFG_DFU_ALT_BOOT_EMMC \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
 	"bl1 raw 0x0 0x1e mmcpart 1;" \
 	"bl2 raw 0x1e 0x1d mmcpart 1;" \
 	"tzsw raw 0x83e 0x138 mmcpart 1\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD \
+#define CFG_DFU_ALT_BOOT_SD \
 	"u-boot raw 0x3f 0x800;" \
 	"bl1 raw 0x1 0x1e;" \
 	"bl2 raw 0x1f 0x1d;" \
@@ -132,7 +132,7 @@
 	"mmcbootpart=1\0" \
 	"mmcrootdev=0\0" \
 	"mmcrootpart=2\0" \
-	"dfu_alt_system="CONFIG_DFU_ALT \
+	"dfu_alt_system="CFG_DFU_ALT \
 	"dfu_alt_info=Please reset the board\0" \
 	"consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
 	"consoleoff=set console console=ram; save; reset\0" \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index bf63a4de0765..e4a81499a726 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -20,7 +20,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
-#define CONFIG_DFU_ALT_SYSTEM               \
+#define CFG_DFU_ALT_SYSTEM               \
 	"uImage fat 0 1;"                   \
 	"zImage fat 0 1;"                   \
 	"Image.itb fat 0 1;"                \
@@ -34,14 +34,14 @@
 	"boot part 0 1;"                    \
 	"root part 0 2\0"
 
-#define CONFIG_DFU_ALT_BOOT_EMMC           \
+#define CFG_DFU_ALT_BOOT_EMMC           \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
 	"bl1 raw 0x0 0x1e mmcpart 1;"      \
 	"bl2 raw 0x1e 0x1d mmcpart 1;"     \
 	"tzsw raw 0x83e 0x200 mmcpart 1;"  \
 	"params.bin raw 0x1880 0x20\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD   \
+#define CFG_DFU_ALT_BOOT_SD   \
 	"u-boot raw 0x3f 0x800;" \
 	"bl1 raw 0x1 0x1e;"      \
 	"bl2 raw 0x1f 0x1d;"     \
@@ -75,7 +75,7 @@
 	"mmcrootdev=0\0" \
 	"mmcbootpart=1\0" \
 	"mmcrootpart=2\0" \
-	"dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \
+	"dfu_alt_system="CFG_DFU_ALT_SYSTEM \
 	"dfu_alt_info=Autoset by THOR/DFU command run.\0"
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 6d7873daa0ad..719b70144051 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -21,7 +21,7 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x1000;" \
@@ -47,7 +47,7 @@
 	"fdt_addr_r=0x18000000\0" \
 	"fdt_addr=0x18000000\0" \
 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"finduuid=part uuid mmc 0:1 uuid\0" \
 	"findfdt="\
 		"if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index faf11d5a72ad..36f648f63400 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -28,7 +28,7 @@
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x400;" \
@@ -63,7 +63,7 @@
 	"ramdiskaddr=0x83000000\0" \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"mmcautodetect=yes\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"findfdt=" \
 		"if test $fdtfile = ask ; then " \
 			"bootmenu -1; fi;" \
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 83907b06ebb4..581921510426 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -15,7 +15,7 @@
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
 		"u-boot raw 0x8a 0x1000;" \
@@ -67,7 +67,7 @@
 	"ramdisk_addr_r=0x83000000\0" \
 	"ramdiskaddr=0x83000000\0" \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"findfdt=" \
 		"if test $fdtfile = ask ; then " \
 			"bootmenu -1; fi;" \
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index da83db1f68ab..555bedb93d65 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -35,7 +35,7 @@
 #define PARTS_CSC			"csc"
 #define PARTS_UMS			"ums"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x400;" \
 	"uImage ext4 0 2;" \
 	"exynos3-goni.dtb ext4 0 2;" \
@@ -102,7 +102,7 @@
 	"ubiblock=8\0" \
 	"ubi=enabled\0" \
 	"opts=always_resume=1\0" \
-	"dfu_alt_info=" CONFIG_DFU_ALT "\0"
+	"dfu_alt_info=" CFG_DFU_ALT "\0"
 
 /* Goni has 3 banks of DRAM, but swap the bank */
 #define PHYS_SDRAM_1		CFG_SYS_SDRAM_BASE	/* OneDRAM Bank #0 */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index ec18842bbe8c..3eac66539dfe 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -39,7 +39,7 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x400;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
@@ -98,7 +98,7 @@
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
 	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"dfu_alt_info=" CFG_DFU_ALT \
 	"spladdr=0x40000100\0" \
 	"splsize=0x200\0" \
 	"splfile=falcon.bin\0" \
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 4d39b4005bd6..18fca09a3807 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -40,7 +40,7 @@
 	"name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
 	"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
 	"u-boot raw 0x80 0x800;" \
 	"/uImage ext4 0 2;" \
 	"/modem.bin ext4 0 2;" \
@@ -86,7 +86,7 @@
 	"mmcrootpart=5\0" \
 	"opts=always_resume=1\0" \
 	"partitions=" PARTS_DEFAULT \
-	"dfu_alt_info=" CONFIG_DFU_ALT \
+	"dfu_alt_info=" CFG_DFU_ALT \
 	"uartpath=ap\0" \
 	"usbpath=ap\0" \
 	"consoleon=set console console=ttySAC2,115200n8; save; reset\0" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index a985c6f28f30..188180da54eb 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -16,7 +16,7 @@
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
 
-#define CONFIG_DFU_ENV_SETTINGS \
+#define CFG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
 
 /* When booting with FIT specify the node entry containing boot.scr */
@@ -27,7 +27,7 @@
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
+	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"bootscr_fitimage_name=bootscr\0" \
 	"script_signed=boot.scr.imx-signed\0" \
-- 
2.25.1

[PATCH 014/149] global: Migrate CONFIG_DW_WDT_CLOCK_KHZ to CFG

[Tom Rini]

Perform a simple rename of CONFIG_DW_WDT_CLOCK_KHZ to CFG_DW_WDT_CLOCK_KHZ

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/watchdog/designware_wdt.c      | 2 +-
 include/configs/socfpga_common.h       | 2 +-
 include/configs/socfpga_soc64_common.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
index f8df1916b5f8..447a22d3b365 100644
--- a/drivers/watchdog/designware_wdt.c
+++ b/drivers/watchdog/designware_wdt.c
@@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev)
 		goto err;
 	}
 #else
-	priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
+	priv->clk_khz = CFG_DW_WDT_CLOCK_KHZ;
 #endif
 
 	if (CONFIG_IS_ENABLED(DM_RESET) &&
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 088cd4d4f7f6..d0f5331d4518 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -64,7 +64,7 @@
 /*
  * L4 Watchdog
  */
-#define CONFIG_DW_WDT_CLOCK_KHZ		25000
+#define CFG_DW_WDT_CLOCK_KHZ		25000
 
 /*
  * NAND Support
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index 47089f312d2c..df3927297bbe 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -90,10 +90,10 @@
 #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
 #ifndef __ASSEMBLY__
 unsigned int cm_get_l4_sys_free_clk_hz(void);
-#define CONFIG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
+#define CFG_DW_WDT_CLOCK_KHZ		(cm_get_l4_sys_free_clk_hz() / 1000)
 #endif
 #else
-#define CONFIG_DW_WDT_CLOCK_KHZ		100000
+#define CFG_DW_WDT_CLOCK_KHZ		100000
 #endif
 
 /*
-- 
2.25.1

[PATCH 015/149] global: Migrate CONFIG_ENV_FLAGS_LIST_STATIC to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_FLAGS_LIST_STATIC to CFG_ENV_FLAGS_LIST_STATIC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                            | 6 +++---
 include/configs/aristainetos2.h   | 2 +-
 include/configs/imx6q-bosch-acc.h | 2 +-
 include/env_flags.h               | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 2944646665a8..e19aa1f722c1 100644
--- a/README
+++ b/README
@@ -1066,7 +1066,7 @@ The following options need to be configured:
 		The same can be accomplished in a more flexible way
 		for any variable by configuring the type of access
 		to allow for those variables in the ".flags" variable
-		or define CONFIG_ENV_FLAGS_LIST_STATIC.
+		or define CFG_ENV_FLAGS_LIST_STATIC.
 
 - Protected RAM:
 		CONFIG_PRAM
@@ -1405,7 +1405,7 @@ Configuration Settings:
 		Use buffered writes to flash.
 
 - CONFIG_ENV_FLAGS_LIST_DEFAULT
-- CONFIG_ENV_FLAGS_LIST_STATIC
+- CFG_ENV_FLAGS_LIST_STATIC
 	Enable validation of the values given to environment variables when
 	calling env set.  Variables can be restricted to only decimal,
 	hexadecimal, or boolean.  If CONFIG_CMD_NET is also defined,
@@ -1436,7 +1436,7 @@ Configuration Settings:
 		Define this to a list (string) to define the ".flags"
 		environment variable in the default or embedded environment.
 
-	- CONFIG_ENV_FLAGS_LIST_STATIC
+	- CFG_ENV_FLAGS_LIST_STATIC
 		Define this to a list (string) to define validation that
 		should be done if an entry is not found in the ".flags"
 		environment variable.  To override a setting in the static
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 854135457153..ff213a41b8f4 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -418,7 +418,7 @@
 
 /* UBI support */
 
-#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
+#define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
 		"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
 
 #endif                         /* __ARISTAINETOS2_CONFIG_H */
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 99da081cdae8..392f97050a65 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -45,7 +45,7 @@
 	"save_env=env save; env save\0" \
 	"altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0"
 
-#define CONFIG_ENV_FLAGS_LIST_STATIC \
+#define CFG_ENV_FLAGS_LIST_STATIC \
 	"bootset:bw," \
 	"clone_pending:bw," \
 	"endurance_test:bw," \
diff --git a/include/env_flags.h b/include/env_flags.h
index 313cb8c49a6d..e4e40169aed0 100644
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -35,8 +35,8 @@ enum env_flags_varaccess {
 #define ENV_FLAGS_VARTYPE_LOC 0
 #define ENV_FLAGS_VARACCESS_LOC 1
 
-#ifndef CONFIG_ENV_FLAGS_LIST_STATIC
-#define CONFIG_ENV_FLAGS_LIST_STATIC ""
+#ifndef CFG_ENV_FLAGS_LIST_STATIC
+#define CFG_ENV_FLAGS_LIST_STATIC ""
 #endif
 
 #ifdef CONFIG_NET
@@ -77,7 +77,7 @@ enum env_flags_varaccess {
 	ETHADDR_FLAGS \
 	NET_FLAGS \
 	SERIAL_FLAGS \
-	CONFIG_ENV_FLAGS_LIST_STATIC
+	CFG_ENV_FLAGS_LIST_STATIC
 
 #ifdef CONFIG_CMD_ENV_FLAGS
 /*
-- 
2.25.1

[PATCH 016/149] global: Migrate CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS to CFG_ENV_SETTINGS_BUTTONS_AND_LEDS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/draco.h    | 4 ++--
 include/configs/etamin.h   | 4 ++--
 include/configs/pxm2.h     | 4 ++--
 include/configs/rastaban.h | 4 ++--
 include/configs/thuban.h   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 4869008da440..d1c7abe1b392 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -34,7 +34,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 811c7cb96188..8bfc9c9f6297 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -56,7 +56,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -134,7 +134,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 586a7edcbb52..eafa6ae9a9a0 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -18,7 +18,7 @@
 #define DDR_IOCTRL_VAL		0x18b
 #define DDR_PLL_FREQ		266
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=59\0" \
 	"led0=117,0,1\0" \
 
@@ -34,7 +34,7 @@
 	"nand_img_size=0x500000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
 	CONFIG_ENV_SETTINGS_NAND_V1 \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 49cd11c17b44..2e002faf2e60 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -21,7 +21,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -44,7 +44,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 696306e46592..25c5a8ccd20e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -37,7 +37,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
-- 
2.25.1

[PATCH 017/149] global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_SETTINGS_NAND_V1 to CFG_ENV_SETTINGS_NAND_V1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/pxm2.h                 | 2 +-
 include/configs/rut.h                  | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index eafa6ae9a9a0..c6a01270a54d 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -37,7 +37,7 @@
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
-	CONFIG_ENV_SETTINGS_NAND_V1 \
+	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
 	"mmc_root_fs_type=ext4 rootwait\0" \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index ac48372b6c0b..f51771f9ca46 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -34,7 +34,7 @@
 	"splashpos=m,m\0" \
 	"optargs=fixrtc --no-log consoleblank=0 \0" \
 	CONFIG_ENV_SETTINGS_V1 \
-	CONFIG_ENV_SETTINGS_NAND_V1 \
+	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
 	"mmc_root_fs_type=ext4 rootwait\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 406a179842e2..296ac34da637 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -196,7 +196,7 @@
 	"kernel_b part 0 8;" \
 	"rootfs partubi 0 10"
 
-#define CONFIG_ENV_SETTINGS_NAND_V1 \
+#define CFG_ENV_SETTINGS_NAND_V1 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"nand_active_ubi_vol_A=rootfs_a\0" \
 	"nand_active_ubi_vol_B=rootfs_b\0" \
-- 
2.25.1

[PATCH 018/149] global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_SETTINGS_NAND_V2 to CFG_ENV_SETTINGS_NAND_V2

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 6 +++---
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index d1c7abe1b392..5b0daec11a6a 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -36,6 +36,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 8bfc9c9f6297..c68d0df02a2b 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -93,8 +93,8 @@
 	"u-boot.env1 mtddev;" \
 	"rootfs mtddevubi" \
 
-#undef CONFIG_ENV_SETTINGS_NAND_V2
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#undef CFG_ENV_SETTINGS_NAND_V2
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
@@ -136,6 +136,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_ETAMIN_H */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 2e002faf2e60..f3435b2b8c6c 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -46,6 +46,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 296ac34da637..7e9a55ec6103 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -273,7 +273,7 @@
 	"u-boot.env1 part 0 7;" \
 	"rootfs partubi 0 9" \
 
-#define CONFIG_ENV_SETTINGS_NAND_V2 \
+#define CFG_ENV_SETTINGS_NAND_V2 \
 	"nand_active_ubi_vol=rootfs_a\0" \
 	"rootfs_name=rootfs\0" \
 	"kernel_name=uImage\0"\
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 25c5a8ccd20e..960b42dffd0e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -39,6 +39,6 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
-	CONFIG_ENV_SETTINGS_NAND_V2
+	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
-- 
2.25.1

[PATCH 019/149] global: Migrate CONFIG_ENV_SETTINGS_V1 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_SETTINGS_V1 to CFG_ENV_SETTINGS_V1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/pxm2.h                 | 2 +-
 include/configs/rut.h                  | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index c6a01270a54d..48f49906b84e 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -36,7 +36,7 @@
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
-	CONFIG_ENV_SETTINGS_V1 \
+	CFG_ENV_SETTINGS_V1 \
 	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index f51771f9ca46..b07d0c50604d 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -33,7 +33,7 @@
 	"nand_img_size=0x500000\0" \
 	"splashpos=m,m\0" \
 	"optargs=fixrtc --no-log consoleblank=0 \0" \
-	CONFIG_ENV_SETTINGS_V1 \
+	CFG_ENV_SETTINGS_V1 \
 	CFG_ENV_SETTINGS_NAND_V1 \
 	"mmc_dev=0\0" \
 	"mmc_root=/dev/mmcblk0p2 rw\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 7e9a55ec6103..4f277f08a44e 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -229,7 +229,7 @@
 		"${nand_img_size}; bootm ${kloadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#define CONFIG_ENV_SETTINGS_V1 \
+#define CFG_ENV_SETTINGS_V1 \
 		COMMON_ENV_SETTINGS \
 	"net_args=run bootargs_defaults;" \
 		"mtdparts default;" \
-- 
2.25.1

[PATCH 020/149] global: Migrate CONFIG_ENV_SETTINGS_V2 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_SETTINGS_V2 to CFG_ENV_SETTINGS_V2

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/draco.h                | 2 +-
 include/configs/etamin.h               | 2 +-
 include/configs/rastaban.h             | 2 +-
 include/configs/siemens-am33x-common.h | 2 +-
 include/configs/thuban.h               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 5b0daec11a6a..ab3cf10d7793 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -35,7 +35,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_DRACO_H */
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index c68d0df02a2b..57f619f55ff9 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -135,7 +135,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_ETAMIN_H */
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index f3435b2b8c6c..59d56d666242 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -45,7 +45,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_RASTABAN_H */
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 4f277f08a44e..7def657bcd1d 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -306,7 +306,7 @@
 		"bootm ${kloadaddr} - ${loadaddr}\0" \
 	COMMON_ENV_NAND_CMDS
 
-#define CONFIG_ENV_SETTINGS_V2 \
+#define CFG_ENV_SETTINGS_V2 \
 		COMMON_ENV_SETTINGS \
 	"net_args=run bootargs_defaults;" \
 		"mtdparts default;" \
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 960b42dffd0e..c8b27263e85e 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -38,7 +38,7 @@
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
 	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
-	CONFIG_ENV_SETTINGS_V2 \
+	CFG_ENV_SETTINGS_V2 \
 	CFG_ENV_SETTINGS_NAND_V2
 
 #endif	/* ! __CONFIG_THUBAN_H */
-- 
2.25.1

[PATCH 021/149] global: Migrate CONFIG_ENV_SROM_BANK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_SROM_BANK to CFG_ENV_SROM_BANK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/smdkc100/smdkc100.c | 6 +++---
 board/samsung/smdkv310/smdkv310.c | 6 +++---
 include/configs/exynos5-common.h  | 2 +-
 include/configs/smdkc100.h        | 2 +-
 include/configs/smdkv310.h        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index b944e44c1ac4..4f46911b0b4d 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -25,16 +25,16 @@ static void smc9115_pre_init(void)
 	u32 smc_bw_conf, smc_bc_conf;
 
 	/* gpio configuration GPK0CON */
-	gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
+	gpio_cfg_pin(S5PC100_GPIO_K00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
 	/* Ethernet needs bus width of 16 bits */
-	smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
+	smc_bw_conf = SMC_DATA16_WIDTH(CFG_ENV_SROM_BANK);
 	smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe)
 			| SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4)
 			| SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0);
 
 	/* Select and configure the SROMC bank */
-	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index bb61ba1f81c6..47483a26a622 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -24,17 +24,17 @@ static void smc9115_pre_init(void)
 	u32 smc_bw_conf, smc_bc_conf;
 
 	/* gpio configuration GPK0CON */
-	gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
+	gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
 
 	/* Ethernet needs bus width of 16 bits */
-	smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
+	smc_bw_conf = SROMC_DATA16_WIDTH(CFG_ENV_SROM_BANK);
 	smc_bc_conf = SROMC_BC_TACS(0x0F) | SROMC_BC_TCOS(0x0F)
 			| SROMC_BC_TACC(0x0F) | SROMC_BC_TCOH(0x0F)
 			| SROMC_BC_TAH(0x0F)  | SROMC_BC_TACP(0x0F)
 			| SROMC_BC_PMC(0x0F);
 
 	/* Select and configure the SROMC bank */
-	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }
 
 int board_init(void)
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 8e277ce7ff26..43ea34db7b6a 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -48,7 +48,7 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK		1
+#define CFG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
 /* Enable Time Command */
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index ffa1a1fcb0ef..ccb7ec38d033 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -94,7 +94,7 @@
  * Ethernet Contoller driver
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
+#define CFG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
 #endif /* CONFIG_CMD_NET */
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 38de1fa9849f..f0604195ad94 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -36,7 +36,7 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_ENV_SROM_BANK		1
+#define CFG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
 #endif	/* __CONFIG_H */
-- 
2.25.1

[PATCH 022/149] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ENV_TOTAL_SIZE to CFG_ENV_TOTAL_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h | 8 ++++----
 include/configs/kmcent2.h            | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 45997c75128c..eb9dd48bd7fe 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -169,7 +169,7 @@
  * Environment
  */
 
-#define CONFIG_ENV_TOTAL_SIZE		0x40000
+#define CFG_ENV_TOTAL_SIZE		0x40000
 #define ENV_DEL_ADDR		CONFIG_ENV_ADDR_REDUND  /* direct for newenv */
 
 #ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
@@ -208,11 +208,11 @@
 
 #define CONFIG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"protect on " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 #define CONFIG_HW_ENV_SETTINGS						\
 	"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi,"	\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 580d3a0faf01..4e5cdf640d27 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -138,7 +138,7 @@
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /* Environment in parallel NOR-Flash */
-#define CONFIG_ENV_TOTAL_SIZE		0x040000
+#define CFG_ENV_TOTAL_SIZE		0x040000
 #define ENV_DEL_ADDR		0xebf00000	/*direct for newenv*/
 
 /*
@@ -428,11 +428,11 @@ int get_scl(void);
 
 #define CONFIG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && "		\
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"protect on " __stringify(ENV_DEL_ADDR)			\
-		" +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0"
+		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
 #ifndef CONFIG_KM_DEF_ARCH
-- 
2.25.1

[PATCH 023/149] global: Migrate CONFIG_ET1100_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ET1100_BASE to CFG_ET1100_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/esd/meesc/meesc.c | 2 +-
 include/configs/meesc.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 21f4ba98b531..9e3621042241 100644
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -163,7 +163,7 @@ int checkboard(void)
 	u_char hw_type;	/* hardware type */
 
 	/* read the "Type" register of the ET1100 controller */
-	hw_type = readb(CONFIG_ET1100_BASE);
+	hw_type = readb(CFG_ET1100_BASE);
 
 	switch (hw_type) {
 	case 0x11:
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index d190e4b50392..38da55c70bfe 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -60,6 +60,6 @@
 #endif
 
 /* hw-controller addresses */
-#define CONFIG_ET1100_BASE		0x70000000
+#define CFG_ET1100_BASE		0x70000000
 
 #endif
-- 
2.25.1

[PATCH 024/149] global: Migrate CONFIG_ETHBASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ETHBASE to CFG_ETHBASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/cadence/xtfpga/xtfpga.c | 2 +-
 include/configs/xtfpga.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c
index f38f5564a06c..8e4081b4c6dd 100644
--- a/board/cadence/xtfpga/xtfpga.c
+++ b/board/cadence/xtfpga/xtfpga.c
@@ -89,7 +89,7 @@ int misc_init_r(void)
 	char *s = env_get("ethaddr");
 	if (s == 0) {
 		unsigned int x;
-		char s[] = __stringify(CONFIG_ETHBASE);
+		char s[] = __stringify(CFG_ETHBASE);
 		x = (*(volatile u32 *)CFG_SYS_FPGAREG_DIPSW)
 			& FPGAREG_MAC_MASK;
 		sprintf(&s[15], "%02x", x);
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index e0189c58f042..83a0539d8f2d 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -120,7 +120,7 @@
 /* Ethernet Driver Info */
 /*======================*/
 
-#define CONFIG_ETHBASE			00:50:C2:13:6f:00
+#define CFG_ETHBASE			00:50:C2:13:6f:00
 #define CFG_SYS_ETHOC_BASE		IOADDR(0x0d030000)
 #define CFG_SYS_ETHOC_BUFFER_ADDR	IOADDR(0x0D800000)
 
-- 
2.25.1

[PATCH 025/149] global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_EXTRA_ENV_SETTINGS to CFG_EXTRA_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                      |  4 ++--
 doc/README.fsl-ddr                          |  4 ++--
 doc/README.link-local                       |  2 +-
 doc/arch/x86.rst                            |  4 ++--
 doc/develop/devicetree/control.rst          |  2 +-
 doc/develop/distro.rst                      |  2 +-
 doc/usage/environment.rst                   |  2 +-
 env/Kconfig                                 |  4 ++--
 include/configs/M5208EVBE.h                 |  2 +-
 include/configs/M5235EVB.h                  |  2 +-
 include/configs/M5253DEMO.h                 |  2 +-
 include/configs/M5272C3.h                   |  2 +-
 include/configs/M5275EVB.h                  |  2 +-
 include/configs/M5282EVB.h                  |  2 +-
 include/configs/M53017EVB.h                 |  2 +-
 include/configs/M5329EVB.h                  |  2 +-
 include/configs/M5373EVB.h                  |  2 +-
 include/configs/MCR3000.h                   |  2 +-
 include/configs/MPC837XERDB.h               |  2 +-
 include/configs/MPC8548CDS.h                |  2 +-
 include/configs/P1010RDB.h                  |  2 +-
 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/alt.h                       |  2 +-
 include/configs/am335x_evm.h                |  2 +-
 include/configs/am335x_guardian.h           |  2 +-
 include/configs/am335x_igep003x.h           |  2 +-
 include/configs/am335x_shc.h                |  2 +-
 include/configs/am335x_sl50.h               |  2 +-
 include/configs/am3517_evm.h                |  2 +-
 include/configs/am43xx_evm.h                |  2 +-
 include/configs/am62x_evm.h                 |  2 +-
 include/configs/am64x_evm.h                 |  2 +-
 include/configs/am65x_evm.h                 |  2 +-
 include/configs/amcore.h                    |  2 +-
 include/configs/apalis-imx8.h               |  2 +-
 include/configs/apalis_imx6.h               |  2 +-
 include/configs/apple.h                     |  2 +-
 include/configs/arbel.h                     |  2 +-
 include/configs/aristainetos2.h             |  2 +-
 include/configs/astro_mcf5373l.h            |  2 +-
 include/configs/at91sam9263ek.h             |  2 +-
 include/configs/at91sam9n12ek.h             |  2 +-
 include/configs/ax25-ae350.h                |  2 +-
 include/configs/axs10x.h                    |  2 +-
 include/configs/baltos.h                    |  2 +-
 include/configs/bcm_ns3.h                   |  2 +-
 include/configs/bcmstb.h                    |  2 +-
 include/configs/beacon-rzg2m.h              |  4 ++--
 include/configs/bitmain_antminer_s9.h       |  2 +-
 include/configs/bk4r1.h                     |  2 +-
 include/configs/brppt1.h                    |  2 +-
 include/configs/brppt2.h                    |  2 +-
 include/configs/brsmarc1.h                  |  2 +-
 include/configs/brxre1.h                    |  2 +-
 include/configs/capricorn-common.h          |  2 +-
 include/configs/cgtqmx8.h                   |  2 +-
 include/configs/chiliboard.h                |  2 +-
 include/configs/cl-som-imx7.h               |  4 ++--
 include/configs/clearfog.h                  |  2 +-
 include/configs/cm_fx6.h                    |  2 +-
 include/configs/cm_t43.h                    |  2 +-
 include/configs/colibri-imx6ull.h           |  2 +-
 include/configs/colibri-imx8x.h             |  2 +-
 include/configs/colibri_imx6.h              |  2 +-
 include/configs/colibri_imx7.h              |  2 +-
 include/configs/colibri_vf.h                |  2 +-
 include/configs/conga-qeval20-qa3-e3845.h   |  4 ++--
 include/configs/controlcenterdc.h           |  2 +-
 include/configs/crs3xx-98dx3236.h           |  2 +-
 include/configs/da850evm.h                  |  2 +-
 include/configs/dart_6ul.h                  |  2 +-
 include/configs/db-88f6820-amc.h            |  2 +-
 include/configs/db-88f6820-gp.h             |  2 +-
 include/configs/db-xc3-24g4xg.h             |  2 +-
 include/configs/devkit3250.h                |  2 +-
 include/configs/devkit8000.h                |  2 +-
 include/configs/dfi-bt700.h                 |  4 ++--
 include/configs/dh_imx6.h                   |  2 +-
 include/configs/display5.h                  |  2 +-
 include/configs/dns325.h                    |  2 +-
 include/configs/dockstar.h                  |  2 +-
 include/configs/draco.h                     |  2 +-
 include/configs/dragonboard410c.h           |  2 +-
 include/configs/dragonboard820c.h           |  2 +-
 include/configs/dragonboard845c.h           |  2 +-
 include/configs/dreamplug.h                 |  2 +-
 include/configs/ds109.h                     |  2 +-
 include/configs/ds414.h                     |  2 +-
 include/configs/durian.h                    |  2 +-
 include/configs/el6x_common.h               |  2 +-
 include/configs/embestmx6boards.h           |  2 +-
 include/configs/emsdp.h                     |  2 +-
 include/configs/etamin.h                    |  2 +-
 include/configs/evb_ast2500.h               |  2 +-
 include/configs/evb_ast2600.h               |  2 +-
 include/configs/evb_rv1108.h                |  4 ++--
 include/configs/exynos5-common.h            |  2 +-
 include/configs/exynos7420-common.h         |  2 +-
 include/configs/exynos78x0-common.h         |  2 +-
 include/configs/gazerbeam.h                 |  2 +-
 include/configs/ge_b1x5v2.h                 |  2 +-
 include/configs/ge_bx50v3.h                 |  2 +-
 include/configs/goflexhome.h                |  2 +-
 include/configs/gose.h                      |  2 +-
 include/configs/guruplug.h                  |  2 +-
 include/configs/helios4.h                   |  2 +-
 include/configs/highbank.h                  |  2 +-
 include/configs/hikey.h                     |  2 +-
 include/configs/hikey960.h                  |  2 +-
 include/configs/hsdk-4xd.h                  |  2 +-
 include/configs/hsdk.h                      |  2 +-
 include/configs/ib62x0.h                    |  2 +-
 include/configs/iconnect.h                  |  2 +-
 include/configs/imx6-engicam.h              |  2 +-
 include/configs/imx6_logic.h                |  2 +-
 include/configs/imx6dl-mamoj.h              |  2 +-
 include/configs/imx6q-bosch-acc.h           |  2 +-
 include/configs/imx6ulz_smm_m2.h            |  2 +-
 include/configs/imx7-cm.h                   |  4 ++--
 include/configs/imx8mm-cl-iot-gate.h        |  2 +-
 include/configs/imx8mm-mx8menlo.h           |  4 ++--
 include/configs/imx8mm_beacon.h             |  2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h |  2 +-
 include/configs/imx8mm_evk.h                |  2 +-
 include/configs/imx8mm_icore_mx8mm.h        |  2 +-
 include/configs/imx8mm_venice.h             |  2 +-
 include/configs/imx8mn_beacon.h             |  2 +-
 include/configs/imx8mn_bsh_smm_s2.h         |  2 +-
 include/configs/imx8mn_bsh_smm_s2pro.h      |  2 +-
 include/configs/imx8mn_evk.h                |  2 +-
 include/configs/imx8mn_var_som.h            |  2 +-
 include/configs/imx8mn_venice.h             |  2 +-
 include/configs/imx8mp_dhcom_pdk2.h         |  2 +-
 include/configs/imx8mp_evk.h                |  2 +-
 include/configs/imx8mp_icore_mx8mp.h        |  2 +-
 include/configs/imx8mp_rsb3720.h            |  2 +-
 include/configs/imx8mp_venice.h             |  2 +-
 include/configs/imx8mq_cm.h                 |  2 +-
 include/configs/imx8mq_evk.h                |  2 +-
 include/configs/imx8mq_phanbell.h           |  2 +-
 include/configs/imx8qm_mek.h                |  2 +-
 include/configs/imx8qm_rom7720.h            |  2 +-
 include/configs/imx8qxp_mek.h               |  2 +-
 include/configs/imx8ulp_evk.h               |  2 +-
 include/configs/imx93_evk.h                 |  2 +-
 include/configs/imxrt1050-evk.h             |  2 +-
 include/configs/iot2050.h                   |  2 +-
 include/configs/j721e_evm.h                 |  2 +-
 include/configs/j721s2_evm.h                |  2 +-
 include/configs/km/km-mpc83xx.h             |  2 +-
 include/configs/km/pg-wcom-ls102xa.h        |  2 +-
 include/configs/kmcent2.h                   |  2 +-
 include/configs/koelsch.h                   |  2 +-
 include/configs/kontron-sl-mx6ul.h          |  2 +-
 include/configs/kontron-sl-mx8mm.h          |  2 +-
 include/configs/kontron_pitx_imx8m.h        |  2 +-
 include/configs/kontron_sl28.h              |  2 +-
 include/configs/kp_imx53.h                  |  2 +-
 include/configs/kp_imx6q_tpc.h              |  2 +-
 include/configs/lacie_kw.h                  |  2 +-
 include/configs/lager.h                     |  2 +-
 include/configs/legoev3.h                   |  2 +-
 include/configs/librem5.h                   |  2 +-
 include/configs/liteboard.h                 |  2 +-
 include/configs/ls1012a2g5rdb.h             |  4 ++--
 include/configs/ls1012a_common.h            |  2 +-
 include/configs/ls1012afrdm.h               |  4 ++--
 include/configs/ls1012afrwy.h               |  4 ++--
 include/configs/ls1012aqds.h                |  4 ++--
 include/configs/ls1012ardb.h                |  4 ++--
 include/configs/ls1021aiot.h                |  2 +-
 include/configs/ls1021aqds.h                |  4 ++--
 include/configs/ls1021atsn.h                |  2 +-
 include/configs/ls1021atwr.h                |  4 ++--
 include/configs/ls1028aqds.h                |  4 ++--
 include/configs/ls1028ardb.h                |  4 ++--
 include/configs/ls1043a_common.h            |  2 +-
 include/configs/ls1046a_common.h            |  2 +-
 include/configs/ls1088a_common.h            |  2 +-
 include/configs/ls1088aqds.h                | 20 ++++++++++----------
 include/configs/ls1088ardb.h                |  6 +++---
 include/configs/ls2080a_common.h            |  2 +-
 include/configs/ls2080aqds.h                | 10 +++++-----
 include/configs/ls2080ardb.h                |  6 +++---
 include/configs/lsxl.h                      |  2 +-
 include/configs/lx2160aqds.h                |  2 +-
 include/configs/lx2160ardb.h                |  2 +-
 include/configs/lx2162aqds.h                |  2 +-
 include/configs/m53menlo.h                  |  2 +-
 include/configs/mccmon6.h                   |  2 +-
 include/configs/meson64.h                   |  4 ++--
 include/configs/meson64_android.h           |  2 +-
 include/configs/microblaze-generic.h        |  4 ++--
 include/configs/microchip_mpfs_icicle.h     |  2 +-
 include/configs/msc_sm2s_imx8mp.h           |  2 +-
 include/configs/mt7623.h                    |  2 +-
 include/configs/mt8183.h                    |  2 +-
 include/configs/mt8512.h                    |  2 +-
 include/configs/mt8516.h                    |  2 +-
 include/configs/mt8518.h                    |  2 +-
 include/configs/mvebu_alleycat-5.h          |  2 +-
 include/configs/mvebu_armada-37xx.h         |  2 +-
 include/configs/mvebu_armada-8k.h           |  2 +-
 include/configs/mx23_olinuxino.h            |  2 +-
 include/configs/mx23evk.h                   |  2 +-
 include/configs/mx28evk.h                   |  2 +-
 include/configs/mx51evk.h                   |  2 +-
 include/configs/mx53cx9020.h                |  2 +-
 include/configs/mx53loco.h                  |  2 +-
 include/configs/mx53ppd.h                   |  2 +-
 include/configs/mx6cuboxi.h                 |  2 +-
 include/configs/mx6sabre_common.h           |  2 +-
 include/configs/mx6slevk.h                  |  2 +-
 include/configs/mx6sllevk.h                 |  2 +-
 include/configs/mx6sxsabreauto.h            |  2 +-
 include/configs/mx6sxsabresd.h              |  2 +-
 include/configs/mx6ul_14x14_evk.h           |  2 +-
 include/configs/mx6ullevk.h                 |  2 +-
 include/configs/mx7dsabresd.h               |  2 +-
 include/configs/mx7ulp_com.h                |  2 +-
 include/configs/mx7ulp_evk.h                |  2 +-
 include/configs/mys_6ulx.h                  |  2 +-
 include/configs/nas220.h                    |  2 +-
 include/configs/nitrogen6x.h                |  2 +-
 include/configs/nokia_rx51.h                |  2 +-
 include/configs/novena.h                    |  2 +-
 include/configs/npi_imx6ull.h               |  2 +-
 include/configs/nsa310s.h                   |  2 +-
 include/configs/o4-imx6ull-nano.h           |  2 +-
 include/configs/octeontx2_common.h          |  2 +-
 include/configs/octeontx_common.h           |  4 ++--
 include/configs/odroid.h                    |  2 +-
 include/configs/odroid_xu3.h                |  4 ++--
 include/configs/omap3_beagle.h              |  2 +-
 include/configs/omap3_evm.h                 |  2 +-
 include/configs/omap3_igep00x0.h            |  2 +-
 include/configs/omap3_logic.h               |  2 +-
 include/configs/omapl138_lcdk.h             |  2 +-
 include/configs/openpiton-riscv64.h         |  2 +-
 include/configs/openrd.h                    |  2 +-
 include/configs/origen.h                    |  2 +-
 include/configs/p1_p2_rdb_pc.h              |  2 +-
 include/configs/pcl063.h                    |  2 +-
 include/configs/pcl063_ull.h                |  2 +-
 include/configs/pcm052.h                    |  2 +-
 include/configs/pcm058.h                    |  2 +-
 include/configs/pdu001.h                    |  2 +-
 include/configs/phycore_am335x_r2.h         |  2 +-
 include/configs/phycore_imx8mm.h            |  2 +-
 include/configs/phycore_imx8mp.h            |  2 +-
 include/configs/pic32mzdask.h               |  2 +-
 include/configs/pico-imx6.h                 |  2 +-
 include/configs/pico-imx6ul.h               |  2 +-
 include/configs/pico-imx7d.h                |  2 +-
 include/configs/pico-imx8mq.h               |  2 +-
 include/configs/pm9261.h                    |  2 +-
 include/configs/pm9263.h                    |  2 +-
 include/configs/pogo_e02.h                  |  2 +-
 include/configs/pogo_v4.h                   |  2 +-
 include/configs/poleg.h                     |  2 +-
 include/configs/pomelo.h                    |  2 +-
 include/configs/poplar.h                    |  2 +-
 include/configs/porter.h                    |  2 +-
 include/configs/presidio_asic.h             |  2 +-
 include/configs/px30_common.h               |  2 +-
 include/configs/pxm2.h                      |  2 +-
 include/configs/qcs404-evb.h                |  2 +-
 include/configs/qemu-arm.h                  |  2 +-
 include/configs/qemu-riscv.h                |  2 +-
 include/configs/rastaban.h                  |  2 +-
 include/configs/rcar-gen3-common.h          |  2 +-
 include/configs/rk3036_common.h             |  2 +-
 include/configs/rk3066_common.h             |  2 +-
 include/configs/rk3128_common.h             |  2 +-
 include/configs/rk3188_common.h             |  2 +-
 include/configs/rk322x_common.h             |  2 +-
 include/configs/rk3288_common.h             |  2 +-
 include/configs/rk3308_common.h             |  2 +-
 include/configs/rk3328_common.h             |  2 +-
 include/configs/rk3368_common.h             |  2 +-
 include/configs/rk3399_common.h             |  2 +-
 include/configs/rk3568_common.h             |  2 +-
 include/configs/rpi.h                       |  2 +-
 include/configs/rut.h                       |  2 +-
 include/configs/rv1108_common.h             |  2 +-
 include/configs/s5p4418_nanopi2.h           |  2 +-
 include/configs/s5p_goni.h                  |  2 +-
 include/configs/s5pc210_universal.h         |  2 +-
 include/configs/sdm845.h                    |  2 +-
 include/configs/sheevaplug.h                |  2 +-
 include/configs/sifive-unleashed.h          |  2 +-
 include/configs/sifive-unmatched.h          |  2 +-
 include/configs/silk.h                      |  2 +-
 include/configs/sipeed-maix.h               |  4 ++--
 include/configs/slimbootloader.h            |  6 +++---
 include/configs/smartweb.h                  |  2 +-
 include/configs/smdkc100.h                  |  2 +-
 include/configs/smegw01.h                   |  2 +-
 include/configs/snapper9g45.h               |  2 +-
 include/configs/sniper.h                    |  2 +-
 include/configs/socfpga_arria5_secu1.h      |  2 +-
 include/configs/socfpga_chameleonv3.h       |  2 +-
 include/configs/socfpga_common.h            |  4 ++--
 include/configs/socfpga_dbm_soc1.h          |  2 +-
 include/configs/socfpga_mcvevk.h            |  2 +-
 include/configs/socfpga_n5x_socdk.h         |  4 ++--
 include/configs/socfpga_soc64_common.h      |  2 +-
 include/configs/socfpga_vining_fpga.h       |  2 +-
 include/configs/socrates.h                  |  2 +-
 include/configs/somlabs_visionsom_6ull.h    |  2 +-
 include/configs/stemmy.h                    |  2 +-
 include/configs/stih410-b2260.h             |  2 +-
 include/configs/stm32f429-discovery.h       |  2 +-
 include/configs/stm32f429-evaluation.h      |  2 +-
 include/configs/stm32f469-discovery.h       |  2 +-
 include/configs/stm32f746-disco.h           |  2 +-
 include/configs/stm32h743-disco.h           |  2 +-
 include/configs/stm32h743-eval.h            |  2 +-
 include/configs/stm32h750-art-pi.h          |  2 +-
 include/configs/stm32mp13_common.h          |  2 +-
 include/configs/stm32mp15_common.h          |  2 +-
 include/configs/stm32mp15_dh_dhsom.h        |  2 +-
 include/configs/stm32mp15_st_common.h       |  6 +++---
 include/configs/stmark2.h                   |  2 +-
 include/configs/stout.h                     |  2 +-
 include/configs/sunxi-common.h              |  2 +-
 include/configs/synquacer.h                 |  2 +-
 include/configs/syzygy_hub.h                |  2 +-
 include/configs/taurus.h                    |  2 +-
 include/configs/tbs2910.h                   |  2 +-
 include/configs/tegra-common-post.h         |  2 +-
 include/configs/ten64.h                     |  4 ++--
 include/configs/theadorable-x86-common.h    |  4 ++--
 include/configs/theadorable.h               |  2 +-
 include/configs/thuban.h                    |  2 +-
 include/configs/thunderx_88xx.h             |  2 +-
 include/configs/ti816x_evm.h                |  2 +-
 include/configs/ti_armv7_keystone2.h        |  2 +-
 include/configs/ti_omap4_common.h           |  2 +-
 include/configs/ti_omap5_common.h           |  2 +-
 include/configs/topic_miami.h               |  4 ++--
 include/configs/total_compute.h             |  2 +-
 include/configs/tqma6.h                     |  2 +-
 include/configs/trats.h                     |  2 +-
 include/configs/trats2.h                    |  2 +-
 include/configs/turris_mox.h                |  2 +-
 include/configs/turris_omnia.h              |  2 +-
 include/configs/udoo.h                      |  2 +-
 include/configs/udoo_neo.h                  |  2 +-
 include/configs/uniphier.h                  |  2 +-
 include/configs/usb_a9263.h                 |  2 +-
 include/configs/usbarmory.h                 |  2 +-
 include/configs/vcoreiii.h                  |  2 +-
 include/configs/verdin-imx8mm.h             |  2 +-
 include/configs/verdin-imx8mp.h             |  2 +-
 include/configs/vexpress_aemv8.h            |  2 +-
 include/configs/vexpress_common.h           |  2 +-
 include/configs/vf610twr.h                  |  2 +-
 include/configs/vinco.h                     |  2 +-
 include/configs/wandboard.h                 |  2 +-
 include/configs/warp7.h                     |  2 +-
 include/configs/x530.h                      |  2 +-
 include/configs/x86-common.h                |  2 +-
 include/configs/xea.h                       |  2 +-
 include/configs/xenguest_arm64.h            |  6 +++---
 include/configs/xilinx_versal.h             |  4 ++--
 include/configs/xilinx_versal_mini.h        |  4 ++--
 include/configs/xilinx_versal_net.h         |  4 ++--
 include/configs/xilinx_versal_net_mini.h    |  4 ++--
 include/configs/xilinx_zynqmp.h             |  8 ++++----
 include/configs/xilinx_zynqmp_mini.h        |  4 ++--
 include/configs/xilinx_zynqmp_r5.h          |  2 +-
 include/configs/xpress.h                    |  2 +-
 include/configs/zynq-common.h               |  4 ++--
 include/configs/zynq_cse.h                  |  2 +-
 include/env_default.h                       |  4 ++--
 381 files changed, 444 insertions(+), 444 deletions(-)

diff --git a/README b/README
index e19aa1f722c1..a278825bbcc9 100644
--- a/README
+++ b/README
@@ -1124,7 +1124,7 @@ The following options need to be configured:
 		symbols.
 
 - Default Environment:
-		CONFIG_EXTRA_ENV_SETTINGS
+		CFG_EXTRA_ENV_SETTINGS
 
 		Define this to contain any number of null terminated
 		strings (variable = value pairs) that will be part of
@@ -1133,7 +1133,7 @@ The following options need to be configured:
 		For example, place something like this in your
 		board's config file:
 
-		#define CONFIG_EXTRA_ENV_SETTINGS \
+		#define CFG_EXTRA_ENV_SETTINGS \
 			"myvar1=value1\0" \
 			"myvar2=value2\0"
 
diff --git a/doc/README.fsl-ddr b/doc/README.fsl-ddr
index 10e63f3be1d3..f44bb2aa25d4 100644
--- a/doc/README.fsl-ddr
+++ b/doc/README.fsl-ddr
@@ -56,8 +56,8 @@ Table of 2-way interleaving modes supported in cpu/8xxx/ddr/
 The ways to configure the ddr interleaving mode
 ==============================================
 1. In board header file(e.g.MPC8572DS.h), add default interleaving setting
-   under "CONFIG_EXTRA_ENV_SETTINGS", like:
-	#define CONFIG_EXTRA_ENV_SETTINGS				\
+   under "CFG_EXTRA_ENV_SETTINGS", like:
+	#define CFG_EXTRA_ENV_SETTINGS				\
 	 "hwconfig=fsl_ddr:ctlr_intlv=bank"			\
 	 ......
 
diff --git a/doc/README.link-local b/doc/README.link-local
index 148b4987f27c..ec2ef940e4c8 100644
--- a/doc/README.link-local
+++ b/doc/README.link-local
@@ -51,7 +51,7 @@ by env variables.  It depends on CONFIG_CMD_LINK_LOCAL, CONFIG_CMD_DHCP,
 and CONFIG_BOOTP_MAY_FAIL.
 If both fail or are disabled, static settings are used.
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"ipconfigcmd=if test \\\"$dhcpenabled\\\" -ne 0;"		\
 		"then "							\
 			"dhcpfail=0;dhcp || dhcpfail=1;"		\
diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst
index 634387ac095c..725a1ae58639 100644
--- a/doc/arch/x86.rst
+++ b/doc/arch/x86.rst
@@ -355,8 +355,8 @@ environment variables if you add this to minnowmax.h:
 		"ext2load scsi 0:2 04000000 /boot/initrd.img-3.13.0-58-generic; " \
 		"run boot"
 
-	#undef CONFIG_EXTRA_ENV_SETTINGS
-	#define CONFIG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"
+	#undef CFG_EXTRA_ENV_SETTINGS
+	#define CFG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"
 
 and change CONFIG_BOOTARGS value in configs/minnowmax_defconfig to::
 
diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst
index c71570d64b47..0b3b32be1bb6 100644
--- a/doc/develop/devicetree/control.rst
+++ b/doc/develop/devicetree/control.rst
@@ -135,7 +135,7 @@ control the boot process of Linux with bootm/bootz commands.
 
 To use this, put something like this in your board header file::
 
-   #define CONFIG_EXTRA_ENV_SETTINGS	"fdtcontroladdr=10000\0"
+   #define CFG_EXTRA_ENV_SETTINGS	"fdtcontroladdr=10000\0"
 
 Build:
 
diff --git a/doc/develop/distro.rst b/doc/develop/distro.rst
index bc72aa951ef7..8016acad098a 100644
--- a/doc/develop/distro.rst
+++ b/doc/develop/distro.rst
@@ -214,7 +214,7 @@ Required Environment Variables
 
 The U-Boot "syslinux" and "pxe boot" commands require a number of environment
 variables be set. Default values for these variables are often hard-coded into
-CONFIG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that
+CFG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that
 the user doesn't have to configure them.
 
 fdt_addr:
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst
index 83f210d2d058..2c44e5da6aa0 100644
--- a/doc/usage/environment.rst
+++ b/doc/usage/environment.rst
@@ -89,7 +89,7 @@ Old-style C environment
 
 Traditionally, the default environment is created in `include/env_default.h`,
 and can be augmented by various `CONFIG` defines. See that file for details. In
-particular you can define `CONFIG_EXTRA_ENV_SETTINGS` in your board file
+particular you can define `CFG_EXTRA_ENV_SETTINGS` in your board file
 to add environment variables.
 
 Board maintainers are encouraged to migrate to the text-based environment as it
diff --git a/env/Kconfig b/env/Kconfig
index 7ca992aa1d40..f73f0b8bc048 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -19,7 +19,7 @@ config ENV_SOURCE_FILE
 	  If this CONFIG is empty, U-Boot uses CONFIG SYS_BOARD as a default, if
 	  the file board/<vendor>/<board>/<SYS_BOARD>.env exists. Otherwise the
 	  environment is assumed to come from the ad-hoc
-	  CONFIG_EXTRA_ENV_SETTINGS #define
+	  CFG_EXTRA_ENV_SETTINGS #define
 
 config SAVEENV
 	def_bool y if CMD_SAVEENV
@@ -657,7 +657,7 @@ config USE_DEFAULT_ENV_FILE
 	help
 	  Normally, the default environment is automatically generated
 	  based on the settings of various CONFIG_* options, as well
-	  as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option,
+	  as the CFG_EXTRA_ENV_SETTINGS. By selecting this option,
 	  you can instead define the entire default environment in an
 	  external file.
 
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index e14650fe0d40..f7aba6e417f8 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -17,7 +17,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 220524bfaed1..049516edf4ae 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -27,7 +27,7 @@
 
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index bc156df20d51..a6349fc08617 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -20,7 +20,7 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#	define CONFIG_EXTRA_ENV_SETTINGS		\
+#	define CFG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
 		"inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0"	\
 		"loadaddr=10000\0"			\
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 6aae584afda9..33c2fc087060 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -27,7 +27,7 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text);
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 41974cff410d..607c5dee2fb0 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -38,7 +38,7 @@
 #define CFG_SYS_I2C_PINMUX_CLR	(0xFFF0)
 #define CFG_SYS_I2C_PINMUX_SET	(0x000F)
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"uboot=u-boot.bin\0"			\
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 7cfe7a2da3e3..31699a40b6f7 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -27,7 +27,7 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text*);
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index ac2bd0b2241e..b6d82c730c64 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -30,7 +30,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
 	"u-boot=u-boot.bin\0"			\
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index a86a117fd8f9..d74a636fd7f8 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -22,7 +22,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
 	"u-boot=u-boot.bin\0"	\
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index b2ad03cc3cb4..fa6f2d23e74e 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -24,7 +24,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
 	"u-boot=u-boot.bin\0"	\
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index f8368823aac6..c6929c1b987d 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -9,7 +9,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"sdram_type=SDRAM\0"						\
 	"flash_type=AM29LV160DB\0"					\
 	"loadaddr=0x400000\0"						\
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index e0ac9338d322..fad161597e61 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -195,7 +195,7 @@
 
 #define FDTFILE			"mpc8379_rdb.dtb"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"netdev=eth1\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 1e3ba6de6e70..6f3e298a2492 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -291,7 +291,7 @@
  * Environment Configuration
  */
 
-#define	CONFIG_EXTRA_ENV_SETTINGS		\
+#define	CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
 	"netdev=eth0\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"	\
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index afb602c5bce9..b57e8638ab71 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void);
  * Environment Configuration
  */
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"	\
 	"netdev=eth0\0"						\
 	"uboot=" CONFIG_UBOOTPATH "\0"		\
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 1a157a7da05d..6e755fc0a8f5 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -304,7 +304,7 @@
 
 #define __USB_PHY_TYPE	utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"bank_intlv=cs0_cs1\0"					\
 	"netdev=eth0\0"						\
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 4794c5a84d1e..063b864f9ff0 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -430,7 +430,7 @@
 	"fdtfile=t1023rdb/t1023rdb.dtb\0"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	ARCH_EXTRA_ENV_SETTINGS					\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"  \
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index cfde8ecf9c63..9d04d30a5387 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -370,7 +370,7 @@
 #define FDTFILE		"t1042rdb/t1042d4rdb.dtb"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:bank_intlv=cs0_cs1;"			\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
 	"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 4b6bdaa3440d..7f332cf2e3be 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -413,7 +413,7 @@
 
 #define __USB_PHY_TYPE		utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index fab40f792af7..d6dd9c07b73f 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -379,7 +379,7 @@
 
 #define __USB_PHY_TYPE		utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 41565f284c6f..22cbf92efb80 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -368,7 +368,7 @@
 #define CTRL_INTLV_PREFERED cacheline
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
diff --git a/include/configs/alt.h b/include/configs/alt.h
index f27740016927..29f4d06b7f83 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -30,7 +30,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"	\
 	"usb_pgood_delay=2000\0"
 
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 755f7fae3e4f..1f473b5a1500 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -78,7 +78,7 @@
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=undefined\0" \
 	"finduuid=part uuid mmc 0:2 uuid\0" \
diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 7c5e7ce475ef..1de78e5a55dd 100644
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -45,7 +45,7 @@
 	"main_pcba_aux_3=0\0" \
 	"main_pcba_aux_4=0\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AM335XX_BOARD_FDTFILE \
 	MEM_LAYOUT_ENV_SETTINGS \
 	BOOTENV \
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index abd868c14538..e2beaf271859 100644
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -20,7 +20,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"bootdir=/boot\0" \
 	"bootfile=zImage\0" \
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 70645edcb140..ee6f62275a8c 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -21,7 +21,7 @@
 #define V_SCLK				(V_OSCK)
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"kloadaddr=0x84000000\0" \
 	"fdtaddr=0x85000000\0" \
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 342a068c855f..f3d3d18c0551 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -30,7 +30,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AM335XX_BOARD_FDTFILE \
 	MEM_LAYOUT_ENV_SETTINGS \
 	BOOTENV
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index c57a0ddc21dd..b75c64838831 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -38,7 +38,7 @@
 #endif /* CONFIG_MTD_RAW_NAND */
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyS2,115200n8\0" \
 	"fdtfile=am3517-evm.dtb\0" \
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 7659c1cc0619..3a6ffd9de0bb 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -66,7 +66,7 @@
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=undefined\0" \
 	"finduuid=part uuid mmc 0:2 uuid\0" \
diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
index 57f3f37908df..809d89119c42 100644
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -55,7 +55,7 @@
 	"partitions=" PARTS_DEFAULT
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	EXTRA_ENV_AM625_BOARD_SETTINGS					\
diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
index 25c71f00a20f..26a7f2521ecc 100644
--- a/include/configs/am64x_evm.h
+++ b/include/configs/am64x_evm.h
@@ -95,7 +95,7 @@
 	DFU_ALT_INFO_OSPI
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	EXTRA_ENV_AM642_BOARD_SETTINGS					\
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 0307426e4aba..33dd6cfdfa45 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -88,7 +88,7 @@
 #endif
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index ca29346fe642..648d30a5b24b 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_UART_PORT		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"upgrade_uboot=loady; "					\
 		"protect off 0xffc00000 0xffc1ffff; "		\
 		"erase 0xffc00000 0xffc1ffff; "			\
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index aa3dcf4a8813..73d8d245a964 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -31,7 +31,7 @@
 #define BOOTENV_RUN_NET_USB_START ""
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 07587c7609be..d46159076f2c 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -62,7 +62,7 @@
 	"ramdisk_addr_r=0x18400000\0" \
 	"scriptaddr=0x18280000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
diff --git a/include/configs/apple.h b/include/configs/apple.h
index b06660add4fa..fe7d11bcdb38 100644
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -27,7 +27,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_DEVICE_SETTINGS \
 	BOOTENV
 
diff --git a/include/configs/arbel.h b/include/configs/arbel.h
index 60758b0ca02a..8e27fb52a1c3 100644
--- a/include/configs/arbel.h
+++ b/include/configs/arbel.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	0x8000
 
 /* Default environemnt variables */
-#define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
+#define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
 		"stderr=serial\0"    \
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index ff213a41b8f4..a6e9d2bb65f7 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -94,7 +94,7 @@
 	"done\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"disable_giga=yes\0" \
 	"usb_pgood_delay=2000\0" \
 	"nor_bootdelay=-2\0" \
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 6aef3bd86f74..65224324fbc2 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -71,7 +71,7 @@
  * u-boot: 'set' command
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS			\
+#define CFG_EXTRA_ENV_SETTINGS			\
 	"loaderversion=11\0"				\
 	"card_id="__stringify(ASTRO_ID)"\0"			\
 	"alterafile=0\0"				\
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index afdb74785f8a..4101440ff5d5 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -36,7 +36,7 @@
 
 /* Address and size of Primary Environment Sector */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"monitor_base=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
 	"update=" \
 		"protect off ${monitor_base} +${filesize};" \
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 0f9e2cfb582d..c59d4bb38ca8 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_NAND_READY_PIN	GPIO_PIN_PD(5)
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                       \
+#define CFG_EXTRA_ENV_SETTINGS                                       \
 	"console=console=ttyS0,115200\0"                                \
 	"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
 	"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index d70f0382300f..b566ecf296ff 100644
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -82,7 +82,7 @@
 	func(RAM, ram, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"kernel_addr_r=0x00080000\0" \
 				"pxefile_addr_r=0x01f00000\0" \
 				"scriptaddr=0x01f00000\0" \
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 04dc50b1cb22..a82dfc902948 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -39,7 +39,7 @@
 /*
  * Environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade=if mmc rescan && " \
 		"fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \
 		"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 6f6552e6dc34..e7946389eff3 100644
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -49,7 +49,7 @@
 #define NANDARGS ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"boot_fdt=try\0" \
 	"bootpart=0:2\0" \
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index fc176dc20140..47de4bc20136 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -793,7 +793,7 @@
 	QSPI_FLASH \
 	FLASH_IMAGES
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ARCH_ENV_SETTINGS
 
 #endif /* __BCM_NS3_H */
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 57360b60ca9c..d1de3561af63 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -131,7 +131,7 @@ extern phys_addr_t prior_stage_fdt_address;
 /*
  * Enable in-place RFS with this initrd_high setting.
  */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"fdtsaveaddr=" __stringify(CONFIG_SYS_FDT_SAVE_ADDRESS) "\0"	\
 	"initrd_high=0xffffffff\0"					\
 	"fdt_high=0xffffffff\0"
diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h
index 2713b158438e..65c01835cc6e 100644
--- a/include/configs/beacon-rzg2m.h
+++ b/include/configs/beacon-rzg2m.h
@@ -8,9 +8,9 @@
 
 #include "rcar-gen3-common.h"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"usb_pgood_delay=2000\0"	\
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h
index 556bfa08ebba..3662668c6a6b 100644
--- a/include/configs/bitmain_antminer_s9.h
+++ b/include/configs/bitmain_antminer_s9.h
@@ -9,7 +9,7 @@
 #define CFG_SYS_SDRAM_BASE	0x00000000
 #define CFG_SYS_SDRAM_SIZE	0x40000000
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"pxefile_addr_r=0x2000000\0" \
 	"scriptaddr=0x3000000\0" \
 	"kernel_addr_r=0x2000000\0" \
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 0842a4a8f543..5df8d03c7065 100644
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -57,7 +57,7 @@
 /* boot command, including the target-defined one if any */
 
 /* Extra env settings (including the target-defined ones if any) */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BK4_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 2c5236aa58bb..236d720a55a8 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -67,7 +67,7 @@ MMC_TGTS \
 
 #define LOAD_OFFSET(x)			0x8##x
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
 "verify=no\0" \
 "scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 984602c2cf7c..32d9f503d9f0 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -24,7 +24,7 @@
 
 /* Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
 "cfgaddr=0x106F0000\0" \
 "scraddr=0x10700000\0" \
diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h
index f9908352b0dc..ffb4cd3027a1 100644
--- a/include/configs/brsmarc1.h
+++ b/include/configs/brsmarc1.h
@@ -24,7 +24,7 @@
 #define V_SCLK				(V_OSCK)
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 BUR_COMMON_ENV \
 "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 "cfgscr=mw ${dtbaddr} 0;" \
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 410b3e641c5c..9ca6d6f863d1 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -20,7 +20,7 @@
 #define V_SCLK				(V_OSCK)
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 BUR_COMMON_ENV \
 "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 "bootaddr=0x80001100\0" \
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 474ad69d996c..a8273a7fcd8d 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -67,7 +67,7 @@
 	"emmc_dev=0\0"
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	AHAB_ENV \
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 6f3396bad4c8..263981860e86 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -55,7 +55,7 @@
 	"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 1e5154af0a15..850eb892db79 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -25,7 +25,7 @@
 		"nand read ${loadaddr} NAND.kernel; " \
 		"bootz ${loadaddr} - ${fdt_addr}\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"fdt_addr=0x87800000\0" \
 	"boot_fdt=try\0" \
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 5c9004cbd93a..2d56d37f06f8 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -24,9 +24,9 @@
 #define CFG_SYS_I2C_PCA953X_ADDR	0x20
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x20, 16} }
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0" \
 	"loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0" \
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 9c9e9506dc64..062d3d870269 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -110,7 +110,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"console=ttyS0,115200\0" \
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 9df8baa8a969..c66cf721870c 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -30,7 +30,7 @@
 
 /* Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr_r=0x18000000\0" \
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 8a18d6f97ab5..aa17c9cbe2ce 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -41,7 +41,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x81200000\0" \
 	"bootm_size=0x8000000\0" \
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 6f3524deb561..5b802aa92a9c 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -79,7 +79,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 215c633a4c95..13bc4e7e682a 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -56,7 +56,7 @@
 		"${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AHAB_ENV \
 	BOOTENV \
 	CONFIG_MFG_ENV_SETTINGS \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 4e51df123a64..bf2a9bbaaff1 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -56,7 +56,7 @@
 	"ramdisk_addr_r=0x18400000\0" \
 	"scriptaddr=0x18280000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 89546b857fee..91f87ea283fe 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -119,7 +119,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MODULE_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index e8918df69e05..60f31389fd41 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -47,7 +47,7 @@
 
 #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index e9b85b4e1c72..6f431725269c 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -18,8 +18,8 @@
 
 #define VIDEO_IO_OFFSET				0
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kernel-ver=4.4.0-22\0"					\
 	"boot=zboot 03000000 0 04000000 ${filesize}\0"		\
 	"upd_uboot=tftp 100000 conga/u-boot.rom;"		\
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 119a834fe742..0e922b966440 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -21,7 +21,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS						\
+#define CFG_EXTRA_ENV_SETTINGS						\
 	"netdev=eth1\0"						\
 	"consoledev=ttyS1\0"							\
 	"u-boot=u-boot.bin\0"							\
diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h
index 25bcc2a6841c..6535730731a6 100644
--- a/include/configs/crs3xx-98dx3236.h
+++ b/include/configs/crs3xx-98dx3236.h
@@ -13,7 +13,7 @@
 /* Environment in SPI NOR flash */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index a818a4b39f83..cfc8330e35ae 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -145,7 +145,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	"bootpart=0:2\0" \
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 4b31bbf4e11a..323703ac5c90 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -68,7 +68,7 @@
 	"mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"console=ttymxc0,115200n8\0" \
 	"addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index b9d03d253d99..c4ae397e3e68 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -17,7 +17,7 @@
 /* NAND */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index bba2b607aa86..6dbf582d733b 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -18,7 +18,7 @@
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h
index 84ea1baa9979..0ee914e91d08 100644
--- a/include/configs/db-xc3-24g4xg.h
+++ b/include/configs/db-xc3-24g4xg.h
@@ -11,7 +11,7 @@
 /* NAND */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 66aa6d5c3c45..ab10101f20a9 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -67,7 +67,7 @@
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"ethaddr=00:01:90:00:C0:81\0"		\
 	"dtbaddr=0x81000000\0"			\
 	"nfsroot=/opt/projects/images/vladimir/oe/devkit3250/rootfs\0"	\
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index e3621fd6f9c7..c522d334dcc2 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -22,7 +22,7 @@
 	DEFAULT_LINUX_BOOT_ENV
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"console=ttyO2,115200n8\0" \
 	"mmcdev=0\0" \
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 154c4f4f13f3..d10422b6c1c7 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -22,8 +22,8 @@
 
 #define VIDEO_IO_OFFSET				0
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kernel-ver=4.4.0-24\0"					\
 	"boot=zboot 03000000 0 04000000 ${filesize}\0"		\
 	"upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;"	\
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 3aed6299ed56..6aef15c658c0 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -41,7 +41,7 @@
 #endif
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"console=ttymxc0,115200\0"	\
 	"fdt_addr=0x18000000\0"		\
 	"fdt_high=0xffffffff\0"		\
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 4401515a65eb..70ad88c90750 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -164,7 +164,7 @@
 		"sf write ${loadaddr} 0x0 ${filesize};" \
 	"fi\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS	  \
+#define CFG_EXTRA_ENV_SETTINGS	  \
 	PARTS_DEFAULT \
 	"gpio_recovery=93\0" \
 	"check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 1bfb741346a7..4842eccf40de 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -28,7 +28,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"stdin=serial\0" \
 	"stdout=serial\0" \
 	"stderr=serial\0" \
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index a6c1e9c6d029..999389197c6a 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -22,7 +22,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0" \
 	"kernel=/boot/uImage\0" \
 	"initrd=/boot/uInitrd\0" \
diff --git a/include/configs/draco.h b/include/configs/draco.h
index ab3cf10d7793..b56ba9132af2 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -28,7 +28,7 @@
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=draco\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index daf7ecd7975b..73aec348458a 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -28,6 +28,6 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index 31cd8536de4b..499708371113 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -26,7 +26,7 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x95000000\0" \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
diff --git a/include/configs/dragonboard845c.h b/include/configs/dragonboard845c.h
index bd88c42a3ba5..c1e590fae2a5 100644
--- a/include/configs/dragonboard845c.h
+++ b/include/configs/dragonboard845c.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x5000000\0"	\
 	"bootm_low=0x80000000\0"	\
 	"bootcmd=bootm $prevbl_initrd_start_addr\0"
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 98322a54f631..85b47a15d710 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -17,7 +17,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"x_bootcmd_ethernet=ping 192.168.2.1\0"	\
 	"x_bootcmd_usb=usb start\0"	\
 	"x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 8e7a86e06262..ea77abb4746a 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -26,7 +26,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"x_bootcmd_ethernet=ping 192.168.1.2\0"	\
 	"x_bootcmd_usb=usb start\0"	\
 	"x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 76d1713fdc68..e69883ba73bc 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -43,7 +43,7 @@
 
 /* Default Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"initrd_high=0xffffffff\0"				\
 	"ramdisk_addr_r=0x8000000\0"				\
 	"usb0Mode=host\0usb1Mode=host\0usb2Mode=device\0"	\
diff --git a/include/configs/durian.h b/include/configs/durian.h
index 001596c00a45..9f11e18d34ad 100644
--- a/include/configs/durian.h
+++ b/include/configs/durian.h
@@ -15,7 +15,7 @@
 
 /* BOOT */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"load_kernel=ext4load scsi 0:1 0x90100000 uImage-2004\0"	\
 	"load_fdt=ext4load scsi 0:1 0x95000000 ft2004-pci-64.dtb\0"\
 	"boot_fdt=bootm 0x90100000 -:- 0x95000000\0"	\
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 89e071c0df66..a5e2dc063a74 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -23,7 +23,7 @@
 
 #define CONFIG_MXC_UART_BASE	UART2_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                               \
+#define CFG_EXTRA_ENV_SETTINGS                                               \
 	"board=EL6Q\0"								\
 	"cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
 	"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 1742b1192fb4..c1748fc26025 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -76,7 +76,7 @@
 	CONSOLE_STDIN_SETTINGS \
 	CONSOLE_STDOUT_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdtfile=" FDTFILE "\0" \
diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h
index c2b921e7cb8b..83aaa09cdbb0 100644
--- a/include/configs/emsdp.h
+++ b/include/configs/emsdp.h
@@ -15,7 +15,7 @@
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade_image=u-boot.bin\0" \
 	"upgrade=emsdp rom unlock && " \
 		"fatload mmc 0 ${loadaddr} ${upgrade_image} && " \
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 57f619f55ff9..8d8e717b38d8 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -128,7 +128,7 @@
 	COMMON_ENV_NAND_CMDS
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=etamin\0" \
 	"ubi_off=4096\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h
index bec1660cf485..f304929263e9 100644
--- a/include/configs/evb_ast2500.h
+++ b/include/configs/evb_ast2500.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_UBOOT_BASE		CONFIG_TEXT_BASE
 
 /* Misc */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	""
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
index c9c988b93740..e1cce58fa933 100644
--- a/include/configs/evb_ast2600.h
+++ b/include/configs/evb_ast2600.h
@@ -14,7 +14,7 @@
 #define STR_HELPER(s)	#s
 #define STR(s)		STR_HELPER(s)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=" STR(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"bootspi=fdt addr 20100000 && fdt header get fitsize totalsize && " \
 	"cp.b 20100000 ${loadaddr} ${fitsize} && bootm; " \
diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h
index 13e3cb2ffeb1..e7d866551a5f 100644
--- a/include/configs/evb_rv1108.h
+++ b/include/configs/evb_rv1108.h
@@ -11,8 +11,8 @@
 /*
  * Default environment settings
  */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS                                       \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS                                       \
 	"netdev=eth0\0"                                                 \
 	"ipaddr=172.16.12.50\0"                                         \
 	"serverip=172.16.12.69\0"					\
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 43ea34db7b6a..ec09f6cc5de6 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -91,7 +91,7 @@
 #define EXYNOS_FDTFILE_SETTING
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index e22dd036ccb8..9971385848a0 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -63,7 +63,7 @@
 #define EXYNOS_FDTFILE_SETTING
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS
diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h
index 8672b9e95270..92c84cd8ce05 100644
--- a/include/configs/exynos78x0-common.h
+++ b/include/configs/exynos78x0-common.h
@@ -74,7 +74,7 @@
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXTRA_ENV_SETTINGS
 
 #endif	/* __CONFIG_EXYNOS78x0_COMMON_H */
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 671b75e69861..855aaa1aa57e 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -55,7 +55,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consoledev=ttyS1\0"						\
 	"u-boot=u-boot.bin\0"						\
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 1aaa3e67d608..0523ff9a64b8 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -35,7 +35,7 @@
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Command definition */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=/boot/fitImage\0" \
 	"fdt_addr_r=0x18000000\0" \
 	"splash_addr_r=0x20000000\0" \
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index f62b8f175e1f..32960fb93256 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -41,7 +41,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	NETWORKBOOT \
 	"image=/boot/fitImage\0" \
 	"dev=mmc\0" \
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 1c86dcb1f6dd..b7de159c865a 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -31,7 +31,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0" \
 	"kernel=/boot/uImage\0" \
 	"bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
diff --git a/include/configs/gose.h b/include/configs/gose.h
index d1fe375a2c1f..45f0ec6f6a0e 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -29,7 +29,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __GOSE_H */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index d196c4eda535..44b4595440ed 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -23,7 +23,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"				\
 	"mtdids=nand0=orion_nand\0"					\
 	"kernel=/boot/zImage\0"						\
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index fc32487e1c7b..7d81d1cf1e4c 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -110,7 +110,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 4aef0b4abd12..76e6054b0cc1 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -16,7 +16,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x00000000
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_high=0x20000000\0"					\
 	"initrd_high=0x20000000\0"
 
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index d4280decc9f0..36bf22b1870e 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -42,7 +42,7 @@
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"kernel_name=Image\0"	\
 				"kernel_addr_r=0x00080000\0" \
 				"fdtfile=hi6220-hikey.dtb\0" \
diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h
index fad1f980481e..40d5e653c3f1 100644
--- a/include/configs/hikey960.h
+++ b/include/configs/hikey960.h
@@ -28,7 +28,7 @@
 	func(MMC, mmc, 0)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"image=Image\0"	\
 				"fdtfile=hi3660-hikey960.dtb\0" \
 				"fdt_addr_r=0x10000000\0" \
diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h
index 59ea8960071a..f59da4177316 100644
--- a/include/configs/hsdk-4xd.h
+++ b/include/configs/hsdk-4xd.h
@@ -37,7 +37,7 @@
 /*
  * Environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade=if mmc rescan && " \
 		"fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \
 		"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index fbfcded47123..2177fafcdc06 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -36,7 +36,7 @@
 /*
  * Environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"upgrade=if mmc rescan && " \
 		"fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \
 		"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 76fc4ac8b66c..e1b62f78b21e 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -18,7 +18,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"				\
 	"kernel=/boot/zImage\0"						\
 	"fdt=/boot/ib62x0.dtb\0"					\
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 6d2104b3a1cd..d372ffb802c1 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -11,7 +11,7 @@
 
 #include "mv-common.h"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"	\
 	"kernel=/boot/uImage\0"			\
 	"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 36b6b95b84de..4208ba95915e 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -24,7 +24,7 @@
 #endif
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 4e23f1a2dc5d..0df61916b7d2 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -21,7 +21,7 @@
 /* Ethernet Configs */
 #define CONFIG_FEC_MXC_PHYADDR         0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"bootm_size=0x10000000\0" \
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 402f83c18eae..b6006c021d5c 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -20,7 +20,7 @@
 /* Environment in MMC */
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x14000000\0"	\
 	"fdt_addr_r=0x13000000\0"	\
 	"kernel_addr_r=0x10008000\0"	\
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 392f97050a65..e28185f24dd3 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -72,7 +72,7 @@
 #endif
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootconf=conf-imx6q-bosch-acc.dtb\0"\
 	"mmcfit_name=fitImage\0" \
 	"mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \
diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h
index 2d9d3c34b0db..c95038eaa537 100644
--- a/include/configs/imx6ulz_smm_m2.h
+++ b/include/configs/imx6ulz_smm_m2.h
@@ -54,7 +54,7 @@
 	#devtypel #instance " "
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	NANDARGS \
 	BOOTENV
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 8e9dbefc4969..66cf5b463fc2 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -12,7 +12,7 @@
 
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 /*
  * Use:
@@ -22,7 +22,7 @@
  */
 #define MY_CONFIG_BOOT_MODE	"boot-mode=sd\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MY_CONFIG_BOOT_MODE \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index c228cf7f37ba..00ce7fb62a93 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -63,7 +63,7 @@
 	BOOT_TARGET_DHCP(func)
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h
index 938c5406b821..a86bd76a3c72 100644
--- a/include/configs/imx8mm-mx8menlo.h
+++ b/include/configs/imx8mm-mx8menlo.h
@@ -9,8 +9,8 @@
 #include <configs/verdin-imx8mm.h>
 
 /* Custom initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS					\
 	BOOTENV								\
 	MEM_LAYOUT_ENV_SETTINGS						\
 	"devtype=mmc\0"							\
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 03325e6c3a7a..ee524f0e63f2 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -20,7 +20,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"console=ttymxc1,115200\0" \
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 80321cf2d8d3..44d74bb1a788 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -34,7 +34,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"altbootcmd=setenv devpart 2 && run bootcmd ; reset\0"		\
 	"bootlimit=3\0"							\
 	"devtype=mmc\0"							\
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 8a694c88a53a..d28f3f1972b9 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -37,7 +37,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index 41ab9307793f..e718daa07c3e 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -30,7 +30,7 @@
 	"ramdisk_addr_r=0x46400000\0" \
 	"scriptaddr=0x46000000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"console=ttymxc1,115200\0" \
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 28ce834769c3..c490e3829f9a 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -25,7 +25,7 @@
 	func(USB, usb, 1) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"splblk=0x42\0" \
 	BOOTENV
 
diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index 85fd5e2371f9..bb3dfe3fa0d2 100644
--- a/include/configs/imx8mn_beacon.h
+++ b/include/configs/imx8mn_beacon.h
@@ -13,7 +13,7 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"ramdiskimage=rootfs.cpio.uboot\0" \
diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h
index a768ff355109..e97b8e871d22 100644
--- a/include/configs/imx8mn_bsh_smm_s2.h
+++ b/include/configs/imx8mn_bsh_smm_s2.h
@@ -35,7 +35,7 @@
 	#devtypel #instance " "
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	NANDARGS \
 	BOOTENV
diff --git a/include/configs/imx8mn_bsh_smm_s2pro.h b/include/configs/imx8mn_bsh_smm_s2pro.h
index 035e5c7bd90f..8619fdde7fdb 100644
--- a/include/configs/imx8mn_bsh_smm_s2pro.h
+++ b/include/configs/imx8mn_bsh_smm_s2pro.h
@@ -22,7 +22,7 @@
 	"emmc_ack=1\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	EMMCARGS \
 	BOOTENV
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index 024b86c7f1d0..b759b834b808 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -32,7 +32,7 @@
 	"scriptaddr=0x40000000\0" \
 	"pxefile_addr_r=0x40100000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"image=Image\0" \
 	BOOTENV \
 	"console=ttymxc1,115200\0" \
diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
index 4633843d1bbb..205337948cfc 100644
--- a/include/configs/imx8mn_var_som.h
+++ b/include/configs/imx8mn_var_som.h
@@ -37,7 +37,7 @@
 	"pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	BOOTENV
 
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index a585cbf87e44..80c2df9f30ff 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -19,7 +19,7 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"splblk=0x40\0" \
 	BOOTENV
 
diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h
index 5443022b04c7..b8fdedefa21f 100644
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"altbootcmd=run bootcmd ; reset\0"				\
 	"bootlimit=3\0"							\
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"		\
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 137bd3b09527..c6e3b105a8ad 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -26,7 +26,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h
index b261a81e44a4..c3abcee40e89 100644
--- a/include/configs/imx8mp_icore_mx8mp.h
+++ b/include/configs/imx8mp_icore_mx8mp.h
@@ -29,7 +29,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 58f7dc6518c1..ed4da0e69b5b 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -71,7 +71,7 @@
 	BOOT_TARGET_DHCP(func)
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h
index e79aa5707537..4b32d5a77ef6 100644
--- a/include/configs/imx8mp_venice.h
+++ b/include/configs/imx8mp_venice.h
@@ -19,7 +19,7 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"splblk=0x40\0" \
 	BOOTENV
 
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 4df98e3f3735..f6f356d27ba2 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -30,7 +30,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=0x43500000\0" \
 	"kernel_addr_r=0x40880000\0" \
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 688c0bf70080..c40448715f8a 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -35,7 +35,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 3b4cd6562235..8fed3e31964c 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -29,7 +29,7 @@
 	"initrd_high=0xffffffff\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index f1f907f3e5a4..7772e71013ef 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -23,7 +23,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	AHAB_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 2e2e5ed43cde..5692e3d00007 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -47,7 +47,7 @@
 	"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index d75b8bf0c18f..669da591fa2b 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -23,7 +23,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	AHAB_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index d313bdc2a448..30dd5af03b00 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -34,7 +34,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h
index 895c50f60253..5cd6492dd503 100644
--- a/include/configs/imx93_evk.h
+++ b/include/configs/imx93_evk.h
@@ -28,7 +28,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=0x83500000\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h
index 84228676c7fd..7688464841eb 100644
--- a/include/configs/imxrt1050-evk.h
+++ b/include/configs/imxrt1050-evk.h
@@ -19,7 +19,7 @@
 					 DMAMEM_SZ_ALL)
 
 #ifdef CONFIG_VIDEO
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 		"stdin=serial\0" \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h
index 0f6150fc9c7e..7d087413362c 100644
--- a/include/configs/iot2050.h
+++ b/include/configs/iot2050.h
@@ -40,7 +40,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	BOOTENV								\
 	EXTRA_ENV_IOT2050_BOARD_SETTINGS
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index e66f994a375f..a7210b5cf3ae 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -170,7 +170,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
index ab204c62b7d6..54dfea6952e9 100644
--- a/include/configs/j721s2_evm.h
+++ b/include/configs/j721s2_evm.h
@@ -127,7 +127,7 @@
 	DFU_ALT_INFO_OSPI
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	DEFAULT_MMC_TI_ARGS						\
 	DEFAULT_FIT_TI_ARGS						\
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 0f5387866239..9edc5fb2e413 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -82,7 +82,7 @@
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONFIG_KM_DEF_ENV						 \
 	CONFIG_KM_DEF_ARCH						 \
 	"newenv="							 \
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index eb9dd48bd7fe..cbcace8099dd 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -219,7 +219,7 @@
 			"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6,"	\
 			"asrc,spdif,lpuart1,ftm1\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_HW_ENV_SETTINGS						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 4e5cdf640d27..fcc0d2df326e 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -439,7 +439,7 @@ int get_scl(void);
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 736865ad80af..61ff80d2c983 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -29,7 +29,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 7c5f673c0f4d..e3ae91089ffa 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -45,6 +45,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX6UL_CONFIG_H */
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index beb1926c12aa..e4d6a8a15408 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -49,6 +49,6 @@
 #define CONFIG_MALLOC_F_ADDR		0x930000
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 17c63d834107..d909bbbbcfda 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -50,7 +50,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"image=Image\0" \
 	"console=ttymxc2,115200\0" \
 	"boot_fdt=try\0" \
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index a073a06c8275..0d293f316b7f 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -61,7 +61,7 @@
 	func(PXE, pxe, 0)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"env_addr=0x203e0004\0" \
 	"envload=env import -d -b ${env_addr}\0" \
 	"install_rcw=source 20200000\0" \
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index c551585a2062..da8a67b4ab63 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -16,7 +16,7 @@
 
 /* Command definition */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1,115200\0"	\
 	"fdt_addr=0x75000000\0"		\
 	"fdt_high=0xffffffff\0"		\
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 136e228682a6..99321b320f5f 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -22,7 +22,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"console=ttymxc0,115200\0"	\
 	"fdt_addr=0x18000000\0"		\
 	"fdt_high=0xffffffff\0"		\
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 7a66df548a3b..7ad29f929979 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -44,7 +44,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"stdin=serial\0"					\
 	"stdout=serial\0"					\
 	"stderr=serial\0"					\
diff --git a/include/configs/lager.h b/include/configs/lager.h
index f3feaa539fcc..777d5b94d1cd 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -30,7 +30,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 794c1fcbed06..687ac89b8579 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -48,7 +48,7 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
 	"fdtfile=da850-lego-ev3.dtb\0" \
 	"memsize=64M\0" \
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 377e3e7b3fa8..7417f8582a4c 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -62,7 +62,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"scriptaddr=0x80000000\0" \
 	"pxefile_addr_r=0x80100000\0" \
 	"kernel_addr_r=0x80800000\0" \
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 721da818633a..938ab5ade9a7 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index f0a9e9ab3155..d1e0ed5817e9 100644
--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -11,8 +11,8 @@
 /* DDR */
 #define CFG_SYS_SDRAM_SIZE		0x40000000
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"initrd_high=0xffffffffffffffff\0"	\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 9e4f949016ef..a5f680db2d37 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -34,7 +34,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index c19ed2f43ecf..4243a21f1f18 100644
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -16,8 +16,8 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(USB, usb, 0)
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index 1b417c72e704..872296749c0a 100644
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -25,8 +25,8 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"initrd_high=0xffffffffffffffff\0"	\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 495bb3911b3a..35e8ff057986 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -55,8 +55,8 @@
 #define I2C_VOL_MONITOR_BUS_V_OVF      0x1
 #define I2C_VOL_MONITOR_BUS_V_SHIFT    3
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"kernel_addr=0x01000000\0"		\
 	"kernelheader_addr=0x600000\0"		\
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index d74936d1281d..1e843f896c7e 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -36,8 +36,8 @@
 #define __PHY_ETH2_MASK		0xFB
 #define __PHY_ETH1_MASK		0xFD
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"verify=no\0"				\
 	"initrd_high=0xffffffffffffffff\0"	\
 	"kernel_addr=0x01000000\0"		\
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 0e3ff3c5b7a4..8b5fba51c6ff 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -72,7 +72,7 @@
 
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 "initrd_high=0xffffffff\0"
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 76e75335c588..78432e558117 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -247,12 +247,12 @@
 #define HWCONFIG_BUFFER_SIZE		256
 
 #ifdef CONFIG_LPUART
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
 	"initrd_high=0xffffffff\0"      \
 	"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 	"initrd_high=0xffffffff\0"      \
 	"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index b15c4a238bca..b722586dd6be 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -60,7 +60,7 @@
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0"		\
 	"initrd_high=0xffffffff\0"					\
 	"kernel_addr=0x61000000\0"					\
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 9b22a2db21a0..a387eeab472a 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -144,7 +144,7 @@
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_LPUART
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200 "	\
 		"cma=64M@0x0-0xb0000000\0" \
 	"initrd_high=0xffffffff\0"      \
@@ -200,7 +200,7 @@
 		"cp.b $kernel_addr $load_addr "		\
 		"$kernel_size && bootm $load_addr#$board\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200 "	\
 		"cma=64M@0x0-0xb0000000\0" \
 	"initrd_high=0xffffffff\0"      \
diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h
index 228fb122f5f3..769ece901c19 100644
--- a/include/configs/ls1028aqds.h
+++ b/include/configs/ls1028aqds.h
@@ -61,8 +61,8 @@
 /* SATA */
 
 #ifndef SPL_NO_ENV
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"board=ls1028aqds\0" \
 	"hwconfig=fsl_ddr:bank_intlv=auto\0" \
 	"ramdisk_addr=0x800000\0" \
diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 5c134612576c..8c53636beac3 100644
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -56,8 +56,8 @@
 
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"board=ls1028ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 685e7e65d154..ac2319c1b42b 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -88,7 +88,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"initrd_high=0xffffffffffffffff\0"	\
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index ae9dc0c73b05..38fb1d45bcb3 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -84,7 +84,7 @@
 #endif
 #ifndef SPL_NO_MISC
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 86c5d48c0de4..720a95d2f539 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -117,7 +117,7 @@ unsigned long long get_qixis_addr(void);
 
 #ifndef SPL_NO_ENV
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 3391540c6e36..084ee064ae68 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -293,8 +293,8 @@
 
 /* Initial environment variables */
 #ifdef CONFIG_NXP_ESBC
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -325,8 +325,8 @@
 #define IFC_MC_INIT_CMD				\
 	"fsl_mc start mc 0x580A00000 0x580E00000\0"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -387,8 +387,8 @@
 		"$kernel_size && bootm $kernel_load#$BOARD\0"
 #else
 #if defined(CONFIG_QSPI_BOOT)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -405,8 +405,8 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"	\
 	"mcmemsize=0x70000000 \0"
 #elif defined(CONFIG_SD_BOOT)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS               \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS               \
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x90100000\0"                 \
@@ -423,8 +423,8 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else	/* NOR BOOT */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 1ddf0687f43c..a1749149e505 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -234,9 +234,9 @@
 #endif
 #endif /* CONFIG_TFABOOT */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
@@ -304,7 +304,7 @@
 		" && esbc_validate ${kernelheader_addr_r};"	\
 		"bootm $load_addr#$BOARD\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index bd78bdb793a6..f51eb31ed065 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -109,7 +109,7 @@ unsigned long long get_qixis_addr(void);
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 4a52fcdfddb4..7ad2432a775b 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -226,9 +226,9 @@
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
@@ -253,7 +253,7 @@
 #define IFC_MC_INIT_CMD				\
 	"fsl_mc start mc 0x580a00000" \
 	" 0x580e00000 \0"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x80100000\0"                 \
 	"loadaddr_sd=0x90100000\0"                 \
@@ -309,7 +309,7 @@
 	"$kernel_addr_sd $kernel_size_sd && "	\
 	"bootm $load_addr#$BOARD\0"
 #elif defined(CONFIG_SD_BOOT)
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x90100000\0"                 \
 	"kernel_addr=0x800\0"                \
@@ -325,7 +325,7 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index b8ab501c98e4..794ea84852e2 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -275,9 +275,9 @@
 #endif
 
 /* Initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
@@ -339,7 +339,7 @@
 		"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\
 		"bootm $load_addr#$board\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index c82eb8b04bf8..47d7ec57b80a 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -22,7 +22,7 @@
 /*
  * Default environment variables
  */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootsource=legacy\0"						\
 	"hdpart=0:1\0"							\
 	"kernel_addr_r=0x00800000\0"					\
diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h
index 9f891064bd5d..3a316e73308f 100644
--- a/include/configs/lx2160aqds.h
+++ b/include/configs/lx2160aqds.h
@@ -14,7 +14,7 @@
 /* MAC/PHY configuration */
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	EXTRA_ENV_SETTINGS			\
 	"boot_scripts=lx2160aqds_boot.scr\0"	\
 	"boot_script_hdr=hdr_lx2160aqds_bs.out\0"	\
diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h
index 58c0ff36571e..8cc4e0db03f0 100644
--- a/include/configs/lx2160ardb.h
+++ b/include/configs/lx2160ardb.h
@@ -18,7 +18,7 @@
 #define I2C_EMC2305_PWM		0x80
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	EXTRA_ENV_SETTINGS			\
 	"boot_scripts=lx2160ardb_boot.scr\0"	\
 	"boot_script_hdr=hdr_lx2160ardb_bs.out\0"	\
diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h
index 157688ef7d7a..54d7cea4c599 100644
--- a/include/configs/lx2162aqds.h
+++ b/include/configs/lx2162aqds.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_RTC_BUS_NUM		0
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	EXTRA_ENV_SETTINGS			\
 	"boot_scripts=lx2162aqds_boot.scr\0"	\
 	"boot_script_hdr=hdr_lx2162aqds_bs.out\0"	\
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index d42ad9acb40d..0deb7672f9e9 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -84,7 +84,7 @@
  * Extra Environments
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index a7f550769261..436f5f0059de 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -33,7 +33,7 @@
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC_PHYADDR		1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200 quiet\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index a22f7a81b001..9244601284b8 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -83,8 +83,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"stdin=" STDIN_CFG "\0" \
 	"stdout=" STDOUT_CFG "\0" \
 	"stderr=" STDOUT_CFG "\0" \
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 1266851196d2..c0e977abb01f 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -279,7 +279,7 @@
 		"fi;" \
 	"fi;"
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                     \
+#define CFG_EXTRA_ENV_SETTINGS                                     \
 	EXTRA_ANDROID_ENV_SETTINGS                                    \
 	"partitions=" PARTS_DEFAULT "\0"                              \
 	"mmcdev=2\0"                                                  \
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index b8b08974c7e7..6740ab2be3e2 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -76,8 +76,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"unlock=yes\0"\
 	"nor0=flash-0\0"\
 	"mtdparts=mtdparts=flash-0:"\
diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index c73c5a1d9fe0..5ced45b88b2d 100644
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -19,7 +19,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"kernel_addr_r=0x84000000\0" \
 	"fdt_addr_r=0x88000000\0" \
diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index cfe926c0a141..ef2111cd20ab 100644
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -30,7 +30,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 93161bd24f02..db12377b004c 100644
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -42,7 +42,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	ENV_MEM_LAYOUT_SETTINGS		\
 	BOOTENV
 
diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h
index 3da7619d78d7..1f973829bba4 100644
--- a/include/configs/mt8183.h
+++ b/include/configs/mt8183.h
@@ -21,7 +21,7 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"scriptaddr=0x40000000\0" \
 	BOOTENV
 
diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h
index 3a35527da10d..c0fc8688ca67 100644
--- a/include/configs/mt8512.h
+++ b/include/configs/mt8512.h
@@ -26,7 +26,7 @@
 #define ENV_BOOT_CMD \
 	"mtk_boot=run boot_rd_img;bootm;\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x6c000000\0" \
 	ENV_DEVICE_SETTINGS \
 	ENV_BOOT_READ_IMAGE \
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h
index 0f7981a56611..73776e3705b7 100644
--- a/include/configs/mt8516.h
+++ b/include/configs/mt8516.h
@@ -21,7 +21,7 @@
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"scriptaddr=0x40000000\0" \
 	BOOTENV
 
diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 8a8bc85ca70e..d6bd1a103866 100644
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -33,7 +33,7 @@
 	"serial#=1234567890ABCDEF\0" \
 	"board=mt8518\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x6c000000\0" \
 	ENV_DEVICE_SETTINGS \
 	ENV_BOOT_READ_IMAGE \
diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h
index 3ad3aefa7559..39e37ffbf7c8 100644
--- a/include/configs/mvebu_alleycat-5.h
+++ b/include/configs/mvebu_alleycat-5.h
@@ -22,7 +22,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS   \
+#define CFG_EXTRA_ENV_SETTINGS   \
 	BOOTENV \
 	"kernel_addr_r=0x202000000\0" \
 	"fdt_addr_r=0x201000000\0"    \
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 9bfc48c52d90..76e148f55ebf 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -89,7 +89,7 @@
 	""
 
 /* fdt_addr and kernel_addr are needed for existing distribution boot scripts */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x6d00000\0"	\
 	"pxefile_addr_r=0x6e00000\0"	\
 	"fdt_addr=0x6f00000\0"		\
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index beac3ae6496d..239a09763ae1 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -41,7 +41,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x6d00000\0"	\
 	"pxefile_addr_r=0x6e00000\0"	\
 	"fdt_addr_r=0x6f00000\0"	\
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index aa3d7a1a3fc8..e769ba2e8377 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -19,7 +19,7 @@
 /* Ethernet */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"update_sd_firmware_filename=u-boot.sd\0" \
 	"update_sd_firmware="		/* Update the SD firmware partition */ \
 		"if mmc rescan ; then "	\
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index f597cdb30563..5ceba8b15fa4 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Extra Environments */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"update_sd_firmware_filename=u-boot.sd\0" \
 	"update_sd_firmware="		/* Update the SD firmware partition */ \
 		"if mmc rescan ; then "	\
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index c740d8533274..f9f65f6968e1 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -18,7 +18,7 @@
 /* UBI and NAND partitioning */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"ubifs_file=filesystem.ubifs\0" \
 	"update_nand_full_filename=u-boot.nand\0" \
 	"update_nand_firmware_filename=u-boot.sb\0"	\
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ddd37b3936ff..8ab1ee79a79c 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -39,7 +39,7 @@
 
 /* Framebuffer and LCD */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"fdt_file=imx51-babbage.dtb\0" \
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index cd806cb698e9..baffe65c3697 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -37,7 +37,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_addr_r=0x75000000\0" \
 	"pxefile_addr_r=0x73000000\0" \
 	"scriptaddr=0x74000000\0" \
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d0107fcc8cb1..0ac93d6e0432 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -27,7 +27,7 @@
 
 /* Command definition */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"fdt_addr=0x71000000\0" \
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 9464d6e44aea..94d2191af91d 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -35,7 +35,7 @@
 	"nfs=run choose_ip setargs bootargs_nfs; ${getcmd} ${loadaddr} " \
 		"${nfsserver}:${image}; bootm ${loadaddr}\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	PPD_CONFIG_NFS \
 	"image=/boot/fitImage\0" \
 	"dev=mmc\0" \
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index f7f209c20b59..d4af96b51ea4 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"som_rev=undefined\0" \
 	"has_emmc=undefined\0" \
 	"fdtfile=undefined\0" \
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 96a48a97a306..9c61350a33b7 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -35,7 +35,7 @@
 #define EMMC_ENV ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"fdtfile=undefined\0" \
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 358d9f47c0f3..4fbd06783a6d 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -15,7 +15,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 8731f6a3e4ad..cf4871cbae39 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -12,7 +12,7 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"epdc_waveform=epdc_splash.bin\0" \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 0dd40563c29b..9d8737c19425 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -12,7 +12,7 @@
 
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 6f5dffe4fbb8..8372f979dc86 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -34,7 +34,7 @@
 #define UPDATE_M4_ENV ""
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index cb1019bd56a7..90c788468710 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -30,7 +30,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 0e986093f35a..4a27fd22902b 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -24,7 +24,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index e56b6101af43..e56083f8e61c 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -50,7 +50,7 @@
 		"bootimg part 0 1;"\
 		"rootfs part 0 2\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_MFG_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 85922fa436cb..5ee5129801d2 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -28,7 +28,7 @@
 #define PHYS_SDRAM			0x60000000
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"console=ttyLP0\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 99e01896c71b..5f4cd9306231 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -28,7 +28,7 @@
 #define PHYS_SDRAM_SIZE			SZ_1G
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttyLP0\0" \
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index a32fcd57f8fc..43261824d3cf 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -33,7 +33,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"fdt_addr_r=0x82000000\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 85691ca94f08..358c3bb85a5e 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -35,7 +35,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootargs=console=ttyS0,115200\0" \
 	"autostart=no\0"
 
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 1d101977c281..496a3164f404 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -64,7 +64,7 @@
 #include <config_distro_bootcmd.h>
 #include <linux/stringify.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index caaa9ed86b34..97d086852902 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -58,7 +58,7 @@
 #define CFG_SYS_ONENAND_BASE		ONENAND_MAP
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"usbtty=cdc_acm\0" \
 	"stdin=usbtty,serial,keyboard\0" \
 	"stdout=usbtty,serial,vidconsole\0" \
diff --git a/include/configs/novena.h b/include/configs/novena.h
index b0d473eeee37..3ffb44ab7252 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -58,7 +58,7 @@
 #endif
 
 /* Extra U-Boot environment. */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"fdt_high=0xffffffff\0"						\
 	"initrd_high=0xffffffff\0"					\
 	"consdev=ttymxc1\0"						\
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 2eebd0c9a457..a12e34b6e607 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -38,7 +38,7 @@
 
 #define CONFIG_FEC_ENET_DEV		1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"image=zImage\0" \
 	"fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index e2ad77072cd5..fa029a176bd7 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -36,7 +36,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0" \
 	"kernel=/boot/zImage\0" \
 	"fdt=/boot/nsa310s.dtb\0" \
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index ea1edab9fc12..0e1083a2130c 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -15,7 +15,7 @@
 #	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
 	"mmcargs=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcpart} console=ttymxc0,${baudrate} panic=30\0" \
diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index 03d1a8e7b5fc..c4db38562d83 100644
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -15,7 +15,7 @@
 /** Stack starting address */
 
 /** Extra environment settings */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 					"loadaddr=20080000\0"	\
 					"ethrotate=yes\0"
 
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 58275ccffa01..0be26ef3287f 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -17,7 +17,7 @@
 
 #include <config_distro_bootcmd.h>
 /* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"loadaddr=0x20080000\0"		\
 	"kernel_addr_r=0x02000000\0"	\
 	"ramdisk_addr_r=0x03000000\0"	\
@@ -27,7 +27,7 @@
 #else
 
 /** Extra environment settings */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"loadaddr=20080000\0"		\
 	"autoload=0\0"
 
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index e2331e45cdfe..3ac13a65d63f 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -71,7 +71,7 @@
  * 1.  BOOT:  100MiB 2MiB
  * 2.  ROOT:  -
 */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
 		"boot.scr\0" \
 	"loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} " \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index e4a81499a726..2bac017ea083 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -60,8 +60,8 @@
  */
 
 /* Define new extra env settings, including DFU settings */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index f4e23bbb0f30..efeb7bf10078 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -73,7 +73,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 8bb8521f1c1c..adb25a62970c 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -69,7 +69,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index a6b5e55b5415..93d36353ffb0 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -59,7 +59,7 @@
 		"if test ${fdtfile} = ''; then " \
 			"echo WARNING: Could not determine device tree to use; fi; \0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_FINDFDT \
 	ENV_DEVICE_SETTINGS \
 	MEM_LAYOUT_SETTINGS \
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 389553775100..957f1c369e6d 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -30,7 +30,7 @@
 
 /* Environment information */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"mmcdev=0\0" \
 	"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index f19211fe6479..5e71ebcba857 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -137,7 +137,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	"bootpart=0:2\0" \
diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h
index 5b097e9fef29..5adfc6719585 100644
--- a/include/configs/openpiton-riscv64.h
+++ b/include/configs/openpiton-riscv64.h
@@ -20,7 +20,7 @@
  * Board boot configuration
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_addr_r=0x86000000\0" \
 	"kernel_addr_r=0x80200000\0" \
 	"image=boot/Image\0" \
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 2cec20ca4259..1e6b16b4e709 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -27,7 +27,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console=ttyS0,115200 " \
+#define CFG_EXTRA_ENV_SETTINGS	"x_bootargs=console=ttyS0,115200 " \
 	CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0"	\
 	"x_bootcmd_usb=usb start\0"					\
diff --git a/include/configs/origen.h b/include/configs/origen.h
index a608df44e80e..fd4cc70a6709 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -23,7 +23,7 @@
 /* MMC SPL */
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x40007000\0" \
 	"rdaddr=0x48000000\0" \
 	"kerneladdr=0x40007000\0" \
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 74627b2e6302..a353c16f74b1 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -393,7 +393,7 @@
 
 #include "p1_p2_bootsrc.h"
 
-#define	CONFIG_EXTRA_ENV_SETTINGS	\
+#define	CFG_EXTRA_ENV_SETTINGS	\
 "netdev=eth0\0"	\
 "uboot=" CONFIG_UBOOTPATH "\0"	\
 "loadaddr=1000000\0"	\
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 2a1660bf188d..146f87e9ce33 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -45,7 +45,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"fdt_addr_r=0x82000000\0" \
 	"fdt_high=0xffffffff\0" \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 4421e740d9ea..0890c115700c 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -65,7 +65,7 @@
 	"mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \
 
 /* Default environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"console=ttymxc0,115200n8\0" \
 	"addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 5c2ff5d02ee7..34994016c54c 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -29,7 +29,7 @@
 /* boot command, including the target-defined one if any */
 
 /* Extra env settings (including the target-defined ones if any) */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	PCM052_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 3674e4cddaed..2991076c50a1 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -39,7 +39,7 @@
 	"nandloadfit=ubi part rootfs;ubi readvol ${loadaddr} fit\0" \
 	"nandboot=run nandloadfit;run nandargs;bootm ${loadaddr}\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x30000000\0" \
 	"optargs=rw rootwait\0" \
 	ENV_MMC \
diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h
index 71807837673f..80b14b002a92 100644
--- a/include/configs/pdu001.h
+++ b/include/configs/pdu001.h
@@ -32,7 +32,7 @@
 	#define CONSOLE_DEV "ttyO5"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"fdtfile=am335x-pdu001.dtb\0" \
 	"bootfile=zImage\0" \
diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h
index f922491637d9..4e6dc79f41b2 100644
--- a/include/configs/phycore_am335x_r2.h
+++ b/include/configs/phycore_am335x_r2.h
@@ -62,7 +62,7 @@
 #include <environment/ti/dfu.h>
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"bootfile=zImage\0" \
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 7f73117ac1c8..9160c78c0464 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -20,7 +20,7 @@
 /* For RAW image gives a error info not panic */
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=Image\0" \
 	"console=ttymxc2,115200\0" \
 	"fdt_addr=0x48000000\0" \
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 7a38382034a6..d79d364c8e2f 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_UBOOT_BASE \
 		(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
 	"fdt_addr=0x48000000\0" \
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 3cc2a693ceee..60c747327588 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -69,7 +69,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	MEM_LAYOUT_ENV_SETTINGS		\
 	CONFIG_LEGACY_BOOTCMD_ENV	\
 	BOOTENV
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 719b70144051..66258a3ab73b 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -38,7 +38,7 @@
 	"bootmenu_3=Boot using PICO-Nymph baseboard=" \
 		"setenv baseboard nymph; saveenv; run base_boot\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	BOOTMENU_ENV \
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 36f648f63400..45fc6126c879 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -45,7 +45,7 @@
 	"bootmenu_2=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx6ul-pico-pi.dtb\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"splashpos=m,m\0" \
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 581921510426..7fc6211ff732 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -51,7 +51,7 @@
 	BOOTENV
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index f9301a5524b9..ac25991703f2 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -25,7 +25,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"script=boot.scr\0"						\
 	"image=Image\0"							\
 	"console=ttymxc0,115200\0"					\
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index a233fb8ed746..f4a34f261a6e 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -144,7 +144,7 @@
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00500000
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
 	"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "		\
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index fa08744b6feb..cd9d21e420bc 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -163,7 +163,7 @@
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
 	"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "		\
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index fc9f113dee66..b1354219c9ff 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -18,7 +18,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootargs_console=console=ttyS0,115200\0" \
 	"bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
 	"ext2load usb 0:1 0x01100000 /uInitrd\0"
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index 239d33d8e9de..33715790233a 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.h
@@ -61,7 +61,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
 	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
diff --git a/include/configs/poleg.h b/include/configs/poleg.h
index 075729e5d37d..c3f1d3393cb6 100644
--- a/include/configs/poleg.h
+++ b/include/configs/poleg.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE           0x0
 
 /* Default environemnt variables */
-#define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
+#define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
 		"stderr=serial\0"    \
diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h
index 1c11685f49e4..8e74dc488875 100644
--- a/include/configs/pomelo.h
+++ b/include/configs/pomelo.h
@@ -21,7 +21,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"image=Image\0" \
 	BOOTENV \
 	"scriptaddr=0x90100000\0" \
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index c58105597e47..6e8adf91877c 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -31,7 +31,7 @@
 					func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 			"loader_mmc_blknum=0x0\0"			\
 			"loader_mmc_nblks=0x780\0"			\
 			"env_mmc_blknum=0xf80\0"			\
diff --git a/include/configs/porter.h b/include/configs/porter.h
index e0f77f358b95..202bd914d506 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -31,7 +31,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h
index 2b25c31b1d8d..df07df6a5a72 100644
--- a/include/configs/presidio_asic.h
+++ b/include/configs/presidio_asic.h
@@ -54,7 +54,7 @@
 #define GLOBAL_IO_DRIVE_CONTROL_OFFSET          0x4c
 
 /* max command args */
-#define CONFIG_EXTRA_ENV_SETTINGS	"silent=y\0"
+#define CFG_EXTRA_ENV_SETTINGS	"silent=y\0"
 
 /* nand driver parameters */
 #ifdef CONFIG_TARGET_PRESIDIO_ASIC
diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index 99376155b491..003686930a4b 100644
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -27,7 +27,7 @@
 	"ramdisk_addr_r=0x0a200000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 48f49906b84e..10eaeb49de62 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -28,7 +28,7 @@
 /* Use common default */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=pxm2\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x500000\0" \
diff --git a/include/configs/qcs404-evb.h b/include/configs/qcs404-evb.h
index c41bb341d82e..8ea59aa21ca6 100644
--- a/include/configs/qcs404-evb.h
+++ b/include/configs/qcs404-evb.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x5000000\0"	\
 	"bootm_low=0x80000000\0"	\
 	"bootcmd=bootm $prevbl_initrd_start_addr\0"
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index a67af73fd56f..45bd94ee5c76 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -76,7 +76,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr=0x40000000\0" \
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 35172da3ff1e..20135f569eb2 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -34,7 +34,7 @@
 #define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \
 	"qemu "
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 59d56d666242..777df4c11259 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -38,7 +38,7 @@
 #define EEPROM_ADDR_CHIP 0x120
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=rastaban\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 86012adfb36f..8e0837a30275 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -32,7 +32,7 @@
 
 /* ENV setting */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __RCAR_GEN3_COMMON_H */
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index a4cae697181d..ea6073f29446 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -25,7 +25,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x7fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
index 99c86edeaa40..c4758e148ba7 100644
--- a/include/configs/rk3066_common.h
+++ b/include/configs/rk3066_common.h
@@ -24,7 +24,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x6fffffff\0" \
 	"initrd_high=0x6fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 302546630ac6..5b0ec3700040 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -27,7 +27,7 @@
 	"ramdisk_addr_r=0x64000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 334fb3affa5e..58f491c2f320 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -31,7 +31,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 256M on a Rock board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x6fffffff\0" \
 	"initrd_high=0x6fffffff\0" \
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 58ad62afe165..b95268df87c2 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -27,7 +27,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board,
  * so limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"fdt_high=0x7fffffff\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 6b55c57dd770..d3b8a5150f6b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -30,7 +30,7 @@
 
 /* Linux fails to load the fdt if it's loaded above 256M on a Rock 2 board, so
  * limit the fdt reallocation to that */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0x0fffffff\0" \
 	"initrd_high=0x0fffffff\0" \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 4b510b139910..bc03e113fef0 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -22,7 +22,7 @@
 	"ramdisk_addr_r=0x04000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"partitions=" PARTS_DEFAULT \
 	ROCKCHIP_DEVICE_SETTINGS \
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 132b7d0fe9bc..85d2186f23e0 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -22,7 +22,7 @@
 	"ramdisk_addr_r=0x06000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 92cdc1a51fbd..17636250510b 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -25,7 +25,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
 	ENV_MEM_LAYOUT_SETTINGS	\
 	BOOTENV
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 67e0c20dca29..9722214ac345 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -34,7 +34,7 @@
 
 #include <config_distro_bootcmd.h>
 #include <environment/distro/sf.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index d43dc2580e46..750f16d03999 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -21,7 +21,7 @@
 	"ramdisk_addr_r=0x0a200000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	ENV_MEM_LAYOUT_SETTINGS			\
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT		\
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index e3549275138b..c3f8e7bf85cd 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -157,7 +157,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \
 	ENV_DEVICE_SETTINGS \
 	ENV_DFU_SETTINGS \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index b07d0c50604d..99799f8494e0 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -27,7 +27,7 @@
 /* Use common default */
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=rut\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x500000\0" \
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 84a5ae6965dd..6e17b23b624c 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -26,7 +26,7 @@
 	"ramdisk_addr_r=0x64000000\0"
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index b4b2dbd03867..bfe559f6e2cd 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -140,7 +140,7 @@
 	#define EXTRA_ENV_BOOT_LOGO  EXTRA_ENV_DTB_RESERVE
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_high=0xffffffff\0"					\
 	"initrd_high=0xffffffff\0"				\
 	"rootdev=" __stringify(CONFIG_ROOT_DEV) "\0"		\
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 555bedb93d65..d1ff00a27f83 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -54,7 +54,7 @@
 
 #define COMMON_BOOT	"${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
 		"onenand write 0x32008000 0x0 0x100000\0" \
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 80d3fc9258cc..bf2d04a169b3 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -29,7 +29,7 @@
 				",100M(swap)"\
 				",-(UMS)\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
 		"onenand write 0x42008000 0x0 0x100000\0" \
diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h
index f7cdd5a19568..9a4fe530a20b 100644
--- a/include/configs/sdm845.h
+++ b/include/configs/sdm845.h
@@ -13,7 +13,7 @@
 
 #define CFG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x4000000\0"	\
 	"bootm_low=0x80000000\0"	\
 	"stdout=vidconsole\0"	\
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index d7923967a721..4e0b3c663c77 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -15,7 +15,7 @@
 /*
  *  Environment variables configurations
  */
-#define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
+#define CFG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
 	"=ttyS0,115200 mtdparts=" CONFIG_MTDPARTS_DEFAULT	\
 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
 	"x_bootcmd_usb=usb start\0" \
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 4a453a9df407..de3a0dcdd592 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -37,7 +37,7 @@
 	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index ac42108620fa..24904aa23871 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -34,7 +34,7 @@
 	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x84000000\0" \
 	"kernel_comp_addr_r=0x88000000\0" \
 	"kernel_comp_size=0x4000000\0" \
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 6d605edf7886..9114a0575828 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -31,7 +31,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h
index 974531ea0d82..760a0a5b9135 100644
--- a/include/configs/sipeed-maix.h
+++ b/include/configs/sipeed-maix.h
@@ -11,8 +11,8 @@
 #define CFG_SYS_SDRAM_BASE 0x80000000
 #define CFG_SYS_SDRAM_SIZE SZ_8M
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80060000\0" \
 	"fdt_addr_r=0x80400000\0" \
 	"scriptaddr=0x80020000\0" \
diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h
index ff0ed180e92e..748a423b0833 100644
--- a/include/configs/slimbootloader.h
+++ b/include/configs/slimbootloader.h
@@ -14,10 +14,10 @@
 	"stderr=serial\0"
 
 /*
- * Override CONFIG_EXTRA_ENV_SETTINGS in x86-common.h
+ * Override CFG_EXTRA_ENV_SETTINGS in x86-common.h
  */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	CONFIG_STD_DEVICES_SETTINGS		\
 	"netdev=eth0\0"				\
 	"consoledev=ttyS0\0"			\
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index b988b96e58d8..762f61470b15 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -73,7 +73,7 @@
  * Predefined environment variables.
  * Usefull to define some easy to use boot commands.
  */
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define	CFG_EXTRA_ENV_SETTINGS					\
 									\
 	"basicargs=console=ttyS0,115200\0"				\
 									\
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index ccb7ec38d033..c148757915a2 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -28,7 +28,7 @@
 				" mem=128M " \
 				" " CONFIG_MTDPARTS_DEFAULT
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x40000;" \
 		"onenand write 0x32008000 0x0 0x40000\0" \
diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h
index 14f9cf560286..11031744bef8 100644
--- a/include/configs/smegw01.h
+++ b/include/configs/smegw01.h
@@ -17,7 +17,7 @@
 /* MMC Config*/
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
 	"fdtfile=imx7d-smegw01.dtb\0" \
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index b7aa49ce435e..df8ed451a43a 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -41,7 +41,7 @@
 
 /* Environment settings */
 
-#define	CONFIG_EXTRA_ENV_SETTINGS	\
+#define	CFG_EXTRA_ENV_SETTINGS	\
 	"ethaddr=00:00:00:00:00:00\0" \
 	"serial=0\0" \
 	"stdout=serial_atmel\0" \
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index afca7e18e9be..eaee8dd37396 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -62,7 +62,7 @@
  * Environment
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x82000000\0" \
 	"loadaddr=0x82000000\0" \
 	"fdt_addr_r=0x88000000\0" \
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 29b4b22b3988..f12163ccc990 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -52,7 +52,7 @@
 	"develop=" \
 		"tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
 	CONFIG_KM_DEF_ENV_BOOTTARGETS \
 	CONFIG_KM_NEW_ENV \
diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h
index aa13878177ef..2ce7011529a4 100644
--- a/include/configs/socfpga_chameleonv3.h
+++ b/include/configs/socfpga_chameleonv3.h
@@ -19,7 +19,7 @@
  */
 #define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"autoload=no\0" \
 	"bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \
 	"distro_bootcmd=bridge enable; run bootcmd_mmc\0" \
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index d0f5331d4518..0c96c9c24fed 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -144,8 +144,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"bootm_size=0xa000000\0" \
 	"kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \
diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h
index 8f1c2de998ea..565a661258fd 100644
--- a/include/configs/socfpga_dbm_soc1.h
+++ b/include/configs/socfpga_dbm_soc1.h
@@ -13,7 +13,7 @@
 /* Environment is in MMC */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index e76438e228d5..ac70d91e2081 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -13,7 +13,7 @@
 /* Environment is in MMC */
 
 /* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
diff --git a/include/configs/socfpga_n5x_socdk.h b/include/configs/socfpga_n5x_socdk.h
index c295e91e3d3e..fe5286e12cd1 100644
--- a/include/configs/socfpga_n5x_socdk.h
+++ b/include/configs/socfpga_n5x_socdk.h
@@ -9,8 +9,8 @@
 
 #include <configs/socfpga_soc64_common.h>
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"bootfile=" CONFIG_BOOTFILE "\0" \
 	"fdt_addr=1100000\0" \
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index df3927297bbe..66ecb168a0a0 100644
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -36,7 +36,7 @@
 /*
  * Environment variable
  */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"bootfile=" CONFIG_BOOTFILE "\0" \
 	"fdt_addr=8000000\0" \
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index d88b07bc1594..4bb15cf46293 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -27,7 +27,7 @@
  *                            Linux system after 5 seconds
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 4c752091fb5e..2b35be83ec65 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -111,7 +111,7 @@
 #define CFG_SYS_BOOTMAPSZ	(8 << 20)	/* Initial Memory map for Linux	*/
 
 
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define	CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consdev=ttyS0\0"						\
 	"uboot_file=/home/tftp/syscon3/u-boot.bin\0"			\
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index de0f48b79a15..e13280563513 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 #endif /* CONFIG_FSL_USDHC */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"console=ttymxc0\0" \
 	"initrd_addr=0x86800000\0" \
diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h
index a5987c5e17a1..e58ddd752cd3 100644
--- a/include/configs/stemmy.h
+++ b/include/configs/stemmy.h
@@ -38,7 +38,7 @@
 #define BOOTCMD_ENV \
 	"fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOT_ENV \
 	CONSOLE_ENV \
 	FASTBOOT_ENV \
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 9294d57ca84e..b3fce5031687 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -29,7 +29,7 @@
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0x40000000\0"		\
 			"fdtfile=stih410-b2260.dtb\0"		\
 			"fdt_addr_r=0x47000000\0"		\
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index afd7d50428bf..de5019a364a0 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -15,7 +15,7 @@
 
 #define CFG_SYS_HZ_CLOCK		1000000	/* Timer is clocked at 1MHz */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \
 	"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
 	"bootm 0x08044000 - 0x08042000\0"
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index c8aad47966fe..a4f3e43dc5a1 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -24,7 +24,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0x00008000\0"		\
 			"fdtfile=stm32429i-eval.dtb\0"	\
 			"fdt_addr_r=0x00408000\0"		\
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 573a6b179561..62a7e9af0c56 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -24,7 +24,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0x00008000\0"		\
 			"fdtfile=stm32f469-disco.dtb\0"	\
 			"fdt_addr_r=0x00408000\0"		\
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 14e883a35892..34856d300403 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -24,7 +24,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xC0008000\0"		\
 			"fdtfile="CONFIG_DEFAULT_DEVICE_TREE".dtb\0"	\
 			"fdt_addr_r=0xC0408000\0"		\
diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 67e6a3a19d21..d36cd6fdd44a 100644
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -21,7 +21,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xD0008000\0"		\
 			"fdtfile=stm32h743i-disco.dtb\0"	\
 			"fdt_addr_r=0xD0408000\0"		\
diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index 4786eb001bc1..8f242bf0ff6e 100644
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -21,7 +21,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xD0008000\0"		\
 			"fdtfile=stm32h743i-eval.dtb\0"	\
 			"fdt_addr_r=0xD0408000\0"		\
diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h
index e667fe6f6ac2..d27b6a3d1de2 100644
--- a/include/configs/stm32h750-art-pi.h
+++ b/include/configs/stm32h750-art-pi.h
@@ -21,7 +21,7 @@
 	func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 			"kernel_addr_r=0xC0008000\0"		\
 			"fdtfile=stm32h750i-art-pi.dtb\0"	\
 			"fdt_addr_r=0xC0408000\0"		\
diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h
index c259a616133b..7c59c69e0bdc 100644
--- a/include/configs/stm32mp13_common.h
+++ b/include/configs/stm32mp13_common.h
@@ -81,7 +81,7 @@
 	"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
 	"ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	STM32MP_BOOTCMD \
 	BOOTENV \
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
index 9715dfad1c97..7db72a19ed95 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -135,7 +135,7 @@
 	"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
 	"ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	STM32MP_BOOTCMD \
 	STM32MP_PARTS_DEFAULT \
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h
index 910d7ef107b5..919216906249 100644
--- a/include/configs/stm32mp15_dh_dhsom.h
+++ b/include/configs/stm32mp15_dh_dhsom.h
@@ -12,7 +12,7 @@
 #define PHY_ANEG_TIMEOUT		20000
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"dfu_alt_info_ram=u-boot.itb ram "				\
 			__stringify(CONFIG_SPL_LOAD_FIT_ADDRESS)	\
 			" 0x800000\0"
diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h
index 38b5aa7319cf..d0cd4130cec2 100644
--- a/include/configs/stm32mp15_st_common.h
+++ b/include/configs/stm32mp15_st_common.h
@@ -18,7 +18,7 @@
 					 230400, 460800, 921600, \
 					 1000000, 2000000 }
 
-#ifdef CONFIG_EXTRA_ENV_SETTINGS
+#ifdef CFG_EXTRA_ENV_SETTINGS
 /*
  * default bootcmd for stm32mp1 STMicroelectronics boards:
  * for serial/usb: execute the stm32prog command
@@ -42,8 +42,8 @@
 		"run distro_bootcmd;" \
 	"fi;\0"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	ST_STM32MP1_BOOTCMD \
 	STM32MP_PARTS_DEFAULT \
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index ce941d832a54..fe2ba9a03b41 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -13,7 +13,7 @@
 #define LDS_BOARD_TEXT						\
 	board/sysam/stmark2/sbf_dram_init.o (.text*)
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kern_size=0x700000\0"					\
 	"loadaddr=0x40001000\0"					\
 		"-(rootfs)\0"					\
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 977c0adc5f02..ee1abe691bfd 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -35,7 +35,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 /* SPL support */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 5d82e7e560f6..eae107fe5ec6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -318,7 +318,7 @@
 #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_EXTRA_SETTINGS \
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index a2b6a1f57d7c..a62d1d325478 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -91,7 +91,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define	CONFIG_EXTRA_ENV_SETTINGS		\
+#define	CFG_EXTRA_ENV_SETTINGS		\
 	"fdt_addr_r=0x9fe00000\0"		\
 	"kernel_addr_r=0x90000000\0"		\
 	"ramdisk_addr_r=0xa0000000\0"		\
diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h
index 7af7b08eb485..e8a207f54167 100644
--- a/include/configs/syzygy_hub.h
+++ b/include/configs/syzygy_hub.h
@@ -10,7 +10,7 @@
 #ifndef __CONFIG_SYZYGY_HUB_H
 #define __CONFIG_SYZYGY_HUB_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"fit_image=fit.itb\0"		\
 	"bitstream_image=download.bit\0"    \
 	"loadbit_addr=0x1000000\0"      \
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 30f842558207..855218a8901e 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -72,7 +72,7 @@
 /* bootstrap in spi flash , u-boot + env + linux in nandflash */
 
 #if defined(CONFIG_BOARD_AXM)
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
 		"${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \
 	"addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 689914cb1873..9b396e6e73b0 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -30,7 +30,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB      */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
 	"bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 2c668e0611ba..0fdb5a81605d 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -65,7 +65,7 @@
 #define INITRD_HIGH "ffffffff"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	TEGRA_DEVICE_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdt_high=" FDT_HIGH "\0" \
diff --git a/include/configs/ten64.h b/include/configs/ten64.h
index 57724719a9d6..e86c16313293 100644
--- a/include/configs/ten64.h
+++ b/include/configs/ten64.h
@@ -34,9 +34,9 @@
 	func(PXE, pxe, 0)
 #include <config_distro_bootcmd.h>
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"BOARD=ten64\0"					\
 	"fdt_addr_r=0x90000000\0"		\
 	"fdt_high=0xa0000000\0"			\
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index b57b1beaafe4..746995179f9c 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -19,9 +19,9 @@
 
 /* Environment settings */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"tftpdir=" DEF_ENV_TFTPDIR "\0"				\
 	"eth_init=" DEF_ENV_ETH_INIT "\0"			\
 	"ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0"	\
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 76b496303f3e..9722b0db72aa 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -35,7 +35,7 @@
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index c8b27263e85e..1753fa410d18 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -31,7 +31,7 @@
 #define EEPROM_ADDR_CHIP 0x120
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=thuban\0" \
 	"ubi_off=2048\0"\
 	"nand_img_size=0x400000\0" \
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 7becf1eb7cb4..8ba40546b2c0 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -35,7 +35,7 @@
 /* Initial environment variables */
 #define UBOOT_IMG_HEAD_SIZE		0x40
 /* C80000 - 0x40 */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 					"kernel_addr=08007ffc0\0"	\
 					"fdt_addr=0x94C00000\0"		\
 					"fdt_high=0x9fffffff\0"
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 7b04292d2188..2d9d2fd66e9a 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -12,7 +12,7 @@
 #include <configs/ti_armv7_omap.h>
 #include <asm/arch/omap.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	DEFAULT_LINUX_BOOT_ENV
 
 /* Clock Defines */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index ea45bba409cb..479ab46e4edd 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -106,7 +106,7 @@
 		"rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; "	\
 		"rproc start ${dev_pmmc}\0"				\
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	ENV_KS2_BOARD_SETTINGS						\
 	DFUARGS								\
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 64ec59d78eb6..49f4263e16ba 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -58,7 +58,7 @@
 #include <config_distro_bootcmd.h>
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 37ab2e446724..e9723ed5b3dd 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -247,7 +247,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 83abaeddf125..3795e6152fa9 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -44,8 +44,8 @@
 # define EXTRA_ENV_USB
 #endif
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"kernel_image=uImage\0"	\
 	"kernel_addr=0x2080000\0" \
 	"ramdisk_image=uramdisk.image.gz\0"	\
diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
index 0f28690612ab..e007be8e4564 100644
--- a/include/configs/total_compute.h
+++ b/include/configs/total_compute.h
@@ -28,7 +28,7 @@
 #define PHYS_SDRAM_2		0x8080000000
 #define PHYS_SDRAM_2_SIZE	0x180000000
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"bootm_size=0x20000000\0"	\
 				"load_addr=0xa0000000\0"	\
 				"kernel_addr_r=0x80080000\0"	\
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 7a1ad9544a30..14d7730f67bf 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -197,7 +197,7 @@
 /* set to a resonable value, changeable by user */
 #define TQMA6_CMA_SIZE                 160M
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                              \
+#define CFG_EXTRA_ENV_SETTINGS                                              \
 	"board=tqma6\0"                                                        \
 	"uimage=uImage\0"                                                      \
 	"zimage=zImage\0"                                                      \
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 3eac66539dfe..2067327918a2 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -54,7 +54,7 @@
 	"params.bin raw 0x38 0x8;" \
 	"/Image.itb ext4 0 2\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
 		"run loaduimage;" \
 		"if run loaddtb; then " \
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 18fca09a3807..9925531aba43 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -55,7 +55,7 @@
 	"params.bin raw 0x38 0x8;" \
 	"/Image.itb ext4 0 2\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootk=" \
 		"run loaduimage;" \
 		"if run loaddtb; then " \
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index fdb420ed874e..3443c80d06ef 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -35,7 +35,7 @@
 	"lzmadec 0x5000000 0x5800000 && "				\
 	"bootm 0x5800000"
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_addr=0x4c00000\0"					\
 	"scriptaddr=0x4d00000\0"				\
 	"pxefile_addr_r=0x4e00000\0"				\
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 52de4cdc7893..47b220ff9ee7 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -80,7 +80,7 @@
 	"fi; " \
 	"bootz 0x1000000"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	RELOCATION_LIMITS_ENV_SETTINGS \
 	LOAD_ADDRESS_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index fac8c1eeb4e2..f0092eff1494 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -15,7 +15,7 @@
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1,115200\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index d4c92233acaa..5d7d734daa2d 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -19,7 +19,7 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
 /* Linux only */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 7fee64029d8d..ecf0d2ac44ae 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -86,7 +86,7 @@
 		"run boot_common\0"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_addr_r_offset=0x05100000\0" \
 	"kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
 	"ramdisk_addr_r_offset=0x06000000\0" \
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 657dbadd3396..b90e047955b9 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -43,6 +43,6 @@
 #endif
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 
 #endif
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 7f79c6342fc3..11706148f1e2 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -40,7 +40,7 @@
 	"pxefile_addr_r=0x70800000\0"		\
 	"ramdisk_addr_r=0x73000000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	MEM_LAYOUT_ENV_SETTINGS					\
 	"bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0"	\
 	"fdtfile=imx53-usbarmory.dtb\0"				\
diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index b03159805c15..2e150276e7a4 100644
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -25,7 +25,7 @@
 #error Unknown DDR size - please add!
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"loadaddr=0x81000000\0"						\
 	"spi_image_off=0x00100000\0"					\
 	"console=ttyS0,115200\0"					\
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 18ac6b2b0895..7f3fa795afdc 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -34,7 +34,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"bootcmd_mfg=fastboot 0\0" \
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 22dc364223ce..2cb076cabac9 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -43,7 +43,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"bootcmd_mfg=fastboot 0\0" \
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 30c1f5025b05..87b8c5d57ee7 100644
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -244,7 +244,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Default load addresses and names for the different payloads. */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 		"kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0"	       \
 		"ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0"      \
 		"pxefile_addr_r=" __stringify(VEXPRESS_PXEFILE_ADDR) "\0"      \
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index e8b6acf8b8fe..705a941e3603 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -145,7 +145,7 @@
         func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
                 "kernel_addr_r=0x60100000\0" \
                 "fdt_addr_r=0x60000000\0" \
                 "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 14e6b2bac91c..0e0b3a7b594d 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -44,7 +44,7 @@
 	"rdaddr=0x84080000\0" \
 	"ramdisk_addr_r=0x84080000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 1c1789ac3fb8..0698ae1d1c6e 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -45,7 +45,7 @@
 
 /* Update the bootcommand according to our mapping for the VInCo platform */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_start=0x20000\0" \
 	"kernel_size=0x800000\0" \
 	"mmcblksize=0x200\0" \
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 6923009d4598..1e765439fabe 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -20,7 +20,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
 	"splashpos=m,m\0" \
 	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 188180da54eb..0826e0bbe025 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -26,7 +26,7 @@
 #define BOOT_SCR_STRING "source ${bootscriptaddr}\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"bootscr_fitimage_name=bootscr\0" \
diff --git a/include/configs/x530.h b/include/configs/x530.h
index 6cc3496ee593..01c1b58b2359 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -49,7 +49,7 @@
 #include <asm/arch/config.h>
 
 /* Keep device tree and initrd in low memory so the kernel can access them */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
 	"initrd_high=0x10000000\0"
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index d71108dd3186..65a1e63e00e6 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -42,7 +42,7 @@
 #define SPLASH_SETTINGS
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS			\
+#define CFG_EXTRA_ENV_SETTINGS			\
 	DISTRO_BOOTENV					\
 	CONFIG_STD_DEVICES_SETTINGS			\
 	SPLASH_SETTINGS					\
diff --git a/include/configs/xea.h b/include/configs/xea.h
index a3dc0c74ebb1..04ca5aa12ac1 100644
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -27,7 +27,7 @@
 
 /* Extra Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootmode=update\0"						\
 	"bootpri=mmc_mmc\0"						\
 	"bootsec=sf_swu\0"						\
diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h
index 612436aeb48f..bc268d25dc3a 100644
--- a/include/configs/xenguest_arm64.h
+++ b/include/configs/xenguest_arm64.h
@@ -9,12 +9,12 @@
 #include <linux/types.h>
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #undef CFG_SYS_SDRAM_BASE
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \
 	"pvblockboot=run loadimage;" \
 		"booti 0x90000000 - 0x88000000;\0"
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 6ee6786e054a..e70acd93bac4 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -126,8 +126,8 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 #endif
diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h
index e1f95de3c34f..23655a475221 100644
--- a/include/configs/xilinx_versal_mini.h
+++ b/include/configs/xilinx_versal_mini.h
@@ -10,11 +10,11 @@
 #ifndef __CONFIG_VERSAL_MINI_H
 #define __CONFIG_VERSAL_MINI_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #include <configs/xilinx_versal.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #endif /* __CONFIG_VERSAL_MINI_H */
diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h
index 37bdb214629d..424ead038e32 100644
--- a/include/configs/xilinx_versal_net.h
+++ b/include/configs/xilinx_versal_net.h
@@ -123,8 +123,8 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV \
 	DFU_ALT_INFO
diff --git a/include/configs/xilinx_versal_net_mini.h b/include/configs/xilinx_versal_net_mini.h
index 1939832a848e..50bacc39ac58 100644
--- a/include/configs/xilinx_versal_net_mini.h
+++ b/include/configs/xilinx_versal_net_mini.h
@@ -11,11 +11,11 @@
 #ifndef __CONFIG_VERSAL_NET_MINI_H
 #define __CONFIG_VERSAL_NET_MINI_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #include <configs/xilinx_versal_net.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #endif /* __CONFIG_VERSAL_NET_MINI_H */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index f71cd6609932..011f0034c509 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -173,16 +173,16 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 #endif
 
 /* SPL can't handle all huge variables - define just DFU */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-# define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+# define CFG_EXTRA_ENV_SETTINGS \
 	"dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \
 			  "atf-uboot.ub ram 0x10000000 0x1000000;" \
 			  "Image ram 0x80000 0x3f80000;" \
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 1c0ab25c6440..9af05456640b 100644
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -10,11 +10,11 @@
 #ifndef __CONFIG_ZYNQMP_MINI_H
 #define __CONFIG_ZYNQMP_MINI_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 #include <configs/xilinx_zynqmp.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #endif /* __CONFIG_ZYNQMP_MINI_H */
diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h
index 3a7b7e03d6af..918aa3d7402a 100644
--- a/include/configs/xilinx_zynqmp_r5.h
+++ b/include/configs/xilinx_zynqmp_r5.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_ZYNQMP_R5_H
 #define __CONFIG_ZYNQMP_R5_H
 
-#define CONFIG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS
 
 /* Serial drivers */
 /* The following table includes the supported baudrates */
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 9f1f2d90dbe1..0d72008bb466 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -34,7 +34,7 @@
 #define CONFIG_FEC_ENET_DEV		0
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc6\0" \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index d95178eb6422..e372e903170a 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -170,8 +170,8 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* Default environment */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"scriptaddr=0x20000\0"	\
 	"script_size_f=0x40000\0"	\
 	"fdt_addr_r=0x1f00000\0"        \
diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index ac6e8c4ff867..a9bb5bb90ad1 100644
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -12,7 +12,7 @@
 #include <configs/zynq-common.h>
 
 /* Undef unneeded configs */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
 #undef CFG_SYS_INIT_RAM_ADDR
 #undef CFG_SYS_INIT_RAM_SIZE
diff --git a/include/env_default.h b/include/env_default.h
index 3b7685ee26c3..c0df39d62f9b 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -118,8 +118,8 @@ const char default_environment[] = {
 	/* This is created in the Makefile */
 	CONFIG_EXTRA_ENV_TEXT
 #endif
-#ifdef	CONFIG_EXTRA_ENV_SETTINGS
-	CONFIG_EXTRA_ENV_SETTINGS
+#ifdef	CFG_EXTRA_ENV_SETTINGS
+	CFG_EXTRA_ENV_SETTINGS
 #endif
 	"\0"
 #else /* CONFIG_USE_DEFAULT_ENV_FILE */
-- 
2.25.1

[PATCH 026/149] global: Migrate CONFIG_FB_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FB_ADDR to CFG_FB_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/video/nexell_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c
index 5595796a678b..af2698ffca84 100644
--- a/drivers/video/nexell_display.c
+++ b/drivers/video/nexell_display.c
@@ -560,7 +560,7 @@ static int nx_display_bind(struct udevice *dev)
 	/* Datasheet S5p4418:
 	 *   Resolution up to 2048 x 1280, up to 12 Bit per color (HDMI)
 	 * Actual (max.) size is 0x1000000 because in U-Boot nanopi2-2016.01
-	 * "#define CONFIG_FB_ADDR  0x77000000" and next address is
+	 * "#define CFG_FB_ADDR  0x77000000" and next address is
 	 * "#define BMP_LOAD_ADDR  0x78000000"
 	 */
 	plat->size = 0x1000000;
-- 
2.25.1

[PATCH 027/149] global: Migrate CONFIG_FEC_ENET_DEV to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FEC_ENET_DEV to CFG_FEC_ENET_DEV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +-
 board/freescale/mx6ullevk/mx6ullevk.c             | 2 +-
 board/seeed/npi_imx6ull/npi_imx6ull.c             | 2 +-
 board/variscite/dart_6ul/dart_6ul.c               | 2 +-
 include/configs/capricorn-common.h                | 2 +-
 include/configs/dart_6ul.h                        | 2 +-
 include/configs/liteboard.h                       | 2 +-
 include/configs/mx6ul_14x14_evk.h                 | 6 +++---
 include/configs/mx6ullevk.h                       | 2 +-
 include/configs/npi_imx6ull.h                     | 2 +-
 include/configs/xpress.h                          | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 1eec048a66fa..570b5014dbb1 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -281,7 +281,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef	CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 #ifdef CONFIG_USB_EHCI_MX6
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 86c11c7bd3a5..e24738064757 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -110,7 +110,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef	CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 	return 0;
diff --git a/board/seeed/npi_imx6ull/npi_imx6ull.c b/board/seeed/npi_imx6ull/npi_imx6ull.c
index eb9ee555c854..c610d2c30696 100644
--- a/board/seeed/npi_imx6ull/npi_imx6ull.c
+++ b/board/seeed/npi_imx6ull/npi_imx6ull.c
@@ -100,7 +100,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 	return 0;
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 7326daa1798d..98d8d1c31205 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -147,7 +147,7 @@ int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef CONFIG_FEC_MXC
-	setup_fec(CONFIG_FEC_ENET_DEV);
+	setup_fec(CFG_FEC_ENET_DEV);
 #endif
 
 #ifdef CONFIG_NAND_MXS
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index a8273a7fcd8d..63afa6e18969 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -19,7 +19,7 @@
 #endif /* CONFIG_SPL_BUILD */
 
 /* ENET1 connects to base board and MUX with ESAI */
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 #define CONFIG_FEC_MXC_PHYADDR		0x0
 
 /* EEPROM */
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 323703ac5c90..c2ed9c7c56af 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -18,7 +18,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 #endif
 
 /* Environment settings */
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 938ab5ade9a7..7200c69bd9e6 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -100,7 +100,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 
 #define CONFIG_FEC_MXC_PHYADDR		0x0
 #endif
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 90c788468710..efc599f37a6d 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -121,11 +121,11 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 
-#if (CONFIG_FEC_ENET_DEV == 0)
+#if (CFG_FEC_ENET_DEV == 0)
 #define CONFIG_FEC_MXC_PHYADDR          0x2
-#elif (CONFIG_FEC_ENET_DEV == 1)
+#elif (CFG_FEC_ENET_DEV == 1)
 #define CONFIG_FEC_MXC_PHYADDR		0x1
 #endif
 #endif
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 4a27fd22902b..58d1a744ae99 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -109,7 +109,7 @@
 /* environment organization */
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 #endif
 
 #endif
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index a12e34b6e607..979512c0a095 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -36,7 +36,7 @@
 #define CONFIG_FEC_MXC_PHYADDR		0x1
 #endif
 
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 0d72008bb466..13f0ee62b89f 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -31,7 +31,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
 #define CFG_EXTRA_ENV_SETTINGS \
-- 
2.25.1

[PATCH 028/149] global: Migrate CONFIG_FEC_MXC_PHYADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FEC_MXC_PHYADDR to CFG_FEC_MXC_PHYADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/compulab/cl-som-imx7/cl-som-imx7.c        | 2 +-
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +-
 doc/README.fec_mxc                              | 2 +-
 drivers/net/fec_mxc.c                           | 4 ++--
 include/configs/aristainetos2.h                 | 2 +-
 include/configs/capricorn-common.h              | 2 +-
 include/configs/cgtqmx8.h                       | 2 +-
 include/configs/cl-som-imx7.h                   | 2 +-
 include/configs/cm_fx6.h                        | 2 +-
 include/configs/imx6_logic.h                    | 2 +-
 include/configs/imx6dl-mamoj.h                  | 2 +-
 include/configs/imx8mm-cl-iot-gate.h            | 2 +-
 include/configs/imx8mm_evk.h                    | 2 +-
 include/configs/imx8mp_evk.h                    | 2 +-
 include/configs/imx8mp_icore_mx8mp.h            | 2 +-
 include/configs/imx8mp_rsb3720.h                | 2 +-
 include/configs/imx8mq_evk.h                    | 2 +-
 include/configs/imx8mq_phanbell.h               | 2 +-
 include/configs/imx8ulp_evk.h                   | 2 +-
 include/configs/kontron_pitx_imx8m.h            | 2 +-
 include/configs/liteboard.h                     | 2 +-
 include/configs/m53menlo.h                      | 2 +-
 include/configs/mccmon6.h                       | 2 +-
 include/configs/msc_sm2s_imx8mp.h               | 2 +-
 include/configs/mx6sxsabreauto.h                | 2 +-
 include/configs/mx6sxsabresd.h                  | 2 +-
 include/configs/mx6ul_14x14_evk.h               | 4 ++--
 include/configs/nitrogen6x.h                    | 2 +-
 include/configs/npi_imx6ull.h                   | 2 +-
 include/configs/pico-imx6.h                     | 2 +-
 include/configs/pico-imx6ul.h                   | 2 +-
 include/configs/pico-imx8mq.h                   | 2 +-
 include/configs/somlabs_visionsom_6ull.h        | 2 +-
 include/configs/tqma6_mba6.h                    | 2 +-
 include/configs/tqma6_wru4.h                    | 2 +-
 include/configs/vf610twr.h                      | 2 +-
 include/configs/vining_2000.h                   | 2 +-
 include/configs/xpress.h                        | 2 +-
 38 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 9733a33ee2c2..1b08a2c5abf2 100644
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -214,7 +214,7 @@ int board_eth_init(struct bd_info *bis)
 	gpio_set_value(CL_SOM_IMX7_ETH1_PHY_NRST, 1);
 	/* MAC initialization */
 	return fecmxc_initialize_multi(bis, CL_SOM_IMX7_FEC_DEV_ID_PRI,
-				       CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+				       CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
 }
 
 /*
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 7340a3440231..9205d5ef6ddb 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis)
 	setup_fec();
 
 	ret = fecmxc_initialize_multi(bis, 1,
-		CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+		CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
 	if (ret)
 		printf("FEC%d MXC: %s:failed\n", 1, __func__);
 
diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index 4e890d348f47..2ccd4288d281 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -18,7 +18,7 @@ CONFIG_PHYLIB
 CONFIG_FEC_MXC_NO_ANEG
 	Relevant only if PHYLIB not used. Skips auto-negotiation restart.
 
-CONFIG_FEC_MXC_PHYADDR
+CFG_FEC_MXC_PHYADDR
 	Optional, selects the exact phy address that should be connected
 	and function fecmxc_initialize will try to initialize it.
 
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 9cb235ad5e37..ab52cc119f4e 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1086,8 +1086,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
 	int addr;
 
 	addr = device_get_phy_addr(priv, dev);
-#ifdef CONFIG_FEC_MXC_PHYADDR
-	addr = CONFIG_FEC_MXC_PHYADDR;
+#ifdef CFG_FEC_MXC_PHYADDR
+	addr = CFG_FEC_MXC_PHYADDR;
 #endif
 
 	phydev = phy_connect(priv->bus, addr, dev, priv->interface);
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index a6e9d2bb65f7..be1478ea8b67 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -26,7 +26,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 #ifdef CONFIG_IMX_HAB
 #define HAB_EXTRA_SETTINGS \
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 63afa6e18969..19c7fca03b29 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -20,7 +20,7 @@
 
 /* ENET1 connects to base board and MUX with ESAI */
 #define CFG_FEC_ENET_DEV		1
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 
 /* EEPROM */
 #define  EEPROM_I2C_BUS		0 /* I2C0 */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 263981860e86..caa1498acead 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -118,6 +118,6 @@
 #define PHYS_SDRAM_2_SIZE		0x100000000	/* 4 GB */
 
 /* Networking */
-#define CONFIG_FEC_MXC_PHYADDR		-1
+#define CFG_FEC_MXC_PHYADDR		-1
 
 #endif /* __CGTQMX8_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 2d56d37f06f8..cde7d3c891ab 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -13,7 +13,7 @@
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 /* ENET1 */
 #define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index c66cf721870c..47b76c9371e8 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -132,7 +132,7 @@
 /* APBH DMA is required for NAND support */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 0df61916b7d2..121b34ae96db 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -19,7 +19,7 @@
 
 
 /* Ethernet Configs */
-#define CONFIG_FEC_MXC_PHYADDR         0
+#define CFG_FEC_MXC_PHYADDR         0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index b6006c021d5c..162b0b8a69bb 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -40,7 +40,7 @@
 /* MMC */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 00ce7fb62a93..7785bdc7cbe6 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -136,7 +136,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index d28f3f1972b9..c364e06dc450 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -61,6 +61,6 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0x80000000 /* 2GB DDR */
 
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 #endif
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index c6e3b105a8ad..1fea5b72deba 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define PHY_ANEG_TIMEOUT 20000
 
diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h
index c3abcee40e89..bbbd91776fef 100644
--- a/include/configs/imx8mp_icore_mx8mp.h
+++ b/include/configs/imx8mp_icore_mx8mp.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define DWC_NET_PHYADDR			1
 
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index ed4da0e69b5b..38ae5f137022 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -39,7 +39,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          4
+#define CFG_FEC_MXC_PHYADDR          4
 
 #define PHY_ANEG_TIMEOUT 20000
 
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index c40448715f8a..d9ce5d5d0f1a 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -24,7 +24,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 8fed3e31964c..eb7059f0648c 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -21,7 +21,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 #endif
 
 #define CONFIG_MFG_ENV_SETTINGS \
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 30dd5af03b00..b7397f6038fd 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -21,7 +21,7 @@
 #if defined(CONFIG_FEC_MXC)
 #define PHY_ANEG_TIMEOUT		20000
 
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index d909bbbbcfda..4dd51c7f1d7f 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -25,7 +25,7 @@
 
 /* ENET1 Config */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 #define PHY_ANEG_TIMEOUT		20000
 
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 7200c69bd9e6..0b8781d7bf34 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -102,7 +102,7 @@
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_ENET_DEV		0
 
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 #endif
 
 #endif
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 0deb7672f9e9..de6928d29737 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -54,7 +54,7 @@
  * Ethernet on SOC (FEC)
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 #endif
 
 #define CFG_SYS_RTC_BUS_NUM		1 /* I2C2 */
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 436f5f0059de..6cc49378fedc 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -31,7 +31,7 @@
 #define CFG_SYS_FLASH_BANKS_SIZES	{ (32 * SZ_1M) }
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200 quiet\0" \
diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index ef2111cd20ab..1cd0b3cf7374 100644
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 #define PHY_ANEG_TIMEOUT 20000
 #endif
 
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 9d8737c19425..3399cdd16fa8 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -93,7 +93,7 @@
 /* Network */
 
 #define IMX_FEC_BASE			ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8372f979dc86..c99d99abc179 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -115,7 +115,7 @@
 
 /* Network */
 
-#define CONFIG_FEC_MXC_PHYADDR          0x1
+#define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index efc599f37a6d..5e3695ecc971 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -124,9 +124,9 @@
 #define CFG_FEC_ENET_DEV		1
 
 #if (CFG_FEC_ENET_DEV == 0)
-#define CONFIG_FEC_MXC_PHYADDR          0x2
+#define CFG_FEC_MXC_PHYADDR          0x2
 #elif (CFG_FEC_ENET_DEV == 1)
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 #endif
 
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 496a3164f404..aca15be64b11 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -18,7 +18,7 @@
 #define CFG_SYS_FSL_USDHC_NUM       2
 
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR		6
+#define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 979512c0a095..4b47e4fbb37a 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -33,7 +33,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 
 #define CFG_FEC_ENET_DEV		1
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 66258a3ab73b..e1f7b7003194 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -98,6 +98,6 @@
 /* Environment organization */
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 #endif			       /* __CONFIG_H * */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 45fc6126c879..1cb8fa63e721 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -15,7 +15,7 @@
 
 /* Network support */
 
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 
 #define CONFIG_MXC_UART_BASE		UART6_BASE_ADDR
 
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index ac25991703f2..1d8709180c83 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -21,7 +21,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 #endif
 
 /* Initial environment variables */
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index e13280563513..3418d4e2b559 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -66,7 +66,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 
 #endif
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 899c218727f3..a5f14dc42679 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_TQMA6_MBA6_H
 #define __CONFIG_TQMA6_MBA6_H
 
-#define CONFIG_FEC_MXC_PHYADDR		0x03
+#define CFG_FEC_MXC_PHYADDR		0x03
 
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 4d8839b6e60d..34c9b6a2f97c 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -7,7 +7,7 @@
 #define __CONFIG_TQMA6_WRU4_H
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		0x01
+#define CFG_FEC_MXC_PHYADDR		0x01
 
 /* UART */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 0e0b3a7b594d..d10b88f15754 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -21,7 +21,7 @@
 
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 /* I2C Configs */
 
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 1a71b300fc55..c84353ebea66 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -34,7 +34,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Network */
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 13f0ee62b89f..96996ac1f0f2 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -32,7 +32,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
-- 
2.25.1

[PATCH 029/149] global: Migrate CONFIG_FLASH_BR_PRELIM to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FLASH_BR_PRELIM to CFG_FLASH_BR_PRELIM

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a353c16f74b1..f328eda416e4 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -188,7 +188,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS	CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
+#define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
 	| BR_PS_16 | BR_V)
 
 #define CONFIG_FLASH_OR_PRELIM	0xfc000ff7
-- 
2.25.1

[PATCH 030/149] global: Migrate CONFIG_FLASH_OR_PRELIM to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FLASH_OR_PRELIM to CFG_FLASH_OR_PRELIM

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index f328eda416e4..41e7f53bd57e 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -191,7 +191,7 @@
 #define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
 	| BR_PS_16 | BR_V)
 
-#define CONFIG_FLASH_OR_PRELIM	0xfc000ff7
+#define CFG_FLASH_OR_PRELIM	0xfc000ff7
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
-- 
2.25.1

[PATCH 031/149] global: Migrate CONFIG_FM_PLAT_CLK_DIV to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FM_PLAT_CLK_DIV to CFG_FM_PLAT_CLK_DIV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index a6e352ceabb1..eec071022e59 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info)
 		[14] = 4,	/* CC4 PPL / 4 */
 	};
 	uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
-#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
 	uint rcw_tmp;
 #endif
 	uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
 #define FM1_CLK_SEL	0x1c000000
 #define FM1_CLK_SHIFT	26
 #endif
-#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
 #if defined(CONFIG_ARCH_T1024)
 	rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
 #else
@@ -377,7 +377,7 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_FM_PLAT_CLK_DIV
+#ifndef CFG_FM_PLAT_CLK_DIV
 	switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) {
 	case 1:
 		sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK];
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 246bcb9fe498..283181ec2d3d 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -147,8 +147,8 @@
 #define CONFIG_PME_PLAT_CLK_DIV		2
 #define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
-#define CONFIG_FM_PLAT_CLK_DIV	1
-#define CFG_SYS_FM1_CLK		CONFIG_FM_PLAT_CLK_DIV
+#define CFG_FM_PLAT_CLK_DIV	1
+#define CFG_SYS_FM1_CLK		CFG_FM_PLAT_CLK_DIV
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE			0x6000UL
-- 
2.25.1

[PATCH 032/149] global: Migrate CONFIG_FPGA_DELAY to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FPGA_DELAY to CFG_FPGA_DELAY

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                  |  2 +-
 drivers/fpga/ACEX1K.c   | 22 ++++++++++-----------
 drivers/fpga/cyclon2.c  | 12 ++++++------
 drivers/fpga/spartan2.c | 42 ++++++++++++++++++++---------------------
 drivers/fpga/spartan3.c | 42 ++++++++++++++++++++---------------------
 drivers/fpga/virtex2.c  | 24 +++++++++++------------
 6 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/README b/README
index a278825bbcc9..84086764d810 100644
--- a/README
+++ b/README
@@ -1018,7 +1018,7 @@ The following options need to be configured:
 		will require a board or device specific function to
 		be written.
 
-		CONFIG_FPGA_DELAY
+		CFG_FPGA_DELAY
 
 		If defined, a function that provides delays in the FPGA
 		configuration driver.
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index ca49ee40a71d..4c00cdf0b57d 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -17,11 +17,11 @@
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
- * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
+ * If there is a need to operate slower, define CFG_FPGA_DELAY in
  * the board config file to slow things down.
  */
-#ifndef CONFIG_FPGA_DELAY
-#define CONFIG_FPGA_DELAY()
+#ifndef CFG_FPGA_DELAY
+#define CFG_FPGA_DELAY()
 #endif
 
 #ifndef CFG_SYS_FPGA_WAIT
@@ -137,7 +137,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		/* Wait for nSTATUS to be released (i.e. deasserted) */
 		ts = get_timer (0);		/* get current time */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for STATUS to go high.\n");
 				(*fn->abort) (cookie);
@@ -147,7 +147,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		} while ((*fn->status) (cookie));
 
 		/* Get ready for the burn */
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 
 		/* Load the data */
 		while (bytecount < bsize) {
@@ -172,13 +172,13 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 			do {
 				/* Deassert the clock */
 				(*fn->clk) (false, true, cookie);
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				/* Write data */
 				(*fn->data) ((val & 0x01), true, cookie);
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				/* Assert the clock */
 				(*fn->clk) (true, true, cookie);
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				val >>= 1;
 				i --;
 			} while (i > 0);
@@ -189,7 +189,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 #endif
 		}
 
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		putc (' ');			/* terminate the dotted line */
@@ -210,9 +210,9 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 	 */
 
 	for (i = 0; i < 12; i++) {
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
 	}
 
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 3eed461e1e5c..6e8a313db35b 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -15,11 +15,11 @@
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
- * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
+ * If there is a need to operate slower, define CFG_FPGA_DELAY in
  * the board config file to slow things down.
  */
-#ifndef CONFIG_FPGA_DELAY
-#define CONFIG_FPGA_DELAY()
+#ifndef CFG_FPGA_DELAY
+#define CFG_FPGA_DELAY()
 #endif
 
 #ifndef CFG_SYS_FPGA_WAIT
@@ -129,7 +129,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		/* Wait for nSTATUS to be asserted */
 		ts = get_timer(0);		/* get current time */
 		do {
-			CONFIG_FPGA_DELAY();
+			CFG_FPGA_DELAY();
 			if (get_timer(ts) > CFG_SYS_FPGA_WAIT) {
 				/* check the time */
 				puts("** Timeout waiting for STATUS to go high.\n");
@@ -139,7 +139,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		} while (!(*fn->status) (cookie));
 
 		/* Get ready for the burn */
-		CONFIG_FPGA_DELAY();
+		CFG_FPGA_DELAY();
 
 		ret = (*fn->write) (buf, bsize, true, cookie);
 		if (ret) {
@@ -151,7 +151,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		puts(" OK? ...");
 #endif
 
-		CONFIG_FPGA_DELAY();
+		CFG_FPGA_DELAY();
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		putc(' ');			/* terminate the dotted line */
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 68971d934702..6eef87b78e16 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -12,11 +12,11 @@
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
- * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
+ * If there is a need to operate slower, define CFG_FPGA_DELAY in
  * the board config file to slow things down.
  */
-#ifndef CONFIG_FPGA_DELAY
-#define CONFIG_FPGA_DELAY()
+#ifndef CFG_FPGA_DELAY
+#define CFG_FPGA_DELAY()
 #endif
 
 #ifndef CFG_SYS_FPGA_WAIT
@@ -140,13 +140,13 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		(*fn->pgm) (true, true, cookie);	/* Assert the program, commit */
 
 		/* Get ready for the burn */
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
 		ts = get_timer (0);		/* get current time */
 		/* Now wait for INIT and BUSY to go high */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
@@ -164,9 +164,9 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			/* XXX - Check the error bit? */
 
 			(*fn->wdata) (data[bytecount++], true, cookie); /* write the data */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
@@ -175,9 +175,9 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				/* XXX - we should have a check in here somewhere to
 				 * make sure we aren't busy forever... */
 
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 				if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
@@ -194,7 +194,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 		}
 
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->cs) (false, true, cookie);	/* Deassert the chip select */
 		(*fn->wr) (false, true, cookie);	/* Deassert the write pin */
 
@@ -207,9 +207,9 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		ret_val = FPGA_SUCCESS;
 		while ((*fn->done) (cookie) == FPGA_FAIL) {
 
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
@@ -330,7 +330,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		/* Wait for INIT state (init low)                            */
 		ts = get_timer (0);		/* get current time */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to start.\n");
 				return FPGA_FAIL;
@@ -338,13 +338,13 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		} while (!(*fn->init) (cookie));
 
 		/* Get ready for the burn */
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
 		ts = get_timer (0);		/* get current time */
 		/* Now wait for INIT to go high */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				return FPGA_FAIL;
@@ -365,13 +365,13 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			do {
 				/* Deassert the clock */
 				(*fn->clk) (false, true, cookie);
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				/* Write data */
 				(*fn->wr) ((val & 0x80), true, cookie);
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				/* Assert the clock */
 				(*fn->clk) (true, true, cookie);
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				val <<= 1;
 				i --;
 			} while (i > 0);
@@ -382,7 +382,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 		}
 
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		putc ('\n');			/* terminate the dotted line */
@@ -395,9 +395,9 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 
 		while (! (*fn->done) (cookie)) {
 
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 			putc ('*');
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 1d5073cb59d4..e892fa571f19 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -17,11 +17,11 @@
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
- * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
+ * If there is a need to operate slower, define CFG_FPGA_DELAY in
  * the board config file to slow things down.
  */
-#ifndef CONFIG_FPGA_DELAY
-#define CONFIG_FPGA_DELAY()
+#ifndef CFG_FPGA_DELAY
+#define CFG_FPGA_DELAY()
 #endif
 
 #ifndef CFG_SYS_FPGA_WAIT
@@ -145,13 +145,13 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		(*fn->pgm) (true, true, cookie);	/* Assert the program, commit */
 
 		/* Get ready for the burn */
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
 		ts = get_timer (0);		/* get current time */
 		/* Now wait for INIT and BUSY to go high */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				(*fn->abort) (cookie);	/* abort the burn */
@@ -169,9 +169,9 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			/* XXX - Check the error bit? */
 
 			(*fn->wdata) (data[bytecount++], true, cookie); /* write the data */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
@@ -180,9 +180,9 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				/* XXX - we should have a check in here somewhere to
 				 * make sure we aren't busy forever... */
 
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-				CONFIG_FPGA_DELAY ();
+				CFG_FPGA_DELAY ();
 				(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 				if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
@@ -199,7 +199,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 		}
 
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->cs) (false, true, cookie);	/* Deassert the chip select */
 		(*fn->wr) (false, true, cookie);	/* Deassert the write pin */
 
@@ -214,9 +214,9 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			/* XXX - we should have a check in here somewhere to
 			 * make sure we aren't busy forever... */
 
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
@@ -337,7 +337,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		/* Wait for INIT state (init low)                            */
 		ts = get_timer (0);		/* get current time */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to start.\n");
 				if (*fn->abort)
@@ -347,13 +347,13 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		} while (!(*fn->init) (cookie));
 
 		/* Get ready for the burn */
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 		(*fn->pgm) (false, true, cookie);	/* Deassert the program, commit */
 
 		ts = get_timer (0);		/* get current time */
 		/* Now wait for INIT to go high */
 		do {
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			if (get_timer (ts) > CFG_SYS_FPGA_WAIT) {	/* check the time */
 				puts ("** Timeout waiting for INIT to clear.\n");
 				if (*fn->abort)
@@ -381,13 +381,13 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				do {
 					/* Deassert the clock */
 					(*fn->clk) (false, true, cookie);
-					CONFIG_FPGA_DELAY ();
+					CFG_FPGA_DELAY ();
 					/* Write data */
 					(*fn->wr) ((val & 0x80), true, cookie);
-					CONFIG_FPGA_DELAY ();
+					CFG_FPGA_DELAY ();
 					/* Assert the clock */
 					(*fn->clk) (true, true, cookie);
-					CONFIG_FPGA_DELAY ();
+					CFG_FPGA_DELAY ();
 					val <<= 1;
 					i --;
 				} while (i > 0);
@@ -399,7 +399,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			}
 		}
 
-		CONFIG_FPGA_DELAY ();
+		CFG_FPGA_DELAY ();
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		putc ('\n');			/* terminate the dotted line */
@@ -414,9 +414,9 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			/* XXX - we should have a check in here somewhere to
 			 * make sure we aren't busy forever... */
 
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
-			CONFIG_FPGA_DELAY ();
+			CFG_FPGA_DELAY ();
 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
 
 			putc ('*');
diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index ed2a4163f6eb..fc99a5f48314 100644
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -22,13 +22,13 @@
 
 /*
  * If the SelectMap interface can be overrun by the processor, enable
- * CONFIG_SYS_FPGA_CHECK_BUSY and/or define CONFIG_FPGA_DELAY in the board
+ * CONFIG_SYS_FPGA_CHECK_BUSY and/or define CFG_FPGA_DELAY in the board
  * configuration file and add board-specific support for checking BUSY status.
  * By default, assume that the SelectMap interface cannot be overrun.
  */
 
-#ifndef CONFIG_FPGA_DELAY
-#define CONFIG_FPGA_DELAY()
+#ifndef CFG_FPGA_DELAY
+#define CFG_FPGA_DELAY()
 #endif
 
 /*
@@ -196,7 +196,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
 	} while (!(*fn->init)(cookie));
 
 	(*fn->pgm)(false, true, cookie);
-	CONFIG_FPGA_DELAY();
+	CFG_FPGA_DELAY();
 	if (fn->clk)
 		(*fn->clk)(true, true, cookie);
 
@@ -205,7 +205,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
 	 */
 	ts = get_timer(0);
 	do {
-		CONFIG_FPGA_DELAY();
+		CFG_FPGA_DELAY();
 		if (get_timer(ts) > CFG_SYS_FPGA_WAIT_INIT) {
 			printf("%s:%d: ** Timeout after %d ticks waiting for INIT to deassert.\n",
 			       __func__, __LINE__, CFG_SYS_FPGA_WAIT_INIT);
@@ -233,7 +233,7 @@ static int virtex2_slave_post(xilinx_virtex2_slave_fns *fn,
 	/*
 	 * Finished writing the data; deassert FPGA CS_B and WRITE_B signals.
 	 */
-	CONFIG_FPGA_DELAY();
+	CFG_FPGA_DELAY();
 	if (fn->cs)
 		(*fn->cs)(false, true, cookie);
 	if (fn->wr)
@@ -269,9 +269,9 @@ static int virtex2_slave_post(xilinx_virtex2_slave_fns *fn,
 			(*fn->wbulkdata)(&dummy, 1, true, cookie);
 		} else {
 			(*fn->wdata)(0xff, true, cookie);
-			CONFIG_FPGA_DELAY();
+			CFG_FPGA_DELAY();
 			(*fn->clk)(false, true, cookie);
-			CONFIG_FPGA_DELAY();
+			CFG_FPGA_DELAY();
 			(*fn->clk)(true, true, cookie);
 		}
 	}
@@ -335,13 +335,13 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		(*fn->wdata)(data[bytecount++], true, cookie);
-		CONFIG_FPGA_DELAY();
+		CFG_FPGA_DELAY();
 
 		/*
 		 * Cycle the clock pin
 		 */
 		(*fn->clk)(false, true, cookie);
-		CONFIG_FPGA_DELAY();
+		CFG_FPGA_DELAY();
 		(*fn->clk)(true, true, cookie);
 
 #ifdef CONFIG_SYS_FPGA_CHECK_BUSY
@@ -472,9 +472,9 @@ static int virtex2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 			for (bit = 7; bit >= 0; --bit) {
 				unsigned char curr_bit = (curr_data >> bit) & 1;
 				(*fn->wdata)(curr_bit, true, cookie);
-				CONFIG_FPGA_DELAY();
+				CFG_FPGA_DELAY();
 				(*fn->clk)(false, true, cookie);
-				CONFIG_FPGA_DELAY();
+				CFG_FPGA_DELAY();
 				(*fn->clk)(true, true, cookie);
 			}
 
-- 
2.25.1

[PATCH 033/149] global: Migrate CONFIG_FSL_PMIC_BITLEN to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_PMIC_BITLEN to CFG_FSL_PMIC_BITLEN

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c | 2 +-
 include/configs/mx51evk.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 9bb7e39f2cc2..eace4dd7e433 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -42,7 +42,7 @@ int pmic_init(unsigned char bus)
 	p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
 	p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
 	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
-	p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
+	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
 	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
 	p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
 #elif defined(CONFIG_POWER_I2C)
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 8ab1ee79a79c..d4cca8d516a6 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -25,7 +25,7 @@
 #define CONFIG_FSL_PMIC_CS	0
 #define CONFIG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
-#define CONFIG_FSL_PMIC_BITLEN	32
+#define CFG_FSL_PMIC_BITLEN	32
 
 /*
  * MMC Configs
-- 
2.25.1

[PATCH 034/149] global: Migrate CONFIG_FSL_PMIC_BUS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_PMIC_BUS to CFG_FSL_PMIC_BUS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mx51evk/mx51evk.c | 2 +-
 include/configs/mx51evk.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 86364acf8ca0..95edb3599443 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -86,7 +86,7 @@ static void power_init(void)
 	struct pmic *p;
 	int ret;
 
-	ret = pmic_init(CONFIG_FSL_PMIC_BUS);
+	ret = pmic_init(CFG_FSL_PMIC_BUS);
 	if (ret)
 		return;
 
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index d4cca8d516a6..1aaa76240deb 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -21,7 +21,7 @@
 #define CONFIG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
-#define CONFIG_FSL_PMIC_BUS	0
+#define CFG_FSL_PMIC_BUS	0
 #define CONFIG_FSL_PMIC_CS	0
 #define CONFIG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
-- 
2.25.1

[PATCH 035/149] global: Migrate CONFIG_FSL_PMIC_CLK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_PMIC_CLK to CFG_FSL_PMIC_CLK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c | 2 +-
 include/configs/mx51evk.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index eace4dd7e433..a576d1570b11 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -40,7 +40,7 @@ int pmic_init(unsigned char bus)
 #if defined(CONFIG_POWER_SPI)
 	p->interface = PMIC_SPI;
 	p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
-	p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
+	p->hw.spi.clk = CFG_FSL_PMIC_CLK;
 	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
 	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
 	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 1aaa76240deb..ee0782ebfebf 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -23,7 +23,7 @@
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
 #define CONFIG_FSL_PMIC_CS	0
-#define CONFIG_FSL_PMIC_CLK	2500000
+#define CFG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CFG_FSL_PMIC_BITLEN	32
 
-- 
2.25.1

[PATCH 036/149] global: Migrate CONFIG_FSL_PMIC_CS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_PMIC_CS to CFG_FSL_PMIC_CS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c | 2 +-
 include/configs/mx51evk.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index a576d1570b11..9ead212f380e 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -39,7 +39,7 @@ int pmic_init(unsigned char bus)
 
 #if defined(CONFIG_POWER_SPI)
 	p->interface = PMIC_SPI;
-	p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
+	p->hw.spi.cs = CFG_FSL_PMIC_CS;
 	p->hw.spi.clk = CFG_FSL_PMIC_CLK;
 	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
 	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index ee0782ebfebf..15bc4c706fdd 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -22,7 +22,7 @@
 
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
-#define CONFIG_FSL_PMIC_CS	0
+#define CFG_FSL_PMIC_CS	0
 #define CFG_FSL_PMIC_CLK	2500000
 #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CFG_FSL_PMIC_BITLEN	32
-- 
2.25.1

[PATCH 037/149] global: Migrate CONFIG_FSL_PMIC_MODE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_PMIC_MODE to CFG_FSL_PMIC_MODE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/power_fsl.c | 2 +-
 include/configs/mx51evk.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 9ead212f380e..9dc930fb305a 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -41,7 +41,7 @@ int pmic_init(unsigned char bus)
 	p->interface = PMIC_SPI;
 	p->hw.spi.cs = CFG_FSL_PMIC_CS;
 	p->hw.spi.clk = CFG_FSL_PMIC_CLK;
-	p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
+	p->hw.spi.mode = CFG_FSL_PMIC_MODE;
 	p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN;
 	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
 	p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 15bc4c706fdd..740e357e00e9 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -24,7 +24,7 @@
 #define CFG_FSL_PMIC_BUS	0
 #define CFG_FSL_PMIC_CS	0
 #define CFG_FSL_PMIC_CLK	2500000
-#define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
+#define CFG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)
 #define CFG_FSL_PMIC_BITLEN	32
 
 /*
-- 
2.25.1

[PATCH 038/149] global: Migrate CONFIG_FSL_SERDES1 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_SERDES1 to CFG_FSL_SERDES1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc837xerdb/mpc837xerdb.c | 4 ++--
 include/configs/MPC837XERDB.h             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 4a1455402650..9c08a2bfef02 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -146,7 +146,7 @@ int board_early_init_f(void)
 	/* we check only part num, and don't look for CPU revisions */
 	switch (PARTID_NO_E(spridr)) {
 	case SPR_8377:
-		fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
+		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
@@ -156,7 +156,7 @@ int board_early_init_f(void)
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	case SPR_8379:
-		fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
+		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index fad161597e61..9fc12dabb5c6 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -149,7 +149,7 @@
 #define CFG_SYS_NS16550_COM2	(CONFIG_SYS_IMMR+0x4600)
 
 /* SERDES */
-#define CONFIG_FSL_SERDES1	0xe3000
+#define CFG_FSL_SERDES1	0xe3000
 #define CONFIG_FSL_SERDES2	0xe3100
 
 /* I2C */
-- 
2.25.1

[PATCH 039/149] global: Migrate CONFIG_FSL_SERDES2 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FSL_SERDES2 to CFG_FSL_SERDES2

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++---
 include/configs/MPC837XERDB.h             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 9c08a2bfef02..8b1bfe0a9f91 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -148,17 +148,17 @@ int board_early_init_f(void)
 	case SPR_8377:
 		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
-		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
+		fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	case SPR_8378:
-		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
+		fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_PEX,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	case SPR_8379:
 		fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
-		fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA,
+		fsl_setup_serdes(CFG_FSL_SERDES2, FSL_SERDES_PROTO_SATA,
 				 FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);
 		break;
 	default:
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 9fc12dabb5c6..07c989d98906 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -150,7 +150,7 @@
 
 /* SERDES */
 #define CFG_FSL_SERDES1	0xe3000
-#define CONFIG_FSL_SERDES2	0xe3100
+#define CFG_FSL_SERDES2	0xe3100
 
 /* I2C */
 #define CFG_SYS_I2C_NOPROBES		{ {0, 0x51} }
-- 
2.25.1

[PATCH 040/149] global: Migrate CONFIG_FTRTC010_EXTCLK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FTRTC010_EXTCLK to CFG_FTRTC010_EXTCLK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/rtc/ftrtc010.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/ftrtc010.c b/drivers/rtc/ftrtc010.c
index 67c2b6e320a7..768c8cdd50b7 100644
--- a/drivers/rtc/ftrtc010.c
+++ b/drivers/rtc/ftrtc010.c
@@ -82,7 +82,7 @@ int rtc_get(struct rtc_time *tmp)
 
 #ifdef CONFIG_FTRTC010_PCLK
 	now = (ftrtc010_time() + readl(&rtc->record)) / RTC_DIV_COUNT;
-#else /* CONFIG_FTRTC010_EXTCLK */
+#else /* CFG_FTRTC010_EXTCLK */
 	now = ftrtc010_time() + readl(&rtc->record);
 #endif
 
-- 
2.25.1

[PATCH 041/149] global: Migrate CONFIG_FTRTC010_PCLK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_FTRTC010_PCLK to CFG_FTRTC010_PCLK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/rtc/ftrtc010.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/ftrtc010.c b/drivers/rtc/ftrtc010.c
index 768c8cdd50b7..e384922f4737 100644
--- a/drivers/rtc/ftrtc010.c
+++ b/drivers/rtc/ftrtc010.c
@@ -80,7 +80,7 @@ int rtc_get(struct rtc_time *tmp)
 	debug("%s(): record register: %x\n",
 	      __func__, readl(&rtc->record));
 
-#ifdef CONFIG_FTRTC010_PCLK
+#ifdef CFG_FTRTC010_PCLK
 	now = (ftrtc010_time() + readl(&rtc->record)) / RTC_DIV_COUNT;
 #else /* CFG_FTRTC010_EXTCLK */
 	now = ftrtc010_time() + readl(&rtc->record);
-- 
2.25.1

[PATCH 042/149] global: Migrate CONFIG_HW_ENV_SETTINGS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_HW_ENV_SETTINGS to CFG_HW_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index cbcace8099dd..b0a759aa7199 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -214,7 +214,7 @@
 		"protect on " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
-#define CONFIG_HW_ENV_SETTINGS						\
+#define CFG_HW_ENV_SETTINGS						\
 	"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi,"	\
 			"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6,"	\
 			"asrc,spdif,lpuart1,ftm1\0"
@@ -222,7 +222,7 @@
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
 	CONFIG_KM_DEF_ENV						\
-	CONFIG_HW_ENV_SETTINGS						\
+	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	"ethrotate=no\0"						\
 	""
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index fcc0d2df326e..18304575f403 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -421,7 +421,7 @@ int get_scl(void);
 	"fpgacfg=true\0"						\
 	""
 
-#define CONFIG_HW_ENV_SETTINGS						\
+#define CFG_HW_ENV_SETTINGS						\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline\0"			\
 	"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0"		\
 	"usb_dr_mode=host\0"
@@ -443,7 +443,7 @@ int get_scl(void);
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
-	CONFIG_HW_ENV_SETTINGS						\
+	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	""
 
-- 
2.25.1

[PATCH 043/149] global: Migrate CONFIG_I2C_MULTI_BUS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_I2C_MULTI_BUS to CFG_I2C_MULTI_BUS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                         | 2 +-
 include/configs/omap3_beagle.h | 2 +-
 include/configs/sniper.h       | 2 +-
 include/configs/tqma6.h        | 2 +-
 include/i2c.h                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 84086764d810..05618352fa93 100644
--- a/README
+++ b/README
@@ -955,7 +955,7 @@ The following options need to be configured:
 		You should define these to the GPIO value as given directly to
 		the generic GPIO functions.
 
-		CONFIG_I2C_MULTI_BUS
+		CFG_I2C_MULTI_BUS
 
 		This option allows the use of multiple I2C buses, each of which
 		must have a controller.	 At any point in time, only one bus is
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index efeb7bf10078..af7cb3513f8f 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -29,7 +29,7 @@
 #endif /* CONFIG_MTD_RAW_NAND */
 
 /* Enable Multi Bus support for I2C */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* DSS Support */
 
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index eaee8dd37396..45a3102aeeef 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -38,7 +38,7 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /*
  * Input
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 14d7730f67bf..cb5f7fc25af9 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -28,7 +28,7 @@
 #define TQMA6_SPI_FLASH_SECTOR_SIZE	SZ_64K
 
 /* I2C Configs */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 #if !defined(CONFIG_DM_PMIC)
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
diff --git a/include/i2c.h b/include/i2c.h
index 51390f8fd84f..3811b26c08e0 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -930,7 +930,7 @@ unsigned int i2c_get_bus_speed(void);
  * only for backwardcompatibility, should go away if we switched
  * completely to new multibus support.
  */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS)
 # if !defined(CFG_SYS_MAX_I2C_BUS)
 #  define CFG_SYS_MAX_I2C_BUS		2
 # endif
-- 
2.25.1

[PATCH 044/149] global: Migrate CONFIG_I2C_MVTWSI_BASE0 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_I2C_MVTWSI_BASE0 to CFG_I2C_MVTWSI_BASE0

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-sunxi/i2c.h        | 2 +-
 arch/arm/mach-kirkwood/include/mach/config.h | 2 +-
 drivers/i2c/mvtwsi.c                         | 6 +++---
 include/configs/db-88f6720.h                 | 2 +-
 include/configs/db-88f6820-gp.h              | 2 +-
 include/configs/db-mv784mp-gp.h              | 2 +-
 include/configs/ds414.h                      | 2 +-
 include/configs/maxbcm.h                     | 2 +-
 include/configs/theadorable.h                | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h
index 241b44928a95..2c2d6b7d31d0 100644
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -8,7 +8,7 @@
 #include <asm/arch/cpu.h>
 
 #ifdef CONFIG_I2C0_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
+#define CFG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
 #endif
 #ifdef CONFIG_I2C1_ENABLE
 #define CONFIG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index a6de7676294b..fbef9c99b1d3 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -24,7 +24,7 @@
 
 #include <asm/arch/soc.h>
 
-#define CONFIG_I2C_MVTWSI_BASE0	KW_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0	KW_TWSI_BASE
 #define MV_UART_CONSOLE_BASE	KW_UART0_BASE
 #define MV_SATA_BASE		KW_SATA_BASE
 #define MV_SATA_PORT0_OFFSET	KW_SATA_PORT0_OFFSET
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index a9c7d6e1bc26..076525d6c4d5 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -197,9 +197,9 @@ inline uint calc_tick(uint speed)
 static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
 {
 	switch (adap->hwadapnr) {
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 	case 0:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
 #endif
 #ifdef CONFIG_I2C_MVTWSI_BASE1
 	case 1:
@@ -737,7 +737,7 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
 				10000);
 }
 
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index ef9c457e1020..54de2d0d8334 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -17,7 +17,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* USB/EHCI configuration */
 
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 6dbf582d733b..2cbe4eb440b4 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -11,7 +11,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* Environment in SPI NOR flash */
 
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index bf8b35102ad7..5c6d7fa1b776 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -13,7 +13,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* USB/EHCI configuration */
 
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index e69883ba73bc..9446acba7923 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -17,7 +17,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 5ad945b55896..413597e09b26 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -19,7 +19,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 
 /* SPI NOR flash default params, used by sf commands */
 
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 9722b0db72aa..412698d3fe92 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -25,7 +25,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
 #define CONFIG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
 
 /* USB/EHCI configuration */
-- 
2.25.1

[PATCH 045/149] global: Migrate CONFIG_I2C_MVTWSI_BASE1 to CFG

[Tom Rini]

Perform a simple rename of CONFIG_I2C_MVTWSI_BASE1 to CFG_I2C_MVTWSI_BASE1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-sunxi/i2c.h | 2 +-
 drivers/i2c/mvtwsi.c                  | 6 +++---
 include/configs/theadorable.h         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h
index 2c2d6b7d31d0..e3dcfdf37082 100644
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -11,7 +11,7 @@
 #define CFG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
 #endif
 #ifdef CONFIG_I2C1_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
+#define CFG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
 #endif
 #ifdef CONFIG_R_I2C_ENABLE
 #define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 076525d6c4d5..2822749971af 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -201,9 +201,9 @@ static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
 	case 0:
 		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 	case 1:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1;
 #endif
 #ifdef CONFIG_I2C_MVTWSI_BASE2
 	case 2:
@@ -743,7 +743,7 @@ U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0)
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 412698d3fe92..2ce92845f1c0 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -26,7 +26,7 @@
 
 /* I2C */
 #define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
+#define CFG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
 
 /* USB/EHCI configuration */
 
-- 
2.25.1

[PATCH 046/149] global: Migrate CONFIG_ICS307_REFCLK_HZ to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ICS307_REFCLK_HZ to CFG_ICS307_REFCLK_HZ

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/ics307_clk.c | 4 ++--
 include/configs/T208xQDS.h          | 2 +-
 include/configs/T208xRDB.h          | 2 +-
 include/configs/T4240RDB.h          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c
index 01662d36e9fb..5f95571d24cc 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/freescale/common/ics307_clk.c
@@ -50,7 +50,7 @@ static u8 ics307_s_to_od[] = {
  */
 unsigned long ics307_sysclk_calculator(unsigned long out_freq)
 {
-	const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ;
+	const unsigned long input_freq = CFG_ICS307_REFCLK_HZ;
 	unsigned long vdw, rdw, odp, s_vdw = 0, s_rdw = 0, s_odp = 0, od;
 	unsigned long tmp_out, diff, result = 0;
 	int found = 0;
@@ -101,7 +101,7 @@ unsigned long ics307_sysclk_calculator(unsigned long out_freq)
  */
 static unsigned long ics307_clk_freq(u8 cw0, u8 cw1, u8 cw2)
 {
-	const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ;
+	const unsigned long input_freq = CFG_ICS307_REFCLK_HZ;
 	unsigned long vdw = ((cw1 << 1) & 0x1FE) + ((cw2 >> 7) & 1);
 	unsigned long rdw = cw2 & 0x7F;
 	unsigned long od = ics307_s_to_od[cw0 & 0x7];
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 7f332cf2e3be..3b98d25aa47a 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -13,7 +13,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
+#define CFG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 
 /* High Level Configuration Options */
 
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index d6dd9c07b73f..60c2947bfc1d 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -13,7 +13,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
+#define CFG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 
 /* High Level Configuration Options */
 
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 22cbf92efb80..01a9f43cbaeb 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -12,7 +12,7 @@
 
 #include <linux/stringify.h>
 
-#define CONFIG_ICS307_REFCLK_HZ		25000000  /* ICS307 ref clk freq */
+#define CFG_ICS307_REFCLK_HZ		25000000  /* ICS307 ref clk freq */
 
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
-- 
2.25.1

[PATCH 047/149] global: Migrate CONFIG_IMX6_PWM_PER_CLK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_IMX6_PWM_PER_CLK to CFG_IMX6_PWM_PER_CLK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pwm/pwm-imx.c         | 2 +-
 include/configs/vining_2000.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 9b8a8c189d09..8fbb40cc2767 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -76,7 +76,7 @@ int pwm_imx_get_parms(int period_ns, int duty_ns, unsigned long *period_c,
 	 * value here as a define. Replace it when we have the clock
 	 * framework.
 	 */
-	c = CONFIG_IMX6_PWM_PER_CLK;
+	c = CFG_IMX6_PWM_PER_CLK;
 	c = c * period_ns;
 	do_div(c, 1000000000);
 	*period_c = c;
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index c84353ebea66..cdd2eeef0ac9 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -43,7 +43,7 @@
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
 #endif
 
-#define CONFIG_IMX6_PWM_PER_CLK 66000000
+#define CFG_IMX6_PWM_PER_CLK 66000000
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */
-- 
2.25.1

[PATCH 048/149] global: Migrate CONFIG_IRAM_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_IRAM_BASE to CFG_IRAM_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/arch-rockchip/bootrom.h | 2 +-
 include/configs/px30_common.h                | 2 +-
 include/configs/rk3066_common.h              | 2 +-
 include/configs/rk3128_common.h              | 2 +-
 include/configs/rk3188_common.h              | 2 +-
 include/configs/rk322x_common.h              | 2 +-
 include/configs/rk3288_common.h              | 2 +-
 include/configs/rk3308_common.h              | 2 +-
 include/configs/rk3328_common.h              | 2 +-
 include/configs/rk3368_common.h              | 2 +-
 include/configs/rk3399_common.h              | 2 +-
 include/configs/rk3568_common.h              | 2 +-
 include/configs/rv1108_common.h              | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h
index 0da78f30b619..4276a0f6811a 100644
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@@ -57,6 +57,6 @@ extern const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1];
 /**
  * Locations of the boot-device identifier in SRAM
  */
-#define BROM_BOOTSOURCE_ID_ADDR   (CONFIG_IRAM_BASE + 0x10)
+#define BROM_BOOTSOURCE_ID_ADDR   (CFG_IRAM_BASE + 0x10)
 
 #endif
diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index 003686930a4b..3f1595cdc95f 100644
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -9,7 +9,7 @@
 #include "rockchip-common.h"
 
 /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */
-#define CONFIG_IRAM_BASE		0xff020000
+#define CFG_IRAM_BASE		0xff020000
 
 #define GICD_BASE			0xff131000
 #define GICC_BASE			0xff132000
diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
index c4758e148ba7..1a6d3678df3e 100644
--- a/include/configs/rk3066_common.h
+++ b/include/configs/rk3066_common.h
@@ -9,7 +9,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 #define CFG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(1024UL << 20UL)
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 5b0ec3700040..8aa17bfbd364 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_HZ_CLOCK		24000000
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 /* RAW SD card / eMMC locations. */
 
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 58f491c2f320..ac9195672fb7 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -9,7 +9,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE	0x10080000
+#define CFG_IRAM_BASE	0x10080000
 
 /* spl size 32kb sram - 2kb bootrom */
 
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index b95268df87c2..fcaf9c52c4be 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_HZ_CLOCK		24000000
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 #define CFG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_BANK_SIZE			(512UL << 20UL)
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index d3b8a5150f6b..5f29432be10b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -11,7 +11,7 @@
 
 #define CFG_SYS_HZ_CLOCK		24000000
 
-#define CONFIG_IRAM_BASE		0xff700000
+#define CFG_IRAM_BASE		0xff700000
 
 /* RAW SD card / eMMC locations. */
 
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index bc03e113fef0..55a0dfecb21b 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xfff80000
+#define CFG_IRAM_BASE		0xfff80000
 
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 85d2186f23e0..fadcb93a5f7e 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xff090000
+#define CFG_IRAM_BASE		0xff090000
 
 /* FAT sd card locations. */
 #define CFG_SYS_SDRAM_BASE		0
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 17636250510b..9aa256b59592 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
 
-#define CONFIG_IRAM_BASE		0xff8c0000
+#define CFG_IRAM_BASE		0xff8c0000
 
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x00500000\0" \
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 9722214ac345..4b419b8fe431 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xff8c0000
+#define CFG_IRAM_BASE		0xff8c0000
 
 /* FAT sd card locations. */
 #define CFG_SYS_SDRAM_BASE		0
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index 750f16d03999..ae360105d508 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xfdcc0000
+#define CFG_IRAM_BASE		0xfdcc0000
 
 #define CFG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xf0000000
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 6e17b23b624c..63551b47e200 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -8,7 +8,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0x10080000
+#define CFG_IRAM_BASE		0x10080000
 
 #define CFG_SYS_TIMER_RATE		(24 * 1000 * 1000)
 /* TIMER1,initialized by ddr initialize code */
-- 
2.25.1

[PATCH 049/149] global: Migrate CONFIG_IRAM_TOP to CFG

[Tom Rini]

Perform a simple rename of CONFIG_IRAM_TOP to CFG_IRAM_TOP

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 arch/arm/mach-exynos/sec_boot.S      | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 1ff5fcac1b38..9225d2cc1f2a 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -51,7 +51,7 @@ enum {
 #ifdef CONFIG_EXYNOS5420
 
 /* Address for relocating helper code (Last 4 KB of IRAM) */
-#define EXYNOS_RELOCATE_CODE_BASE	(CONFIG_IRAM_TOP - 0x1000)
+#define EXYNOS_RELOCATE_CODE_BASE	(CFG_IRAM_TOP - 0x1000)
 
 /*
  * Power up secondary CPUs.
diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S
index 40c07209e475..1303544d83b6 100644
--- a/arch/arm/mach-exynos/sec_boot.S
+++ b/arch/arm/mach-exynos/sec_boot.S
@@ -21,7 +21,7 @@ relocate_wait_code:
 	.ltorg
 /*
  * Secondary core waits here until Primary wake it up.
- * Below code is copied to (CONFIG_IRAM_TOP - 0x1000)
+ * Below code is copied to (CFG_IRAM_TOP - 0x1000)
  * This is a workaround code which is supposed to act as a
  * substitute/supplement to the iROM code.
  *
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 934a4ef9d1f1..99ab1a174f7c 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_EXYNOS5420_H
 #define __CONFIG_EXYNOS5420_H
 
-#define CONFIG_IRAM_TOP			0x02074000
+#define CFG_IRAM_TOP			0x02074000
 
 #define CONFIG_PHY_IRAM_BASE		0x02020000
 
-- 
2.25.1

[PATCH 050/149] global: Migrate CONFIG_KM_DEF_ARCH to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_DEF_ARCH to CFG_KM_DEF_ARCH

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/km-mpc83xx.h | 6 +++---
 include/configs/kmcent2.h       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 9edc5fb2e413..8f2a5a200562 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -78,13 +78,13 @@
 #define CONFIG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
-#ifndef CONFIG_KM_DEF_ARCH
-#define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
+#ifndef CFG_KM_DEF_ARCH
+#define CFG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	CONFIG_KM_DEF_ENV						 \
-	CONFIG_KM_DEF_ARCH						 \
+	CFG_KM_DEF_ARCH						 \
 	"newenv="							 \
 		"prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \
 		"era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0"	 \
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 18304575f403..c10a3366b0c9 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -435,13 +435,13 @@ int get_scl(void);
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) "\0"
 
 /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */
-#ifndef CONFIG_KM_DEF_ARCH
-#define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
+#ifndef CFG_KM_DEF_ARCH
+#define CFG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_DEF_ENV						\
-	CONFIG_KM_DEF_ARCH						\
+	CFG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
-- 
2.25.1

[PATCH 051/149] global: Migrate CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG_KM_DEF_BOOT_ARGS_CPU

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h  | 2 +-
 include/configs/km/km-powerpc.h      | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index cc5ec219b8db..94408e6efd9a 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -98,7 +98,7 @@
 		CONFIG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
 		" " CONFIG_KM_UBI_LINUX_MTD " "				\
-		CONFIG_KM_DEF_BOOT_ARGS_CPU				\
+		CFG_KM_DEF_BOOT_ARGS_CPU				\
 		"\0"							\
 	"addpanic="							\
 		"setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0"	\
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 424caa0df977..41ce6b5ee852 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -28,7 +28,7 @@
 #define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
 /* architecture specific default bootargs */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
 	"u-boot="CONFIG_HOSTNAME "/u-boot.bin\0"		\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index b0a759aa7199..00e4a1f2cb84 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -176,8 +176,8 @@
 #define CONFIG_KM_DEF_ENV
 #endif
 
-#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#ifndef CFG_KM_DEF_BOOT_ARGS_CPU
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 #endif
 
 #define CONFIG_KM_DEF_ENV_CPU						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index c10a3366b0c9..b384fc6a6f46 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -15,7 +15,7 @@
  * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot
  * parameters
  */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
+#define CFG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
 
 #include "km/keymile-common.h"
 
-- 
2.25.1

[PATCH 052/149] global: Migrate CONFIG_KM_DEF_ENV et al to CFG

[Tom Rini]

Perform simple renames of:
   CONFIG_KM_DEF_ENV to CFG_KM_DEF_ENV
   CONFIG_KM_DEF_ENV_BOOTARGS to CFG_KM_DEF_ENV_BOOTARGS
   CONFIG_KM_DEF_ENV_BOOTPARAMS to CFG_KM_DEF_ENV_BOOTPARAMS
   CONFIG_KM_DEF_ENV_BOOTTARGETS to CFG_KM_DEF_ENV_BOOTTARGETS
   CONFIG_KM_DEF_ENV_CONSTANTS to CFG_KM_DEF_ENV_CONSTANTS
   CONFIG_KM_DEF_ENV_CPU to CFG_KM_DEF_ENV_CPU
   CONFIG_KM_DEF_ENV_FLASH_BOOT to CFG_KM_DEF_ENV_FLASH_BOOT
   CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG_KM_DEV_ENV_FLASH_BOOT_UBI

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h    | 36 +++++++++++++-------------
 include/configs/km/km-mpc83xx.h        |  6 ++---
 include/configs/km/km-powerpc.h        |  2 +-
 include/configs/km/pg-wcom-ls102xa.h   |  8 +++---
 include/configs/kmcent2.h              |  8 +++---
 include/configs/socfpga_arria5_secu1.h |  4 +--
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 94408e6efd9a..5e3baca75b23 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -15,8 +15,8 @@
 
 #define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
-#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
-#define CONFIG_KM_DEF_ENV_BOOTPARAMS \
+#ifndef CFG_KM_DEF_ENV_BOOTPARAMS
+#define CFG_KM_DEF_ENV_BOOTPARAMS \
 	"actual_bank=0\0"
 #endif
 
@@ -34,7 +34,7 @@
 # define CONFIG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
@@ -44,7 +44,7 @@
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
@@ -65,7 +65,7 @@
  * available targets:
  * - 'release': for a standalone system		kernel/rootfs from flash
  */
-#define CONFIG_KM_DEF_ENV_BOOTTARGETS					\
+#define CFG_KM_DEF_ENV_BOOTTARGETS					\
 	"subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt "		\
 		"set_fdthigh cramfsloadkernel flashargs add_default "	\
 		"addpanic boot\0"					\
@@ -88,7 +88,7 @@
  * - 'flashargs': defaults arguments for flash base boot
  *
  */
-#define CONFIG_KM_DEF_ENV_BOOTARGS					\
+#define CFG_KM_DEF_ENV_BOOTARGS					\
 	"add_default="							\
 		"setenv bootargs ${bootargs} "				\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
@@ -120,12 +120,12 @@
  * processor specific settings
  * - 'cramfsloadfdt': copy fdt from a cramfs to ram
  */
-#define CONFIG_KM_DEF_ENV_FLASH_BOOT					\
+#define CFG_KM_DEF_ENV_FLASH_BOOT					\
 	"cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0"		\
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
 	"uimage=" CONFIG_KM_UIMAGE_NAME					\
-	CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+	CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*
  * constants
@@ -133,7 +133,7 @@
  *
  * - 'default': setup default environment
  */
-#define CONFIG_KM_DEF_ENV_CONSTANTS					\
+#define CFG_KM_DEF_ENV_CONSTANTS					\
 	"backup_bank=0\0"						\
 	"release=run newenv; reset\0"					\
 	"pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0"		\
@@ -142,15 +142,15 @@
 	"env_version=1\0"						\
 	""
 
-#ifndef CONFIG_KM_DEF_ENV
-#define CONFIG_KM_DEF_ENV	\
-	CONFIG_KM_DEF_ENV_BOOTPARAMS					\
+#ifndef CFG_KM_DEF_ENV
+#define CFG_KM_DEF_ENV	\
+	CFG_KM_DEF_ENV_BOOTPARAMS					\
 	"netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0"		\
-	CONFIG_KM_DEF_ENV_CPU						\
-	CONFIG_KM_DEF_ENV_BOOTTARGETS					\
-	CONFIG_KM_DEF_ENV_BOOTARGS					\
-	CONFIG_KM_DEF_ENV_FLASH_BOOT					\
-	CONFIG_KM_DEF_ENV_CONSTANTS					\
+	CFG_KM_DEF_ENV_CPU						\
+	CFG_KM_DEF_ENV_BOOTTARGETS					\
+	CFG_KM_DEF_ENV_BOOTARGS					\
+	CFG_KM_DEF_ENV_FLASH_BOOT					\
+	CFG_KM_DEF_ENV_CONSTANTS					\
 	"altbootcmd=run bootcmd\0"					\
 	"boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"			\
 	"bootcmd=km_checkbidhwk &&  "					\
@@ -169,6 +169,6 @@
 	"load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0"		\
 	"load=tftpboot ${load_addr_r} ${u-boot}\0"			\
 	""
-#endif /* CONFIG_KM_DEF_ENV */
+#endif /* CFG_KM_DEF_ENV */
 
 #endif /* __CONFIG_KEYMILE_H */
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 8f2a5a200562..a5c9cf4f7666 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -74,8 +74,8 @@
 /*
  * Environment Configuration
  */
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV "km-common=empty\0"
+#ifndef CFG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#define CFG_KM_DEF_ENV "km-common=empty\0"
 #endif
 
 #ifndef CFG_KM_DEF_ARCH
@@ -83,7 +83,7 @@
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS \
-	CONFIG_KM_DEF_ENV						 \
+	CFG_KM_DEF_ENV						 \
 	CFG_KM_DEF_ARCH						 \
 	"newenv="							 \
 		"prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 41ce6b5ee852..260a05f59e7f 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -30,7 +30,7 @@
 /* architecture specific default bootargs */
 #define CFG_KM_DEF_BOOT_ARGS_CPU		""
 
-#define CONFIG_KM_DEF_ENV_CPU						\
+#define CFG_KM_DEF_ENV_CPU						\
 	"u-boot="CONFIG_HOSTNAME "/u-boot.bin\0"		\
 	"update="							\
 		"protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 00e4a1f2cb84..cc395682963a 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -172,15 +172,15 @@
 #define CFG_ENV_TOTAL_SIZE		0x40000
 #define ENV_DEL_ADDR		CONFIG_ENV_ADDR_REDUND  /* direct for newenv */
 
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV
+#ifndef CFG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#define CFG_KM_DEF_ENV
 #endif
 
 #ifndef CFG_KM_DEF_BOOT_ARGS_CPU
 #define CFG_KM_DEF_BOOT_ARGS_CPU		""
 #endif
 
-#define CONFIG_KM_DEF_ENV_CPU						\
+#define CFG_KM_DEF_ENV_CPU						\
 	"boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"			\
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
@@ -221,7 +221,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
-	CONFIG_KM_DEF_ENV						\
+	CFG_KM_DEF_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	"ethrotate=no\0"						\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index b384fc6a6f46..61b005a3c70c 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -388,13 +388,13 @@ int get_scl(void);
 /*
  * Environment Configuration
  */
-#ifndef CONFIG_KM_DEF_ENV		/* if not set by keymile-common.h */
-#define CONFIG_KM_DEF_ENV
+#ifndef CFG_KM_DEF_ENV		/* if not set by keymile-common.h */
+#define CFG_KM_DEF_ENV
 #endif
 
 #define __USB_PHY_TYPE	utmi
 
-#define CONFIG_KM_DEF_ENV_CPU						\
+#define CFG_KM_DEF_ENV_CPU						\
 	"boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"			\
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
@@ -440,7 +440,7 @@ int get_scl(void);
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS					\
-	CONFIG_KM_DEF_ENV						\
+	CFG_KM_DEF_ENV						\
 	CFG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index f12163ccc990..71aa5a7ca949 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -46,7 +46,7 @@
 	"newenv=" \
 		"nand erase 0x100000 0x40000\0"
 
-#define CONFIG_KM_DEF_ENV_BOOTTARGETS \
+#define CFG_KM_DEF_ENV_BOOTTARGETS \
 	"release=" \
 		"run newenv; reset\0" \
 	"develop=" \
@@ -54,7 +54,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
-	CONFIG_KM_DEF_ENV_BOOTTARGETS \
+	CFG_KM_DEF_ENV_BOOTTARGETS \
 	CONFIG_KM_NEW_ENV \
 	"socfpga_legacy_reset_compat=1\0"	\
 	"altbootcmd=run bootcmd;\0"	\
-- 
2.25.1

[PATCH 053/149] global: Migrate CONFIG_KM_ECC_MODE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_ECC_MODE to CFG_KM_ECC_MODE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 5e3baca75b23..1ae134c2ae3e 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -52,10 +52,10 @@
 
 #ifdef CONFIG_NAND_ECC_BCH
 #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
-#define CONFIG_KM_ECC_MODE    " eccmode=bch"
+#define CFG_KM_ECC_MODE    " eccmode=bch"
 #else
 #define CONFIG_KM_UIMAGE_NAME "uImage\0"
-#define CONFIG_KM_ECC_MODE
+#define CFG_KM_ECC_MODE
 #endif
 
 /*
@@ -95,7 +95,7 @@
 		":${hostname}:${netdev}:off:"				\
 		" console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}"	\
 		" mem=${kernelmem} init=${init}"			\
-		CONFIG_KM_ECC_MODE					\
+		CFG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
 		" " CONFIG_KM_UBI_LINUX_MTD " "				\
 		CFG_KM_DEF_BOOT_ARGS_CPU				\
-- 
2.25.1

[PATCH 054/149] global: Migrate CONFIG_KM_NEW_ENV to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_NEW_ENV to CFG_KM_NEW_ENV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/pg-wcom-ls102xa.h   | 4 ++--
 include/configs/kmcent2.h              | 4 ++--
 include/configs/socfpga_arria5_secu1.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index cc395682963a..4adecacd5ece 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -206,7 +206,7 @@
 	"checkfdt=true\0"						\
 	""
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -220,7 +220,7 @@
 			"asrc,spdif,lpuart1,ftm1\0"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_KM_DEF_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 61b005a3c70c..8d98928a6eeb 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -426,7 +426,7 @@ int get_scl(void);
 	"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0"		\
 	"usb_dr_mode=host\0"
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -442,7 +442,7 @@ int get_scl(void);
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CFG_KM_DEF_ENV						\
 	CFG_KM_DEF_ARCH						\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	""
diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 71aa5a7ca949..6fb7a895995b 100644
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -42,7 +42,7 @@
 	"_fpga_loadsafe=echo Loading FPGA SAFE image..." \
 		" && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \
 
-#define CONFIG_KM_NEW_ENV \
+#define CFG_KM_NEW_ENV \
 	"newenv=" \
 		"nand erase 0x100000 0x40000\0"
 
@@ -55,7 +55,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	FPGA_RMTU_ENV \
 	CFG_KM_DEF_ENV_BOOTTARGETS \
-	CONFIG_KM_NEW_ENV \
+	CFG_KM_NEW_ENV \
 	"socfpga_legacy_reset_compat=1\0"	\
 	"altbootcmd=run bootcmd;\0"	\
 	"bootlimit=6\0"	\
-- 
2.25.1

[PATCH 055/149] global: Migrate CONFIG_KM_UBI_LINUX_MTD to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_UBI_LINUX_MTD to CFG_KM_UBI_LINUX_MTD

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 1ae134c2ae3e..7e347e5b8f4f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -31,7 +31,7 @@
 #ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-# define CONFIG_KM_UBI_LINUX_MTD					\
+# define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
@@ -40,7 +40,7 @@
 /* two flash chips called boot and app */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
 /* app:  CONFIG_KM_UBI_PARTITION_NAME_APP */
-# define CONFIG_KM_UBI_LINUX_MTD					\
+# define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
@@ -97,7 +97,7 @@
 		" mem=${kernelmem} init=${init}"			\
 		CFG_KM_ECC_MODE					\
 		" phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\
-		" " CONFIG_KM_UBI_LINUX_MTD " "				\
+		" " CFG_KM_UBI_LINUX_MTD " "				\
 		CFG_KM_DEF_BOOT_ARGS_CPU				\
 		"\0"							\
 	"addpanic="							\
-- 
2.25.1

[PATCH 056/149] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_UBI_PARTITION_NAME_APP to CFG_KM_UBI_PARTITION_NAME_APP

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 12 ++++++------
 include/configs/kmcoge5ne.h         |  2 +-
 include/configs/pg-wcom-expu1.h     |  2 +-
 include/configs/pg-wcom-seli8.h     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 7e347e5b8f4f..2e73d9d6d28f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -28,7 +28,7 @@
 #define CONFIG_KM_UBI_PART_BOOT_OPTS		""
 #endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */
 
-#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
+#ifndef CFG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
 # define CFG_KM_UBI_LINUX_MTD					\
@@ -36,19 +36,19 @@
 	CONFIG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
-#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
+#else /* CFG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
 /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
-/* app:  CONFIG_KM_UBI_PARTITION_NAME_APP */
+/* app:  CFG_KM_UBI_PARTITION_NAME_APP */
 # define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
-	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
+	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
-	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */
+	"ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0"
+#endif /* CFG_KM_UBI_PARTITION_NAME_APP */
 
 #ifdef CONFIG_NAND_ECC_BCH
 #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index e4f28935370e..ebb3e6a04468 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 66c371336b27..36b5949c430d 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -9,7 +9,7 @@
 #define WCOM_EXPU1
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* CLIPS FPGA Definitions */
 #define CFG_SYS_CSPR3_EXT	(0x00)
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index 69829a5c9bd1..f50db92aa74c 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -7,7 +7,7 @@
 #define __CONFIG_PG_WCOM_SELI8_H
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* PAXK FPGA Definitions */
 #define CFG_SYS_CSPR3_EXT	(0x00)
-- 
2.25.1

[PATCH 057/149] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG_KM_UBI_PARTITION_NAME_BOOT

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 18 +++++++++---------
 include/configs/kmcoge5ne.h         |  2 +-
 include/configs/pg-wcom-expu1.h     |  2 +-
 include/configs/pg-wcom-seli8.h     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 2e73d9d6d28f..720711ac8dde 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -20,9 +20,9 @@
 	"actual_bank=0\0"
 #endif
 
-#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
+#ifndef CFG_KM_UBI_PARTITION_NAME_BOOT
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */
 
 #ifndef CONFIG_KM_UBI_PART_BOOT_OPTS
 #define CONFIG_KM_UBI_PART_BOOT_OPTS		""
@@ -30,23 +30,23 @@
 
 #ifndef CFG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
-/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
+/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */
 # define CFG_KM_UBI_LINUX_MTD					\
-	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
+	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
-	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
+	"ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CFG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
-/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
+/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */
 /* app:  CFG_KM_UBI_PARTITION_NAME_APP */
 # define CFG_KM_UBI_LINUX_MTD					\
-	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
+	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
-	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
+	"ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
 	"ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0"
 #endif /* CFG_KM_UBI_PARTITION_NAME_APP */
 
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index ebb3e6a04468..b6386bdbcb7e 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -11,7 +11,7 @@
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* include common defines/options for all Keymile boards */
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 36b5949c430d..88efa3e53b84 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -8,7 +8,7 @@
 
 #define WCOM_EXPU1
 
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* CLIPS FPGA Definitions */
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index f50db92aa74c..f9c55ca32f6a 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_PG_WCOM_SELI8_H
 #define __CONFIG_PG_WCOM_SELI8_H
 
-#define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
+#define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* PAXK FPGA Definitions */
-- 
2.25.1

[PATCH 058/149] global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_UBI_PART_BOOT_OPTS to CFG_KM_UBI_PART_BOOT_OPTS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 720711ac8dde..b33bf3615e4f 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -24,16 +24,16 @@
 #define CFG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */
 
-#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS
-#define CONFIG_KM_UBI_PART_BOOT_OPTS		""
-#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */
+#ifndef CFG_KM_UBI_PART_BOOT_OPTS
+#define CFG_KM_UBI_PART_BOOT_OPTS		""
+#endif /* CFG_KM_UBI_PART_BOOT_OPTS */
 
 #ifndef CFG_KM_UBI_PARTITION_NAME_APP
 /* one flash chip only called boot */
 /* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */
 # define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
-	CONFIG_KM_UBI_PART_BOOT_OPTS
+	CFG_KM_UBI_PART_BOOT_OPTS
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CFG_KM_UBI_PARTITION_NAME_APP */
@@ -42,7 +42,7 @@
 /* app:  CFG_KM_UBI_PARTITION_NAME_APP */
 # define CFG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT			\
-	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
+	CFG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP
 # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
-- 
2.25.1

[PATCH 059/149] global: Migrate CONFIG_KM_UIMAGE_NAME to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KM_UIMAGE_NAME to CFG_KM_UIMAGE_NAME

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/keymile-common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index b33bf3615e4f..ffcd44d5ef97 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -51,10 +51,10 @@
 #endif /* CFG_KM_UBI_PARTITION_NAME_APP */
 
 #ifdef CONFIG_NAND_ECC_BCH
-#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
+#define CFG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
 #define CFG_KM_ECC_MODE    " eccmode=bch"
 #else
-#define CONFIG_KM_UIMAGE_NAME "uImage\0"
+#define CFG_KM_UIMAGE_NAME "uImage\0"
 #define CFG_KM_ECC_MODE
 #endif
 
@@ -124,7 +124,7 @@
 	"cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0"		\
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
-	"uimage=" CONFIG_KM_UIMAGE_NAME					\
+	"uimage=" CFG_KM_UIMAGE_NAME					\
 	CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*
-- 
2.25.1

[PATCH 060/149] global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KSNET_CPSW_NUM_PORTS to CFG_KSNET_CPSW_NUM_PORTS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 2 +-
 include/configs/k2e_evm.h                     | 2 +-
 include/configs/k2g_evm.h                     | 2 +-
 include/configs/k2hk_evm.h                    | 2 +-
 include/configs/k2l_evm.h                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 0852ce80a641..21cac6ea312a 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -117,7 +117,7 @@ struct mac_sl_cfg {
 #define CPSW_CTL_VLAN_AWARE			BIT(1)
 #define CPSW_CTL_FIFO_LOOPBACK			BIT(0)
 
-#define DEVICE_CPSW_NUM_PORTS			CONFIG_KSNET_CPSW_NUM_PORTS
+#define DEVICE_CPSW_NUM_PORTS			CFG_KSNET_CPSW_NUM_PORTS
 #define DEVICE_N_GMACSL_PORTS			(DEVICE_CPSW_NUM_PORTS - 1)
 
 #ifdef CONFIG_KSNET_NETCP_V1_0
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 1283f450b32c..929c9a26de15 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -37,6 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_CPSW_NUM_PORTS	9
+#define CFG_KSNET_CPSW_NUM_PORTS	9
 
 #endif /* __CONFIG_K2E_EVM_H */
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index fd3708ba81a7..d0634a99f492 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -51,7 +51,7 @@
 	"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
 /* Network */
-#define CONFIG_KSNET_CPSW_NUM_PORTS	2
+#define CFG_KSNET_CPSW_NUM_PORTS	2
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
 #define SPI_MTD_PARTS	KEYSTONE_SPI1_MTD_PARTS
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 36e3c59d1c58..05b4a3c204d6 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -37,6 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_CPSW_NUM_PORTS	5
+#define CFG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2HK_EVM_H */
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index cb7b0367810c..b1b839b5043c 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -37,6 +37,6 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_CPSW_NUM_PORTS	5
+#define CFG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2L_EVM_H */
-- 
2.25.1

[PATCH 061/149] global: Migrate CONFIG_KSNET_MAC_ID_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KSNET_MAC_ID_BASE to CFG_KSNET_MAC_ID_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 2 +-
 include/configs/ti_armv7_keystone2.h          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index 21cac6ea312a..f191c909f41f 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -49,7 +49,7 @@
 
 #define KEYSTONE2_EMAC_GIG_ENABLE
 
-#define MAC_ID_BASE_ADDR		CONFIG_KSNET_MAC_ID_BASE
+#define MAC_ID_BASE_ADDR		CFG_KSNET_MAC_ID_BASE
 
 /* MDIO module input frequency */
 #ifdef CONFIG_SOC_K2G
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 479ab46e4edd..e46d635ca032 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -47,7 +47,7 @@
 #define CFG_SYS_SPI_CLK		ks_clk_get_rate(KS2_CLK1_6)
 
 /* Keystone net */
-#define CONFIG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
+#define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CONFIG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
-- 
2.25.1

[PATCH 062/149] global: Migrate CONFIG_KSNET_NETCP_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KSNET_NETCP_BASE to CFG_KSNET_NETCP_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 include/configs/ti_armv7_keystone2.h          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h
index f191c909f41f..bedbcdc8bac6 100644
--- a/arch/arm/include/asm/ti-common/keystone_net.h
+++ b/arch/arm/include/asm/ti-common/keystone_net.h
@@ -18,7 +18,7 @@
 /* EMAC */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define GBETH_BASE			(CONFIG_KSNET_NETCP_BASE + 0x00090000)
+#define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x900)
 #define EMAC_MDIO_BASE_ADDR		(GBETH_BASE + 0x300)
 #define EMAC_SGMII_BASE_ADDR		(GBETH_BASE + 0x100)
@@ -32,7 +32,7 @@
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define GBETH_BASE			(CONFIG_KSNET_NETCP_BASE + 0x00200000)
+#define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00200000)
 #define CPGMACSL_REG_RX_PRI_MAP		0x020
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x22000)
 #define EMAC_MDIO_BASE_ADDR		(GBETH_BASE + 0x00f00)
@@ -190,14 +190,14 @@ struct mac_sl_cfg {
 /* PSS */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR	(CONFIG_KSNET_NETCP_BASE + 0x604)
+#define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x06060606
 #define hw_config_streaming_switch()\
 	writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR	(CONFIG_KSNET_NETCP_BASE + 0x500)
+#define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x500)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x0
 
 #define hw_config_streaming_switch()\
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index e46d635ca032..c21fabc36ed5 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -48,7 +48,7 @@
 
 /* Keystone net */
 #define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
-#define CONFIG_KSNET_NETCP_BASE			KS2_NETCP_BASE
+#define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
 #define CONFIG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
-- 
2.25.1

[PATCH 063/149] global: Migrate CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG_KSNET_SERDES_LANES_PER_SGMII

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c        | 4 ++--
 include/configs/ti_armv7_keystone2.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 679a0450f1d5..114eb854d722 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -372,12 +372,12 @@ static void keystone2_net_serdes_setup(void)
 {
 	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
-			CONFIG_KSNET_SERDES_LANES_PER_SGMII);
+			CFG_KSNET_SERDES_LANES_PER_SGMII);
 
 #if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L)
 	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
-			CONFIG_KSNET_SERDES_LANES_PER_SGMII);
+			CFG_KSNET_SERDES_LANES_PER_SGMII);
 #endif
 
 	/* wait till setup */
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index c21fabc36ed5..cb4ea394eb8b 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -51,7 +51,7 @@
 #define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
-#define CONFIG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
+#define CFG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
 
 /* EEPROM definitions */
 
-- 
2.25.1

[PATCH 064/149] global: Migrate CONFIG_KSNET_SERDES_SGMII2_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KSNET_SERDES_SGMII2_BASE to CFG_KSNET_SERDES_SGMII2_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c        | 2 +-
 include/configs/ti_armv7_keystone2.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 114eb854d722..90b8821a2caf 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -375,7 +375,7 @@ static void keystone2_net_serdes_setup(void)
 			CFG_KSNET_SERDES_LANES_PER_SGMII);
 
 #if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L)
-	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE,
+	ks2_serdes_init(CFG_KSNET_SERDES_SGMII2_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
 			CFG_KSNET_SERDES_LANES_PER_SGMII);
 #endif
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index cb4ea394eb8b..1429faa534e3 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -50,7 +50,7 @@
 #define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
 #define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
-#define CONFIG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
+#define CFG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
 #define CFG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
 
 /* EEPROM definitions */
-- 
2.25.1

[PATCH 065/149] global: Migrate CONFIG_KSNET_SERDES_SGMII_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_KSNET_SERDES_SGMII_BASE to CFG_KSNET_SERDES_SGMII_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/ti/keystone_net.c        | 2 +-
 include/configs/ti_armv7_keystone2.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index 90b8821a2caf..89b04b6fbdae 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -370,7 +370,7 @@ struct ks2_serdes ks2_serdes_sgmii_156p25mhz = {
 #ifndef CONFIG_SOC_K2G
 static void keystone2_net_serdes_setup(void)
 {
-	ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII_BASE,
+	ks2_serdes_init(CFG_KSNET_SERDES_SGMII_BASE,
 			&ks2_serdes_sgmii_156p25mhz,
 			CFG_KSNET_SERDES_LANES_PER_SGMII);
 
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 1429faa534e3..7142d30a5994 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -49,7 +49,7 @@
 /* Keystone net */
 #define CFG_KSNET_MAC_ID_BASE		KS2_MAC_ID_BASE_ADDR
 #define CFG_KSNET_NETCP_BASE			KS2_NETCP_BASE
-#define CONFIG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
+#define CFG_KSNET_SERDES_SGMII_BASE		KS2_SGMII_SERDES_BASE
 #define CFG_KSNET_SERDES_SGMII2_BASE		KS2_SGMII_SERDES2_BASE
 #define CFG_KSNET_SERDES_LANES_PER_SGMII	KS2_LANES_PER_SGMII_SERDES
 
-- 
2.25.1

[PATCH 066/149] global: Migrate CONFIG_LEGACY_BOOTCMD_ENV to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LEGACY_BOOTCMD_ENV to CFG_LEGACY_BOOTCMD_ENV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/pic32mzdask.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 60c747327588..0ae4fc55a97b 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -52,7 +52,7 @@
 	"fdt_addr_r=0x89d00000\0"				\
 	"scriptaddr=0x88300000\0"				\
 
-#define CONFIG_LEGACY_BOOTCMD_ENV					\
+#define CFG_LEGACY_BOOTCMD_ENV					\
 	"legacy_bootcmd= "						\
 		"if load mmc 0 ${scriptaddr} uEnv.txt; then "		\
 			"env import -tr ${scriptaddr} ${filesize}; "	\
@@ -71,7 +71,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS	\
 	MEM_LAYOUT_ENV_SETTINGS		\
-	CONFIG_LEGACY_BOOTCMD_ENV	\
+	CFG_LEGACY_BOOTCMD_ENV	\
 	BOOTENV
 
 #endif	/* __PIC32MZDASK_CONFIG_H */
-- 
2.25.1

[PATCH 067/149] global: Migrate CONFIG_LOWPOWER_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LOWPOWER_ADDR to CFG_LOWPOWER_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 9225d2cc1f2a..02a79962af24 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -161,7 +161,7 @@ static void secondary_cores_configure(void)
 
 	/* set lowpower flag and address */
 	writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG);
-	writel((uint32_t)&low_power_start, CONFIG_LOWPOWER_ADDR);
+	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
 	writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4);
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 99ab1a174f7c..164cdb0fa155 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -16,6 +16,6 @@
  * Low Power settings
  */
 #define CONFIG_LOWPOWER_FLAG		0x02020028
-#define CONFIG_LOWPOWER_ADDR		0x0202002C
+#define CFG_LOWPOWER_ADDR		0x0202002C
 
 #endif	/* __CONFIG_EXYNOS5420_H */
-- 
2.25.1

[PATCH 068/149] global: Migrate CONFIG_LOWPOWER_FLAG to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LOWPOWER_FLAG to CFG_LOWPOWER_FLAG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 4 ++--
 include/configs/exynos5420-common.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 02a79962af24..243b5c80c90e 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -73,7 +73,7 @@ static void low_power_start(void)
 
 	reg_val = readl(EXYNOS5420_SPARE_BASE);
 	if (reg_val != CPU_RST_FLAG_VAL) {
-		writel(0x0, CONFIG_LOWPOWER_FLAG);
+		writel(0x0, CFG_LOWPOWER_FLAG);
 		branch_bx(0x0);
 	}
 
@@ -160,7 +160,7 @@ static void secondary_cores_configure(void)
 	writel(0x0, (EXYNOS_RELOCATE_CODE_BASE + 0x1C));
 
 	/* set lowpower flag and address */
-	writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG);
+	writel(CPU_RST_FLAG_VAL, CFG_LOWPOWER_FLAG);
 	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 164cdb0fa155..bd43efa553c7 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -15,7 +15,7 @@
 /*
  * Low Power settings
  */
-#define CONFIG_LOWPOWER_FLAG		0x02020028
+#define CFG_LOWPOWER_FLAG		0x02020028
 #define CFG_LOWPOWER_ADDR		0x0202002C
 
 #endif	/* __CONFIG_EXYNOS5420_H */
-- 
2.25.1

[PATCH 069/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG_LPC32XX_NAND_MLC_BUSY_DELAY

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index a884c65d18b8..dd3f35def0fa 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -142,7 +142,7 @@ static void lpc32xx_nand_init(void)
 
 	writel(
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 010da1531ff9..a1ecd8ceef02 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -28,7 +28,7 @@
  */
 
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
-#define CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
+#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
-- 
2.25.1

[PATCH 070/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG_LPC32XX_NAND_MLC_NAND_TA

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index dd3f35def0fa..cd3831b5ffeb 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -143,7 +143,7 @@ static void lpc32xx_nand_init(void)
 	writel(
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index a1ecd8ceef02..d345382545e5 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -29,7 +29,7 @@
 
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
-#define CONFIG_LPC32XX_NAND_MLC_NAND_TA      18181818
+#define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
-- 
2.25.1

[PATCH 071/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG_LPC32XX_NAND_MLC_RD_HIGH

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index cd3831b5ffeb..388be16e2e71 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -144,7 +144,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index d345382545e5..3959051a4ca6 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -30,7 +30,7 @@
 #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
-#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH      31250000
+#define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
-- 
2.25.1

[PATCH 072/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG_LPC32XX_NAND_MLC_RD_LOW

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 388be16e2e71..e75ed1f2ae9c 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -145,7 +145,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 3959051a4ca6..1a4617c5c02b 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -31,7 +31,7 @@
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
-#define CONFIG_LPC32XX_NAND_MLC_RD_LOW       45454545
+#define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
-- 
2.25.1

[PATCH 073/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG_LPC32XX_NAND_MLC_TCEA_DELAY

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index e75ed1f2ae9c..088fdb7981da 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -141,7 +141,7 @@ static void lpc32xx_nand_init(void)
 	clk = get_hclk_clk_rate();
 
 	writel(
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 1a4617c5c02b..34af515037fe 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -27,7 +27,7 @@
  * NAND chip timings for FIXME: which one?
  */
 
-#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
+#define CFG_LPC32XX_NAND_MLC_TCEA_DELAY  333333333
 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY   10000000
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
-- 
2.25.1

[PATCH 074/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG_LPC32XX_NAND_MLC_WR_HIGH

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 088fdb7981da..31a9a22ba31f 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -146,7 +146,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA,    0x07, 16) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
+		clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
 		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
 }
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 34af515037fe..c67a0bb6e1a8 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -32,7 +32,7 @@
 #define CFG_LPC32XX_NAND_MLC_NAND_TA      18181818
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
-#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH      40000000
+#define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
-- 
2.25.1

[PATCH 075/149] global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG_LPC32XX_NAND_MLC_WR_LOW

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +-
 include/configs/work_92105.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
index 31a9a22ba31f..285411776096 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@@ -147,7 +147,7 @@ static void lpc32xx_nand_init(void)
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH,    0x0F, 12) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW,     0x0F, 8) |
 		clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH,    0x0F, 4) |
-		clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
+		clkdiv(CFG_LPC32XX_NAND_MLC_WR_LOW,     0x0F, 0),
 		&lpc32xx_nand_mlc_registers->time_reg);
 }
 
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index c67a0bb6e1a8..f1a7853a80e6 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -33,7 +33,7 @@
 #define CFG_LPC32XX_NAND_MLC_RD_HIGH      31250000
 #define CFG_LPC32XX_NAND_MLC_RD_LOW       45454545
 #define CFG_LPC32XX_NAND_MLC_WR_HIGH      40000000
-#define CONFIG_LPC32XX_NAND_MLC_WR_LOW       83333333
+#define CFG_LPC32XX_NAND_MLC_WR_LOW       83333333
 
 /*
  * NAND
-- 
2.25.1

[PATCH 076/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG_LPC32XX_NAND_SLC_RDR_CLKS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index f4f1b22f5e21..0f12201aa0e3 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -130,7 +130,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
-	       TAC_R_RDY(CONFIG_LPC32XX_NAND_SLC_RDR_CLKS) |
+	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index ab10101f20a9..e17896841355 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -45,7 +45,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
-#define CONFIG_LPC32XX_NAND_SLC_RDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
-- 
2.25.1

[PATCH 077/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG_LPC32XX_NAND_SLC_RHOLD

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 0f12201aa0e3..1fdc80989fab 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -132,7 +132,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
-	       TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) |
+	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
 }
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index e17896841355..0b815ded7322 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -47,7 +47,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
-#define CONFIG_LPC32XX_NAND_SLC_RHOLD		200000000
+#define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
 
 /*
-- 
2.25.1

[PATCH 078/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG_LPC32XX_NAND_SLC_RSETUP

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 1fdc80989fab..71e8286d1c8f 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -133,7 +133,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
-	       TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
+	       TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
 }
 
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 0b815ded7322..72cf031e05da 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -48,7 +48,7 @@
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_RSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_RSETUP		50000000
 
 /*
  * USB
-- 
2.25.1

[PATCH 079/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG_LPC32XX_NAND_SLC_RWIDTH

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 71e8286d1c8f..fb1fb2d7dccf 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -131,7 +131,7 @@ static void lpc32xx_nand_init(void)
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
-	       TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) |
+	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
 	       TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP),
 	       &lpc32xx_nand_slc_regs->tac);
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 72cf031e05da..5ba8c1bb20e2 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -46,7 +46,7 @@
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
-#define CONFIG_LPC32XX_NAND_SLC_RWIDTH		66666666
+#define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
 #define CFG_LPC32XX_NAND_SLC_RSETUP		50000000
 
-- 
2.25.1

[PATCH 080/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG_LPC32XX_NAND_SLC_WDR_CLKS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index fb1fb2d7dccf..7de5c840ed9b 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void)
 	       &lpc32xx_nand_slc_regs->icr);
 
 	/* Configure NAND flash timings */
-	writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) |
+	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5ba8c1bb20e2..dc16ed84c52c 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -41,7 +41,7 @@
 /*
  * NAND chip timings
  */
-#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS	14
+#define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
-- 
2.25.1

[PATCH 081/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG_LPC32XX_NAND_SLC_WHOLD

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index 7de5c840ed9b..dee8fd24b94b 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -128,7 +128,7 @@ static void lpc32xx_nand_init(void)
 	/* Configure NAND flash timings */
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
-	       TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
+	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index dc16ed84c52c..24312c848e2d 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -43,7 +43,7 @@
  */
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
-#define CONFIG_LPC32XX_NAND_SLC_WHOLD		200000000
+#define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
-- 
2.25.1

[PATCH 082/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG_LPC32XX_NAND_SLC_WSETUP

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index dee8fd24b94b..a070df81d7cd 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void)
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
 	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
-	       TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
+	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
 	       TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
 	       TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 24312c848e2d..5719e422da97 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -44,7 +44,7 @@
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
-#define CONFIG_LPC32XX_NAND_SLC_WSETUP		50000000
+#define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
 #define CFG_LPC32XX_NAND_SLC_RWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_RHOLD		200000000
-- 
2.25.1

[PATCH 083/149] global: Migrate CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG

[Tom Rini]

Perform a simple rename of CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG_LPC32XX_NAND_SLC_WWIDTH

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +-
 include/configs/devkit3250.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
index a070df81d7cd..356f8d9440bb 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -127,7 +127,7 @@ static void lpc32xx_nand_init(void)
 
 	/* Configure NAND flash timings */
 	writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
-	       TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
+	       TAC_W_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) |
 	       TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
 	       TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
 	       TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5719e422da97..9cfee381d4ac 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -42,7 +42,7 @@
  * NAND chip timings
  */
 #define CFG_LPC32XX_NAND_SLC_WDR_CLKS	14
-#define CONFIG_LPC32XX_NAND_SLC_WWIDTH		66666666
+#define CFG_LPC32XX_NAND_SLC_WWIDTH		66666666
 #define CFG_LPC32XX_NAND_SLC_WHOLD		200000000
 #define CFG_LPC32XX_NAND_SLC_WSETUP		50000000
 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS	14
-- 
2.25.1

[PATCH 084/149] global: Migrate CONFIG_MALLOC_F_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MALLOC_F_ADDR to CFG_MALLOC_F_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/sandbox/cpu/start.c                    | 2 +-
 common/init/board_init.c                    | 2 +-
 common/spl/spl.c                            | 4 ++--
 doc/arch/sandbox/sandbox.rst                | 2 +-
 include/configs/capricorn-common.h          | 2 +-
 include/configs/cgtqmx8.h                   | 2 +-
 include/configs/imx8mm-cl-iot-gate.h        | 2 +-
 include/configs/imx8mm_beacon.h             | 2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h | 2 +-
 include/configs/imx8mm_evk.h                | 2 +-
 include/configs/imx8mm_icore_mx8mm.h        | 2 +-
 include/configs/imx8mm_venice.h             | 2 +-
 include/configs/imx8mp_rsb3720.h            | 2 +-
 include/configs/imx8mq_cm.h                 | 2 +-
 include/configs/imx8mq_evk.h                | 2 +-
 include/configs/imx8mq_phanbell.h           | 2 +-
 include/configs/imx8qm_mek.h                | 2 +-
 include/configs/imx8qxp_mek.h               | 2 +-
 include/configs/imx8ulp_evk.h               | 2 +-
 include/configs/imx93_evk.h                 | 2 +-
 include/configs/kontron-sl-mx8mm.h          | 2 +-
 include/configs/kontron_pitx_imx8m.h        | 2 +-
 include/configs/kontron_sl28.h              | 2 +-
 include/configs/phycore_imx8mm.h            | 2 +-
 include/configs/pico-imx8mq.h               | 2 +-
 include/configs/sandbox.h                   | 2 +-
 include/configs/verdin-imx8mm.h             | 2 +-
 include/configs/verdin-imx8mp.h             | 2 +-
 28 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 622df41f54cf..234652872ecc 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[])
 	}
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
-	gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+	gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 #if CONFIG_IS_ENABLED(LOG)
 	gd->default_log_level = state->default_log_level;
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 6a550261778d..96ffb79a9869 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void)
 ulong board_init_f_alloc_reserve(ulong top)
 {
 	/* Reserve early malloc arena */
-#ifndef CONFIG_MALLOC_F_ADDR
+#ifndef CFG_MALLOC_F_ADDR
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	top -= CONFIG_VAL(SYS_MALLOC_F_LEN);
 #endif
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 1d2e8fda7284..4668367b680f 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc)
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
 	if (setup_malloc) {
-#ifdef CONFIG_MALLOC_F_ADDR
-		gd->malloc_base = CONFIG_MALLOC_F_ADDR;
+#ifdef CFG_MALLOC_F_ADDR
+		gd->malloc_base = CFG_MALLOC_F_ADDR;
 #endif
 		gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN);
 		gd->malloc_ptr = 0;
diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst
index e6d840365166..cd7f8a2cb0dc 100644
--- a/doc/arch/sandbox/sandbox.rst
+++ b/doc/arch/sandbox/sandbox.rst
@@ -615,7 +615,7 @@ Addr      Config                     Usage
 =======   ========================   ===============================
       0   CONFIG_SYS_FDT_LOAD_ADDR   Device tree
    c000   CONFIG_BLOBLIST_ADDR       Blob list
-  10000   CONFIG_MALLOC_F_ADDR       Early memory allocation
+  10000   CFG_MALLOC_F_ADDR          Early memory allocation
   f0000   CONFIG_PRE_CON_BUF_ADDR    Pre-console buffer
  100000   CONFIG_TRACE_EARLY_ADDR    Early trace buffer (if enabled). Also used
                                      as the SPL load buffer in spl_test_load().
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 19c7fca03b29..9e7322cdb937 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -14,7 +14,7 @@
 
 /* SPL config */
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif /* CONFIG_SPL_BUILD */
 
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index caa1498acead..a63325973846 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 7785bdc7cbe6..64cdc401d039 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x912000
+#define CFG_MALLOC_F_ADDR		0x912000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index ee524f0e63f2..d85ae21e2317 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 44d74bb1a788..0723d27ab703 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 
 /* For RAW image gives a error info not panic */
 
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index c364e06dc450..d5642b96495f 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h
index e718daa07c3e..2158b0af74f9 100644
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -15,7 +15,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-# define CONFIG_MALLOC_F_ADDR		0x930000
+# define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif /* CONFIG_SPL_BUILD */
 
diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index c490e3829f9a..5579a05d165f 100644
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif
 
 /* Enable Distro Boot */
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 38ae5f137022..e4e24b522fdb 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -24,7 +24,7 @@
 		 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
+#define CFG_MALLOC_F_ADDR		0x184000 /* malloc f used before \
 						  * GD_FLG_FULL_MALLOC_INIT \
 						  * set \
 						  */
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index f6f356d27ba2..f7ae1b47d063 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 #endif
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d9ce5d5d0f1a..4b46321e8512 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -15,7 +15,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index eb7059f0648c..5158f2cc605a 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 7772e71013ef..a25efbb16bdb 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 669da591fa2b..4f55ae49403d 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SERIAL_LPUART_BASE	0x5a060000
-#define CONFIG_MALLOC_F_ADDR		0x00120000
+#define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
 
diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index b7397f6038fd..d77510e1685e 100644
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_UBOOT_BASE	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x22040000
+#define CFG_MALLOC_F_ADDR		0x22040000
 
 
 #endif
diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h
index 5cd6492dd503..7b7bef3ca755 100644
--- a/include/configs/imx93_evk.h
+++ b/include/configs/imx93_evk.h
@@ -14,7 +14,7 @@
 	(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MALLOC_F_ADDR		0x204D0000
+#define CFG_MALLOC_F_ADDR		0x204D0000
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index e4d6a8a15408..d80238bd02f2 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -46,7 +46,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS BOOTENV
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 4dd51c7f1d7f..5a3c9f76a431 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE     0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
 
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index 0d293f316b7f..940bfd2b336a 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -28,7 +28,7 @@
 /* generic timer */
 
 /* early heap for SPL DM */
-#define CONFIG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
+#define CFG_MALLOC_F_ADDR		CFG_SYS_FSL_OCRAM_BASE
 
 /* serial port */
 #define CFG_SYS_NS16550_CLK          (get_bus_freq(0) / 2)
diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h
index 9160c78c0464..ce6dc87c69c7 100644
--- a/include/configs/phycore_imx8mm.h
+++ b/include/configs/phycore_imx8mm.h
@@ -16,7 +16,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 1d8709180c83..37ade717ae99 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -14,7 +14,7 @@
 #define CONFIG_SYS_SPL_PTE_RAM_BASE	0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x182000
+#define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 8d9af7f088d1..4e5653dc886e 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MALLOC_F_ADDR		0x0010000
+#define CFG_MALLOC_F_ADDR		0x0010000
 
 /* Size of our emulated memory */
 #define SB_CONCAT(x, y) x ## y
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 7f3fa795afdc..27d7efb883de 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -14,7 +14,7 @@
 
 #ifdef CONFIG_SPL_BUILD
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR		0x930000
+#define CFG_MALLOC_F_ADDR		0x930000
 /* For RAW image gives a error info not panic */
 #endif
 
diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h
index 2cb076cabac9..942081ab84d7 100644
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -16,7 +16,7 @@
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
-#define CONFIG_MALLOC_F_ADDR				0x184000
+#define CFG_MALLOC_F_ADDR				0x184000
 /* For RAW image gives a error info not panic */
 
 #endif /* CONFIG_SPL_BUILD */
-- 
2.25.1

[PATCH 085/149] global: Migrate CONFIG_MAX_MEM_MAPPED to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MAX_MEM_MAPPED to CFG_MAX_MEM_MAPPED

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c           |  6 +++---
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 14 +++++++-------
 arch/arm/include/asm/arch-ls102xa/config.h        |  2 +-
 arch/powerpc/cpu/mpc85xx/cpu.c                    | 14 +++++++-------
 arch/powerpc/cpu/mpc85xx/mp.c                     |  4 ++--
 arch/powerpc/cpu/mpc85xx/tlb.c                    |  8 ++++----
 arch/powerpc/cpu/mpc8xxx/pamu_table.c             |  2 +-
 arch/powerpc/include/asm/config.h                 |  6 +++---
 arch/xtensa/include/asm/config.h                  |  2 +-
 board/ti/dra7xx/evm.c                             | 14 +++++++-------
 common/memsize.c                                  |  6 +++---
 drivers/ddr/fsl/util.c                            |  6 +++---
 include/configs/dra7xx_evm.h                      |  2 +-
 include/configs/mt7621.h                          |  2 +-
 include/configs/rcar-gen3-common.h                |  2 +-
 include/configs/synquacer.h                       |  2 +-
 include/configs/xtfpga.h                          |  8 ++++----
 17 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 2aeec7dea7bf..5c45c2a5ed58 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -1308,13 +1308,13 @@ phys_size_t get_effective_memsize(void)
 	 * allocated from first region. If the memory extends to  the second
 	 * region (or the third region if applicable), Management Complex (MC)
 	 * memory should be put into the highest region, i.e. the end of DDR
-	 * memory. CONFIG_MAX_MEM_MAPPED is set to the size of first region so
+	 * memory. CFG_MAX_MEM_MAPPED is set to the size of first region so
 	 * U-Boot doesn't relocate itself into higher address. Should DDR be
 	 * configured to skip the first region, this function needs to be
 	 * adjusted.
 	 */
-	if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
-		ea_size = CONFIG_MAX_MEM_MAPPED;
+	if (gd->ram_size > CFG_MAX_MEM_MAPPED) {
+		ea_size = CFG_MAX_MEM_MAPPED;
 		rem = gd->ram_size - ea_size;
 	} else {
 		ea_size = gd->ram_size;
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index 57d92f65520d..12758c8dd1ca 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -36,7 +36,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			0x06000000
@@ -121,7 +121,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* DCFG - GUR */
 #define CFG_SYS_FSL_OCRAM_BASE	0x18000000 /* initial RAM */
@@ -147,7 +147,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE				0x06000000
@@ -191,7 +191,7 @@
 
 /* DDR */
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SEC */
 
@@ -211,7 +211,7 @@
 #define CFG_SYS_NUM_FM1_DTSEC		7
 #define CFG_SYS_NUM_FM1_10GEC		1
 #define CFG_SYS_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED			CFG_SYS_DDR_BLOCK1_SIZE
 
 #define QE_MURAM_SIZE		0x6000UL
 #define MAX_QE_RISC		1
@@ -250,14 +250,14 @@
 #define GICD_BASE		0x01401000
 #define GICC_BASE		0x01402000
 #define CFG_SYS_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED		CFG_SYS_DDR_BLOCK1_SIZE
 
 #elif defined(CONFIG_ARCH_LS1046A)
 #define CFG_SYS_NUM_FMAN			1
 #define CFG_SYS_NUM_FM1_DTSEC		8
 #define CFG_SYS_NUM_FM1_10GEC		2
 #define CFG_SYS_DDR_BLOCK1_SIZE  ((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
+#define CFG_MAX_MEM_MAPPED           CFG_SYS_DDR_BLOCK1_SIZE
 
 /* SMMU Defintions */
 #define SMMU_BASE		0x09000000
diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 4a4d64244148..d0abbdadf08b 100644
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -70,7 +70,7 @@
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #ifdef CONFIG_DDR_SPD
-#define CONFIG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
+#define CFG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
 #endif
 
 #define DCU_LAYER_MAX_NUM			16
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index be85c54e4801..0abcc01b8574 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -616,12 +616,12 @@ static int reset_tlb(phys_addr_t p_addr, u32 size, phys_addr_t *phys_offset)
 /*
  * slide the testing window up to test another area
  * for 32_bit system, the maximum testable memory is limited to
- * CONFIG_MAX_MEM_MAPPED
+ * CFG_MAX_MEM_MAPPED
  */
 int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
 	phys_addr_t test_cap, p_addr;
-	phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
+	phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED);
 
 #if !defined(CONFIG_PHYS_64BIT) || \
     !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
@@ -632,7 +632,7 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 #endif
 	p_addr = (*vstart) + (*size) + (*phys_offset);
 	if (p_addr < test_cap - 1) {
-		p_size = min(test_cap - p_addr, CONFIG_MAX_MEM_MAPPED);
+		p_size = min(test_cap - p_addr, CFG_MAX_MEM_MAPPED);
 		if (reset_tlb(p_addr, p_size, phys_offset) == -1)
 			return -1;
 		*vstart = CFG_SYS_DDR_SDRAM_BASE;
@@ -649,18 +649,18 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 /* initialization for testing area */
 int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 {
-	phys_size_t p_size = min(gd->ram_size, CONFIG_MAX_MEM_MAPPED);
+	phys_size_t p_size = min(gd->ram_size, CFG_MAX_MEM_MAPPED);
 
 	*vstart = CFG_SYS_DDR_SDRAM_BASE;
-	*size = (u32) p_size;	/* CONFIG_MAX_MEM_MAPPED < 4G */
+	*size = (u32) p_size;	/* CFG_MAX_MEM_MAPPED < 4G */
 	*phys_offset = 0;
 
 #if !defined(CONFIG_PHYS_64BIT) || \
     !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
 	(CFG_SYS_INIT_RAM_ADDR_PHYS < 0x100000000ull)
-		if (gd->ram_size > CONFIG_MAX_MEM_MAPPED) {
+		if (gd->ram_size > CFG_MAX_MEM_MAPPED) {
 			puts("Cannot test more than ");
-			print_size(CONFIG_MAX_MEM_MAPPED,
+			print_size(CFG_MAX_MEM_MAPPED,
 				" without proper 36BIT support.\n");
 		}
 #endif
diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 44f8ed8a19a3..7c47e415f05d 100644
--- a/arch/powerpc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
@@ -193,8 +193,8 @@ u32 determine_mp_bootpg(unsigned int *pagesize)
 
 
 	/* use last 4K of mapped memory */
-	bootpg = ((gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : gd->ram_size) +
+	bootpg = ((gd->ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : gd->ram_size) +
 		CFG_SYS_SDRAM_BASE - 4096;
 	if (pagesize)
 		*pagesize = 4096;
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 5d21bef58781..2a78f0fe502c 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -306,12 +306,12 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,
 	u64 memsize = (u64)memsize_in_meg << 20;
 	u64 size;
 
-	size = min(memsize, (u64)CONFIG_MAX_MEM_MAPPED);
+	size = min(memsize, (u64)CFG_MAX_MEM_MAPPED);
 	size = tlb_map_range(ram_tlb_address, p_addr, size, TLB_MAP_RAM);
 
-	if (size || memsize > CONFIG_MAX_MEM_MAPPED) {
-		print_size(memsize > CONFIG_MAX_MEM_MAPPED ?
-			   memsize - CONFIG_MAX_MEM_MAPPED + size : size,
+	if (size || memsize > CFG_MAX_MEM_MAPPED) {
+		print_size(memsize > CFG_MAX_MEM_MAPPED ?
+			   memsize - CFG_MAX_MEM_MAPPED + size : size,
 			   " of DDR memory left unmapped in U-Boot\n");
 #ifndef CONFIG_SPL_BUILD
 		puts("       ");
diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
index caad6670cc90..b906279226a5 100644
--- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c
+++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c
@@ -17,7 +17,7 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries)
 
 	tbl->start_addr[i] =
 			(uint64_t)virt_to_phys((void *)CFG_SYS_SDRAM_BASE);
-	tbl->size[i] = (phys_size_t)(min(gd->ram_size, CONFIG_MAX_MEM_MAPPED));
+	tbl->size[i] = (phys_size_t)(min(gd->ram_size, CFG_MAX_MEM_MAPPED));
 	tbl->end_addr[i] = tbl->start_addr[i] +  tbl->size[i] - 1;
 
 	i++;
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index 983c6f70cfee..f0702cab1431 100644
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -14,13 +14,13 @@
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
 
-#ifndef CONFIG_MAX_MEM_MAPPED
+#ifndef CFG_MAX_MEM_MAPPED
 #if	defined(CONFIG_E500)		|| \
 	defined(CONFIG_MPC86xx)		|| \
 	defined(CONFIG_E300)
-#define CONFIG_MAX_MEM_MAPPED	((phys_size_t)2 << 30)
+#define CFG_MAX_MEM_MAPPED	((phys_size_t)2 << 30)
 #else
-#define CONFIG_MAX_MEM_MAPPED	(256 << 20)
+#define CFG_MAX_MEM_MAPPED	(256 << 20)
 #endif
 #endif
 
diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h
index 21b334b93896..268c5688b3d3 100644
--- a/arch/xtensa/include/asm/config.h
+++ b/arch/xtensa/include/asm/config.h
@@ -14,7 +14,7 @@
  * restricting used physical memory to the first 128MB.
  */
 #if XCHAL_HAVE_PTP_MMU
-#define CONFIG_MAX_MEM_MAPPED (128 << 20)
+#define CFG_MAX_MEM_MAPPED (128 << 20)
 #endif
 
 #endif
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 1c00e253ffc8..bd7aac3656a6 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -279,13 +279,13 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
 	case DRA752_ES2_0:
 		switch (emif_nr) {
 		case 1:
-			if (ram_size > CONFIG_MAX_MEM_MAPPED)
+			if (ram_size > CFG_MAX_MEM_MAPPED)
 				*regs = &emif1_ddr3_532_mhz_1cs_2G;
 			else
 				*regs = &emif1_ddr3_532_mhz_1cs;
 			break;
 		case 2:
-			if (ram_size > CONFIG_MAX_MEM_MAPPED)
+			if (ram_size > CFG_MAX_MEM_MAPPED)
 				*regs = &emif2_ddr3_532_mhz_1cs_2G;
 			else
 				*regs = &emif2_ddr3_532_mhz_1cs;
@@ -303,7 +303,7 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)
 	case DRA722_ES1_0:
 	case DRA722_ES2_0:
 	case DRA722_ES2_1:
-		if (ram_size < CONFIG_MAX_MEM_MAPPED)
+		if (ram_size < CFG_MAX_MEM_MAPPED)
 			*regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es1;
 		else
 			*regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es2;
@@ -362,7 +362,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 	case DRA752_ES1_0:
 	case DRA752_ES1_1:
 	case DRA752_ES2_0:
-		if (ram_size > CONFIG_MAX_MEM_MAPPED)
+		if (ram_size > CFG_MAX_MEM_MAPPED)
 			*dmm_lisa_regs = &lisa_map_dra7_2GB;
 		else
 			*dmm_lisa_regs = &lisa_map_dra7_1536MB;
@@ -371,7 +371,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)
 	case DRA722_ES2_0:
 	case DRA722_ES2_1:
 	default:
-		if (ram_size < CONFIG_MAX_MEM_MAPPED)
+		if (ram_size < CFG_MAX_MEM_MAPPED)
 			*dmm_lisa_regs = &lisa_map_2G_x_2;
 		else
 			*dmm_lisa_regs = &lisa_map_2G_x_4;
@@ -646,9 +646,9 @@ int dram_init_banksize(void)
 
 	gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE;
 	gd->bd->bi_dram[0].size = get_effective_memsize();
-	if (ram_size > CONFIG_MAX_MEM_MAPPED) {
+	if (ram_size > CFG_MAX_MEM_MAPPED) {
 		gd->bd->bi_dram[1].start = 0x200000000;
-		gd->bd->bi_dram[1].size = ram_size - CONFIG_MAX_MEM_MAPPED;
+		gd->bd->bi_dram[1].size = ram_size - CFG_MAX_MEM_MAPPED;
 	}
 
 	return 0;
diff --git a/common/memsize.c b/common/memsize.c
index 3c80ad2c8346..ad9ddf67ac5b 100644
--- a/common/memsize.c
+++ b/common/memsize.c
@@ -106,11 +106,11 @@ phys_size_t __weak get_effective_memsize(void)
 	if (gd->ram_base + ram_size < gd->ram_base)
 		ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base;
 
-#ifndef CONFIG_MAX_MEM_MAPPED
+#ifndef CFG_MAX_MEM_MAPPED
 	return ram_size;
 #else
 	/* limit stack to what we can reasonable map */
-	return ((ram_size > CONFIG_MAX_MEM_MAPPED) ?
-		CONFIG_MAX_MEM_MAPPED : ram_size);
+	return ((ram_size > CFG_MAX_MEM_MAPPED) ?
+		CFG_MAX_MEM_MAPPED : ram_size);
 #endif
 }
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index e49cf6e8e3db..60051392e713 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -139,10 +139,10 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params,
 	}
 
 #if !defined(CONFIG_PHYS_64BIT)
-	if (base >= CONFIG_MAX_MEM_MAPPED)
+	if (base >= CFG_MAX_MEM_MAPPED)
 		return;
-	if ((base + size) >= CONFIG_MAX_MEM_MAPPED)
-		size = CONFIG_MAX_MEM_MAPPED - base;
+	if ((base + size) >= CFG_MAX_MEM_MAPPED)
+		size = CFG_MAX_MEM_MAPPED - base;
 #endif
 	if (set_ddr_laws(base, size, law_memctl) < 0) {
 		printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num,
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index f8afcc7826e9..ef1d5a112608 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -13,7 +13,7 @@
 
 #include <environment/ti/dfu.h>
 
-#define CONFIG_MAX_MEM_MAPPED		0x80000000
+#define CFG_MAX_MEM_MAPPED		0x80000000
 
 #ifndef CONFIG_QSPI_BOOT
 /* MMC ENV related defines */
diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h
index b6e680bcc78e..a9574940d42f 100644
--- a/include/configs/mt7621.h
+++ b/include/configs/mt7621.h
@@ -10,7 +10,7 @@
 
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
-#define CONFIG_MAX_MEM_MAPPED		0x1c000000
+#define CFG_MAX_MEM_MAPPED		0x1c000000
 
 #define CFG_SYS_INIT_SP_OFFSET	0x800000
 
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 8e0837a30275..213caa75238a 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -28,7 +28,7 @@
 #define DRAM_RSV_SIZE			0x08000000
 #define CFG_SYS_SDRAM_BASE		(0x40000000 + DRAM_RSV_SIZE)
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
-#define CONFIG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
+#define CFG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
 /* ENV setting */
 
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index a62d1d325478..e65d6238163f 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE		(0x80000000)	/* Start address of DDR3 */
 #define PHYS_SDRAM_SIZE			(0x7c000000)	/* Default size (2GB - Secure memory) */
 
-#define CONFIG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
+#define CFG_MAX_MEM_MAPPED		PHYS_SDRAM_SIZE
 
 #define SQ_DRAMINFO_BASE		(0x2e00ffc0)	/* DRAM info from TF-A */
 
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 83a0539d8f2d..9655b666eda7 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -27,7 +27,7 @@
 #else
 #define CFG_SYS_MEMORY_BASE		0x60000000
 #define CFG_SYS_IO_BASE		0x90000000
-#define CONFIG_MAX_MEM_MAPPED		0x10000000
+#define CFG_MAX_MEM_MAPPED		0x10000000
 #endif
 
 /* Onboard RAM sizes:
@@ -53,10 +53,10 @@
 
 /* Memory test is destructive so default must not overlap vectors or U-Boot*/
 
-#if defined(CONFIG_MAX_MEM_MAPPED) && \
-	CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
+#if defined(CFG_MAX_MEM_MAPPED) && \
+	CFG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR		\
-	(MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
+	(MEMADDR(CFG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
 #else
 #define XTENSA_SYS_TEXT_ADDR		\
 	(MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
-- 
2.25.1

[PATCH 086/149] global: Migrate CONFIG_MAX_RAM_BANK_SIZE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MAX_RAM_BANK_SIZE to CFG_MAX_RAM_BANK_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-davinci/misc.c                 | 2 +-
 arch/arm/mach-omap2/am33xx/board.c           | 4 ++--
 arch/arm/mach-omap2/sec-common.c             | 2 +-
 arch/arm/mach-orion5x/dram.c                 | 4 ++--
 arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +-
 board/phytec/phycore_am335x_r2/board.c       | 2 +-
 board/ti/ks2_evm/board.c                     | 2 +-
 include/configs/am43xx_evm.h                 | 2 +-
 include/configs/bur_am335x_common.h          | 2 +-
 include/configs/cm_t43.h                     | 2 +-
 include/configs/da850evm.h                   | 2 +-
 include/configs/draco.h                      | 2 +-
 include/configs/etamin.h                     | 2 +-
 include/configs/legoev3.h                    | 2 +-
 include/configs/omapl138_lcdk.h              | 2 +-
 include/configs/pxm2.h                       | 2 +-
 include/configs/rastaban.h                   | 2 +-
 include/configs/rut.h                        | 2 +-
 include/configs/thuban.h                     | 2 +-
 include/configs/ti816x_evm.h                 | 2 +-
 include/configs/ti_am335x_common.h           | 2 +-
 include/configs/ti_armv7_keystone2.h         | 2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index 42078b39f8ab..cfad28c43d0a 100644
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -27,7 +27,7 @@ int dram_init(void)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(void *)CFG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	return 0;
 }
 
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 86755d6d9543..a52d04d85c8a 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -73,7 +73,7 @@ int dram_init(void)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(void *)CFG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	return 0;
 }
 
@@ -521,7 +521,7 @@ void board_init_f(ulong dummy)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(void *)CFG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 }
 #endif
 
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c
index 0f9b915ea3dd..64560b21e3f5 100644
--- a/arch/arm/mach-omap2/sec-common.c
+++ b/arch/arm/mach-omap2/sec-common.c
@@ -203,7 +203,7 @@ u32 get_sec_mem_start(void)
 			omap_sdram_size()
 #else
 			get_ram_size((void *)CFG_SYS_SDRAM_BASE,
-				     CONFIG_MAX_RAM_BANK_SIZE)
+				     CFG_MAX_RAM_BANK_SIZE)
 #endif
 			- sec_mem_size));
 	return sec_mem_start;
diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
index c9a3750e48de..5647f847d78f 100644
--- a/arch/arm/mach-orion5x/dram.c
+++ b/arch/arm/mach-orion5x/dram.c
@@ -39,7 +39,7 @@ int dram_init (void)
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size(
 			(long *) orion5x_sdram_bar(0),
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	return 0;
 }
 
@@ -51,7 +51,7 @@ int dram_init_banksize(void)
 		gd->bd->bi_dram[i].start = orion5x_sdram_bar(i);
 		gd->bd->bi_dram[i].size = get_ram_size(
 			(long *) (gd->bd->bi_dram[i].start),
-			CONFIG_MAX_RAM_BANK_SIZE);
+			CFG_MAX_RAM_BANK_SIZE);
 	}
 
 	return 0;
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 4b1b0b0f3716..e41d07e18cc5 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -53,7 +53,7 @@
 #define MVCPU_WIN_ENABLE	ORION5X_WIN_ENABLE
 #define MVCPU_WIN_DISABLE	ORION5X_WIN_DISABLE
 
-#define CONFIG_MAX_RAM_BANK_SIZE		(64*1024*1024)
+#define CFG_MAX_RAM_BANK_SIZE		(64*1024*1024)
 
 /* include here SoC variants. 5181, 5281, 6183 should go here when
    adding support for them, and this comment should then be updated. */
diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c
index e84dd251c254..eb573d076dd7 100644
--- a/board/phytec/phycore_am335x_r2/board.c
+++ b/board/phytec/phycore_am335x_r2/board.c
@@ -167,7 +167,7 @@ void sdram_init(void)
 
 	/* Detect memory physically present */
 	gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE,
-				    CONFIG_MAX_RAM_BANK_SIZE);
+				    CFG_MAX_RAM_BANK_SIZE);
 
 	/* Reconfigure memory for actual detected size */
 	switch (gd->ram_size) {
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c
index 1683f780a33b..5dcda12105b9 100644
--- a/board/ti/ks2_evm/board.c
+++ b/board/ti/ks2_evm/board.c
@@ -47,7 +47,7 @@ int dram_init(void)
 	ddr3_size = ddr3_init();
 
 	gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE,
-				    CONFIG_MAX_RAM_BANK_SIZE);
+				    CFG_MAX_RAM_BANK_SIZE);
 #if defined(CONFIG_TI_AEMIF)
 	if (!(board_is_k2g_ice() || board_is_k2g_i1()))
 		aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs);
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 3a6ffd9de0bb..f43e00e8a2b6 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_AM43XX_EVM_H
 #define __CONFIG_AM43XX_EVM_H
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 21)	/* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 21)	/* 2GB */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
 #include <asm/arch/omap.h>
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 3e0b42507888..ab57e14392d0 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -19,7 +19,7 @@
 
 #endif /* CONFIG_DM */
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 /* Timer information */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index aa17c9cbe2ce..743c8c86922f 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_CM_T43_H
 #define __CONFIG_CM_T43_H
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2GB */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
 #include <asm/arch/omap.h>
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index cfc8330e35ae..736af88a0247 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -31,7 +31,7 @@
  */
 #define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
 #define PHYS_SDRAM_1_SIZE	(64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
 /* memtest start addr */
 
 /* memtest will be run on 16MB */
diff --git a/include/configs/draco.h b/include/configs/draco.h
index b56ba9132af2..4c67174572f3 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -25,7 +25,7 @@
 	"led1=64,0,1\0"
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 /* Default env settings */
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 8d8e717b38d8..d07b4e95364f 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -67,7 +67,7 @@
 	"led5=63,0,1\0"
 
 /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 687ac89b8579..ff966586ba65 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -27,7 +27,7 @@
  */
 #define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
 #define PHYS_SDRAM_1_SIZE	(64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
 
 /* memtest start addr */
 
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 5e71ebcba857..af0093511a02 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -26,7 +26,7 @@
  */
 #define PHYS_SDRAM_1		DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
 #define PHYS_SDRAM_1_SIZE	(128 << 20) /* SDRAM size 128MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
+#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
 
 /* memtest start addr */
 
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 10eaeb49de62..b701e52076db 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -23,7 +23,7 @@
 	"led0=117,0,1\0" \
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(512 << 20)	/* 1GB */
 
 /* Use common default */
 
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 777df4c11259..2efb4d23cdda 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -32,7 +32,7 @@
 	"led5=63,0,1\0"
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 99799f8494e0..4002bc4b6c88 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -19,7 +19,7 @@
 #define DDR_PLL_FREQ	303
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20) /* 256 MiB */
+#define CFG_MAX_RAM_BANK_SIZE	(256 << 20) /* 256 MiB */
 
 /* Watchdog */
 #define WATCHDOG_TRIGGER_GPIO	14
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 1753fa410d18..a5913e1e7d2c 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -25,7 +25,7 @@
 	"led1=64,0,1\0"
 
  /* Physical Memory Map */
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 2d9d2fd66e9a..ac6d46f917b8 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -19,7 +19,7 @@
 #define V_OSCK          24000000    /* Clock output from T2 */
 #define V_SCLK          (V_OSCK >> 1)
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2048MB */
+#define CFG_MAX_RAM_BANK_SIZE	(2048 << 20)	/* 2048MB */
 #define CFG_SYS_SDRAM_BASE		0x80000000
 
 /**
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index ed17b4292096..20f8643771d8 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -11,7 +11,7 @@
 #ifndef __CONFIG_TI_AM335X_COMMON_H__
 #define __CONFIG_TI_AM335X_COMMON_H__
 
-#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
+#define CFG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 #define CFG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
 
 #include <asm/arch/omap.h>
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 7142d30a5994..a47f0902a267 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -15,7 +15,7 @@
 
 /* Memory Configuration */
 #define CFG_SYS_LPAE_SDRAM_BASE	0x800000000
-#define CONFIG_MAX_RAM_BANK_SIZE	(2 << 30)       /* 2GB */
+#define CFG_MAX_RAM_BANK_SIZE	(2 << 30)       /* 2GB */
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
 #define SPL_MALLOC_F_SIZE	CONFIG_SYS_MALLOC_F_LEN
-- 
2.25.1

[PATCH 087/149] global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MFG_ENV_SETTINGS to CFG_MFG_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/capricorn-common.h | 4 ++--
 include/configs/cgtqmx8.h          | 4 ++--
 include/configs/colibri-imx8x.h    | 4 ++--
 include/configs/imx8mq_phanbell.h  | 4 ++--
 include/configs/imx8qm_rom7720.h   | 4 ++--
 include/configs/mx7dsabresd.h      | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 9e7322cdb937..9dcacad2fc00 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -60,7 +60,7 @@
 			"${loadaddr} ${m4_0_image}\0" \
 	"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	MFG_ENV_SETTINGS_DEFAULT \
 	"initrd_addr=0x83100000\0" \
 	"initrd_high=0xffffffffffffffff\0" \
@@ -68,7 +68,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	AHAB_ENV \
 	ENV_COMMON \
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index a63325973846..91454df19720 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -42,7 +42,7 @@
 #define FEC0_RESET IMX_GPIO_NR(2, 5)
 #define FEC0_PDOMAIN "conn_enet0"
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -56,7 +56,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 13bc4e7e682a..2de116c59da7 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -43,7 +43,7 @@
 #undef BOOTENV_RUN_NET_USB_START
 #define BOOTENV_RUN_NET_USB_START ""
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs ${consoleargs} " \
 		"rdinit=/linuxrc g_mass_storage.stall=0 " \
 		"g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
@@ -59,7 +59,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	AHAB_ENV \
 	BOOTENV \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 5158f2cc605a..6d0c45311183 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -24,13 +24,13 @@
 #define CFG_FEC_MXC_PHYADDR          0
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"initrd_addr=0x43800000\0" \
 	"initrd_high=0xffffffff\0" \
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 5692e3d00007..df2cb8d9ced1 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -33,7 +33,7 @@
 #define MFG_NAND_PARTITION ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -48,7 +48,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	M4_BOOT_ENV \
 	"script=boot.scr\0" \
 	"image=Image\0" \
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index e56083f8e61c..9c938f04e93c 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -32,7 +32,7 @@
 #define UPDATE_M4_ENV ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
 	"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
 		"rdinit=/linuxrc " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -52,7 +52,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	UPDATE_M4_ENV \
-	CONFIG_MFG_ENV_SETTINGS \
+	CFG_MFG_ENV_SETTINGS \
 	CFG_DFU_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
-- 
2.25.1

[PATCH 088/149] global: Migrate CONFIG_MXC_NAND_IP_REGS_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MXC_NAND_IP_REGS_BASE to CFG_MXC_NAND_IP_REGS_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/mxc_nand.c | 2 +-
 include/configs/m53menlo.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 8aa5f7342131..10679b2aa105 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -1175,7 +1175,7 @@ int board_nand_init(struct nand_chip *this)
 	host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
 #ifdef MXC_NFC_V3_2
 	host->ip_regs =
-		(struct mxc_nand_ip_regs __iomem *)CONFIG_MXC_NAND_IP_REGS_BASE;
+		(struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE;
 #endif
 	host->clk_act = 1;
 
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index de6928d29737..3ac67b0f489e 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -46,7 +46,7 @@
 #ifdef CONFIG_CMD_NAND
 #define CFG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
-#define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
+#define CFG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
 #endif
 
-- 
2.25.1

[PATCH 089/149] global: Migrate CONFIG_MXC_NAND_REGS_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MXC_NAND_REGS_BASE to CFG_MXC_NAND_REGS_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/mtd/nand/raw/mxc_nand.c | 2 +-
 include/configs/m53menlo.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 10679b2aa105..051ded6a240a 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -1172,7 +1172,7 @@ int board_nand_init(struct nand_chip *this)
 	this->write_buf = mxc_nand_write_buf;
 	this->read_buf = mxc_nand_read_buf;
 
-	host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
+	host->regs = (struct mxc_nand_regs __iomem *)CFG_MXC_NAND_REGS_BASE;
 #ifdef MXC_NFC_V3_2
 	host->ip_regs =
 		(struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE;
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 3ac67b0f489e..ee19c8936b9a 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -45,7 +45,7 @@
  */
 #ifdef CONFIG_CMD_NAND
 #define CFG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI
-#define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
+#define CFG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI
 #define CFG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CFG_SYS_NAND_LARGEPAGE
 #endif
-- 
2.25.1

[PATCH 090/149] global: Migrate CONFIG_MXC_UART_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_MXC_UART_BASE to CFG_MXC_UART_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/ge/b1x5v2/spl.c                       |  4 ++--
 drivers/serial/serial_mxc.c                 |  6 +++---
 include/configs/apalis_imx6.h               |  2 +-
 include/configs/cl-som-imx7.h               |  2 +-
 include/configs/cm_fx6.h                    |  2 +-
 include/configs/colibri_imx6.h              |  2 +-
 include/configs/dart_6ul.h                  |  2 +-
 include/configs/dh_imx6.h                   |  2 +-
 include/configs/display5.h                  |  2 +-
 include/configs/el6x_common.h               |  2 +-
 include/configs/embestmx6boards.h           |  2 +-
 include/configs/ge_b1x5v2.h                 |  4 ++--
 include/configs/gw_ventana.h                |  2 +-
 include/configs/imx6-engicam.h              |  4 ++--
 include/configs/imx6_logic.h                |  2 +-
 include/configs/imx6dl-mamoj.h              |  2 +-
 include/configs/imx6ulz_smm_m2.h            |  2 +-
 include/configs/imx7-cm.h                   |  2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h |  2 +-
 include/configs/imx8mp_dhcom_pdk2.h         |  2 +-
 include/configs/imx8mp_rsb3720.h            |  2 +-
 include/configs/imx8mq_cm.h                 |  2 +-
 include/configs/imx8mq_evk.h                |  2 +-
 include/configs/imx8mq_phanbell.h           |  2 +-
 include/configs/kontron-sl-mx6ul.h          |  2 +-
 include/configs/kontron_pitx_imx8m.h        |  2 +-
 include/configs/librem5.h                   | 10 +++++-----
 include/configs/liteboard.h                 |  2 +-
 include/configs/m53menlo.h                  |  2 +-
 include/configs/mccmon6.h                   |  2 +-
 include/configs/msc_sm2s_imx8mp.h           |  2 +-
 include/configs/mx51evk.h                   |  2 +-
 include/configs/mx53cx9020.h                |  2 +-
 include/configs/mx53loco.h                  |  2 +-
 include/configs/mx6cuboxi.h                 |  2 +-
 include/configs/mx6memcal.h                 |  6 +++---
 include/configs/mx6sabreauto.h              |  2 +-
 include/configs/mx6sabresd.h                |  2 +-
 include/configs/mx6slevk.h                  |  2 +-
 include/configs/mx6sllevk.h                 |  2 +-
 include/configs/mx6sxsabreauto.h            |  2 +-
 include/configs/mx6sxsabresd.h              |  2 +-
 include/configs/mx6ul_14x14_evk.h           |  2 +-
 include/configs/mx6ullevk.h                 |  2 +-
 include/configs/mys_6ulx.h                  |  2 +-
 include/configs/nitrogen6x.h                |  2 +-
 include/configs/novena.h                    |  2 +-
 include/configs/npi_imx6ull.h               |  2 +-
 include/configs/pcl063.h                    |  2 +-
 include/configs/pcl063_ull.h                |  2 +-
 include/configs/pico-imx6.h                 |  2 +-
 include/configs/pico-imx6ul.h               |  2 +-
 include/configs/pico-imx7d.h                |  2 +-
 include/configs/pico-imx8mq.h               |  2 +-
 include/configs/tqma6_mba6.h                |  2 +-
 include/configs/tqma6_wru4.h                |  2 +-
 include/configs/udoo.h                      |  2 +-
 include/configs/udoo_neo.h                  |  2 +-
 include/configs/usbarmory.h                 |  2 +-
 include/configs/vining_2000.h               |  2 +-
 include/configs/wandboard.h                 |  2 +-
 include/configs/xpress.h                    |  2 +-
 62 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/board/ge/b1x5v2/spl.c b/board/ge/b1x5v2/spl.c
index 52c80f792d3c..460d3be1d834 100644
--- a/board/ge/b1x5v2/spl.c
+++ b/board/ge/b1x5v2/spl.c
@@ -565,9 +565,9 @@ void board_init_f(ulong dummy)
 	timer_init();
 
 	/* iomux */
-	if (CONFIG_MXC_UART_BASE == UART2_BASE)
+	if (CFG_MXC_UART_BASE == UART2_BASE)
 		SETUP_IOMUX_PADS(uart2_pads);
-	else if (CONFIG_MXC_UART_BASE == UART3_BASE)
+	else if (CFG_MXC_UART_BASE == UART3_BASE)
 		SETUP_IOMUX_PADS(uart3_pads);
 
 	/* UART clocks enabled and gd valid - init serial console */
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 82c0d84628d5..8bcbbf2bbfcb 100644
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
 
 #if !CONFIG_IS_ENABLED(DM_SERIAL)
 
-#ifndef CONFIG_MXC_UART_BASE
-#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
+#ifndef CFG_MXC_UART_BASE
+#error "define CFG_MXC_UART_BASE to use the MXC UART driver"
 #endif
 
-#define mxc_base	((struct mxc_uart *)CONFIG_MXC_UART_BASE)
+#define mxc_base	((struct mxc_uart *)CFG_MXC_UART_BASE)
 
 static void mxc_serial_setbrg(void)
 {
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index d46159076f2c..2fb4cfa5e9a1 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index cde7d3c891ab..b7920c7b3057 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 47b76c9371e8..90ebec4a94ca 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -26,7 +26,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* Serial console */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 /* Environment */
 
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index bf2a9bbaaff1..3c67aab04c1c 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index c2ed9c7c56af..fb619105a760 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -28,7 +28,7 @@
 #define MMC_ROOTFS_PART			2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 6aef15c658c0..348be5a6ec64 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	3
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 70ad88c90750..cd1544be039f 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -34,7 +34,7 @@
 #define CFG_SYS_SPI_ARGS_OFFS        0x140000
 #define CFG_SYS_SPI_ARGS_SIZE        0x10000
 
-#define CONFIG_MXC_UART_BASE		UART5_BASE
+#define CFG_MXC_UART_BASE		UART5_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index a5e2dc063a74..6913a91c4c19 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -21,7 +21,7 @@
 
 /* Commands */
 
-#define CONFIG_MXC_UART_BASE	UART2_BASE
+#define CFG_MXC_UART_BASE	UART2_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS                                               \
 	"board=EL6Q\0"								\
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index c1748fc26025..81a92c9bb971 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -12,7 +12,7 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
 
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 0523ff9a64b8..529b8fc53e57 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -13,9 +13,9 @@
 #include "mx6_common.h"
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CFG_MXC_UART_BASE		UART3_BASE
 
-#if CONFIG_MXC_UART_BASE == UART2_BASE
+#if CFG_MXC_UART_BASE == UART2_BASE
 /* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */
 #define CONSOLE_DEVICE "ttymxc1" /* System on Module debug connector */
 #else
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 5a78c68e2fcc..c6ace9d65eb3 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -16,7 +16,7 @@
 #include "mx6_common.h"
 
 /* Serial */
-#define CONFIG_MXC_UART_BASE	       UART2_BASE
+#define CFG_MXC_UART_BASE	       UART2_BASE
 
 /* NAND */
 
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 4208ba95915e..786b70fe064d 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -116,9 +116,9 @@
 /* UART */
 #ifdef CONFIG_MXC_UART
 # ifdef CONFIG_MX6UL
-#  define CONFIG_MXC_UART_BASE		UART1_BASE
+#  define CFG_MXC_UART_BASE		UART1_BASE
 # else
-#  define CONFIG_MXC_UART_BASE		UART4_BASE
+#  define CFG_MXC_UART_BASE		UART4_BASE
 # endif
 #endif
 
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 121b34ae96db..f9544cd430ca 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -8,7 +8,7 @@
 #ifndef __IMX6LOGIC_CONFIG_H
 #define __IMX6LOGIC_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
 #include "mx6_common.h"
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 162b0b8a69bb..db08e43f0d86 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -35,7 +35,7 @@
 #include <config_distro_bootcmd.h>
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CFG_MXC_UART_BASE		UART3_BASE
 
 /* MMC */
 
diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h
index c95038eaa537..9da98d0af277 100644
--- a/include/configs/imx6ulz_smm_m2.h
+++ b/include/configs/imx6ulz_smm_m2.h
@@ -12,7 +12,7 @@
 #include <linux/sizes.h>
 #include <linux/stringify.h>
 
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 #ifndef CONFIG_SPL_BUILD
 
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 66cf5b463fc2..84fb1bfb7598 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 #undef CFG_EXTRA_ENV_SETTINGS
 
diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 0723d27ab703..f7d2b660c1f3 100644
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -25,7 +25,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x40000000 /* Minimum 1 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h
index b8fdedefa21f..d022faaa91a4 100644
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x20000000 /* Minimum 512 MiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT		20000
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index e4e24b522fdb..495ca313db28 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -148,7 +148,7 @@
 #define PHYS_SDRAM_2_SIZE		0x80000000	/* 2 GB */
 #endif
 
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index f7ae1b47d063..828bd6723727 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -54,7 +54,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE					0x40000000 /* 1 GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM		2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 4b46321e8512..a7a51907f5c9 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -59,7 +59,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 6d0c45311183..bfde15e6240f 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -92,7 +92,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0x40000000 /* 1GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index e3ae91089ffa..4354f3945e83 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -22,7 +22,7 @@
 #define CFG_SYS_UBOOT_BASE		CONFIG_TEXT_BASE
 
 /* Board and environment settings */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 5a3c9f76a431..bf590efb4348 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -67,7 +67,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE			0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(3)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(3)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR       0
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 7417f8582a4c..9e4d373e56d5 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -30,23 +30,23 @@
 #define CONSOLE_ON_UART1
 
 #ifdef CONSOLE_ON_UART1
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 #define CONSOLE_UART_CLK		0
 #define CONSOLE		"ttymxc0"
 #elif defined(CONSOLE_ON_UART2)
-#define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART2_BASE_ADDR
 #define CONSOLE_UART_CLK		1
 #define CONSOLE		"ttymxc1"
 #elif defined(CONSOLE_ON_UART3)
-#define CONFIG_MXC_UART_BASE		UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART3_BASE_ADDR
 #define CONSOLE_UART_CLK		2
 #define CONSOLE		"ttymxc2"
 #elif defined(CONSOLE_ON_UART4)
-#define CONFIG_MXC_UART_BASE		UART4_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART4_BASE_ADDR
 #define CONSOLE_UART_CLK		3
 #define CONSOLE		"ttymxc3"
 #else
-#define CONFIG_MXC_UART_BASE		UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_BASE_ADDR
 #define CONSOLE_UART_CLK		0
 #define CONSOLE		"ttymxc0"
 #endif
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 0b8781d7bf34..63e5dbfab775 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -13,7 +13,7 @@
 #include <linux/stringify.h>
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index ee19c8936b9a..9aac5677fb75 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -31,7 +31,7 @@
 /*
  * Serial Driver
  */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /*
  * MMC Driver
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 6cc49378fedc..b64bf93bcb74 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -17,7 +17,7 @@
  * mode from SD card (SD2)
  */
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index 1cd0b3cf7374..c1c1fd5a7843 100644
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -55,7 +55,7 @@
 #define PHYS_SDRAM_2			0xc0000000
 #define PHYS_SDRAM_2_SIZE		0x0
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART2_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 740e357e00e9..123b7a533b17 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -18,7 +18,7 @@
  * Hardware drivers
  */
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS	0
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index baffe65c3697..1a3ec6e0cdb8 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -14,7 +14,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE UART2_BASE
+#define CFG_MXC_UART_BASE UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 0ac93d6e0432..d87f9e942c51 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -11,7 +11,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d4af96b51ea4..871d52c343f5 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -19,7 +19,7 @@
 
 /* Command definition */
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"som_rev=undefined\0" \
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index f6d3b2eeb9cf..b664962a26a5 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -14,12 +14,12 @@
 
 #ifdef CONFIG_SERIAL_CONSOLE_UART1
 #if defined(CONFIG_MX6SL)
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
 #else
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 #endif
 #elif defined(CONFIG_SERIAL_CONSOLE_UART2)
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #else
 #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
 #endif
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 888da7ce365f..274c14bbd383 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -8,7 +8,7 @@
 #ifndef __MX6SABREAUTO_CONFIG_H
 #define __MX6SABREAUTO_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE	UART4_BASE
+#define CFG_MXC_UART_BASE	UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 78a554d0ccba..af9978e02c89 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -8,7 +8,7 @@
 #ifndef __MX6SABRESD_CONFIG_H
 #define __MX6SABRESD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 #define CONSOLE_DEV		"ttymxc0"
 
 #include "mx6sabre_common.h"
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 4fbd06783a6d..f6d9ac20821f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index cf4871cbae39..aec3e51bff87 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"epdc_waveform=epdc_splash.bin\0" \
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3399cdd16fa8..3d0f6e452d65 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index c99d99abc179..8c39e6d6cf4d 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -12,7 +12,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 #ifdef CONFIG_IMX_BOOTAUX
 
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 5e3695ecc971..3f8a90b626d1 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -15,7 +15,7 @@
 
 #define is_mx6ul_9x9_evk()	CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 58d1a744ae99..2c3cd32cefa7 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -16,7 +16,7 @@
 
 #define PHYS_SDRAM_SIZE	SZ_512M
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 43261824d3cf..0c0235b42984 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index aca15be64b11..5625771bad14 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -11,7 +11,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE	       UART2_BASE
+#define CFG_MXC_UART_BASE	       UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 3ffb44ab7252..7243549b68d8 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -49,7 +49,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 4b47e4fbb37a..24d7b0c26e86 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 146f87e9ce33..e8c48cf83652 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -22,7 +22,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 0890c115700c..bd04268a3ef3 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -22,7 +22,7 @@
 #define MMC_ROOTFS_PART		2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configs */
 
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index e1f7b7003194..a1d0dd93c526 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 1cb8fa63e721..64e0a5564810 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -17,7 +17,7 @@
 
 #define CFG_FEC_MXC_PHYADDR		0x1
 
-#define CONFIG_MXC_UART_BASE		UART6_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART6_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 7fc6211ff732..dbeaeea77f7d 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
 
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 37ade717ae99..4b602ea03022 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -71,7 +71,7 @@
 #define PHYS_SDRAM			0x40000000
 #define PHYS_SDRAM_SIZE			0x80000000	/* 2 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE		UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE		UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM	2
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index a5f14dc42679..b5871424bc64 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -11,7 +11,7 @@
 
 #define CFG_FEC_MXC_PHYADDR		0x03
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 #define CONSOLE_DEV		"ttymxc1"
 
 #endif /* __CONFIG_TQMA6_MBA6_H */
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 34c9b6a2f97c..e06fc7fe1559 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -10,7 +10,7 @@
 #define CFG_FEC_MXC_PHYADDR		0x01
 
 /* UART */
-#define CONFIG_MXC_UART_BASE		UART4_BASE
+#define CFG_MXC_UART_BASE		UART4_BASE
 #define CONSOLE_DEV		"ttymxc3"
 
 /* Watchdog */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index f0092eff1494..d85cf7808c7e 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CFG_MXC_UART_BASE		UART2_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 5d7d734daa2d..842abb7b7a22 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* Command definition */
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* Linux only */
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 11706148f1e2..00b45cc3d2ad 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -17,7 +17,7 @@
 /* U-Boot general configurations */
 
 /* UART */
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CFG_MXC_UART_BASE	UART1_BASE
 
 /* SD/MMC */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index cdd2eeef0ac9..7954ed9910c7 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -50,7 +50,7 @@
 #endif
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 #endif
 
 #endif				/* __CONFIG_H */
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 1e765439fabe..8853bcd7be28 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE		UART1_BASE
+#define CFG_MXC_UART_BASE		UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 96996ac1f0f2..c8ae047e62c3 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -10,7 +10,7 @@
 #include "mx6_common.h"
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE		MX6UL_UART7_BASE_ADDR
+#define CFG_MXC_UART_BASE		MX6UL_UART7_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
-- 
2.25.1

[PATCH 091/149] global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

[Tom Rini]

Perform simple renames of:
   CONFIG_MXC_USB_FLAGS to CFG_MXC_USB_FLAGS
   CONFIG_MXC_USB_PORT to CFG_MXC_USB_PORT
   CONFIG_MXC_USB_PORTSC to CFG_MXC_USB_PORTSC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/host/ehci-mx5.c              | 4 ++--
 drivers/usb/host/ehci-mx6.c              | 8 ++++----
 include/configs/apalis_imx6.h            | 4 ++--
 include/configs/aristainetos2.h          | 4 ++--
 include/configs/brppt2.h                 | 2 +-
 include/configs/cl-som-imx7.h            | 4 ++--
 include/configs/cm_fx6.h                 | 4 ++--
 include/configs/colibri-imx6ull.h        | 4 ++--
 include/configs/colibri_imx6.h           | 4 ++--
 include/configs/colibri_imx7.h           | 4 ++--
 include/configs/dart_6ul.h               | 4 ++--
 include/configs/dh_imx6.h                | 4 ++--
 include/configs/display5.h               | 2 +-
 include/configs/embestmx6boards.h        | 4 ++--
 include/configs/ge_b1x5v2.h              | 4 ++--
 include/configs/gw_ventana.h             | 4 ++--
 include/configs/imx6_logic.h             | 4 ++--
 include/configs/imx6dl-mamoj.h           | 4 ++--
 include/configs/imx6q-bosch-acc.h        | 4 ++--
 include/configs/imx7-cm.h                | 2 +-
 include/configs/imx8mm-cl-iot-gate.h     | 2 +-
 include/configs/kontron-sl-mx6ul.h       | 4 ++--
 include/configs/kontron-sl-mx8mm.h       | 4 ++--
 include/configs/kp_imx53.h               | 4 ++--
 include/configs/kp_imx6q_tpc.h           | 4 ++--
 include/configs/liteboard.h              | 4 ++--
 include/configs/m53menlo.h               | 6 +++---
 include/configs/meerkat96.h              | 2 +-
 include/configs/mx51evk.h                | 6 +++---
 include/configs/mx53cx9020.h             | 6 +++---
 include/configs/mx53loco.h               | 6 +++---
 include/configs/mx53ppd.h                | 6 +++---
 include/configs/mx6cuboxi.h              | 2 +-
 include/configs/mx6memcal.h              | 2 +-
 include/configs/mx6sabreauto.h           | 4 ++--
 include/configs/mx6sabresd.h             | 4 ++--
 include/configs/mx6slevk.h               | 4 ++--
 include/configs/mx6sllevk.h              | 2 +-
 include/configs/mx6sxsabreauto.h         | 4 ++--
 include/configs/mx6sxsabresd.h           | 4 ++--
 include/configs/mx6ul_14x14_evk.h        | 4 ++--
 include/configs/mx7dsabresd.h            | 2 +-
 include/configs/mx7ulp_com.h             | 2 +-
 include/configs/mys_6ulx.h               | 4 ++--
 include/configs/nitrogen6x.h             | 4 ++--
 include/configs/novena.h                 | 4 ++--
 include/configs/npi_imx6ull.h            | 4 ++--
 include/configs/o4-imx6ull-nano.h        | 2 +-
 include/configs/opos6uldev.h             | 4 ++--
 include/configs/pcl063.h                 | 4 ++--
 include/configs/pcl063_ull.h             | 4 ++--
 include/configs/pico-imx6.h              | 4 ++--
 include/configs/pico-imx6ul.h            | 4 ++--
 include/configs/pico-imx7d.h             | 4 ++--
 include/configs/somlabs_visionsom_6ull.h | 4 ++--
 include/configs/tbs2910.h                | 2 +-
 include/configs/tqma6.h                  | 2 +-
 include/configs/usbarmory.h              | 6 +++---
 include/configs/verdin-imx8mm.h          | 2 +-
 include/configs/vining_2000.h            | 4 ++--
 include/configs/wandboard.h              | 4 ++--
 include/configs/warp7.h                  | 2 +-
 include/configs/xpress.h                 | 4 ++--
 63 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 964a53bb7c0e..c11279867c7c 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -299,10 +299,10 @@ static int ehci_usb_probe(struct udevice *dev)
 			HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
 	setbits_le32(&ehci->usbmode, CM_HOST);
 
-	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	__raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
-	mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS);
+	mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
 	mdelay(10);
 
 	return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index fa2ca2a1d912..0a12db614ff4 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define UCMD_RESET		(1 << 1) /* controller reset */
 
 /* If this is not defined, assume MX6/MX7/MX8M SoC default */
-#ifndef CONFIG_MXC_USB_PORTSC
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#ifndef CFG_MXC_USB_PORTSC
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 /* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 		return 0;
 
 	setbits_le32(&ehci->usbmode, CM_HOST);
-	writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
 	mdelay(10);
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)
 	case USBPHY_INTERFACE_MODE_HSIC:
 		return PORT_PTS_HSIC;
 	default:
-		return CONFIG_MXC_USB_PORTSC;
+		return CFG_MXC_USB_PORTSC;
 	}
 }
 
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 2fb4cfa5e9a1..8a9f3ef75a7d 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -26,8 +26,8 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index be1478ea8b67..286435d6f84c 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -413,8 +413,8 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* UBI support */
 
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 32d9f503d9f0..38c98c5e21c4 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -79,6 +79,6 @@ BUR_COMMON_ENV \
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_BRPP2_IMX6_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b7920c7b3057..0a667c60b61b 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -96,7 +96,7 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 90ebec4a94ca..7d0f2b6dc13a 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -135,8 +135,8 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Boot */
 #define CFG_SYS_BOOTMAPSZ	        (8 << 20)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 5b802aa92a9c..ba45ee4efd37 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -123,8 +123,8 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3c67aab04c1c..4b2841833b5a 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -23,8 +23,8 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Command definition */
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 91f87ea283fe..c568643977ca 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -167,7 +167,7 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #endif
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index fb619105a760..c5781670864b 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -47,8 +47,8 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 348be5a6ec64..5cf73274d5e1 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,8 +32,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
diff --git a/include/configs/display5.h b/include/configs/display5.h
index cd1544be039f..3b96fff7d6f8 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -288,5 +288,5 @@
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */
 #endif
 
-#define CONFIG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 81a92c9bb971..31c7e104f6b8 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -18,8 +18,8 @@
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 529b8fc53e57..49b058cb10d4 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -24,8 +24,8 @@
 #endif
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Memory */
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index c6ace9d65eb3..0a9dfe736f7d 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,8 +36,8 @@
 /* Various command support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS      0
+#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS      0
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f9544cd430ca..85c054451f35 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -117,8 +117,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Falcon Mode */
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index db08e43f0d86..6c61b3f44801 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -43,8 +43,8 @@
 #define CFG_FEC_MXC_PHYADDR		1
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS			0
 
 /* Falcon */
 
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index e28185f24dd3..2c998cdcfc72 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -110,7 +110,7 @@
 #endif
 #endif
 
-#define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS             0
+#define CFG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS             0
 
 #endif /* __IMX6Q_ACC_H */
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 84fb1bfb7598..106fbdb9053c 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -79,6 +79,6 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 64cdc401d039..2641d7bc960b 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -139,6 +139,6 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /*__IMX8MM_CL_IOT_GATE_H*/
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 4354f3945e83..1c92cd787677 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -25,8 +25,8 @@
 #define CFG_MXC_UART_BASE		UART4_BASE
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Boot order for distro boot */
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index d80238bd02f2..eee3d2ddb037 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -25,8 +25,8 @@
 /* Board and environment settings */
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* GUID for capsule updatable firmware image */
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index da8a67b4ab63..6e383cbe75f7 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -11,8 +11,8 @@
 #include <linux/sizes.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 99321b320f5f..1aa4b8ab5987 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -18,8 +18,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS	\
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 63e5dbfab775..5811059c8e2b 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -95,8 +95,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 9aac5677fb75..1ecbba1b58ff 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -70,9 +70,9 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORT		1
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORT		1
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LVDS display */
diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 9e480fe0558e..6ffc1282411a 100644
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -24,6 +24,6 @@
 /* Environment configs */
 
 /* USB configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 123b7a533b17..dff54d04a678 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -33,9 +33,9 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	MMC_SDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_ULPI
-#define CONFIG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	PORT_PTS_ULPI
+#define CFG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 1a3ec6e0cdb8..e995776d30d5 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -23,9 +23,9 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d87f9e942c51..7398804e6b54 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -17,9 +17,9 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
 #define CFG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 94d2191af91d..df65dbeea41c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -12,9 +12,9 @@
 #include <asm/arch/imx-regs.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 871d52c343f5..f0d6405d3012 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -15,7 +15,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* Command definition */
 
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index b664962a26a5..f2edd13eb881 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -31,6 +31,6 @@
 #define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_UTMI
+#define CFG_MXC_USB_PORTSC	PORT_PTS_UTMI
 
 #endif	       /* __CONFIG_H */
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 274c14bbd383..da98139d7d77 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -12,8 +12,8 @@
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index af9978e02c89..2b028e3aa2b1 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -29,8 +29,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #endif                         /* __MX6SABRESD_CONFIG_H */
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index f6d9ac20821f..39c8ef060c7f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -90,8 +90,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	3
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index aec3e51bff87..290996b51bc7 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -94,7 +94,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 #include <linux/stringify.h>
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3d0f6e452d65..1c14a6beb0ac 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -96,8 +96,8 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8c39e6d6cf4d..8b02c3b63101 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -118,8 +118,8 @@
 #define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_PCI
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 3f8a90b626d1..635ae78abcb5 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -116,8 +116,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 9c938f04e93c..94bee75fdea5 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -99,6 +99,6 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 5ee5129801d2..a310c64e7948 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -51,5 +51,5 @@
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	SZ_256K
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif	/* __CONFIG_H */
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 0c0235b42984..2571098d06c6 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -30,8 +30,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 5625771bad14..c9c599d07621 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -21,8 +21,8 @@
 #define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 7243549b68d8..dc5b04312905 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -53,8 +53,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Extra U-Boot environment. */
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 24d7b0c26e86..5f933391cc01 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -29,8 +29,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_MXC_PHYADDR		0x1
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index 0e1083a2130c..9050da8738b1 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 #if IS_ENABLED(CONFIG_CMD_USB)
-#	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#	define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 459134b93f83..1edb1826c4e8 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -19,8 +19,8 @@
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LCD */
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index e8c48cf83652..38dcee053596 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -42,8 +42,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index bd04268a3ef3..d742201ce43b 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -44,8 +44,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index a1d0dd93c526..d806d7d9c57d 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -16,8 +16,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 64e0a5564810..4caa82337583 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -23,8 +23,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index dbeaeea77f7d..fd8962e9f751 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -107,7 +107,7 @@
 #define CFG_SYS_FSL_USDHC_NUM		2
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS			0
 
 #endif
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 3418d4e2b559..041a83b057d4 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -61,8 +61,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 9b396e6e73b0..535859792d3b 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -27,7 +27,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB      */
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index cb5f7fc25af9..af5a474cf31e 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -39,7 +39,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 00b45cc3d2ad..27e61f5b8f46 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -23,9 +23,9 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Linux boot */
 
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 27d7efb883de..8cb1f1aff353 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -67,6 +67,6 @@
 #define PHYS_SDRAM_SIZE			SZ_2G /* 2GB DDR */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /* __VERDIN_IMX8MM_H */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 7954ed9910c7..6db68c1e7001 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -36,8 +36,8 @@
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 8853bcd7be28..7b8c5cbe7a8f 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -17,8 +17,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 0826e0bbe025..5d2956a5963c 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -93,7 +93,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index c8ae047e62c3..a2aa31008ec9 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -28,8 +28,8 @@
 /* Environment is in stored in the eMMC boot partition */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
 #define CFG_FEC_MXC_PHYADDR          0x0
-- 
2.25.1

[PATCH 091/149] global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

[Tom Rini]

Perform simple renames of:
   CONFIG_MXC_USB_FLAGS to CFG_MXC_USB_FLAGS
   CONFIG_MXC_USB_PORT to CFG_MXC_USB_PORT
   CONFIG_MXC_USB_PORTSC to CFG_MXC_USB_PORTSC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/host/ehci-mx5.c              | 4 ++--
 drivers/usb/host/ehci-mx6.c              | 8 ++++----
 include/configs/apalis_imx6.h            | 4 ++--
 include/configs/aristainetos2.h          | 4 ++--
 include/configs/brppt2.h                 | 2 +-
 include/configs/cl-som-imx7.h            | 4 ++--
 include/configs/cm_fx6.h                 | 4 ++--
 include/configs/colibri-imx6ull.h        | 4 ++--
 include/configs/colibri_imx6.h           | 4 ++--
 include/configs/colibri_imx7.h           | 4 ++--
 include/configs/dart_6ul.h               | 4 ++--
 include/configs/dh_imx6.h                | 4 ++--
 include/configs/display5.h               | 2 +-
 include/configs/embestmx6boards.h        | 4 ++--
 include/configs/ge_b1x5v2.h              | 4 ++--
 include/configs/gw_ventana.h             | 4 ++--
 include/configs/imx6_logic.h             | 4 ++--
 include/configs/imx6dl-mamoj.h           | 4 ++--
 include/configs/imx6q-bosch-acc.h        | 4 ++--
 include/configs/imx7-cm.h                | 2 +-
 include/configs/imx8mm-cl-iot-gate.h     | 2 +-
 include/configs/kontron-sl-mx6ul.h       | 4 ++--
 include/configs/kontron-sl-mx8mm.h       | 4 ++--
 include/configs/kp_imx53.h               | 4 ++--
 include/configs/kp_imx6q_tpc.h           | 4 ++--
 include/configs/liteboard.h              | 4 ++--
 include/configs/m53menlo.h               | 6 +++---
 include/configs/meerkat96.h              | 2 +-
 include/configs/mx51evk.h                | 6 +++---
 include/configs/mx53cx9020.h             | 6 +++---
 include/configs/mx53loco.h               | 6 +++---
 include/configs/mx53ppd.h                | 6 +++---
 include/configs/mx6cuboxi.h              | 2 +-
 include/configs/mx6memcal.h              | 2 +-
 include/configs/mx6sabreauto.h           | 4 ++--
 include/configs/mx6sabresd.h             | 4 ++--
 include/configs/mx6slevk.h               | 4 ++--
 include/configs/mx6sllevk.h              | 2 +-
 include/configs/mx6sxsabreauto.h         | 4 ++--
 include/configs/mx6sxsabresd.h           | 4 ++--
 include/configs/mx6ul_14x14_evk.h        | 4 ++--
 include/configs/mx7dsabresd.h            | 2 +-
 include/configs/mx7ulp_com.h             | 2 +-
 include/configs/mys_6ulx.h               | 4 ++--
 include/configs/nitrogen6x.h             | 4 ++--
 include/configs/novena.h                 | 4 ++--
 include/configs/npi_imx6ull.h            | 4 ++--
 include/configs/o4-imx6ull-nano.h        | 2 +-
 include/configs/opos6uldev.h             | 4 ++--
 include/configs/pcl063.h                 | 4 ++--
 include/configs/pcl063_ull.h             | 4 ++--
 include/configs/pico-imx6.h              | 4 ++--
 include/configs/pico-imx6ul.h            | 4 ++--
 include/configs/pico-imx7d.h             | 4 ++--
 include/configs/somlabs_visionsom_6ull.h | 4 ++--
 include/configs/tbs2910.h                | 2 +-
 include/configs/tqma6.h                  | 2 +-
 include/configs/usbarmory.h              | 6 +++---
 include/configs/verdin-imx8mm.h          | 2 +-
 include/configs/vining_2000.h            | 4 ++--
 include/configs/wandboard.h              | 4 ++--
 include/configs/warp7.h                  | 2 +-
 include/configs/xpress.h                 | 4 ++--
 63 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 964a53bb7c0e..c11279867c7c 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -299,10 +299,10 @@ static int ehci_usb_probe(struct udevice *dev)
 			HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
 	setbits_le32(&ehci->usbmode, CM_HOST);
 
-	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	__raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
-	mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS);
+	mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
 	mdelay(10);
 
 	return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index fa2ca2a1d912..0a12db614ff4 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define UCMD_RESET		(1 << 1) /* controller reset */
 
 /* If this is not defined, assume MX6/MX7/MX8M SoC default */
-#ifndef CONFIG_MXC_USB_PORTSC
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#ifndef CFG_MXC_USB_PORTSC
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 /* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 		return 0;
 
 	setbits_le32(&ehci->usbmode, CM_HOST);
-	writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+	writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
 	setbits_le32(&ehci->portsc, USB_EN);
 
 	mdelay(10);
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)
 	case USBPHY_INTERFACE_MODE_HSIC:
 		return PORT_PTS_HSIC;
 	default:
-		return CONFIG_MXC_USB_PORTSC;
+		return CFG_MXC_USB_PORTSC;
 	}
 }
 
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 2fb4cfa5e9a1..8a9f3ef75a7d 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -26,8 +26,8 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index be1478ea8b67..286435d6f84c 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -413,8 +413,8 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* UBI support */
 
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 32d9f503d9f0..38c98c5e21c4 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -79,6 +79,6 @@ BUR_COMMON_ENV \
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_BRPP2_IMX6_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b7920c7b3057..0a667c60b61b 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -96,7 +96,7 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 90ebec4a94ca..7d0f2b6dc13a 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -135,8 +135,8 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Boot */
 #define CFG_SYS_BOOTMAPSZ	        (8 << 20)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 5b802aa92a9c..ba45ee4efd37 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -123,8 +123,8 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3c67aab04c1c..4b2841833b5a 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -23,8 +23,8 @@
 
 /* USB Configs */
 /* Host */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Command definition */
 
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 91f87ea283fe..c568643977ca 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -167,7 +167,7 @@
 
 /* USB Configs */
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #endif
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index fb619105a760..c5781670864b 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -47,8 +47,8 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 348be5a6ec64..5cf73274d5e1 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,8 +32,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
diff --git a/include/configs/display5.h b/include/configs/display5.h
index cd1544be039f..3b96fff7d6f8 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -288,5 +288,5 @@
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */
 #endif
 
-#define CONFIG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* __CONFIG_H */
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 81a92c9bb971..31c7e104f6b8 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -18,8 +18,8 @@
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 529b8fc53e57..49b058cb10d4 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -24,8 +24,8 @@
 #endif
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 /* Memory */
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index c6ace9d65eb3..0a9dfe736f7d 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,8 +36,8 @@
 /* Various command support */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS      0
+#define CFG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS      0
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f9544cd430ca..85c054451f35 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -117,8 +117,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Falcon Mode */
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index db08e43f0d86..6c61b3f44801 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -43,8 +43,8 @@
 #define CFG_FEC_MXC_PHYADDR		1
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS			0
 
 /* Falcon */
 
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index e28185f24dd3..2c998cdcfc72 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -110,7 +110,7 @@
 #endif
 #endif
 
-#define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS             0
+#define CFG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS             0
 
 #endif /* __IMX6Q_ACC_H */
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 84fb1bfb7598..106fbdb9053c 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -79,6 +79,6 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 64cdc401d039..2641d7bc960b 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -139,6 +139,6 @@
 #define CFG_FEC_MXC_PHYADDR		0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /*__IMX8MM_CL_IOT_GATE_H*/
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 4354f3945e83..1c92cd787677 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -25,8 +25,8 @@
 #define CFG_MXC_UART_BASE		UART4_BASE
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Boot order for distro boot */
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index d80238bd02f2..eee3d2ddb037 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -25,8 +25,8 @@
 /* Board and environment settings */
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* GUID for capsule updatable firmware image */
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index da8a67b4ab63..6e383cbe75f7 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -11,8 +11,8 @@
 #include <linux/sizes.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 99321b320f5f..1aa4b8ab5987 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -18,8 +18,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS	\
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 63e5dbfab775..5811059c8e2b 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -95,8 +95,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 9aac5677fb75..1ecbba1b58ff 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -70,9 +70,9 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORT		1
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORT		1
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LVDS display */
diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 9e480fe0558e..6ffc1282411a 100644
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -24,6 +24,6 @@
 /* Environment configs */
 
 /* USB configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 123b7a533b17..dff54d04a678 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -33,9 +33,9 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	MMC_SDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_ULPI
-#define CONFIG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	PORT_PTS_ULPI
+#define CFG_MXC_USB_FLAGS	MXC_EHCI_POWER_PINS_ENABLED
 
 /* Framebuffer and LCD */
 
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 1a3ec6e0cdb8..e995776d30d5 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -23,9 +23,9 @@
 
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d87f9e942c51..7398804e6b54 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -17,9 +17,9 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* PMIC Controller */
 #define CFG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 94d2191af91d..df65dbeea41c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -12,9 +12,9 @@
 #include <asm/arch/imx-regs.h>
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Command definition */
 
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 871d52c343f5..f0d6405d3012 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -15,7 +15,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
 
 /* USB */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* Command definition */
 
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index b664962a26a5..f2edd13eb881 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -31,6 +31,6 @@
 #define CFG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
-#define CONFIG_MXC_USB_PORTSC	PORT_PTS_UTMI
+#define CFG_MXC_USB_PORTSC	PORT_PTS_UTMI
 
 #endif	       /* __CONFIG_H */
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 274c14bbd383..da98139d7d77 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -12,8 +12,8 @@
 #define CONSOLE_DEV		"ttymxc3"
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index af9978e02c89..2b028e3aa2b1 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -29,8 +29,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #endif                         /* __MX6SABRESD_CONFIG_H */
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index f6d9ac20821f..39c8ef060c7f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -90,8 +90,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	3
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index aec3e51bff87..290996b51bc7 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -94,7 +94,7 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif
 
 #include <linux/stringify.h>
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3d0f6e452d65..1c14a6beb0ac 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -96,8 +96,8 @@
 #define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #define CFG_SYS_FSL_USDHC_NUM	2
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8c39e6d6cf4d..8b02c3b63101 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -118,8 +118,8 @@
 #define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_PCI
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 3f8a90b626d1..635ae78abcb5 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -116,8 +116,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 9c938f04e93c..94bee75fdea5 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -99,6 +99,6 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 5ee5129801d2..a310c64e7948 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -51,5 +51,5 @@
 #define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	SZ_256K
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif	/* __CONFIG_H */
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 0c0235b42984..2571098d06c6 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -30,8 +30,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 5625771bad14..c9c599d07621 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -21,8 +21,8 @@
 #define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 #ifdef CONFIG_CMD_MMC
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 7243549b68d8..dc5b04312905 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -53,8 +53,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* Extra U-Boot environment. */
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 24d7b0c26e86..5f933391cc01 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -29,8 +29,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_MXC_PHYADDR		0x1
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index 0e1083a2130c..9050da8738b1 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 #if IS_ENABLED(CONFIG_CMD_USB)
-#	define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#	define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB */
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 459134b93f83..1edb1826c4e8 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -19,8 +19,8 @@
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 #endif
 
 /* LCD */
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index e8c48cf83652..38dcee053596 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -42,8 +42,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index bd04268a3ef3..d742201ce43b 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -44,8 +44,8 @@
 #define CFG_SYS_NAND_BASE		0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define ENV_MMC \
 	"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index a1d0dd93c526..d806d7d9c57d 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -16,8 +16,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC3_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 64e0a5564810..4caa82337583 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -23,8 +23,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index dbeaeea77f7d..fd8962e9f751 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -107,7 +107,7 @@
 #define CFG_SYS_FSL_USDHC_NUM		2
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS			0
+#define CFG_MXC_USB_PORTSC			(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS			0
 
 #endif
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 3418d4e2b559..041a83b057d4 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -61,8 +61,8 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 #endif
 
 #ifdef CONFIG_CMD_NET
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 9b396e6e73b0..535859792d3b 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -27,7 +27,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #endif /* CONFIG_CMD_USB      */
 
 #define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index cb5f7fc25af9..af5a474cf31e 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -39,7 +39,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 00b45cc3d2ad..27e61f5b8f46 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -23,9 +23,9 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB */
-#define CONFIG_MXC_USB_PORT	1
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CFG_MXC_USB_PORT	1
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS	0
 
 /* Linux boot */
 
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 27d7efb883de..8cb1f1aff353 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -67,6 +67,6 @@
 #define PHYS_SDRAM_SIZE			SZ_2G /* 2GB DDR */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif /* __VERDIN_IMX8MM_H */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 7954ed9910c7..6db68c1e7001 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -36,8 +36,8 @@
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS   0
+#define CFG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 8853bcd7be28..7b8c5cbe7a8f 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -17,8 +17,8 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 0826e0bbe025..5d2956a5963c 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -93,7 +93,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	1
 
 
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* USB Device Firmware Update support */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index c8ae047e62c3..a2aa31008ec9 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -28,8 +28,8 @@
 /* Environment is in stored in the eMMC boot partition */
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS		0
+#define CFG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
 #define CFG_FEC_MXC_PHYADDR          0x0
-- 
2.25.1

[PATCH 092/149] global: Migrate CONFIG_ODROID_REV_AIN to CFG

[Tom Rini]

Perform a simple rename of CONFIG_ODROID_REV_AIN to CFG_ODROID_REV_AIN

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/exynos5-dt-types.c | 4 ++--
 include/configs/odroid_xu3.h            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c
index 554fc91cc1a3..9294d36ba358 100644
--- a/board/samsung/common/exynos5-dt-types.c
+++ b/board/samsung/common/exynos5-dt-types.c
@@ -57,7 +57,7 @@ static int odroid_get_adc_val(unsigned int *adcval)
 	unsigned int adcval_prev = 0;
 	int ret, retries = 20;
 
-	ret = adc_channel_single_shot("adc@12D10000", CONFIG_ODROID_REV_AIN,
+	ret = adc_channel_single_shot("adc@12D10000", CFG_ODROID_REV_AIN,
 				      &adcval_prev);
 	if (ret)
 		return ret;
@@ -66,7 +66,7 @@ static int odroid_get_adc_val(unsigned int *adcval)
 		mdelay(5);
 
 		ret = adc_channel_single_shot("adc@12D10000",
-					      CONFIG_ODROID_REV_AIN, adcval);
+					      CFG_ODROID_REV_AIN, adcval);
 		if (ret)
 			return ret;
 
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 2bac017ea083..7304851d0f33 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -52,7 +52,7 @@
 #define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
-#define CONFIG_ODROID_REV_AIN		9
+#define CFG_ODROID_REV_AIN		9
 
 /*
  * Need to override existing one (smdk5420) with odroid so set_board_info will
-- 
2.25.1

[PATCH 093/149] global: Migrate CONFIG_OTHBOOTARGS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_OTHBOOTARGS to CFG_OTHBOOTARGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/x86-common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 65a1e63e00e6..5d461e8d0c64 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -27,9 +27,9 @@
 /* Default environment */
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
-#define CONFIG_OTHBOOTARGS	"othbootargs=\0"
+#define CFG_OTHBOOTARGS	"othbootargs=\0"
 #else
-#define CONFIG_OTHBOOTARGS	"othbootargs=acpi=off\0"
+#define CFG_OTHBOOTARGS	"othbootargs=acpi=off\0"
 #endif
 
 #if defined(CONFIG_DISTRO_DEFAULTS)
@@ -49,7 +49,7 @@
 	"pciconfighost=1\0"				\
 	"netdev=eth0\0"					\
 	"consoledev=ttyS0\0"				\
-	CONFIG_OTHBOOTARGS				\
+	CFG_OTHBOOTARGS				\
 	"scriptaddr=0x7000000\0"			\
 	"kernel_addr_r=0x1000000\0"			\
 	"ramdisk_addr_r=0x4000000\0"			\
-- 
2.25.1

[PATCH 094/149] global: Migrate CONFIG_PCIE_IMX_PERST_GPIO to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PCIE_IMX_PERST_GPIO to CFG_PCIE_IMX_PERST_GPIO

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pci/pcie_imx.c         | 12 ++++++------
 include/configs/mx6sabresd.h   |  2 +-
 include/configs/mx6sxsabresd.h |  2 +-
 include/configs/novena.h       |  2 +-
 include/configs/tbs2910.h      |  2 +-
 include/configs/vining_2000.h  |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 46ac01713ff7..902507aaae38 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -566,7 +566,7 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 	 * do self-initialisation.
 	 *
 	 * In case your #PERST pin is connected to a plain GPIO pin of the
-	 * CPU, you can define CONFIG_PCIE_IMX_PERST_GPIO in your board's
+	 * CPU, you can define CFG_PCIE_IMX_PERST_GPIO in your board's
 	 * configuration file and the condition below will handle the rest
 	 * of the reset toggling.
 	 *
@@ -578,13 +578,13 @@ int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 	 * Linux at all in the first place since it's in some non-reset
 	 * state due to being previously used in U-Boot.
 	 */
-#ifdef CONFIG_PCIE_IMX_PERST_GPIO
-	gpio_request(CONFIG_PCIE_IMX_PERST_GPIO, "pcie_reset");
-	gpio_direction_output(CONFIG_PCIE_IMX_PERST_GPIO, 0);
+#ifdef CFG_PCIE_IMX_PERST_GPIO
+	gpio_request(CFG_PCIE_IMX_PERST_GPIO, "pcie_reset");
+	gpio_direction_output(CFG_PCIE_IMX_PERST_GPIO, 0);
 	mdelay(20);
-	gpio_set_value(CONFIG_PCIE_IMX_PERST_GPIO, 1);
+	gpio_set_value(CFG_PCIE_IMX_PERST_GPIO, 1);
 	mdelay(20);
-	gpio_free(CONFIG_PCIE_IMX_PERST_GPIO);
+	gpio_free(CFG_PCIE_IMX_PERST_GPIO);
 #else
 	if (dm_gpio_is_valid(gpio)) {
 		/* Assert PERST# for 20ms then de-assert */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 2b028e3aa2b1..116a9c6abcf3 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	3
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
 #endif
 
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8b02c3b63101..85e5cfbb58db 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -123,7 +123,7 @@
 #endif
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
 #endif
 
diff --git a/include/configs/novena.h b/include/configs/novena.h
index dc5b04312905..6f4353e7df78 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -41,7 +41,7 @@
 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
 #define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 535859792d3b..256331ae1733 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -22,7 +22,7 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
 /* USB */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 6db68c1e7001..7bfc22c043fe 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -40,7 +40,7 @@
 #define CFG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
+#define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(4, 6)
 #endif
 
 #define CFG_IMX6_PWM_PER_CLK 66000000
-- 
2.25.1

[PATCH 095/149] global: Migrate CONFIG_PCIE_IMX_POWER_GPIO to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PCIE_IMX_POWER_GPIO to CFG_PCIE_IMX_POWER_GPIO

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pci/pcie_imx.c         | 10 +++++-----
 include/configs/mx6sabresd.h   |  2 +-
 include/configs/mx6sxsabresd.h |  2 +-
 include/configs/novena.h       |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index 902507aaae38..da48466480cb 100644
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -534,13 +534,13 @@ static int imx6_pcie_init_phy(void)
 
 int imx6_pcie_toggle_power(struct udevice *vpcie)
 {
-#ifdef CONFIG_PCIE_IMX_POWER_GPIO
-	gpio_request(CONFIG_PCIE_IMX_POWER_GPIO, "pcie_power");
-	gpio_direction_output(CONFIG_PCIE_IMX_POWER_GPIO, 0);
+#ifdef CFG_PCIE_IMX_POWER_GPIO
+	gpio_request(CFG_PCIE_IMX_POWER_GPIO, "pcie_power");
+	gpio_direction_output(CFG_PCIE_IMX_POWER_GPIO, 0);
 	mdelay(20);
-	gpio_set_value(CONFIG_PCIE_IMX_POWER_GPIO, 1);
+	gpio_set_value(CFG_PCIE_IMX_POWER_GPIO, 1);
 	mdelay(20);
-	gpio_free(CONFIG_PCIE_IMX_POWER_GPIO);
+	gpio_free(CFG_PCIE_IMX_POWER_GPIO);
 #endif
 
 #if CONFIG_IS_ENABLED(DM_REGULATOR)
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 116a9c6abcf3..1aa8a56cceb6 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -21,7 +21,7 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(7, 12)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(3, 19)
 #endif
 
 /* PMIC */
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 85e5cfbb58db..fe0ad34ef9c1 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -124,7 +124,7 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(2, 0)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(2, 1)
 #endif
 
 #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 6f4353e7df78..5e8b7fa62170 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -42,7 +42,7 @@
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
 #define CFG_PCIE_IMX_PERST_GPIO	IMX_GPIO_NR(3, 29)
-#define CONFIG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
+#define CFG_PCIE_IMX_POWER_GPIO	IMX_GPIO_NR(7, 12)
 #endif
 
 /* PMIC */
-- 
2.25.1

[PATCH 096/149] global: Migrate CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PHY_ET1011C_TX_CLK_FIX to CFG_PHY_ET1011C_TX_CLK_FIX

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/phy/et1011c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c
index c243c5b72f81..7eff5ec7cacb 100644
--- a/drivers/net/phy/et1011c.c
+++ b/drivers/net/phy/et1011c.c
@@ -60,7 +60,7 @@ static int et1011c_parse_status(struct phy_device *phydev)
 			  mii_reg |
 			  ET1011C_GMII_INTERFACE |
 			  ET1011C_SYS_CLK_EN |
-#ifdef CONFIG_PHY_ET1011C_TX_CLK_FIX
+#ifdef CFG_PHY_ET1011C_TX_CLK_FIX
 			  ET1011C_TX_CLK_EN |
 #endif
 			  ET1011C_TX_FIFO_DEPTH_16);
-- 
2.25.1

[PATCH 097/149] global: Migrate CONFIG_PHY_ID to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PHY_ID to CFG_PHY_ID

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/egnite/ethernut5/ethernut5.c | 2 +-
 include/configs/ethernut5.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index ceb0d2cf0aa3..9953df017e19 100644
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -160,7 +160,7 @@ int board_eth_init(struct bd_info *bis)
 	/* Set peripheral pins. */
 	at91_macb_hw_init();
 	/* Basic EMAC initialization. */
-	if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CONFIG_PHY_ID))
+	if (macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, CFG_PHY_ID))
 		return -1;
 	/*
 	 * Early board revisions have a pull-down at the PHY's MODE0
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 3fd58d6bd4a7..182369def910 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -48,7 +48,7 @@
 /* JFFS2 */
 
 /* Ethernet */
-#define CONFIG_PHY_ID			0
+#define CFG_PHY_ID			0
 
 /* MMC */
 #ifdef CONFIG_CMD_MMC
-- 
2.25.1

[PATCH 098/149] global: Migrate CONFIG_PHY_IRAM_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PHY_IRAM_BASE to CFG_PHY_IRAM_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 6 +++---
 include/configs/exynos5420-common.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 243b5c80c90e..c57b8aee7989 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -77,10 +77,10 @@ static void low_power_start(void)
 		branch_bx(0x0);
 	}
 
-	reg_val = readl(CONFIG_PHY_IRAM_BASE + 0x4);
+	reg_val = readl(CFG_PHY_IRAM_BASE + 0x4);
 	if (reg_val != (uint32_t)&low_power_start) {
 		/* Store jump address as low_power_start if not present */
-		writel((uint32_t)&low_power_start, CONFIG_PHY_IRAM_BASE + 0x4);
+		writel((uint32_t)&low_power_start, CFG_PHY_IRAM_BASE + 0x4);
 		dsb();
 		sev();
 	}
@@ -164,7 +164,7 @@ static void secondary_cores_configure(void)
 	writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR);
 	writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE);
 	/* Store jump address for power down */
-	writel((uint32_t)&power_down_core, CONFIG_PHY_IRAM_BASE + 0x4);
+	writel((uint32_t)&power_down_core, CFG_PHY_IRAM_BASE + 0x4);
 
 	/* Need all core power down check */
 	dsb();
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index bd43efa553c7..b75fe1b0a86c 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -10,7 +10,7 @@
 
 #define CFG_IRAM_TOP			0x02074000
 
-#define CONFIG_PHY_IRAM_BASE		0x02020000
+#define CFG_PHY_IRAM_BASE		0x02020000
 
 /*
  * Low Power settings
-- 
2.25.1

[PATCH 099/149] global: Migrate CONFIG_PL011_CLOCK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PL011_CLOCK to CFG_PL011_CLOCK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                                     | 2 +-
 arch/arm/cpu/armv7/s5p4418/cpu.c           | 2 +-
 board/armltd/total_compute/total_compute.c | 2 +-
 board/armltd/vexpress64/vexpress64.c       | 2 +-
 drivers/serial/serial_pl01x.c              | 8 ++++----
 include/configs/corstone1000.h             | 2 +-
 include/configs/highbank.h                 | 2 +-
 include/configs/lx2160a_common.h           | 2 +-
 include/configs/mxs.h                      | 2 +-
 include/configs/s5p4418_nanopi2.h          | 2 +-
 include/configs/synquacer.h                | 2 +-
 include/configs/thunderx_88xx.h            | 2 +-
 include/configs/total_compute.h            | 2 +-
 include/configs/vexpress_aemv8.h           | 4 ++--
 include/configs/vexpress_common.h          | 2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/README b/README
index 05618352fa93..8354cf5699b9 100644
--- a/README
+++ b/README
@@ -413,7 +413,7 @@ The following options need to be configured:
 					controller register space
 
 - Serial Ports:
-		CONFIG_PL011_CLOCK
+		CFG_PL011_CLOCK
 
 		If you have Amba PrimeCell PL011 UARTs, set this variable to
 		the clock speed of the UARTs.
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index 3baa761ec7a9..7ba9c0b03236 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -64,7 +64,7 @@ static void serial_device_init(void)
 
 	/* set clock   */
 	clk_disable(clk);
-	clk_set_rate(clk, CONFIG_PL011_CLOCK);
+	clk_set_rate(clk, CFG_PL011_CLOCK);
 	clk_enable(clk);
 }
 #endif
diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c
index b7772f79a31a..53941b5f5f28 100644
--- a/board/armltd/total_compute/total_compute.c
+++ b/board/armltd/total_compute/total_compute.c
@@ -13,7 +13,7 @@
 static const struct pl01x_serial_plat serial_plat = {
 	.base = UART0_BASE,
 	.type = TYPE_PL011,
-	.clock = CONFIG_PL011_CLOCK,
+	.clock = CFG_PL011_CLOCK,
 };
 
 U_BOOT_DRVINFO(total_compute_serials) = {
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index 4ca544f1017d..99fb67ecedc2 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static const struct pl01x_serial_plat serial_plat = {
 	.base = V2M_UART0,
 	.type = TYPE_PL011,
-	.clock = CONFIG_PL011_CLOCK,
+	.clock = CFG_PL011_CLOCK,
 };
 
 U_BOOT_DRVINFO(vexpress_serials) = {
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index d3c3d3e2d188..dd2881931dfd 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -193,7 +193,7 @@ static void pl01x_serial_init_baud(int baudrate)
 
 #if defined(CONFIG_PL011_SERIAL)
 	pl01x_type = TYPE_PL011;
-	clock = CONFIG_PL011_CLOCK;
+	clock = CFG_PL011_CLOCK;
 #endif
 	base_regs = (struct pl01x_regs *)port[CONFIG_CONS_INDEX];
 
@@ -343,8 +343,8 @@ static const struct udevice_id pl01x_serial_id[] ={
 	{}
 };
 
-#ifndef CONFIG_PL011_CLOCK
-#define CONFIG_PL011_CLOCK 0
+#ifndef CFG_PL011_CLOCK
+#define CFG_PL011_CLOCK 0
 #endif
 
 int pl01x_serial_of_to_plat(struct udevice *dev)
@@ -359,7 +359,7 @@ int pl01x_serial_of_to_plat(struct udevice *dev)
 		return -EINVAL;
 
 	plat->base = addr;
-	plat->clock = dev_read_u32_default(dev, "clock", CONFIG_PL011_CLOCK);
+	plat->clock = dev_read_u32_default(dev, "clock", CFG_PL011_CLOCK);
 	ret = clk_get_by_index(dev, 0, &clk);
 	if (!ret) {
 		ret = clk_enable(&clk);
diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h
index 8aec52d508e2..3347c11792d5 100644
--- a/include/configs/corstone1000.h
+++ b/include/configs/corstone1000.h
@@ -16,7 +16,7 @@
 
 #define V2M_BASE		0x80000000
 
-#define CONFIG_PL011_CLOCK	50000000
+#define CFG_PL011_CLOCK	50000000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1		(V2M_BASE)
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 76e6054b0cc1..97bb439f7357 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -8,7 +8,7 @@
 
 #define CFG_SYS_BOOTMAPSZ		(16 << 20)
 
-#define CONFIG_PL011_CLOCK		150000000
+#define CFG_PL011_CLOCK		150000000
 
 /*
  * Miscellaneous configurable options
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index c1a98fd3e4cb..f8a20ea16f9d 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -39,7 +39,7 @@
 
 
 /* Serial Port */
-#define CONFIG_PL011_CLOCK		(get_bus_freq(0) / 4)
+#define CFG_PL011_CLOCK		(get_bus_freq(0) / 4)
 #define CFG_SYS_SERIAL0		0x21c0000
 #define CFG_SYS_SERIAL1		0x21d0000
 #define CFG_SYS_SERIAL2		0x21e0000
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 32e0e06617e5..90cb1a5e4a00 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -77,7 +77,7 @@
  * DUART Serial Driver.
  * Conflicts with AUART driver which can be set by board.
  */
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index bfe559f6e2cd..0e7d01925eef 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -76,7 +76,7 @@
 /*-----------------------------------------------------------------------
  * serial console configuration
  */
-#define CONFIG_PL011_CLOCK		50000000
+#define CFG_PL011_CLOCK		50000000
 #define CONFIG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
 					 (void *)PHY_BASEADDR_UART1, \
 					 (void *)PHY_BASEADDR_UART2, \
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index e65d6238163f..350cc69c28dc 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -31,7 +31,7 @@
 
 /* Serial (pl011)       */
 #define UART_CLK			(62500000)
-#define CONFIG_PL011_CLOCK		UART_CLK
+#define CFG_PL011_CLOCK		UART_CLK
 #define CONFIG_PL01x_PORTS		{(void *)(0x2a400000)}
 
 /* Support MTD */
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 8ba40546b2c0..2bca86bed939 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -17,7 +17,7 @@
 
 /* PL011 Serial Configuration */
 
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			(0x801000000000)
diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
index e007be8e4564..436bf622e174 100644
--- a/include/configs/total_compute.h
+++ b/include/configs/total_compute.h
@@ -14,7 +14,7 @@
 #define UART0_BASE		0x7ff80000
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_CLOCK	7372800
+#define CFG_PL011_CLOCK	7372800
 
 /* Miscellaneous configurable options */
 
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 87b8c5d57ee7..43f7e454d812 100644
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -86,9 +86,9 @@
 
 /* PL011 Serial Configuration */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_PL011_CLOCK		7372800
+#define CFG_PL011_CLOCK		7372800
 #else
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #endif
 
 /* Physical Memory Map */
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 705a941e3603..3fc70de57713 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -116,7 +116,7 @@
 #define CFG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
 
 /* PL011 Serial Configuration */
-#define CONFIG_PL011_CLOCK		24000000
+#define CFG_PL011_CLOCK		24000000
 #define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					 (void *)CFG_SYS_SERIAL1}
 
-- 
2.25.1

[PATCH 100/149] global: Migrate CONFIG_PL01x_PORTS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PL01x_PORTS to CFG_PL01x_PORTS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                            | 2 +-
 drivers/serial/serial_pl01x.c     | 2 +-
 include/configs/lx2160a_common.h  | 2 +-
 include/configs/mxs.h             | 2 +-
 include/configs/s5p4418_nanopi2.h | 2 +-
 include/configs/synquacer.h       | 2 +-
 include/configs/vexpress_common.h | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 8354cf5699b9..12672d2bfb00 100644
--- a/README
+++ b/README
@@ -418,7 +418,7 @@ The following options need to be configured:
 		If you have Amba PrimeCell PL011 UARTs, set this variable to
 		the clock speed of the UARTs.
 
-		CONFIG_PL01x_PORTS
+		CFG_PL01x_PORTS
 
 		If you have Amba PrimeCell PL010 or PL011 UARTs on your board,
 		define this to a list of base addresses for each (supported)
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index dd2881931dfd..7449e9b90430 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_DM_SERIAL
 
-static volatile unsigned char *const port[] = CONFIG_PL01x_PORTS;
+static volatile unsigned char *const port[] = CFG_PL01x_PORTS;
 static enum pl01x_type pl01x_type __section(".data");
 static struct pl01x_regs *base_regs __section(".data");
 #define NUM_PORTS (sizeof(port)/sizeof(port[0]))
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index f8a20ea16f9d..6f46ca78d4d8 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -45,7 +45,7 @@
 #define CFG_SYS_SERIAL2		0x21e0000
 #define CFG_SYS_SERIAL3		0x21f0000
 /*below might needs to be removed*/
-#define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
+#define CFG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					(void *)CFG_SYS_SERIAL1, \
 					(void *)CFG_SYS_SERIAL2, \
 					(void *)CFG_SYS_SERIAL3 }
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 90cb1a5e4a00..6ebfee692717 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -78,7 +78,7 @@
  * Conflicts with AUART driver which can be set by board.
  */
 #define CFG_PL011_CLOCK		24000000
-#define CONFIG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
+#define CFG_PL01x_PORTS		{ (void *)MXS_UARTDBG_BASE }
 /* Default baudrate can be overridden by board! */
 
 /* NAND */
diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h
index 0e7d01925eef..2fa44e65fc16 100644
--- a/include/configs/s5p4418_nanopi2.h
+++ b/include/configs/s5p4418_nanopi2.h
@@ -77,7 +77,7 @@
  * serial console configuration
  */
 #define CFG_PL011_CLOCK		50000000
-#define CONFIG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
+#define CFG_PL01x_PORTS		{(void *)PHY_BASEADDR_UART0, \
 					 (void *)PHY_BASEADDR_UART1, \
 					 (void *)PHY_BASEADDR_UART2, \
 					 (void *)PHY_BASEADDR_UART3}
diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 350cc69c28dc..8f44c6f66a92 100644
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -32,7 +32,7 @@
 /* Serial (pl011)       */
 #define UART_CLK			(62500000)
 #define CFG_PL011_CLOCK		UART_CLK
-#define CONFIG_PL01x_PORTS		{(void *)(0x2a400000)}
+#define CFG_PL01x_PORTS		{(void *)(0x2a400000)}
 
 /* Support MTD */
 #define CFG_SYS_FLASH_BASE		(0x08000000)
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 3fc70de57713..ba7731bfca6b 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -117,7 +117,7 @@
 
 /* PL011 Serial Configuration */
 #define CFG_PL011_CLOCK		24000000
-#define CONFIG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
+#define CFG_PL01x_PORTS		{(void *)CFG_SYS_SERIAL0, \
 					 (void *)CFG_SYS_SERIAL1}
 
 #define CFG_SYS_SERIAL0		V2M_UART0
-- 
2.25.1

[PATCH 101/149] global: Migrate CONFIG_PME_PLAT_CLK_DIV to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PME_PLAT_CLK_DIV to CFG_PME_PLAT_CLK_DIV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index eec071022e59..c2e3e00f7ba8 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info)
 		[14] = 4,	/* CC4 PPL / 4 */
 	};
 	uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
-#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CFG_PME_PLAT_CLK_DIV)
 	uint rcw_tmp;
 #endif
 	uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
 #define FM1_CLK_SEL	0x1c000000
 #define FM1_CLK_SHIFT	26
 #endif
-#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
+#if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CFG_PME_PLAT_CLK_DIV)
 #if defined(CONFIG_ARCH_T1024)
 	rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
 #else
@@ -215,7 +215,7 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_PME
-#ifndef CONFIG_PME_PLAT_CLK_DIV
+#ifndef CFG_PME_PLAT_CLK_DIV
 	switch ((rcw_tmp & PME_CLK_SEL) >> PME_CLK_SHIFT) {
 	case 1:
 		sys_info->freq_pme = freq_c_pll[CFG_SYS_PME_CLK];
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 283181ec2d3d..fc584895eecf 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -144,8 +144,8 @@
 #define CONFIG_SYS_FSL_SRDS_1
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	5
-#define CONFIG_PME_PLAT_CLK_DIV		2
-#define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
+#define CFG_PME_PLAT_CLK_DIV		2
+#define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_FM_PLAT_CLK_DIV	1
 #define CFG_SYS_FM1_CLK		CFG_FM_PLAT_CLK_DIV
@@ -182,8 +182,8 @@
 #define CFG_SYS_FSL_SRIO_OB_WIN_NUM	9
 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM	5
 #endif
-#define CONFIG_PME_PLAT_CLK_DIV		1
-#define CFG_SYS_PME_CLK		CONFIG_PME_PLAT_CLK_DIV
+#define CFG_PME_PLAT_CLK_DIV		1
+#define CFG_SYS_PME_CLK		CFG_PME_PLAT_CLK_DIV
 #define CFG_SYS_FM1_CLK		0
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM_MURAM_SIZE	0x28000
-- 
2.25.1

[PATCH 102/149] global: Migrate CONFIG_POSTBOOTMENU to CFG

[Tom Rini]

Perform a simple rename of CONFIG_POSTBOOTMENU to CFG_POSTBOOTMENU

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 cmd/bootmenu.c               | 4 ++--
 include/configs/nokia_rx51.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 3340be16325b..e5a10f5d5c4d 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -577,8 +577,8 @@ cleanup:
 		free(command);
 	}
 
-#ifdef CONFIG_POSTBOOTMENU
-	run_command(CONFIG_POSTBOOTMENU, 0);
+#ifdef CFG_POSTBOOTMENU
+	run_command(CFG_POSTBOOTMENU, 0);
 #endif
 
 	if (efi_ret != EFI_SUCCESS || cmd_ret != CMD_RET_SUCCESS)
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 97d086852902..a64b7b34dc15 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -128,7 +128,7 @@
 	"bootmenu_delay=30\0" \
 	""
 
-#define CONFIG_POSTBOOTMENU \
+#define CFG_POSTBOOTMENU \
 	"echo;" \
 	"echo Extra commands:;" \
 	"echo run sdboot - Boot from SD card slot.;" \
-- 
2.25.1

[PATCH 103/149] global: Migrate CONFIG_POWER_LTC3676_I2C_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_POWER_LTC3676_I2C_ADDR to CFG_POWER_LTC3676_I2C_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++--
 drivers/power/pmic/pmic_ltc3676.c           | 2 +-
 include/configs/gw_ventana.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index e85a00954cee..6ad994af1c64 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -851,8 +851,8 @@ void setup_pmic(void)
 	}
 
 	/* configure LTC3676 PMIC */
-	else if (!i2c_probe(CONFIG_POWER_LTC3676_I2C_ADDR)) {
-		debug("probed LTC3676@0x%x\n", CONFIG_POWER_LTC3676_I2C_ADDR);
+	else if (!i2c_probe(CFG_POWER_LTC3676_I2C_ADDR)) {
+		debug("probed LTC3676@0x%x\n", CFG_POWER_LTC3676_I2C_ADDR);
 		power_ltc3676_init(i2c_pmic);
 		p = pmic_get("LTC3676_PMIC");
 		if (!p || pmic_probe(p))
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 00c3e201cd56..af94f37b0f10 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -23,7 +23,7 @@ int power_ltc3676_init(unsigned char bus)
 	p->name = name;
 	p->interface = PMIC_I2C;
 	p->number_of_regs = LTC3676_NUM_OF_REGS;
-	p->hw.i2c.addr = CONFIG_POWER_LTC3676_I2C_ADDR;
+	p->hw.i2c.addr = CFG_POWER_LTC3676_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->bus = bus;
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 0a9dfe736f7d..85a2ad21dc03 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -31,7 +31,7 @@
  * PMIC
  */
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
-#define CONFIG_POWER_LTC3676_I2C_ADDR  0x3c
+#define CFG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
 
-- 
2.25.1

[PATCH 104/149] global: Migrate CONFIG_POWER_PFUZE100_I2C_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_POWER_PFUZE100_I2C_ADDR to CFG_POWER_PFUZE100_I2C_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++--
 drivers/power/pmic/pmic_pfuze100.c          | 2 +-
 include/configs/el6x_common.h               | 2 +-
 include/configs/gw_ventana.h                | 2 +-
 include/configs/imx8mq_evk.h                | 2 +-
 include/configs/kontron_pitx_imx8m.h        | 2 +-
 include/configs/mx6sabreauto.h              | 2 +-
 include/configs/mx6sabresd.h                | 2 +-
 include/configs/novena.h                    | 2 +-
 include/configs/tqma6.h                     | 2 +-
 include/configs/vining_2000.h               | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 6ad994af1c64..2f046c9c0b3e 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -791,8 +791,8 @@ void setup_pmic(void)
 	i2c_set_bus_num(i2c_pmic);
 
 	/* configure PFUZE100 PMIC */
-	if (!i2c_probe(CONFIG_POWER_PFUZE100_I2C_ADDR)) {
-		debug("probed PFUZE100@0x%x\n", CONFIG_POWER_PFUZE100_I2C_ADDR);
+	if (!i2c_probe(CFG_POWER_PFUZE100_I2C_ADDR)) {
+		debug("probed PFUZE100@0x%x\n", CFG_POWER_PFUZE100_I2C_ADDR);
 		power_pfuze100_init(i2c_pmic);
 		p = pmic_get("PFUZE100");
 		if (p && !pmic_probe(p)) {
diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c
index c646a0c31f82..5115b55e49dc 100644
--- a/drivers/power/pmic/pmic_pfuze100.c
+++ b/drivers/power/pmic/pmic_pfuze100.c
@@ -23,7 +23,7 @@ int power_pfuze100_init(unsigned char bus)
 	p->name = name;
 	p->interface = PMIC_I2C;
 	p->number_of_regs = PFUZE100_NUM_OF_REGS;
-	p->hw.i2c.addr = CONFIG_POWER_PFUZE100_I2C_ADDR;
+	p->hw.i2c.addr = CFG_POWER_PFUZE100_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->bus = bus;
 
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 6913a91c4c19..78af42d04504 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Commands */
 
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 85a2ad21dc03..ebc5d03d0d5c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -30,7 +30,7 @@
 /*
  * PMIC
  */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 #define CFG_POWER_LTC3676_I2C_ADDR  0x3c
 
 /* Various command support */
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index a7a51907f5c9..d2de2900c063 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -18,7 +18,7 @@
 #define CFG_MALLOC_F_ADDR		0x182000
 /* For RAW image gives a error info not panic */
 
-#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR 0x08
 #endif
 
 /* ENET Config */
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index bf590efb4348..e3a021c987c6 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -20,7 +20,7 @@
 /* For RAW image gives a error info not panic */
 
 
-#define CONFIG_POWER_PFUZE100_I2C_ADDR  0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR  0x08
 #endif
 
 /* ENET1 Config */
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index da98139d7d77..05ae2fce1fd7 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -36,6 +36,6 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 
 #endif                         /* __MX6SABREAUTO_CONFIG_H */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 1aa8a56cceb6..30d3b9d93074 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -25,7 +25,7 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 5e8b7fa62170..39d3afd1c8ee 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -46,7 +46,7 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* UART */
 #define CFG_MXC_UART_BASE		UART2_BASE
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index af5a474cf31e..8c75a75a9e59 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -31,7 +31,7 @@
 #define CFG_I2C_MULTI_BUS
 
 #if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 #define TQMA6_PFUZE100_I2C_BUS		2
 #endif
 
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 7bfc22c043fe..30654191a264 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -31,7 +31,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	USDHC4_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE100_I2C_ADDR	0x08
 
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0x0
-- 
2.25.1

[PATCH 105/149] global: Migrate CONFIG_POWER_PFUZE3000_I2C_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_POWER_PFUZE3000_I2C_ADDR to CFG_POWER_PFUZE3000_I2C_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/power/pmic/pmic_pfuze3000.c | 2 +-
 include/configs/cl-som-imx7.h       | 2 +-
 include/configs/pico-imx7d.h        | 2 +-
 include/configs/udoo_neo.h          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/power/pmic/pmic_pfuze3000.c b/drivers/power/pmic/pmic_pfuze3000.c
index 1077fa5e9d98..a6d97252bc9e 100644
--- a/drivers/power/pmic/pmic_pfuze3000.c
+++ b/drivers/power/pmic/pmic_pfuze3000.c
@@ -23,7 +23,7 @@ int power_pfuze3000_init(unsigned char bus)
 	p->name = name;
 	p->interface = PMIC_I2C;
 	p->number_of_regs = PFUZE3000_NUM_OF_REGS;
-	p->hw.i2c.addr = CONFIG_POWER_PFUZE3000_I2C_ADDR;
+	p->hw.i2c.addr = CFG_POWER_PFUZE3000_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->bus = bus;
 
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 0a667c60b61b..280ae1e9cca8 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -19,7 +19,7 @@
 #define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE3000_I2C_ADDR	0x08
 
 #define CFG_SYS_I2C_PCA953X_ADDR	0x20
 #define CFG_SYS_I2C_PCA953X_WIDTH	{ {0x20, 16} }
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index fd8962e9f751..5774184300c2 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -98,7 +98,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE3000_I2C_ADDR	0x08
 
 /* FLASH and environment organization */
 
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 842abb7b7a22..80386414f89f 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -62,7 +62,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* PMIC */
-#define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
+#define CFG_POWER_PFUZE3000_I2C_ADDR	0x08
 #define PFUZE3000_I2C_BUS	0
 
 #endif				/* __CONFIG_H */
-- 
2.25.1

[PATCH 106/149] global: Migrate CONFIG_PRAM to CFG

[Tom Rini]

Perform a simple rename of CONFIG_PRAM to CFG_PRAM

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                               | 4 ++--
 common/board_f.c                     | 8 ++++----
 common/board_r.c                     | 6 +++---
 include/configs/M5208EVBE.h          | 2 +-
 include/configs/M5235EVB.h           | 2 +-
 include/configs/M5249EVB.h           | 2 +-
 include/configs/M53017EVB.h          | 2 +-
 include/configs/M5329EVB.h           | 2 +-
 include/configs/M5373EVB.h           | 2 +-
 include/configs/am43xx_evm.h         | 2 +-
 include/configs/km/km-powerpc.h      | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 2 +-
 include/configs/kmcent2.h            | 2 +-
 include/configs/nokia_rx51.h         | 2 +-
 include/configs/stmark2.h            | 2 +-
 include/configs/ti_omap5_common.h    | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/README b/README
index 12672d2bfb00..2d3a48e88a59 100644
--- a/README
+++ b/README
@@ -1069,11 +1069,11 @@ The following options need to be configured:
 		or define CFG_ENV_FLAGS_LIST_STATIC.
 
 - Protected RAM:
-		CONFIG_PRAM
+		CFG_PRAM
 
 		Define this variable to enable the reservation of
 		"protected RAM", i. e. RAM which is not overwritten
-		by U-Boot. Define CONFIG_PRAM to hold the number of
+		by U-Boot. Define CFG_PRAM to hold the number of
 		kB you want to reserve for pRAM. You can overwrite
 		this default value by defining an environment
 		variable "pram" to the number of kB you want to
diff --git a/common/board_f.c b/common/board_f.c
index e027248db56d..2b4edf30c930 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -380,19 +380,19 @@ static int setup_dest_addr(void)
 	return arch_setup_dest_addr();
 }
 
-#ifdef CONFIG_PRAM
+#ifdef CFG_PRAM
 /* reserve protected RAM */
 static int reserve_pram(void)
 {
 	ulong reg;
 
-	reg = env_get_ulong("pram", 10, CONFIG_PRAM);
+	reg = env_get_ulong("pram", 10, CFG_PRAM);
 	gd->relocaddr -= (reg << 10);		/* size is in kB */
 	debug("Reserving %ldk for protected RAM at %08lx\n", reg,
 	      gd->relocaddr);
 	return 0;
 }
-#endif /* CONFIG_PRAM */
+#endif /* CFG_PRAM */
 
 /* Round memory pointer down to next 4 kB limit */
 static int reserve_round_4k(void)
@@ -925,7 +925,7 @@ static const init_fnc_t init_sequence_f[] = {
 #ifdef CONFIG_OF_BOARD_FIXUP
 	fix_fdt,
 #endif
-#ifdef CONFIG_PRAM
+#ifdef CFG_PRAM
 	reserve_pram,
 #endif
 	reserve_round_4k,
diff --git a/common/board_r.c b/common/board_r.c
index 347bb7f7c02d..42060ee709d5 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -533,7 +533,7 @@ static int initr_ide(void)
 }
 #endif
 
-#if defined(CONFIG_PRAM)
+#if defined(CFG_PRAM)
 /*
  * Export available size of memory for Linux, taking into account the
  * protected RAM at top of memory
@@ -543,7 +543,7 @@ int initr_mem(void)
 	ulong pram = 0;
 	char memsz[32];
 
-	pram = env_get_ulong("pram", 10, CONFIG_PRAM);
+	pram = env_get_ulong("pram", 10, CFG_PRAM);
 	sprintf(memsz, "%ldk", (long int)((gd->ram_size / 1024) - pram));
 	env_set("mem", memsz);
 
@@ -791,7 +791,7 @@ static init_fnc_t init_sequence_r[] = {
 	 */
 	last_stage_init,
 #endif
-#if defined(CONFIG_PRAM)
+#if defined(CFG_PRAM)
 	initr_mem,
 #endif
 	run_main_loop,
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index f7aba6e417f8..a4fda551f1f7 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -29,7 +29,7 @@
 	"save\0"				\
 	""
 
-#define CONFIG_PRAM		512	/* 512 KB */
+#define CFG_PRAM		512	/* 512 KB */
 
 #define CFG_SYS_CLK		166666666	/* CPU Core Clock */
 #define CFG_SYS_PLL_ODR	0x36
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 049516edf4ae..8939c8e7ab9c 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -39,7 +39,7 @@
 	"save\0"				\
 	""
 
-#define CONFIG_PRAM		512	/* 512 KB */
+#define CFG_PRAM		512	/* 512 KB */
 
 #define CFG_SYS_CLK			75000000
 #define CFG_SYS_CPU_CLK		CFG_SYS_CLK * 2
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index c71130909fca..4fd539c01749 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -57,7 +57,7 @@
 #define CFG_SYS_FLASH_BASE		(CFG_SYS_CS0_BASE)
 
 #if 0 /* test-only */
-#define CONFIG_PRAM		512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
+#define CFG_PRAM		512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
 #endif
 
 /*
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index b6d82c730c64..6359915e09a6 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -42,7 +42,7 @@
 	"save\0"				\
 	""
 
-#define CONFIG_PRAM		512	/* 512 KB */
+#define CFG_PRAM		512	/* 512 KB */
 
 #define CFG_SYS_CLK		80000000
 #define CFG_SYS_CPU_CLK	CFG_SYS_CLK * 3
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index d74a636fd7f8..456135bdc64a 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -34,7 +34,7 @@
 	"save\0"	\
 	""
 
-#define CONFIG_PRAM		512	/* 512 KB */
+#define CFG_PRAM		512	/* 512 KB */
 
 #define CFG_SYS_CLK			80000000
 #define CFG_SYS_CPU_CLK		CFG_SYS_CLK * 3
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index fa6f2d23e74e..4e8dcb5ef7f7 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -36,7 +36,7 @@
 	"save\0"	\
 	""
 
-#define CONFIG_PRAM		512	/* 512 KB */
+#define CFG_PRAM		512	/* 512 KB */
 
 #define CFG_SYS_CLK			80000000
 #define CFG_SYS_CPU_CLK		CFG_SYS_CLK * 3
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index f43e00e8a2b6..a2f73c475434 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -152,7 +152,7 @@
 
 #if defined(CONFIG_TI_SECURE_DEVICE)
 /* Avoid relocating onto firewalled area at end of DRAM */
-#define CONFIG_PRAM (64 * 1024)
+#define CFG_PRAM (64 * 1024)
 #endif /* CONFIG_TI_SECURE_DEVICE */
 
 #endif	/* __CONFIG_AM43XX_EVM_H */
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 260a05f59e7f..ffc669ae9922 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -25,7 +25,7 @@
 
 /* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
  * is not valid yet, which is the case for when u-boot copies itself to RAM */
-#define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
+#define CFG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
 /* architecture specific default bootargs */
 #define CFG_KM_DEF_BOOT_ARGS_CPU		""
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 4adecacd5ece..a5dde8e441c9 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -12,7 +12,7 @@
 #define CFG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE	OCRAM_SIZE
 
-#define CONFIG_PRAM			((CONFIG_KM_PNVRAM + \
+#define CFG_PRAM			((CONFIG_KM_PNVRAM + \
 					  CONFIG_KM_PHRAM + \
 					  CONFIG_KM_RESERVED_PRAM) >> 10)
 
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 8d98928a6eeb..1dff1531c73a 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -181,7 +181,7 @@
 /* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
  * is not valid yet, which is the case for when u-boot copies itself to RAM
  */
-#define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)
+#define CFG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)
 
 /*
  * IFC Definitions
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a64b7b34dc15..54eea322dd3f 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -169,6 +169,6 @@
 #define KERNEL_ADDRESS			(SDRAM_END-KERNEL_MAXSIZE)
 
 /* Reserve protected RAM for attached kernel */
-#define CONFIG_PRAM			((KERNEL_MAXSIZE >> 10)+1)
+#define CFG_PRAM			((KERNEL_MAXSIZE >> 10)+1)
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index fe2ba9a03b41..19589be270ff 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -36,7 +36,7 @@
 
 /* Input, PCI, Flexbus, and VCO */
 
-#define CONFIG_PRAM			2048	/* 2048 KB */
+#define CFG_PRAM			2048	/* 2048 KB */
 
 #define CFG_SYS_MBAR			0xFC000000
 
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index e9723ed5b3dd..74a39c40785c 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -279,7 +279,7 @@
  * firewall violation, we tell u-boot that memory is protected RAM (PRAM)
  */
 #if (CONFIG_TI_SECURE_EMIF_REGION_START == 0)
-#define CONFIG_PRAM (CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE) >> 10
+#define CFG_PRAM (CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE) >> 10
 #endif
 #else
 /*
-- 
2.25.1

[PATCH 107/149] global: Migrate CONFIG_QBMAN_CLK_DIV to CFG

[Tom Rini]

Perform a simple rename of CONFIG_QBMAN_CLK_DIV to CFG_QBMAN_CLK_DIV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index c2e3e00f7ba8..9af40310b46f 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -249,10 +249,10 @@ void get_sys_info(sys_info_t *sys_info)
 #endif
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
-#ifndef CONFIG_QBMAN_CLK_DIV
-#define CONFIG_QBMAN_CLK_DIV	2
+#ifndef CFG_QBMAN_CLK_DIV
+#define CFG_QBMAN_CLK_DIV	2
 #endif
-	sys_info->freq_qman = sys_info->freq_systembus / CONFIG_QBMAN_CLK_DIV;
+	sys_info->freq_qman = sys_info->freq_systembus / CFG_QBMAN_CLK_DIV;
 #endif
 
 #if defined(CONFIG_SYS_MAPLE)
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index fc584895eecf..d731ac3f4d78 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -163,7 +163,7 @@
 #define CFG_SYS_NUM_FM1_10GEC	1
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
-#define CONFIG_QBMAN_CLK_DIV		1
+#define CFG_QBMAN_CLK_DIV		1
 #define CFG_SYS_FM_MURAM_SIZE	0x30000
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
 #define QE_MURAM_SIZE			0x6000UL
-- 
2.25.1

[PATCH 108/149] global: Migrate CONFIG_RAMDISK_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_RAMDISK_ADDR to CFG_RAMDISK_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 cmd/qfw.c                    | 4 ++--
 doc/usage/cmd/qfw.rst        | 2 +-
 include/configs/x86-common.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/qfw.c b/cmd/qfw.c
index 95ddc4b79ec7..0c49c6074e16 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -130,8 +130,8 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag,
 	env = env_get("ramdiskaddr");
 	initrd_addr = env ?
 		(void *)hextoul(env, NULL) :
-#ifdef CONFIG_RAMDISK_ADDR
-		(void *)CONFIG_RAMDISK_ADDR;
+#ifdef CFG_RAMDISK_ADDR
+		(void *)CFG_RAMDISK_ADDR;
 #else
 		NULL;
 #endif
diff --git a/doc/usage/cmd/qfw.rst b/doc/usage/cmd/qfw.rst
index b3704b92d6d9..cc0e27c27790 100644
--- a/doc/usage/cmd/qfw.rst
+++ b/doc/usage/cmd/qfw.rst
@@ -31,7 +31,7 @@ kernel_addr
 initrd_addr
     address to which the file specified by the -initrd parameter of QEMU shall
     be loaded. Defaults to environment variable *ramdiskaddr* and further to
-    the value of *CONFIG_RAMDISK_ADDR*.
+    the value of *CFG_RAMDISK_ADDR*.
 
 Examples
 --------
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 5d461e8d0c64..f421ec580344 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -25,7 +25,7 @@
  */
 
 /* Default environment */
-#define CONFIG_RAMDISK_ADDR	0x4000000
+#define CFG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CFG_OTHBOOTARGS	"othbootargs=\0"
 #else
-- 
2.25.1

[PATCH 109/149] global: Migrate CONFIG_RESET_VECTOR_ADDRESS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_RESET_VECTOR_ADDRESS to CFG_RESET_VECTOR_ADDRESS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/Kconfig     |  2 +-
 arch/powerpc/cpu/mpc85xx/u-boot.lds  |  4 ++--
 arch/powerpc/dts/kmcent2-u-boot.dtsi |  2 +-
 arch/powerpc/dts/u-boot.dtsi         |  6 +++---
 board/freescale/p1_p2_rdb_pc/README  |  2 +-
 board/freescale/p2041rdb/README      |  2 +-
 board/freescale/t104xrdb/README      |  2 +-
 board/freescale/t208xqds/README      |  2 +-
 board/freescale/t208xrdb/README      |  2 +-
 include/configs/P1010RDB.h           |  8 ++++----
 include/configs/P2041RDB.h           |  8 ++++----
 include/configs/T102xRDB.h           | 10 +++++-----
 include/configs/T104xRDB.h           |  8 ++++----
 include/configs/T208xQDS.h           | 10 +++++-----
 include/configs/T208xRDB.h           | 10 +++++-----
 include/configs/T4240RDB.h           |  8 ++++----
 include/configs/kmcent2.h            |  2 +-
 include/configs/p1_p2_rdb_pc.h       |  4 ++--
 18 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 3275d4fa9b88..6ab8a5249a42 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -931,7 +931,7 @@ config ARCH_T4240
 	imply FSL_SATA
 
 config MPC85XX_HAVE_RESET_VECTOR
-	bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc"
+	bool "Indicate reset vector at CFG_RESET_VECTOR_ADDRESS - 0xffc"
 	depends on MPC85xx
 
 config BTB
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index fa3aa954cbb5..3af0dfdf336b 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -5,8 +5,8 @@
 
 #include "config.h"
 
-#ifdef CONFIG_RESET_VECTOR_ADDRESS
-#define RESET_VECTOR_ADDRESS	CONFIG_RESET_VECTOR_ADDRESS
+#ifdef CFG_RESET_VECTOR_ADDRESS
+#define RESET_VECTOR_ADDRESS	CFG_RESET_VECTOR_ADDRESS
 #else
 #define RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
diff --git a/arch/powerpc/dts/kmcent2-u-boot.dtsi b/arch/powerpc/dts/kmcent2-u-boot.dtsi
index 28f303b749e9..53bac5533f24 100644
--- a/arch/powerpc/dts/kmcent2-u-boot.dtsi
+++ b/arch/powerpc/dts/kmcent2-u-boot.dtsi
@@ -91,7 +91,7 @@
 			align = <256>;
 		};
 		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
+			offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>;
 		};
 	};
 };
diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi
index b4b5257362e5..6b7375cff215 100644
--- a/arch/powerpc/dts/u-boot.dtsi
+++ b/arch/powerpc/dts/u-boot.dtsi
@@ -23,11 +23,11 @@
 		u-boot-dtb-with-ucode {
 			align = <4>;
 		};
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 		powerpc-mpc85xx-bootpg-resetvec {
-			offset = <(CONFIG_RESET_VECTOR_ADDRESS - 0xffc)>;
+			offset = <(CFG_RESET_VECTOR_ADDRESS - 0xffc)>;
 		};
 	};
 };
diff --git a/board/freescale/p1_p2_rdb_pc/README b/board/freescale/p1_p2_rdb_pc/README
index f542decec79b..fd849bfc29a2 100644
--- a/board/freescale/p1_p2_rdb_pc/README
+++ b/board/freescale/p1_p2_rdb_pc/README
@@ -57,7 +57,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="p1020rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/board/freescale/p2041rdb/README b/board/freescale/p2041rdb/README
index 96612daeeb11..ae7702773723 100644
--- a/board/freescale/p2041rdb/README
+++ b/board/freescale/p2041rdb/README
@@ -98,7 +98,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="p2041rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 CPLD command
 ============
diff --git a/board/freescale/t104xrdb/README b/board/freescale/t104xrdb/README
index e90dca416639..f312e6a3e32b 100644
--- a/board/freescale/t104xrdb/README
+++ b/board/freescale/t104xrdb/README
@@ -379,7 +379,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t1042d4rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/board/freescale/t208xqds/README b/board/freescale/t208xqds/README
index 63953d6b9b66..0d80c6901fb2 100755
--- a/board/freescale/t208xqds/README
+++ b/board/freescale/t208xqds/README
@@ -285,7 +285,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t2080qds" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/board/freescale/t208xrdb/README b/board/freescale/t208xrdb/README
index 60551f6723e6..533054bfe192 100644
--- a/board/freescale/t208xrdb/README
+++ b/board/freescale/t208xrdb/README
@@ -281,7 +281,7 @@ enabled in relative defconfig file,
 1. CONFIG_DEFAULT_DEVICE_TREE="t2080rdb" (Change default device tree name if required)
 2. CONFIG_OF_CONTROL
 3. CONFIG_MPC85XX_HAVE_RESET_VECTOR if reset vector is located at
-   CONFIG_RESET_VECTOR_ADDRESS - 0xffc
+   CFG_RESET_VECTOR_ADDRESS - 0xffc
 
 If device tree support is enabled in defconfig,
 1. use 'u-boot.bin' for NOR boot.
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b57e8638ab71..9efae58ce903 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -24,7 +24,7 @@
 
 #ifdef CONFIG_SPIFLASH
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
+#define CFG_RESET_VECTOR_ADDRESS	0x110bfffc
 #else
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(512 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x11000000)
@@ -52,11 +52,11 @@
 #endif
 
 #ifdef CONFIG_NAND_SECBOOT	/* NAND Boot */
-#define CONFIG_RESET_VECTOR_ADDRESS	0x110bfffc
+#define CFG_RESET_VECTOR_ADDRESS	0x110bfffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /* High Level Configuration Options */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 6e755fc0a8f5..28f53ae78a1c 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -12,7 +12,7 @@
 #define __CONFIG_H
 
 #ifdef CONFIG_RAMBOOT_PBL
-#define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
 
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
@@ -20,13 +20,13 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 063b864f9ff0..7ee46abffdb6 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x30000000)
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS	0x30000FFC
+#define CFG_RESET_VECTOR_ADDRESS	0x30000FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x30000000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x30000000)
@@ -45,8 +45,8 @@
 
 #endif /* CONFIG_RAMBOOT_PBL */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
@@ -87,7 +87,7 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS	\
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
 /*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 9d04d30a5387..f196bd76e6ec 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x30000000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x30000000)
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x30000FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x30000FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x30000000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x30000000)
@@ -48,8 +48,8 @@
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 3b98d25aa47a..2023d7497f69 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST		(0x00200000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START	(0x00200000)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define	CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
+#define	CFG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	(0x00200000)
 #define CFG_SYS_MMC_U_BOOT_START	(0x00200000)
@@ -52,11 +52,11 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 60c2947bfc1d..f213d2de770c 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
+#define        CFG_RESET_VECTOR_ADDRESS             0x200FFC
 #define CFG_SYS_SPI_FLASH_U_BOOT_SIZE       (768 << 10)
 #define CFG_SYS_SPI_FLASH_U_BOOT_DST                (0x00200000)
 #define CFG_SYS_SPI_FLASH_U_BOOT_START      (0x00200000)
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define        CONFIG_RESET_VECTOR_ADDRESS             0x200FFC
+#define        CFG_RESET_VECTOR_ADDRESS             0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE     (768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST      (0x00200000)
 #define CFG_SYS_MMC_U_BOOT_START    (0x00200000)
@@ -52,11 +52,11 @@
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR (CONFIG_TEXT_BASE & 0xfff00000)
 #define CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS \
 		(0x300000000ull | CFG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR)
-#define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS 0xfffffffc
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 /*
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 01a9f43cbaeb..506f1b7e268b 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -16,13 +16,13 @@
 
 #ifdef CONFIG_RAMBOOT_PBL
 #ifndef CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
+#define CFG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
 #define RESET_VECTOR_OFFSET		0x27FFC
 #define BOOT_PAGE_OFFSET		0x27000
 
 #ifdef	CONFIG_SDCARD
-#define CONFIG_RESET_VECTOR_ADDRESS	0x200FFC
+#define CFG_RESET_VECTOR_ADDRESS	0x200FFC
 #define CFG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CFG_SYS_MMC_U_BOOT_DST	0x00200000
 #define CFG_SYS_MMC_U_BOOT_START	0x00200000
@@ -34,8 +34,8 @@
 
 /* High Level Configuration Options */
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 1dff1531c73a..1eaf1968321c 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -133,7 +133,7 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_RESET_VECTOR_ADDRESS	0xebfffffc
+#define CFG_RESET_VECTOR_ADDRESS	0xebfffffc
 
 #define CFG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 41e7f53bd57e..832ad9c3ece0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -105,8 +105,8 @@
 #endif /* not CONFIG_TPL_BUILD */
 #endif
 
-#ifndef CONFIG_RESET_VECTOR_ADDRESS
-#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#ifndef CFG_RESET_VECTOR_ADDRESS
+#define CFG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
 #define CFG_SYS_CCSRBAR		0xffe00000
-- 
2.25.1

[PATCH 110/149] global: Migrate CONFIG_SAR2_REG to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SAR2_REG to CFG_SAR2_REG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-mvebu/cpu.c              | 4 ++--
 arch/arm/mach-mvebu/include/mach/soc.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 67ad5e5907be..9139df1ae248 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -195,7 +195,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 	int i;
 
 #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS)
-	val = readl(CONFIG_SAR2_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR2_REG);	/* SAR - Sample At Reset */
 #else
 	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
 #endif
@@ -205,7 +205,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 	 * Shift CPU0 clock frequency select bit from SAR2 register
 	 * into correct position
 	 */
-	freq |= ((readl(CONFIG_SAR2_REG) & SAR2_CPU_FREQ_MASK)
+	freq |= ((readl(CFG_SAR2_REG) & SAR2_CPU_FREQ_MASK)
 		 >> SAR2_CPU_FREQ_OFFS) << 3;
 #endif
 	for (i = 0; sar_freq_tab[i].val != 0xff; i++) {
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index e6383d4a86e2..1210d26c7461 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -135,7 +135,7 @@
 #if defined(CONFIG_ARMADA_375)
 /* SAR values for Armada 375 */
 #define CONFIG_SAR_REG		(MVEBU_REGISTER(0xe8200))
-#define CONFIG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
+#define CFG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
 
 #define SAR_CPU_FREQ_OFFS	17
 #define SAR_CPU_FREQ_MASK	(0x1f << SAR_CPU_FREQ_OFFS)
@@ -174,7 +174,7 @@
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
 #define CONFIG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
-#define CONFIG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
+#define CFG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
 
 #define SAR_CPU_FREQ_OFFS	18
 #define SAR_CPU_FREQ_MASK	(0x7 << SAR_CPU_FREQ_OFFS)
@@ -192,7 +192,7 @@
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
 #define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
-#define CONFIG_SAR2_REG		(MVEBU_REGISTER(0x18234))
+#define CFG_SAR2_REG		(MVEBU_REGISTER(0x18234))
 
 #define SAR_CPU_FREQ_OFFS	21
 #define SAR_CPU_FREQ_MASK	(0x7 << SAR_CPU_FREQ_OFFS)
-- 
2.25.1

[PATCH 111/149] global: Migrate CONFIG_SAR_REG to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SAR_REG to CFG_SAR_REG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-kirkwood/include/mach/kw88f6281.h |  2 +-
 arch/arm/mach-kirkwood/include/mach/soc.h       |  2 +-
 arch/arm/mach-mvebu/cpu.c                       |  4 ++--
 arch/arm/mach-mvebu/include/mach/soc.h          | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-kirkwood/include/mach/kw88f6281.h b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
index 7f8e156a6bdc..67f0b3ec6772 100644
--- a/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
+++ b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h
@@ -15,7 +15,7 @@
 #define KW_REGS_PHY_BASE		KW88F6281_REGS_PHYS_BASE
 
 /* TCLK Core Clock definition */
-#define CFG_SYS_TCLK			((readl(CONFIG_SAR_REG) & BIT(21)) ? \
+#define CFG_SYS_TCLK			((readl(CFG_SAR_REG) & BIT(21)) ? \
 					166666667 : 200000000)
 
 #endif /* _ASM_ARCH_KW88F6281_H */
diff --git a/arch/arm/mach-kirkwood/include/mach/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h
index 5f545c6f4349..4a7efc50f67a 100644
--- a/arch/arm/mach-kirkwood/include/mach/soc.h
+++ b/arch/arm/mach-kirkwood/include/mach/soc.h
@@ -62,7 +62,7 @@
 #define MVCPU_WIN_ENABLE	KWCPU_WIN_ENABLE
 #define MVCPU_WIN_DISABLE	KWCPU_WIN_DISABLE
 
-#define CONFIG_SAR_REG		(KW_MPP_BASE + 0x0030)
+#define CFG_SAR_REG		(KW_MPP_BASE + 0x0030)
 
 #if defined (CONFIG_KW88F6281)
 #include <asm/arch/kw88f6281.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 9139df1ae248..329d13691f0e 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -83,7 +83,7 @@ u32 get_boot_device(void)
 	/*
 	 * Now check the SAR register for the strapped boot-device
 	 */
-	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR_REG);	/* SAR - Sample At Reset */
 	boot_device = (val & BOOT_DEV_SEL_MASK) >> BOOT_DEV_SEL_OFFS;
 	debug("SAR_REG=0x%08x boot_device=0x%x\n", val, boot_device);
 	switch (boot_device) {
@@ -197,7 +197,7 @@ void get_sar_freq(struct sar_freq_modes *sar_freq)
 #if defined(CONFIG_ARMADA_375) || defined(CONFIG_ARMADA_MSYS)
 	val = readl(CFG_SAR2_REG);	/* SAR - Sample At Reset */
 #else
-	val = readl(CONFIG_SAR_REG);	/* SAR - Sample At Reset */
+	val = readl(CFG_SAR_REG);	/* SAR - Sample At Reset */
 #endif
 	freq = (val & SAR_CPU_FREQ_MASK) >> SAR_CPU_FREQ_OFFS;
 #if defined(SAR2_CPU_FREQ_MASK)
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index 1210d26c7461..6edd2e2d79c7 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -134,7 +134,7 @@
 
 #if defined(CONFIG_ARMADA_375)
 /* SAR values for Armada 375 */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0xe8200))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0xe8200))
 #define CFG_SAR2_REG		(MVEBU_REGISTER(0xe8204))
 
 #define SAR_CPU_FREQ_OFFS	17
@@ -146,11 +146,11 @@
 #define BOOT_FROM_UART		0x30
 #define BOOT_FROM_SPI		0x38
 
-#define CFG_SYS_TCLK		((readl(CONFIG_SAR_REG) & BIT(20)) ? \
+#define CFG_SYS_TCLK		((readl(CFG_SAR_REG) & BIT(20)) ? \
 				 200000000 : 166000000)
 #elif defined(CONFIG_ARMADA_38X)
 /* SAR values for Armada 38x */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18600))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0x18600))
 
 #define SAR_CPU_FREQ_OFFS	10
 #define SAR_CPU_FREQ_MASK	(0x1f << SAR_CPU_FREQ_OFFS)
@@ -169,11 +169,11 @@
 #define BOOT_FROM_MMC		0x30
 #define BOOT_FROM_MMC_ALT	0x31
 
-#define CFG_SYS_TCLK		((readl(CONFIG_SAR_REG) & BIT(15)) ? \
+#define CFG_SYS_TCLK		((readl(CFG_SAR_REG) & BIT(15)) ? \
 				 200000000 : 250000000)
 #elif defined(CONFIG_ARMADA_MSYS)
 /* SAR values for MSYS */
-#define CONFIG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
+#define CFG_SAR_REG		(MBUS_DFX_BASE  + 0xf8200)
 #define CFG_SAR2_REG		(MBUS_DFX_BASE  + 0xf8204)
 
 #define SAR_CPU_FREQ_OFFS	18
@@ -191,7 +191,7 @@
 #define CFG_SYS_TCLK		200000000	/* 200MHz */
 #elif defined(CONFIG_ARMADA_XP)
 /* SAR values for Armada XP */
-#define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
+#define CFG_SAR_REG		(MVEBU_REGISTER(0x18230))
 #define CFG_SAR2_REG		(MVEBU_REGISTER(0x18234))
 
 #define SAR_CPU_FREQ_OFFS	21
-- 
2.25.1

[PATCH 112/149] global: Migrate CONFIG_SCIF_A to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SCIF_A to CFG_SCIF_A

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/serial_sh.c | 2 +-
 drivers/serial/serial_sh.h | 8 ++++----
 include/configs/stout.h    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index e6c23cedff11..4671217b59a0 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -274,7 +274,7 @@ U_BOOT_DRIVER(serial_sh) = {
 # error "Default SCIF doesn't set....."
 #endif
 
-#if defined(CONFIG_SCIF_A)
+#if defined(CFG_SCIF_A)
 	#define SCIF_BASE_PORT	PORT_SCIFA
 #elif defined(CONFIG_SCI)
 	#define SCIF_BASE_PORT  PORT_SCI
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index 11deaa951168..e6ab6f1b9b76 100644
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -92,7 +92,7 @@ struct uart_port {
 # define SCIF_ORER 0x0001  /* overrun error bit */
 #elif defined(CONFIG_RCAR_GEN2) || defined(CONFIG_RCAR_GEN3) || \
       defined(CONFIG_R7S72100)
-# if defined(CONFIG_SCIF_A)
+# if defined(CFG_SCIF_A)
 #  define SCIF_ORER	0x0200
 # else
 #  define SCIF_ORER	0x0001
@@ -164,7 +164,7 @@ struct uart_port {
 # define SCIF2_TXROOM_MAX 16
 #elif defined(CONFIG_RCAR_GEN2)
 # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
-# if defined(CONFIG_SCIF_A)
+# if defined(CFG_SCIF_A)
 #  define SCIF_RFDC_MASK	0x007f
 # else
 #  define SCIF_RFDC_MASK	0x001f
@@ -380,7 +380,7 @@ SCIF_FNS(SCFDR,  0,  0, 0x1C, 16)
 SCIF_FNS(SCSPTR, 0,  0, 0x20, 16)
 SCIF_FNS(DL,     0,  0, 0x30, 16)
 SCIF_FNS(CKS,    0,  0, 0x34, 16)
-#if defined(CONFIG_SCIF_A)
+#if defined(CFG_SCIF_A)
 SCIF_FNS(SCLSR,  0,  0, 0x14, 16)
 #else
 SCIF_FNS(SCLSR,  0,  0, 0x24, 16)
@@ -491,7 +491,7 @@ static inline int scbrr_calc(struct uart_port *port, int bps, int clk)
 #define SCBRR_VALUE(bps, clk) scbrr_calc(port, bps, clk)
 #elif defined(CONFIG_RCAR_GEN2)
 #define DL_VALUE(bps, clk) (clk / bps / 16) /* External Clock */
- #if defined(CONFIG_SCIF_A)
+ #if defined(CFG_SCIF_A)
   #define SCBRR_VALUE(bps, clk) (clk / bps / 16 - 1) /* Internal Clock */
  #else
   #define SCBRR_VALUE(bps, clk) (clk / bps / 32 - 1) /* Internal Clock */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index ee1abe691bfd..ea5828b950b1 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -23,7 +23,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SCIF */
-#define CONFIG_SCIF_A
+#define CFG_SCIF_A
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-- 
2.25.1

[PATCH 113/149] global: Migrate CONFIG_SCSI_DEV_LIST to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SCSI_DEV_LIST to CFG_SCSI_DEV_LIST

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/scsi/scsi.c          | 4 ++--
 include/configs/ls1021aiot.h | 2 +-
 include/configs/ls1028ardb.h | 2 +-
 include/configs/ls1043ardb.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 3e769b0843f0..a020a7da23a5 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -18,8 +18,8 @@
 #include <dm/uclass-internal.h>
 
 #if !defined(CONFIG_DM_SCSI)
-# ifdef CONFIG_SCSI_DEV_LIST
-#  define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST
+# ifdef CFG_SCSI_DEV_LIST
+#  define SCSI_DEV_LIST CFG_SCSI_DEV_LIST
 # else
 #  ifdef CONFIG_SATA_ULI5288
 
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 8b5fba51c6ff..53d9936f4e77 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -61,7 +61,7 @@
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440
 #endif
-#define CONFIG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
+#define CFG_SCSI_DEV_LIST		{PCI_VENDOR_ID_FREESCALE, \
 	PCI_DEVICE_ID_FREESCALE_AHCI}
 
 /* SPI */
diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h
index 8c53636beac3..ee4f885c5341 100644
--- a/include/configs/ls1028ardb.h
+++ b/include/configs/ls1028ardb.h
@@ -52,7 +52,7 @@
 /* SATA */
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 
 /* Initial environment variables */
 #ifndef SPL_NO_ENV
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index c8a6f0146aac..60362b6a4d07 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -203,7 +203,7 @@
 #ifndef SPL_NO_SATA
 #define SCSI_VEND_ID 0x1b4b
 #define SCSI_DEV_ID  0x9170
-#define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#define CFG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
 #endif
 
 #include <asm/fsl_secure_boot.h>
-- 
2.25.1

[PATCH 114/149] global: Migrate CONFIG_SC_TIMER_CLK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SC_TIMER_CLK to CFG_SC_TIMER_CLK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-imx/syscounter.c | 2 +-
 include/configs/mx6_common.h   | 2 +-
 include/configs/mx7_common.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index df478a232637..129efac6fa69 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -65,7 +65,7 @@ int timer_init(void)
 	struct sctr_regs *sctr = (struct sctr_regs *)SCTR_BASE_ADDR;
 	unsigned long val, freq;
 
-	freq = CONFIG_SC_TIMER_CLK;
+	freq = CFG_SC_TIMER_CLK;
 	asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
 
 	writel(freq, &sctr->cntfid0);
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index dd8cabc2e935..0b8233de8c42 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -9,7 +9,7 @@
 #include <linux/stringify.h>
 
 #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL))
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #else
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CFG_SYS_PL310_BASE	L2_PL310_BASE
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 6e14b4fbf053..a542839ce1da 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -14,7 +14,7 @@
 #include <asm/mach-imx/gpio.h>
 
 /* Timer settings */
-#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CFG_SC_TIMER_CLK 8000000 /* 8Mhz */
 
 /* Miscellaneous configurable options */
 
-- 
2.25.1

[PATCH 115/149] global: Migrate CONFIG_SET_DFU_ALT_BUF_LEN to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SET_DFU_ALT_BUF_LEN to CFG_SET_DFU_ALT_BUF_LEN

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/samsung/common/misc.c  | 2 +-
 include/configs/odroid.h     | 2 +-
 include/configs/odroid_xu3.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 9c0ec29c937b..5ffa216e2e5d 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_SET_DFU_ALT_INFO
 void set_dfu_alt_info(char *interface, char *devstr)
 {
-	size_t buf_size = CONFIG_SET_DFU_ALT_BUF_LEN;
+	size_t buf_size = CFG_SET_DFU_ALT_BUF_LEN;
 	ALLOC_CACHE_ALIGN_BUFFER(char, buf, buf_size);
 	char *alt_info = "Settings not found!";
 	char *status = "error!\n";
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 3ac13a65d63f..560a23c23efb 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -37,7 +37,7 @@
 	""PARTS_BOOT" part 0 1;" \
 	""PARTS_ROOT" part 0 2\0" \
 
-#define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 #define CFG_DFU_ALT_BOOT_EMMC \
 	"u-boot raw 0x3e 0x800 mmcpart 1;" \
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 7304851d0f33..58b5ee6ea0a9 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -49,7 +49,7 @@
 	"params.bin raw 0x1880 0x20\0"
 
 /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */
-#define CONFIG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN	(SZ_1K)
 
 /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
 #define CFG_ODROID_REV_AIN		9
-- 
2.25.1

[PATCH 116/149] global: Migrate CONFIG_SH_ETHER_ALIGNE_SIZE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SH_ETHER_ALIGNE_SIZE to CFG_SH_ETHER_ALIGNE_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sh_eth.c      |  4 ++--
 drivers/net/sh_eth.h      | 16 ++++++++--------
 include/configs/alt.h     |  2 +-
 include/configs/condor.h  |  2 +-
 include/configs/gose.h    |  2 +-
 include/configs/grpeach.h |  2 +-
 include/configs/koelsch.h |  2 +-
 include/configs/lager.h   |  2 +-
 include/configs/porter.h  |  2 +-
 include/configs/silk.h    |  2 +-
 include/configs/stout.h   |  2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 0c584a23b97e..90e47d93aada 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -41,7 +41,7 @@
 	!CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define flush_cache_wback(addr, len)    \
 		flush_dcache_range((unsigned long)addr, \
-		(unsigned long)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE)))
+		(unsigned long)(addr + ALIGN(len, CFG_SH_ETHER_ALIGNE_SIZE)))
 #else
 #define flush_cache_wback(...)
 #endif
@@ -49,7 +49,7 @@
 #if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
 #define invalidate_cache(addr, len)		\
 	{	\
-		unsigned long line_size = CONFIG_SH_ETHER_ALIGNE_SIZE;	\
+		unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE;	\
 		unsigned long start, end;	\
 		\
 		start = (unsigned long)addr;	\
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 520f7f732574..1c07610e1ac7 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -29,8 +29,8 @@
 #endif /* defined(CONFIG_SH) */
 
 /* base padding size is 16 */
-#ifndef CONFIG_SH_ETHER_ALIGNE_SIZE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE 16
+#ifndef CFG_SH_ETHER_ALIGNE_SIZE
+#define CFG_SH_ETHER_ALIGNE_SIZE 16
 #endif
 
 /* Number of supported ports */
@@ -47,7 +47,7 @@
 
 /* The size of the tx descriptor is determined by how much padding is used.
    4, 20, or 52 bytes of padding can be used */
-#define TX_DESC_PADDING	(CONFIG_SH_ETHER_ALIGNE_SIZE - 12)
+#define TX_DESC_PADDING	(CFG_SH_ETHER_ALIGNE_SIZE - 12)
 
 /* Tx descriptor. We always use 3 bytes of padding */
 struct tx_desc_s {
@@ -62,9 +62,9 @@ struct tx_desc_s {
 
 /* The size of the rx descriptor is determined by how much padding is used.
    4, 20, or 52 bytes of padding can be used */
-#define RX_DESC_PADDING	(CONFIG_SH_ETHER_ALIGNE_SIZE - 12)
+#define RX_DESC_PADDING	(CFG_SH_ETHER_ALIGNE_SIZE - 12)
 /* aligned cache line size */
-#define RX_BUF_ALIGNE_SIZE	(CONFIG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)
+#define RX_BUF_ALIGNE_SIZE	(CFG_SH_ETHER_ALIGNE_SIZE > 32 ? 64 : 32)
 
 /* Rx descriptor. We always use 4 bytes of padding */
 struct rx_desc_s {
@@ -388,11 +388,11 @@ enum DMAC_M_BIT {
 #endif
 };
 
-#if CONFIG_SH_ETHER_ALIGNE_SIZE == 64
+#if CFG_SH_ETHER_ALIGNE_SIZE == 64
 # define EMDR_DESC EDMR_DL1
-#elif CONFIG_SH_ETHER_ALIGNE_SIZE == 32
+#elif CFG_SH_ETHER_ALIGNE_SIZE == 32
 # define EMDR_DESC EDMR_DL0
-#elif CONFIG_SH_ETHER_ALIGNE_SIZE == 16 /* Default */
+#elif CFG_SH_ETHER_ALIGNE_SIZE == 16 /* Default */
 # define EMDR_DESC 0
 #endif
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 29f4d06b7f83..f06ceed47f0c 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 819184996e69..6d7c788163d3 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -19,7 +19,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 /* XTAL_CLK : 33.33MHz */
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45f0ec6f6a0e..93157de470bd 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index dd6b22de7bac..5b91e6ff039b 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -22,6 +22,6 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 #endif	/* __GRPEACH_H */
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 61ff80d2c983..ff02a875013c 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 777d5b94d1cd..83e8705dfe76 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 202bd914d506..8f834f2c7eba 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -27,7 +27,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 9114a0575828..80fce05b3999 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -27,7 +27,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
diff --git a/include/configs/stout.h b/include/configs/stout.h
index ea5828b950b1..d8f0fb185630 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -31,7 +31,7 @@
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
 #define CONFIG_SH_ETHER_CACHE_INVALIDATE
-#define CONFIG_SH_ETHER_ALIGNE_SIZE	64
+#define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
 
-- 
2.25.1

[PATCH 117/149] global: Migrate CONFIG_SH_ETHER_CACHE_INVALIDATE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SH_ETHER_CACHE_INVALIDATE to CFG_SH_ETHER_CACHE_INVALIDATE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/sh_eth.c      | 2 +-
 include/configs/alt.h     | 2 +-
 include/configs/condor.h  | 2 +-
 include/configs/gose.h    | 2 +-
 include/configs/grpeach.h | 2 +-
 include/configs/koelsch.h | 2 +-
 include/configs/lager.h   | 2 +-
 include/configs/porter.h  | 2 +-
 include/configs/silk.h    | 2 +-
 include/configs/stout.h   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 90e47d93aada..63b21969d5cc 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -46,7 +46,7 @@
 #define flush_cache_wback(...)
 #endif
 
-#if defined(CONFIG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
+#if defined(CFG_SH_ETHER_CACHE_INVALIDATE) && defined(CONFIG_ARM)
 #define invalidate_cache(addr, len)		\
 	{	\
 		unsigned long line_size = CFG_SH_ETHER_ALIGNE_SIZE;	\
diff --git a/include/configs/alt.h b/include/configs/alt.h
index f06ceed47f0c..7a29157ef440 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 6d7c788163d3..fa3edef9b300 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -18,7 +18,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 93157de470bd..e54f4b24e048 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 5b91e6ff039b..5ae17f70e909 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -21,7 +21,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 #endif	/* __GRPEACH_H */
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index ff02a875013c..1d8aa6def88f 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 83e8705dfe76..bb8cc5fecb7a 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 8f834f2c7eba..143e9a4672f1 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 80fce05b3999..2d1e23c27451 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -26,7 +26,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index d8f0fb185630..9e05a7ae6f96 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -30,7 +30,7 @@
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK
-#define CONFIG_SH_ETHER_CACHE_INVALIDATE
+#define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
 /* Board Clock */
-- 
2.25.1

[PATCH 118/149] global: Migrate CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SH_ETHER_CACHE_WRITEBACK to CFG_SH_ETHER_CACHE_WRITEBACK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                    | 2 +-
 drivers/net/sh_eth.c      | 2 +-
 include/configs/alt.h     | 2 +-
 include/configs/condor.h  | 2 +-
 include/configs/gose.h    | 2 +-
 include/configs/grpeach.h | 2 +-
 include/configs/koelsch.h | 2 +-
 include/configs/lager.h   | 2 +-
 include/configs/porter.h  | 2 +-
 include/configs/silk.h    | 2 +-
 include/configs/stout.h   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 2d3a48e88a59..5f688d70f32f 100644
--- a/README
+++ b/README
@@ -547,7 +547,7 @@ The following options need to be configured:
 			CONFIG_SH_ETHER_PHY_ADDR
 			Define the ETH PHY's address
 
-			CONFIG_SH_ETHER_CACHE_WRITEBACK
+			CFG_SH_ETHER_CACHE_WRITEBACK
 			If this option is set, the driver enables cache flush.
 
 - TPM Support:
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 63b21969d5cc..0053733075ed 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -37,7 +37,7 @@
 # error "Please define CONFIG_SH_ETHER_PHY_ADDR"
 #endif
 
-#if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK) && \
+#if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \
 	!CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define flush_cache_wback(addr, len)    \
 		flush_dcache_range((unsigned long)addr, \
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 7a29157ef440..2b7832527347 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/condor.h b/include/configs/condor.h
index fa3edef9b300..3f99cbf9dab9 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -17,7 +17,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/gose.h b/include/configs/gose.h
index e54f4b24e048..45a537341b0e 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -23,7 +23,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 5ae17f70e909..3fde61407094 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -20,7 +20,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 1d8aa6def88f..b3b6f03e08d4 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -23,7 +23,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index bb8cc5fecb7a..16d15ccdd913 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -24,7 +24,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 143e9a4672f1..f217141af8c0 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 2d1e23c27451..09c23d379e98 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -25,7 +25,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 9e05a7ae6f96..dd44b3e6d00a 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -29,7 +29,7 @@
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CONFIG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
-#define CONFIG_SH_ETHER_CACHE_WRITEBACK
+#define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
 
-- 
2.25.1

[PATCH 119/149] global: Migrate CONFIG_SH_ETHER_PHY_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SH_ETHER_PHY_ADDR to CFG_SH_ETHER_PHY_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                    | 2 +-
 drivers/net/sh_eth.c      | 6 +++---
 include/configs/alt.h     | 2 +-
 include/configs/condor.h  | 2 +-
 include/configs/gose.h    | 2 +-
 include/configs/grpeach.h | 2 +-
 include/configs/koelsch.h | 2 +-
 include/configs/lager.h   | 2 +-
 include/configs/porter.h  | 2 +-
 include/configs/silk.h    | 2 +-
 include/configs/stout.h   | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 5f688d70f32f..217fbaf55757 100644
--- a/README
+++ b/README
@@ -544,7 +544,7 @@ The following options need to be configured:
 			CONFIG_SH_ETHER_USE_PORT
 			Define the number of ports to be used
 
-			CONFIG_SH_ETHER_PHY_ADDR
+			CFG_SH_ETHER_PHY_ADDR
 			Define the ETH PHY's address
 
 			CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 0053733075ed..3bf94cb2f7eb 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -33,8 +33,8 @@
 #ifndef CONFIG_SH_ETHER_USE_PORT
 # error "Please define CONFIG_SH_ETHER_USE_PORT"
 #endif
-#ifndef CONFIG_SH_ETHER_PHY_ADDR
-# error "Please define CONFIG_SH_ETHER_PHY_ADDR"
+#ifndef CFG_SH_ETHER_PHY_ADDR
+# error "Please define CFG_SH_ETHER_PHY_ADDR"
 #endif
 
 #if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \
@@ -694,7 +694,7 @@ static int sh_ether_probe(struct udevice *udev)
 	priv->bus = miiphy_get_dev_by_name(udev->name);
 
 	eth->port = CONFIG_SH_ETHER_USE_PORT;
-	eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
+	eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
 	eth->port_info[eth->port].iobase =
 		(void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port);
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 2b7832527347..06ab5ce669b9 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -22,7 +22,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 3f99cbf9dab9..43b88f127213 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -15,7 +15,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45a537341b0e..5184db41061f 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -21,7 +21,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 3fde61407094..8ba9b73672c8 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -18,7 +18,7 @@
 
 /* Network interface */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0
+#define CFG_SH_ETHER_PHY_ADDR	0
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index b3b6f03e08d4..2910336def6c 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -21,7 +21,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 16d15ccdd913..815239a73bd4 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -22,7 +22,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/porter.h b/include/configs/porter.h
index f217141af8c0..f732aeb47b56 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -23,7 +23,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 09c23d379e98..005eed154947 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -23,7 +23,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/stout.h b/include/configs/stout.h
index dd44b3e6d00a..cf90e4d46457 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -27,7 +27,7 @@
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
-#define CONFIG_SH_ETHER_PHY_ADDR	0x1
+#define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
-- 
2.25.1

[PATCH 120/149] global: Migrate CONFIG_SH_ETHER_PHY_MODE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SH_ETHER_PHY_MODE to CFG_SH_ETHER_PHY_MODE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/alt.h     | 2 +-
 include/configs/condor.h  | 2 +-
 include/configs/gose.h    | 2 +-
 include/configs/grpeach.h | 2 +-
 include/configs/koelsch.h | 2 +-
 include/configs/lager.h   | 2 +-
 include/configs/porter.h  | 2 +-
 include/configs/silk.h    | 2 +-
 include/configs/stout.h   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 06ab5ce669b9..53c31562a5d0 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -23,7 +23,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 43b88f127213..2c9817cf02c5 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -16,7 +16,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 5184db41061f..ed7dd70dd964 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -22,7 +22,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 8ba9b73672c8..6a11aa61f0fb 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -19,7 +19,7 @@
 /* Network interface */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 2910336def6c..31d0795f07fb 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -22,7 +22,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 815239a73bd4..991fc9020ee0 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -23,7 +23,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/porter.h b/include/configs/porter.h
index f732aeb47b56..1587c5c5397c 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -24,7 +24,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 005eed154947..21100c46b1cb 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -24,7 +24,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
diff --git a/include/configs/stout.h b/include/configs/stout.h
index cf90e4d46457..51f4420ed6fa 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -28,7 +28,7 @@
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
-#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
+#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
 #define CFG_SH_ETHER_CACHE_INVALIDATE
 #define CFG_SH_ETHER_ALIGNE_SIZE	64
-- 
2.25.1

[PATCH 121/149] global: Migrate CONFIG_SH_ETHER_USE_PORT to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SH_ETHER_USE_PORT to CFG_SH_ETHER_USE_PORT

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                    | 2 +-
 drivers/net/sh_eth.c      | 6 +++---
 include/configs/alt.h     | 2 +-
 include/configs/condor.h  | 2 +-
 include/configs/gose.h    | 2 +-
 include/configs/grpeach.h | 2 +-
 include/configs/koelsch.h | 2 +-
 include/configs/lager.h   | 2 +-
 include/configs/porter.h  | 2 +-
 include/configs/silk.h    | 2 +-
 include/configs/stout.h   | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 217fbaf55757..a9b225e45ecb 100644
--- a/README
+++ b/README
@@ -541,7 +541,7 @@ The following options need to be configured:
 		CONFIG_SH_ETHER
 		Support for Renesas on-chip Ethernet controller
 
-			CONFIG_SH_ETHER_USE_PORT
+			CFG_SH_ETHER_USE_PORT
 			Define the number of ports to be used
 
 			CFG_SH_ETHER_PHY_ADDR
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 3bf94cb2f7eb..8f162ca58fbb 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -30,8 +30,8 @@
 
 #include "sh_eth.h"
 
-#ifndef CONFIG_SH_ETHER_USE_PORT
-# error "Please define CONFIG_SH_ETHER_USE_PORT"
+#ifndef CFG_SH_ETHER_USE_PORT
+# error "Please define CFG_SH_ETHER_USE_PORT"
 #endif
 #ifndef CFG_SH_ETHER_PHY_ADDR
 # error "Please define CFG_SH_ETHER_PHY_ADDR"
@@ -693,7 +693,7 @@ static int sh_ether_probe(struct udevice *udev)
 
 	priv->bus = miiphy_get_dev_by_name(udev->name);
 
-	eth->port = CONFIG_SH_ETHER_USE_PORT;
+	eth->port = CFG_SH_ETHER_USE_PORT;
 	eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
 	eth->port_info[eth->port].iobase =
 		(void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port);
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 53c31562a5d0..8f03762583e9 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -21,7 +21,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 2c9817cf02c5..50c8d1733838 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -14,7 +14,7 @@
 /* Environment compatibility */
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/gose.h b/include/configs/gose.h
index ed7dd70dd964..7ae0726518da 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -20,7 +20,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512u * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 6a11aa61f0fb..8de4a36e931a 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_SDRAM_SIZE		(10 * 1024 * 1024)
 
 /* Network interface */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 31d0795f07fb..d47d70178ccd 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -20,7 +20,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 991fc9020ee0..2577c7a7da67 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -21,7 +21,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 1587c5c5397c..2cb430be8b0d 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -22,7 +22,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(1024u * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 21100c46b1cb..7bed32d8553b 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -22,7 +22,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE	(512 * 1024 * 1024)
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 51f4420ed6fa..1278ba63f4f3 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -26,7 +26,7 @@
 #define CFG_SCIF_A
 
 /* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT	0
+#define CFG_SH_ETHER_USE_PORT	0
 #define CFG_SH_ETHER_PHY_ADDR	0x1
 #define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
 #define CFG_SH_ETHER_CACHE_WRITEBACK
-- 
2.25.1

[PATCH 122/149] global: Migrate CONFIG_SLIC to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SLIC to CFG_SLIC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 include/configs/p1_p2_rdb_pc.h              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index df9f6ae47322..4d7d042eaf3b 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -187,7 +187,7 @@ void board_gpio_init(void)
 	setbits_be32(&pgpio->gpdat, 0x00080000);
 #endif
 
-#ifdef CONFIG_SLIC
+#ifdef CFG_SLIC
 	/* reset SLIC */
 	setbits_be32(&pgpio->gpdir, 0x00040000);
 	setbits_be32(&pgpio->gpdat, 0x00040000);
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 832ad9c3ece0..be7680198299 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -13,7 +13,7 @@
 #include <linux/stringify.h>
 
 #if defined(CONFIG_TARGET_P1020RDB_PC)
-#define CONFIG_SLIC
+#define CFG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x5c
 #define __SW_BOOT_SPI		0x1c
@@ -42,7 +42,7 @@
  * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off
  */
 #if defined(CONFIG_TARGET_P1020RDB_PD)
-#define CONFIG_SLIC
+#define CFG_SLIC
 #define __SW_BOOT_MASK		0x03
 #define __SW_BOOT_NOR		0x64
 #define __SW_BOOT_SPI		0x34
-- 
2.25.1

[PATCH 123/149] global: Migrate CONFIG_SMP_PEN_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SMP_PEN_ADDR to CFG_SMP_PEN_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv7/nonsec_virt.S     | 4 ++--
 board/samsung/arndale/arndale.c      | 4 ++--
 include/configs/arndale.h            | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 2 +-
 include/configs/ls1021aiot.h         | 2 +-
 include/configs/ls1021aqds.h         | 2 +-
 include/configs/ls1021atwr.h         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index b6d144f065d2..dcf9a7165f03 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -205,11 +205,11 @@ ENTRY(_nonsec_init)
 	bx	lr
 ENDPROC(_nonsec_init)
 
-#ifdef CONFIG_SMP_PEN_ADDR
+#ifdef CFG_SMP_PEN_ADDR
 /* void __weak smp_waitloop(unsigned previous_address); */
 ENTRY(smp_waitloop)
 	wfi
-	ldr	r1, =CONFIG_SMP_PEN_ADDR	@ load start address
+	ldr	r1, =CFG_SMP_PEN_ADDR	@ load start address
 	ldr	r1, [r1]
 #ifdef CONFIG_PEN_ADDR_BIG_ENDIAN
 	rev	r1, r1
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index a992dc684291..3ebf600e1d7c 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -112,10 +112,10 @@ int checkboard(void)
 }
 #endif
 
-#ifdef CONFIG_SMP_PEN_ADDR
+#ifdef CFG_SMP_PEN_ADDR
 void smp_set_core_boot_addr(unsigned long addr, int corenr)
 {
-	writel(addr, CONFIG_SMP_PEN_ADDR);
+	writel(addr, CFG_SMP_PEN_ADDR);
 
 	/* make sure this write is really executed */
 	__asm__ volatile ("dsb\n");
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 8acc525b11c9..b56effcd411e 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -16,7 +16,7 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SMP_PEN_ADDR	0x02020000
+#define CFG_SMP_PEN_ADDR	0x02020000
 
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
 #define CFG_ARM_GIC_BASE_ADDRESS	0x10480000
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index a5dde8e441c9..d7ecd5ebe052 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -161,7 +161,7 @@
 					{1, {I2C_NULL_HOP}                 }, \
 				}
 
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 53d9936f4e77..83ab94ec444c 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -68,7 +68,7 @@
 
 #define FSL_PCIE_COMPAT		"fsl,ls1021a-pcie"
 
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 78432e558117..e4e5522a2384 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -242,7 +242,7 @@
  * MMC
  */
 
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index a387eeab472a..eb8fb042723a 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -133,7 +133,7 @@
 
 /* GPIO */
 
-#define CONFIG_SMP_PEN_ADDR		0x01ee0200
+#define CFG_SMP_PEN_ADDR		0x01ee0200
 
 #define HWCONFIG_BUFFER_SIZE		256
 
-- 
2.25.1

[PATCH 124/149] global: Migrate CONFIG_STACKBASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_STACKBASE to CFG_STACKBASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/tegra-common.h    | 2 +-
 include/configs/tegra114-common.h | 2 +-
 include/configs/tegra124-common.h | 2 +-
 include/configs/tegra20-common.h  | 2 +-
 include/configs/tegra30-common.h  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 66cf7ae5847e..bde7ffce008f 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -45,7 +45,7 @@
 #define CFG_SYS_BOOTMAPSZ	(256 << 20)	/* 256M */
 
 #ifndef CONFIG_ARM64
-#define CFG_SYS_INIT_RAM_ADDR	CONFIG_STACKBASE
+#define CFG_SYS_INIT_RAM_ADDR	CFG_STACKBASE
 #define CFG_SYS_INIT_RAM_SIZE	CONFIG_SYS_MALLOC_LEN
 
 /* Defines for SPL */
diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index 87ec1f5a99d6..ab4fa5504c52 100644
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -15,7 +15,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x83800000	/* 56MB */
+#define CFG_STACKBASE	0x83800000	/* 56MB */
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index 0485fea6ccb8..b413e2512128 100644
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -17,7 +17,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x83800000	/* 56MB */
+#define CFG_STACKBASE	0x83800000	/* 56MB */
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 617bfb2197cf..a313ac2041a9 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -16,7 +16,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x03800000	/* 56MB */
+#define CFG_STACKBASE	0x03800000	/* 56MB */
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 04fcf11ed82d..c57d2d157e33 100644
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -16,7 +16,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_STACKBASE	0x83800000	/* 56MB */
+#define CFG_STACKBASE	0x83800000	/* 56MB */
 
 /*
  * Memory layout for where various images get loaded by boot scripts:
-- 
2.25.1

[PATCH 125/149] global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_STD_DEVICES_SETTINGS to CFG_STD_DEVICES_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/bayleybay.h               | 2 +-
 include/configs/cherryhill.h              | 2 +-
 include/configs/chromebook_coral.h        | 4 ++--
 include/configs/chromebook_samus.h        | 4 ++--
 include/configs/conga-qeval20-qa3-e3845.h | 2 +-
 include/configs/coreboot.h                | 2 +-
 include/configs/cougarcanyon2.h           | 2 +-
 include/configs/crownbay.h                | 2 +-
 include/configs/dfi-bt700.h               | 2 +-
 include/configs/efi-x86_app.h             | 2 +-
 include/configs/efi-x86_payload.h         | 2 +-
 include/configs/galileo.h                 | 2 +-
 include/configs/minnowmax.h               | 2 +-
 include/configs/qemu-x86.h                | 2 +-
 include/configs/slimbootloader.h          | 4 ++--
 include/configs/som-db5800-som-6867.h     | 2 +-
 include/configs/theadorable-x86-common.h  | 2 +-
 include/configs/x86-chromebook.h          | 2 +-
 include/configs/x86-common.h              | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index b347125f2fa0..b0df328cd84b 100644
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h
index 726c43d35ea0..d6ce70a96aea 100644
--- a/include/configs/cherryhill.h
+++ b/include/configs/cherryhill.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h
index d14c1d445b25..43fdc394416d 100644
--- a/include/configs/chromebook_coral.h
+++ b/include/configs/chromebook_coral.h
@@ -13,8 +13,8 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_STD_DEVICES_SETTINGS
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
+#undef CFG_STD_DEVICES_SETTINGS
+#define CFG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h
index e29be3fda4ac..03a1033c5735 100644
--- a/include/configs/chromebook_samus.h
+++ b/include/configs/chromebook_samus.h
@@ -15,8 +15,8 @@
 #include <configs/x86-common.h>
 #include <configs/x86-chromebook.h>
 
-#undef CONFIG_STD_DEVICES_SETTINGS
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
+#undef CFG_STD_DEVICES_SETTINGS
+#define CFG_STD_DEVICES_SETTINGS     "stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 6f431725269c..60617e6fec25 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index f73004386fda..b4f49bf5289d 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -15,7 +15,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index b64c7df1b25f..31639e48da88 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vga\0" \
 					"stderr=serial,vga\0"
 
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index ff74deb3d400..387bb8800e89 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index d10422b6c1c7..05389a435bee 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -16,7 +16,7 @@
 /* Use BayTrail internal HS UART which is memory-mapped */
 #endif
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
index 17a785140262..843ed8b9d1db 100644
--- a/include/configs/efi-x86_app.h
+++ b/include/configs/efi-x86_app.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=vidconsole\0" \
 					"stderr=vidconsole\0"
 
diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h
index f50c2ce4dd07..c72b067c367d 100644
--- a/include/configs/efi-x86_payload.h
+++ b/include/configs/efi-x86_payload.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 472f236b9b6e..0380ac287be2 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -14,7 +14,7 @@
 
 /* ns16550 UART is memory-mapped in Quark SoC */
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 6c15c72efda5..4a12c2f72c62 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0" \
 					"usb_pgood_delay=40\0"
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 5cd13887084c..33263a46a407 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -22,7 +22,7 @@
 #include <config_distro_bootcmd.h>
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,i8042-kbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h
index 748a423b0833..20b99a1021df 100644
--- a/include/configs/slimbootloader.h
+++ b/include/configs/slimbootloader.h
@@ -8,7 +8,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS		\
+#define CFG_STD_DEVICES_SETTINGS		\
 	"stdin=serial,i8042-kbd,usbkbd\0"	\
 	"stdout=serial\0"			\
 	"stderr=serial\0"
@@ -18,7 +18,7 @@
  */
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS		\
-	CONFIG_STD_DEVICES_SETTINGS		\
+	CFG_STD_DEVICES_SETTINGS		\
 	"netdev=eth0\0"				\
 	"consoledev=ttyS0\0"			\
 	"ramdiskaddr=0x4000000\0"		\
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index f09709213673..b2e7aa1514c0 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -12,7 +12,7 @@
 
 #include <configs/x86-common.h>
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
 					"stdout=serial,vidconsole\0" \
 					"stderr=serial,vidconsole\0"
 
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index 746995179f9c..b23b8783076b 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -11,7 +11,7 @@
 #ifndef __THEADORABLE_X86_COMMON_H
 #define __THEADORABLE_X86_COMMON_H
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+#define CFG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 9df3bfd527f6..41fb499ae4f7 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -12,7 +12,7 @@
 
 #define VIDEO_IO_OFFSET				0
 
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
+#define CFG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index f421ec580344..c1c5a09a35c7 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -44,7 +44,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS			\
 	DISTRO_BOOTENV					\
-	CONFIG_STD_DEVICES_SETTINGS			\
+	CFG_STD_DEVICES_SETTINGS			\
 	SPLASH_SETTINGS					\
 	"pciconfighost=1\0"				\
 	"netdev=eth0\0"					\
-- 
2.25.1

[PATCH 126/149] global: Migrate CONFIG_SYS_I2C_DIRECT_BUS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_SYS_I2C_DIRECT_BUS to CFG_SYS_I2C_DIRECT_BUS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                 |  4 ++--
 cmd/i2c.c              |  4 ++--
 drivers/i2c/i2c_core.c | 10 +++++-----
 include/i2c.h          |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index a9b225e45ecb..fe571f7ef0a6 100644
--- a/README
+++ b/README
@@ -843,7 +843,7 @@ The following options need to be configured:
 		CFG_SYS_NUM_I2C_BUSES
 		Hold the number of i2c buses you want to use.
 
-		CONFIG_SYS_I2C_DIRECT_BUS
+		CFG_SYS_I2C_DIRECT_BUS
 		define this, if you don't use i2c muxes on your hardware.
 		if CFG_SYS_I2C_MAX_HOPS is not defined or == 0 you can
 		omit this define.
@@ -855,7 +855,7 @@ The following options need to be configured:
 
 		CFG_SYS_I2C_BUSES
 		hold a list of buses you want to use, only used if
-		CONFIG_SYS_I2C_DIRECT_BUS is not defined, for example
+		CFG_SYS_I2C_DIRECT_BUS is not defined, for example
 		a board with CFG_SYS_I2C_MAX_HOPS = 1 and
 		CFG_SYS_NUM_I2C_BUSES = 9:
 
diff --git a/cmd/i2c.c b/cmd/i2c.c
index f204061cf09f..dd803ee22719 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1699,7 +1699,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 
 		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
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 			int j;
 
 			for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) {
@@ -1735,7 +1735,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 			return -1;
 		}
 		printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 			int j;
 			for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) {
 				if (i2c_bus[i].next_hop[j].chip == 0)
diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 7f65db23205a..fe0cd75d94a1 100644
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -33,14 +33,14 @@ struct i2c_adapter *i2c_get_adapter(int index)
 	return i2c_adap_p;
 }
 
-#if !defined(CONFIG_SYS_I2C_DIRECT_BUS)
+#if !defined(CFG_SYS_I2C_DIRECT_BUS)
 struct i2c_bus_hose i2c_bus[CFG_SYS_NUM_I2C_BUSES] =
 			CFG_SYS_I2C_BUSES;
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 /*
  * i2c_mux_set()
  * -------------
@@ -237,7 +237,7 @@ int i2c_set_bus_num(unsigned int bus)
 	if ((bus == I2C_BUS) && (I2C_ADAP->init_done > 0))
 		return 0;
 
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 	if (bus >= CFG_SYS_NUM_I2C_BUSES)
 		return -1;
 #endif
@@ -249,7 +249,7 @@ int i2c_set_bus_num(unsigned int bus)
 		return -2;
 	}
 
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 	i2c_mux_disconnect_all();
 #endif
 
@@ -257,7 +257,7 @@ int i2c_set_bus_num(unsigned int bus)
 	if (I2C_ADAP->init_done == 0)
 		i2c_init_bus(bus, I2C_ADAP->speed, I2C_ADAP->slaveaddr);
 
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 	i2c_mux_set_all();
 #endif
 	return 0;
diff --git a/include/i2c.h b/include/i2c.h
index 3811b26c08e0..ef3820eaba7c 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -635,12 +635,12 @@ void i2c_early_init_f(void);
 
 #if !defined(CFG_SYS_I2C_MAX_HOPS)
 /* no muxes used bus = i2c adapters */
-#define CONFIG_SYS_I2C_DIRECT_BUS	1
+#define CFG_SYS_I2C_DIRECT_BUS	1
 #define CFG_SYS_I2C_MAX_HOPS		0
 #define CFG_SYS_NUM_I2C_BUSES	ll_entry_count(struct i2c_adapter, i2c)
 #else
 /* we use i2c muxes */
-#undef CONFIG_SYS_I2C_DIRECT_BUS
+#undef CFG_SYS_I2C_DIRECT_BUS
 #endif
 
 /* define the I2C bus number for RTC and DTT if not already done */
@@ -691,7 +691,7 @@ struct i2c_adapter {
 
 struct i2c_adapter *i2c_get_adapter(int index);
 
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 struct i2c_mux {
 	int	id;
 	char	name[16];
@@ -720,7 +720,7 @@ extern struct i2c_bus_hose	i2c_bus[];
 #define	I2C_ADAP		I2C_ADAP_NR(gd->cur_i2c_bus)
 #define I2C_ADAP_HWNR		(I2C_ADAP->hwadapnr)
 
-#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+#ifndef CFG_SYS_I2C_DIRECT_BUS
 #define I2C_MUX_PCA9540_ID	1
 #define I2C_MUX_PCA9540		{I2C_MUX_PCA9540_ID, "PCA9540B"}
 #define I2C_MUX_PCA9542_ID	2
-- 
2.25.1

[PATCH 127/149] global: Migrate CONFIG_TEGRA_BOARD_STRING to CFG

[Tom Rini]

Perform a simple rename of CONFIG_TEGRA_BOARD_STRING to CFG_TEGRA_BOARD_STRING

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-tegra/board2.c  | 2 +-
 include/configs/beaver.h      | 2 +-
 include/configs/cardhu.h      | 2 +-
 include/configs/cei-tk1-som.h | 2 +-
 include/configs/dalmore.h     | 2 +-
 include/configs/harmony.h     | 2 +-
 include/configs/jetson-tk1.h  | 2 +-
 include/configs/medcom-wide.h | 2 +-
 include/configs/nyan-big.h    | 2 +-
 include/configs/p2371-0000.h  | 2 +-
 include/configs/p2371-2180.h  | 2 +-
 include/configs/p2571.h       | 2 +-
 include/configs/p2771-0000.h  | 2 +-
 include/configs/p3450-0000.h  | 2 +-
 include/configs/paz00.h       | 2 +-
 include/configs/plutux.h      | 2 +-
 include/configs/seaboard.h    | 2 +-
 include/configs/tec-ng.h      | 2 +-
 include/configs/tec.h         | 2 +-
 include/configs/trimslice.h   | 2 +-
 include/configs/venice2.h     | 2 +-
 include/configs/ventana.h     | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 54bbd8a776e9..c7a45f4ff82a 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -89,7 +89,7 @@ int checkboard(void)
 {
 	int board_id = tegra_board_id();
 
-	printf("Board: %s", CONFIG_TEGRA_BOARD_STRING);
+	printf("Board: %s", CFG_TEGRA_BOARD_STRING);
 	if (board_id != -1)
 		printf(", ID: %d\n", board_id);
 	printf("\n");
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 7e0e47796073..e622b7127e36 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -11,7 +11,7 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Beaver"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 64d713a19691..82729eb95cf6 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -11,7 +11,7 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Cardhu"
 
 #define BOARD_EXTRA_ENV_SETTINGS \
 	"board_name=cardhu-a04\0" \
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index e49eb602081d..fbd38b77fe55 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -16,7 +16,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"CEI tk1-som"
+#define CFG_TEGRA_BOARD_STRING	"CEI tk1-som"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index c9009e396237..095554157fae 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -11,7 +11,7 @@
 #include "tegra114-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Dalmore"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index a1a66bfb64e0..cae7acdb70b2 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Harmony"
 
 /* Board-specific serial config */
 
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index aa9e1d811a50..9858f8ff2b5d 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -12,7 +12,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Jetson TK1"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index efac0febdf81..8dbe741278a6 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Medcom-Wide"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index e885526e625f..c04d402deb0c 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -12,7 +12,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
+#define CFG_TEGRA_BOARD_STRING	"Google/NVIDIA Nyan-big"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index f426889e1c41..a29d7135d0bf 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -12,7 +12,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-0000"
 
 /* Board-specific serial config */
 
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 24adf4e13f05..0b077aba6592 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -12,7 +12,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2371-2180"
 
 /* Board-specific serial config */
 
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 8a1e7d9b9680..5155aa7b1dd2 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -12,7 +12,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2571"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2571"
 
 /* Board-specific serial config */
 
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 84cdd5719623..e409cc3896d7 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -11,7 +11,7 @@
 #include "tegra186-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P2771-0000"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P2771-0000"
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h
index 078d35dde2c9..e60f42eaa728 100644
--- a/include/configs/p3450-0000.h
+++ b/include/configs/p3450-0000.h
@@ -11,7 +11,7 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA P3450-0000"
 
 /* Board-specific serial config */
 
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 898167009f6a..950b3217642b 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -13,7 +13,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Compal Paz00"
+#define CFG_TEGRA_BOARD_STRING	"Compal Paz00"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 1d8ac618c0b2..30bfce9f503c 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Plutux"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index e5d672746b12..8e98620422d8 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Seaboard"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index ae879abe3f86..5e49abb49faf 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -10,7 +10,7 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten™ NG Evaluation Carrier"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/tec.h b/include/configs/tec.h
index e8a9df756d52..05dd7c96f619 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -12,7 +12,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
+#define CFG_TEGRA_BOARD_STRING	"Avionic Design Tamonten Evaluation Carrier"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index b5bf99122019..7d1ff2afd147 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"Compulab Trimslice"
+#define CFG_TEGRA_BOARD_STRING	"Compulab Trimslice"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 970893ca17bb..353b5ea67c13 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -12,7 +12,7 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Venice2"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index e7b7b911d9b6..1d9c60ca7c67 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -11,7 +11,7 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
+#define CFG_TEGRA_BOARD_STRING	"NVIDIA Ventana"
 
 /* Board-specific serial config */
 #define CFG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
-- 
2.25.1

[PATCH 128/149] global: Migrate CONFIG_TESTPIN_MASK to CFG

[Tom Rini]

Perform a simple rename of CONFIG_TESTPIN_MASK to CFG_TESTPIN_MASK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/keymile/km83xx/km83xx.c | 2 +-
 include/configs/kmcoge5ne.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 88afc76bbbf6..73e3709bbba2 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -217,7 +217,7 @@ int post_hotkeys_pressed(void)
 	struct km_bec_fpga *base =
 		(struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
 	int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG);
-	testpin = (testpin_reg & CONFIG_TESTPIN_MASK) != 0;
+	testpin = (testpin_reg & CFG_TESTPIN_MASK) != 0;
 	debug("post_hotkeys_pressed: %d\n", !testpin);
 	return testpin;
 }
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index b6386bdbcb7e..0bd789b26b06 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -36,6 +36,6 @@
 #define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
-#define CONFIG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
+#define CFG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
 
 #endif /* CONFIG */
-- 
2.25.1

[PATCH 129/149] global: Migrate CONFIG_TESTPIN_REG to CFG

[Tom Rini]

Perform a simple rename of CONFIG_TESTPIN_REG to CFG_TESTPIN_REG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/keymile/km83xx/km83xx.c | 2 +-
 include/configs/kmcoge5ne.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 73e3709bbba2..9ec1dbc6f97b 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -216,7 +216,7 @@ int post_hotkeys_pressed(void)
 	int testpin = 0;
 	struct km_bec_fpga *base =
 		(struct km_bec_fpga *)CFG_SYS_KMBEC_FPGA_BASE;
-	int testpin_reg = in_8(&base->CONFIG_TESTPIN_REG);
+	int testpin_reg = in_8(&base->CFG_TESTPIN_REG);
 	testpin = (testpin_reg & CFG_TESTPIN_MASK) != 0;
 	debug("post_hotkeys_pressed: %d\n", !testpin);
 	return testpin;
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 0bd789b26b06..f67e81f2b3e3 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -35,7 +35,7 @@
 #define CFG_POST (CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS)
 #define CFG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
-#define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
+#define CFG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CFG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
 
 #endif /* CONFIG */
-- 
2.25.1

[PATCH 130/149] global: Migrate CONFIG_TSEC_TBICR_SETTINGS to CFG

[Tom Rini]

Perform a simple rename of CONFIG_TSEC_TBICR_SETTINGS to CFG_TSEC_TBICR_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/net/tsec.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index f465409d8c8e..8833e3098d52 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -29,14 +29,14 @@
 		)
 
 /* By default force the TBI PHY into 1000Mbps full duplex when in SGMII mode */
-#ifndef CONFIG_TSEC_TBICR_SETTINGS
-#define CONFIG_TSEC_TBICR_SETTINGS ( \
+#ifndef CFG_TSEC_TBICR_SETTINGS
+#define CFG_TSEC_TBICR_SETTINGS ( \
 		TBICR_PHY_RESET \
 		| TBICR_ANEG_ENABLE \
 		| TBICR_FULL_DUPLEX \
 		| TBICR_SPEED1_SET \
 		)
-#endif /* CONFIG_TSEC_TBICR_SETTINGS */
+#endif /* CFG_TSEC_TBICR_SETTINGS */
 
 /* Configure the TBI for SGMII operation */
 static void tsec_configure_serdes(struct tsec_private *priv)
@@ -50,7 +50,7 @@ static void tsec_configure_serdes(struct tsec_private *priv)
 	tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa),
 			      0, TBI_TBICON, TBICON_CLK_SELECT);
 	tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa),
-			      0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS);
+			      0, TBI_CR, CFG_TSEC_TBICR_SETTINGS);
 }
 
 /* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c
-- 
2.25.1

[PATCH 131/149] global: Migrate CONFIG_USART_BASE to CFG

[Tom Rini]

Perform a simple rename of CONFIG_USART_BASE to CFG_USART_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/atmel_usart.c        | 10 +++++-----
 include/configs/corvus.h            |  2 +-
 include/configs/sam9x60_curiosity.h |  2 +-
 include/configs/sam9x60ek.h         |  2 +-
 include/configs/smartweb.h          |  2 +-
 include/configs/taurus.h            |  2 +-
 include/configs/vinco.h             |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 90ccdf6b2945..56655427b06b 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -72,13 +72,13 @@ static void atmel_serial_activate(atmel_usart3_t *usart)
 
 static void atmel_serial_setbrg(void)
 {
-	atmel_serial_setbrg_internal((atmel_usart3_t *)CONFIG_USART_BASE,
+	atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
 				     CONFIG_USART_ID, gd->baudrate);
 }
 
 static int atmel_serial_init(void)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
 	atmel_serial_init_internal(usart);
 	serial_setbrg();
@@ -89,7 +89,7 @@ static int atmel_serial_init(void)
 
 static void atmel_serial_putc(char c)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
 	if (c == '\n')
 		serial_putc('\r');
@@ -100,7 +100,7 @@ static void atmel_serial_putc(char c)
 
 static int atmel_serial_getc(void)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 
 	while (!(readl(&usart->csr) & USART3_BIT(RXRDY)))
 		 schedule();
@@ -109,7 +109,7 @@ static int atmel_serial_getc(void)
 
 static int atmel_serial_tstc(void)
 {
-	atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE;
+	atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE;
 	return (readl(&usart->csr) & USART3_BIT(RXRDY)) != 0;
 }
 
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 8a61086ecc15..c9eb75d93088 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
 /* serial console */
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CFG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /* SDRAM */
diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h
index f44ce909b918..204020d5ee74 100644
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_AT91_SLOW_CLOCK	32768
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
-#define CONFIG_USART_BASE   ATMEL_BASE_DBGU
+#define CFG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     0 /* ignored in arm */
 
 /* SDRAM */
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 27b39ebf4174..800b98ff98af 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_AT91_SLOW_CLOCK	32768
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
-#define CONFIG_USART_BASE   ATMEL_BASE_DBGU
+#define CFG_USART_BASE   ATMEL_BASE_DBGU
 #define CONFIG_USART_ID     0 /* ignored in arm */
 
 /*
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 762f61470b15..f9a5aa9e32d0 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -61,7 +61,7 @@
 #define CFG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 
 /* serial console */
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CFG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /* DFU class support */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 855218a8901e..88870d6fdf69 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -34,7 +34,7 @@
 
 /* Misc CPU related */
 
-#define CONFIG_USART_BASE		ATMEL_BASE_DBGU
+#define CFG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /*
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 0698ae1d1c6e..3b4032301f6e 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -17,7 +17,7 @@
 /* The value in the common file is too far away for the VInCo platform */
 
 /* serial console */
-#define CONFIG_USART_BASE		0xfc00c000
+#define CFG_USART_BASE		0xfc00c000
 #define CONFIG_USART_ID			30
 
 /* Timer */
-- 
2.25.1

[PATCH 132/149] global: Migrate CONFIG_USART_ID to CFG

[Tom Rini]

Perform a simple rename of CONFIG_USART_ID to CFG_USART_ID

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/atmel_usart.c        | 2 +-
 include/configs/corvus.h            | 2 +-
 include/configs/sam9x60_curiosity.h | 2 +-
 include/configs/sam9x60ek.h         | 2 +-
 include/configs/smartweb.h          | 2 +-
 include/configs/taurus.h            | 2 +-
 include/configs/vinco.h             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 56655427b06b..9d97bc865445 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -73,7 +73,7 @@ static void atmel_serial_activate(atmel_usart3_t *usart)
 static void atmel_serial_setbrg(void)
 {
 	atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE,
-				     CONFIG_USART_ID, gd->baudrate);
+				     CFG_USART_ID, gd->baudrate);
 }
 
 static int atmel_serial_init(void)
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index c9eb75d93088..f2675e0ec864 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -29,7 +29,7 @@
 
 /* serial console */
 #define CFG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CFG_USART_ID			ATMEL_ID_SYS
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE           ATMEL_BASE_CS6
diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h
index 204020d5ee74..e79f80f17f61 100644
--- a/include/configs/sam9x60_curiosity.h
+++ b/include/configs/sam9x60_curiosity.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
 #define CFG_USART_BASE   ATMEL_BASE_DBGU
-#define CONFIG_USART_ID     0 /* ignored in arm */
+#define CFG_USART_ID     0 /* ignored in arm */
 
 /* SDRAM */
 #define CFG_SYS_SDRAM_BASE		0x20000000
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 800b98ff98af..2c761821efb1 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -15,7 +15,7 @@
 #define CFG_SYS_AT91_MAIN_CLOCK	24000000	/* 24 MHz crystal */
 
 #define CFG_USART_BASE   ATMEL_BASE_DBGU
-#define CONFIG_USART_ID     0 /* ignored in arm */
+#define CFG_USART_ID     0 /* ignored in arm */
 
 /*
  * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index f9a5aa9e32d0..75a1670e3317 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -62,7 +62,7 @@
 
 /* serial console */
 #define CFG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CFG_USART_ID			ATMEL_ID_SYS
 
 /* DFU class support */
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 88870d6fdf69..174b848e2595 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -35,7 +35,7 @@
 /* Misc CPU related */
 
 #define CFG_USART_BASE		ATMEL_BASE_DBGU
-#define CONFIG_USART_ID			ATMEL_ID_SYS
+#define CFG_USART_ID			ATMEL_ID_SYS
 
 /*
  * SDRAM: 1 bank, min 32, max 128 MB
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 3b4032301f6e..68c56df5435e 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -18,7 +18,7 @@
 
 /* serial console */
 #define CFG_USART_BASE		0xfc00c000
-#define CONFIG_USART_ID			30
+#define CFG_USART_ID			30
 
 /* Timer */
 #define CFG_SYS_TIMER_COUNTER	0xfc06863c
-- 
2.25.1

[PATCH 133/149] global: Migrate CONFIG_USB_ISP1301_I2C_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_USB_ISP1301_I2C_ADDR to CFG_USB_ISP1301_I2C_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/usb/host/ohci-lpc32xx.c | 2 +-
 include/configs/devkit3250.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index 3be0b311a36e..a04b2961b961 100644
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -69,7 +69,7 @@ struct otg_regs {
 #define OTG1_DM_PULLDOWN		(1 << 3)
 #define OTG1_VBUS_DRV			(1 << 5)
 
-#define ISP1301_I2C_ADDR		CONFIG_USB_ISP1301_I2C_ADDR
+#define ISP1301_I2C_ADDR		CFG_USB_ISP1301_I2C_ADDR
 
 #define ISP1301_I2C_MODE_CONTROL_1_SET		0x04
 #define ISP1301_I2C_MODE_CONTROL_1_CLR		0x05
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 9cfee381d4ac..d85aeaafe519 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -53,7 +53,7 @@
 /*
  * USB
  */
-#define CONFIG_USB_ISP1301_I2C_ADDR		0x2d
+#define CFG_USB_ISP1301_I2C_ADDR		0x2d
 
 /*
  * U-Boot General Configurations
-- 
2.25.1

[PATCH 134/149] global: Migrate CONFIG_VSC7385_IMAGE et al to CFG

[Tom Rini]

Perform simple renames of:
   CONFIG_VSC7385_IMAGE to CFG_VSC7385_IMAGE
   CONFIG_VSC7385_IMAGE_SIZE to CFG_VSC7385_IMAGE_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/mpc837xerdb/mpc837xerdb.c   | 6 +++---
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
 include/configs/MPC837XERDB.h               | 4 ++--
 include/configs/p1_p2_rdb_pc.h              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 8b1bfe0a9f91..97884a397964 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -206,9 +206,9 @@ int misc_init_r(void)
 {
 	int rc = 0;
 
-#ifdef CONFIG_VSC7385_IMAGE
-	if (vsc7385_upload_firmware((void *) CONFIG_VSC7385_IMAGE,
-		CONFIG_VSC7385_IMAGE_SIZE)) {
+#ifdef CFG_VSC7385_IMAGE
+	if (vsc7385_upload_firmware((void *) CFG_VSC7385_IMAGE,
+		CFG_VSC7385_IMAGE_SIZE)) {
 		puts("Failure uploading VSC7385 microcode.\n");
 		rc = 1;
 	}
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 4d7d042eaf3b..602b7f0156ba 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -355,7 +355,7 @@ int board_early_init_r(void)
 		vscfw_addr = hextoul(tmp, NULL);
 		printf("uploading VSC7385 microcode from %x\n", vscfw_addr);
 		if (vsc7385_upload_firmware((void *)vscfw_addr,
-					    CONFIG_VSC7385_IMAGE_SIZE))
+					    CFG_VSC7385_IMAGE_SIZE))
 			puts("Failure uploading VSC7385 microcode.\n");
 	} else {
 		puts("No address specified for VSC7385 microcode.\n");
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 07c989d98906..70b1c399241e 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -42,8 +42,8 @@
 #ifdef CONFIG_VSC7385_ENET
 
 /* The flash address and size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE		0xFE7FE000
-#define CONFIG_VSC7385_IMAGE_SIZE	8192
+#define CFG_VSC7385_IMAGE		0xFE7FE000
+#define CFG_VSC7385_IMAGE_SIZE	8192
 
 #endif
 
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index be7680198299..f5bd09134499 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -270,7 +270,7 @@
 #endif
 
 /* The size of the VSC7385 firmware image */
-#define CONFIG_VSC7385_IMAGE_SIZE	8192
+#define CFG_VSC7385_IMAGE_SIZE	8192
 #endif
 
 #ifndef __VSCFW_ADDR
-- 
2.25.1

[PATCH 135/149] global: Migrate CONFIG_WATCHDOG_PRESC et al to CFG

[Tom Rini]

Perform simple renames of:
   CONFIG_WATCHDOG_PRESC to CFG_WATCHDOG_PRESC
   CONFIG_WATCHDOG_RC to CFG_WATCHDOG_RC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc85xx/cpu.c | 2 +-
 include/configs/kmcent2.h      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 0abcc01b8574..e8a3e82765fc 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -357,7 +357,7 @@ void
 init_85xx_watchdog(void)
 {
 	mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WATCHDOG_MASK) |
-	      TCR_WP(CONFIG_WATCHDOG_PRESC) | TCR_WRC(CONFIG_WATCHDOG_RC));
+	      TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CFG_WATCHDOG_RC));
 }
 
 void
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 1eaf1968321c..9bb8cd19033e 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -375,8 +375,8 @@ int get_scl(void);
 /*
  * Hardware Watchdog
  */
-#define CONFIG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
-#define CONFIG_WATCHDOG_RC WRC_CHIP	/* reset chip on watchdog event */
+#define CFG_WATCHDOG_PRESC 34	/* wdog prescaler 2^(64-34) ~10min */
+#define CFG_WATCHDOG_RC WRC_CHIP	/* reset chip on watchdog event */
 
 /*
  * For booting Linux, the board info and command line data
-- 
2.25.1

[PATCH 136/149] global: Migrate CONFIG_X86_MRC_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_X86_MRC_ADDR to CFG_X86_MRC_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/x86/cpu/intel_common/mrc.c  | 2 +-
 arch/x86/dts/u-boot.dtsi         | 2 +-
 include/configs/x86-chromebook.h | 2 +-
 tools/binman/binman.rst          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index a4918fbad61a..69405d740b47 100644
--- a/arch/x86/cpu/intel_common/mrc.c
+++ b/arch/x86/cpu/intel_common/mrc.c
@@ -200,7 +200,7 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev,
 
 	debug("PEI data at %p:\n", pei_data);
 
-	data = (char *)CONFIG_X86_MRC_ADDR;
+	data = (char *)CFG_X86_MRC_ADDR;
 	if (data) {
 		int rv;
 		ulong start;
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 24e692f988d8..454efc17614e 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -86,7 +86,7 @@
 #endif
 #ifdef CONFIG_HAVE_MRC
 	intel-mrc {
-		offset = <CONFIG_X86_MRC_ADDR>;
+		offset = <CFG_X86_MRC_ADDR>;
 	};
 #endif
 #ifdef CONFIG_FSP_VERSION1
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 41fb499ae4f7..059e3a0d8a2c 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -6,7 +6,7 @@
 #ifndef _X86_CHROMEBOOK_H
 #define _X86_CHROMEBOOK_H
 
-#define CONFIG_X86_MRC_ADDR			0xfffa0000
+#define CFG_X86_MRC_ADDR			0xfffa0000
 #define CONFIG_X86_REFCODE_ADDR			0xffea0000
 #define CONFIG_X86_REFCODE_RUN_ADDR		0
 
diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst
index e7b231e07120..69e4b00239c1 100644
--- a/tools/binman/binman.rst
+++ b/tools/binman/binman.rst
@@ -298,7 +298,7 @@ C preprocessor::
 
     #ifdef CONFIG_HAVE_MRC
         intel-mrc {
-                offset = <CONFIG_X86_MRC_ADDR>;
+                offset = <CFG_X86_MRC_ADDR>;
         };
     #endif
 
-- 
2.25.1

[PATCH 137/149] global: Migrate CONFIG_X86_REFCODE_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_X86_REFCODE_ADDR to CFG_X86_REFCODE_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/x86/cpu/broadwell/refcode.c | 2 +-
 arch/x86/dts/u-boot.dtsi         | 2 +-
 include/configs/x86-chromebook.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 94c2e05346a6..3b7ec2b74e8e 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -78,7 +78,7 @@ static int cpu_run_reference_code(void)
 	int ret, dummy;
 	int size;
 
-	hdr = (struct rmodule_header *)CONFIG_X86_REFCODE_ADDR;
+	hdr = (struct rmodule_header *)CFG_X86_REFCODE_ADDR;
 	debug("Extracting code from rmodule at %p\n", hdr);
 	if (hdr->magic != RMODULE_MAGIC) {
 		debug("Invalid rmodule magic\n");
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 454efc17614e..e0de33180910 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -149,7 +149,7 @@
 #endif
 #ifdef CONFIG_HAVE_REFCODE
 	intel-refcode {
-		offset = <CONFIG_X86_REFCODE_ADDR>;
+		offset = <CFG_X86_REFCODE_ADDR>;
 	};
 #endif
 #ifdef CONFIG_TPL
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 059e3a0d8a2c..8bbbe51ecb57 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -7,7 +7,7 @@
 #define _X86_CHROMEBOOK_H
 
 #define CFG_X86_MRC_ADDR			0xfffa0000
-#define CONFIG_X86_REFCODE_ADDR			0xffea0000
+#define CFG_X86_REFCODE_ADDR			0xffea0000
 #define CONFIG_X86_REFCODE_RUN_ADDR		0
 
 #define VIDEO_IO_OFFSET				0
-- 
2.25.1

[PATCH 138/149] global: Migrate CONFIG_X86_REFCODE_RUN_ADDR to CFG

[Tom Rini]

Perform a simple rename of CONFIG_X86_REFCODE_RUN_ADDR to CFG_X86_REFCODE_RUN_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/x86/cpu/broadwell/refcode.c | 4 ++--
 include/configs/x86-chromebook.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index 3b7ec2b74e8e..df2df7972e98 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -99,7 +99,7 @@ static int cpu_run_reference_code(void)
 	pei_data->saved_data = (void *)&dummy;
 
 	src = (char *)hdr + hdr->payload_begin_offset;
-	dest = (char *)CONFIG_X86_REFCODE_RUN_ADDR;
+	dest = (char *)CFG_X86_REFCODE_RUN_ADDR;
 
 	size = hdr->payload_end_offset - hdr->payload_begin_offset;
 	debug("Copying refcode from %p to %p, size %x\n", src, dest, size);
@@ -112,7 +112,7 @@ static int cpu_run_reference_code(void)
 	func = (asmlinkage int (*)(void *))dest;
 	debug("Running reference code at %p\n", func);
 #ifdef DEBUG
-	print_buffer(CONFIG_X86_REFCODE_RUN_ADDR, (void *)func, 1, 0x40, 0);
+	print_buffer(CFG_X86_REFCODE_RUN_ADDR, (void *)func, 1, 0x40, 0);
 #endif
 	ret = func(pei_data);
 	if (ret != 0) {
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 8bbbe51ecb57..98abb00927ad 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -8,7 +8,7 @@
 
 #define CFG_X86_MRC_ADDR			0xfffa0000
 #define CFG_X86_REFCODE_ADDR			0xffea0000
-#define CONFIG_X86_REFCODE_RUN_ADDR		0
+#define CFG_X86_REFCODE_RUN_ADDR		0
 
 #define VIDEO_IO_OFFSET				0
 
-- 
2.25.1

[PATCH 139/149] librem5: Rename CONFIG_POWER_BD71837 symbols

[Tom Rini]

Rename the CONFIG_POWER_BD71837_I2C_* symbols to not have the CONFIG
prefix and be local to the file they are used in.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/purism/librem5/spl.c | 8 +++++---
 include/configs/librem5.h  | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/board/purism/librem5/spl.c b/board/purism/librem5/spl.c
index 1bfd948806f2..1a203b459990 100644
--- a/board/purism/librem5/spl.c
+++ b/board/purism/librem5/spl.c
@@ -322,6 +322,8 @@ void disable_charger_bq25895(void)
 }
 
 #define I2C_PMIC	0
+#define POWER_BD71837_I2C_BUS	0
+#define POWER_BD71837_I2C_ADDR	0x4B
 
 int power_bd71837_init(unsigned char bus)
 {
@@ -336,7 +338,7 @@ int power_bd71837_init(unsigned char bus)
 	p->name = name;
 	p->interface = I2C_PMIC;
 	p->number_of_regs = BD718XX_MAX_REGISTER;
-	p->hw.i2c.addr = CONFIG_POWER_BD71837_I2C_ADDR;
+	p->hw.i2c.addr = POWER_BD71837_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->bus = bus;
 
@@ -357,10 +359,10 @@ int power_init_board(void)
 	/*
 	 * Init PMIC
 	 */
-	rv = power_bd71837_init(CONFIG_POWER_BD71837_I2C_BUS);
+	rv = power_bd71837_init(POWER_BD71837_I2C_BUS);
 	if (rv) {
 		log_err("%s: power_bd71837_init(%d) error %d\n", __func__,
-			CONFIG_POWER_BD71837_I2C_BUS, rv);
+			POWER_BD71837_I2C_BUS, rv);
 		goto out;
 	}
 
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 9e4d373e56d5..e17190ce9c5d 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -19,10 +19,6 @@
 
 #define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */
 
-#define CONFIG_POWER_BD71837
-#define CONFIG_POWER_BD71837_I2C_BUS	0
-#define CONFIG_POWER_BD71837_I2C_ADDR	0x4B
-
 #endif /* CONFIG_SPL_BUILD*/
 
 #define CFG_SYS_FSL_USDHC_NUM	2
-- 
2.25.1

[PATCH 140/149] configs: Remove unused or redundant CONFIG symbols

[Tom Rini]

A number of CONFIG symbols have crept in that are never referenced in
code, so drop them here. Further, we have two symbols being enabled
in headers while already enabled correctly in Kconfig, so these lines
can also be removed.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig         | 1 +
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 1 -
 arch/arm/mach-mvebu/include/mach/config.h         | 3 ---
 include/configs/cgtqmx8.h                         | 1 -
 include/configs/imx8mp_rsb3720.h                  | 9 ---------
 include/configs/imx8mq_cm.h                       | 1 -
 include/configs/imx8mq_evk.h                      | 1 -
 include/configs/imx8mq_phanbell.h                 | 1 -
 include/configs/imx8qm_mek.h                      | 1 -
 include/configs/imx8qxp_mek.h                     | 1 -
 include/configs/kontron_pitx_imx8m.h              | 1 -
 include/configs/librem5.h                         | 6 ------
 include/configs/pico-imx8mq.h                     | 1 -
 13 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 2862257e1f2c..9656c52e955f 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -29,6 +29,7 @@ config ARCH_LS1028A
 	select ESBC_HDR_LS if CHAIN_OF_TRUST
 	select FSL_LAYERSCAPE
 	select FSL_LSCH3
+	select FSL_TZASC_400
 	select GICV3
 	select NXP_LSCH3_2
 	select SYS_FSL_HAS_CCI400
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index 12758c8dd1ca..516c9eab0478 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -160,7 +160,6 @@
 
 #elif defined(CONFIG_ARCH_LS1028A)
 #define CFG_SYS_FSL_CLUSTER_CLOCKS		{ 1, 1 }
-#define CONFIG_FSL_TZASC_400
 
 /* TZ Protection Controller Definitions */
 #define TZPC_BASE				0x02200000
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 96a08104ff46..610274754837 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -27,7 +27,4 @@
 
 #define MV_UART_CONSOLE_BASE		MVEBU_UART0_BASE
 
-/* Needed for SPI NOR booting in SPL */
-#define CONFIG_DM_SEQ_ALIAS		1
-
 #endif /* __MVEBU_CONFIG_H */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 91454df19720..98d4d8cf4bd9 100644
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SERIAL_LPUART_BASE	0x5a060000
 #define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 495ca313db28..d4ab6a6207d6 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -28,12 +28,6 @@
 						  * GD_FLG_FULL_MALLOC_INIT \
 						  * set \
 						  */
-
-
-#if defined(CONFIG_NAND_BOOT)
-#define CONFIG_SPL_NAND_MXS
-#endif
-
 #endif
 
 /* ENET Config */
@@ -158,9 +152,6 @@
 #define FSL_FSPI_FLASH_NUM		1
 #define FSPI0_BASE_ADDR			0x30bb0000
 #define FSPI0_AMBA_BASE			0x0
-#define CONFIG_FSPI_QUAD_SUPPORT
-
-#define CONFIG_SYS_FSL_FSPI_AHB
 #endif
 
 #ifdef CONFIG_NAND_MXS
diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index 828bd6723727..7cf482d6de15 100644
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -11,7 +11,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR		0x182000
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index d2de2900c063..d2e1649400a7 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -12,7 +12,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR		0x182000
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index bfde15e6240f..b66fc18fa5e8 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -11,7 +11,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SYS_SPL_PTE_RAM_BASE    0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR		0x182000
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index a25efbb16bdb..4d5abe2d073b 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -11,7 +11,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SERIAL_LPUART_BASE	0x5a060000
 #define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 4f55ae49403d..93999509948a 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -11,7 +11,6 @@
 #include <asm/arch/imx-regs.h>
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SERIAL_LPUART_BASE	0x5a060000
 #define CFG_MALLOC_F_ADDR		0x00120000
 
 #endif
diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index e3a021c987c6..5cf6b5a6dd46 100644
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -13,7 +13,6 @@
 		 0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_SPL_PTE_RAM_BASE     0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR		0x182000
diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index e17190ce9c5d..ce0a340ba26e 100644
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -15,12 +15,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-#ifdef CONFIG_SPL_BUILD
-
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */
-
-#endif /* CONFIG_SPL_BUILD*/
-
 #define CFG_SYS_FSL_USDHC_NUM	2
 
 #define CONSOLE_ON_UART1
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 4b602ea03022..be31f8a23cab 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -11,7 +11,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/
-#define CONFIG_SYS_SPL_PTE_RAM_BASE	0x41580000
 
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CFG_MALLOC_F_ADDR		0x182000
-- 
2.25.1

[PATCH 141/149] bcmcygnus: Convert CONFIG_IPROC to Kconfig

[Tom Rini]

Select this symbol as needed.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig                            | 4 ++++
 arch/arm/include/asm/iproc-common/configs.h | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 42576e503a4a..d7318cad8f63 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -599,6 +599,9 @@ config ARM64_SUPPORT_AARCH32
 	help
 	  This ARM64 system supports AArch32 execution state.
 
+config IPROC
+	bool
+
 config S5P
 	def_bool y if ARCH_EXYNOS || ARCH_S5PC1XX
 
@@ -704,6 +707,7 @@ config TARGET_BCMCYGNUS
 	bool "Support bcmcygnus"
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select IPROC
 	imply BCM_SF2_ETH
 	imply BCM_SF2_ETH_GMAC
 	imply CMD_HASH
diff --git a/arch/arm/include/asm/iproc-common/configs.h b/arch/arm/include/asm/iproc-common/configs.h
index c63c27dac7e1..ce831bc13a7e 100644
--- a/arch/arm/include/asm/iproc-common/configs.h
+++ b/arch/arm/include/asm/iproc-common/configs.h
@@ -8,9 +8,6 @@
 
 #include <linux/stringify.h>
 
-/* Architecture, CPU, chip, etc */
-#define CONFIG_IPROC
-
 /* Memory Info */
 #define CFG_SYS_SDRAM_BASE		0x61000000
 
-- 
2.25.1

[PATCH 142/149] kbuild: Remove uncmd_spl logic

[Tom Rini]

At this point in the conversion there should be no need to have logic to
disable some symbol during the SPL build as all symbols should have an
SPL counterpart.

The main real changes done here are that we now must make proper use of
CONFIG_IS_ENABLED(DM_SERIAL) rather than many of the odd tricks we
developed prior to CONFIG_IS_ENABLED() being available.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/freescale/common/i2c_common.c    |  2 +-
 board/freescale/common/i2c_common.h    |  2 +-
 drivers/misc/gsc.c                     |  2 +-
 drivers/serial/Makefile                | 17 +----------------
 drivers/serial/atmel_usart.c           |  8 +++-----
 drivers/serial/serial-uclass.c         |  6 +++---
 drivers/serial/serial_mtk.c            |  3 +--
 drivers/serial/serial_pl01x.c          | 11 +++--------
 drivers/serial/serial_pl01x_internal.h |  2 +-
 include/config_uncmd_spl.h             | 21 ---------------------
 include/configs/kmcent2.h              |  2 +-
 include/configs/mv-common.h            |  2 +-
 include/configs/sunxi-common.h         |  2 +-
 include/configs/ti_omap4_common.h      |  2 +-
 include/configs/x530.h                 |  2 +-
 include/ns16550.h                      | 10 +++++-----
 scripts/Makefile.autoconf              |  1 -
 scripts/Makefile.build                 |  1 -
 scripts/Makefile.uncmd_spl             | 14 --------------
 19 files changed, 25 insertions(+), 85 deletions(-)
 delete mode 100644 include/config_uncmd_spl.h
 delete mode 100644 scripts/Makefile.uncmd_spl

diff --git a/board/freescale/common/i2c_common.c b/board/freescale/common/i2c_common.c
index 0f09ed7d34f6..119ed3c6171b 100644
--- a/board/freescale/common/i2c_common.c
+++ b/board/freescale/common/i2c_common.c
@@ -9,7 +9,7 @@
 #include <i2c.h>
 #include "i2c_common.h"
 
-#ifdef CONFIG_DM_I2C
+#if CONFIG_IS_ENABLED(DM_I2C)
 
 /* If DM is in use, retrieve the chip for the specified bus number */
 int fsl_i2c_get_device(int address, int bus, DEVICE_HANDLE_T *dev)
diff --git a/board/freescale/common/i2c_common.h b/board/freescale/common/i2c_common.h
index 840ad6618314..77a7b6aedd7b 100644
--- a/board/freescale/common/i2c_common.h
+++ b/board/freescale/common/i2c_common.h
@@ -9,7 +9,7 @@
 #define __NXP_I2C_COMMON_H__
 
 /* Common functionality shared by the I2C drivers for VID and the mux. */
-#ifdef CONFIG_DM_I2C
+#if CONFIG_IS_ENABLED(DM_I2C)
 #define DEVICE_HANDLE_T struct udevice *
 
 #define I2C_READ(dev, register, data, length) \
diff --git a/drivers/misc/gsc.c b/drivers/misc/gsc.c
index ec24ca807b07..65c9c2c6ce37 100644
--- a/drivers/misc/gsc.c
+++ b/drivers/misc/gsc.c
@@ -77,7 +77,7 @@ enum {
 	GSC_SC_RST_CAUSE_MAX		= 10,
 };
 
-#if (IS_ENABLED(CONFIG_DM_I2C))
+#if CONFIG_IS_ENABLED(DM_I2C)
 
 struct gsc_priv {
 	int gscver;
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 33fa56822114..37d3f82dbd87 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -3,30 +3,15 @@
 # (C) Copyright 2006-2009
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-ifdef CONFIG_SPL_BUILD
-
-ifeq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)DM_SERIAL),yy)
-obj-y += serial-uclass.o
-else
-obj-y += serial.o
-endif
-
-else
-
-ifdef CONFIG_DM_SERIAL
+ifeq ($(CONFIG_$(SPL_TPL_)DM_SERIAL),y)
 obj-y += serial-uclass.o
 else
 obj-y += serial.o
 endif
 
-endif
-
-ifdef CONFIG_DM_SERIAL
 obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o
-else
 obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
 obj-$(CONFIG_$(SPL_)SYS_NS16550_SERIAL) += serial_ns16550.o
-endif
 
 obj-$(CONFIG_ALTERA_UART) += altera_uart.o
 obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 9d97bc865445..9853f49c94ff 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 
 #include <asm/io.h>
-#ifdef CONFIG_DM_SERIAL
+#if CONFIG_IS_ENABLED(DM_SERIAL)
 #include <asm/arch/atmel_serial.h>
 #endif
 #include <asm/arch/clk.h>
@@ -28,7 +28,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_DM_SERIAL
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 static void atmel_serial_setbrg_internal(atmel_usart3_t *usart, int id,
 					 int baudrate)
 {
@@ -133,9 +133,7 @@ __weak struct serial_device *default_serial_console(void)
 {
 	return &atmel_serial_drv;
 }
-#endif
-
-#ifdef CONFIG_DM_SERIAL
+#else
 enum serial_clk_type {
 	CLK_TYPE_NORMAL = 0,
 	CLK_TYPE_DBGU,
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index c02106747a08..7240d763d12e 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -407,7 +407,7 @@ void serial_stdio_init(void)
 {
 }
 
-#if defined(CONFIG_DM_STDIO)
+#if CONFIG_IS_ENABLED(DM_STDIO)
 
 #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 static void serial_stub_putc(struct stdio_dev *sdev, const char ch)
@@ -505,7 +505,7 @@ U_BOOT_ENV_CALLBACK(baudrate, on_baudrate);
 static int serial_post_probe(struct udevice *dev)
 {
 	struct dm_serial_ops *ops = serial_get_ops(dev);
-#ifdef CONFIG_DM_STDIO
+#if CONFIG_IS_ENABLED(DM_STDIO)
 	struct serial_dev_priv *upriv = dev_get_uclass_priv(dev);
 	struct stdio_dev sdev;
 #endif
@@ -540,7 +540,7 @@ static int serial_post_probe(struct udevice *dev)
 			return ret;
 	}
 
-#ifdef CONFIG_DM_STDIO
+#if CONFIG_IS_ENABLED(DM_STDIO)
 	if (!(gd->flags & GD_FLG_RELOC))
 		return 0;
 	memset(&sdev, '\0', sizeof(sdev));
diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 6fb4cb65c29f..ded7346a13f5 100644
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -173,8 +173,7 @@ static int _mtk_serial_pending(struct mtk_serial_priv *priv, bool input)
 		return (readl(&priv->regs->lsr) & UART_LSR_THRE) ? 0 : 1;
 }
 
-#if defined(CONFIG_DM_SERIAL) && \
-	(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_DM))
+#if CONFIG_IS_ENABLED(DM_SERIAL)
 static int mtk_serial_setbrg(struct udevice *dev, int baudrate)
 {
 	struct mtk_serial_priv *priv = dev_get_priv(dev);
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 7449e9b90430..f5468353e101 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -27,8 +27,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_DM_SERIAL
-
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 static volatile unsigned char *const port[] = CFG_PL01x_PORTS;
 static enum pl01x_type pl01x_type __section(".data");
 static struct pl01x_regs *base_regs __section(".data");
@@ -186,7 +185,7 @@ static int pl01x_generic_setbrg(struct pl01x_regs *regs, enum pl01x_type type,
 	return 0;
 }
 
-#ifndef CONFIG_DM_SERIAL
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 static void pl01x_serial_init_baud(int baudrate)
 {
 	int clock = 0;
@@ -273,11 +272,7 @@ __weak struct serial_device *default_serial_console(void)
 {
 	return &pl01x_serial_drv;
 }
-
-#endif /* nCONFIG_DM_SERIAL */
-
-#ifdef CONFIG_DM_SERIAL
-
+#else
 int pl01x_serial_setbrg(struct udevice *dev, int baudrate)
 {
 	struct pl01x_serial_plat *plat = dev_get_plat(dev);
diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h
index dfd95a0b77c7..71c52bb53125 100644
--- a/drivers/serial/serial_pl01x_internal.h
+++ b/drivers/serial/serial_pl01x_internal.h
@@ -38,7 +38,7 @@ struct pl01x_regs {
 	u32	pl011_cr;	/* 0x30 Control register */
 };
 
-#ifdef CONFIG_DM_SERIAL
+#if CONFIG_IS_ENABLED(DM_SERIAL)
 
 int pl01x_serial_of_to_plat(struct udevice *dev);
 int pl01x_serial_probe(struct udevice *dev);
diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
deleted file mode 100644
index a59b9bbafbdf..000000000000
--- a/include/config_uncmd_spl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2012
- * Ilya Yanok, ilya.yanok@gmail.com
- */
-
-#ifndef __CONFIG_UNCMD_SPL_H__
-#define __CONFIG_UNCMD_SPL_H__
-
-#ifdef CONFIG_SPL_BUILD
-/* SPL needs only BOOTP + TFTP so undefine other stuff to save space */
-
-#ifndef CONFIG_SPL_DM
-#undef CONFIG_DM_SERIAL
-#undef CONFIG_DM_I2C
-#endif
-
-#undef CONFIG_DM_STDIO
-
-#endif /* CONFIG_SPL_BUILD */
-#endif /* __CONFIG_UNCMD_SPL_H__ */
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 9bb8cd19033e..c356920c7876 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -325,7 +325,7 @@
  * shorted - index 1
  * Retain non-DM serial port for debug purposes.
  */
-#if !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_CLK		(get_bus_freq(0) / 2)
 #define CFG_SYS_NS16550_COM1	(CFG_SYS_CCSRBAR + 0x11C500)
 #endif
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index fa275d61d185..3dfcb138b490 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -33,7 +33,7 @@
  * NS16550 Configuration
  */
 #define CFG_SYS_NS16550_CLK		CFG_SYS_TCLK
-#if !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_COM1		MV_UART_CONSOLE_BASE
 #endif
 
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index eae107fe5ec6..8032abe76921 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -23,7 +23,7 @@
 #else
 #define CFG_SYS_NS16550_CLK		24000000
 #endif
-#ifndef CONFIG_DM_SERIAL
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 # define CFG_SYS_NS16550_COM1		SUNXI_UART0_BASE
 # define CFG_SYS_NS16550_COM2		SUNXI_UART1_BASE
 # define CFG_SYS_NS16550_COM3		SUNXI_UART2_BASE
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 49f4263e16ba..9e312ac16d1a 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -28,7 +28,7 @@
  * Hardware drivers
  */
 #define CFG_SYS_NS16550_CLK		48000000
-#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_COM3		UART3_BASE
 #endif
 
diff --git a/include/configs/x530.h b/include/configs/x530.h
index 01c1b58b2359..c3ffbbfd1f8f 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -14,7 +14,7 @@
  * NS16550 Configuration
  */
 #define CFG_SYS_NS16550_CLK		CFG_SYS_TCLK
-#if !defined(CONFIG_DM_SERIAL)
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
 #define CFG_SYS_NS16550_COM1		MV_UART_CONSOLE_BASE
 #endif
 
diff --git a/include/ns16550.h b/include/ns16550.h
index 0ee5c4d6de75..f45fc8cecc56 100644
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -26,7 +26,7 @@
 
 #include <linux/types.h>
 
-#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE)
+#if CONFIG_IS_ENABLED(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
@@ -37,10 +37,10 @@
 #ifdef CONFIG_NS16550_DYNAMIC
 #define UART_REG(x)	unsigned char x
 #else
-#if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
-#error "Please define NS16550 registers size."
-#elif defined(CONFIG_SYS_NS16550_MEM32) && !defined(CONFIG_DM_SERIAL)
+#if defined(CONFIG_SYS_NS16550_MEM32) && !CONFIG_IS_ENABLED(DM_SERIAL)
 #define UART_REG(x) u32 x
+#elif !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
+#error "Please define NS16550 registers size."
 #elif (CONFIG_SYS_NS16550_REG_SIZE > 0)
 #define UART_REG(x)						   \
 	unsigned char prepad_##x[CONFIG_SYS_NS16550_REG_SIZE - 1]; \
@@ -113,7 +113,7 @@ struct ns16550 {
 	UART_REG(scr);		/* 10*/
 	UART_REG(ssr);		/* 11*/
 #endif
-#ifdef CONFIG_DM_SERIAL
+#if CONFIG_IS_ENABLED(DM_SERIAL)
 	struct ns16550_plat *plat;
 #endif
 };
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index f5f5e4a4d540..0ade91642ae3 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -113,7 +113,6 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
 	echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
-	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
 	echo \#include \<asm/config.h\>;				\
 	echo \#include \<linux/kconfig.h\>;				\
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 3b8c9d8c3190..97dd4a64f6ef 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -48,7 +48,6 @@ subdir-ccflags-y :=
 # Modified for U-Boot
 -include include/config/auto.conf
 -include $(prefix)/include/autoconf.mk
-include scripts/Makefile.uncmd_spl
 
 include scripts/Kbuild.include
 
diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
deleted file mode 100644
index 6ea097d36dd5..000000000000
--- a/scripts/Makefile.uncmd_spl
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# Makefile version of include/config_uncmd_spl.h
-# TODO: Invent a better way
-
-ifdef CONFIG_SPL_BUILD
-
-ifndef CONFIG_SPL_DM
-CONFIG_DM_SERIAL=
-CONFIG_DM_I2C=
-CONFIG_DM_SPI=
-CONFIG_DM_SPI_FLASH=
-endif
-
-endif
-- 
2.25.1

[PATCH 143/149] checkpatch.pl: Update CONFIG logic in U-Boot section

[Tom Rini]

Now that all CONFIG symbols are in Kconfig, checkpatch.pl should check
for and error on any case of define/undef CONFIG_*.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 scripts/checkpatch.pl           | 8 ++++----
 tools/patman/test_checkpatch.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index fe13e265a3fe..ccfcbb3e1255 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2630,10 +2630,10 @@ sub u_boot_line {
 		     "strl$1 is preferred over strn$1 because it always produces a nul-terminated string\n" . $herecurr);
 	}
 
-	# use defconfig to manage CONFIG_CMD options
-	if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) {
-		ERROR("DEFINE_CONFIG_CMD",
-		      "All commands are managed by Kconfig\n" . $herecurr);
+	# use Kconfig for all CONFIG symbols
+	if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_\w*)\b/) {
+		ERROR("DEFINE_CONFIG_SYM",
+		      "All CONFIG symbols are managed by Kconfig\n" . $herecurr);
 	}
 
 	# Don't put common.h and dm.h in header files
diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py
index 8960cd505f82..4c2ab6e590ed 100644
--- a/tools/patman/test_checkpatch.py
+++ b/tools/patman/test_checkpatch.py
@@ -396,7 +396,7 @@ index 0000000..2234c87
         """Test for enabling/disabling commands using preprocesor"""
         pm = PatchMaker()
         pm.add_line('common/main.c', '#undef CONFIG_CMD_WHICH')
-        self.check_single_message(pm, 'DEFINE_CONFIG_CMD', 'error')
+        self.check_single_message(pm, 'DEFINE_CONFIG_SYM', 'error')
 
     def test_barred_include_in_hdr(self):
         """Test for using a barred include in a header file"""
-- 
2.25.1

[PATCH 144/149] CI: Replace unmigrated symbol test with non-Kconfig introduction test

[Tom Rini]

Now that all symbols have been migrated to Kconfig, or are part of the
CFG namespace we do not need a complex check for unmigrated CONFIG
symbols. Any instance of #define (or #undef) or a CONFIG value is wrong,
so cause CI to fail.

This test is not as strict as possible yet as we have more symbols that
were not previously caught to deal with.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 .azure-pipelines.yml | 31 ++++++-------------------------
 .gitlab-ci.yml       | 28 +++++-----------------------
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index add8847225f0..e102f6bf2af8 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -53,37 +53,18 @@ stages:
             -j$(sysctl -n hw.logicalcpu)
         displayName: 'Perform tools-only build'
 
-  - job: check_for_migrated_symbols_in_board_header
-    displayName: 'Check for migrated symbols in board header'
+  - job: check_for_new_CONFIG_symbols_outside_Kconfig
+    displayName: 'Check for new CONFIG symbols outside Kconfig'
     pool:
       vmImage: $(ubuntu_vm)
     container:
       image: $(ci_runner_image)
       options: $(container_option)
     steps:
-      - script: |
-          KSYMLST=`mktemp`
-          KUSEDLST=`mktemp`
-          RET=0
-          cat `find . -name "Kconfig*"` | \
-             sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-             -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-             | sort -u > $KSYMLST
-          for CFG in `find include/configs -name "*.h"`; do
-             (grep '#define[[:blank:]]CONFIG_' $CFG | \
-                sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; \
-                grep '#undef[[:blank:]]CONFIG_' $CFG | \
-                sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | \
-                sort -u > ${KUSEDLST} || true
-             NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \
-                cut -d , -f 3`
-             if [[ $NUM -ne 0 ]]; then
-                echo "Unmigrated symbols found in $CFG:"
-                comm -12 ${KSYMLST} ${KUSEDLST}
-                RET=1
-             fi
-          done
-          exit $RET
+      # If grep succeeds and finds a match the test fails as we should
+      # have no matches.
+      - script: git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_' \
+                  include/configs `find arch -name config.h` && exit 1 || exit 0
 
   - job: cppcheck
     displayName: 'Static code analysis with cppcheck'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91d5e0c4a8c8..f84d08a729e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,31 +124,13 @@ build all other platforms:
         exit $ret;
       fi;
 
-check for migrated symbols in board header:
+check for new CONFIG symbols outside Kconfig:
   stage: testsuites
   script:
-    - KSYMLST=`mktemp`;
-      KUSEDLST=`mktemp`;
-      RET=0;
-      cat `find . -name "Kconfig*"` |
-         sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p'
-         -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p'
-         | sort -u > $KSYMLST;
-      for CFG in `find include/configs -name "*.h"`; do
-         (grep '#define[[:blank:]]CONFIG_' $CFG |
-            sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ;
-            grep '#undef[[:blank:]]CONFIG_' $CFG |
-            sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') |
-            sort -u > ${KUSEDLST} || true;
-         NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} |
-            cut -d , -f 3`;
-         if [[ $NUM -ne 0 ]]; then
-            echo "Unmigrated symbols found in $CFG:";
-            comm -12 ${KSYMLST} ${KUSEDLST};
-            RET=1;
-         fi;
-      done;
-      exit $RET
+    # If grep succeeds and finds a match the test fails as we should
+    # have no matches.
+    - git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_'
+        include/configs `find arch -name config.h` && exit 1 || exit 0
 
 # QA jobs for code analytics
 # static code analysis with cppcheck (we can add --enable=all later)
-- 
2.25.1

[PATCH 145/149] kbuild: Remove checking for adhoc CONFIG symbols

[Tom Rini]

At this point all listed adhoc CONFIG symbols have been migrated to
Kconfig or removed from the tree or renamed to CFG (or similar). We also
now have CI tests that will error on any new introductions, and
checkpatch.pl also looks. We can now remove these hooks and related
scripts.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 Makefile                     |   8 --
 scripts/build-whitelist.sh   |  45 ------
 scripts/check-config.sh      |  63 ---------
 scripts/config_whitelist.txt | 261 -----------------------------------
 tools/moveconfig.py          |  32 +----
 5 files changed, 2 insertions(+), 407 deletions(-)
 delete mode 100755 scripts/build-whitelist.sh
 delete mode 100755 scripts/check-config.sh

diff --git a/Makefile b/Makefile
index eba39194e331..da2fd0faa050 100644
--- a/Makefile
+++ b/Makefile
@@ -1073,10 +1073,6 @@ cmd_lzma = lzma -c -z -k -9 $< > $@
 
 cfg: u-boot.cfg
 
-quiet_cmd_cfgcheck = CFGCHK  $2
-cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \
-		$(srctree)/scripts/config_whitelist.txt $(srctree)
-
 quiet_cmd_ofcheck = OFCHK   $2
 cmd_ofcheck = $(srctree)/scripts/check-of.sh $2 \
 		$(srctree)/scripts/of_allowlist.txt
@@ -1144,10 +1140,6 @@ endif
 	$(call deprecated,CONFIG_TIMER,Timer drivers,v2023.01,$(if $(strip $(CFG_SYS_TIMER_RATE)$(CFG_SYS_TIMER_COUNTER)),x))
 	$(call deprecated,CONFIG_DM_SERIAL,Serial drivers,v2023.04,$(CONFIG_SERIAL))
 	$(call deprecated,CONFIG_DM_SCSI,SCSI drivers,v2023.04,$(CONFIG_SCSI))
-	@# Check that this build does not use CONFIG options that we do not
-	@# know about unless they are in Kconfig. All the existing CONFIG
-	@# options are whitelisted, so new ones should not be added.
-	$(call cmd,cfgcheck,u-boot.cfg)
 	@# Check that this build does not override OF_HAS_PRIOR_STAGE by
 	@# disabling OF_BOARD.
 	$(call cmd,ofcheck,$(KCONFIG_CONFIG))
diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
deleted file mode 100755
index 37630c0271cd..000000000000
--- a/scripts/build-whitelist.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2016 Google, Inc
-# Written by Simon Glass <sjg@chromium.org>
-#
-
-# This script creates the configuration whitelist file. This file contains
-# all the config options which are allowed to be used outside Kconfig.
-# Please do not add things to the whitelist. Instead, add your new option
-# to Kconfig.
-#
-export LC_ALL=C LC_COLLATE=C
-
-# Looks for the rest of the CONFIG options, but exclude those in Kconfig and
-# defconfig files.
-#
-git grep CONFIG_ | \
-	egrep -vi "(Kconfig:|defconfig:|README|\.py|\.pl:)" \
-	| tr ' \t' '\n\n' \
-	| sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' \
-	|sort |uniq >scripts/config_whitelist.txt.tmp1;
-
-# Finally, we need a list of the valid Kconfig options to exclude these from
-# the whitelist.
-cat `find . -name "Kconfig*"` |sed -n \
-	-e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-	-e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-	|sort |uniq >scripts/config_whitelist.txt.tmp2
-
-# Use only the options that are present in the first file but not the second.
-comm -23 scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2 \
-	|sort |uniq >scripts/config_whitelist.txt.tmp3
-
-# If scripts/config_whitelist.txt already exists, take the intersection of the
-# current list and the new one.  We do not want to increase whitelist options.
-if [ -r scripts/config_whitelist.txt ]; then
-	comm -12 scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt \
-		> scripts/config_whitelist.txt.tmp4
-	mv scripts/config_whitelist.txt.tmp4 scripts/config_whitelist.txt
-else
-	mv scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt
-fi
-
-rm scripts/config_whitelist.txt.tmp*
-
-unset LC_ALL LC_COLLATE
diff --git a/scripts/check-config.sh b/scripts/check-config.sh
deleted file mode 100755
index cc1c9a54d951..000000000000
--- a/scripts/check-config.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2016 Google, Inc
-# Written by Simon Glass <sjg@chromium.org>
-#
-# Check that the u-boot.cfg file provided does not introduce any new
-# ad-hoc CONFIG options
-#
-# Use scripts/build-whitelist.sh to generate the list of current ad-hoc
-# CONFIG options (those which are not in Kconfig).
-
-# Usage
-#    check-config.sh <path to u-boot.cfg> <path to whitelist file> <source dir>
-#
-# For example:
-#   scripts/check-config.sh b/chromebook_link/u-boot.cfg kconfig_whitelist.txt .
-
-set -e
-set -u
-
-PROG_NAME="${0##*/}"
-
-usage() {
-	echo "$PROG_NAME <path to u-boot.cfg> <path to whitelist file> <source dir>"
-	exit 1
-}
-
-[ $# -ge 3 ] || usage
-
-path="$1"
-whitelist="$2"
-srctree="$3"
-
-# Temporary files
-configs="${path}.configs"
-suspects="${path}.suspects"
-ok="${path}.ok"
-new_adhoc="${path}.adhoc"
-
-export LC_ALL=C
-export LC_COLLATE=C
-
-cat ${path} |sed -nr 's/^#define (CONFIG_[A-Za-z0-9_]*).*/\1/p' |sort |uniq \
-	>${configs}
-
-comm -23 ${configs} ${whitelist} > ${suspects}
-
-cat `find ${srctree} -name "Kconfig*"` |sed -nr \
-	-e 's/^[[:blank:]]*config *([A-Za-z0-9_]*).*$/CONFIG_\1/p' \
-	-e 's/^[[:blank:]]*menuconfig ([A-Za-z0-9_]*).*$/CONFIG_\1/p' \
-	|sort |uniq > ${ok}
-comm -23 ${suspects} ${ok} >${new_adhoc}
-if [ -s ${new_adhoc} ]; then
-	echo >&2 "Error: You must add new CONFIG options using Kconfig"
-	echo >&2 "The following new ad-hoc CONFIG options were detected:"
-	cat >&2 ${new_adhoc}
-	echo >&2
-	echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig"
-	echo >&2 "file and add a 'config' or 'menuconfig' option."
-	# Don't delete the temporary files in case they are useful
-	exit 1
-else
-	rm ${suspects} ${ok} ${new_adhoc}
-fi
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 36fd8688d5c5..e69de29bb2d1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,261 +0,0 @@
-CONFIG_ARM_GIC_BASE_ADDRESS
-CONFIG_BOARDDIR
-CONFIG_DFU_ALT
-CONFIG_DFU_ALT_BOOT_EMMC
-CONFIG_DFU_ALT_BOOT_SD
-CONFIG_DFU_ALT_SYSTEM
-CONFIG_DFU_ENV_SETTINGS
-CONFIG_DM9000_BASE
-CONFIG_DM9000_BYTE_SWAPPED
-CONFIG_DM9000_NO_SROM
-CONFIG_DM9000_USE_16BIT
-CONFIG_DW_WDT_CLOCK_KHZ
-CONFIG_ENV_FLAGS_LIST_STATIC
-CONFIG_ENV_IS_EMBEDDED
-CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
-CONFIG_ENV_SETTINGS_NAND_V1
-CONFIG_ENV_SETTINGS_NAND_V2
-CONFIG_ENV_SETTINGS_V1
-CONFIG_ENV_SETTINGS_V2
-CONFIG_ENV_SROM_BANK
-CONFIG_ENV_TOTAL_SIZE
-CONFIG_ET1100_BASE
-CONFIG_ETHBASE
-CONFIG_EXTRA_ENV_SETTINGS
-CONFIG_FB_ADDR
-CONFIG_FDTADDR
-CONFIG_FDTFILE
-CONFIG_FEC_ENET_DEV
-CONFIG_FEC_FIXED_SPEED
-CONFIG_FEC_MXC_PHYADDR
-CONFIG_FLASH_BR_PRELIM
-CONFIG_FLASH_OR_PRELIM
-CONFIG_FLASH_SECTOR_SIZE
-CONFIG_FLASH_SHOW_PROGRESS
-CONFIG_FLASH_SPANSION_S29WS_N
-CONFIG_FLASH_VERIFY
-CONFIG_FM_PLAT_CLK_DIV
-CONFIG_FSL_CPLD
-CONFIG_FSL_ESDHC_PIN_MUX
-CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-CONFIG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_PMIC_BITLEN
-CONFIG_FSL_PMIC_BUS
-CONFIG_FSL_PMIC_CLK
-CONFIG_FSL_PMIC_CS
-CONFIG_FSL_PMIC_MODE
-CONFIG_FSL_SDHC_V2_3
-CONFIG_FSL_SERDES1
-CONFIG_FSL_SERDES2
-CONFIG_FTRTC010_EXTCLK
-CONFIG_FTRTC010_PCLK
-CONFIG_GATEWAYIP
-CONFIG_GMII
-CONFIG_G_DNL_THOR_PRODUCT_NUM
-CONFIG_G_DNL_THOR_VENDOR_NUM
-CONFIG_G_DNL_UMS_PRODUCT_NUM
-CONFIG_G_DNL_UMS_VENDOR_NUM
-CONFIG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HOSTNAME
-CONFIG_HSMMC2_8BIT
-CONFIG_HW_ENV_SETTINGS
-CONFIG_I2C_ENV_EEPROM_BUS
-CONFIG_I2C_MULTI_BUS
-CONFIG_I2C_MVTWSI
-CONFIG_I2C_MVTWSI_BASE0
-CONFIG_I2C_MVTWSI_BASE1
-CONFIG_I2C_RTC_ADDR
-CONFIG_ICS307_REFCLK_HZ
-CONFIG_IMX6_PWM_PER_CLK
-CONFIG_IPADDR
-CONFIG_IRAM_BASE
-CONFIG_IRAM_END
-CONFIG_IRAM_SIZE
-CONFIG_IRAM_TOP
-CONFIG_KM_DEF_ARCH
-CONFIG_KM_DEF_BOOT_ARGS_CPU
-CONFIG_KM_DEF_ENV
-CONFIG_KM_DEF_ENV_BOOTARGS
-CONFIG_KM_DEF_ENV_BOOTPARAMS
-CONFIG_KM_DEF_ENV_BOOTTARGETS
-CONFIG_KM_DEF_ENV_CONSTANTS
-CONFIG_KM_DEF_ENV_CPU
-CONFIG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
-CONFIG_KM_ECC_MODE
-CONFIG_KM_NEW_ENV
-CONFIG_KM_UBI_LINUX_MTD
-CONFIG_KM_UBI_PARTITION_NAME_APP
-CONFIG_KM_UBI_PARTITION_NAME_BOOT
-CONFIG_KM_UBI_PART_BOOT_OPTS
-CONFIG_KM_UIMAGE_NAME
-CONFIG_KSNET_CPSW_NUM_PORTS
-CONFIG_KSNET_MAC_ID_BASE
-CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
-CONFIG_KSNET_NETCP_BASE
-CONFIG_KSNET_NETCP_V1_0
-CONFIG_KSNET_NETCP_V1_5
-CONFIG_KSNET_SERDES_LANES_PER_SGMII
-CONFIG_KSNET_SERDES_SGMII2_BASE
-CONFIG_KSNET_SERDES_SGMII_BASE
-CONFIG_L1_INIT_RAM
-CONFIG_L2_CACHE
-CONFIG_LEGACY_BOOTCMD_ENV
-CONFIG_LOWPOWER_ADDR
-CONFIG_LOWPOWER_FLAG
-CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
-CONFIG_LPC32XX_NAND_MLC_NAND_TA
-CONFIG_LPC32XX_NAND_MLC_RD_HIGH
-CONFIG_LPC32XX_NAND_MLC_RD_LOW
-CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY
-CONFIG_LPC32XX_NAND_MLC_WR_HIGH
-CONFIG_LPC32XX_NAND_MLC_WR_LOW
-CONFIG_LPC32XX_NAND_SLC_RDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_RHOLD
-CONFIG_LPC32XX_NAND_SLC_RSETUP
-CONFIG_LPC32XX_NAND_SLC_RWIDTH
-CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_WHOLD
-CONFIG_LPC32XX_NAND_SLC_WSETUP
-CONFIG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_MACB_SEARCH_PHY
-CONFIG_MALLOC_F_ADDR
-CONFIG_MALTA
-CONFIG_MAX_DSP_CPUS
-CONFIG_MAX_MEM_MAPPED
-CONFIG_MAX_RAM_BANK_SIZE
-CONFIG_MEMSIZE_IN_BYTES
-CONFIG_MEM_INIT_VALUE
-CONFIG_MFG_ENV_SETTINGS
-CONFIG_MII_DEFAULT_TSEC
-CONFIG_MIU_2BIT_21_7_INTERLEAVED
-CONFIG_MIU_2BIT_INTERLEAVED
-CONFIG_MMC_DEFAULT_DEV
-CONFIG_MMC_SUNXI_SLOT
-CONFIG_MONITOR_IS_IN_RAM
-CONFIG_MTD_NAND_VERIFY_WRITE
-CONFIG_MVGBE_PORTS
-CONFIG_MXC_GPT_HCLK
-CONFIG_MXC_NAND_HWECC
-CONFIG_MXC_NAND_IP_REGS_BASE
-CONFIG_MXC_NAND_REGS_BASE
-CONFIG_MXC_UART_BASE
-CONFIG_MXC_USB_FLAGS
-CONFIG_MXC_USB_PORT
-CONFIG_MXC_USB_PORTSC
-CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
-CONFIG_NAND_CS_INIT
-CONFIG_NETDEV
-CONFIG_NETMASK
-CONFIG_NORBOOT
-CONFIG_NUM_DSP_CPUS
-CONFIG_ODROID_REV_AIN
-CONFIG_OTHBOOTARGS
-CONFIG_OVERWRITE_ETHADDR_ONCE
-CONFIG_PCIE_IMX_PERST_GPIO
-CONFIG_PCIE_IMX_POWER_GPIO
-CONFIG_PEN_ADDR_BIG_ENDIAN
-CONFIG_PHY_BASE_ADR
-CONFIG_PHY_ET1011C_TX_CLK_FIX
-CONFIG_PHY_ID
-CONFIG_PHY_INTERFACE_MODE
-CONFIG_PHY_IRAM_BASE
-CONFIG_PL011_CLOCK
-CONFIG_PL01x_PORTS
-CONFIG_PME_PLAT_CLK_DIV
-CONFIG_POSTBOOTMENU
-CONFIG_POWER_LTC3676_I2C_ADDR
-CONFIG_POWER_PFUZE100_I2C_ADDR
-CONFIG_POWER_PFUZE3000_I2C_ADDR
-CONFIG_PPC_SPINTABLE_COMPATIBLE
-CONFIG_PRAM
-CONFIG_PSRAM_SCFG
-CONFIG_QBMAN_CLK_DIV
-CONFIG_RAMBOOT_SPIFLASH
-CONFIG_RAMBOOT_TEXT_BASE
-CONFIG_RAMDISK_ADDR
-CONFIG_RD_LVL
-CONFIG_RESET_VECTOR_ADDRESS
-CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
-CONFIG_ROOTPATH
-CONFIG_SANDBOX_ARCH
-CONFIG_SANDBOX_SPI_MAX_BUS
-CONFIG_SANDBOX_SPI_MAX_CS
-CONFIG_SAR2_REG
-CONFIG_SAR_REG
-CONFIG_SCIF_A
-CONFIG_SCSI_DEV_LIST
-CONFIG_SC_TIMER_CLK
-CONFIG_SERIAL_BOOT
-CONFIG_SERVERIP
-CONFIG_SETUP_INITRD_TAG
-CONFIG_SET_DFU_ALT_BUF_LEN
-CONFIG_SH_ETHER_ALIGNE_SIZE
-CONFIG_SH_ETHER_CACHE_INVALIDATE
-CONFIG_SH_ETHER_CACHE_WRITEBACK
-CONFIG_SH_ETHER_PHY_ADDR
-CONFIG_SH_ETHER_PHY_MODE
-CONFIG_SH_ETHER_USE_PORT
-CONFIG_SH_QSPI_BASE
-CONFIG_SLIC
-CONFIG_SMDK5420
-CONFIG_SMP_PEN_ADDR
-CONFIG_SOCRATES
-CONFIG_SPI_ADDR
-CONFIG_SPI_BOOTING
-CONFIG_SPI_FLASH_QUAD
-CONFIG_SPI_FLASH_SIZE
-CONFIG_SPI_HALF_DUPLEX
-CONFIG_SPI_N25Q256A_RESET
-CONFIG_STACKBASE
-CONFIG_STANDALONE_LOAD_ADDR
-CONFIG_STD_DEVICES_SETTINGS
-CONFIG_SYS_BAUDRATE_TABLE
-CONFIG_TEGRA_BOARD_STRING
-CONFIG_TEGRA_ENABLE_UARTA
-CONFIG_TEGRA_ENABLE_UARTD
-CONFIG_TEGRA_SLINK_CTRLS
-CONFIG_TEGRA_SPI
-CONFIG_TEGRA_UARTA_GPU
-CONFIG_TEGRA_UARTA_SDIO1
-CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
-CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
-CONFIG_TESTPIN_MASK
-CONFIG_TESTPIN_REG
-CONFIG_THOR_RESET_OFF
-CONFIG_TPM_TIS_BASE_ADDRESS
-CONFIG_TSEC1
-CONFIG_TSEC1_NAME
-CONFIG_TSEC2
-CONFIG_TSEC2_NAME
-CONFIG_TSEC3
-CONFIG_TSEC3_NAME
-CONFIG_TSEC4
-CONFIG_TSEC4_NAME
-CONFIG_TSECV2
-CONFIG_TSECV2_1
-CONFIG_TSEC_TBICR_SETTINGS
-CONFIG_UBIFS_VOLUME
-CONFIG_UBI_PART
-CONFIG_UBOOTPATH
-CONFIG_UBOOT_SECTOR_COUNT
-CONFIG_UBOOT_SECTOR_START
-CONFIG_UEC_ETH
-CONFIG_USART_BASE
-CONFIG_USART_ID
-CONFIG_USBD_HS
-CONFIG_USB_BOOTING
-CONFIG_USB_EXT2_BOOT
-CONFIG_USB_FAT_BOOT
-CONFIG_USB_ISP1301_I2C_ADDR
-CONFIG_U_BOOT_HDR_SIZE
-CONFIG_VAR_SIZE_SPL
-CONFIG_VERY_BIG_RAM
-CONFIG_VSC7385_IMAGE
-CONFIG_VSC7385_IMAGE_SIZE
-CONFIG_WATCHDOG_PRESC
-CONFIG_WATCHDOG_RC
-CONFIG_X86EMU_RAW_IO
-CONFIG_X86_MRC_ADDR
-CONFIG_X86_REFCODE_ADDR
-CONFIG_X86_REFCODE_RUN_ADDR
diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 09617a07f91b..8f084a6070ac 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -443,22 +443,6 @@ def cleanup_headers(configs, args):
                     cleanup_one_header(header_path, patterns, args)
                     cleanup_empty_blocks(header_path, args)
 
-def cleanup_whitelist(configs, args):
-    """Delete config whitelist entries
-
-    Args:
-      configs: A list of CONFIGs to remove.
-      args (Namespace): program arguments
-    """
-    if not confirm(args, 'Clean up whitelist entries?'):
-        return
-
-    lines = read_file(os.path.join('scripts', 'config_whitelist.txt'))
-
-    lines = [x for x in lines if x.strip() not in configs]
-
-    write_file(os.path.join('scripts', 'config_whitelist.txt'), lines)
-
 def find_matching(patterns, line):
     for pat in patterns:
         if pat.search(line):
@@ -1558,14 +1542,10 @@ def do_find_config(config_list):
     """
     all_configs, all_defconfigs, config_db, defconfig_db = read_database()
 
-    # Get the whitelist
-    adhoc_configs = set(read_file('scripts/config_whitelist.txt'))
-
     # Start with all defconfigs
     out = all_defconfigs
 
     # Work through each config in turn
-    adhoc = []
     for item in config_list:
         # Get the real config name and whether we want this config or not
         cfg = item
@@ -1574,10 +1554,6 @@ def do_find_config(config_list):
             want = False
             cfg = cfg[1:]
 
-        if cfg in adhoc_configs:
-            adhoc.append(cfg)
-            continue
-
         # Search everything that is still in the running. If it has a config
         # that we want, or doesn't have one that we don't, add it into the
         # running for the next stage
@@ -1588,11 +1564,8 @@ def do_find_config(config_list):
             has_cfg = defconfig_matches(config_db[defc], re_match)
             if has_cfg == want:
                 out.add(defc)
-    if adhoc:
-        print(f"Error: Not in Kconfig: %s" % ' '.join(adhoc))
-    else:
-        print(f'{len(out)} matches')
-        print(' '.join(item.split('_defconfig')[0] for item in out))
+    print(f'{len(out)} matches')
+    print(' '.join(item.split('_defconfig')[0] for item in out))
 
 
 def prefix_config(cfg):
@@ -1739,7 +1712,6 @@ doc/develop/moveconfig.rst for documentation.'''
 
     if configs:
         cleanup_headers(configs, args)
-        cleanup_whitelist(configs, args)
         cleanup_readme(configs, args)
 
     if args.commit:
-- 
2.25.1

[PATCH 146/149] post: Move CONFIG_SYS_POST to CFG_SYS_POST

[Tom Rini]

Migrate the rest of the CONFIG_SYS_POST macros over to CFG_SYS_POST
namespace.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 doc/README.POST                               | 12 +--
 drivers/serial/serial-uclass.c                |  2 +-
 drivers/serial/serial.c                       |  2 +-
 include/post.h                                | 50 ++++++------
 include/serial.h                              |  4 +-
 post/cpu/mpc83xx/ecc.c                        |  8 +-
 post/drivers/flash.c                          | 14 ++--
 post/drivers/i2c.c                            | 20 ++---
 post/drivers/rtc.c                            |  4 +-
 post/lib_powerpc/andi.c                       |  2 +-
 post/lib_powerpc/asm.S                        |  2 +-
 post/lib_powerpc/b.c                          |  2 +-
 post/lib_powerpc/cmp.c                        |  2 +-
 post/lib_powerpc/cmpi.c                       |  2 +-
 post/lib_powerpc/complex.c                    |  2 +-
 post/lib_powerpc/cpu.c                        |  4 +-
 post/lib_powerpc/cr.c                         |  2 +-
 post/lib_powerpc/fpu/20001122-1.c             |  4 +-
 post/lib_powerpc/fpu/20010114-2.c             |  4 +-
 post/lib_powerpc/fpu/20010226-1.c             |  4 +-
 post/lib_powerpc/fpu/980619-1.c               |  4 +-
 post/lib_powerpc/fpu/acc1.c                   |  4 +-
 post/lib_powerpc/fpu/compare-fp-1.c           |  4 +-
 post/lib_powerpc/fpu/fpu.c                    |  4 +-
 post/lib_powerpc/fpu/mul-subnormal-single-1.c |  4 +-
 post/lib_powerpc/load.c                       |  2 +-
 post/lib_powerpc/multi.c                      |  2 +-
 post/lib_powerpc/rlwimi.c                     |  2 +-
 post/lib_powerpc/rlwinm.c                     |  2 +-
 post/lib_powerpc/rlwnm.c                      |  2 +-
 post/lib_powerpc/srawi.c                      |  2 +-
 post/lib_powerpc/store.c                      |  2 +-
 post/lib_powerpc/string.c                     |  2 +-
 post/lib_powerpc/three.c                      |  2 +-
 post/lib_powerpc/threei.c                     |  2 +-
 post/lib_powerpc/threex.c                     |  2 +-
 post/lib_powerpc/two.c                        |  2 +-
 post/lib_powerpc/twox.c                       |  2 +-
 post/post.c                                   |  6 +-
 post/tests.c                                  | 78 +++++++++----------
 40 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/doc/README.POST b/doc/README.POST
index 5d92f3fe6e91..1366f95c6623 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -649,15 +649,15 @@ not need any modifications for porting them to another board/CPU.
 
 For verifying the I2C bus, a full I2C bus scanning will be performed
 using the i2c_probe() routine. If a board defines
-CONFIG_SYS_POST_I2C_ADDRS the I2C test will pass if all devices
-listed in CONFIG_SYS_POST_I2C_ADDRS are found, and no additional
-devices are detected.  If CONFIG_SYS_POST_I2C_ADDRS is not defined
+CFG_SYS_POST_I2C_ADDRS the I2C test will pass if all devices
+listed in CFG_SYS_POST_I2C_ADDRS are found, and no additional
+devices are detected.  If CFG_SYS_POST_I2C_ADDRS is not defined
 the test will pass if any I2C device is found.
 
-The CONFIG_SYS_POST_I2C_IGNORES define can be used to list I2C
+The CFG_SYS_POST_I2C_IGNORES define can be used to list I2C
 devices which may or may not be present when using
-CONFIG_SYS_POST_I2C_ADDRS.  The I2C POST test will pass regardless
-if the devices in CONFIG_SYS_POST_I2C_IGNORES are found or not.
+CFG_SYS_POST_I2C_ADDRS.  The I2C POST test will pass regardless
+if the devices in CFG_SYS_POST_I2C_IGNORES are found or not.
 This is useful in cases when I2C devices are optional (eg on a
 daughtercard that may or may not be present) or not critical
 to board operation.
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 7240d763d12e..77d3f373721f 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -526,7 +526,7 @@ static int serial_post_probe(struct udevice *dev)
 		ops->getconfig += gd->reloc_off;
 	if (ops->setconfig)
 		ops->setconfig += gd->reloc_off;
-#if CFG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CFG_SYS_POST_UART
 	if (ops->loop)
 		ops->loop += gd->reloc_off;
 #endif
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 369a8e38e3e2..9a380d7c5e7e 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -458,7 +458,7 @@ void default_serial_puts(const char *s)
 		dev->putc(*s++);
 }
 
-#if CFG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CFG_SYS_POST_UART
 static const int bauds[] = CFG_SYS_BAUDRATE_TABLE;
 
 /**
diff --git a/include/post.h b/include/post.h
index e68d5c89020c..411206950648 100644
--- a/include/post.h
+++ b/include/post.h
@@ -17,8 +17,8 @@
 #if defined(CONFIG_POST)
 
 #ifndef CFG_POST_EXTERNAL_WORD_FUNCS
-#ifdef CONFIG_SYS_POST_WORD_ADDR
-#define _POST_WORD_ADDR	CONFIG_SYS_POST_WORD_ADDR
+#ifdef CFG_SYS_POST_WORD_ADDR
+#define _POST_WORD_ADDR	CFG_SYS_POST_WORD_ADDR
 #else
 
 #if defined(CONFIG_ARCH_MPC8360)
@@ -34,7 +34,7 @@
 #ifndef _POST_WORD_ADDR
 #error "_POST_WORD_ADDR currently not implemented for this platform!"
 #endif
-#endif /* CONFIG_SYS_POST_WORD_ADDR */
+#endif /* CFG_SYS_POST_WORD_ADDR */
 
 static inline ulong post_word_load (void)
 {
@@ -140,29 +140,29 @@ extern int memory_post_test(int flags);
 #endif /* __GNUC__ */
 #endif /* __ASSEMBLY__ */
 
-#define CONFIG_SYS_POST_RTC		0x00000001
-#define CONFIG_SYS_POST_WATCHDOG	0x00000002
+#define CFG_SYS_POST_RTC		0x00000001
+#define CFG_SYS_POST_WATCHDOG	0x00000002
 #define CFG_SYS_POST_MEMORY		0x00000004
-#define CONFIG_SYS_POST_CPU		0x00000008
-#define CONFIG_SYS_POST_I2C		0x00000010
-#define CONFIG_SYS_POST_CACHE		0x00000020
-#define CONFIG_SYS_POST_UART		0x00000040
-#define CONFIG_SYS_POST_ETHER		0x00000080
-#define CONFIG_SYS_POST_USB		0x00000200
-#define CONFIG_SYS_POST_SPR		0x00000400
-#define CONFIG_SYS_POST_SYSMON		0x00000800
-#define CONFIG_SYS_POST_DSP		0x00001000
-#define CONFIG_SYS_POST_OCM		0x00002000
-#define CONFIG_SYS_POST_FPU		0x00004000
-#define CONFIG_SYS_POST_ECC		0x00008000
-#define CONFIG_SYS_POST_BSPEC1		0x00010000
-#define CONFIG_SYS_POST_BSPEC2		0x00020000
-#define CONFIG_SYS_POST_BSPEC3		0x00040000
-#define CONFIG_SYS_POST_BSPEC4		0x00080000
-#define CONFIG_SYS_POST_BSPEC5		0x00100000
-#define CONFIG_SYS_POST_CODEC		0x00200000
-#define CONFIG_SYS_POST_COPROC		0x00400000
-#define CONFIG_SYS_POST_FLASH		0x00800000
+#define CFG_SYS_POST_CPU		0x00000008
+#define CFG_SYS_POST_I2C		0x00000010
+#define CFG_SYS_POST_CACHE		0x00000020
+#define CFG_SYS_POST_UART		0x00000040
+#define CFG_SYS_POST_ETHER		0x00000080
+#define CFG_SYS_POST_USB		0x00000200
+#define CFG_SYS_POST_SPR		0x00000400
+#define CFG_SYS_POST_SYSMON		0x00000800
+#define CFG_SYS_POST_DSP		0x00001000
+#define CFG_SYS_POST_OCM		0x00002000
+#define CFG_SYS_POST_FPU		0x00004000
+#define CFG_SYS_POST_ECC		0x00008000
+#define CFG_SYS_POST_BSPEC1		0x00010000
+#define CFG_SYS_POST_BSPEC2		0x00020000
+#define CFG_SYS_POST_BSPEC3		0x00040000
+#define CFG_SYS_POST_BSPEC4		0x00080000
+#define CFG_SYS_POST_BSPEC5		0x00100000
+#define CFG_SYS_POST_CODEC		0x00200000
+#define CFG_SYS_POST_COPROC		0x00400000
+#define CFG_SYS_POST_FLASH		0x00800000
 #define CFG_SYS_POST_MEM_REGIONS	0x01000000
 
 #endif /* CONFIG_POST */
diff --git a/include/serial.h b/include/serial.h
index f4d7dc58a9e1..42bdf3759c00 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -14,7 +14,7 @@ struct serial_device {
 	int	(*tstc)(void);
 	void	(*putc)(const char c);
 	void	(*puts)(const char *s);
-#if CFG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CFG_SYS_POST_UART
 	void	(*loop)(int);
 #endif
 	struct serial_device	*next;
@@ -242,7 +242,7 @@ struct dm_serial_ops {
 	 * @return 0 if OK, -ve on error
 	 */
 	int (*clear)(struct udevice *dev);
-#if CFG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CFG_SYS_POST_UART
 	/**
 	 * loop() - Control serial device loopback mode
 	 *
diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c
index 45263e6b44ca..68da8ff41716 100644
--- a/post/cpu/mpc83xx/ecc.c
+++ b/post/cpu/mpc83xx/ecc.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <post.h>
 
-#if CFG_POST & CONFIG_SYS_POST_ECC
+#if CFG_POST & CFG_SYS_POST_ECC
 /*
  * We use the RAW I/O accessors where possible in order to
  * achieve performance goal, since the test's execution time
@@ -51,7 +51,7 @@ int ecc_post_test(int flags)
 	int errbit;
 	u32 pattern[2], writeback[2], retval[2];
 	ddr83xx_t *ddr = &((immap_t *)CONFIG_SYS_IMMR)->ddr;
-	volatile u64 *addr = (u64 *)CONFIG_SYS_POST_ECC_START_ADDR;
+	volatile u64 *addr = (u64 *)CFG_SYS_POST_ECC_START_ADDR;
 
 	/* The pattern is written into memory to generate error */
 	pattern[0] = 0xfedcba98UL;
@@ -70,8 +70,8 @@ int ecc_post_test(int flags)
 	int_state = disable_interrupts();
 	icache_enable();
 
-	for (addr = (u64*)CONFIG_SYS_POST_ECC_START_ADDR, errbit=0;
-	     addr < (u64*)CONFIG_SYS_POST_ECC_STOP_ADDR; addr++, errbit++ ) {
+	for (addr = (u64*)CFG_SYS_POST_ECC_START_ADDR, errbit=0;
+	     addr < (u64*)CFG_SYS_POST_ECC_STOP_ADDR; addr++, errbit++ ) {
 
 		schedule();
 
diff --git a/post/drivers/flash.c b/post/drivers/flash.c
index e157d3691100..a1fcf1f135d9 100644
--- a/post/drivers/flash.c
+++ b/post/drivers/flash.c
@@ -6,7 +6,7 @@
  * Licensed under the GPL-2 or later.
  */
 
-#if CFG_POST & CONFIG_SYS_POST_FLASH
+#if CFG_POST & CFG_SYS_POST_FLASH
 #include <common.h>
 #include <malloc.h>
 #include <post.h>
@@ -23,10 +23,10 @@
  *  - better seed pattern than 0x00..0xff
  */
 
-#ifndef CONFIG_SYS_POST_FLASH_NUM
-# define CONFIG_SYS_POST_FLASH_NUM 0
+#ifndef CFG_SYS_POST_FLASH_NUM
+# define CFG_SYS_POST_FLASH_NUM 0
 #endif
-#if CONFIG_SYS_POST_FLASH_START >= CONFIG_SYS_POST_FLASH_END
+#if CFG_SYS_POST_FLASH_START >= CFG_SYS_POST_FLASH_END
 # error "invalid flash block start/end"
 #endif
 
@@ -59,9 +59,9 @@ int flash_post_test(int flags)
 
 	len = 0;
 	src = NULL;
-	info = &flash_info[CONFIG_SYS_POST_FLASH_NUM];
-	n_start = CONFIG_SYS_POST_FLASH_START;
-	n_end = CONFIG_SYS_POST_FLASH_END;
+	info = &flash_info[CFG_SYS_POST_FLASH_NUM];
+	n_start = CFG_SYS_POST_FLASH_START;
+	n_end = CFG_SYS_POST_FLASH_END;
 
 	for (n = n_start; n < n_end; ++n) {
 		ulong s_start, s_len, s_off;
diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c
index 057454ffd8f5..557d6329a4f0 100644
--- a/post/drivers/i2c.c
+++ b/post/drivers/i2c.c
@@ -9,14 +9,14 @@
  *
  * For verifying the I2C bus, a full I2C bus scanning is performed.
  *
- * #ifdef CONFIG_SYS_POST_I2C_ADDRS
+ * #ifdef CFG_SYS_POST_I2C_ADDRS
  *   The test is considered as passed if all the devices and only the devices
  *   in the list are found.
- *   #ifdef CONFIG_SYS_POST_I2C_IGNORES
- *     Ignore devices listed in CONFIG_SYS_POST_I2C_IGNORES.  These devices
+ *   #ifdef CFG_SYS_POST_I2C_IGNORES
+ *     Ignore devices listed in CFG_SYS_POST_I2C_IGNORES.  These devices
  *     are optional or not vital to board functionality.
  *   #endif
- * #else [ ! CONFIG_SYS_POST_I2C_ADDRS ]
+ * #else [ ! CFG_SYS_POST_I2C_ADDRS ]
  *   The test is considered as passed if any I2C device is found.
  * #endif
  */
@@ -26,12 +26,12 @@
 #include <post.h>
 #include <i2c.h>
 
-#if CFG_POST & CONFIG_SYS_POST_I2C
+#if CFG_POST & CFG_SYS_POST_I2C
 
 static int i2c_ignore_device(unsigned int chip)
 {
-#ifdef CONFIG_SYS_POST_I2C_IGNORES
-	const unsigned char i2c_ignore_list[] = CONFIG_SYS_POST_I2C_IGNORES;
+#ifdef CFG_SYS_POST_I2C_IGNORES
+	const unsigned char i2c_ignore_list[] = CFG_SYS_POST_I2C_IGNORES;
 	int i;
 
 	for (i = 0; i < sizeof(i2c_ignore_list); i++)
@@ -45,7 +45,7 @@ static int i2c_ignore_device(unsigned int chip)
 int i2c_post_test (int flags)
 {
 	unsigned int i;
-#ifndef CONFIG_SYS_POST_I2C_ADDRS
+#ifndef CFG_SYS_POST_I2C_ADDRS
 	/* Start at address 1, address 0 is the general call address */
 	for (i = 1; i < 128; i++) {
 		if (i2c_ignore_device(i))
@@ -59,7 +59,7 @@ int i2c_post_test (int flags)
 #else
 	unsigned int ret  = 0;
 	int j;
-	unsigned char i2c_addr_list[] = CONFIG_SYS_POST_I2C_ADDRS;
+	unsigned char i2c_addr_list[] = CFG_SYS_POST_I2C_ADDRS;
 
 	/* Start at address 1, address 0 is the general call address */
 	for (i = 1; i < 128; i++) {
@@ -94,4 +94,4 @@ int i2c_post_test (int flags)
 #endif
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_I2C */
+#endif /* CFG_POST & CFG_SYS_POST_I2C */
diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c
index cfed56b680cd..cc7a49847ccd 100644
--- a/post/drivers/rtc.c
+++ b/post/drivers/rtc.c
@@ -26,7 +26,7 @@
 #include <post.h>
 #include <rtc.h>
 
-#if CFG_POST & CONFIG_SYS_POST_RTC
+#if CFG_POST & CFG_SYS_POST_RTC
 
 static int rtc_post_skip (ulong * diff)
 {
@@ -189,4 +189,4 @@ int rtc_post_test (int flags)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_RTC */
+#endif /* CFG_POST & CFG_SYS_POST_RTC */
diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c
index d69d61396bcb..4f3021668800 100644
--- a/post/lib_powerpc/andi.c
+++ b/post/lib_powerpc/andi.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/asm.S b/post/lib_powerpc/asm.S
index 13302d796898..93c78563936c 100644
--- a/post/lib_powerpc/asm.S
+++ b/post/lib_powerpc/asm.S
@@ -10,7 +10,7 @@
 #include <ppc_defs.h>
 #include <asm/cache.h>
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 /* void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2); */
 	.global	cpu_post_exec_02
diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c
index eb9371fa6b20..0ec032dcb152 100644
--- a/post/lib_powerpc/b.c
+++ b/post/lib_powerpc/b.c
@@ -24,7 +24,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 extern void cpu_post_exec_31 (ulong *code, ulong *ctr, ulong *lr, ulong *jump,
diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c
index e4d0931fc9a4..57f2b9694c33 100644
--- a/post/lib_powerpc/cmp.c
+++ b/post/lib_powerpc/cmp.c
@@ -23,7 +23,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_12 (ulong *code, ulong *res, ulong op1, ulong op2);
 
diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c
index 983892d00635..6e2bd636d74d 100644
--- a/post/lib_powerpc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
@@ -23,7 +23,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 
diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c
index d2ec21b0cbea..751bce673785 100644
--- a/post/lib_powerpc/complex.c
+++ b/post/lib_powerpc/complex.c
@@ -18,7 +18,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern int cpu_post_complex_1_asm (int a1, int a2, int a3, int a4, int n);
 extern int cpu_post_complex_2_asm (int x, int n);
diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c
index 77c25381729b..98a8c6392c3a 100644
--- a/post/lib_powerpc/cpu.c
+++ b/post/lib_powerpc/cpu.c
@@ -20,7 +20,7 @@
 #include <post.h>
 #include <asm/mmu.h>
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern int cpu_post_test_cmp (void);
 extern int cpu_post_test_cmpi (void);
@@ -118,4 +118,4 @@ int cpu_post_test (int flags)
 	return ret;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_CPU */
+#endif /* CFG_POST & CFG_SYS_POST_CPU */
diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c
index 077fb0f2da3a..3c7b61138467 100644
--- a/post/lib_powerpc/cr.c
+++ b/post/lib_powerpc/cr.c
@@ -33,7 +33,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_11 (ulong *code, ulong *res, ulong op1);
 extern void cpu_post_exec_21x (ulong *code, ulong *op1, ulong *op2, ulong op3);
diff --git a/post/lib_powerpc/fpu/20001122-1.c b/post/lib_powerpc/fpu/20001122-1.c
index eddd3f915eed..9c1c886fc4f7 100644
--- a/post/lib_powerpc/fpu/20001122-1.c
+++ b/post/lib_powerpc/fpu/20001122-1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 int fpu_post_test_math1 (void)
 {
@@ -40,4 +40,4 @@ int fpu_post_test_math1 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/20010114-2.c b/post/lib_powerpc/fpu/20010114-2.c
index 9e3e54661f99..01bac5003836 100644
--- a/post/lib_powerpc/fpu/20010114-2.c
+++ b/post/lib_powerpc/fpu/20010114-2.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 static float rintf (float x)
 {
@@ -45,4 +45,4 @@ int fpu_post_test_math2 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/20010226-1.c b/post/lib_powerpc/fpu/20010226-1.c
index 5bb386090035..cc4aa0dca645 100644
--- a/post/lib_powerpc/fpu/20010226-1.c
+++ b/post/lib_powerpc/fpu/20010226-1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 int fpu_post_test_math3 (void)
 {
@@ -33,4 +33,4 @@ int fpu_post_test_math3 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/980619-1.c b/post/lib_powerpc/fpu/980619-1.c
index 415cd50c85d2..111a2013fb58 100644
--- a/post/lib_powerpc/fpu/980619-1.c
+++ b/post/lib_powerpc/fpu/980619-1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 int fpu_post_test_math4 (void)
 {
@@ -39,4 +39,4 @@ int fpu_post_test_math4 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/acc1.c b/post/lib_powerpc/fpu/acc1.c
index 4cf3b7cef757..63cc3eeafc30 100644
--- a/post/lib_powerpc/fpu/acc1.c
+++ b/post/lib_powerpc/fpu/acc1.c
@@ -13,7 +13,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 static double func (const double *array)
 {
@@ -36,4 +36,4 @@ int fpu_post_test_math5 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/compare-fp-1.c b/post/lib_powerpc/fpu/compare-fp-1.c
index 029600fd2b74..4b4589664f12 100644
--- a/post/lib_powerpc/fpu/compare-fp-1.c
+++ b/post/lib_powerpc/fpu/compare-fp-1.c
@@ -15,7 +15,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 static int failed;
 
@@ -204,4 +204,4 @@ int fpu_post_test_math6 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/fpu.c b/post/lib_powerpc/fpu/fpu.c
index 8993b36e801d..59109f71e36a 100644
--- a/post/lib_powerpc/fpu/fpu.c
+++ b/post/lib_powerpc/fpu/fpu.c
@@ -21,7 +21,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 #include <watchdog.h>
 
@@ -71,4 +71,4 @@ int fpu_post_test (int flags)
 	return ret;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
index 87b882c6b22f..891aa95685fe 100644
--- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c
+++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
@@ -15,7 +15,7 @@
 
 GNU_FPOST_ATTR
 
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
 
 union uf
 {
@@ -82,4 +82,4 @@ int fpu_post_test_math7 (void)
 	return 0;
 }
 
-#endif /* CFG_POST & CONFIG_SYS_POST_FPU */
+#endif /* CFG_POST & CFG_SYS_POST_FPU */
diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c
index ece0b2756e00..e4ac6bf186f9 100644
--- a/post/lib_powerpc/load.c
+++ b/post/lib_powerpc/load.c
@@ -28,7 +28,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_22w (ulong *code, ulong *op1, ulong op2, ulong *op3);
 extern void cpu_post_exec_21w (ulong *code, ulong *op1, ulong *op2);
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index 0e9ee88eb5d5..4df45790ab65 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -21,7 +21,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_02(ulong *code, ulong op1, ulong op2);
 
diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index d24a3f665c7c..da2191322570 100644
--- a/post/lib_powerpc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 9f4a3edb3ea7..b0b976f98af4 100644
--- a/post/lib_powerpc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index 224e6bdd45e9..22cd4568fc88 100644
--- a/post/lib_powerpc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c
index 713d4f2276b3..a103df75eb1a 100644
--- a/post/lib_powerpc/srawi.c
+++ b/post/lib_powerpc/srawi.c
@@ -19,7 +19,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c
index 2dbcccf098a5..71a4b6aba431 100644
--- a/post/lib_powerpc/store.c
+++ b/post/lib_powerpc/store.c
@@ -28,7 +28,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_12w (ulong *code, ulong *op1, ulong op2, ulong op3);
 extern void cpu_post_exec_11w (ulong *code, ulong *op1, ulong op2);
diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c
index 9b54847632a3..21e02bcb2664 100644
--- a/post/lib_powerpc/string.c
+++ b/post/lib_powerpc/string.c
@@ -20,7 +20,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_02 (ulong *code, ulong op1, ulong op2);
 extern void cpu_post_exec_04 (ulong *code, ulong op1, ulong op2, ulong op3,
diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c
index 55f0ff8a8825..68339b05ef27 100644
--- a/post/lib_powerpc/three.c
+++ b/post/lib_powerpc/three.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c
index ec52d238e699..885dd8cb095e 100644
--- a/post/lib_powerpc/threei.c
+++ b/post/lib_powerpc/threei.c
@@ -21,7 +21,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c
index 6f5f0b8eb760..62ac713ecff7 100644
--- a/post/lib_powerpc/threex.c
+++ b/post/lib_powerpc/threex.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_22 (ulong *code, ulong *cr, ulong *res, ulong op1,
     ulong op2);
diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c
index b44dd4e20845..7985669ba6eb 100644
--- a/post/lib_powerpc/two.c
+++ b/post/lib_powerpc/two.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c
index 320cc0a64e7c..33d1a1d8d91d 100644
--- a/post/lib_powerpc/twox.c
+++ b/post/lib_powerpc/twox.c
@@ -22,7 +22,7 @@
 #include <post.h>
 #include "cpu_asm.h"
 
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
 
 extern void cpu_post_exec_21 (ulong *code, ulong *cr, ulong *res, ulong op1);
 extern ulong cpu_post_makecr (long v);
diff --git a/post/post.c b/post/post.c
index 9964b4108041..4db862c0dbb8 100644
--- a/post/post.c
+++ b/post/post.c
@@ -16,7 +16,7 @@
 #include <post.h>
 #include <asm/global_data.h>
 
-#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
+#ifdef CFG_SYS_POST_HOTKEYS_GPIO
 #include <asm/gpio.h>
 #endif
 
@@ -55,9 +55,9 @@ int post_init_f(void)
  */
 __weak int post_hotkeys_pressed(void)
 {
-#ifdef CONFIG_SYS_POST_HOTKEYS_GPIO
+#ifdef CFG_SYS_POST_HOTKEYS_GPIO
 	int ret;
-	unsigned gpio = CONFIG_SYS_POST_HOTKEYS_GPIO;
+	unsigned gpio = CFG_SYS_POST_HOTKEYS_GPIO;
 
 	ret = gpio_request(gpio, "hotkeys");
 	if (ret) {
diff --git a/post/tests.c b/post/tests.c
index d61ea74d512e..8cea428fcdc7 100644
--- a/post/tests.c
+++ b/post/tests.c
@@ -45,7 +45,7 @@ extern void sysmon_reloc (void);
 
 struct post_test post_list[] =
 {
-#if CFG_POST & CONFIG_SYS_POST_OCM
+#if CFG_POST & CFG_SYS_POST_OCM
     {
 	"OCM test",
 	"ocm",
@@ -54,10 +54,10 @@ struct post_test post_list[] =
 	&ocm_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_OCM
+	CFG_SYS_POST_OCM
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_CACHE
+#if CFG_POST & CFG_SYS_POST_CACHE
     {
 	"Cache test",
 	"cache",
@@ -66,10 +66,10 @@ struct post_test post_list[] =
 	&cache_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_CACHE
+	CFG_SYS_POST_CACHE
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_WATCHDOG
+#if CFG_POST & CFG_SYS_POST_WATCHDOG
 #if defined(CFG_POST_WATCHDOG)
 	CFG_POST_WATCHDOG,
 #else
@@ -81,11 +81,11 @@ struct post_test post_list[] =
 	&watchdog_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_WATCHDOG
+	CFG_SYS_POST_WATCHDOG
     },
 #endif
 #endif
-#if CFG_POST & CONFIG_SYS_POST_I2C
+#if CFG_POST & CFG_SYS_POST_I2C
     {
 	"I2C test",
 	"i2c",
@@ -94,10 +94,10 @@ struct post_test post_list[] =
 	&i2c_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_I2C
+	CFG_SYS_POST_I2C
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_RTC
+#if CFG_POST & CFG_SYS_POST_RTC
     {
 	"RTC test",
 	"rtc",
@@ -106,7 +106,7 @@ struct post_test post_list[] =
 	&rtc_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_RTC
+	CFG_SYS_POST_RTC
     },
 #endif
 #if CFG_POST & CFG_SYS_POST_MEMORY
@@ -121,7 +121,7 @@ struct post_test post_list[] =
 	CFG_SYS_POST_MEMORY
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_CPU
+#if CFG_POST & CFG_SYS_POST_CPU
     {
 	"CPU test",
 	"cpu",
@@ -131,10 +131,10 @@ struct post_test post_list[] =
 	&cpu_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_CPU
+	CFG_SYS_POST_CPU
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_FPU
+#if CFG_POST & CFG_SYS_POST_FPU
     {
 	"FPU test",
 	"fpu",
@@ -144,10 +144,10 @@ struct post_test post_list[] =
 	&fpu_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_FPU
+	CFG_SYS_POST_FPU
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_UART
+#if CFG_POST & CFG_SYS_POST_UART
 #if defined(CFG_POST_UART)
 	CFG_POST_UART,
 #else
@@ -159,11 +159,11 @@ struct post_test post_list[] =
 	&uart_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_UART
+	CFG_SYS_POST_UART
     },
 #endif /* CFG_POST_UART */
 #endif
-#if CFG_POST & CONFIG_SYS_POST_ETHER
+#if CFG_POST & CFG_SYS_POST_ETHER
     {
 	"ETHERNET test",
 	"ethernet",
@@ -172,10 +172,10 @@ struct post_test post_list[] =
 	&ether_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_ETHER
+	CFG_SYS_POST_ETHER
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_USB
+#if CFG_POST & CFG_SYS_POST_USB
     {
 	"USB test",
 	"usb",
@@ -184,10 +184,10 @@ struct post_test post_list[] =
 	&usb_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_USB
+	CFG_SYS_POST_USB
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_SPR
+#if CFG_POST & CFG_SYS_POST_SPR
     {
 	"SPR test",
 	"spr",
@@ -196,10 +196,10 @@ struct post_test post_list[] =
 	&spr_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_SPR
+	CFG_SYS_POST_SPR
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_SYSMON
+#if CFG_POST & CFG_SYS_POST_SYSMON
     {
 	"SYSMON test",
 	"sysmon",
@@ -208,10 +208,10 @@ struct post_test post_list[] =
 	&sysmon_post_test,
 	&sysmon_init_f,
 	&sysmon_reloc,
-	CONFIG_SYS_POST_SYSMON
+	CFG_SYS_POST_SYSMON
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_DSP
+#if CFG_POST & CFG_SYS_POST_DSP
     {
 	"DSP test",
 	"dsp",
@@ -220,10 +220,10 @@ struct post_test post_list[] =
 	&dsp_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_DSP
+	CFG_SYS_POST_DSP
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_CODEC
+#if CFG_POST & CFG_SYS_POST_CODEC
     {
 	"CODEC test",
 	"codec",
@@ -232,10 +232,10 @@ struct post_test post_list[] =
 	&codec_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_CODEC
+	CFG_SYS_POST_CODEC
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_ECC
+#if CFG_POST & CFG_SYS_POST_ECC
     {
 	"ECC test",
 	"ecc",
@@ -244,25 +244,25 @@ struct post_test post_list[] =
 	&ecc_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_ECC
+	CFG_SYS_POST_ECC
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_BSPEC1
+#if CFG_POST & CFG_SYS_POST_BSPEC1
 	CFG_POST_BSPEC1,
 #endif
-#if CFG_POST & CONFIG_SYS_POST_BSPEC2
+#if CFG_POST & CFG_SYS_POST_BSPEC2
 	CFG_POST_BSPEC2,
 #endif
-#if CFG_POST & CONFIG_SYS_POST_BSPEC3
+#if CFG_POST & CFG_SYS_POST_BSPEC3
 	CFG_POST_BSPEC3,
 #endif
-#if CFG_POST & CONFIG_SYS_POST_BSPEC4
+#if CFG_POST & CFG_SYS_POST_BSPEC4
 	CFG_POST_BSPEC4,
 #endif
-#if CFG_POST & CONFIG_SYS_POST_BSPEC5
+#if CFG_POST & CFG_SYS_POST_BSPEC5
 	CFG_POST_BSPEC5,
 #endif
-#if CFG_POST & CONFIG_SYS_POST_COPROC
+#if CFG_POST & CFG_SYS_POST_COPROC
     {
 	"Coprocessors communication test",
 	"coproc_com",
@@ -271,10 +271,10 @@ struct post_test post_list[] =
 	&coprocessor_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_COPROC
+	CFG_SYS_POST_COPROC
     },
 #endif
-#if CFG_POST & CONFIG_SYS_POST_FLASH
+#if CFG_POST & CFG_SYS_POST_FLASH
     {
 	"Parallel NOR flash test",
 	"flash",
@@ -283,7 +283,7 @@ struct post_test post_list[] =
 	&flash_post_test,
 	NULL,
 	NULL,
-	CONFIG_SYS_POST_FLASH
+	CFG_SYS_POST_FLASH
     },
 #endif
 #if CFG_POST & CFG_SYS_POST_MEM_REGIONS
-- 
2.25.1

[PATCH 147/149] pci-rcar-gen3: Rename CONFIG_SEND_ENABLE

[Tom Rini]

We rename the symbol CONFIG_SEND_ENABLE to just SEND_ENABLE, and remove
the second whitespace following the define.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/pci/pci-rcar-gen3.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c
index 49029238d350..1252ef74c581 100644
--- a/drivers/pci/pci-rcar-gen3.c
+++ b/drivers/pci/pci-rcar-gen3.c
@@ -27,7 +27,7 @@
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
-#define  CONFIG_SEND_ENABLE	BIT(31)
+#define SEND_ENABLE		BIT(31)
 #define  TYPE0			(0 << 8)
 #define  TYPE1			BIT(8)
 #define PCIECDR			0x000020
@@ -170,9 +170,9 @@ static int rcar_pcie_config_access(const struct udevice *udev,
 
 	/* Enable the configuration access */
 	if (!PCI_BUS(bdf))
-		writel(CONFIG_SEND_ENABLE | TYPE0, priv->regs + PCIECCTLR);
+		writel(SEND_ENABLE | TYPE0, priv->regs + PCIECCTLR);
 	else
-		writel(CONFIG_SEND_ENABLE | TYPE1, priv->regs + PCIECCTLR);
+		writel(SEND_ENABLE | TYPE1, priv->regs + PCIECCTLR);
 
 	/* Check for errors */
 	if (readl(priv->regs + PCIEERRFR) & UNSUPPORTED_REQUEST)
-- 
2.25.1

[PATCH 148/149] cf_spi.c: Rename CONFIG_SPI_IDLE_VAL to SPI_IDLE_VAL

[Tom Rini]

This value is never changed by boards, so just rename it to
SPI_IDLE_VAL to fit with the rest of the code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/spi/cf_spi.c      | 12 ++++++------
 drivers/spi/sandbox_spi.c |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index ea23357090fe..1a841b5dcefc 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -32,11 +32,11 @@ struct coldfire_spi_priv {
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_SPI_IDLE_VAL
+#ifndef SPI_IDLE_VAL
 #if defined(CONFIG_SPI_MMC)
-#define CONFIG_SPI_IDLE_VAL	0xFFFF
+#define SPI_IDLE_VAL	0xFFFF
 #else
-#define CONFIG_SPI_IDLE_VAL	0x0
+#define SPI_IDLE_VAL	0x0
 #endif
 #endif
 
@@ -184,7 +184,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen,
 			}
 
 			if (din) {
-				cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL);
+				cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL);
 				if (cfspi->charbit == 16)
 					*spi_rd16++ = cfspi_rx(cfspi);
 				else
@@ -208,7 +208,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen,
 		}
 
 		if (din) {
-			cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL);
+			cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL);
 			if (cfspi->charbit == 16)
 				*spi_rd16 = cfspi_rx(cfspi);
 			else
@@ -216,7 +216,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen,
 		}
 	} else {
 		/* dummy read */
-		cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL);
+		cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL);
 		cfspi_rx(cfspi);
 	}
 
diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 0564d8b55e70..f844597d04cf 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -24,10 +24,6 @@
 #include <dm/acpi.h>
 #include <dm/device-internal.h>
 
-#ifndef CONFIG_SPI_IDLE_VAL
-# define CONFIG_SPI_IDLE_VAL 0xFF
-#endif
-
 /**
  * struct sandbox_spi_priv - Sandbox SPI private data
  *
-- 
2.25.1

[PATCH 149/149] common/spl/spl_ram: Remove unused default

[Tom Rini]

We ask for CONFIG_SPL_LOAD_FIT_ADDRESS in Kconfig, so we cannot define
it in C as a fall-back. However, this option previously was buried under
"if ... endif" Kconfig logic. Rework a number of config options to now
have more robust dependency lines so that we can ask this address when
needed. With that done, we can remove the fallback in spl_ram.c.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 boot/Kconfig         | 29 +++++++++++++++--------------
 common/spl/spl_ram.c |  4 ----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index 668270cc6605..65613a01491d 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -36,10 +36,9 @@ config TIMESTAMP
 	  loaded that does not, the message 'Wrong FIT format: no timestamp'
 	  is shown.
 
-if FIT
-
 config FIT_EXTERNAL_OFFSET
 	hex "FIT external data offset"
+	depends on FIT
 	default 0x0
 	help
 	  This specifies a data offset in fit image.
@@ -50,6 +49,7 @@ config FIT_EXTERNAL_OFFSET
 
 config FIT_FULL_CHECK
 	bool "Do a full check of the FIT before using it"
+	depends on FIT
 	default y
 	help
 	  Enable this do a full check of the FIT to make sure it is valid. This
@@ -59,7 +59,7 @@ config FIT_FULL_CHECK
 
 config FIT_SIGNATURE
 	bool "Enable signature verification of FIT uImages"
-	depends on DM
+	depends on DM && FIT
 	select HASH
 	imply RSA
 	imply RSA_VERIFY
@@ -97,7 +97,7 @@ config FIT_RSASSA_PSS
 
 config FIT_CIPHER
 	bool "Enable ciphering data in a FIT uImages"
-	depends on DM
+	depends on DM && FIT
 	select AES
 	help
 	  Enable the feature of data ciphering/unciphering in the tool mkimage
@@ -105,6 +105,7 @@ config FIT_CIPHER
 
 config FIT_VERBOSE
 	bool "Show verbose messages when FIT images fail"
+	depends on FIT
 	help
 	  Generally a system will have valid FIT images so debug messages
 	  are a waste of code space. If you are debugging your images then
@@ -113,6 +114,7 @@ config FIT_VERBOSE
 
 config FIT_BEST_MATCH
 	bool "Select the best match for the kernel device tree"
+	depends on FIT
 	help
 	  When no configuration is explicitly selected, default to the
 	  one whose fdt's compatibility field best matches that of
@@ -122,6 +124,7 @@ config FIT_BEST_MATCH
 
 config FIT_IMAGE_POST_PROCESS
 	bool "Enable post-processing of FIT artifacts after loading by U-Boot"
+	depends on FIT
 	depends on TI_SECURE_DEVICE || SOCFPGA_SECURE_VAB_AUTH
 	default y if TI_SECURE_DEVICE
 	help
@@ -137,15 +140,14 @@ config FIT_IMAGE_POST_PROCESS
 
 config FIT_PRINT
         bool "Support FIT printing"
+	depends on FIT
         default y
         help
           Support printing the content of the fitImage in a verbose manner.
 
-if SPL
-
 config SPL_FIT
 	bool "Support Flattened Image Tree within SPL"
-	depends on SPL
+	depends on SPL && FIT
 	select SPL_HASH
 	select SPL_OF_LIBFDT
 
@@ -157,13 +159,13 @@ config SPL_FIT_PRINT
 
 config SPL_FIT_FULL_CHECK
 	bool "Do a full check of the FIT before using it"
+	depends on SPL_FIT
 	help
 	  Enable this do a full check of the FIT to make sure it is valid. This
 	  helps to protect against carefully crafted FITs which take advantage
 	  of bugs or omissions in the code. This includes a bad structure,
 	  multiple root nodes and the like.
 
-
 config SPL_FIT_SIGNATURE
 	bool "Enable signature verification of FIT firmware within SPL"
 	depends on SPL_DM
@@ -196,6 +198,7 @@ config SPL_FIT_RSASSA_PSS
 
 config SPL_LOAD_FIT
 	bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
+	depends on SPL && FIT
 	select SPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part
@@ -217,7 +220,7 @@ config SPL_LOAD_FIT
 
 config SPL_LOAD_FIT_ADDRESS
 	hex "load address of fit image"
-	depends on SPL_LOAD_FIT
+	depends on SPL_LOAD_FIT || SPL_RAM_SUPPORT || TPL_RAM_SUPPORT
 	default 0x0
 	help
 	  Specify the load address of the fit image that will be loaded
@@ -243,6 +246,7 @@ config SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
 
 config SPL_LOAD_FIT_FULL
 	bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
+	depends on FIT
 	select SPL_FIT
 	help
 	  Normally with the SPL framework a legacy image is generated as part
@@ -277,7 +281,8 @@ config SPL_FIT_SOURCE
 
 config USE_SPL_FIT_GENERATOR
 	bool "Use a script to generate the .its script"
-	default y if SPL_FIT && (!ARCH_SUNXI && !RISCV)
+	depends on SPL_FIT
+	default y if !ARCH_SUNXI && !RISCV
 
 config SPL_FIT_GENERATOR
 	string ".its file generator script for U-Boot FIT image"
@@ -290,8 +295,6 @@ config SPL_FIT_GENERATOR
 	  passed a list of supported device tree file stub names to
 	  include in the generated image.
 
-endif # SPL
-
 if VPL
 
 config VPL_FIT
@@ -342,8 +345,6 @@ config VPL_FIT_SIGNATURE_MAX_SIZE
 
 endif # VPL
 
-endif # FIT
-
 config PXE_UTILS
 	bool
 	select MENU
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index 2b1ac191523a..5753bd228f77 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -17,10 +17,6 @@
 #include <spl.h>
 #include <linux/libfdt.h>
 
-#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
-# define CONFIG_SPL_LOAD_FIT_ADDRESS	0
-#endif
-
 static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
 			       ulong count, void *buf)
 {
-- 
2.25.1

Re: [PATCH 144/149] CI: Replace unmigrated symbol test with non-Kconfig introduction test

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]

On Sun, Dec 04, 2022 at 10:14:15AM -0500, Tom Rini wrote:

> Now that all symbols have been migrated to Kconfig, or are part of the
> CFG namespace we do not need a complex check for unmigrated CONFIG
> symbols. Any instance of #define (or #undef) or a CONFIG value is wrong,
> so cause CI to fail.
> 
> This test is not as strict as possible yet as we have more symbols that
> were not previously caught to deal with.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

At this point in the series, I want to make a few comments.

First, before applying, there are some recent other series I'll be
taking, such as the one to convert keymile platforms, which makes some
of the patches here irrelevant.

Second, and as implied by the last few patches in this series, the regex
pattern here finds more symbols, some of which we can ignore.  For
example, the final form of this test will just ignore arch/*/dts/ as
CONFIG symbols defined there are coming in from Linux and not our
concern.  And include/linux/kconfig.h defines CONFIG_IS_ENABLED, etc, so
also valid defines.  But there's a lot of oddball defines out there,
which I intend to deal with.  Starting with symbols which do NOT follow
the pattern of '#defineSPACECONFIG_...' just because there's only a few
of them, and dealing with those manually makes scripting something in
the form of "for every symbol, is there a non-define usage of it" should
get rid of many of them, as unused code.  The hopefully follow up to
that is usage in code that should be removed anyhow as it's never
enabled (and not something like an RTC driver that should be enabled for
sandbox as it's otherwise up to date).

Third, this is still a big milestone. Everything in the big list of
symbols has been handled and tooling is in place to catch
re-introductions. I want to thank everyone for their hard work getting
us here.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 091/149] global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

On Sun, Dec 04, 2022 at 10:13:22AM -0500, Tom Rini wrote:

> Perform simple renames of:
>    CONFIG_MXC_USB_FLAGS to CFG_MXC_USB_FLAGS
>    CONFIG_MXC_USB_PORT to CFG_MXC_USB_PORT
>    CONFIG_MXC_USB_PORTSC to CFG_MXC_USB_PORTSC
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Duplicate posting because I once again hit the maximum number of emails
in a row I can send before Google says No, and then off by one in my
resending.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 33/41] sandbox: Finish migration to Kconfig

[Simon Glass]

Hi Tom,

On Sat, 3 Dec 2022 at 10:43, Tom Rini <trini@konsulko.com> wrote:
>
> Stop using CONFIG_SANDBOX_ARCH and use CONFIG_SANDBOX instead. For the
> SPI related defines, set them directly in Kconfig. This now empties
> arch/sandbox/include/asm/config.h.
>
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/sandbox/include/asm/config.h | 10 ----------
>  drivers/adc/adc-uclass.c          |  2 +-
>  drivers/spi/Kconfig               | 10 ++++++++++
>  3 files changed, 11 insertions(+), 11 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 01/41] usb: Update USB_STORAGE dependencies

[Simon Glass]

On Sat, 3 Dec 2022 at 10:43, Tom Rini <trini@konsulko.com> wrote:
>
> As it's no longer possible to have !DM_USB set, we can remove these
> dependencies.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  common/spl/Kconfig  | 2 +-
>  drivers/usb/Kconfig | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[Simon Glass]

Hi Tom,

On Mon, 5 Dec 2022 at 04:07, Tom Rini <trini@konsulko.com> wrote:
>
> While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
> cannot undef the symbol in this manner. As this ends up only being a
> single location in a file that already has other checks for HOST_CC, add
> one more HOST_CC check instead.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  lib/rsa/rsa-verify.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
> index 9605c376390a..0662235be6f1 100644
> --- a/lib/rsa/rsa-verify.c
> +++ b/lib/rsa/rsa-verify.c
> @@ -23,18 +23,13 @@
>  #include <u-boot/rsa-mod-exp.h>
>  #include <u-boot/rsa.h>
>
> -#ifndef __UBOOT__
>  /*
>   * NOTE:
>   * Since host tools, like mkimage, make use of openssl library for
>   * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are
>   * of no use and should not be compiled in.
> - * So just turn off CONFIG_RSA_VERIFY_WITH_PKEY.
>   */
>
> -#undef CONFIG_RSA_VERIFY_WITH_PKEY
> -#endif
> -
>  /* Default public exponent for backward compatibility */
>  #define RSA_DEFAULT_PUBEXP     65537
>
> @@ -506,6 +501,7 @@ int rsa_verify_hash(struct image_sign_info *info,
>  {
>         int ret = -EACCES;
>
> +#if !defined(USE_HOSTCC)

you can use

if tools_build()

here, I believe. I've been trying to avoid #if USE_HOSTCC

>         if (CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && !info->fdt_blob) {
>                 /* don't rely on fdt properties */
>                 ret = rsa_verify_with_pkey(info, hash, sig, sig_len);
> @@ -513,6 +509,7 @@ int rsa_verify_hash(struct image_sign_info *info,
>                         debug("%s: rsa_verify_with_pkey() failed\n", __func__);
>                 return ret;
>         }
> +#endif
>
>         if (CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
>                 const void *blob = info->fdt_blob;
> --
> 2.25.1
>

Regards,
Simon

Re: [PATCH 002/149] rk32xx: Use standard TPL linker script

[Simon Glass]

On Mon, 5 Dec 2022 at 04:06, Tom Rini <trini@konsulko.com> wrote:
>
> As of 2f41ade79e59 ("linker: Modify linker scripts to be more generic")
> we can use the same linker script for SPL and TPL and not have to make
> use of #undef tricks. Remove these last remnants.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/arm/mach-rockchip/rk3288/Kconfig |  3 ---
>  arch/arm/mach-rockchip/u-boot-tpl.lds | 12 ------------
>  configs/evb-rk3229_defconfig          |  1 -
>  3 files changed, 16 deletions(-)
>  delete mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 001/149] exynos: Rework legacy PWM usage

[Simon Glass]

On Mon, 5 Dec 2022 at 04:06, Tom Rini <trini@konsulko.com> wrote:
>
> The way that the timer support is currently done for exynos/nexell
> platforms relies on the legacy PWM infrastructure, and that needs to be
> updated. However, we really cannot safely undef CONFIG_DM_PWM to build
> the timer.c file without warnings. For now, rename the relevant legacy
> functions to be prefixed with s5p_ and add prototypes to the arch pwm.h
> files.
>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Cc: Dzmitry Sankouski <dsankouski@gmail.com>
> Cc: Stefan Bosch <stefan_b@posteo.net>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/arm/cpu/armv7/s5p-common/pwm.c      | 11 +++++------
>  arch/arm/cpu/armv7/s5p-common/timer.c    | 10 +++-------
>  arch/arm/mach-exynos/include/mach/pwm.h  |  5 +++++
>  arch/arm/mach-nexell/include/mach/pwm.h  |  5 +++++
>  arch/arm/mach-s5pc1xx/include/mach/pwm.h |  5 +++++
>  board/friendlyarm/nanopi2/board.c        |  4 ++--
>  board/friendlyarm/nanopi2/onewire.c      |  4 ++--
>  7 files changed, 27 insertions(+), 17 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Can someone update this to use driver model?


- Simon

Re: [PATCH 05/41] chromebook_samus_tpl: Disable SPL networking

[Simon Glass]

On Mon, 28 Nov 2022 at 04:25, Tom Rini <trini@konsulko.com> wrote:
>
> We don't appear to actually use networking in SPL here, disable it.
>
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  configs/chromebook_samus_tpl_defconfig | 1 -
>  1 file changed, 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

[PATCHv2 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[Tom Rini]

While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
cannot undef the symbol in this manner. As this ends up being a test
within another function we can use !tools_build() as a test here.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v2:
- Switch to !tools_build() per Simon
---
 lib/rsa/rsa-verify.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 9605c376390a..db2aca5385a9 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -23,18 +23,13 @@
 #include <u-boot/rsa-mod-exp.h>
 #include <u-boot/rsa.h>
 
-#ifndef __UBOOT__
 /*
  * NOTE:
  * Since host tools, like mkimage, make use of openssl library for
  * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are
  * of no use and should not be compiled in.
- * So just turn off CONFIG_RSA_VERIFY_WITH_PKEY.
  */
 
-#undef CONFIG_RSA_VERIFY_WITH_PKEY
-#endif
-
 /* Default public exponent for backward compatibility */
 #define RSA_DEFAULT_PUBEXP	65537
 
@@ -506,7 +501,8 @@ int rsa_verify_hash(struct image_sign_info *info,
 {
 	int ret = -EACCES;
 
-	if (CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && !info->fdt_blob) {
+	if (!tools_build() && CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) &&
+			!info->fdt_blob) {
 		/* don't rely on fdt properties */
 		ret = rsa_verify_with_pkey(info, hash, sig, sig_len);
 		if (ret)
-- 
2.25.1

Re: [PATCHv2 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[Simon Glass]

On Mon, 5 Dec 2022 at 11:37, Tom Rini <trini@konsulko.com> wrote:
>
> While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
> cannot undef the symbol in this manner. As this ends up being a test
> within another function we can use !tools_build() as a test here.
>
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Changes in v2:
> - Switch to !tools_build() per Simon
> ---
>  lib/rsa/rsa-verify.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 01/38] power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

On Sat, Nov 19, 2022 at 06:45:08PM -0500, Tom Rini wrote:

> As we have more legacy PMIC drivers to move to Kconfig, guard them all
> with POWER_LEGACY or SPL_POWER_LEGACY. Do the same kind of check for
> building the drivers too. This also means that we need to resort the
> list slightly in the Makefile.
> 
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

For the series, applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCHv2 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[AKASHI Takahiro]

On Sun, Dec 04, 2022 at 05:37:06PM -0500, Tom Rini wrote:
> While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
> cannot undef the symbol in this manner. As this ends up being a test
> within another function we can use !tools_build() as a test here.
> 
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Changes in v2:
> - Switch to !tools_build() per Simon
> ---
>  lib/rsa/rsa-verify.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
> index 9605c376390a..db2aca5385a9 100644
> --- a/lib/rsa/rsa-verify.c
> +++ b/lib/rsa/rsa-verify.c
> @@ -23,18 +23,13 @@
>  #include <u-boot/rsa-mod-exp.h>
>  #include <u-boot/rsa.h>
>  
> -#ifndef __UBOOT__
>  /*
>   * NOTE:
>   * Since host tools, like mkimage, make use of openssl library for
>   * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are
>   * of no use and should not be compiled in.
> - * So just turn off CONFIG_RSA_VERIFY_WITH_PKEY.
>   */

I think you can delete the whole comment here.
If you think it's still helpful, please place it below
in the function.

-Takahiro Akashi

> -#undef CONFIG_RSA_VERIFY_WITH_PKEY
> -#endif
> -
>  /* Default public exponent for backward compatibility */
>  #define RSA_DEFAULT_PUBEXP	65537
>  
> @@ -506,7 +501,8 @@ int rsa_verify_hash(struct image_sign_info *info,
>  {
>  	int ret = -EACCES;
>  
> -	if (CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && !info->fdt_blob) {
> +	if (!tools_build() && CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) &&
> +			!info->fdt_blob) {
>  		/* don't rely on fdt properties */
>  		ret = rsa_verify_with_pkey(info, hash, sig, sig_len);
>  		if (ret)
> -- 
> 2.25.1
> 

Re: [PATCH 04/41] topic_miami*: Disable networking support more fully

[Mike Looijmans]

Looks fine to me,

Acked-by: Mike Looijmans <mike.looijmans@topic.nl>

(PS: Sorry for top-posting, but otherwise our M$ mailserver will mangle it)



Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@topicproducts.com
W: www.topic.nl

Please consider the environment before printing this e-mail
On 27-11-2022 16:24, Tom Rini wrote:
> This platform had largely disabled networking support before. More
> completely disable it by turning off CONFIG_NET.
>
> Cc: Mike Looijmans <mike.looijmans@topic.nl>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>   configs/topic_miami_defconfig     | 2 +-
>   configs/topic_miamilite_defconfig | 2 +-
>   configs/topic_miamiplus_defconfig | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
> index 96aa62a7ec12..ece625f62924 100644
> --- a/configs/topic_miami_defconfig
> +++ b/configs/topic_miami_defconfig
> @@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y
>   CONFIG_CMD_MMC=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
> -# CONFIG_CMD_NET is not set
>   CONFIG_CMD_CACHE=y
>   CONFIG_OF_EMBED=y
>   CONFIG_ENV_OVERWRITE=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +# CONFIG_NET is not set
>   CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_DFU_RAM=y
>   CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
> diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
> index 41ba8a7487d1..693a602ea395 100644
> --- a/configs/topic_miamilite_defconfig
> +++ b/configs/topic_miamilite_defconfig
> @@ -46,11 +46,11 @@ CONFIG_CMD_I2C=y
>   CONFIG_CMD_MMC=y
>   CONFIG_CMD_USB=y
>   # CONFIG_CMD_SETEXPR is not set
> -# CONFIG_CMD_NET is not set
>   CONFIG_CMD_CACHE=y
>   CONFIG_OF_EMBED=y
>   CONFIG_ENV_OVERWRITE=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +# CONFIG_NET is not set
>   CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_DFU_RAM=y
>   CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
> diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
> index 763bd8cccdd3..97624e69e722 100644
> --- a/configs/topic_miamiplus_defconfig
> +++ b/configs/topic_miamiplus_defconfig
> @@ -50,6 +50,7 @@ CONFIG_CMD_CACHE=y
>   CONFIG_OF_EMBED=y
>   CONFIG_ENV_OVERWRITE=y
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +# CONFIG_NET is not set
>   CONFIG_SPL_DM_SEQ_ALIAS=y
>   CONFIG_DFU_RAM=y
>   CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000
> @@ -62,7 +63,6 @@ CONFIG_MMC_SDHCI_ZYNQ=y
>   CONFIG_SF_DEFAULT_SPEED=108000000
>   CONFIG_SPI_FLASH_STMICRO=y
>   # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
> -# CONFIG_NETDEVICES is not set
>   CONFIG_DEBUG_UART_ZYNQ=y
>   CONFIG_ARM_DCC=y
>   CONFIG_ZYNQ_SERIAL=y


-- 
Mike Looijmans

[PATCHv3 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[Tom Rini]

While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
cannot undef the symbol in this manner. As this ends up being a test
within another function we can use !tools_build() as a test here.

Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v3:
- Move comment, per Akashi-san
Changes in v2:
- Switch to !tools_build() per Simon
---
 lib/rsa/rsa-verify.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c
index 9605c376390a..2f3b34403913 100644
--- a/lib/rsa/rsa-verify.c
+++ b/lib/rsa/rsa-verify.c
@@ -23,18 +23,6 @@
 #include <u-boot/rsa-mod-exp.h>
 #include <u-boot/rsa.h>
 
-#ifndef __UBOOT__
-/*
- * NOTE:
- * Since host tools, like mkimage, make use of openssl library for
- * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are
- * of no use and should not be compiled in.
- * So just turn off CONFIG_RSA_VERIFY_WITH_PKEY.
- */
-
-#undef CONFIG_RSA_VERIFY_WITH_PKEY
-#endif
-
 /* Default public exponent for backward compatibility */
 #define RSA_DEFAULT_PUBEXP	65537
 
@@ -506,7 +494,13 @@ int rsa_verify_hash(struct image_sign_info *info,
 {
 	int ret = -EACCES;
 
-	if (CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) && !info->fdt_blob) {
+	/*
+	 * Since host tools, like mkimage, make use of openssl library for
+	 * RSA encryption, rsa_verify_with_pkey()/rsa_gen_key_prop() are
+	 * of no use and should not be compiled in.
+	 */
+	if (!tools_build() && CONFIG_IS_ENABLED(RSA_VERIFY_WITH_PKEY) &&
+			!info->fdt_blob) {
 		/* don't rely on fdt properties */
 		ret = rsa_verify_with_pkey(info, hash, sig, sig_len);
 		if (ret)
-- 
2.25.1

Re: [PATCHv3 010/149] rsa-verify: Rework host check for CONFIG_RSA_VERIFY_WITH_PKEY

[Simon Glass]

On Wed, 7 Dec 2022 at 07:51, Tom Rini <trini@konsulko.com> wrote:
>
> While we do not want to use CONFIG_RSA_VERIFY_WITH_PKEY on the host, we
> cannot undef the symbol in this manner. As this ends up being a test
> within another function we can use !tools_build() as a test here.
>
> Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
> Cc: Simon Glass <sjg@chromium.org>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Changes in v3:
> - Move comment, per Akashi-san
> Changes in v2:
> - Switch to !tools_build() per Simon
> ---
>  lib/rsa/rsa-verify.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH 01/41] xenguest_arm64: Disable networking support more fully

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

On Sun, Nov 27, 2022 at 10:24:56AM -0500, Tom Rini wrote:

> This platform had largely disabled networking support before. More
> completely disable it by turning off CONFIG_NET.
> 
> Cc: Anastasiia Lukianenko <anastasiia_lukianenko@epam.com>
> Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Except for patch 6, for the series, applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 01/41] usb: Update USB_STORAGE dependencies

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

On Fri, Dec 02, 2022 at 04:42:11PM -0500, Tom Rini wrote:

> As it's no longer possible to have !DM_USB set, we can remove these
> dependencies.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

For the series, applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 001/149] exynos: Rework legacy PWM usage

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

On Sun, Dec 04, 2022 at 10:03:26AM -0500, Tom Rini wrote:

> The way that the timer support is currently done for exynos/nexell
> platforms relies on the legacy PWM infrastructure, and that needs to be
> updated. However, we really cannot safely undef CONFIG_DM_PWM to build
> the timer.c file without warnings. For now, rename the relevant legacy
> functions to be prefixed with s5p_ and add prototypes to the arch pwm.h
> files.
> 
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Cc: Dzmitry Sankouski <dsankouski@gmail.com>
> Cc: Stefan Bosch <stefan_b@posteo.net>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

For the series, applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]