u-boot.lists.denx.de archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig
@ 2021-12-17 23:08 Tom Rini
  2021-12-17 23:08 ` [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols Tom Rini
                   ` (11 more replies)
  0 siblings, 12 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_83XX_PCICLK

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/Kconfig | 7 +++++++
 configs/kmcoge5ne_defconfig      | 1 +
 configs/kmopti2_defconfig        | 1 +
 configs/kmsupx5_defconfig        | 1 +
 configs/kmtegr1_defconfig        | 1 +
 configs/kmtepr2_defconfig        | 1 +
 configs/tuge1_defconfig          | 1 +
 configs/tuxx1_defconfig          | 1 +
 include/configs/km/km-mpc8309.h  | 5 -----
 include/configs/km/km-mpc832x.h  | 5 -----
 include/configs/kmcoge5ne.h      | 5 -----
 scripts/config_whitelist.txt     | 1 -
 12 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index d58d278c6da8..bcd837508789 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -188,6 +188,13 @@ source "arch/powerpc/cpu/mpc83xx/sysio/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/arbiter/Kconfig"
 source "arch/powerpc/cpu/mpc83xx/initreg/Kconfig"
 
+config 83XX_PCICLK
+	hex "PCI clock frequency"
+	default 0xDEADBEEF
+	help
+	  If required, the PCI clock frequency to use when configuring
+	  the host bridge.
+
 config FSL_ELBC
 	bool
 
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 461f2e381224..53f7abc3fd09 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -156,6 +156,7 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_DBYP_PLL_BYPASSED=y
 CONFIG_LCRR_EADC_2=y
 CONFIG_LCRR_CLKDIV_4=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 01709052c1a2..d230638548b8 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -139,6 +139,7 @@ CONFIG_ACR_APARK_MASTER=y
 CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 7802be8af4c8..b0b59262dec3 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -119,6 +119,7 @@ CONFIG_ACR_APARK_MASTER=y
 CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index e2bf945bc3dc..53aaf6caa25c 100644
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -118,6 +118,7 @@ CONFIG_ACR_APARK_MASTER=y
 CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 98f613ce16e3..b333769dc4f5 100644
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -139,6 +139,7 @@ CONFIG_ACR_APARK_MASTER=y
 CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 9272a0cb4214..6078b46410af 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -119,6 +119,7 @@ CONFIG_ACR_APARK_MASTER=y
 CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 38875b39c12f..cc9bbab8c6bb 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -141,6 +141,7 @@ CONFIG_ACR_APARK_MASTER=y
 CONFIG_ACR_PARKM_USB_I2C1_BOOT=y
 CONFIG_LCRR_EADC_1=y
 CONFIG_LCRR_CLKDIV_2=y
+CONFIG_83XX_PCICLK=0x3ef1480
 CONFIG_SYS_LOAD_ADDR=0x100000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/include/configs/km/km-mpc8309.h b/include/configs/km/km-mpc8309.h
index 47a335bcf8ff..98204bd3c692 100644
--- a/include/configs/km/km-mpc8309.h
+++ b/include/configs/km/km-mpc8309.h
@@ -5,11 +5,6 @@
 
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_PCICLK		66000000
-
 /* QE microcode/firmware address */
 /* between the u-boot partition and env */
 
diff --git a/include/configs/km/km-mpc832x.h b/include/configs/km/km-mpc832x.h
index d985ab7a65a9..54018daa68e6 100644
--- a/include/configs/km/km-mpc832x.h
+++ b/include/configs/km/km-mpc832x.h
@@ -3,11 +3,6 @@
  */
 #define CONFIG_KM8321	/* Keymile PBEC8321 board specific */
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_PCICLK		66000000
-
 /*
  * System IO Config
  */
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 9e1f802e4e57..8f4685c271c6 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -24,11 +24,6 @@
 #include "km/km-mpc83xx.h"
 #include "km/km-mpc8360.h"
 
-/*
- * System Clock Setup
- */
-#define CONFIG_83XX_PCICLK		66000000
-
 /**
  * KMCOGE5NE has 512 MB RAM
  */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7c0489595509..a9bbd5078a87 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,6 +1,5 @@
 CONFIG_64BIT_PHYS_ADDR
 CONFIG_83XX
