Convert CONFIG_HWCONFIG to Kconfig

This converts the following to Kconfig: CONFIG_HWCONFIG Signed-off-by: Tom Rini <trini@konsulko.com>
2022-11-19 18:45:16 -05:00 · 2022-11-19 18:45:16 -05:00 · 19b4040df0
commit 19b4040df0
parent d9feb83505
47 changed files with 22 additions and 40 deletions
--- 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 || \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.

--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@ -14,8 +14,6 @@
 * High Level Configuration Options
 */

-#define CONFIG_HWCONFIG
-
 /*
 * On-board devices
 */
--- 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
 */
--- 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.
 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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" \
--- 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 */

--- 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

 /*
--- 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
--- 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" \
--- 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) \
--- 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	\
--- 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
--- 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) \
--- 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) \
--- 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) \
--- 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
--- 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) \
--- 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
--- 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 */
--- 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 */
--- 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.
 */
--- 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