Merge branch '2022-04-01-Kconfig-migrations-and-cleanups' into next

- Migrate a number of CONFIG symbols to Kconfig.  Of note, with this we
  now complete migration of CONFIG_SYS_EXTRA_OPTIONS.

14 files changed, 83 insertions, 4 deletions

diff --git a/board/atmel/at91sam9263ek/Kconfig b/board/atmel/at91sam9263ek/Kconfig
index 3f0873fe510..71cbc89123e 100644
--- a/board/atmel/at91sam9263ek/Kconfig
+++ b/board/atmel/at91sam9263ek/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "at91sam9263ek"
 
+config SYS_USE_NORFLASH
+	bool "Use the NOR flash on the platform"
+
 endif
diff --git a/board/buffalo/lsxl/Kconfig b/board/buffalo/lsxl/Kconfig
index ef788963780..fd8f0542c31 100644
--- a/board/buffalo/lsxl/Kconfig
+++ b/board/buffalo/lsxl/Kconfig
@@ -9,4 +9,15 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "lsxl"
 
+choice
+	prompt "Board model"
+
+config LSCHLV2
+	bool "LSCHLV2 support"
+
+config LSXHL
+	bool "LSXHL support"
+
+endchoice
+
 endif
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index 300b01e0400..b41d93b6f68 100644
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -22,6 +22,13 @@ config CMD_ESBC_VALIDATE
 	    esbc_validate - validate signature using RSA verification
 	    esbc_halt - put the core in spin loop (Secure Boot Only)
 
+config DEEP_SLEEP
+	bool "Enable SoC deep sleep feature"
+	default y if ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
+	help
+	  Indicates this SoC supports deep sleep feature. If deep sleep is
+	  supported, core will start to execute uboot when wakes up.
+
 config FSL_USE_PCA9547_MUX
 	bool "Enable PCA9547 I2C Mux on Freescale boards"
 	help
diff --git a/board/freescale/common/cds_via.c b/board/freescale/common/cds_via.c
index 8f8f0d1f588..6184472b165 100644
--- a/board/freescale/common/cds_via.c
+++ b/board/freescale/common/cds_via.c
@@ -28,7 +28,11 @@ void mpc85xx_config_via(struct pci_controller *hose,
 	 * This allows legacy I/O (i8259, etc) on the VIA
 	 * southbridge to be accessed.
 	 */
-	bridge = PCI_BDF(0,BRIDGE_ID,0);
+#ifdef CONFIG_TARGET_MPC8548CDS_LEGACY
+	bridge = PCI_BDF(0, 17, 0);
+#else
+	bridge = PCI_BDF(0, 28, 0);
+#endif
 	pci_hose_write_config_byte(hose, bridge, PCI_IO_BASE, 0);
 	pci_hose_write_config_word(hose, bridge, PCI_IO_BASE_UPPER16, 0);
 	pci_hose_write_config_byte(hose, bridge, PCI_IO_LIMIT, 0x10);
diff --git a/board/freescale/m5235evb/Kconfig b/board/freescale/m5235evb/Kconfig
index fc8341999aa..f0d4c8c7964 100644
--- a/board/freescale/m5235evb/Kconfig
+++ b/board/freescale/m5235evb/Kconfig
@@ -12,4 +12,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "M5235EVB"
 
+config NORFLASH_PS32BIT
+	bool "Board has 32bit CFI flash"
+
 endif
diff --git a/board/freescale/mpc837xerdb/Kconfig b/board/freescale/mpc837xerdb/Kconfig
index 03415f9fc94..3779625edd5 100644
--- a/board/freescale/mpc837xerdb/Kconfig
+++ b/board/freescale/mpc837xerdb/Kconfig
@@ -1,5 +1,8 @@
 if TARGET_MPC837XERDB
 
+config PCIE
+	def_bool y
+
 config SYS_BOARD
 	default "mpc837xerdb"
 
diff --git a/board/freescale/mpc8548cds/Kconfig b/board/freescale/mpc8548cds/Kconfig
index 09f3b0b7663..87f3374bf45 100644
--- a/board/freescale/mpc8548cds/Kconfig
+++ b/board/freescale/mpc8548cds/Kconfig
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "MPC8548CDS"
 
+config TARGET_MPC8548CDS_LEGACY
+	bool "Legacy platform support"
+
 endif
diff --git a/board/freescale/mx53loco/Kconfig b/board/freescale/mx53loco/Kconfig
index a690a601ac0..5dcdcd9f725 100644
--- a/board/freescale/mx53loco/Kconfig
+++ b/board/freescale/mx53loco/Kconfig
@@ -1,5 +1,8 @@
 if TARGET_MX53LOCO
 
+config DIALOG_POWER
+	def_bool y
+
 config SYS_BOARD
 	default "mx53loco"
 
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 19ece122963..b6f0d204267 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -160,6 +160,14 @@ int board_early_init_f(void)
 	return 0;
 }
 