-CONFIG_83XX_PCICLK
 CONFIG_88F5182
 CONFIG_A003399_NOR_WORKAROUND
 CONFIG_A008044_WORKAROUND
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 03/12] Convert CONFIG_SYS_I2C_EEPROM_ADDR_LEN to Kconfig Tom Rini
                   ` (10 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

Neither of these symbols are referenced anywhere else, so remove them.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/start.S | 2 --
 include/configs/km/km-mpc832x.h  | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index 91c8778e5033..0944d1910573 100644
--- a/arch/powerpc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -14,8 +14,6 @@
 #include <config.h>
 #include <mpc83xx.h>
 
-#define CONFIG_83XX	1		/* needed for Linux kernel header files*/
-
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 
diff --git a/include/configs/km/km-mpc832x.h b/include/configs/km/km-mpc832x.h
index 54018daa68e6..aac1e999e40a 100644
--- a/include/configs/km/km-mpc832x.h
+++ b/include/configs/km/km-mpc832x.h
@@ -1,8 +1,3 @@
-/*
- * High Level Configuration Options
- */
-#define CONFIG_KM8321	/* Keymile PBEC8321 board specific */
-
 /*
  * System IO Config
  */
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 03/12] Convert CONFIG_SYS_I2C_EEPROM_ADDR_LEN to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
  2021-12-17 23:08 ` [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 04/12] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8 Tom Rini
                   ` (9 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_SYS_I2C_EEPROM_ADDR_LEN

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/km/km-mpc832x.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/configs/km/km-mpc832x.h b/include/configs/km/km-mpc832x.h
index aac1e999e40a..888bb2981f7b 100644
--- a/include/configs/km/km-mpc832x.h
+++ b/include/configs/km/km-mpc832x.h
@@ -58,6 +58,3 @@
 
 #define CONFIG_SYS_KMBEC_FPGA_BASE	0xE8000000
 #define CONFIG_SYS_KMBEC_FPGA_SIZE	128
-
-/* EEprom support */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 04/12] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
  2021-12-17 23:08 ` [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols Tom Rini
  2021-12-17 23:08 ` [PATCH 03/12] Convert CONFIG_SYS_I2C_EEPROM_ADDR_LEN to Kconfig Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 05/12] Convert CONFIG_CPU_PXA27X to Kconfig Tom Rini
                   ` (8 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

The only place we use CONFIG_CPU_ARMV8 was in the arm_dcc serial driver.
Switch this to CONFIG_ARM64 today, and if in the future we need finer
granularity tuning here, a new CONFIG_SERIAL option needs to be
introduced.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 drivers/serial/arm_dcc.c        | 2 +-
 include/configs/meson64.h       | 1 -
 include/configs/mt8183.h        | 1 -
 include/configs/mt8512.h        | 2 --
 include/configs/mt8516.h        | 1 -
 include/configs/mt8518.h        | 2 --
 include/configs/xilinx_versal.h | 2 --
 include/configs/xilinx_zynqmp.h | 2 --
 8 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index dfcb6fd69812..a402a123b6d6 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -51,7 +51,7 @@
 #define status_dcc(x)	\
 		__asm__ volatile ("mrc p14, 0, %0, c14, c0, 0\n" : "=r" (x))
 
-#elif defined(CONFIG_CPU_ARMV8)
+#elif defined(CONFIG_ARM64)
 /*
  * ARMV8
  */
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index cb202d555561..44f2967fc6b3 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -29,7 +29,6 @@
 #define STDIN_CFG "serial"
 #endif
 
-#define CONFIG_CPU_ARMV8
 #define CONFIG_REMAKE_ELF
 #define CONFIG_SYS_MAXARGS		32
 #define CONFIG_SYS_CBSIZE		1024
diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h
index ebd2b326ade0..2b4e976aa1fe 100644
--- a/include/configs/mt8183.h
+++ b/include/configs/mt8183.h
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_CPU_ARMV8
 #define COUNTER_FREQUENCY		13000000
 
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h
index 8882a5a40970..9c443db9f52d 100644
--- a/include/configs/mt8512.h
+++ b/include/configs/mt8512.h
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_NONCACHED_MEMORY		SZ_1M
 
-#define CONFIG_CPU_ARMV8
-
 #define COUNTER_FREQUENCY			13000000
 
 #define CONFIG_SYS_BOOTM_LEN			SZ_64M
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h
index 12840b883dec..47132c1db1d2 100644
--- a/include/configs/mt8516.h
+++ b/include/configs/mt8516.h
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_CPU_ARMV8
 #define COUNTER_FREQUENCY		13000000
 
 #define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h
index 593c6a11d742..49ee926b0c94 100644
--- a/include/configs/mt8518.h
+++ b/include/configs/mt8518.h
@@ -13,8 +13,6 @@
 
 #define CONFIG_SYS_NONCACHED_MEMORY		SZ_1M
 
-#define CONFIG_CPU_ARMV8
-
 #define COUNTER_FREQUENCY			13000000
 
 /* DRAM definition */
diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 43486457a45d..03539a41b49f 100644
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -26,8 +26,6 @@
 #endif
 
 /* Serial setup */
-#define CONFIG_CPU_ARMV8
-
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{ 4800, 9600, 19200, 38400, 57600, 115200 }
 
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index d683d12e95b9..f4b7f305bf75 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -26,8 +26,6 @@
 #endif
 
 /* Serial setup */
-#define CONFIG_CPU_ARMV8
-
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{ 4800, 9600, 19200, 38400, 57600, 115200 }
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 05/12] Convert CONFIG_CPU_PXA27X to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (2 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 04/12] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8 Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 06/12] Convert CONFIG_CPU_SH7751 " Tom Rini
                   ` (7 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_CPU_PXA27X

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 594aec2b92d7..4bfca750c27b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -311,6 +311,10 @@ config CPU_PXA
 	select SYS_CACHE_SHIFT_5
 	imply SYS_ARM_MMU
 
+config CPU_PXA27X
+	bool
+	select CPU_PXA
+
 config CPU_SA1100
 	bool
 	select SYS_CACHE_SHIFT_5
@@ -1765,7 +1769,7 @@ config TARGET_SL28
 
 config TARGET_COLIBRI_PXA270
 	bool "Support colibri_pxa270"
-	select CPU_PXA
+	select CPU_PXA27X
 	select GPIO_EXTRA_HEADER
 
 config ARCH_UNIPHIER
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 22eab7779b01..0be7f5a416d0 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -12,7 +12,6 @@
 /*
  * High Level Board Configuration Options
  */
-#define	CONFIG_CPU_PXA27X		1	/* Marvell PXA270 CPU */
 /* Avoid overwriting factory configuration block */
 #define CONFIG_BOARD_SIZE_LIMIT		0x40000
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a9bbd5078a87..2bc2d5b146bd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -162,7 +162,6 @@ CONFIG_CPU_MIPSR2
 CONFIG_CPU_MONAHANS
 CONFIG_CPU_PXA25X
 CONFIG_CPU_PXA26X
-CONFIG_CPU_PXA27X
 CONFIG_CPU_PXA300
 CONFIG_CPU_SH7751
 CONFIG_CPU_TYPE_R
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 06/12] Convert CONFIG_CPU_SH7751 to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (3 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 05/12] Convert CONFIG_CPU_PXA27X to Kconfig Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 07/12] Convert CONFIG_CPU_FREQ_HZ " Tom Rini
                   ` (6 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_CPU_SH7751

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

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 7836869c55dc..7e6cb7015896 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -4,13 +4,17 @@ menu "SuperH architecture"
 config CPU_SH4
 	bool
 
+config CPU_SH7751
+	bool
+	select CPU_SH4
+
 choice
 	prompt "Target select"
 	optional
 
 config TARGET_R2DPLUS
 	bool "Renesas R2D-PLUS"
-	select CPU_SH4
+	select CPU_SH7751
 
 endchoice
 
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 680d16d547c4..8e86830e61be 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -1,7 +1,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_CPU_SH7751	1
 #define __LITTLE_ENDIAN__	1
 
 /* SCIF */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2bc2d5b146bd..655eaab81812 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -163,7 +163,6 @@ CONFIG_CPU_MONAHANS
 CONFIG_CPU_PXA25X
 CONFIG_CPU_PXA26X
 CONFIG_CPU_PXA300
-CONFIG_CPU_SH7751
 CONFIG_CPU_TYPE_R
 CONFIG_CPU_VR41XX
 CONFIG_CQSPI_REF_CLK
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 07/12] Convert CONFIG_CPU_FREQ_HZ to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (4 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 06/12] Convert CONFIG_CPU_SH7751 " Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 08/12] Kconfig: Remove some symbols from the whitelist Tom Rini
                   ` (5 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot; +Cc: Michal Simek

This converts the following to Kconfig:
   CONFIG_CPU_FREQ_HZ

Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-zynqmp-r5/Kconfig    | 6 ++++++
 configs/xilinx_zynqmp_r5_defconfig | 1 +
 include/configs/xilinx_zynqmp_r5.h | 3 ---
 include/configs/zynq-common.h      | 5 -----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-zynqmp-r5/Kconfig b/arch/arm/mach-zynqmp-r5/Kconfig
index 5e0175413395..f14514b3c7c1 100644
--- a/arch/arm/mach-zynqmp-r5/Kconfig
+++ b/arch/arm/mach-zynqmp-r5/Kconfig
@@ -21,6 +21,12 @@ config SYS_CONFIG_NAME
 	  Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
 	  will be used for board configuration.
 
+config CPU_FREQ_HZ
+	int "CPU frequency"
+	default 800000000
+	help
+	  The value, in Hz, that the CPU clock is running at.
+
 config SYS_MALLOC_F_LEN
 	default 0x600
 
diff --git a/configs/xilinx_zynqmp_r5_defconfig b/configs/xilinx_zynqmp_r5_defconfig
index a9c3c4a03e81..98f46cf0205a 100644
--- a/configs/xilinx_zynqmp_r5_defconfig
+++ b/configs/xilinx_zynqmp_r5_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-r5"
 CONFIG_DEBUG_UART_BASE=0xff010000
 CONFIG_DEBUG_UART_CLOCK=100000000
+CONFIG_CPU_FREQ_HZ=500000000
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_LOAD_ADDR=0x0
 CONFIG_BOOTSTAGE=y
diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h
index 6d5b81e05e16..3ec99e062df5 100644
--- a/include/configs/xilinx_zynqmp_r5.h
+++ b/include/configs/xilinx_zynqmp_r5.h
@@ -8,9 +8,6 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS
 
-/* CPU clock */
-#define CONFIG_CPU_FREQ_HZ	500000000
-
 /* Serial drivers */
 /* The following table includes the supported baudrates */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 8f8a9c7479c3..88c6490d81cd 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -9,11 +9,6 @@
 #ifndef __CONFIG_ZYNQ_COMMON_H
 #define __CONFIG_ZYNQ_COMMON_H
 
-/* CPU clock */
-#ifndef CONFIG_CPU_FREQ_HZ
-# define CONFIG_CPU_FREQ_HZ	800000000
-#endif
-
 #define CONFIG_REMAKE_ELF
 
 /* Cache options */
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 08/12] Kconfig: Remove some symbols from the whitelist
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (5 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 07/12] Convert CONFIG_CPU_FREQ_HZ " Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:58   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 09/12] Convert CONFIG_88F5182 et al to Kconfig Tom Rini
                   ` (4 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

There are a number of symbols that are never defined, only referenced in
code imported from the Linux kernel or similar.  Drop them from the list.

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

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 655eaab81812..9fae7ce8617c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,41 +1,24 @@
-CONFIG_64BIT_PHYS_ADDR
-CONFIG_83XX
 CONFIG_88F5182
 CONFIG_A003399_NOR_WORKAROUND
 CONFIG_A008044_WORKAROUND
-CONFIG_AEABI
 CONFIG_AM335X_USB0
 CONFIG_AM335X_USB0_MODE
 CONFIG_AM335X_USB1
 CONFIG_AM335X_USB1_MODE
-CONFIG_ANDES_PCU
-CONFIG_ANDES_PCU_BASE
-CONFIG_ARCH_ADPAG101P
-CONFIG_ARCH_HAS_ILOG2_U32
-CONFIG_ARCH_HAS_ILOG2_U64
-CONFIG_ARCH_OMAP4
-CONFIG_ARCH_RMOBILE_EXTRAM_BOOT
-CONFIG_ARCH_USE_BUILTIN_BSWAP
-CONFIG_ARC_MMU_VER
 CONFIG_ARMV7_SECURE_BASE
 CONFIG_ARMV7_SECURE_MAX_SIZE
 CONFIG_ARMV7_SECURE_RESERVE_SIZE
 CONFIG_ARMV8_SWITCH_TO_EL1
 CONFIG_ARM_GIC_BASE_ADDRESS
 CONFIG_ARP_TIMEOUT
-CONFIG_AT91C_PQFP_UHPBUG
-CONFIG_AT91RESET_EXTRST
-CONFIG_AT91RM9200
 CONFIG_AT91SAM9260EK
 CONFIG_AT91SAM9261EK
 CONFIG_AT91SAM9G10
 CONFIG_AT91SAM9G10EK
 CONFIG_AT91SAM9G20EK
 CONFIG_AT91SAM9G20EK_2MMC
-CONFIG_AT91SAM9G45EKES
 CONFIG_AT91SAM9G45_LCD_BASE
 CONFIG_AT91SAM9M10G45EK
-CONFIG_AT91_CAN
 CONFIG_AT91_EFLASH
 CONFIG_AT91_GPIO_PULLUP
 CONFIG_AT91_LED
@@ -45,13 +28,9 @@ CONFIG_ATMEL_LCD
 CONFIG_ATMEL_LCD_BGR555
 CONFIG_ATMEL_LCD_RGB565
 CONFIG_ATMEL_LEGACY
-CONFIG_ATMEL_MCI_8BIT
 CONFIG_ATMEL_SPI0
 CONFIG_AUTO_ZRELADDR
 CONFIG_BACKSIDE_L2_CACHE
-CONFIG_BCH_CONST_M
-CONFIG_BCH_CONST_PARAMS
-CONFIG_BCH_CONST_T
 CONFIG_BCM2835_GPIO
 CONFIG_BIOSEMU
 CONFIG_BITBANGMII_MULTI
@@ -72,11 +51,8 @@ CONFIG_BOARD_SIZE_LIMIT
 CONFIG_BOOTFILE
 CONFIG_BOOTMODE
 CONFIG_BOOTP_BOOTFILESIZE
-CONFIG_BOOTP_DHCP_REQUEST_DELAY
-CONFIG_BOOTP_ID_CACHE_SIZE
 CONFIG_BOOTP_MAY_FAIL
 CONFIG_BOOTP_NISDOMAIN
-CONFIG_BOOTP_RANDOM_DELAY
 CONFIG_BOOTP_SERVERIP
 CONFIG_BOOTP_TIMEOFFSET
 CONFIG_BOOTP_VENDOREX
@@ -84,7 +60,6 @@ CONFIG_BOOTROM_ERR_REG
 CONFIG_BOOTSCRIPT_ADDR
 CONFIG_BOOTSCRIPT_COPY_RAM
 CONFIG_BOOTSCRIPT_HDR_ADDR
-CONFIG_BOOTSCRIPT_KEY_HASH
 CONFIG_BOOT_RETRY_MIN
 CONFIG_BOOT_RETRY_TIME
 CONFIG_BPTR_VIRT_ADDR
@@ -97,35 +72,14 @@ CONFIG_BS_HDR_ADDR_RAM
 CONFIG_BS_HDR_SIZE
 CONFIG_BS_SIZE
 CONFIG_BTB
-CONFIG_BUILD_ENVCRC
-CONFIG_BUS_WIDTH
-CONFIG_CDP_APPLIANCE_VLAN_TYPE
-CONFIG_CDP_CAPABILITIES
-CONFIG_CDP_DEVICE_ID
-CONFIG_CDP_DEVICE_ID_PREFIX
-CONFIG_CDP_PLATFORM
-CONFIG_CDP_PORT_ID
-CONFIG_CDP_POWER_CONSUMPTION
-CONFIG_CDP_TRIGGER
-CONFIG_CDP_VERSION
-CONFIG_CFG_DATA_SECTOR
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
 CONFIG_CF_DSPI
 CONFIG_CF_SBF
-CONFIG_CF_V2
-CONFIG_CF_V3
-CONFIG_CF_V4
-CONFIG_CF_V4E
 CONFIG_CHAIN_BOOT_CMD
 CONFIG_CHIP_SELECTS_PER_CTRL
-CONFIG_CHIP_SELECT_QUAD_CAPABLE
 CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
 CONFIG_CI_UDC_HAS_HOSTPC
-CONFIG_CLK_1000_200_200
-CONFIG_CLK_1000_330_165
 CONFIG_CLK_1000_400_200
-CONFIG_CLK_800_330_165
-CONFIG_CLK_DEBUG
 CONFIG_CLOCKS
 CONFIG_CLOCK_SYNTHESIZER
 CONFIG_CM922T_XA10
@@ -135,11 +89,7 @@ CONFIG_CM_MULTIPLE_SSRAM
 CONFIG_CM_REMAP
 CONFIG_CM_SPD_DETECT
 CONFIG_CM_TCRAM
-CONFIG_COLDFIRE
 CONFIG_COMMON_BOOT
-CONFIG_COMPAT
-CONFIG_CONS_EXTC_PINSEL
-CONFIG_CONS_EXTC_RATE
 CONFIG_CONS_ON_SCC
 CONFIG_CONS_SCIF0
 CONFIG_CONS_SCIF1
@@ -151,39 +101,13 @@ CONFIG_CPLD_OR_PRELIM
 CONFIG_CPM2
 CONFIG_CPU_ARMV8
 CONFIG_CPU_FREQ_HZ
-CONFIG_CPU_HAS_LLSC
-CONFIG_CPU_HAS_PREFETCH
-CONFIG_CPU_HAS_SMARTMIPS
-CONFIG_CPU_HAS_SR_RB
-CONFIG_CPU_HAS_WB
-CONFIG_CPU_LITTLE_ENDIAN
-CONFIG_CPU_MICROMIPS
-CONFIG_CPU_MIPSR2
-CONFIG_CPU_MONAHANS
-CONFIG_CPU_PXA25X
-CONFIG_CPU_PXA26X
-CONFIG_CPU_PXA300
-CONFIG_CPU_TYPE_R
-CONFIG_CPU_VR41XX
 CONFIG_CQSPI_REF_CLK
-CONFIG_CS8900_BUS16
-CONFIG_CS8900_BUS32
-CONFIG_CTL_JTAG
-CONFIG_CTL_TBE
 CONFIG_CUSTOMER_BOARD_SUPPORT
 CONFIG_D2NET_V2
-CONFIG_DA850_EVM_MAX_CPU_CLK
 CONFIG_DB_784MP_GP
 CONFIG_DCACHE
-CONFIG_DCACHE_OFF
-CONFIG_DCFG_ADDR
 CONFIG_DEBUG
-CONFIG_DEBUG_FS
 CONFIG_DEBUG_LED
-CONFIG_DEBUG_LOCK_ALLOC
-CONFIG_DEBUG_SEMIHOSTING
-CONFIG_DEBUG_UART_LINFLEXUART
-CONFIG_DEBUG_WRITECOUNT
 CONFIG_DEEP_SLEEP
 CONFIG_DEFAULT
 CONFIG_DEFAULT_IMMR
@@ -194,12 +118,9 @@ CONFIG_DFU_ALT_BOOT_EMMC
 CONFIG_DFU_ALT_BOOT_SD
 CONFIG_DFU_ALT_SYSTEM
 CONFIG_DFU_ENV_SETTINGS
-CONFIG_DHCP_MIN_EXT_LEN
 CONFIG_DIALOG_POWER
 CONFIG_DIMM_SLOTS_PER_CTLR
-CONFIG_DISCONTIGMEM
 CONFIG_DISCOVER_PHY
-CONFIG_DISPLAY_AER_xxxx
 CONFIG_DM9000_BASE
 CONFIG_DM9000_BYTE_SWAPPED
 CONFIG_DM9000_DEBUG
@@ -207,33 +128,20 @@ CONFIG_DM9000_NO_SROM
 CONFIG_DM9000_USE_16BIT
 CONFIG_DMA_COHERENT
 CONFIG_DMA_COHERENT_SIZE
-CONFIG_DMA_NONCOHERENT
-CONFIG_DNET_AUTONEG_TIMEOUT
 CONFIG_DP_DDR_CTRL
 CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
 CONFIG_DP_DDR_NUM_CTRLS
 CONFIG_DRIVER_DM9000
 CONFIG_DSP_CLUSTER_START
-CONFIG_DWCDDR21MCTL
-CONFIG_DWCDDR21MCTL_BASE
 CONFIG_DWC_AHSATA_BASE_ADDR
 CONFIG_DWC_AHSATA_PORT_ID
 CONFIG_DW_ALTDESCRIPTOR
-CONFIG_DW_AXI_BURST_LEN
 CONFIG_DW_GMAC_DEFAULT_DMA_PBL
-CONFIG_DW_MAC_FORCE_THRESHOLD_MODE
 CONFIG_DW_WDT_BASE
 CONFIG_DW_WDT_CLOCK_KHZ
 CONFIG_E1000_NO_NVM
 CONFIG_E300
 CONFIG_E5500
-CONFIG_ECC
-CONFIG_EDB9301
-CONFIG_EDB93XX_INDUSTRIAL
-CONFIG_EDB93XX_SDCS0
-CONFIG_EDB93XX_SDCS1
-CONFIG_EDB93XX_SDCS2
-CONFIG_EDB93XX_SDCS3
 CONFIG_EFLASH_PROTSECTORS
 CONFIG_EHCI_DESC_BIG_ENDIAN
 CONFIG_EHCI_HCD_INIT_AFTER_RESET
@@ -243,16 +151,10 @@ CONFIG_EHCI_MXS_PORT1
 CONFIG_EMU
 CONFIG_ENABLE_36BIT_PHYS
 CONFIG_ENABLE_MMU
-CONFIG_ENABLE_MUST_CHECK
-CONFIG_ENV_ADDR_FLEX
-CONFIG_ENV_CALLBACK_LIST_DEFAULT
-CONFIG_ENV_CALLBACK_LIST_STATIC
-CONFIG_ENV_FLAGS_LIST_DEFAULT
 CONFIG_ENV_FLAGS_LIST_STATIC
 CONFIG_ENV_IS_EMBEDDED
 CONFIG_ENV_MAX_ENTRIES
 CONFIG_ENV_MIN_ENTRIES
-CONFIG_ENV_OFFSET_OOB
 CONFIG_ENV_RANGE
 CONFIG_ENV_REFLASH
 CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
@@ -260,34 +162,25 @@ CONFIG_ENV_SETTINGS_NAND_V1
 CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
-CONFIG_ENV_SIZE_FLEX
 CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ENV_VERSION
-CONFIG_EPH_POWER_EN
-CONFIG_EPOLL
 CONFIG_ESBC_ADDR_64BIT
 CONFIG_ESBC_HDR_LS
-CONFIG_ESDHC_DETECT_8_BIT_QUIRK
 CONFIG_ESDHC_DETECT_QUIRK
 CONFIG_ESDHC_HC_BLK_ADDR
 CONFIG_ESPRESSO7420
 CONFIG_ET1100_BASE
-CONFIG_ETHADDR
 CONFIG_ETHBASE
 CONFIG_ETHPRIME
-CONFIG_ETH_BUFSIZE
-CONFIG_ETH_RXSIZE
 CONFIG_EXTRA_CLOCK
 CONFIG_EXTRA_ENV
 CONFIG_EXTRA_ENV_SETTINGS
 CONFIG_EXTRA_ENV_SETTINGS_COMMON
-CONFIG_EXT_AHB2AHB_BASE
 CONFIG_EXT_AHBAPBBRG_BASE
 CONFIG_EXT_AHBPCIBRG_BASE
 CONFIG_EXT_AHBSLAVE01_BASE
 CONFIG_EXT_AHBSLAVE02_BASE
-CONFIG_EXT_PHY
 CONFIG_EXT_USB_HOST_BASE
 CONFIG_EXYNOS4
 CONFIG_EXYNOS4210
@@ -304,27 +197,14 @@ CONFIG_EXYNOS_SPL
 CONFIG_EXYNOS_TMU
 CONFIG_FACTORYSET
 CONFIG_FB_ADDR
-CONFIG_FB_BACKLIGHT
-CONFIG_FB_DEFERRED_IO
 CONFIG_FDTADDR
 CONFIG_FDTFILE
-CONFIG_FEATURE_CLEAN_UP
-CONFIG_FEATURE_COMMAND_EDITING
-CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
-CONFIG_FEATURE_SH_EXTRA_QUIET
-CONFIG_FEATURE_SH_FANCY_PROMPT
-CONFIG_FEATURE_SH_STANDALONE_SHELL
 CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
-CONFIG_FEC_MXC_25M_REF_CLK
 CONFIG_FEC_MXC_PHYADDR
-CONFIG_FEC_MXC_SWAP_PACKET
 CONFIG_FEC_XCV_TYPE
 CONFIG_FEROCEON
 CONFIG_FEROCEON_88FR131
-CONFIG_FILE
-CONFIG_FIXED_PHY
-CONFIG_FIXED_PHY_ADDR
 CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_CFI_LEGACY
@@ -334,16 +214,13 @@ CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
-CONFIG_FORCE_DDR_DATA_BUS_WIDTH_32
 CONFIG_FORMIKE
 CONFIG_FPGA_COUNT
-CONFIG_FPGA_DELAY
 CONFIG_FPGA_STRATIX_V
 CONFIG_FSL_CADMUS
 CONFIG_FSL_CORENET
 CONFIG_FSL_CPLD
 CONFIG_FSL_DCU_SII9022A
-CONFIG_FSL_DEEP_SLEEP
 CONFIG_FSL_DEVICE_DISABLE
 CONFIG_FSL_DIU_CH7301
 CONFIG_FSL_DIU_FB
@@ -351,8 +228,6 @@ CONFIG_FSL_DSPI1
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FIXED_MMC_LOCATION
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
-CONFIG_FSL_I2C_CUSTOM_DFSR
-CONFIG_FSL_I2C_CUSTOM_FDR
 CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_LBC
@@ -364,35 +239,25 @@ CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_QIXIS
-CONFIG_FSL_QIXIS_CLOCK_MEASUREMENT
 CONFIG_FSL_SATA_V2
 CONFIG_FSL_SDHC_V2_3
-CONFIG_FSL_SDRAM_TYPE
 CONFIG_FSL_SERDES
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_FSL_SGMII_RISER
-CONFIG_FSL_TBCLK_EXTRA_DIV
-CONFIG_FSL_TRUST_ARCH_v1
-CONFIG_FSNOTIFY
-CONFIG_FS_POSIX_ACL
 CONFIG_FTAHBC020S
 CONFIG_FTAHBC020S_BASE
 CONFIG_FTAPBBRG020S_01_BASE
 CONFIG_FTCFC010_BASE
 CONFIG_FTDMAC020_BASE
-CONFIG_FTGMAC100_BASE
 CONFIG_FTGPIO010_BASE
-CONFIG_FTIDE020S_BASE
 CONFIG_FTIIC010_BASE
 CONFIG_FTINTC010_BASE
 CONFIG_FTLCDC100_BASE
 CONFIG_FTMAC100_BASE
-CONFIG_FTMAC110_BASE
 CONFIG_FTPMU010
 CONFIG_FTPMU010_BASE
 CONFIG_FTPMU010_POWER
-CONFIG_FTPWM010_BASE
 CONFIG_FTRTC010_BASE
 CONFIG_FTRTC010_EXTCLK
 CONFIG_FTRTC010_PCLK
@@ -403,22 +268,15 @@ CONFIG_FTSMC020_BASE
 CONFIG_FTSSP010_01_BASE
 CONFIG_FTSSP010_02_BASE
 CONFIG_FTTMR010_BASE
-CONFIG_FTTMR010_EXT_CLK
 CONFIG_FTUART010_01_BASE
 CONFIG_FTUART010_02_BASE
 CONFIG_FTUART010_03_BASE
 CONFIG_FTWDT010_BASE
 CONFIG_FTWDT010_WATCHDOG
-CONFIG_FZOTG266HD0A_BASE
 CONFIG_GATEWAYIP
-CONFIG_GLOBAL_DATA_NOT_REG10
 CONFIG_GLOBAL_TIMER
 CONFIG_GMII
-CONFIG_GPCNTRL
-CONFIG_GPIO_LED_INVERTED_TABLE
-CONFIG_GPIO_LED_STUBS
 CONFIG_GREEN_LED
-CONFIG_GURNARD_FPGA
 CONFIG_GURNARD_SPLASH
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
@@ -435,7 +293,6 @@ CONFIG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HETROGENOUS_CLUSTERS
 CONFIG_HIDE_LOGO_VERSION
 CONFIG_HIKEY_GPIO
-CONFIG_HITACHI_SX14
 CONFIG_HOSTNAME
 CONFIG_HPS_ALTERAGRP_DBGATCLK
 CONFIG_HPS_ALTERAGRP_MAINCLK
@@ -585,43 +442,27 @@ CONFIG_HWCONFIG
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_GSC
-CONFIG_I2C_MBB_TIMEOUT
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
 CONFIG_I2C_MVTWSI_BASE
 CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
-CONFIG_I2C_MVTWSI_BASE2
-CONFIG_I2C_MVTWSI_BASE3
-CONFIG_I2C_MVTWSI_BASE4
-CONFIG_I2C_MVTWSI_BASE5
-CONFIG_I2C_REPEATED_START
 CONFIG_I2C_RTC_ADDR
-CONFIG_I2C_TIMEOUT
 CONFIG_ICACHE
 CONFIG_ICS307_REFCLK_HZ
 CONFIG_IDE_PREINIT
 CONFIG_IDE_RESET
-CONFIG_IMA
 CONFIG_IMX
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IMX_HDMI
 CONFIG_IMX_VIDEO_SKIP
 CONFIG_INETSPACE_V2
-CONFIG_INI_ALLOW_MULTILINE
-CONFIG_INI_CASE_INSENSITIVE
-CONFIG_INI_MAX_LINE
-CONFIG_INI_MAX_NAME
-CONFIG_INI_MAX_SECTION
-CONFIG_INTEGRITY
 CONFIG_INTERRUPTS
 CONFIG_IODELAY_RECALIBRATION
 CONFIG_IOMUX_LPSR
 CONFIG_IOMUX_SHARE_CONF_REG
-CONFIG_IOS
 CONFIG_IO_TRACE
 CONFIG_IPADDR
-CONFIG_IPROC
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
@@ -633,9 +474,7 @@ CONFIG_JFFS2_LZO
 CONFIG_JFFS2_NAND
 CONFIG_JFFS2_PART_OFFSET
 CONFIG_JFFS2_PART_SIZE
-CONFIG_JFFS2_SUMMARY
 CONFIG_JRSTARTR_JR0
-CONFIG_JTAG_CONSOLE
 CONFIG_KEEP_SERVERADDR
 CONFIG_KEY_REVOCATION
 CONFIG_KIRKWOOD_EGIGA_INIT
@@ -680,18 +519,14 @@ CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
-CONFIG_KVM_GUEST
 CONFIG_KW88F6192
 CONFIG_KW88F6281
 CONFIG_KW88F6702
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
-CONFIG_LAN91C96_USE_32_BIT
 CONFIG_LAYERSCAPE_NS_ACCESS
 CONFIG_LBA48
-CONFIG_LBDAF
 CONFIG_LCD_ALIGNMENT
-CONFIG_LCD_BMP_RLE8
 CONFIG_LCD_INFO
 CONFIG_LCD_INFO_BELOW_LOGO
 CONFIG_LCD_IN_PSRAM
@@ -700,14 +535,10 @@ CONFIG_LCD_MENU
 CONFIG_LD9040
 CONFIG_LEGACY
 CONFIG_LEGACY_BOOTCMD_ENV
-CONFIG_LITTLETON_LCD
-CONFIG_LMS283GF05
 CONFIG_LOADS_ECHO
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
-CONFIG_LOW_MCFCLK
 CONFIG_LPC32XX_ETH
-CONFIG_LPC32XX_ETH_BUFS_BASE
 CONFIG_LPC32XX_HSUART
 CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
 CONFIG_LPC32XX_NAND_MLC_NAND_TA
@@ -724,90 +555,41 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_LPC_BASE
-CONFIG_LPC_IO_BASE
 CONFIG_LPUART
 CONFIG_LPUART_32B_REG
-CONFIG_LQ038J7DH53
 CONFIG_LS102XA_STREAM_ID
 CONFIG_LSCHLV2
 CONFIG_LSXHL
-CONFIG_M41T94_SPI_CS
-CONFIG_M520x
-CONFIG_M5301x
 CONFIG_MACB_SEARCH_PHY
-CONFIG_MACRESET_TIMEOUT
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
-CONFIG_MARCO_MEMSET
-CONFIG_MASK_AER_AO
 CONFIG_MAX_DSP_CPUS
-CONFIG_MAX_FPGA_DEVICES
 CONFIG_MAX_MEM_MAPPED
-CONFIG_MAX_PKT
 CONFIG_MAX_RAM_BANK_SIZE
-CONFIG_MCF5249
-CONFIG_MCF5253
 CONFIG_MCFRTC
 CONFIG_MCFTMR
-CONFIG_MDIO_TIMEOUT
 CONFIG_MEMSIZE_IN_BYTES
-CONFIG_MEM_HOLE_16M
 CONFIG_MEM_INIT_VALUE
 CONFIG_MEM_REMAP
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MII_DEFAULT_TSEC
 CONFIG_MII_INIT
-CONFIG_MIPS_HUGE_TLB_SUPPORT
-CONFIG_MIPS_MT_FPAFF
 CONFIG_MISC_COMMON
-CONFIG_MIU_1BIT_INTERLEAVED
 CONFIG_MIU_2BIT_21_7_INTERLEAVED
 CONFIG_MIU_2BIT_INTERLEAVED
-CONFIG_MIU_LINEAR
 CONFIG_MMCROOT
 CONFIG_MMC_DEFAULT_DEV
-CONFIG_MMC_RPMB_TRACE
 CONFIG_MMC_SUNXI_SLOT
-CONFIG_MMU
 CONFIG_MONITOR_IS_IN_RAM
-CONFIG_MPC83XX_GPIO_0_INIT_DIRECTION
-CONFIG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN
-CONFIG_MPC83XX_GPIO_0_INIT_VALUE
-CONFIG_MPC83XX_GPIO_1_INIT_DIRECTION
-CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN
-CONFIG_MPC83XX_GPIO_1_INIT_VALUE
 CONFIG_MPC85XX_FEC
 CONFIG_MPC85XX_FEC_NAME
-CONFIG_MPC8xxx_DISABLE_BPTR
 CONFIG_MTD_CONCAT
-CONFIG_MTD_NAND_MUSEUM_IDS
 CONFIG_MTD_NAND_VERIFY_WRITE
-CONFIG_MTD_ONENAND_VERIFY_WRITE
 CONFIG_MTD_PARTITION
-CONFIG_MTD_UBI_BEB_RESERVE
-CONFIG_MTD_UBI_BLOCK
-CONFIG_MTD_UBI_DEBUG
-CONFIG_MTD_UBI_DEBUG_MSG
-CONFIG_MTD_UBI_DEBUG_MSG_BLD
-CONFIG_MTD_UBI_DEBUG_MSG_EBA
-CONFIG_MTD_UBI_DEBUG_MSG_IO
-CONFIG_MTD_UBI_DEBUG_MSG_WL
-CONFIG_MTD_UBI_DEBUG_PARANOID
-CONFIG_MTD_UBI_GLUEBI
-CONFIG_MTD_UBI_MODULE
-CONFIG_MULTI_CS
 CONFIG_MVGBE_PORTS
-CONFIG_MVMFP_V2
 CONFIG_MVS
-CONFIG_MV_ETH_RXQ
-CONFIG_MV_I2C_NUM
-CONFIG_MV_I2C_REG
 CONFIG_MX27
 CONFIG_MX27_CLK32
-CONFIG_MX27_TIMER_HIGH_PRECISION
-CONFIG_MX28_FEC_MAC_IN_OCOTP
-CONFIG_MXC_EPDC
 CONFIG_MXC_GPT_HCLK
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
@@ -820,60 +602,36 @@ CONFIG_MXS
 CONFIG_MXS_AUART
 CONFIG_MXS_AUART_BASE
 CONFIG_MXS_OCOTP
-CONFIG_MY_OPTION
 CONFIG_NANDFLASH_SIZE
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
-CONFIG_NAND_DATA_REG
 CONFIG_NAND_ECC_BCH
-CONFIG_NAND_ENV_DST
 CONFIG_NAND_KIRKWOOD
 CONFIG_NAND_KMETER1
-CONFIG_NAND_MODE_REG
 CONFIG_NAND_OMAP_GPMC_WSCFG
 CONFIG_NAND_SECBOOT
 CONFIG_NAND_SPL
-CONFIG_NAND_U_BOOT
-CONFIG_NATSEMI
-CONFIG_NCEL2C100_BASE
-CONFIG_NCEMIC100_BASE
-CONFIG_NDS_DLM1_BASE
-CONFIG_NDS_DLM2_BASE
-CONFIG_NEO
 CONFIG_NET2BIG_V2
-CONFIG_NETCONSOLE_BUFFER_SIZE
 CONFIG_NETDEV
 CONFIG_NETMASK
 CONFIG_NETSPACE_LITE_V2
 CONFIG_NETSPACE_MAX_V2
 CONFIG_NETSPACE_MINI_V2
 CONFIG_NETSPACE_V2
-CONFIG_NET_MULTI
 CONFIG_NET_RETRY_COUNT
 CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NFS_TIMEOUT
 CONFIG_NOBQFMAN
-CONFIG_NON_SECURE
 CONFIG_NORBOOT
 CONFIG_NORFLASH_PS32BIT
-CONFIG_NO_ETH
-CONFIG_NO_WAIT
 CONFIG_NS16550_MIN_FUNCTIONS
-CONFIG_NS8382X
 CONFIG_NUM_DSP_CPUS
-CONFIG_NUM_PAMU
 CONFIG_ODROID_REV_AIN
-CONFIG_OFF_PADCONF
 CONFIG_ORIGEN
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
-CONFIG_PALMAS_AUDPWR
 CONFIG_PALMAS_POWER
-CONFIG_PALMAS_SMPS7_FPWM
-CONFIG_PALMAS_USB_SS_PWR
-CONFIG_PARAVIRT
 CONFIG_PCA953X
-CONFIG_PCA9698
 CONFIG_PCI1
 CONFIG_PCI2
 CONFIG_PCIE
@@ -884,11 +642,8 @@ CONFIG_PCIE4
 CONFIG_PCIE_IMX
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
-CONFIG_PCI_BOOTDELAY
 CONFIG_PCI_CLK_FREQ
 CONFIG_PCI_CONFIG_HOST_BRIDGE
-CONFIG_PCI_EHCI_DEVICE
-CONFIG_PCI_EHCI_DEVNO
 CONFIG_PCI_GT64120
 CONFIG_PCI_IO_BUS
 CONFIG_PCI_IO_PHYS
@@ -899,14 +654,10 @@ CONFIG_PCI_MEM_SIZE
 CONFIG_PCI_MSC01
 CONFIG_PCI_NOSCAN
 CONFIG_PCI_OHCI
-CONFIG_PCI_OHCI_DEVNO
 CONFIG_PCI_PREF_BUS
 CONFIG_PCI_PREF_PHYS
 CONFIG_PCI_PREF_SIZE
 CONFIG_PCI_SCAN_SHOW
-CONFIG_PCI_SYS_BUS
-CONFIG_PCI_SYS_PHYS
-CONFIG_PCI_SYS_SIZE
 CONFIG_PEN_ADDR_BIG_ENDIAN
 CONFIG_PHYSMEM
 CONFIG_PHY_BASE_ADR
@@ -914,11 +665,8 @@ CONFIG_PHY_ET1011C_TX_CLK_FIX
 CONFIG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
-CONFIG_PHY_MODE_NEED_CHANGE
 CONFIG_PHY_RESET_DELAY
-CONFIG_PIXIS_SGMII_CMD
 CONFIG_PL011_CLOCK
-CONFIG_PL011_SERIAL_RLCR
 CONFIG_PL01x_PORTS
 CONFIG_PM
 CONFIG_PMC_BR_PRELIM
@@ -926,24 +674,15 @@ CONFIG_PMC_OR_PRELIM
 CONFIG_PME_PLAT_CLK_DIV
 CONFIG_PMU
 CONFIG_PMW_BASE
-CONFIG_PM_SLEEP
 CONFIG_POST
 CONFIG_POSTBOOTMENU
-CONFIG_POST_BSPEC1
-CONFIG_POST_BSPEC2
-CONFIG_POST_BSPEC3
-CONFIG_POST_BSPEC4
-CONFIG_POST_BSPEC5
 CONFIG_POST_EXTERNAL_WORD_FUNCS
 CONFIG_POST_SKIP_ENV_FLAGS
-CONFIG_POST_UART
-CONFIG_POST_WATCHDOG
 CONFIG_POWER_FSL
 CONFIG_POWER_FSL_MC13892
 CONFIG_POWER_HI6553
 CONFIG_POWER_LTC3676
 CONFIG_POWER_LTC3676_I2C_ADDR
-CONFIG_POWER_MAX77696_I2C_ADDR
 CONFIG_POWER_PFUZE100
 CONFIG_POWER_PFUZE100_I2C_ADDR
 CONFIG_POWER_PFUZE3000
@@ -954,25 +693,18 @@ CONFIG_POWER_TPS65090_EC
 CONFIG_POWER_TPS65217
 CONFIG_POWER_TPS65218
 CONFIG_POWER_TPS65910
-CONFIG_PPC64BRIDGE
 CONFIG_PPC_CLUSTER_START
 CONFIG_PPC_SPINTABLE_COMPATIBLE
 CONFIG_PRAM
-CONFIG_PRINTK
-CONFIG_PROC_FS
-CONFIG_PROFILE_ALL_BRANCHES
-CONFIG_PROFILING
 CONFIG_PSRAM_SCFG
 CONFIG_PWM
 CONFIG_PXA_LCD
 CONFIG_PXA_PWR_I2C
 CONFIG_PXA_STD_I2C
 CONFIG_PXA_VGA
-CONFIG_PXA_VIDEO
 CONFIG_QBMAN_CLK_DIV
 CONFIG_QIXIS_I2C_ACCESS
 CONFIG_QSPI
-CONFIG_QUOTA
 CONFIG_RAMBOOT_NAND
 CONFIG_RAMBOOT_SPIFLASH
 CONFIG_RAMBOOT_TEXT_BASE
@@ -980,11 +712,8 @@ CONFIG_RAMDISKFILE
 CONFIG_RAMDISK_ADDR
 CONFIG_RAMDISK_BOOT
 CONFIG_RD_LVL
-CONFIG_REALMODE_DEBUG
 CONFIG_RED_LED
-CONFIG_REG
 CONFIG_REMAKE_ELF
-CONFIG_REQ
 CONFIG_RESERVED_01_BASE
 CONFIG_RESERVED_02_BASE
 CONFIG_RESERVED_03_BASE
@@ -995,50 +724,29 @@ CONFIG_RESET_VECTOR_ADDRESS
 CONFIG_RESTORE_FLASH
 CONFIG_RES_BLOCK_SIZE
 CONFIG_RMII
-CONFIG_RMSTP0_ENA
-CONFIG_RMSTP10_ENA
-CONFIG_RMSTP11_ENA
-CONFIG_RMSTP1_ENA
-CONFIG_RMSTP2_ENA
-CONFIG_RMSTP3_ENA
-CONFIG_RMSTP4_ENA
-CONFIG_RMSTP5_ENA
-CONFIG_RMSTP6_ENA
-CONFIG_RMSTP7_ENA
-CONFIG_RMSTP8_ENA
-CONFIG_RMSTP9_ENA
 CONFIG_ROCKCHIP_CHIP_TAG
 CONFIG_ROCKCHIP_MAX_INIT_SIZE
 CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
 CONFIG_ROCKCHIP_STIMER_BASE
-CONFIG_ROM_STUBS
 CONFIG_ROOTPATH
 CONFIG_RTC_DS1337
 CONFIG_RTC_DS1337_NOOSC
 CONFIG_RTC_DS1338
-CONFIG_RTC_DS1339_TCR_VAL
 CONFIG_RTC_DS1374
-CONFIG_RTC_DS1388
-CONFIG_RTC_DS1388_TCR_VAL
 CONFIG_RTC_DS3231
 CONFIG_RTC_FTRTC010
-CONFIG_RTC_M41T11
 CONFIG_RTC_MC13XXX
 CONFIG_RTC_MCFRRTC
-CONFIG_RTC_MCP79411
 CONFIG_RTC_MXS
 CONFIG_RTC_PT7C4338
-CONFIG_RX_DESCR_NUM
 CONFIG_S5P
 CONFIG_S5PC100
 CONFIG_S5PC110
 CONFIG_S5P_PA_SYSRAM
-CONFIG_S6E8AX0
 CONFIG_SAMA5D3_LCD_BASE
 CONFIG_SAMSUNG
 CONFIG_SAMSUNG_ONENAND
 CONFIG_SANDBOX_ARCH
-CONFIG_SANDBOX_BIG_ENDIAN
 CONFIG_SANDBOX_SDL
 CONFIG_SANDBOX_SPI_MAX_BUS
 CONFIG_SANDBOX_SPI_MAX_CS
@@ -1046,10 +754,7 @@ CONFIG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
-CONFIG_SATA_ULI5288
-CONFIG_SCF0403_LCD
 CONFIG_SCIF_A
-CONFIG_SCIF_USE_EXT_CLK
 CONFIG_SCSI_AHCI_PLAT
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
@@ -1057,25 +762,17 @@ CONFIG_SDCARD
 CONFIG_SDRAM_OFFSET_FOR_RT
 CONFIG_SECBOOT
 CONFIG_SECURE_BL1_ONLY
-CONFIG_SECURE_RUNTIME_RESV_SRAM_SZ
-CONFIG_SECURITY
 CONFIG_SEC_FW_SIZE
 CONFIG_SERIAL_BOOT
 CONFIG_SERIAL_FLASH
-CONFIG_SERIAL_HW_FLOW_CONTROL
 CONFIG_SERIAL_SOFTWARE_FIFO
-CONFIG_SERIRQ_CONTINUOUS_MODE
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
 CONFIG_SET_BOOTARGS
 CONFIG_SET_DFU_ALT_BUF_LEN
-CONFIG_SGI_IP28
 CONFIG_SH73A0
 CONFIG_SH7751_PCI
-CONFIG_SHARP_LM8V31
 CONFIG_SHEEVA_88SV131
-CONFIG_SH_CMT_CLK_FREQ
-CONFIG_SH_DSP
 CONFIG_SH_ETHER_ALIGNE_SIZE
 CONFIG_SH_ETHER_BASE_ADDR
 CONFIG_SH_ETHER_CACHE_INVALIDATE
@@ -1085,49 +782,28 @@ CONFIG_SH_ETHER_PHY_MODE
 CONFIG_SH_ETHER_SH7734_MII
 CONFIG_SH_ETHER_USE_PORT
 CONFIG_SH_GPIO_PFC
-CONFIG_SH_MMCIF_CLK
 CONFIG_SH_QSPI_BASE
 CONFIG_SH_SCIF_CLK_FREQ
-CONFIG_SH_SDHI_FREQ
-CONFIG_SH_SDRAM_OFFSET
 CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
 CONFIG_SKIP_TRUNOFF_WATCHDOG
 CONFIG_SLIC
-CONFIG_SLTTMR
 CONFIG_SMC91111
 CONFIG_SMC91111_BASE
 CONFIG_SMC91111_EXT_PHY
-CONFIG_SMC_AUTONEG_TIMEOUT
 CONFIG_SMC_USE_32_BIT
-CONFIG_SMC_USE_IOFUNCS
 CONFIG_SMDK5420
 CONFIG_SMP_PEN_ADDR
 CONFIG_SMSC_LPC47M
 CONFIG_SMSC_SIO1007
-CONFIG_SMSTP0_ENA
-CONFIG_SMSTP10_ENA
-CONFIG_SMSTP11_ENA
-CONFIG_SMSTP1_ENA
-CONFIG_SMSTP2_ENA
-CONFIG_SMSTP3_ENA
-CONFIG_SMSTP4_ENA
-CONFIG_SMSTP5_ENA
-CONFIG_SMSTP6_ENA
-CONFIG_SMSTP7_ENA
-CONFIG_SMSTP8_ENA
-CONFIG_SMSTP9_ENA
 CONFIG_SOCRATES
-CONFIG_SOC_OMAP3430
 CONFIG_SOFT_I2C_READ_REPEATED_START
 CONFIG_SPD_EEPROM
 CONFIG_SPIFLASH
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
-CONFIG_SPI_DATAFLASH_WRITE_VERIFY
 CONFIG_SPI_FLASH_QUAD
 CONFIG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
-CONFIG_SPI_IDLE_VAL
 CONFIG_SPI_N25Q256A_RESET
 CONFIG_SPL_ATMEL_SIZE
 CONFIG_SPL_BOARD_LOAD_IMAGE
@@ -1138,29 +814,21 @@ CONFIG_SPL_BSS_START_ADDR
 CONFIG_SPL_CMT
 CONFIG_SPL_CMT_DEBUG
 CONFIG_SPL_COMMON_INIT_DDR
-CONFIG_SPL_CONSOLE
-CONFIG_SPL_ETH_DEVICE
 CONFIG_SPL_FLUSH_IMAGE
 CONFIG_SPL_FS_LOAD_ARGS_NAME
 CONFIG_SPL_FS_LOAD_KERNEL_NAME
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
 CONFIG_SPL_GD_ADDR
 CONFIG_SPL_INIT_MINIMAL
-CONFIG_SPL_JR0_LIODN_NS
-CONFIG_SPL_JR0_LIODN_S
 CONFIG_SPL_MAX_FOOTPRINT
-CONFIG_SPL_MAX_PEB_SIZE
 CONFIG_SPL_MAX_SIZE
-CONFIG_SPL_MXS_PSWITCH_WAIT
 CONFIG_SPL_NAND_INIT
 CONFIG_SPL_NAND_MINIMAL
 CONFIG_SPL_NAND_RAW_ONLY
 CONFIG_SPL_NAND_SOFTECC
 CONFIG_SPL_NAND_WORKSPACE
 CONFIG_SPL_PAD_TO
-CONFIG_SPL_PANIC_ON_RAW_IMAGE
 CONFIG_SPL_PBL_PAD
-CONFIG_SPL_PPAACT_ADDR
 CONFIG_SPL_RELOC_MALLOC_ADDR
 CONFIG_SPL_RELOC_MALLOC_SIZE
 CONFIG_SPL_RELOC_STACK
@@ -1168,14 +836,12 @@ CONFIG_SPL_RELOC_TEXT_BASE
 CONFIG_SPL_SATA_BOOT_DEVICE
 CONFIG_SPL_SIZE
 CONFIG_SPL_SKIP_RELOCATE
-CONFIG_SPL_SPAACT_ADDR
 CONFIG_SPL_SPI_FLASH_MINIMAL
 CONFIG_SPL_STACK
 CONFIG_SPL_STACK_ADDR
 CONFIG_SPL_STACK_SIZE
 CONFIG_SPL_START_S_PATH
 CONFIG_SPL_TARGET
-CONFIG_SPL_UBOOT_KEY_HASH
 CONFIG_SRAM_BASE
 CONFIG_SRAM_SIZE
 CONFIG_SRIO1
@@ -1191,28 +857,19 @@ CONFIG_SRIO_PCIE_BOOT_SLAVE
 CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_BUS
 CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_PHYS
 CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZE
-CONFIG_SSE2
 CONFIG_STACKBASE
 CONFIG_STANDALONE_LOAD_ADDR
-CONFIG_STATIC_BOARD_REV
 CONFIG_STD_DEVICES_SETTINGS
-CONFIG_SXNI855T
-CONFIG_SYSFS
-CONFIG_SYSMGR_ISWGRP_HANDOFF
 CONFIG_SYS_64BIT
 CONFIG_SYS_64BIT_LBA
 CONFIG_SYS_83XX_DDR_USES_CS0
-CONFIG_SYS_ADDRESS_MAP_A
 CONFIG_SYS_AMASK0
-CONFIG_SYS_AMASK0_FINAL
 CONFIG_SYS_AMASK1
 CONFIG_SYS_AMASK1_FINAL
 CONFIG_SYS_AMASK2
 CONFIG_SYS_AMASK2_FINAL
 CONFIG_SYS_AMASK3
-CONFIG_SYS_AMASK3_FINAL
 CONFIG_SYS_AMASK4
-CONFIG_SYS_AMASK5
 CONFIG_SYS_AMASK6
 CONFIG_SYS_AMASK7
 CONFIG_SYS_AT91_MAIN_CLOCK
@@ -1226,7 +883,6 @@ CONFIG_SYS_ATA_IDE0_OFFSET
 CONFIG_SYS_ATA_IDE1_OFFSET
 CONFIG_SYS_ATA_REG_OFFSET
 CONFIG_SYS_ATA_STRIDE
-CONFIG_SYS_ATMEL_CPU_NAME
 CONFIG_SYS_AUTOLOAD
 CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
 CONFIG_SYS_AUXCORE_BOOTDATA
@@ -1235,8 +891,6 @@ CONFIG_SYS_BAUDRATE_TABLE
 CONFIG_SYS_BCSR
 CONFIG_SYS_BFTIC3_BASE
 CONFIG_SYS_BFTIC3_SIZE
-CONFIG_SYS_BITBANG_PHY_PORT
-CONFIG_SYS_BITBANG_PHY_PORTS
 CONFIG_SYS_BMAN_CENA_BASE
 CONFIG_SYS_BMAN_CENA_SIZE
 CONFIG_SYS_BMAN_CINH_BASE
@@ -1248,11 +902,9 @@ CONFIG_SYS_BMAN_NUM_PORTALS
 CONFIG_SYS_BMAN_SP_CENA_SIZE
 CONFIG_SYS_BMAN_SP_CINH_SIZE
 CONFIG_SYS_BMAN_SWP_ISDR_REG
-CONFIG_SYS_BOARD_NAME
 CONFIG_SYS_BOOK3E_HV
 CONFIG_SYS_BOOTCOUNT_BE
 CONFIG_SYS_BOOTCOUNT_LE
-CONFIG_SYS_BOOTFILE_PREFIX
 CONFIG_SYS_BOOTMAPSZ
 CONFIG_SYS_BOOTM_LEN
 CONFIG_SYS_BOOTPARAMS_LEN
@@ -1261,15 +913,9 @@ CONFIG_SYS_BOOT_RAMDISK_HIGH
 CONFIG_SYS_CACHE_ACR0
 CONFIG_SYS_CACHE_ACR1
 CONFIG_SYS_CACHE_ACR2
-CONFIG_SYS_CACHE_ACR3
-CONFIG_SYS_CACHE_ACR4
-CONFIG_SYS_CACHE_ACR5
-CONFIG_SYS_CACHE_ACR6
-CONFIG_SYS_CACHE_ACR7
 CONFIG_SYS_CACHE_DCACR
 CONFIG_SYS_CACHE_ICACR
 CONFIG_SYS_CACHE_STASHING
-CONFIG_SYS_CADMUS_BASE_REG
 CONFIG_SYS_CBSIZE
 CONFIG_SYS_CCCR
 CONFIG_SYS_CCSRBAR
@@ -1277,20 +923,10 @@ CONFIG_SYS_CCSRBAR_PHYS
 CONFIG_SYS_CCSRBAR_PHYS_HIGH
 CONFIG_SYS_CCSRBAR_PHYS_LOW
 CONFIG_SYS_CCSR_DO_NOT_RELOCATE
-CONFIG_SYS_CFI_FLASH_CONFIG_REGS
 CONFIG_SYS_CFI_FLASH_STATUS_POLL
-CONFIG_SYS_CF_INTC_REG1
-CONFIG_SYS_CH7301_I2C
 CONFIG_SYS_CKEN
 CONFIG_SYS_CLK
 CONFIG_SYS_CLKTL_CBCDR
-CONFIG_SYS_CLK_FREQ_C100
-CONFIG_SYS_CLK_FREQ_C110
-CONFIG_SYS_CMD_CONFIGURE
-CONFIG_SYS_CMD_EL
-CONFIG_SYS_CMD_IAS
-CONFIG_SYS_CMD_INT
-CONFIG_SYS_CMD_SUSPEND
 CONFIG_SYS_CORE_SRAM
 CONFIG_SYS_CORE_SRAM_SIZE
 CONFIG_SYS_CPC_REINIT_F
@@ -1305,7 +941,6 @@ CONFIG_SYS_CPLD_FTIM1
 CONFIG_SYS_CPLD_FTIM2
 CONFIG_SYS_CPLD_FTIM3
 CONFIG_SYS_CPLD_SIZE
-CONFIG_SYS_CPM_INTERRUPT
 CONFIG_SYS_CPRI
 CONFIG_SYS_CPRI_CLK
 CONFIG_SYS_CPUSPEED
@@ -1339,50 +974,25 @@ CONFIG_SYS_CS3_FTIM1
 CONFIG_SYS_CS3_FTIM2
 CONFIG_SYS_CS3_FTIM3
 CONFIG_SYS_CS3_MASK
-CONFIG_SYS_CS4_BASE
-CONFIG_SYS_CS4_CTRL
 CONFIG_SYS_CS4_FTIM0
 CONFIG_SYS_CS4_FTIM1
 CONFIG_SYS_CS4_FTIM2
 CONFIG_SYS_CS4_FTIM3
-CONFIG_SYS_CS4_MASK
-CONFIG_SYS_CS5_BASE
-CONFIG_SYS_CS5_CTRL
-CONFIG_SYS_CS5_FTIM0
-CONFIG_SYS_CS5_FTIM1
-CONFIG_SYS_CS5_FTIM2
-CONFIG_SYS_CS5_FTIM3
-CONFIG_SYS_CS5_MASK
-CONFIG_SYS_CS6_BASE
-CONFIG_SYS_CS6_CTRL
 CONFIG_SYS_CS6_FTIM0
 CONFIG_SYS_CS6_FTIM1
 CONFIG_SYS_CS6_FTIM2
 CONFIG_SYS_CS6_FTIM3
-CONFIG_SYS_CS6_MASK
-CONFIG_SYS_CS7_BASE
-CONFIG_SYS_CS7_CTRL
 CONFIG_SYS_CS7_FTIM0
 CONFIG_SYS_CS7_FTIM1
 CONFIG_SYS_CS7_FTIM2
 CONFIG_SYS_CS7_FTIM3
-CONFIG_SYS_CS7_MASK
 CONFIG_SYS_CSOR0
-CONFIG_SYS_CSOR0_EXT
 CONFIG_SYS_CSOR1
-CONFIG_SYS_CSOR1_EXT
 CONFIG_SYS_CSOR2
-CONFIG_SYS_CSOR2_EXT
 CONFIG_SYS_CSOR3
-CONFIG_SYS_CSOR3_EXT
 CONFIG_SYS_CSOR4
-CONFIG_SYS_CSOR4_EXT
-CONFIG_SYS_CSOR5
-CONFIG_SYS_CSOR5_EXT
 CONFIG_SYS_CSOR6
-CONFIG_SYS_CSOR6_EXT
 CONFIG_SYS_CSOR7
-CONFIG_SYS_CSOR7_EXT
 CONFIG_SYS_CSPR0
 CONFIG_SYS_CSPR0_EXT
 CONFIG_SYS_CSPR0_FINAL
@@ -1397,8 +1007,6 @@ CONFIG_SYS_CSPR3_EXT
 CONFIG_SYS_CSPR3_FINAL
 CONFIG_SYS_CSPR4
 CONFIG_SYS_CSPR4_EXT
-CONFIG_SYS_CSPR5
-CONFIG_SYS_CSPR5_EXT
 CONFIG_SYS_CSPR6
 CONFIG_SYS_CSPR6_EXT
 CONFIG_SYS_CSPR7
@@ -1411,32 +1019,14 @@ CONFIG_SYS_DA850_DDR2_SDRCR
 CONFIG_SYS_DA850_DDR2_SDTIMR
 CONFIG_SYS_DA850_DDR2_SDTIMR2
 CONFIG_SYS_DA850_PLL0_PLLM
-CONFIG_SYS_DA850_PLL0_PREDIV
 CONFIG_SYS_DA850_PLL1_PLLM
 CONFIG_SYS_DA850_SYSCFG_SUSPSRC
-CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT
 CONFIG_SYS_DAVINCI_I2C_SLAVE
 CONFIG_SYS_DAVINCI_I2C_SLAVE1
 CONFIG_SYS_DAVINCI_I2C_SLAVE2
 CONFIG_SYS_DAVINCI_I2C_SPEED
 CONFIG_SYS_DAVINCI_I2C_SPEED1
 CONFIG_SYS_DAVINCI_I2C_SPEED2
-CONFIG_SYS_DBAT0L
-CONFIG_SYS_DBAT0U
-CONFIG_SYS_DBAT1L
-CONFIG_SYS_DBAT1U
-CONFIG_SYS_DBAT2L
-CONFIG_SYS_DBAT2U
-CONFIG_SYS_DBAT3L
-CONFIG_SYS_DBAT3U
-CONFIG_SYS_DBAT4L
-CONFIG_SYS_DBAT4U
-CONFIG_SYS_DBAT5L
-CONFIG_SYS_DBAT5U
-CONFIG_SYS_DBAT6L
-CONFIG_SYS_DBAT6U
-CONFIG_SYS_DBAT7L
-CONFIG_SYS_DBAT7U
 CONFIG_SYS_DCACHE_INV
 CONFIG_SYS_DCSRBAR
 CONFIG_SYS_DCSRBAR_PHYS
@@ -1444,18 +1034,8 @@ CONFIG_SYS_DCSR_COP_CCP_ADDR
 CONFIG_SYS_DCSR_DCFG_ADDR
 CONFIG_SYS_DCSR_DCFG_OFFSET
 CONFIG_SYS_DCU_ADDR
-CONFIG_SYS_DDR2_CS0_BNDS
-CONFIG_SYS_DDR2_CS0_CONFIG
-CONFIG_SYS_DDR2_CS1_BNDS
-CONFIG_SYS_DDR2_CS1_CONFIG
-CONFIG_SYS_DDR2_CS2_BNDS
-CONFIG_SYS_DDR2_CS2_CONFIG
-CONFIG_SYS_DDR2_CS3_BNDS
-CONFIG_SYS_DDR2_CS3_CONFIG
 CONFIG_SYS_DDRCDR
 CONFIG_SYS_DDRCDR_VALUE
-CONFIG_SYS_DDRD
-CONFIG_SYS_DDRTC
 CONFIG_SYS_DDRUA
 CONFIG_SYS_DDR_BLOCK1_SIZE
 CONFIG_SYS_DDR_BLOCK2_BASE
@@ -1463,52 +1043,34 @@ CONFIG_SYS_DDR_CLKSEL
 CONFIG_SYS_DDR_CLK_CNTL
 CONFIG_SYS_DDR_CLK_CONTROL
 CONFIG_SYS_DDR_CLK_CTRL
-CONFIG_SYS_DDR_CLK_CTRL_1000
-CONFIG_SYS_DDR_CLK_CTRL_1200
 CONFIG_SYS_DDR_CLK_CTRL_667
 CONFIG_SYS_DDR_CLK_CTRL_800
-CONFIG_SYS_DDR_CLK_CTRL_900
 CONFIG_SYS_DDR_CONFIG
 CONFIG_SYS_DDR_CONFIG_2
 CONFIG_SYS_DDR_CONFIG_256
 CONFIG_SYS_DDR_CONTROL
 CONFIG_SYS_DDR_CONTROL_2
-CONFIG_SYS_DDR_CPO
 CONFIG_SYS_DDR_CS0_BNDS
 CONFIG_SYS_DDR_CS0_CONFIG
 CONFIG_SYS_DDR_CS0_CONFIG_2
 CONFIG_SYS_DDR_CS1_BNDS
 CONFIG_SYS_DDR_CS1_CONFIG
 CONFIG_SYS_DDR_CS1_CONFIG_2
-CONFIG_SYS_DDR_CS2_BNDS
-CONFIG_SYS_DDR_CS2_CONFIG
-CONFIG_SYS_DDR_CS3_BNDS
-CONFIG_SYS_DDR_CS3_CONFIG
 CONFIG_SYS_DDR_DATA_INIT
 CONFIG_SYS_DDR_INIT_ADDR
 CONFIG_SYS_DDR_INIT_EXT_ADDR
 CONFIG_SYS_DDR_INTERVAL
-CONFIG_SYS_DDR_INTERVAL_1000
-CONFIG_SYS_DDR_INTERVAL_1200
 CONFIG_SYS_DDR_INTERVAL_667
 CONFIG_SYS_DDR_INTERVAL_800
-CONFIG_SYS_DDR_INTERVAL_900
 CONFIG_SYS_DDR_MODE
 CONFIG_SYS_DDR_MODE2
 CONFIG_SYS_DDR_MODE_1
-CONFIG_SYS_DDR_MODE_1_1000
-CONFIG_SYS_DDR_MODE_1_1200
 CONFIG_SYS_DDR_MODE_1_667
 CONFIG_SYS_DDR_MODE_1_800
-CONFIG_SYS_DDR_MODE_1_900
 CONFIG_SYS_DDR_MODE_2
-CONFIG_SYS_DDR_MODE_2_1000
-CONFIG_SYS_DDR_MODE_2_1200
 CONFIG_SYS_DDR_MODE_2_667
 CONFIG_SYS_DDR_MODE_2_800
-CONFIG_SYS_DDR_MODE_2_900
 CONFIG_SYS_DDR_MODE_CONTROL
-CONFIG_SYS_DDR_MODE_WEAK
 CONFIG_SYS_DDR_RAW_TIMING
 CONFIG_SYS_DDR_RCW_1
 CONFIG_SYS_DDR_RCW_2
@@ -1519,53 +1081,31 @@ CONFIG_SYS_DDR_SDRAM_CLK_CNTL
 CONFIG_SYS_DDR_SIZE
 CONFIG_SYS_DDR_SR_CNTR
 CONFIG_SYS_DDR_TIMING_0
-CONFIG_SYS_DDR_TIMING_0_1000
-CONFIG_SYS_DDR_TIMING_0_1200
 CONFIG_SYS_DDR_TIMING_0_667
 CONFIG_SYS_DDR_TIMING_0_800
-CONFIG_SYS_DDR_TIMING_0_900
 CONFIG_SYS_DDR_TIMING_1
-CONFIG_SYS_DDR_TIMING_1_1000
-CONFIG_SYS_DDR_TIMING_1_1200
 CONFIG_SYS_DDR_TIMING_1_667
 CONFIG_SYS_DDR_TIMING_1_800
-CONFIG_SYS_DDR_TIMING_1_900
 CONFIG_SYS_DDR_TIMING_2
-CONFIG_SYS_DDR_TIMING_2_1000
-CONFIG_SYS_DDR_TIMING_2_1200
 CONFIG_SYS_DDR_TIMING_2_667
 CONFIG_SYS_DDR_TIMING_2_800
-CONFIG_SYS_DDR_TIMING_2_900
 CONFIG_SYS_DDR_TIMING_3
-CONFIG_SYS_DDR_TIMING_3_1000
-CONFIG_SYS_DDR_TIMING_3_1200
 CONFIG_SYS_DDR_TIMING_3_667
 CONFIG_SYS_DDR_TIMING_3_800
-CONFIG_SYS_DDR_TIMING_3_900
 CONFIG_SYS_DDR_TIMING_4
 CONFIG_SYS_DDR_TIMING_5
-CONFIG_SYS_DDR_WRITE_DATA_DELAY
-CONFIG_SYS_DDR_WRLVL_CNTL
 CONFIG_SYS_DDR_WRLVL_CONTROL
 CONFIG_SYS_DDR_WRLVL_CONTROL_667
 CONFIG_SYS_DDR_WRLVL_CONTROL_800
-CONFIG_SYS_DDR_ZQ_CNTL
 CONFIG_SYS_DDR_ZQ_CONTROL
 CONFIG_SYS_DEBUG
 CONFIG_SYS_DEBUG_SERVER_FW_ADDR
 CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR
 CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-CONFIG_SYS_DEFAULT_VIDEO_MODE
 CONFIG_SYS_DIALOG_PMIC_I2C_ADDR
-CONFIG_SYS_DIMM_SLOTS_PER_CTLR
-CONFIG_SYS_DIRECT_FLASH_NFS
 CONFIG_SYS_DIRECT_FLASH_TFTP
 CONFIG_SYS_DISCOVER_PHY
 CONFIG_SYS_DIU_ADDR
-CONFIG_SYS_DP501_BASE
-CONFIG_SYS_DP501_DIFFERENTIAL
-CONFIG_SYS_DP501_I2C
-CONFIG_SYS_DP501_VCAPCTRL0
 CONFIG_SYS_DPAA_DCE
 CONFIG_SYS_DPAA_FMAN
 CONFIG_SYS_DPAA_PME
@@ -1575,21 +1115,15 @@ CONFIG_SYS_DP_DDR_BASE_PHY
 CONFIG_SYS_DRAM_BASE
 CONFIG_SYS_DRAM_SIZE
 CONFIG_SYS_DRAM_TEST
-CONFIG_SYS_DSPI_CS0
-CONFIG_SYS_DSPI_CS2
 CONFIG_SYS_DSPI_CTAR0
 CONFIG_SYS_DSPI_CTAR1
 CONFIG_SYS_DSPI_CTAR2
 CONFIG_SYS_DSPI_CTAR3
 CONFIG_SYS_DV_NOR_BOOT_CFG
-CONFIG_SYS_EBI_CFGR_VAL
-CONFIG_SYS_EBI_CSA_VAL
 CONFIG_SYS_EEPROM_BUS_NUM
 CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
 CONFIG_SYS_EEPROM_WREN
 CONFIG_SYS_EHCI_USB1_ADDR
-CONFIG_SYS_ELO3_DMA3
-CONFIG_SYS_EMAC_TI_CLKDIV
 CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
 CONFIG_SYS_ENET_BD_BASE
 CONFIG_SYS_ENV_ADDR
@@ -1600,22 +1134,14 @@ CONFIG_SYS_ETVPE_CLK
 CONFIG_SYS_EXCEPTION_VECTORS_HIGH
 CONFIG_SYS_FAST_CLK
 CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-CONFIG_SYS_FAULT_MII_ADDR
 CONFIG_SYS_FDT_BASE
 CONFIG_SYS_FDT_PAD
-CONFIG_SYS_FEC0_IOBASE
-CONFIG_SYS_FEC1_IOBASE
 CONFIG_SYS_FECI2C
 CONFIG_SYS_FEC_BUF_USE_SRAM
-CONFIG_SYS_FIXED_PHY_ADDR
-CONFIG_SYS_FIXED_PHY_PORT
-CONFIG_SYS_FIXED_PHY_PORTS
 CONFIG_SYS_FLASH0
 CONFIG_SYS_FLASH1
 CONFIG_SYS_FLASH1_BASE_PHYS
 CONFIG_SYS_FLASH1_BASE_PHYS_EARLY
-CONFIG_SYS_FLASHBOOT
-CONFIG_SYS_FLASH_AUTOPROTECT_LIST
 CONFIG_SYS_FLASH_BANKS_LIST
 CONFIG_SYS_FLASH_BANKS_SIZES
 CONFIG_SYS_FLASH_BASE
@@ -1624,16 +1150,11 @@ CONFIG_SYS_FLASH_BASE1
 CONFIG_SYS_FLASH_BASE_PHYS
 CONFIG_SYS_FLASH_BASE_PHYS_EARLY
 CONFIG_SYS_FLASH_BR_PRELIM
-CONFIG_SYS_FLASH_CFI_AMD_RESET
 CONFIG_SYS_FLASH_CFI_NONBLOCK
 CONFIG_SYS_FLASH_CFI_WIDTH
 CONFIG_SYS_FLASH_CHECKSUM
-CONFIG_SYS_FLASH_CHECK_BLANK_BEFORE_ERASE
 CONFIG_SYS_FLASH_EMPTY_INFO
 CONFIG_SYS_FLASH_ERASE_TOUT
-CONFIG_SYS_FLASH_LEGACY_256Kx8
-CONFIG_SYS_FLASH_LEGACY_512Kx16
-CONFIG_SYS_FLASH_LEGACY_512Kx8
 CONFIG_SYS_FLASH_LOCK_TOUT
 CONFIG_SYS_FLASH_OR_PRELIM
 CONFIG_SYS_FLASH_PARMSECT_SZ
@@ -1642,12 +1163,10 @@ CONFIG_SYS_FLASH_SECT_SIZE
 CONFIG_SYS_FLASH_SECT_SZ
 CONFIG_SYS_FLASH_SIZE
 CONFIG_SYS_FLASH_UNLOCK_TOUT
-CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE
 CONFIG_SYS_FLASH_WRITE_TOUT
 CONFIG_SYS_FLYCNFG_VAL
 CONFIG_SYS_FM1_10GEC1_PHY_ADDR
 CONFIG_SYS_FM1_CLK
-CONFIG_SYS_FM1_DTSEC1_MDIO_ADDR
 CONFIG_SYS_FM1_DTSEC1_PHY_ADDR
 CONFIG_SYS_FM1_DTSEC1_RISER_PHY_ADDR
 CONFIG_SYS_FM1_DTSEC2_PHY_ADDR
@@ -1657,34 +1176,16 @@ CONFIG_SYS_FM1_DTSEC3_RISER_PHY_ADDR
 CONFIG_SYS_FM1_DTSEC4_PHY_ADDR
 CONFIG_SYS_FM1_DTSEC4_RISER_PHY_ADDR
 CONFIG_SYS_FM1_DTSEC5_PHY_ADDR
-CONFIG_SYS_FM1_DTSEC_MDIO_ADDR
 CONFIG_SYS_FM1_QSGMII11_PHY_ADDR
 CONFIG_SYS_FM1_QSGMII21_PHY_ADDR
-CONFIG_SYS_FM1_TGEC_MDIO_ADDR
 CONFIG_SYS_FM2_10GEC1_PHY_ADDR
 CONFIG_SYS_FM2_CLK
 CONFIG_SYS_FM2_DTSEC1_PHY_ADDR
 CONFIG_SYS_FM2_DTSEC2_PHY_ADDR
 CONFIG_SYS_FM2_DTSEC3_PHY_ADDR
 CONFIG_SYS_FM2_DTSEC4_PHY_ADDR
-CONFIG_SYS_FM2_DTSEC_MDIO_ADDR
-CONFIG_SYS_FM2_TGEC_MDIO_ADDR
 CONFIG_SYS_FMAN_V3
 CONFIG_SYS_FM_MURAM_SIZE
-CONFIG_SYS_FORM_3U_CPCI
-CONFIG_SYS_FORM_3U_VPX
-CONFIG_SYS_FORM_6U_CPCI
-CONFIG_SYS_FORM_6U_VPX
-CONFIG_SYS_FORM_AMC
-CONFIG_SYS_FORM_ATCA_AMC
-CONFIG_SYS_FORM_ATCA_PMC
-CONFIG_SYS_FORM_CUSTOM
-CONFIG_SYS_FORM_PCI
-CONFIG_SYS_FORM_PCI_EXPRESS
-CONFIG_SYS_FORM_PMC
-CONFIG_SYS_FORM_PMC_XMC
-CONFIG_SYS_FORM_VME
-CONFIG_SYS_FORM_XMC
 CONFIG_SYS_FPGAREG_DATE
 CONFIG_SYS_FPGAREG_DIPSW
 CONFIG_SYS_FPGAREG_FREQ
@@ -1692,10 +1193,6 @@ CONFIG_SYS_FPGAREG_RESET
 CONFIG_SYS_FPGAREG_RESET_CODE
 CONFIG_SYS_FPGA_AMASK
 CONFIG_SYS_FPGA_BASE
-CONFIG_SYS_FPGA_CHECK_BUSY
-CONFIG_SYS_FPGA_CHECK_CTRLC
-CONFIG_SYS_FPGA_CHECK_ERROR
-CONFIG_SYS_FPGA_COUNT
 CONFIG_SYS_FPGA_CSOR
 CONFIG_SYS_FPGA_CSPR
 CONFIG_SYS_FPGA_CSPR_EXT
@@ -1703,25 +1200,15 @@ CONFIG_SYS_FPGA_FTIM0
 CONFIG_SYS_FPGA_FTIM1
 CONFIG_SYS_FPGA_FTIM2
 CONFIG_SYS_FPGA_FTIM3
-CONFIG_SYS_FPGA_NO_RFL_HI
 CONFIG_SYS_FPGA_PROG_FEEDBACK
-CONFIG_SYS_FPGA_PROG_TIME
 CONFIG_SYS_FPGA_SIZE
 CONFIG_SYS_FPGA_WAIT
-CONFIG_SYS_FPGA_WAIT_BUSY
-CONFIG_SYS_FPGA_WAIT_CONFIG
-CONFIG_SYS_FPGA_WAIT_INIT
-CONFIG_SYS_FSL_AIOP1_BASE
-CONFIG_SYS_FSL_AIOP1_SIZE
-CONFIG_SYS_FSL_B4860QDS_XFI_ERR
 CONFIG_SYS_FSL_BMAN_ADDR
 CONFIG_SYS_FSL_BMAN_OFFSET
-CONFIG_SYS_FSL_CCSR_BASE
 CONFIG_SYS_FSL_CCSR_GUR_BE
 CONFIG_SYS_FSL_CCSR_GUR_LE
 CONFIG_SYS_FSL_CCSR_SCFG_BE
 CONFIG_SYS_FSL_CCSR_SCFG_LE
-CONFIG_SYS_FSL_CCSR_SIZE
 CONFIG_SYS_FSL_CH3_CLK_CTRL_ADDR
 CONFIG_SYS_FSL_CH3_CLK_GRPA_ADDR
 CONFIG_SYS_FSL_CH3_CLK_GRPB_ADDR
@@ -1758,28 +1245,19 @@ CONFIG_SYS_FSL_CPC_ADDR
 CONFIG_SYS_FSL_CPC_OFFSET
 CONFIG_SYS_FSL_CSU_ADDR
 CONFIG_SYS_FSL_DCFG_ADDR
-CONFIG_SYS_FSL_DCSR_BASE
 CONFIG_SYS_FSL_DCSR_DDR2_ADDR
 CONFIG_SYS_FSL_DCSR_DDR3_ADDR
 CONFIG_SYS_FSL_DCSR_DDR4_ADDR
 CONFIG_SYS_FSL_DCSR_DDR_ADDR
-CONFIG_SYS_FSL_DCSR_SIZE
 CONFIG_SYS_FSL_DCU_BE
 CONFIG_SYS_FSL_DCU_LE
 CONFIG_SYS_FSL_DDR2_ADDR
-CONFIG_SYS_FSL_DDR3L
 CONFIG_SYS_FSL_DDR3_ADDR
 CONFIG_SYS_FSL_DDR_ADDR
 CONFIG_SYS_FSL_DDR_EMU
 CONFIG_SYS_FSL_DDR_INTLV_256B
 CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS
 CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY
-CONFIG_SYS_FSL_DRAM_BASE1
-CONFIG_SYS_FSL_DRAM_BASE2
-CONFIG_SYS_FSL_DRAM_BASE3
-CONFIG_SYS_FSL_DRAM_SIZE1
-CONFIG_SYS_FSL_DRAM_SIZE2
-CONFIG_SYS_FSL_DRAM_SIZE3
 CONFIG_SYS_FSL_DSPI_BE
 CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT
 CONFIG_SYS_FSL_DSP_CCSR_DDR_ADDR
@@ -1788,7 +1266,6 @@ CONFIG_SYS_FSL_DSP_DDR_ADDR
 CONFIG_SYS_FSL_DSP_M2_RAM_ADDR
 CONFIG_SYS_FSL_DSP_M3_RAM_ADDR
 CONFIG_SYS_FSL_ERRATUM_A008751
-CONFIG_SYS_FSL_ERRATUM_A_004934
 CONFIG_SYS_FSL_ESDHC_ADDR
 CONFIG_SYS_FSL_ESDHC_BE
 CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
@@ -1796,7 +1273,6 @@ CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
 CONFIG_SYS_FSL_ESDHC_LE
 CONFIG_SYS_FSL_ESDHC_NUM
 CONFIG_SYS_FSL_ESDHC_P1010_BROKEN_SDCLK
-CONFIG_SYS_FSL_ESDHC_USE_PIO
 CONFIG_SYS_FSL_FM
 CONFIG_SYS_FSL_FM1_ADDR
 CONFIG_SYS_FSL_FM1_DTSEC1_ADDR
@@ -1822,28 +1298,14 @@ CONFIG_SYS_FSL_FM2_RX4_1G_OFFSET
 CONFIG_SYS_FSL_FM2_RX5_1G_OFFSET
 CONFIG_SYS_FSL_FMAN_ADDR
 CONFIG_SYS_FSL_GUTS_ADDR
-CONFIG_SYS_FSL_I2C
-CONFIG_SYS_FSL_IFC_BASE
-CONFIG_SYS_FSL_IFC_BASE1
-CONFIG_SYS_FSL_IFC_BASE2
 CONFIG_SYS_FSL_IFC_BE
 CONFIG_SYS_FSL_IFC_LE
-CONFIG_SYS_FSL_IFC_SIZE
-CONFIG_SYS_FSL_IFC_SIZE1
-CONFIG_SYS_FSL_IFC_SIZE1_1
-CONFIG_SYS_FSL_IFC_SIZE2
 CONFIG_SYS_FSL_ISBC_VER
 CONFIG_SYS_FSL_JR0_ADDR
 CONFIG_SYS_FSL_JR0_OFFSET
 CONFIG_SYS_FSL_LS1_CLK_ADDR
 CONFIG_SYS_FSL_LSCH3_SERDES_ADDR
 CONFIG_SYS_FSL_MAX_NUM_OF_SEC
-CONFIG_SYS_FSL_MC9SDZ60_I2C_ADDR
-CONFIG_SYS_FSL_MC_BASE
-CONFIG_SYS_FSL_MC_SIZE
-CONFIG_SYS_FSL_NI_BASE
-CONFIG_SYS_FSL_NI_SIZE
-CONFIG_SYS_FSL_NO_SERDES
 CONFIG_SYS_FSL_NUM_CC_PLL
 CONFIG_SYS_FSL_NUM_CC_PLLS
 CONFIG_SYS_FSL_OCRAM_BASE
@@ -1852,26 +1314,16 @@ CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS
 CONFIG_SYS_FSL_PAMU_OFFSET
 CONFIG_SYS_FSL_PCIE_COMPAT
 CONFIG_SYS_FSL_PCI_VER_3_X
-CONFIG_SYS_FSL_PEBUF_BASE
-CONFIG_SYS_FSL_PEBUF_SIZE
 CONFIG_SYS_FSL_PEX_LUT_BE
 CONFIG_SYS_FSL_PEX_LUT_LE
 CONFIG_SYS_FSL_PMIC_I2C_ADDR
 CONFIG_SYS_FSL_PMU_ADDR
 CONFIG_SYS_FSL_PMU_CLTBENR
-CONFIG_SYS_FSL_QBMAN_BASE
-CONFIG_SYS_FSL_QBMAN_SIZE
-CONFIG_SYS_FSL_QBMAN_SIZE_1
 CONFIG_SYS_FSL_QMAN_ADDR
 CONFIG_SYS_FSL_QMAN_OFFSET
 CONFIG_SYS_FSL_QMAN_V3
 CONFIG_SYS_FSL_QSPI_BASE
-CONFIG_SYS_FSL_QSPI_BASE1
-CONFIG_SYS_FSL_QSPI_BASE2
 CONFIG_SYS_FSL_QSPI_LE
-CONFIG_SYS_FSL_QSPI_SIZE
-CONFIG_SYS_FSL_QSPI_SIZE1
-CONFIG_SYS_FSL_QSPI_SIZE2
 CONFIG_SYS_FSL_RAID_ENGINE
 CONFIG_SYS_FSL_RAID_ENGINE_ADDR
 CONFIG_SYS_FSL_RAID_ENGINE_OFFSET
@@ -1910,49 +1362,15 @@ CONFIG_SYS_FSL_SRIO_OFFSET
 CONFIG_SYS_FSL_SRK_LE
 CONFIG_SYS_FSL_TBCLK_DIV
 CONFIG_SYS_FSL_TIMER_ADDR
-CONFIG_SYS_FSL_USB1_ADDR
 CONFIG_SYS_FSL_USB1_PHY_ENABLE
-CONFIG_SYS_FSL_USB2_ADDR
 CONFIG_SYS_FSL_USB2_PHY_ENABLE
-CONFIG_SYS_FSL_USB_CTRL_PHY_EN
-CONFIG_SYS_FSL_USB_DRVVBUS_CR_EN
 CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
-CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE
-CONFIG_SYS_FSL_USB_HS_DISCNCT_INC
-CONFIG_SYS_FSL_USB_INTERNAL_SOC_CLK_EN
 CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
-CONFIG_SYS_FSL_USB_PLLPRG1_PHY_DIV
-CONFIG_SYS_FSL_USB_PLLPRG2_FRAC_LPF_EN
-CONFIG_SYS_FSL_USB_PLLPRG2_MFI
-CONFIG_SYS_FSL_USB_PLLPRG2_MFI_INTERNAL_CLK
-CONFIG_SYS_FSL_USB_PLLPRG2_PHY1_CLK_EN
-CONFIG_SYS_FSL_USB_PLLPRG2_PHY2_CLK_EN
-CONFIG_SYS_FSL_USB_PLLPRG2_PLL_EN
-CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV
-CONFIG_SYS_FSL_USB_PLLPRG2_REF_DIV_INTERNAL_CLK
-CONFIG_SYS_FSL_USB_PWRFLT_CR_EN
-CONFIG_SYS_FSL_USB_RX_AUTO_CAL_RD_WR_SEL
-CONFIG_SYS_FSL_USB_SQUELCH_PROG_MASK
-CONFIG_SYS_FSL_USB_SQUELCH_PROG_RD_0
-CONFIG_SYS_FSL_USB_SQUELCH_PROG_RD_3
-CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_0
-CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_3
-CONFIG_SYS_FSL_USB_SYS_CLK_VALID
-CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_EN
-CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_MASK
 CONFIG_SYS_FSL_USDHC_NUM
 CONFIG_SYS_FSL_WDOG_BE
 CONFIG_SYS_FSL_WRIOP1_ADDR
-CONFIG_SYS_FSL_WRIOP1_BASE
 CONFIG_SYS_FSL_WRIOP1_MDIO1
 CONFIG_SYS_FSL_WRIOP1_MDIO2
-CONFIG_SYS_FSL_WRIOP1_SIZE
-CONFIG_SYS_FSL_XHCI_USB1_ADDR
-CONFIG_SYS_FSL_XHCI_USB2_ADDR
-CONFIG_SYS_FSL_XHCI_USB3_ADDR
-CONFIG_SYS_FSMC_BASE
-CONFIG_SYS_FSMC_NAND_16BIT
-CONFIG_SYS_FSMC_NAND_8BIT
 CONFIG_SYS_FTAHBC020S_SLAVE_BSR_6
 CONFIG_SYS_FTAHBC020S_SLAVE_BSR_BASE
 CONFIG_SYS_FTPMU010_PDLLCR0_HCLKOUTDIS
@@ -1989,16 +1407,10 @@ CONFIG_SYS_GPDR0_VAL
 CONFIG_SYS_GPDR1_VAL
 CONFIG_SYS_GPDR2_VAL
 CONFIG_SYS_GPDR3_VAL
-CONFIG_SYS_GPIO1_DAT
-CONFIG_SYS_GPIO1_DIR
 CONFIG_SYS_GPIO1_EN
 CONFIG_SYS_GPIO1_FUNC
 CONFIG_SYS_GPIO1_LED
 CONFIG_SYS_GPIO1_OUT
-CONFIG_SYS_GPIO1_PRELIM
-CONFIG_SYS_GPIO2_DAT
-CONFIG_SYS_GPIO2_DIR
-CONFIG_SYS_GPIO2_PRELIM
 CONFIG_SYS_GPIO_EN
 CONFIG_SYS_GPIO_FUNC
 CONFIG_SYS_GPIO_OUT
@@ -2008,29 +1420,9 @@ CONFIG_SYS_GPSR1_VAL
 CONFIG_SYS_GPSR2_VAL
 CONFIG_SYS_GPSR3_VAL
 CONFIG_SYS_HALT_BEFOR_RAM_JUMP
-CONFIG_SYS_HELP_CMD_WIDTH
-CONFIG_SYS_HIGH
 CONFIG_SYS_HMI_BASE
-CONFIG_SYS_HRCW_HIGH
-CONFIG_SYS_HRCW_LOW
 CONFIG_SYS_HZ_CLOCK
-CONFIG_SYS_I2C2_FSL_OFFSET
-CONFIG_SYS_I2C2_OFFSET
-CONFIG_SYS_I2C2_PINMUX_CLR
-CONFIG_SYS_I2C2_PINMUX_REG
-CONFIG_SYS_I2C2_PINMUX_SET
-CONFIG_SYS_I2C_0
-CONFIG_SYS_I2C_2
-CONFIG_SYS_I2C_5
-CONFIG_SYS_I2C_BASE0
-CONFIG_SYS_I2C_BASE1
-CONFIG_SYS_I2C_BASE2
-CONFIG_SYS_I2C_BASE3
-CONFIG_SYS_I2C_BASE4
-CONFIG_SYS_I2C_BASE5
 CONFIG_SYS_I2C_BUSES
-CONFIG_SYS_I2C_CLK_OFFSET
-CONFIG_SYS_I2C_DIRECT_BUS
 CONFIG_SYS_I2C_DVI_ADDR
 CONFIG_SYS_I2C_DVI_BUS_NUM
 CONFIG_SYS_I2C_EEPROM_CCID
@@ -2039,13 +1431,10 @@ CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS
 CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS
 CONFIG_SYS_I2C_EXPANDER_ADDR
 CONFIG_SYS_I2C_FPGA_ADDR
-CONFIG_SYS_I2C_FRAM
 CONFIG_SYS_I2C_G762_ADDR
 CONFIG_SYS_I2C_IFDR_DIV
 CONFIG_SYS_I2C_INIT_BOARD
 CONFIG_SYS_I2C_LDI_ADDR
-CONFIG_SYS_I2C_LPC32XX_SLAVE
-CONFIG_SYS_I2C_LPC32XX_SPEED
 CONFIG_SYS_I2C_MAX_HOPS
 CONFIG_SYS_I2C_NOPROBES
 CONFIG_SYS_I2C_PCA953X_ADDR
@@ -2059,24 +1448,7 @@ CONFIG_SYS_I2C_QIXIS_ADDR
 CONFIG_SYS_I2C_RTC_ADDR
 CONFIG_SYS_I2C_TCA642X_ADDR
 CONFIG_SYS_I2C_TCA642X_BUS_NUM
-CONFIG_SYS_IBAT0L
-CONFIG_SYS_IBAT0U
-CONFIG_SYS_IBAT1L
-CONFIG_SYS_IBAT1U
-CONFIG_SYS_IBAT2L
-CONFIG_SYS_IBAT2U
-CONFIG_SYS_IBAT3L
-CONFIG_SYS_IBAT3U
-CONFIG_SYS_IBAT4L
-CONFIG_SYS_IBAT4U
-CONFIG_SYS_IBAT5L
-CONFIG_SYS_IBAT5U
-CONFIG_SYS_IBAT6L
-CONFIG_SYS_IBAT6U
-CONFIG_SYS_IBAT7L
-CONFIG_SYS_IBAT7U
 CONFIG_SYS_ICACHE_INV
-CONFIG_SYS_ICS8N3QV01_I2C
 CONFIG_SYS_IDE_MAXBUS
 CONFIG_SYS_IDE_MAXDEVICE
 CONFIG_SYS_IFC_ADDR
@@ -2101,18 +1473,14 @@ CONFIG_SYS_INIT_SP_ADDR
 CONFIG_SYS_INIT_SP_OFFSET
 CONFIG_SYS_INPUT_CLKSRC
 CONFIG_SYS_INTERLAKEN
-CONFIG_SYS_INTR_BASE
 CONFIG_SYS_INT_FLASH_BASE
 CONFIG_SYS_INT_FLASH_ENABLE
 CONFIG_SYS_IO_BASE
-CONFIG_SYS_ISA_BASE
 CONFIG_SYS_ISA_IO
 CONFIG_SYS_ISA_IO_BASE_ADDRESS
-CONFIG_SYS_ISA_MEM
 CONFIG_SYS_JFFS2_FIRST_BANK
 CONFIG_SYS_JFFS2_FIRST_SECTOR
 CONFIG_SYS_JFFS2_NUM_BANKS
-CONFIG_SYS_JFFS2_SORT_FRAGMENTS
 CONFIG_SYS_KMBEC_FPGA_BASE
 CONFIG_SYS_KMBEC_FPGA_SIZE
 CONFIG_SYS_KWD_CONFIG
@@ -2139,27 +1507,20 @@ CONFIG_SYS_LBC_SDRAM_SIZE
 CONFIG_SYS_LDB_CLOCK
 CONFIG_SYS_LIME_BASE
 CONFIG_SYS_LIME_SIZE
-CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE
 CONFIG_SYS_LOADS_BAUD_CHANGE
 CONFIG_SYS_LOW
 CONFIG_SYS_LOWMEM_BASE
-CONFIG_SYS_LOW_RES_TIMER
 CONFIG_SYS_LPAE_SDRAM_BASE
 CONFIG_SYS_LS1_DDR_BLOCK1_SIZE
 CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH
 CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS
-CONFIG_SYS_LS_MC_DPC_IN_DDR
 CONFIG_SYS_LS_MC_DPC_MAX_LENGTH
-CONFIG_SYS_LS_MC_DPL_IN_DDR
 CONFIG_SYS_LS_MC_DPL_MAX_LENGTH
 CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
 CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE
 CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET
 CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET
-CONFIG_SYS_LS_MC_FW_IN_DDR
-CONFIG_SYS_LS_PPA_FW_IN_xxx
 CONFIG_SYS_M41T11_BASE_YEAR
-CONFIG_SYS_M41T11_EXT_CENTURY_DATA
 CONFIG_SYS_MAIN_PWR_ON
 CONFIG_SYS_MALLOC_SIMPLE
 CONFIG_SYS_MAMR
@@ -2168,7 +1529,6 @@ CONFIG_SYS_MAPPED_RAM_BASE
 CONFIG_SYS_MASTER_CLOCK
 CONFIG_SYS_MATRIX_EBI0CSA_VAL
 CONFIG_SYS_MATRIX_EBICSA_VAL
-CONFIG_SYS_MATRIX_MCFG_REMAP
 CONFIG_SYS_MAXARGS
 CONFIG_SYS_MAX_FLASH_BANKS
 CONFIG_SYS_MAX_FLASH_BANKS_DETECT
@@ -2176,39 +1536,32 @@ CONFIG_SYS_MAX_FLASH_SECT
 CONFIG_SYS_MAX_I2C_BUS
 CONFIG_SYS_MAX_NAND_CHIPS
 CONFIG_SYS_MAX_NAND_DEVICE
-CONFIG_SYS_MAX_PCI_EPS
 CONFIG_SYS_MBAR
 CONFIG_SYS_MBAR2
 CONFIG_SYS_MCATT0_VAL
 CONFIG_SYS_MCATT1_VAL
 CONFIG_SYS_MCFRRTC_BASE
-CONFIG_SYS_MCFRTC_BASE
-CONFIG_SYS_MCF_SYNCR
 CONFIG_SYS_MCIO0_VAL
 CONFIG_SYS_MCIO1_VAL
 CONFIG_SYS_MCKR
 CONFIG_SYS_MCKR1_VAL
 CONFIG_SYS_MCKR2_VAL
 CONFIG_SYS_MCKR_CSS
-CONFIG_SYS_MCKR_VAL
 CONFIG_SYS_MCMEM0_VAL
 CONFIG_SYS_MCMEM1_VAL
 CONFIG_SYS_MDCNFG_VAL
 CONFIG_SYS_MDIO1_OFFSET
-CONFIG_SYS_MDIO_BASE_ADDR
 CONFIG_SYS_MDMRS_VAL
 CONFIG_SYS_MDREFR_VAL
 CONFIG_SYS_MECR_VAL
 CONFIG_SYS_MEMAC_LITTLE_ENDIAN
 CONFIG_SYS_MEMORY_BASE
 CONFIG_SYS_MEMORY_SIZE
-CONFIG_SYS_MEM_MAP
 CONFIG_SYS_MEM_RESERVE_SECURE
 CONFIG_SYS_MEM_SIZE
 CONFIG_SYS_MEM_TOP_HIDE
 CONFIG_SYS_MFD
 CONFIG_SYS_MHZ
-CONFIG_SYS_MII_MODE
 CONFIG_SYS_MIPS_TIMER_FREQ
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS
@@ -2231,8 +1584,6 @@ CONFIG_SYS_MPC83xx_ESDHC_ADDR
 CONFIG_SYS_MPC83xx_ESDHC_OFFSET
 CONFIG_SYS_MPC83xx_USB1_ADDR
 CONFIG_SYS_MPC83xx_USB1_OFFSET
-CONFIG_SYS_MPC83xx_USB2_ADDR
-CONFIG_SYS_MPC83xx_USB2_OFFSET
 CONFIG_SYS_MPC85XX_NO_RESETVEC
 CONFIG_SYS_MPC85xx_CPM_ADDR
 CONFIG_SYS_MPC85xx_CPM_OFFSET
@@ -2293,42 +1644,24 @@ CONFIG_SYS_MPC85xx_USB2_PHY_OFFSET
 CONFIG_SYS_MPC8xxx_DDR2_OFFSET
 CONFIG_SYS_MPC8xxx_DDR3_OFFSET
 CONFIG_SYS_MPC8xxx_DDR_OFFSET
-CONFIG_SYS_MPC8xxx_GUTS_ADDR
 CONFIG_SYS_MPC8xxx_PIC_ADDR
-CONFIG_SYS_MPC92469AC
 CONFIG_SYS_MRAM_BASE
 CONFIG_SYS_MRAM_SIZE
 CONFIG_SYS_MSC0_VAL
 CONFIG_SYS_MSC1_VAL
 CONFIG_SYS_MSC2_VAL
-CONFIG_SYS_MX5_CLK32
-CONFIG_SYS_MX5_HCLK
-CONFIG_SYS_MX6_CLK32
-CONFIG_SYS_MX6_HCLK
-CONFIG_SYS_MX7_CLK32
-CONFIG_SYS_MX7_HCLK
-CONFIG_SYS_MXS_VDD5V_ONLY
 CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
-CONFIG_SYS_NAND_ACTL_ALE
-CONFIG_SYS_NAND_ACTL_CLE
-CONFIG_SYS_NAND_ACTL_DELAY
-CONFIG_SYS_NAND_ACTL_NCE
-CONFIG_SYS_NAND_ALE
 CONFIG_SYS_NAND_AMASK
 CONFIG_SYS_NAND_BASE
 CONFIG_SYS_NAND_BASE2
 CONFIG_SYS_NAND_BASE_LIST
 CONFIG_SYS_NAND_BASE_PHYS
-CONFIG_SYS_NAND_BOOT
 CONFIG_SYS_NAND_BR_PRELIM
-CONFIG_SYS_NAND_BUSWIDTH_16
-CONFIG_SYS_NAND_CLE
 CONFIG_SYS_NAND_CS
 CONFIG_SYS_NAND_CSOR
 CONFIG_SYS_NAND_CSPR
 CONFIG_SYS_NAND_CSPR_EXT
 CONFIG_SYS_NAND_DATA_BASE
-CONFIG_SYS_NAND_DBW_16
 CONFIG_SYS_NAND_DBW_8
 CONFIG_SYS_NAND_DDR_LAW
 CONFIG_SYS_NAND_ECCBYTES
@@ -2346,8 +1679,6 @@ CONFIG_SYS_NAND_FTIM3
 CONFIG_SYS_NAND_HW_ECC
 CONFIG_SYS_NAND_HW_ECC_OOBFIRST
 CONFIG_SYS_NAND_LARGEPAGE
-CONFIG_SYS_NAND_LBLAWAR_PRELIM
-CONFIG_SYS_NAND_LBLAWBAR_PRELIM
 CONFIG_SYS_NAND_MASK_ALE
 CONFIG_SYS_NAND_MASK_CLE
 CONFIG_SYS_NAND_MAX_ECCPOS
@@ -2357,10 +1688,8 @@ CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
 CONFIG_SYS_NAND_OR_PRELIM
 CONFIG_SYS_NAND_PAGE_2K
 CONFIG_SYS_NAND_PAGE_4K
-CONFIG_SYS_NAND_QUIET
 CONFIG_SYS_NAND_READY_PIN
 CONFIG_SYS_NAND_REGS_BASE
-CONFIG_SYS_NAND_SELECT_DEVICE
 CONFIG_SYS_NAND_SIZE
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS
 CONFIG_SYS_NAND_U_BOOT_DST
@@ -2384,14 +1713,12 @@ CONFIG_SYS_NOR_FTIM1
 CONFIG_SYS_NOR_FTIM2
 CONFIG_SYS_NOR_FTIM3
 CONFIG_SYS_NS16550_CLK
-CONFIG_SYS_NS16550_CLK_DIV
 CONFIG_SYS_NS16550_COM1
 CONFIG_SYS_NS16550_COM2
 CONFIG_SYS_NS16550_COM3
 CONFIG_SYS_NS16550_COM4
 CONFIG_SYS_NS16550_COM5
 CONFIG_SYS_NS16550_COM6
-CONFIG_SYS_NS16550_IER
 CONFIG_SYS_NS16550_MEM32
 CONFIG_SYS_NS16550_PORT_MAPPED
 CONFIG_SYS_NS16550_REG_SIZE
@@ -2403,22 +1730,15 @@ CONFIG_SYS_NUM_FM2_10GEC
 CONFIG_SYS_NUM_FM2_DTSEC
 CONFIG_SYS_NUM_FMAN
 CONFIG_SYS_NUM_I2C_BUSES
-CONFIG_SYS_NUM_IRQS
-CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 CONFIG_SYS_NVRAM_BASE_ADDR
 CONFIG_SYS_NVRAM_SIZE
 CONFIG_SYS_OBIR
-CONFIG_SYS_OHCI_BE_CONTROLLER
 CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 CONFIG_SYS_OMAP_ABE_SYSCK
 CONFIG_SYS_ONENAND_BASE
 CONFIG_SYS_ONENAND_BLOCK_SIZE
-CONFIG_SYS_ONENAND_PAGE_SIZE
-CONFIG_SYS_OR0_REMAP
-CONFIG_SYS_OR1_REMAP
 CONFIG_SYS_OR_TIMING_MRAM
 CONFIG_SYS_OSCIN_FREQ
-CONFIG_SYS_OSD_DH
 CONFIG_SYS_OSPR_OFFSET
 CONFIG_SYS_PACNT
 CONFIG_SYS_PADAT
@@ -2434,7 +1754,6 @@ CONFIG_SYS_PBDDR
 CONFIG_SYS_PBI_FLASH_BASE
 CONFIG_SYS_PBI_FLASH_WINDOW
 CONFIG_SYS_PBSIZE
-CONFIG_SYS_PCA953X_NVM_WP
 CONFIG_SYS_PCCNT
 CONFIG_SYS_PCDAT
 CONFIG_SYS_PCDDR
@@ -2451,7 +1770,6 @@ CONFIG_SYS_PCI1_MEM_PHYS
 CONFIG_SYS_PCI1_MEM_SIZE
 CONFIG_SYS_PCI1_MEM_VIRT
 CONFIG_SYS_PCI2_ADDR
-CONFIG_SYS_PCI64_MEMORY_BUS
 CONFIG_SYS_PCIE
 CONFIG_SYS_PCIE1_ADDR
 CONFIG_SYS_PCIE1_BASE
@@ -2468,7 +1786,6 @@ CONFIG_SYS_PCIE1_MEM_VIRT
 CONFIG_SYS_PCIE1_NAME
 CONFIG_SYS_PCIE1_PHYS_ADDR
 CONFIG_SYS_PCIE1_PHYS_BASE
-CONFIG_SYS_PCIE1_PHYS_SIZE
 CONFIG_SYS_PCIE1_VIRT_ADDR
 CONFIG_SYS_PCIE2_ADDR
 CONFIG_SYS_PCIE2_BASE
@@ -2485,7 +1802,6 @@ CONFIG_SYS_PCIE2_MEM_VIRT
 CONFIG_SYS_PCIE2_NAME
 CONFIG_SYS_PCIE2_PHYS_ADDR
 CONFIG_SYS_PCIE2_PHYS_BASE
-CONFIG_SYS_PCIE2_PHYS_SIZE
 CONFIG_SYS_PCIE2_VIRT_ADDR
 CONFIG_SYS_PCIE3_ADDR
 CONFIG_SYS_PCIE3_IO_PHYS
@@ -2503,66 +1819,32 @@ CONFIG_SYS_PCIE4_MEM_PHYS
 CONFIG_SYS_PCIE4_MEM_VIRT
 CONFIG_SYS_PCIE4_NAME
 CONFIG_SYS_PCIE4_PHYS_ADDR
-CONFIG_SYS_PCIE4_PHYS_SIZE
 CONFIG_SYS_PCIE_MMAP_SIZE
-CONFIG_SYS_PCI_BAR0
-CONFIG_SYS_PCI_BAR1
-CONFIG_SYS_PCI_BAR2
-CONFIG_SYS_PCI_BAR3
-CONFIG_SYS_PCI_BAR4
-CONFIG_SYS_PCI_BAR5
-CONFIG_SYS_PCI_CACHE_LINE_SIZE
-CONFIG_SYS_PCI_CFG_PHYS
-CONFIG_SYS_PCI_EP_MEMORY_BASE
 CONFIG_SYS_PCI_IO_BASE
-CONFIG_SYS_PCI_IO_BUS
 CONFIG_SYS_PCI_IO_PHYS
 CONFIG_SYS_PCI_IO_SIZE
 CONFIG_SYS_PCI_MAP_END
 CONFIG_SYS_PCI_MAP_START
-CONFIG_SYS_PCI_MEMORY_BUS
-CONFIG_SYS_PCI_MEMORY_PHYS
-CONFIG_SYS_PCI_MEMORY_SIZE
 CONFIG_SYS_PCI_MEM_BASE
-CONFIG_SYS_PCI_MEM_BUS
 CONFIG_SYS_PCI_MEM_PHYS
 CONFIG_SYS_PCI_MEM_SIZE
 CONFIG_SYS_PCI_MMIO_BASE
 CONFIG_SYS_PCI_MMIO_PHYS
 CONFIG_SYS_PCI_MMIO_SIZE
-CONFIG_SYS_PCI_NR_INBOUND_WIN
 CONFIG_SYS_PCI_SLV_MEM_BUS
 CONFIG_SYS_PCI_SLV_MEM_LOCAL
 CONFIG_SYS_PCI_SLV_MEM_SIZE
-CONFIG_SYS_PCI_SYS_MEM_BUS
-CONFIG_SYS_PCI_SYS_MEM_PHYS
-CONFIG_SYS_PCI_SYS_MEM_SIZE
-CONFIG_SYS_PCI_TBATR0
-CONFIG_SYS_PCI_TBATR1
-CONFIG_SYS_PCI_TBATR2
-CONFIG_SYS_PCI_TBATR3
-CONFIG_SYS_PCI_TBATR4
-CONFIG_SYS_PCI_TBATR5
 CONFIG_SYS_PDCNT
 CONFIG_SYS_PEHLPAR
-CONFIG_SYS_PEPAR
-CONFIG_SYS_PFPAR
-CONFIG_SYS_PHY_UBOOT_BASE
-CONFIG_SYS_PIOC_ASR_VAL
-CONFIG_SYS_PIOC_BSR_VAL
 CONFIG_SYS_PIOC_PDR_VAL
 CONFIG_SYS_PIOC_PDR_VAL1
 CONFIG_SYS_PIOC_PPUDR_VAL
 CONFIG_SYS_PIOD_PDR_VAL1
 CONFIG_SYS_PIOD_PPUDR_VAL
 CONFIG_SYS_PIO_MODE
-CONFIG_SYS_PIXIS_VBOOT_ENABLE
-CONFIG_SYS_PIXIS_VBOOT_MASK
-CONFIG_SYS_PIXIS_VCFGEN0_ENABLE
 CONFIG_SYS_PJPAR
 CONFIG_SYS_PL310_BASE
 CONFIG_SYS_PLLAR_VAL
-CONFIG_SYS_PLLBR_VAL
 CONFIG_SYS_PLLCR
 CONFIG_SYS_PLL_BYPASS
 CONFIG_SYS_PLL_FDR
@@ -2572,44 +1854,9 @@ CONFIG_SYS_PMAN
 CONFIG_SYS_PMC_BASE
 CONFIG_SYS_PMC_BASE_PHYS
 CONFIG_SYS_PME_CLK
-CONFIG_SYS_PORTTC
-CONFIG_SYS_POST_BSPEC1
-CONFIG_SYS_POST_BSPEC2
-CONFIG_SYS_POST_BSPEC3
-CONFIG_SYS_POST_BSPEC4
-CONFIG_SYS_POST_BSPEC5
-CONFIG_SYS_POST_CACHE
-CONFIG_SYS_POST_CODEC
-CONFIG_SYS_POST_COPROC
-CONFIG_SYS_POST_CPU
-CONFIG_SYS_POST_DSP
-CONFIG_SYS_POST_ECC
-CONFIG_SYS_POST_ETHER
-CONFIG_SYS_POST_FLASH
-CONFIG_SYS_POST_FLASH_END
-CONFIG_SYS_POST_FLASH_NUM
-CONFIG_SYS_POST_FLASH_START
-CONFIG_SYS_POST_FPU
-CONFIG_SYS_POST_HOTKEYS_GPIO
-CONFIG_SYS_POST_I2C
-CONFIG_SYS_POST_I2C_ADDRS
-CONFIG_SYS_POST_I2C_IGNORES
 CONFIG_SYS_POST_MEMORY
 CONFIG_SYS_POST_MEM_REGIONS
-CONFIG_SYS_POST_OCM
-CONFIG_SYS_POST_RTC
-CONFIG_SYS_POST_SPR
-CONFIG_SYS_POST_SYSMON
-CONFIG_SYS_POST_UART
-CONFIG_SYS_POST_USB
-CONFIG_SYS_POST_WATCHDOG
-CONFIG_SYS_POST_WORD_ADDR
-CONFIG_SYS_PPC_DDR_WIMGE
-CONFIG_SYS_PQSPAR
-CONFIG_SYS_PSDPAR
 CONFIG_SYS_PSSR_VAL
-CONFIG_SYS_PTCPAR
-CONFIG_SYS_PTDPAR
 CONFIG_SYS_PTV
 CONFIG_SYS_PUAPAR
 CONFIG_SYS_QMAN_CENA_BASE
@@ -2630,10 +1877,8 @@ CONFIG_SYS_RCAR_I2C0_BASE
 CONFIG_SYS_RCAR_I2C1_BASE
 CONFIG_SYS_RCAR_I2C2_BASE
 CONFIG_SYS_RCAR_I2C3_BASE
-CONFIG_SYS_READ_SPD
 CONFIG_SYS_RESET_ADDR
 CONFIG_SYS_RESET_ADDRESS
-CONFIG_SYS_RESET_SCTRL
 CONFIG_SYS_RFD
 CONFIG_SYS_RGMII1_PHY_ADDR
 CONFIG_SYS_RGMII2_PHY_ADDR
@@ -2645,8 +1890,6 @@ CONFIG_SYS_ROM_BASE
 CONFIG_SYS_RSTC_RMR_VAL
 CONFIG_SYS_RTC_BUS_NUM
 CONFIG_SYS_RTC_CNT
-CONFIG_SYS_RTC_OSCILLATOR
-CONFIG_SYS_RTC_REG_BASE_ADDR
 CONFIG_SYS_RTC_SETUP
 CONFIG_SYS_RX_ETH_BUFFER
 CONFIG_SYS_SATA
@@ -2656,45 +1899,22 @@ CONFIG_SYS_SATA1_OFFSET
 CONFIG_SYS_SATA2
 CONFIG_SYS_SATA2_FLAGS
 CONFIG_SYS_SATA2_OFFSET
-CONFIG_SYS_SATA_ENV_DEV
 CONFIG_SYS_SATA_FAT_BOOT_PARTITION
 CONFIG_SYS_SATA_MAX_DEVICE
 CONFIG_SYS_SBFHDR_DATA_OFFSET
 CONFIG_SYS_SBFHDR_SIZE
-CONFIG_SYS_SCCR_ENCCM
-CONFIG_SYS_SCCR_PCICM
-CONFIG_SYS_SCCR_PCIEXP1CM
-CONFIG_SYS_SCCR_PCIEXP2CM
 CONFIG_SYS_SCCR_SATACM
 CONFIG_SYS_SCCR_TSEC1CM
-CONFIG_SYS_SCCR_TSEC1ON
 CONFIG_SYS_SCCR_TSEC2CM
-CONFIG_SYS_SCCR_TSEC2ON
-CONFIG_SYS_SCCR_TSECCM
 CONFIG_SYS_SCCR_USBDRCM
-CONFIG_SYS_SCCR_USBMPHCM
 CONFIG_SYS_SCR
 CONFIG_SYS_SCSI_MAX_DEVICE
 CONFIG_SYS_SCSI_MAX_LUN
 CONFIG_SYS_SCSI_MAX_SCSI_ID
-CONFIG_SYS_SDIO0
-CONFIG_SYS_SDIO0_MAX_CLK
-CONFIG_SYS_SDIO1
-CONFIG_SYS_SDIO1_MAX_CLK
-CONFIG_SYS_SDIO2
-CONFIG_SYS_SDIO2_MAX_CLK
-CONFIG_SYS_SDIO3
-CONFIG_SYS_SDIO3_MAX_CLK
-CONFIG_SYS_SDIO_BASE0
-CONFIG_SYS_SDIO_BASE1
-CONFIG_SYS_SDIO_BASE2
-CONFIG_SYS_SDIO_BASE3
 CONFIG_SYS_SDRAM
-CONFIG_SYS_SDRAM1
 CONFIG_SYS_SDRAM_BASE
 CONFIG_SYS_SDRAM_BASE0
 CONFIG_SYS_SDRAM_BASE1
-CONFIG_SYS_SDRAM_BASE1xx
 CONFIG_SYS_SDRAM_BASE2
 CONFIG_SYS_SDRAM_CFG
 CONFIG_SYS_SDRAM_CFG1
@@ -2704,7 +1924,6 @@ CONFIG_SYS_SDRAM_EMOD
 CONFIG_SYS_SDRAM_MODE
 CONFIG_SYS_SDRAM_SIZE
 CONFIG_SYS_SDRAM_SIZE0
-CONFIG_SYS_SDRAM_SIZE1
 CONFIG_SYS_SDRAM_SIZE_LAW
 CONFIG_SYS_SDRAM_VAL
 CONFIG_SYS_SDRAM_VAL1
@@ -2753,13 +1972,10 @@ CONFIG_SYS_SH_SDHI3_BASE
 CONFIG_SYS_SH_SDHI_NR_CHANNEL
 CONFIG_SYS_SICRH
 CONFIG_SYS_SICRL
-CONFIG_SYS_SIL1178_I2C
 CONFIG_SYS_SMC0_CYCLE0_VAL
 CONFIG_SYS_SMC0_MODE0_VAL
 CONFIG_SYS_SMC0_PULSE0_VAL
 CONFIG_SYS_SMC0_SETUP0_VAL
-CONFIG_SYS_SMC_CSR0_VAL
-CONFIG_SYS_SPCR_OPT
 CONFIG_SYS_SPD_BUS_NUM
 CONFIG_SYS_SPI_ARGS_OFFS
 CONFIG_SYS_SPI_ARGS_SIZE
@@ -2770,8 +1986,6 @@ CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS
 CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE
 CONFIG_SYS_SPI_FLASH_U_BOOT_START
 CONFIG_SYS_SPI_KERNEL_OFFS
-CONFIG_SYS_SPI_MXC_WAIT
-CONFIG_SYS_SPI_RTC_DEVID
 CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
 CONFIG_SYS_SPI_U_BOOT_SIZE
 CONFIG_SYS_SPL_ARGS_ADDR
@@ -2793,8 +2007,6 @@ CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR_PHYS
 CONFIG_SYS_SST_SECT
 CONFIG_SYS_SST_SECTSZ
 CONFIG_SYS_STACK_SIZE
-CONFIG_SYS_STATUS_C
-CONFIG_SYS_STATUS_OK
 CONFIG_SYS_SXCNFG_VAL
 CONFIG_SYS_TBIPA_VALUE
 CONFIG_SYS_TCLK
@@ -2802,30 +2014,17 @@ CONFIG_SYS_TIMERBASE
 CONFIG_SYS_TIMER_BASE
 CONFIG_SYS_TIMER_COUNTER
 CONFIG_SYS_TIMER_COUNTS_DOWN
-CONFIG_SYS_TIMER_PRESCALER
 CONFIG_SYS_TIMER_RATE
 CONFIG_SYS_TMPVIRT
-CONFIG_SYS_TMRINTR_MASK
-CONFIG_SYS_TMRINTR_NO
-CONFIG_SYS_TMRINTR_PEND
-CONFIG_SYS_TMRINTR_PRI
-CONFIG_SYS_TMRPND_REG
-CONFIG_SYS_TMR_BASE
 CONFIG_SYS_TSEC1_OFFSET
 CONFIG_SYS_TSEC2_OFFSET
 CONFIG_SYS_TSEC3_OFFSET
 CONFIG_SYS_TX_ETH_BUFFER
-CONFIG_SYS_UART1_ALT1_GPIO
-CONFIG_SYS_UART2_ALT1_GPIO
 CONFIG_SYS_UART2_ALT3_GPIO
-CONFIG_SYS_UART2_PRI_GPIO
-CONFIG_SYS_UART_BASE
 CONFIG_SYS_UART_PORT
 CONFIG_SYS_UBOOT_BASE
 CONFIG_SYS_UBOOT_START
-CONFIG_SYS_UDELAY_BASE
 CONFIG_SYS_UEC
-CONFIG_SYS_UEC1_PHY_ADDR
 CONFIG_SYS_UEC2_ETH_TYPE
 CONFIG_SYS_UEC2_INTERFACE_SPEED
 CONFIG_SYS_UEC2_INTERFACE_TYPE
@@ -2833,13 +2032,8 @@ CONFIG_SYS_UEC2_PHY_ADDR
 CONFIG_SYS_UEC2_RX_CLK
 CONFIG_SYS_UEC2_TX_CLK
 CONFIG_SYS_UEC2_UCC_NUM
-CONFIG_SYS_UEC3_PHY_ADDR
-CONFIG_SYS_UEC4_PHY_ADDR
-CONFIG_SYS_UECx_PHY_ADDR
 CONFIG_SYS_ULB_CLK
 CONFIG_SYS_UNIFY_CACHE
-CONFIG_SYS_UNSPEC_PHYID
-CONFIG_SYS_UNSPEC_STRID
 CONFIG_SYS_USB_FAT_BOOT_PARTITION
 CONFIG_SYS_USB_OHCI_BOARD_INIT
 CONFIG_SYS_USB_OHCI_CPU_INIT
@@ -2852,7 +2046,6 @@ CONFIG_SYS_USE_DATAFLASH_CS0
 CONFIG_SYS_USE_DATAFLASH_CS1
 CONFIG_SYS_USE_DATAFLASH_CS3
 CONFIG_SYS_USE_FLASH
-CONFIG_SYS_USE_MAIN_OSCILLATOR
 CONFIG_SYS_USE_MMC
 CONFIG_SYS_USE_NAND
 CONFIG_SYS_USE_NANDFLASH
@@ -2861,7 +2054,6 @@ CONFIG_SYS_USR_EXCEP
 CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
 CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
 CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT
-CONFIG_SYS_VCXK_AUTODETECT
 CONFIG_SYS_VCXK_BASE
 CONFIG_SYS_VCXK_DEFAULT_LINEALIGN
 CONFIG_SYS_VCXK_DOUBLEBUFFERED
@@ -2874,31 +2066,22 @@ CONFIG_SYS_VCXK_INVERT_PORT
 CONFIG_SYS_VCXK_REQUEST_DDR
 CONFIG_SYS_VCXK_REQUEST_PIN
 CONFIG_SYS_VCXK_REQUEST_PORT
-CONFIG_SYS_VCXK_RESET_DDR
-CONFIG_SYS_VCXK_RESET_PIN
-CONFIG_SYS_VCXK_RESET_PORT
 CONFIG_SYS_VIDEO_LOGO_MAX_SIZE
 CONFIG_SYS_VSC7385_BASE
 CONFIG_SYS_VSC7385_BASE_PHYS
 CONFIG_SYS_VSC7385_BR_PRELIM
 CONFIG_SYS_VSC7385_OR_PRELIM
-CONFIG_SYS_WATCHDOG_FREQ
 CONFIG_SYS_WATCHDOG_VALUE
 CONFIG_SYS_WDTC_WDMR_VAL
 CONFIG_SYS_WRITE_SWAPPED_DATA
 CONFIG_SYS_XHCI_USB1_ADDR
 CONFIG_SYS_XHCI_USB2_ADDR
 CONFIG_SYS_XHCI_USB3_ADDR
-CONFIG_SYS_XIMG_LEN
-CONFIG_TAM3517_SETTINGS
 CONFIG_TCA642X
 CONFIG_TEGRA_BOARD_STRING
 CONFIG_TEGRA_CLOCK_SCALING
 CONFIG_TEGRA_ENABLE_UARTA
-CONFIG_TEGRA_ENABLE_UARTB
-CONFIG_TEGRA_ENABLE_UARTC
 CONFIG_TEGRA_ENABLE_UARTD
-CONFIG_TEGRA_ENABLE_UARTE
 CONFIG_TEGRA_GPU
 CONFIG_TEGRA_LP0
 CONFIG_TEGRA_PMU
@@ -2910,8 +2093,6 @@ CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
 CONFIG_TESTPIN_REG
-CONFIG_TEST_LIST_SORT
-CONFIG_TFTP_FILE_NAME_MAX_LEN
 CONFIG_TFTP_PORT
 CONFIG_THOR_RESET_OFF
 CONFIG_THUNDERX
@@ -2935,7 +2116,6 @@ CONFIG_TSECV2
 CONFIG_TSECV2_1
 CONFIG_TSEC_TBICR_SETTINGS
 CONFIG_TWL6030_POWER
-CONFIG_TX_DESCR_NUM
 CONFIG_TZSW_RESERVED_DRAM_SIZE
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
@@ -2945,130 +2125,53 @@ CONFIG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
 CONFIG_UDP_CHECKSUM
 CONFIG_UEC_ETH
-CONFIG_UEC_ETH1
 CONFIG_UEC_ETH2
-CONFIG_UEC_ETH3
-CONFIG_UEC_ETH4
-CONFIG_UEC_ETH5
-CONFIG_UEC_ETH6
-CONFIG_UEC_ETH7
-CONFIG_UEC_ETH8
-CONFIG_UID16
-CONFIG_ULPI_REF_CLK
 CONFIG_UPDATEB
-CONFIG_UPDATE_LOAD_ADDR
 CONFIG_USART_BASE
 CONFIG_USART_ID
-CONFIG_USBD_CONFIGURATION_STR
-CONFIG_USBD_CTRL_INTERFACE_STR
-CONFIG_USBD_DATA_INTERFACE_STR
 CONFIG_USBD_HS
 CONFIG_USBD_MANUFACTURER
 CONFIG_USBD_PRODUCTID_CDCACM
 CONFIG_USBD_PRODUCTID_GSERIAL
 CONFIG_USBD_PRODUCT_NAME
-CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE
-CONFIG_USBD_SERIAL_BULK_PKTSIZE
-CONFIG_USBD_SERIAL_INT_ENDPOINT
-CONFIG_USBD_SERIAL_INT_PKTSIZE
-CONFIG_USBD_SERIAL_IN_ENDPOINT
-CONFIG_USBD_SERIAL_IN_PKTSIZE
-CONFIG_USBD_SERIAL_OUT_ENDPOINT
-CONFIG_USBD_SERIAL_OUT_PKTSIZE
 CONFIG_USBD_VENDORID
 CONFIG_USBNET_DEV_ADDR
 CONFIG_USB_ATMEL
 CONFIG_USB_ATMEL_CLK_SEL_PLLB
 CONFIG_USB_ATMEL_CLK_SEL_UPLL
-CONFIG_USB_BIN_FIXUP
 CONFIG_USB_BOOTING
 CONFIG_USB_DEVICE
 CONFIG_USB_DEV_BASE
-CONFIG_USB_DEV_PULLUP_GPIO
-CONFIG_USB_EHCI_BASE
-CONFIG_USB_EHCI_BASE_LIST
 CONFIG_USB_EHCI_EXYNOS
-CONFIG_USB_EHCI_FARADAY
 CONFIG_USB_EHCI_TXFIFO_THRESH
-CONFIG_USB_ETH_QMULT
-CONFIG_USB_ETH_SUBSET
 CONFIG_USB_EXT2_BOOT
 CONFIG_USB_FAT_BOOT
-CONFIG_USB_GADGET_AMD5536UDC
 CONFIG_USB_GADGET_AT91
-CONFIG_USB_GADGET_DUMMY_HCD
 CONFIG_USB_GADGET_DWC2_OTG_PHY
-CONFIG_USB_GADGET_FOTG210
-CONFIG_USB_GADGET_FSL_USB2
-CONFIG_USB_GADGET_GOKU
-CONFIG_USB_GADGET_IMX
-CONFIG_USB_GADGET_M66592
-CONFIG_USB_GADGET_MQ11XX
-CONFIG_USB_GADGET_MUSBHSFC
-CONFIG_USB_GADGET_N9604
-CONFIG_USB_GADGET_NET2280
-CONFIG_USB_GADGET_OMAP
-CONFIG_USB_GADGET_PXA27X
-CONFIG_USB_GADGET_PXA2XX
-CONFIG_USB_GADGET_SA1100
-CONFIG_USB_INVENTRA_DMA
 CONFIG_USB_ISP1301_I2C_ADDR
 CONFIG_USB_MAX_CONTROLLER_COUNT
-CONFIG_USB_MUSB_TIMEOUT
-CONFIG_USB_MUSB_TUSB6010
 CONFIG_USB_OHCI_LPC32XX
 CONFIG_USB_OHCI_NEW
-CONFIG_USB_OTG
-CONFIG_USB_OTG_BLACKLIST_HUB
-CONFIG_USB_PXA25X_SMALL
-CONFIG_USB_TI_CPPI_DMA
 CONFIG_USB_TTY
-CONFIG_USB_TUSB_OMAP_DMA
-CONFIG_USB_ULPI_TIMEOUT
 CONFIG_USB_XHCI_EXYNOS
 CONFIG_USE_INTERRUPT
 CONFIG_USE_ONENAND_BOARD_INIT
-CONFIG_UTBIPAR_INIT_TBIPA
-CONFIG_U_BOOT_HDR_ADDR
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
 CONFIG_VIDEO_BCM2835
 CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_DA8XX
-CONFIG_VIDEO_FONT_4X6
 CONFIG_VIDEO_LOGO
-CONFIG_VIDEO_MXS_MODE_SYSTEM
-CONFIG_VIDEO_STD_TIMINGS
-CONFIG_VID_FLS_ENV
-CONFIG_VM86
-CONFIG_VOIPAC_LCD
-CONFIG_VOL_MONITOR_INA220
-CONFIG_VOL_MONITOR_IR36021_READ
-CONFIG_VOL_MONITOR_IR36021_SET
 CONFIG_VSC7385_ENET
 CONFIG_VSC7385_IMAGE
 CONFIG_VSC7385_IMAGE_SIZE
 CONFIG_VSC9953
-CONFIG_WATCHDOG_NOWAYOUT
 CONFIG_WATCHDOG_PRESC
 CONFIG_WATCHDOG_RC
 CONFIG_WATCHDOG_TIMEOUT
-CONFIG_WD_PERIOD
-CONFIG_X86EMU_DEBUG
 CONFIG_X86EMU_RAW_IO
 CONFIG_X86_MRC_ADDR
 CONFIG_X86_REFCODE_ADDR
 CONFIG_X86_REFCODE_RUN_ADDR
-CONFIG_XGI_XG22_BASE
-CONFIG_XSENGINE
 CONFIG_XTFPGA
-CONFIG_YAFFS_AUTO_UNICODE
-CONFIG_YAFFS_CASE_INSENSITIVE
-CONFIG_YAFFS_DEFINES_TYPES
-CONFIG_YAFFS_UNICODE
-CONFIG_YAFFS_UTIL
-CONFIG_YAFFS_WINCE
-CONFIG_YELLOW_LED
-CONFIG_ZLT
-CONFIG_eTSEC_MDIO_BUS
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 09/12] Convert CONFIG_88F5182 et al to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (6 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 08/12] Kconfig: Remove some symbols from the whitelist Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:59   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 10/12] Convert CONFIG_SYS_KWD_CONFIG " Tom Rini
                   ` (3 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_88F5182
   CONFIG_BOARD_IS_OPENRD_BASE
   CONFIG_BOARD_IS_OPENRD_CLIENT
   CONFIG_BOARD_IS_OPENRD_ULTIMATE
   CONFIG_D2NET_V2
   CONFIG_FEROCEON
   CONFIG_FEROCEON_88FR131
   CONFIG_INETSPACE_V2
   CONFIG_KW88F6192
   CONFIG_KW88F6281
   CONFIG_KW88F6702
   CONFIG_NET2BIG_V2
   CONFIG_NETSPACE_LITE_V2
   CONFIG_NETSPACE_MAX_V2
   CONFIG_NETSPACE_MINI_V2
   CONFIG_NETSPACE_V2
   CONFIG_SHEEVA_88SV131

At this point mv-plug-common.h is now only an include of mv-common.h so
remove that indirection.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-kirkwood/Kconfig     | 49 ++++++++++++++++++++++++++++++
 arch/arm/mach-orion5x/Kconfig      |  8 +++++
 board/LaCie/net2big_v2/Kconfig     | 11 +++++++
 board/LaCie/netspace_v2/Kconfig    | 25 +++++++++++++++
 board/Marvell/openrd/Kconfig       | 14 +++++++++
 configs/d2net_v2_defconfig         |  1 -
 configs/inetspace_v2_defconfig     |  1 -
 configs/net2big_v2_defconfig       |  2 +-
 configs/netspace_lite_v2_defconfig |  2 +-
 configs/netspace_max_v2_defconfig  |  2 +-
 configs/netspace_mini_v2_defconfig |  2 +-
 configs/netspace_v2_defconfig      |  2 +-
 configs/openrd_base_defconfig      |  1 -
 configs/openrd_client_defconfig    |  2 +-
 configs/openrd_ultimate_defconfig  |  2 +-
 include/configs/SBx81LIFKW.h       |  2 --
 include/configs/SBx81LIFXCAT.h     |  2 --
 include/configs/dns325.h           |  6 ----
 include/configs/dockstar.h         |  6 ----
 include/configs/dreamplug.h        |  7 +----
 include/configs/ds109.h            |  7 +----
 include/configs/edminiv2.h         |  3 --
 include/configs/goflexhome.h       |  6 ----
 include/configs/guruplug.h         | 15 +--------
 include/configs/ib62x0.h           |  6 ----
 include/configs/iconnect.h         |  6 ----
 include/configs/km/km_arm.h        |  6 ----
 include/configs/lacie_kw.h         | 11 -------
 include/configs/lsxl.h             |  2 --
 include/configs/mv-plug-common.h   | 21 -------------
 include/configs/nas220.h           |  6 ----
 include/configs/nsa310s.h          |  5 ---
 include/configs/openrd.h           |  6 ----
 include/configs/pogo_e02.h         |  6 ----
 include/configs/sheevaplug.h       |  7 +----
 scripts/config_whitelist.txt       | 17 -----------
 36 files changed, 118 insertions(+), 159 deletions(-)
 delete mode 100644 include/configs/mv-plug-common.h

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index cb4e9f29ef6d..c060cc8546b6 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -1,66 +1,115 @@
 if ARCH_KIRKWOOD
 
+config FEROCEON_88FR131
+	bool
+
+config KW88F6192
+	bool
+
+config KW88F6281
+	bool
+
+config SHEEVA_88SV131
+	bool
+
 choice
 	prompt "Marvell Kirkwood board select"
 	optional
 
 config TARGET_OPENRD
 	bool "Marvell OpenRD Board"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_DREAMPLUG
 	bool "DreamPlug Board"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_DS109
 	bool "Synology DS109"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_GURUPLUG
 	bool "GuruPlug Board"
+	select KW88F6281
+	select SHEEVA_88SV131
 
 config TARGET_SHEEVAPLUG
 	bool "SheevaPlug Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_LSXL
 	bool "lsxl Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_POGO_E02
 	bool "pogo_e02 Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_DNS325
 	bool "dns325 Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_ICONNECT
 	bool "iconnect Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_KM_KIRKWOOD
 	bool "KM Kirkwood Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 	select VENDOR_KM
 
 config TARGET_NET2BIG_V2
 	bool "LaCie 2Big Network v2 NAS Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_NETSPACE_V2
 	bool "LaCie netspace_v2 Board"
+	select FEROCEON_88FR131
 
 config TARGET_IB62X0
 	bool "ib62x0 Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_DOCKSTAR
 	bool "Dockstar Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_GOFLEXHOME
 	bool "GoFlex Home Board"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_NAS220
 	bool "BlackArmor NAS220"
+	select FEROCEON_88FR131
+	select KW88F6192
 
 config TARGET_NSA310S
 	bool "Zyxel NSA310S"
+	select FEROCEON_88FR131
+	select KW88F6192
 
 config TARGET_SBx81LIFKW
 	bool "Allied Telesis SBx81GS24/SBx81GT40/SBx81XS6/SBx81XS16"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 config TARGET_SBx81LIFXCAT
 	bool "Allied Telesis SBx81GP24/SBx81GT24"
+	select FEROCEON_88FR131
+	select KW88F6281
 
 endchoice
 
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 5baa6fb935ae..b8b45a048ca3 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -1,11 +1,19 @@
 if ARCH_ORION5X
 
+config 88F5182
+	bool
+
+config FEROCEON
+	bool
+
 choice
 	prompt "Marvell Orion board select"
 	optional
 
 config TARGET_EDMINIV2
 	bool "LaCie Ethernet Disk mini V2"
+	select 88F5182
+	select FEROCEON
 	select SUPPORT_SPL
 
 endchoice
diff --git a/board/LaCie/net2big_v2/Kconfig b/board/LaCie/net2big_v2/Kconfig
index ba460dba45ec..758d25e00714 100644
--- a/board/LaCie/net2big_v2/Kconfig
+++ b/board/LaCie/net2big_v2/Kconfig
@@ -1,5 +1,16 @@
 if TARGET_NET2BIG_V2
 
+choice
+	prompt "Board variant"
+
+config D2NET_V2
+	bool "D2NET v2"
+
+config NET2BIG_V2
+	bool "NET2BIG v2"
+
+endchoice
+
 config SYS_BOARD
 	default "net2big_v2"
 
diff --git a/board/LaCie/netspace_v2/Kconfig b/board/LaCie/netspace_v2/Kconfig
index 930b822dfbe7..4eca1d47de51 100644
--- a/board/LaCie/netspace_v2/Kconfig
+++ b/board/LaCie/netspace_v2/Kconfig
@@ -1,5 +1,30 @@
 if TARGET_NETSPACE_V2
 
+choice
+	prompt "Board variant"
+
+config INETSPACE_V2
+	bool "INETSPACE v2"
+	select KW88F6281
+
+config NETSPACE_LITE_V2
+	bool "NETSPACE LITE v2"
+	select KW88F6192
+
+config NETSPACE_MAX_V2
+	bool "NETSPACE MAX v2"
+	select KW88F6281
+
+config NETSPACE_MINI_V2
+	bool "NETSPACE MINI v2"
+	select KW88F6192
+
+config NETSPACE_V2
+	bool "NETSPACE v2"
+	select KW88F6281
+
+endchoice
+
 config SYS_BOARD
 	default "netspace_v2"
 
diff --git a/board/Marvell/openrd/Kconfig b/board/Marvell/openrd/Kconfig
index 124b66da0f13..dc26ed2f42f4 100644
--- a/board/Marvell/openrd/Kconfig
+++ b/board/Marvell/openrd/Kconfig
@@ -1,5 +1,19 @@
 if TARGET_OPENRD
 
+choice
+	prompt "Board variant"
+
+config BOARD_IS_OPENRD_BASE
+	bool "Base"
+
+config BOARD_IS_OPENRD_CLIENT
+	bool "Client"
+
+config BOARD_IS_OPENRD_ULTIMATE
+	bool "Ultimate"
+
+endchoice
+
 config SYS_BOARD
 	default "openrd"
 
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 32fe1dcb4266..3f2763399b5e 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-d2net"
 CONFIG_IDENT_STRING=" D2 v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index b6ebab0d183d..c3f9be8765fb 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-is2"
 CONFIG_IDENT_STRING=" IS v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index cc1d81c7a1dd..083d3e6e0220 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NET2BIG_V2=y
+CONFIG_NET2BIG_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-net2big"
 CONFIG_IDENT_STRING=" 2Big v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 249ffc6dad09..e671d994f765 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_LITE_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2lite"
 CONFIG_IDENT_STRING=" NS v2 Lite"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index e11a6b7cd46b..607cb5a3f9a5 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_MAX_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2max"
 CONFIG_IDENT_STRING=" NS Max v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 7b9c29b9db98..203071d37775 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_MINI_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2mini"
 CONFIG_IDENT_STRING=" NS v2 Mini"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index ba0d0ffbab65..84a2389d1780 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
+CONFIG_NETSPACE_V2=y
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x70000
 CONFIG_ENV_SECT_SIZE=0x10000
@@ -13,7 +14,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ns2"
 CONFIG_IDENT_STRING=" NS v2"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 9e048d475c18..e79649ee7ea3 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base"
 CONFIG_IDENT_STRING="\nOpenRD-Base"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 6f9f0a279dce..9d924f3cbc91 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -7,13 +7,13 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
+CONFIG_BOARD_IS_OPENRD_CLIENT=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client"
 CONFIG_IDENT_STRING="\nOpenRD-Client"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index b5879638cd12..7c2e41e72e08 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -7,13 +7,13 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
+CONFIG_BOARD_IS_OPENRD_ULTIMATE=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate"
 CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_SYS_LOAD_ADDR=0x800000
-CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; ${x_bootcmd_usb}; bootm 0x6400000;"
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 782b16f30fa0..3ebeccc33bcd 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -9,8 +9,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
 
 /* additions for new ARM relocation support */
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index e4666e1e7e3c..53a6bdf0a302 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -9,8 +9,6 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
 
 /* additions for new ARM relocation support */
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 8e298ddfa1a5..e35c16add4dd 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -12,12 +12,6 @@
 #ifndef _CONFIG_DNS325_H
 #define _CONFIG_DNS325_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KW88F6281		/* SOC Name */
-
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 8a5daf48c0fe..0ad04eee1b74 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -11,12 +11,6 @@
 #ifndef _CONFIG_DOCKSTAR_H
 #define _CONFIG_DOCKSTAR_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KW88F6281	1	/* SOC Name */
-
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 61b1e0fc1f34..beea234d8dc8 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -11,12 +11,7 @@
 #ifndef _CONFIG_DREAMPLUG_H
 #define _CONFIG_DREAMPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index c57461c7e6bf..8553ea0b95f2 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -11,12 +11,7 @@
 #ifndef _CONFIG_DS109_H
 #define _CONFIG_DS109_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 6b487b310cce..e20e058e0a32 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -28,9 +28,6 @@
  * High Level Configuration Options (easy to change)
  */
 
-#define CONFIG_FEROCEON		1	/* CPU Core subversion */
-#define CONFIG_88F5182		1	/* SOC Name */
-
 #include <asm/arch/orion5x.h>
 /*
  * CLKs configurations
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 269178c9c2be..90e37d985354 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -14,12 +14,6 @@
 #ifndef _CONFIG_GOFLEXHOME_H
 #define _CONFIG_GOFLEXHOME_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KW88F6281	1	/* SOC Name */
-
 /*
  * Default GPIO configuration and LED status
  */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index e51f3f2483f1..25c5a97c69d7 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -9,20 +9,7 @@
 #ifndef _CONFIG_GURUPLUG_H
 #define _CONFIG_GURUPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-
-/*
- * Standard filesystems
- */
-
-/*
- * mv-plug-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 75bb073d4d8d..9783fd89ec02 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -8,12 +8,6 @@
 #ifndef _CONFIG_IB62x0_H
 #define _CONFIG_IB62x0_H
 
-/*
- * High level configuration options
- */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KW88F6281		/* SOC Name */
-
 #include "mv-common.h"
 
 /*
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 4903b92ca3af..f1aad1efde64 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -8,12 +8,6 @@
 #ifndef _CONFIG_ICONNECT_H
 #define _CONFIG_ICONNECT_H
 
-/*
- * High level configuration options
- */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KW88F6281		/* SOC Name */
-
 #include "mv-common.h"
 
 /*
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index cca624ea3e11..6501884d32ce 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -19,12 +19,6 @@
 #ifndef _CONFIG_KM_ARM_H
 #define _CONFIG_KM_ARM_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KW88F6281		/* SOC Name */
-
 #define CONFIG_NAND_ECC_BCH
 
 /* include common defines/options for all Keymile boards */
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 6180563ab767..d6c5425a9dd0 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -6,17 +6,6 @@
 #ifndef _CONFIG_LACIE_KW_H
 #define _CONFIG_LACIE_KW_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-/* SoC name */
-#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-#define CONFIG_KW88F6192
-#else
-#define CONFIG_KW88F6281
-#endif
-
 /*
  * SDRAM configuration
  */
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 7294a3c20a5a..5891a1d8c594 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -21,8 +21,6 @@
 /*
  * General configuration options
  */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KW88F6281		/* SOC Name */
 
 #define CONFIG_KIRKWOOD_GPIO
 
diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
deleted file mode 100644
index d38d9872c006..000000000000
--- a/include/configs/mv-plug-common.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2009-2015
- * Marvell Semiconductor <www.marvell.com>
- */
-
-#ifndef _CONFIG_MARVELL_PLUG_H
-#define _CONFIG_MARVELL_PLUG_H
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_KW88F6281	1	/* SOC Name */
-
-/*
- * mv-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
-#include "mv-common.h"
-
-#endif /* _CONFIG_MARVELL_PLUG_H */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 9f89cca0b017..12480d9d5525 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -11,12 +11,6 @@
 #ifndef _CONFIG_NAS220_H
 #define _CONFIG_NAS220_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131		/* #define CPU Core subversion */
-#define CONFIG_KW88F6192		/* SOC Name */
-
 /* power-on led, regulator, sata0, sata1 */
 #define NAS220_GE_OE_VAL_LOW ((1 << 12)|(1 << 14)|(1 << 24)|(1 << 28))
 #define NAS220_GE_OE_VAL_HIGH (0)
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 54f496f6ce14..8cc9ca6a49d1 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -9,11 +9,6 @@
 #ifndef _CONFIG_NSA310S_H
 #define _CONFIG_NSA310S_H
 
-/* high level configuration options */
-#define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KW88F6192		1	/* SOC Name */
-#define CONFIG_KW88F6702		1	/* SOC Name */
-
 #include "mv-common.h"
 
 /* environment variables configuration */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index bd27e503cad1..43d089657b11 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -13,12 +13,6 @@
 #ifndef _CONFIG_OPENRD_H
 #define _CONFIG_OPENRD_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-#define CONFIG_KW88F6281	1	/* SOC Name */
-
 #include "mv-common.h"
 
 /*
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 196e362bd74f..3e94125cb35f 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -12,12 +12,6 @@
 #ifndef _CONFIG_POGO_E02_H
 #define _CONFIG_POGO_E02_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KW88F6281		/* SOC Name */
-
 #include "mv-common.h"
 
 /*
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index bb7ce8d3edeb..8dba4fcb4f84 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -9,12 +9,7 @@
 #ifndef _CONFIG_SHEEVAPLUG_H
 #define _CONFIG_SHEEVAPLUG_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-
-#include "mv-plug-common.h"
+#include "mv-common.h"
 
 /*
  *  Environment variables configurations
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9fae7ce8617c..43c53c764bbc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,4 +1,3 @@
-CONFIG_88F5182
 CONFIG_A003399_NOR_WORKAROUND
 CONFIG_A008044_WORKAROUND
 CONFIG_AM335X_USB0
@@ -42,9 +41,6 @@ CONFIG_BOARDDIR
 CONFIG_BOARDNAME
 CONFIG_BOARD_COMMON
 CONFIG_BOARD_ECC_SUPPORT
-CONFIG_BOARD_IS_OPENRD_BASE
-CONFIG_BOARD_IS_OPENRD_CLIENT
-CONFIG_BOARD_IS_OPENRD_ULTIMATE
 CONFIG_BOARD_NAME
 CONFIG_BOARD_POSTCLK_INIT
 CONFIG_BOARD_SIZE_LIMIT
@@ -103,7 +99,6 @@ CONFIG_CPU_ARMV8
 CONFIG_CPU_FREQ_HZ
 CONFIG_CQSPI_REF_CLK
 CONFIG_CUSTOMER_BOARD_SUPPORT
-CONFIG_D2NET_V2
 CONFIG_DB_784MP_GP
 CONFIG_DCACHE
 CONFIG_DEBUG
@@ -203,8 +198,6 @@ CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
 CONFIG_FEC_XCV_TYPE
-CONFIG_FEROCEON
-CONFIG_FEROCEON_88FR131
 CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_CFI_LEGACY
@@ -456,7 +449,6 @@ CONFIG_IMX
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IMX_HDMI
 CONFIG_IMX_VIDEO_SKIP
-CONFIG_INETSPACE_V2
 CONFIG_INTERRUPTS
 CONFIG_IODELAY_RECALIBRATION
 CONFIG_IOMUX_LPSR
@@ -519,9 +511,6 @@ CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
-CONFIG_KW88F6192
-CONFIG_KW88F6281
-CONFIG_KW88F6702
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LAYERSCAPE_NS_ACCESS
@@ -611,13 +600,8 @@ CONFIG_NAND_KMETER1
 CONFIG_NAND_OMAP_GPMC_WSCFG
 CONFIG_NAND_SECBOOT
 CONFIG_NAND_SPL
-CONFIG_NET2BIG_V2
 CONFIG_NETDEV
 CONFIG_NETMASK
-CONFIG_NETSPACE_LITE_V2
-CONFIG_NETSPACE_MAX_V2
-CONFIG_NETSPACE_MINI_V2
-CONFIG_NETSPACE_V2
 CONFIG_NET_RETRY_COUNT
 CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NFS_TIMEOUT
@@ -772,7 +756,6 @@ CONFIG_SET_BOOTARGS
 CONFIG_SET_DFU_ALT_BUF_LEN
 CONFIG_SH73A0
 CONFIG_SH7751_PCI
-CONFIG_SHEEVA_88SV131
 CONFIG_SH_ETHER_ALIGNE_SIZE
 CONFIG_SH_ETHER_BASE_ADDR
 CONFIG_SH_ETHER_CACHE_INVALIDATE
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 10/12] Convert CONFIG_SYS_KWD_CONFIG to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (7 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 09/12] Convert CONFIG_88F5182 et al to Kconfig Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:59   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 11/12] Convert CONFIG_KIRKWOOD_GPIO " Tom Rini
                   ` (2 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_SYS_KWD_CONFIG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/Kconfig                             |  8 ++++++++
 arch/arm/mach-kirkwood/include/mach/config.h |  9 ---------
 arch/arm/mach-mvebu/include/mach/config.h    |  9 ---------
 configs/SBx81LIFKW_defconfig                 |  1 +
 configs/SBx81LIFXCAT_defconfig               |  1 +
 configs/crs305-1g-4s-bit_defconfig           |  1 +
 configs/crs305-1g-4s_defconfig               |  1 +
 configs/crs326-24g-2s-bit_defconfig          |  1 +
 configs/crs326-24g-2s_defconfig              |  1 +
 configs/crs328-4c-20s-4s-bit_defconfig       |  1 +
 configs/crs328-4c-20s-4s_defconfig           |  1 +
 configs/d2net_v2_defconfig                   |  1 +
 configs/db-xc3-24g4xg_defconfig              |  1 +
 configs/dns325_defconfig                     |  1 +
 configs/dockstar_defconfig                   |  1 +
 configs/dreamplug_defconfig                  |  1 +
 configs/ds109_defconfig                      |  1 +
 configs/goflexhome_defconfig                 |  1 +
 configs/guruplug_defconfig                   |  1 +
 configs/ib62x0_defconfig                     |  1 +
 configs/iconnect_defconfig                   |  1 +
 configs/inetspace_v2_defconfig               |  1 +
 configs/km_kirkwood_128m16_defconfig         |  1 +
 configs/km_kirkwood_defconfig                |  1 +
 configs/km_kirkwood_pci_defconfig            |  1 +
 configs/kmcoge5un_defconfig                  |  1 +
 configs/kmnusa_defconfig                     |  1 +
 configs/kmsuse2_defconfig                    |  1 +
 configs/lschlv2_defconfig                    |  1 +
 configs/lsxhl_defconfig                      |  1 +
 configs/nas220_defconfig                     |  1 +
 configs/net2big_v2_defconfig                 |  1 +
 configs/netspace_lite_v2_defconfig           |  1 +
 configs/netspace_max_v2_defconfig            |  1 +
 configs/netspace_mini_v2_defconfig           |  1 +
 configs/netspace_v2_defconfig                |  1 +
 configs/nsa310s_defconfig                    |  1 +
 configs/openrd_base_defconfig                |  1 +
 configs/openrd_client_defconfig              |  1 +
 configs/openrd_ultimate_defconfig            |  1 +
 configs/pogo_e02_defconfig                   |  1 +
 configs/sheevaplug_defconfig                 |  1 +
 include/configs/SBx81LIFKW.h                 |  5 -----
 include/configs/SBx81LIFXCAT.h               |  5 -----
 include/configs/crs3xx-98dx3236.h            |  1 -
 include/configs/db-xc3-24g4xg.h              |  6 ------
 include/configs/km_kirkwood.h                |  9 ---------
 include/configs/lacie_kw.h                   | 18 ------------------
 include/configs/lsxl.h                       | 11 -----------
 scripts/config_whitelist.txt                 |  1 -
 50 files changed, 47 insertions(+), 74 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4bfca750c27b..08a06cd9e235 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2046,6 +2046,14 @@ config ISW_ENTRY_ADDR
 	  image headers.
 endif
 
+config SYS_KWD_CONFIG
+	string "kwbimage config file path"
+	depends on ARCH_KIRKWOOD || ARCH_MVEBU
+	default "arch/arm/mach-mvebu/kwbimage.cfg"
+	help
+	  Path within the source directory to the kwbimage.cfg file to use
+	  when packaging the U-Boot image for use.
+
 source "arch/arm/mach-apple/Kconfig"
 
 source "arch/arm/mach-aspeed/Kconfig"
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index 9fd90611bd98..eb9502361eef 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -27,15 +27,6 @@
 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8	/* Set RGMII Pad voltage to 1.8V */
 #define CONFIG_KIRKWOOD_PCIE_INIT       /* Enable PCIE Port0 for kernel */
 
-/*
- * By default kwbimage.cfg from board specific folder is used
- * If for some board, different configuration file need to be used,
- * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
- */
-#ifndef CONFIG_SYS_KWD_CONFIG
-#define	CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-#endif /* CONFIG_SYS_KWD_CONFIG */
-
 /* Kirkwood has 2k of Security SRAM, use it for SP */
 #define CONFIG_SYS_INIT_SP_ADDR		0xC8012000
 
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 6ecd394a533d..681f64961f0b 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -27,15 +27,6 @@
 
 #define CONFIG_SYS_L2_PL310
 
-/*
- * By default the generated mvebu kwbimage.cfg is used
- * If for some board, different configuration file need to be used,
- * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
- */
-#ifndef CONFIG_SYS_KWD_CONFIG
-#define	CONFIG_SYS_KWD_CONFIG	arch/arm/mach-mvebu/kwbimage.cfg
-#endif /* CONFIG_SYS_KWD_CONFIG */
-
 /* end of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR		0x00FF0000
 
diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig
index 6001bccd6f9d..ec7c7eb29565 100644
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/alliedtelesis/SBx81LIFKW/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00600000
 CONFIG_TARGET_SBx81LIFKW=y
 CONFIG_ENV_SIZE=0x2000
diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig
index 8835b75c732f..a3ddabd65758 100644
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00600000
 CONFIG_TARGET_SBx81LIFXCAT=y
 CONFIG_ENV_SIZE=0x2000
diff --git a/configs/crs305-1g-4s-bit_defconfig b/configs/crs305-1g-4s-bit_defconfig
index bf6186030cff..ff8f413810fd 100644
--- a/configs/crs305-1g-4s-bit_defconfig
+++ b/configs/crs305-1g-4s-bit_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CRS3XX_98DX3236=y
diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig
index 5fc805875bde..a71b6425ea5b 100644
--- a/configs/crs305-1g-4s_defconfig
+++ b/configs/crs305-1g-4s_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CRS3XX_98DX3236=y
diff --git a/configs/crs326-24g-2s-bit_defconfig b/configs/crs326-24g-2s-bit_defconfig
index 3de29490e898..c0746be76427 100644
--- a/configs/crs326-24g-2s-bit_defconfig
+++ b/configs/crs326-24g-2s-bit_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CRS3XX_98DX3236=y
diff --git a/configs/crs326-24g-2s_defconfig b/configs/crs326-24g-2s_defconfig
index 77296abfc9bf..344f1b082453 100644
--- a/configs/crs326-24g-2s_defconfig
+++ b/configs/crs326-24g-2s_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CRS3XX_98DX3236=y
diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig
index 513cc52562ed..edfd0a4faf93 100644
--- a/configs/crs328-4c-20s-4s-bit_defconfig
+++ b/configs/crs328-4c-20s-4s-bit_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CRS3XX_98DX3236=y
diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig
index dd0cd63b90c8..d6f93534dd9d 100644
--- a/configs/crs328-4c-20s-4s_defconfig
+++ b/configs/crs328-4c-20s-4s_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/mikrotik/crs3xx-98dx3236/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_CRS3XX_98DX3236=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 3f2763399b5e..8e1bb2d4a01a 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/net2big_v2/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NET2BIG_V2=y
diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig
index b2ee2c284313..3c0b045a21fa 100644
--- a/configs/db-xc3-24g4xg_defconfig
+++ b/configs/db-xc3-24g4xg_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/db-xc3-24g4xg/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_MEMTEST_START=0x00800000
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index a133402ff2f2..c1da0f545c63 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/d-link/dns325/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_TARGET_DNS325=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index ba934088e131..6c89a9a6fb21 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Seagate/dockstar/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_DOCKSTAR=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 3b4df5c0dbdb..557013dbacd1 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/dreamplug/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_DREAMPLUG=y
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index ba74ece738de..8e2aea9ad624 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -8,6 +8,7 @@ CONFIG_CMDLINE_TAG=y
 CONFIG_INITRD_TAG=y
 CONFIG_STATIC_MACH_TYPE=y
 CONFIG_MACH_TYPE=527
+CONFIG_SYS_KWD_CONFIG="board/Synology/ds109/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_DS109=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 70f703639c8c..ec8b7398d0a8 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Seagate/goflexhome/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_GOFLEXHOME=y
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 2e6b8e02825d..e7802afb0a0c 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/guruplug/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_GURUPLUG=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 913fb438cd15..23a211c39134 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/raidsonic/ib62x0/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_IB62X0=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index a6607faf7fa6..605b98b1642b 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/iomega/iconnect/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_ICONNECT=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index c3f9be8765fb..0af49d45f0c3 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage-is2.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index d6624dd9551d..c9832d3d51e4 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_128M16_1.cfg"
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_ENV_SIZE=0x2000
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index bf696cd2db28..b0a268e370d5 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_ENV_SIZE=0x2000
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 0731bb557293..38c4c1e2e483 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_KM_FPGA_CONFIG=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 12aa23095cce..f46f45d64abf 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_256M8_1.cfg"
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 06b2d1fb571d..36965722cde3 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_128M16_1.cfg"
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_KM_FPGA_CONFIG=y
diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig
index a528bf5cfe90..a3079c04327e 100644
--- a/configs/kmsuse2_defconfig
+++ b/configs/kmsuse2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_128M16_1.cfg"
 CONFIG_SYS_TEXT_BASE=0x07d00000
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_KM_FPGA_CONFIG=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 471b17e2efb3..dfcd39b4d5f4 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/buffalo/lsxl/kwbimage-lschl.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_LSXL=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 4188c3264f23..21e48949f9f0 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/buffalo/lsxl/kwbimage-lsxhl.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_LSXL=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 581d84518c17..d078714c2354 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Seagate/nas220/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NAS220=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 083d3e6e0220..ed60c48a16bb 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/net2big_v2/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NET2BIG_V2=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index e671d994f765..51b413c99034 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage-ns2l.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 607cb5a3f9a5..746854df77a5 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 203071d37775..4cb5036fe96f 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage-ns2l.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 84a2389d1780..51243a22a2dd 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/LaCie/netspace_v2/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 501e82bcee2f..46ca3bac4797 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/zyxel/nsa310s/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NSA310S=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index e79649ee7ea3..2c5a29cfe35f 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/openrd/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index 9d924f3cbc91..b21d41b1ed4f 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/openrd/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 7c2e41e72e08..ceeb62109aa4 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/openrd/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_OPENRD=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 94885b888e90..10f08a515d96 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -3,6 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_e02/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_POGO_E02=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 72304135cd40..6e39aa178a63 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_KIRKWOOD=y
+CONFIG_SYS_KWD_CONFIG="board/Marvell/sheevaplug/kwbimage.cfg"
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_SHEEVAPLUG=y
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 3ebeccc33bcd..6edc2b628ab4 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -6,11 +6,6 @@
 #ifndef _CONFIG_SBX81LIFKW_H
 #define _CONFIG_SBX81LIFKW_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE	0x00000000
 
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 53a6bdf0a302..50d02d3c1c97 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -6,11 +6,6 @@
 #ifndef _CONFIG_SBX81LIFXCAT_H
 #define _CONFIG_SBX81LIFXCAT_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE	0x00000000
 
diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h
index 27b45a7605d2..4dbc75826699 100644
--- a/include/configs/crs3xx-98dx3236.h
+++ b/include/configs/crs3xx-98dx3236.h
@@ -11,7 +11,6 @@
  */
 
 #define CONFIG_SYS_BOOTM_LEN	(64 * 1024 * 1024) /* 64 MB */
-#define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
 
 /* Environment in SPI NOR flash */
 
diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h
index 6a4c5a7ab554..1d242bf4e650 100644
--- a/include/configs/db-xc3-24g4xg.h
+++ b/include/configs/db-xc3-24g4xg.h
@@ -6,12 +6,6 @@
 #ifndef _CONFIG_DB_XC3_24G4G_H
 #define _CONFIG_DB_XC3_24G4G_H
 
-/*
- * High Level Configuration Options (easy to change)
- */
-
-#define CONFIG_SYS_KWD_CONFIG	$(CONFIG_BOARDDIR)/kwbimage.cfg
-
 /* Environment in SPI NOR flash */
 
 /* NAND */
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index 82c2a129223e..e58a69501b33 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -34,8 +34,6 @@
 /* KM_KIRKWOOD_128M16 */
 #elif defined(CONFIG_KM_KIRKWOOD_128M16)
 #define CONFIG_HOSTNAME			"km_kirkwood_128m16"
-#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
 #define CONFIG_KM_DISABLE_PCIE
 
 /* KM_NUSA */
@@ -43,21 +41,14 @@
 
 #define CONFIG_HOSTNAME			"kmnusa"
 
-#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
-
 /* KMCOGE5UN */
 #elif defined(CONFIG_KM_COGE5UN)
-#undef	CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg
 #define CONFIG_HOSTNAME			"kmcoge5un"
 #define CONFIG_KM_DISABLE_PCIE
 
 /* KM_SUSE2 */
 #elif defined(CONFIG_KM_SUSE2)
 #define CONFIG_HOSTNAME			"kmsuse2"
-#undef CONFIG_SYS_KWD_CONFIG
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
 #define CONFIG_KM_UBI_PART_BOOT_OPTS		",2048"
 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
 #else
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index d6c5425a9dd0..0d6dd30e0c4f 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -6,24 +6,6 @@
 #ifndef _CONFIG_LACIE_KW_H
 #define _CONFIG_LACIE_KW_H
 
-/*
- * SDRAM configuration
- */
-
-/*
- * Different SDRAM configuration and size for some of the boards derived
- * from the Network Space v2
- */
-#if defined(CONFIG_INETSPACE_V2)
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-is2.cfg
-#elif defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg
-#endif
-
-/*
- * mv-common.h should be defined after CMD configs since it used them
- * to enable certain macros
- */
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 5891a1d8c594..fad69ab1f854 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -7,17 +7,6 @@
 #ifndef _CONFIG_LSXL_H
 #define _CONFIG_LSXL_H
 
-/*
- * Version number information
- */
-#if defined(CONFIG_LSCHLV2)
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lschl.cfg
-#elif defined(CONFIG_LSXHL)
-#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg
-#else
-#error "unknown board"
-#endif
-
 /*
  * General configuration options
  */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 43c53c764bbc..a248b5686fad 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1466,7 +1466,6 @@ CONFIG_SYS_JFFS2_FIRST_SECTOR
 CONFIG_SYS_JFFS2_NUM_BANKS
 CONFIG_SYS_KMBEC_FPGA_BASE
 CONFIG_SYS_KMBEC_FPGA_SIZE
-CONFIG_SYS_KWD_CONFIG
 CONFIG_SYS_L2_PL310
 CONFIG_SYS_L2_SIZE
 CONFIG_SYS_L3_SIZE
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 11/12] Convert CONFIG_KIRKWOOD_GPIO to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (8 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 10/12] Convert CONFIG_SYS_KWD_CONFIG " Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:59   ` Tom Rini
  2021-12-17 23:08 ` [PATCH 12/12] Convert CONFIG_JFFS2_DEV et al " Tom Rini
  2021-12-28 12:58 ` [PATCH 01/12] Convert CONFIG_83XX_PCICLK " Tom Rini
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_KIRKWOOD_GPIO

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/SBx81LIFKW_defconfig         | 1 +
 configs/SBx81LIFXCAT_defconfig       | 1 +
 configs/d2net_v2_defconfig           | 1 +
 configs/dns325_defconfig             | 1 +
 configs/inetspace_v2_defconfig       | 1 +
 configs/km_kirkwood_128m16_defconfig | 1 +
 configs/km_kirkwood_defconfig        | 1 +
 configs/km_kirkwood_pci_defconfig    | 1 +
 configs/kmcoge5un_defconfig          | 1 +
 configs/kmnusa_defconfig             | 1 +
 configs/kmsuse2_defconfig            | 1 +
 configs/lschlv2_defconfig            | 1 +
 configs/lsxhl_defconfig              | 1 +
 configs/nas220_defconfig             | 1 +
 configs/net2big_v2_defconfig         | 1 +
 configs/netspace_lite_v2_defconfig   | 1 +
 configs/netspace_max_v2_defconfig    | 1 +
 configs/netspace_mini_v2_defconfig   | 1 +
 configs/netspace_v2_defconfig        | 1 +
 drivers/gpio/Kconfig                 | 5 +++++
 include/configs/SBx81LIFKW.h         | 1 -
 include/configs/SBx81LIFXCAT.h       | 1 -
 include/configs/dns325.h             | 1 -
 include/configs/km/km_arm.h          | 1 -
 include/configs/lacie_kw.h           | 1 -
 include/configs/lsxl.h               | 2 --
 include/configs/nas220.h             | 2 --
 scripts/config_whitelist.txt         | 1 -
 28 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/configs/SBx81LIFKW_defconfig b/configs/SBx81LIFKW_defconfig
