[PATCH 09/38] Convert CONFIG_HWCONFIG to Kconfig

Tom Rini
2022-11-19T23:47:39Z

This converts the following to Kconfig:
CONFIG_HWCONFIG

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

diff --git a/common/Kconfig b/common/Kconfig
index 21434c5cf16a..053e93eb1ab4 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -676,6 +676,10 @@ config CLOCKS
bool "Call set_cpu_clk_info"
depends on ARM

+config HWCONFIG
+ bool "hwconfig infrastructure"
+ default y if PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
+
config SYS_FSL_CLK
bool
depends on ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3 || \
diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index 6c41d7c88d1e..d8d6417d21e6 100644
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_DELAY_STR="root"
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run flashboot"
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
# CONFIG_AUTO_COMPLETE is not set
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index ec80edf293a6..9b1b61981789 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -35,6 +35,7 @@ CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
CONFIG_MISC_INIT_R=y
CONFIG_SPL_PAD_TO=0x8000
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index 01cdc4f7843f..9332c8cb3ff5 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -29,6 +29,7 @@ CONFIG_BOOTCOMMAND="run envboot; run mmcboot; "
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PBSIZE=1050
diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig
index 2e0f27b2cb19..a947dce4f5f6 100644
--- a/configs/da850evm_nand_defconfig
+++ b/configs/da850evm_nand_defconfig
@@ -33,6 +33,7 @@ CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb"
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
CONFIG_SPL_PAD_TO=0x8000
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0xc0000000
diff --git a/configs/gazerbeam_defconfig b/configs/gazerbeam_defconfig
index 3974e3d2bd32..d2946971b482 100644
--- a/configs/gazerbeam_defconfig
+++ b/configs/gazerbeam_defconfig
@@ -131,6 +131,7 @@ CONFIG_DISPLAY_CPUINFO=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_CBSIZE=1024
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index ce81b558ee21..b275247d25d4 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
CONFIG_MISC_INIT_R=y
CONFIG_PCI_INIT_R=y
CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 3ef909a1ce30..6169042c7e6a 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
CONFIG_MISC_INIT_R=y
CONFIG_PCI_INIT_R=y
CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index d3d4876658a0..6d57ad49a13c 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -39,6 +39,7 @@ CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HWCONFIG=y
CONFIG_MISC_INIT_R=y
CONFIG_PCI_INIT_R=y
CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 298ff16b7eb4..71d196533f7e 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -167,6 +167,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 9386f2c51216..66ec936cce4a 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -137,6 +137,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 173306668fb2..3ba334c2401c 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -150,6 +150,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index c281611dd4c5..4a02e5e88fc1 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -130,6 +130,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index e099f74de1c2..55158864ea33 100644
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -150,6 +150,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/kontron_sl28_defconfig b/configs/kontron_sl28_defconfig
index f044334e80e6..9b90ed478cc4 100644
--- a/configs/kontron_sl28_defconfig
+++ b/configs/kontron_sl28_defconfig
@@ -39,6 +39,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=10
CONFIG_USE_BOOTARGS=y
CONFIG_BOARD_LATE_INIT=y
+# CONFIG_HWCONFIG is not set
CONFIG_PCI_INIT_R=y
CONFIG_SPL_MAX_SIZE=0x20000
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig
index 98e37f18b4f2..90c1b94b0214 100644
--- a/configs/legoev3_defconfig
+++ b/configs/legoev3_defconfig
@@ -23,6 +23,7 @@ CONFIG_BOOTCOMMAND="if mmc rescan; then if run loadbootscr; then run bootscript;
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_BOARD_LATE_INIT=y
CONFIG_CLOCKS=y
+CONFIG_HWCONFIG=y
CONFIG_HUSH_PARSER=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_BOOTM_PLAN9 is not set
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index b89c348e5a52..ab52ea26a089 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -23,6 +23,7 @@ CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PBSIZE=276
CONFIG_CMD_REGINFO=y
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 3b8560f3e061..894a79df59e9 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -130,6 +130,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 04ce0b3afecc..6e66e6ce3052 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -152,6 +152,7 @@ CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n"
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_BOARD_EARLY_INIT_R=y
+# CONFIG_HWCONFIG is not set
CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/doc/README.hwconfig b/doc/README.hwconfig
index b6ddb438cfa7..5408a22bb6a4 100644
--- a/doc/README.hwconfig
+++ b/doc/README.hwconfig
@@ -1,6 +1,3 @@
-To enable this feature just define CONFIG_HWCONFIG in your board
-config file.
-
This implements a simple hwconfig infrastructure: an
interface for software knobs to control hardware.

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 717320c34aeb..2796adbdcd8f 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -14,8 +14,6 @@
* High Level Configuration Options
*/

-#define CONFIG_HWCONFIG
-
/*
* On-board devices
*/
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index e41b8e0843a7..75ac26957078 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -122,8 +122,6 @@
#define CFG_SYS_FLASH_BANKS_LIST \
{CFG_SYS_FLASH_BASE_PHYS + 0x800000, CFG_SYS_FLASH_BASE_PHYS}