+#if defined(CONFIG_TARGET_P1020RDB_PC)
+#define BOARD_NAME "P1020RDB-PC"
+#elif defined(CONFIG_TARGET_P1020RDB_PD)
+#define BOARD_NAME "P1020RDB-PD"
+#elif defined(CONFIG_TARGET_P2020RDB)
+#define BOARD_NAME "P2020RDB-PC"
+#endif
+
 int checkboard(void)
 {
 	struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
@@ -167,7 +175,8 @@ int checkboard(void)
 	u8 in, out, io_config, val;
 	int bus_num = CONFIG_SYS_SPD_BUS_NUM;
 
-	printf("Board: %s CPLD: V%d.%d PCBA: V%d.0\n", CONFIG_BOARDNAME,
+	/* FIXME: This should just use the model from the device tree or similar */
+	printf("Board: %s CPLD: V%d.%d PCBA: V%d.0\n", BOARD_NAME,
 		in_8(&cpld_data->cpld_rev_major) & 0x0F,
 		in_8(&cpld_data->cpld_rev_minor) & 0x0F,
 		in_8(&cpld_data->pcba_rev) & 0x0F);
diff --git a/board/freescale/t208xqds/Kconfig b/board/freescale/t208xqds/Kconfig
index f65d8eed542..58a31b65278 100644
--- a/board/freescale/t208xqds/Kconfig
+++ b/board/freescale/t208xqds/Kconfig
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T208xQDS"
 
+config SRIO_PCIE_BOOT_SLAVE
+	bool "Boot as a SRIO PCIe slave device"
+
 source "board/freescale/common/Kconfig"
 
 endif
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c
index ed700f4e1da..4e9d841fe29 100644
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -547,7 +547,7 @@ int last_stage_init(void)
 
 int checkboard(void)
 {
-	printf("BOARD: %s\n", CONFIG_BOARD_NAME);
+	printf("BOARD: General Electric Bx50v3\n");
 	return 0;
 }
 
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index ff550f7fe76..67db0c50f47 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -306,7 +306,7 @@ static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset)
 		return 0;
 	page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN * 2];
 
-	if (IS_ENABLED(CONFIG_KMTEGR1)) {
+	if (IS_ENABLED(CONFIG_TARGET_KMTEGR1)) {
 		/* KMTEGR1 has a special setup. eth0 has no connection to the
 		 * outside and gets an locally administred MAC address, eth1 is
 		 * the debug interface and gets the official MAC address from
diff --git a/board/keymile/km_arm/Kconfig b/board/keymile/km_arm/Kconfig
index c52b365b175..9d222d71365 100644
--- a/board/keymile/km_arm/Kconfig
+++ b/board/keymile/km_arm/Kconfig
@@ -60,4 +60,27 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	imply FS_CRAMFS
 	imply CMD_USB
 
+choice
+	prompt "Board model"
+
+config KM_COGE5UN
+	bool "Hitachi Power Grids COGE5UN"
+
+config KM_KIRKWOOD_128M16
+	bool "Hitachi Power Grids Kirkwood 128M16"
+
+config KM_KIRKWOOD
+	bool "Hitachi Power Grids Kirkwood"
+
+config KM_KIRKWOOD_PCI
+	bool "Hitachi Power Grids Kirkwood PCI"
+
+config KM_NUSA
+	bool "Hitachi Power Grids Kirkwood (NUSA)"
+
+config KM_SUSE2
+	bool "Hitachi Power Grids Kirkwood (SUSE2)"
+
+endchoice
+
 endif
diff --git a/board/sysam/stmark2/Kconfig b/board/sysam/stmark2/Kconfig
index 87ab7ab7b52..4abcdb3aaf1 100644
--- a/board/sysam/stmark2/Kconfig
+++ b/board/sysam/stmark2/Kconfig
@@ -1,5 +1,12 @@
 if TARGET_STMARK2
 
+config CF_SBF
+	def_bool y
+
+config SYS_INPUT_CLKSRC
+	hex
+	default 30000000
+
 config SYS_CPU
 	default "mcf5445x"