index ec7c7eb29565..77f44f6329ed 100644
--- a/configs/SBx81LIFKW_defconfig
+++ b/configs/SBx81LIFKW_defconfig
@@ -35,6 +35,7 @@ CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
diff --git a/configs/SBx81LIFXCAT_defconfig b/configs/SBx81LIFXCAT_defconfig
index a3ddabd65758..b84e3bd9d6ac 100644
--- a/configs/SBx81LIFXCAT_defconfig
+++ b/configs/SBx81LIFXCAT_defconfig
@@ -37,6 +37,7 @@ CONFIG_ENV_SPI_MAX_HZ=20000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 8e1bb2d4a01a..a856202d110e 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -47,6 +47,7 @@ CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index c1da0f545c63..144fd30706b5 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -41,6 +41,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
+CONFIG_KIRKWOOD_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 0af49d45f0c3..8779e58b9322 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -47,6 +47,7 @@ CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index c9832d3d51e4..f4b1abfd6a9d 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -49,6 +49,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SOFT=y
 CONFIG_SYS_I2C_SOFT_SLAVE=0x0
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index b0a268e370d5..eba4f097775d 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -49,6 +49,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SOFT=y
 CONFIG_SYS_I2C_SOFT_SLAVE=0x0
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index 38c4c1e2e483..5d19c5117602 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -50,6 +50,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SOFT=y
 CONFIG_SYS_I2C_SOFT_SLAVE=0x0
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index f46f45d64abf..9124504e3232 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -53,6 +53,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SOFT=y
 CONFIG_SYS_I2C_SOFT_SLAVE=0x0
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 36965722cde3..d81c78761202 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -53,6 +53,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SOFT=y
 CONFIG_SYS_I2C_SOFT_SLAVE=0x0
diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig
index a3079c04327e..d274c9576414 100644
--- a/configs/kmsuse2_defconfig
+++ b/configs/kmsuse2_defconfig
@@ -54,6 +54,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NETCONSOLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_RAM=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SOFT=y
 CONFIG_SYS_I2C_SOFT_SLAVE=0x0
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index dfcd39b4d5f4..497da09d4399 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -39,6 +39,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 21e48949f9f0..cadeb9afd3cb 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -39,6 +39,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index d078714c2354..259eb2fa32ce 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
+CONFIG_KIRKWOOD_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index ed60c48a16bb..985f530fb873 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -48,6 +48,7 @@ CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 51b413c99034..668f4ea291d4 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -48,6 +48,7 @@ CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 746854df77a5..25ce3c61a1f8 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -48,6 +48,7 @@ CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 4cb5036fe96f..0c9a3036eb13 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -47,6 +47,7 @@ CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
 CONFIG_BLK=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 51243a22a2dd..8f662edd1682 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -48,6 +48,7 @@ CONFIG_ENV_ADDR=0x70000
 CONFIG_NETCONSOLE=y
 CONFIG_DM=y
 CONFIG_SATA_MV=y
+CONFIG_KIRKWOOD_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x0
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 40abc33772eb..b41a755fc758 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -177,6 +177,11 @@ config HSDK_CREG_GPIO
 	help
 	  This driver supports CREG GPIOs on Synopsys HSDK SOC.
 