-#define CONFIG_HWCONFIG /* enable hwconfig */
-
/*
* SDRAM on the Local Bus
*/
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index a8af0a101c84..0a1b932e94e8 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -96,7 +96,6 @@
#endif
#endif

-#define CONFIG_HWCONFIG
/*
* These can be toggled for performance analysis, otherwise use default.
*/
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 1e02855fefd8..acbd43419f2e 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -132,8 +132,6 @@

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS + 0x8000000}

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index b5fb0a9b529e..e394237daf08 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -270,8 +270,6 @@
#define CFG_SYS_CS1_FTIM3 CFG_SYS_NAND_FTIM3
#endif

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index bee4b704a24f..f681a2182298 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -248,8 +248,6 @@
#define CFG_SYS_CS1_FTIM3 CFG_SYS_NAND_FTIM3
#endif

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index be8c30db26a7..a93e05dd4d2d 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -246,8 +246,6 @@
#define CFG_SYS_CS2_FTIM3 CFG_SYS_NAND_FTIM3
#endif

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 795873f42336..cf65a0da1883 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -211,8 +211,6 @@
#define CFG_SYS_CS1_FTIM3 CFG_SYS_NAND_FTIM3
#endif

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index ffd56454939e..b51762264ade 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -70,8 +70,6 @@
#define CFG_SYS_FLASH_BASE 0xe0000000
#define CFG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CFG_SYS_FLASH_BASE)

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CONFIG_L1_INIT_RAM
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 578277fc75c1..a818a4b39f83 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -137,7 +137,6 @@
* Linux Information
*/
#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_HWCONFIG /* enable hwconfig */

#define DEFAULT_LINUX_BOOT_ENV \
"loadaddr=0xc0700000\0" \
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 65283afd2a06..6c5ca0a52057 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -45,7 +45,6 @@
#define CONFIG_IMX_VIDEO_SKIP

/* Miscellaneous configurable options */
-#define CONFIG_HWCONFIG

/* Memory configuration */

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 6ccb4f07e3be..bbd2b36c45af 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -166,7 +166,6 @@

#define CONFIG_SMP_PEN_ADDR 0x01ee0200

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 256

/*
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index e152714b1169..89c5a24ee901 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -309,8 +309,6 @@
#define CFG_SYS_CS2_FTIM2 SYS_QRIO_FTIM2
#define CFG_SYS_CS2_FTIM3 SYS_QRIO_FTIM3

-#define CONFIG_HWCONFIG
-
/* define to use L1 as initial stack */
#define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 2664982715f1..abe470fe890b 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -48,7 +48,6 @@
* Linux Information
*/
#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_HWCONFIG /* enable hwconfig */
#define CONFIG_SETUP_INITRD_TAG
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootenvfile=uEnv.txt\0" \
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 7598e54ed2b1..9e4f949016ef 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -24,7 +24,6 @@

#define CFG_SYS_NS16550_CLK (get_serial_clock())

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 3063635592e2..a9680149807c 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -92,7 +92,6 @@
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_SMP_PEN_ADDR 0x01ee0200

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 256

#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 137d459c291e..34d4c2fdeccc 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -276,7 +276,6 @@
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_SMP_PEN_ADDR 0x01ee0200

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 256

#ifdef CONFIG_LPUART
diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 052a15658d71..a5b7364435dd 100644
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -67,7 +67,6 @@
/* PCIe */
#define FSL_PCIE_COMPAT "fsl,ls1021a-pcie"

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 256

#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index f39c7c088446..059941e713a1 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -157,7 +157,6 @@
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_SMP_PEN_ADDR 0x01ee0200

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 256

#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index bdd3951e85f4..b190bfe9c8e0 100644
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -34,7 +34,6 @@

/* Physical Memory Map */

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index b4048744b1ea..a3fa92d1ff47 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -110,7 +110,6 @@

/* Miscellaneous configurable options */

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

#ifndef SPL_NO_MISC
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index cac30e4679eb..4ed5481c3e74 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -74,7 +74,6 @@

/* Miscellaneous configurable options */

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index bacc84f629ae..57429d4bbe32 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -114,7 +114,6 @@ unsigned long long get_qixis_addr(void);

/* Physical Memory Map */

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

#ifndef SPL_NO_ENV
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 18defd5e5a63..e82456fd8148 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -107,7 +107,6 @@ unsigned long long get_qixis_addr(void);
/* Physical Memory Map */
/* fixme: these need to be checked against the board */

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

/* Initial environment variables */
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index bbee9df404a1..ff85d966e661 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -84,7 +84,6 @@

#define COUNTER_FREQUENCY_REAL (get_board_sys_clk() / 4)

-#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128

/* Initial environment variables */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index e8b752785b4d..eda2d43d0c1f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -112,7 +112,6 @@
#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc
#endif

-#define CONFIG_HWCONFIG
/*
* These can be toggled for performance analysis, otherwise use default.
*/
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index aa9cae017d9a..d1b20da24a86 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -33,8 +33,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
#define CFG_SYS_DDR_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE

-#define CONFIG_HWCONFIG
-
#define CFG_SYS_INIT_RAM_ADDR 0x00100000
#define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0x0
#define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0x00100000
--
2.25.1