+config KIRKWOOD_GPIO
+	bool "Kirkwood GPIO driver"
+	help
+	  This drdiver supports GPIOs on Kirkwood platforms
+
 config LPC32XX_GPIO
 	bool "LPC32XX GPIO driver"
 	depends on DM
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 6edc2b628ab4..dbaffc635d24 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -12,7 +12,6 @@
 #define CONFIG_KIRKWOOD_EGIGA_INIT	/* Enable GbePort0/1 for kernel */
 #define CONFIG_KIRKWOOD_PCIE_INIT	/* Enable PCIE Port0 */
 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8	/* Set RGMII Pad voltage to 1.8V */
-#define CONFIG_KIRKWOOD_GPIO	1
 
 /*
  * NS16550 Configuration
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 50d02d3c1c97..bbd3ccc6d9d2 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -12,7 +12,6 @@
 #define CONFIG_KIRKWOOD_EGIGA_INIT	/* Enable GbePort0/1 for kernel */
 #define CONFIG_KIRKWOOD_PCIE_INIT	/* Enable PCIE Port0 */
 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8	/* Set RGMII Pad voltage to 1.8V */
-#define CONFIG_KIRKWOOD_GPIO	1
 
 /*
  * NS16550 Configuration
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index e35c16add4dd..0590704000ec 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -26,7 +26,6 @@
 /*
  * Enable GPI0 support
  */
-#define CONFIG_KIRKWOOD_GPIO
 
 /*
  * Environment variables configurations
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 6501884d32ce..a485c3ac6d1d 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -68,7 +68,6 @@
 #undef CONFIG_I2C_MVTWSI
 #define CONFIG_SYS_I2C_INIT_BOARD
 
-#define	CONFIG_KIRKWOOD_GPIO		/* Enable GPIO Support */
 #define CONFIG_SYS_NUM_I2C_BUSES	6
 #define CONFIG_SYS_I2C_MAX_HOPS		1
 #define CONFIG_SYS_I2C_BUSES	{	{0, {I2C_NULL_HOP} }, \
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 0d6dd30e0c4f..046f1888cb18 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -41,7 +41,6 @@
 /*
  * Enable GPI0 support
  */
-#define CONFIG_KIRKWOOD_GPIO
 
 /*
  * Enable I2C support
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index fad69ab1f854..afa0206fb93a 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -11,8 +11,6 @@
  * General configuration options
  */
 
-#define CONFIG_KIRKWOOD_GPIO
-
 #include "mv-common.h"
 
 /* loading initramfs images without uimage header */
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 12480d9d5525..a4347ae1aa15 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -63,6 +63,4 @@
  * EFI partition
  */
 
-#define CONFIG_KIRKWOOD_GPIO
-
 #endif /* _CONFIG_NAS220_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a248b5686fad..69835e5e5b9d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -470,7 +470,6 @@ CONFIG_JRSTARTR_JR0
 CONFIG_KEEP_SERVERADDR
 CONFIG_KEY_REVOCATION
 CONFIG_KIRKWOOD_EGIGA_INIT
-CONFIG_KIRKWOOD_GPIO
 CONFIG_KIRKWOOD_PCIE_INIT
 CONFIG_KIRKWOOD_RGMII_PAD_1V8
 CONFIG_KM8321
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [PATCH 12/12] Convert CONFIG_JFFS2_DEV et al to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (9 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 11/12] Convert CONFIG_KIRKWOOD_GPIO " Tom Rini
@ 2021-12-17 23:08 ` Tom Rini
  2021-12-28 12:59   ` Tom Rini
  2021-12-28 12:58 ` [PATCH 01/12] Convert CONFIG_83XX_PCICLK " Tom Rini
  11 siblings, 1 reply; 24+ messages in thread
From: Tom Rini @ 2021-12-17 23:08 UTC (permalink / raw)
  To: u-boot

This converts the following to Kconfig:
   CONFIG_JFFS2_DEV
   CONFIG_JFFS2_LZO
   CONFIG_JFFS2_NAND
   CONFIG_JFFS2_PART_OFFSET
   CONFIG_JFFS2_PART_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 README                             |  3 ---
 cmd/Kconfig                        | 21 +++++++++++++++++++++
 cmd/jffs2.c                        | 12 ------------
 configs/devkit8000_defconfig       |  4 ++++
 configs/ethernut5_defconfig        |  1 +
 configs/ids8313_defconfig          |  1 +
 configs/nas220_defconfig           |  2 ++
 configs/pm9263_defconfig           |  3 +++
 fs/jffs2/Kconfig                   | 12 ++++++++++++
 include/configs/M5329EVB.h         |  4 ----
 include/configs/M5373EVB.h         |  4 ----
 include/configs/devkit8000.h       |  9 ---------
 include/configs/ethernut5.h        |  3 ---
 include/configs/ids8313.h          |  3 ---
 include/configs/imx27lite-common.h |  1 -
 include/configs/nas220.h           |  6 ------
 include/configs/pm9263.h           |  5 -----
 include/configs/stmark2.h          |  3 ---
 scripts/config_whitelist.txt       |  4 ----
 19 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/README b/README
index 7d46c567a3f9..e1d74b3aa86e 100644
--- a/README
+++ b/README
@@ -1028,9 +1028,6 @@ The following options need to be configured:
 		sending again an USB request to the device.
 
 - Journaling Flash filesystem support:
-		CONFIG_JFFS2_NAND
-		Define these for a default partition on a NAND device
-
 		CONFIG_SYS_JFFS2_FIRST_SECTOR,
 		CONFIG_SYS_JFFS2_FIRST_BANK, CONFIG_SYS_JFFS2_NUM_BANKS
 		Define these for a default partition on a NOR device
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 7747ab50a042..ef82f794b557 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -2219,6 +2219,27 @@ config CMD_JFFS2
 	  provide the ability to load files, list directories and obtain
 	  filesystem information.
 
+config JFFS2_DEV
+	string "Default device for JFFS2"
+	depends on CMD_JFFS2
+	default "nor0"
+	help
+	  The default device to use with the jffs2 command.
+
+config JFFS2_PART_OFFSET
+	hex "Default offset within flash to locate the JFFS2 image"
+	depends on CMD_JFFS2
+	default 0x0
+	help
+	  The default offset within flash to locate the JFFS2 image.
+
+config JFFS2_PART_SIZE
+	hex "Default size of JFFS2 partition"
+	depends on CMD_JFFS2
+	default 0xFFFFFFFF
+	help
+	  The default size of the JFFS2 partition
+
 config CMD_MTDPARTS
 	bool "MTD partition support"
 	depends on MTD
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 63bd55263a29..6f15b57b6a18 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -360,11 +360,7 @@ int mtdparts_init(void)
 		/* id */
 		id->mtd_id = "single part";
 
-#if defined(CONFIG_JFFS2_DEV)
 		dev_name = CONFIG_JFFS2_DEV;
-#else
-		dev_name = "nor0";
-#endif
 
 		if ((mtd_id_parse(dev_name, NULL, &id->type, &id->num) != 0) ||
 				(mtd_device_validate(id->type, id->num, &size) != 0)) {
@@ -382,17 +378,9 @@ int mtdparts_init(void)
 		part->name = "static";
 		part->auto_name = 0;
 
-#if defined(CONFIG_JFFS2_PART_SIZE)
 		part->size = CONFIG_JFFS2_PART_SIZE;
-#else
-		part->size = SIZE_REMAINING;
-#endif
 
-#if defined(CONFIG_JFFS2_PART_OFFSET)
 		part->offset = CONFIG_JFFS2_PART_OFFSET;
-#else
-		part->offset = 0x00000000;
-#endif
 
 		part->dev = current_mtd_dev;
 		INIT_LIST_HEAD(&part->link);
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 4017eb69add8..4034f9ca7512 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -27,6 +27,9 @@ CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NTPSERVER=y
 CONFIG_CMD_JFFS2=y
+CONFIG_JFFS2_DEV="nand0"
+CONFIG_JFFS2_PART_OFFSET=0x680000
+CONFIG_JFFS2_PART_SIZE=0xF980000
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
@@ -50,4 +53,5 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_CONS_INDEX=3
+CONFIG_JFFS2_NAND=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index e7ebfef38619..1821b23ed5f2 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -81,3 +81,4 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_JFFS2_NAND=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 4ee97ae55557..246cc3d045f8 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -199,4 +199,5 @@ CONFIG_TSEC_ENET=y
 CONFIG_RTC_PCF8563=y
 CONFIG_SYS_NS16550=y
 CONFIG_WATCHDOG=y
+CONFIG_JFFS2_NAND=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 259eb2fa32ce..7e4e19a9f788 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -54,3 +54,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_NAND=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index c755aaaae973..e8a5b4df9bdf 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -31,6 +31,8 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_JFFS2=y
+CONFIG_JFFS2_DEV="nand0"
+CONFIG_JFFS2_PART_SIZE=0x10000000
 CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0,nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:256k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),-(rootfs);nand:-(nand)"
 CONFIG_OF_CONTROL=y
@@ -63,3 +65,4 @@ CONFIG_USB=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_LCD=y
+CONFIG_JFFS2_NAND=y
diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig
index 1b9ecdd8cca3..0e79c3409062 100644
--- a/fs/jffs2/Kconfig
+++ b/fs/jffs2/Kconfig
@@ -5,3 +5,15 @@ config FS_JFFS2
 	  Flash File System version 2). JFFS2 is a log-structured file system
 	  for use with flash memory devices. It supports raw NAND devices,
 	  hard links and compression.
+
+config JFFS2_LZO
+	bool "Enable LZO compression in JFFS2"
+	depends on FS_JFFS2
+	help
+	  Enable LZO compression in the JFFS2 filesystem
+
+config JFFS2_NAND
+	bool "Enable JFFS2 support for NAND flash"
+	depends on FS_JFFS2
+	help
+	  Enable support for NAND flash as the backing store for JFFS2.
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 16343b5d3864..f96f54ef65bc 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -135,10 +135,6 @@
 #	define CONFIG_SYS_NAND_SIZE		1
 #	define CONFIG_SYS_NAND_BASE_LIST	{ CONFIG_SYS_NAND_BASE }
 #	define NAND_ALLOW_ERASE_ALL	1
-#	define CONFIG_JFFS2_NAND	1
-#	define CONFIG_JFFS2_DEV		"nand0"
-#	define CONFIG_JFFS2_PART_SIZE	(CONFIG_SYS_CS2_MASK & ~1)
-#	define CONFIG_JFFS2_PART_OFFSET	0x00000000
 #endif
 
 #define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_CS0_BASE
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index ccc59ebed253..b7906013e09e 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -137,10 +137,6 @@
 #	define CONFIG_SYS_NAND_SIZE		1
 #	define CONFIG_SYS_NAND_BASE_LIST	{ CONFIG_SYS_NAND_BASE }
 #	define NAND_ALLOW_ERASE_ALL	1
-#	define CONFIG_JFFS2_NAND	1
-#	define CONFIG_JFFS2_DEV		"nand0"
-#	define CONFIG_JFFS2_PART_SIZE	(CONFIG_SYS_CS2_MASK & ~1)
-#	define CONFIG_JFFS2_PART_OFFSET	0x00000000
 #endif
 
 #define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_CS0_BASE
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index d813d924a689..9282f8372850 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -46,15 +46,6 @@
 
 /* TWL4030 */
 
-/* Board NAND Info */
-#define CONFIG_JFFS2_NAND
-/* nand device jffs2 lives on */
-#define CONFIG_JFFS2_DEV		"nand0"
-/* start of jffs2 partition */
-#define CONFIG_JFFS2_PART_OFFSET	0x680000
-#define CONFIG_JFFS2_PART_SIZE		0xf980000	/* size of jffs2 */
-							/* partition */
-
 /* BOOTP/DHCP options */
 #define CONFIG_BOOTP_NISDOMAIN
 #define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 75409a4eccac..ccf615efa3df 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -54,9 +54,6 @@
 #endif
 
 /* JFFS2 */
-#ifdef CONFIG_CMD_JFFS2
-#define CONFIG_JFFS2_NAND
-#endif
 
 /* Ethernet */
 #define CONFIG_NET_RETRY_COUNT		20
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index c88c72dfddab..206a57a65325 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -233,9 +233,6 @@
 #define CONFIG_TIMESTAMP
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE
 
-#define CONFIG_JFFS2_NAND
-#define CONFIG_JFFS2_DEV		"0"
-
 /* mtdparts command line support */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index c289d694e9b3..dffe175f50af 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -103,7 +103,6 @@
 #define CONFIG_MXC_NAND_REGS_BASE	0xd8000000
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BASE		0xd8000000
-#define CONFIG_JFFS2_NAND
 #define CONFIG_MXC_NAND_HWECC
 
 /*
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index a4347ae1aa15..815f81f6493d 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -53,12 +53,6 @@
 #define CONFIG_PHY_BASE_ADR 8
 #endif /* CONFIG_CMD_NET */
 
-/*
- * File system
- */
-#define CONFIG_JFFS2_NAND
-#define CONFIG_JFFS2_LZO
-
 /*
  * EFI partition
  */
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index d4f787029810..e9eb736ecb1a 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -179,11 +179,6 @@
 
 #endif
 
-#define CONFIG_JFFS2_NAND		1
-#define CONFIG_JFFS2_DEV		"nand0" /* NAND device jffs2 lives on */
-#define CONFIG_JFFS2_PART_OFFSET	0	/* start of jffs2 partition */
-#define CONFIG_JFFS2_PART_SIZE		(256 * 1024 * 1024) /* partition size*/
-
 /* PSRAM */
 #define	PHYS_PSRAM			0x70000000
 #define	PHYS_PSRAM_SIZE			0x00400000	/* 4MB */
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index 1a5cf6b78110..18a57f2231b6 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -41,9 +41,6 @@
 #define CONFIG_RTC_MCFRRTC
 #define CONFIG_SYS_MCFRRTC_BASE		0xFC0A8000
 
-/* spi not partitions */
-#define CONFIG_JFFS2_DEV		"nor0"
-
 /* Timer */
 #define CONFIG_MCFTMR
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 69835e5e5b9d..f57c389492c2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -461,10 +461,6 @@ CONFIG_IRAM_SIZE
 CONFIG_IRAM_STACK
 CONFIG_IRAM_TOP
 CONFIG_IRDA_BASE
-CONFIG_JFFS2_DEV
-CONFIG_JFFS2_LZO
-CONFIG_JFFS2_NAND
-CONFIG_JFFS2_PART_OFFSET
 CONFIG_JFFS2_PART_SIZE
 CONFIG_JRSTARTR_JR0
 CONFIG_KEEP_SERVERADDR
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* Re: [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig
  2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
                   ` (10 preceding siblings ...)
  2021-12-17 23:08 ` [PATCH 12/12] Convert CONFIG_JFFS2_DEV et al " Tom Rini
@ 2021-12-28 12:58 ` Tom Rini
  11 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

On Fri, Dec 17, 2021 at 06:08:36PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_83XX_PCICLK
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols
  2021-12-17 23:08 ` [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

On Fri, Dec 17, 2021 at 06:08:37PM -0500, Tom Rini wrote:

> Neither of these symbols are referenced anywhere else, so remove them.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 03/12] Convert CONFIG_SYS_I2C_EEPROM_ADDR_LEN to Kconfig
  2021-12-17 23:08 ` [PATCH 03/12] Convert CONFIG_SYS_I2C_EEPROM_ADDR_LEN to Kconfig Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

On Fri, Dec 17, 2021 at 06:08:38PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_SYS_I2C_EEPROM_ADDR_LEN
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 04/12] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8
  2021-12-17 23:08 ` [PATCH 04/12] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8 Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

On Fri, Dec 17, 2021 at 06:08:39PM -0500, Tom Rini wrote:

> The only place we use CONFIG_CPU_ARMV8 was in the arm_dcc serial driver.
> Switch this to CONFIG_ARM64 today, and if in the future we need finer
> granularity tuning here, a new CONFIG_SERIAL option needs to be
> introduced.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 05/12] Convert CONFIG_CPU_PXA27X to Kconfig
  2021-12-17 23:08 ` [PATCH 05/12] Convert CONFIG_CPU_PXA27X to Kconfig Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

On Fri, Dec 17, 2021 at 06:08:40PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_CPU_PXA27X
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 06/12] Convert CONFIG_CPU_SH7751 to Kconfig
  2021-12-17 23:08 ` [PATCH 06/12] Convert CONFIG_CPU_SH7751 " Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

On Fri, Dec 17, 2021 at 06:08:41PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_CPU_SH7751
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 07/12] Convert CONFIG_CPU_FREQ_HZ to Kconfig
  2021-12-17 23:08 ` [PATCH 07/12] Convert CONFIG_CPU_FREQ_HZ " Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot; +Cc: Michal Simek

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

On Fri, Dec 17, 2021 at 06:08:42PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_CPU_FREQ_HZ
> 
> Cc: Michal Simek <monstr@monstr.eu>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 08/12] Kconfig: Remove some symbols from the whitelist
  2021-12-17 23:08 ` [PATCH 08/12] Kconfig: Remove some symbols from the whitelist Tom Rini
@ 2021-12-28 12:58   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:58 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

On Fri, Dec 17, 2021 at 06:08:43PM -0500, Tom Rini wrote:

> There are a number of symbols that are never defined, only referenced in
> code imported from the Linux kernel or similar.  Drop them from the list.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 09/12] Convert CONFIG_88F5182 et al to Kconfig
  2021-12-17 23:08 ` [PATCH 09/12] Convert CONFIG_88F5182 et al to Kconfig Tom Rini
@ 2021-12-28 12:59   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:59 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

On Fri, Dec 17, 2021 at 06:08:44PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_88F5182
>    CONFIG_BOARD_IS_OPENRD_BASE
>    CONFIG_BOARD_IS_OPENRD_CLIENT
>    CONFIG_BOARD_IS_OPENRD_ULTIMATE
>    CONFIG_D2NET_V2
>    CONFIG_FEROCEON
>    CONFIG_FEROCEON_88FR131
>    CONFIG_INETSPACE_V2
>    CONFIG_KW88F6192
>    CONFIG_KW88F6281
>    CONFIG_KW88F6702
>    CONFIG_NET2BIG_V2
>    CONFIG_NETSPACE_LITE_V2
>    CONFIG_NETSPACE_MAX_V2
>    CONFIG_NETSPACE_MINI_V2
>    CONFIG_NETSPACE_V2
>    CONFIG_SHEEVA_88SV131
> 
> At this point mv-plug-common.h is now only an include of mv-common.h so
> remove that indirection.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 10/12] Convert CONFIG_SYS_KWD_CONFIG to Kconfig
  2021-12-17 23:08 ` [PATCH 10/12] Convert CONFIG_SYS_KWD_CONFIG " Tom Rini
@ 2021-12-28 12:59   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:59 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

On Fri, Dec 17, 2021 at 06:08:45PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_SYS_KWD_CONFIG
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 11/12] Convert CONFIG_KIRKWOOD_GPIO to Kconfig
  2021-12-17 23:08 ` [PATCH 11/12] Convert CONFIG_KIRKWOOD_GPIO " Tom Rini
@ 2021-12-28 12:59   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:59 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

On Fri, Dec 17, 2021 at 06:08:46PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_KIRKWOOD_GPIO
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PATCH 12/12] Convert CONFIG_JFFS2_DEV et al to Kconfig
  2021-12-17 23:08 ` [PATCH 12/12] Convert CONFIG_JFFS2_DEV et al " Tom Rini
@ 2021-12-28 12:59   ` Tom Rini
  0 siblings, 0 replies; 24+ messages in thread
From: Tom Rini @ 2021-12-28 12:59 UTC (permalink / raw)
  To: u-boot

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

On Fri, Dec 17, 2021 at 06:08:47PM -0500, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_JFFS2_DEV
>    CONFIG_JFFS2_LZO
>    CONFIG_JFFS2_NAND
>    CONFIG_JFFS2_PART_OFFSET
>    CONFIG_JFFS2_PART_SIZE
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2021-12-28 13:03 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-17 23:08 [PATCH 01/12] Convert CONFIG_83XX_PCICLK to Kconfig Tom Rini
2021-12-17 23:08 ` [PATCH 02/12] ppc: mpc83xx: Remove unused CONFIG symbols Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 03/12] Convert CONFIG_SYS_I2C_EEPROM_ADDR_LEN to Kconfig Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 04/12] serial: arm_dcc: Use CONFIG_ARM64 not CONFIG_CPU_ARMV8 Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 05/12] Convert CONFIG_CPU_PXA27X to Kconfig Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 06/12] Convert CONFIG_CPU_SH7751 " Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 07/12] Convert CONFIG_CPU_FREQ_HZ " Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 08/12] Kconfig: Remove some symbols from the whitelist Tom Rini
2021-12-28 12:58   ` Tom Rini
2021-12-17 23:08 ` [PATCH 09/12] Convert CONFIG_88F5182 et al to Kconfig Tom Rini
2021-12-28 12:59   ` Tom Rini
2021-12-17 23:08 ` [PATCH 10/12] Convert CONFIG_SYS_KWD_CONFIG " Tom Rini
2021-12-28 12:59   ` Tom Rini
2021-12-17 23:08 ` [PATCH 11/12] Convert CONFIG_KIRKWOOD_GPIO " Tom Rini
2021-12-28 12:59   ` Tom Rini
2021-12-17 23:08 ` [PATCH 12/12] Convert CONFIG_JFFS2_DEV et al " Tom Rini
2021-12-28 12:59   ` Tom Rini
2021-12-28 12:58 ` [PATCH 01/12] Convert CONFIG_83XX_PCICLK " Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).