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.

3 files changed, 3 insertions, 81 deletions

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 0b3ffa08bfa..00c03817792 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -100,10 +100,6 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg
 # Prior to Kconfig, it was generated by mkconfig. Now it is created here.
 define filechk_config_h
 	(echo "/* Automatically generated - do not edit */";		\
-	for i in $$(echo $(CONFIG_SYS_EXTRA_OPTIONS) | sed 's/,/ /g'); do \
-		echo \#define CONFIG_$$i				\
-		| sed '/=/ {s/=/	/;q; } ; { s/$$/	1/; }'; \
-	done;								\
 	echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
 	echo \#include \<config_uncmd_spl.h\>;				\
 	echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>;		\
diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
index 6feb9b67cf5..37630c0271c 100755
--- a/scripts/build-whitelist.sh
+++ b/scripts/build-whitelist.sh
@@ -10,30 +10,13 @@
 #
 export LC_ALL=C LC_COLLATE=C
 
-# There are two independent greps. The first pulls out the component parts
-# of CONFIG_SYS_EXTRA_OPTIONS. An example is:
+# Looks for the rest of the CONFIG options, but exclude those in Kconfig and
+# defconfig files.
 #
-#	SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
-#
-# We want this to produce:
-#	CONFIG_SUN7I_GMAC
-#	CONFIG_AHCI
-#	CONFIG_SATAPWR
-#
-# The second looks for the rest of the CONFIG options, but excludes those in
-# Kconfig and defconfig files.
-#
-(
-git grep CONFIG_SYS_EXTRA_OPTIONS |sed -n \
-	's/.*CONFIG_SYS_EXTRA_OPTIONS="\(.*\)"/\1/ p' \
-	| tr , '\n' \
-	| sed 's/ *\([A-Za-z0-9_]*\).*/CONFIG_\1/'
-
 git grep CONFIG_ | \
 	egrep -vi "(Kconfig:|defconfig:|README|\.py|\.pl:)" \
 	| tr ' \t' '\n\n' \
-	| sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p'
-) \
+	| sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' \
 	|sort |uniq >scripts/config_whitelist.txt.tmp1;
 
 # Finally, we need a list of the valid Kconfig options to exclude these from
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7048840c421..e4c5f743c94 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,12 +1,6 @@
-CONFIG_AM335X_USB0_MODE
-CONFIG_AM335X_USB1_MODE
 CONFIG_ARM_GIC_BASE_ADDRESS
 CONFIG_AUTO_ZRELADDR
-CONFIG_BCM2835_GPIO
-CONFIG_BITBANGMII_MULTI
 CONFIG_BOARDDIR
-CONFIG_BOARDNAME
-CONFIG_BOARD_NAME
 CONFIG_BOARD_SIZE_LIMIT
 CONFIG_BOOTROM_ERR_REG
 CONFIG_BOOTSCRIPT_ADDR
@@ -20,14 +14,9 @@ CONFIG_BS_HDR_ADDR_DEVICE
 CONFIG_BS_HDR_ADDR_RAM
 CONFIG_BS_HDR_SIZE
 CONFIG_BS_SIZE
-CONFIG_CF_DSPI
-CONFIG_CF_SBF
 CONFIG_CHAIN_BOOT_CMD
 CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
 CONFIG_CI_UDC_HAS_HOSTPC
-CONFIG_CLK_1000_400_200
-CONFIG_CLOCKS
-CONFIG_CLOCK_SYNTHESIZER
 CONFIG_CM922T_XA10
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CM_INIT
@@ -40,26 +29,19 @@ CONFIG_CONS_SCIF0
 CONFIG_CONS_SCIF1
 CONFIG_CONS_SCIF2
 CONFIG_CONS_SCIF4
-CONFIG_CON_ROT
-CONFIG_CPLD_BR_PRELIM
-CONFIG_CPLD_OR_PRELIM
 CONFIG_CQSPI_REF_CLK
 CONFIG_CUSTOMER_BOARD_SUPPORT
-CONFIG_DB_784MP_GP
 CONFIG_DCACHE
 CONFIG_DEBUG
 CONFIG_DEBUG_LED
-CONFIG_DEEP_SLEEP
 CONFIG_DEFAULT
 CONFIG_DEFAULT_IMMR
 CONFIG_DESIGNWARE_ETH
-CONFIG_DEVICE_TREE_LIST
 CONFIG_DFU_ALT
 CONFIG_DFU_ALT_BOOT_EMMC
 CONFIG_DFU_ALT_BOOT_SD
 CONFIG_DFU_ALT_SYSTEM
 CONFIG_DFU_ENV_SETTINGS
-CONFIG_DIALOG_POWER
 CONFIG_DIMM_SLOTS_PER_CTLR
 CONFIG_DISCOVER_PHY
 CONFIG_DM9000_BASE
@@ -81,8 +63,6 @@ CONFIG_DW_GMAC_DEFAULT_DMA_PBL
 CONFIG_DW_WDT_BASE
 CONFIG_DW_WDT_CLOCK_KHZ
 CONFIG_E1000_NO_NVM
-CONFIG_E300
-CONFIG_E5500
 CONFIG_EFLASH_PROTSECTORS
 CONFIG_EHCI_DESC_BIG_ENDIAN
 CONFIG_EHCI_HCD_INIT_AFTER_RESET
@@ -399,9 +379,7 @@ CONFIG_KEY_REVOCATION
 CONFIG_KIRKWOOD_EGIGA_INIT
 CONFIG_KIRKWOOD_PCIE_INIT
 CONFIG_KIRKWOOD_RGMII_PAD_1V8
-CONFIG_KMTEGR1
 CONFIG_KM_BOARD_EXTRA_ENV
-CONFIG_KM_COGE5UN
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
@@ -414,13 +392,8 @@ CONFIG_KM_DEF_ENV_FLASH_BOOT
 CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_DISABLE_PCIE
 CONFIG_KM_ECC_MODE
-CONFIG_KM_KIRKWOOD
-CONFIG_KM_KIRKWOOD_128M16
-CONFIG_KM_KIRKWOOD_PCI
 CONFIG_KM_NEW_ENV
-CONFIG_KM_NUSA
 CONFIG_KM_ROOTFSSIZE
-CONFIG_KM_SUSE2
 CONFIG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
@@ -443,7 +416,6 @@ CONFIG_LBA48
 CONFIG_LCD_ALIGNMENT
 CONFIG_LCD_MENU
 CONFIG_LD9040
-CONFIG_LEGACY
 CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LOADS_ECHO
 CONFIG_LOWPOWER_ADDR
@@ -464,19 +436,13 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS
 CONFIG_LPC32XX_NAND_SLC_WHOLD
 CONFIG_LPC32XX_NAND_SLC_WSETUP
 CONFIG_LPC32XX_NAND_SLC_WWIDTH
-CONFIG_LPUART
-CONFIG_LPUART_32B_REG
 CONFIG_LS102XA_STREAM_ID
-CONFIG_LSCHLV2
-CONFIG_LSXHL
 CONFIG_MACB_SEARCH_PHY
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MAX_DSP_CPUS
 CONFIG_MAX_MEM_MAPPED
 CONFIG_MAX_RAM_BANK_SIZE
-CONFIG_MCFRTC
-CONFIG_MCFTMR
 CONFIG_MEMSIZE_IN_BYTES
 CONFIG_MEM_INIT_VALUE
 CONFIG_MEM_REMAP
@@ -507,10 +473,7 @@ CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT
 CONFIG_MXC_USB_PORTSC
 CONFIG_MXS
-CONFIG_MXS_AUART
-CONFIG_MXS_AUART_BASE
 CONFIG_MXS_OCOTP
-CONFIG_NANDFLASH_SIZE
 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
 CONFIG_NAND_CS_INIT
 CONFIG_NAND_ECC_BCH
@@ -524,7 +487,6 @@ CONFIG_NETMASK
 CONFIG_NEVER_ASSERT_ODT_TO_CPU
 CONFIG_NOBQFMAN
 CONFIG_NORBOOT
-CONFIG_NORFLASH_PS32BIT
 CONFIG_NS16550_MIN_FUNCTIONS
 CONFIG_NUM_DSP_CPUS
 CONFIG_ODROID_REV_AIN
@@ -535,7 +497,6 @@ CONFIG_PALMAS_POWER
 CONFIG_PCA953X
 CONFIG_PCI1
 CONFIG_PCI2
-CONFIG_PCIE
 CONFIG_PCIE1
 CONFIG_PCIE2
 CONFIG_PCIE3
@@ -602,7 +563,6 @@ CONFIG_PXA_STD_I2C
 CONFIG_PXA_VGA
 CONFIG_QBMAN_CLK_DIV
 CONFIG_QIXIS_I2C_ACCESS
-CONFIG_QSPI
 CONFIG_RAMBOOT_NAND
 CONFIG_RAMBOOT_SPIFLASH
 CONFIG_RAMBOOT_TEXT_BASE
@@ -650,11 +610,9 @@ CONFIG_SATA2
 CONFIG_SCIF_A
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
-CONFIG_SDCARD
 CONFIG_SDRAM_OFFSET_FOR_RT
 CONFIG_SECBOOT
 CONFIG_SERIAL_BOOT
-CONFIG_SERIAL_FLASH
 CONFIG_SERIAL_SOFTWARE_FIFO
 CONFIG_SERVERIP
 CONFIG_SETUP_INITRD_TAG
@@ -687,14 +645,12 @@ CONFIG_SMSC_SIO1007
 CONFIG_SOCRATES
 CONFIG_SOFT_I2C_READ_REPEATED_START
 CONFIG_SPD_EEPROM
-CONFIG_SPIFLASH
 CONFIG_SPI_ADDR
 CONFIG_SPI_BOOTING
 CONFIG_SPI_FLASH_QUAD
 CONFIG_SPI_FLASH_SIZE
 CONFIG_SPI_HALF_DUPLEX
 CONFIG_SPI_N25Q256A_RESET
-CONFIG_SPL_ATMEL_SIZE
 CONFIG_SPL_BOARD_LOAD_IMAGE
 CONFIG_SPL_BOOTROM_SAVE
 CONFIG_SPL_BOOT_DEVICE
@@ -741,7 +697,6 @@ CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS
 CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE
 CONFIG_SRIO_PCIE_BOOT_MASTER
 CONFIG_SRIO_PCIE_BOOT_RELEASE_MASK
-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
@@ -1343,7 +1298,6 @@ CONFIG_SYS_INIT_RAM_LOCK
 CONFIG_SYS_INIT_RAM_SIZE
 CONFIG_SYS_INIT_SP_ADDR
 CONFIG_SYS_INIT_SP_OFFSET
-CONFIG_SYS_INPUT_CLKSRC
 CONFIG_SYS_INTERLAKEN
 CONFIG_SYS_INT_FLASH_BASE
 CONFIG_SYS_INT_FLASH_ENABLE
@@ -1437,7 +1391,6 @@ CONFIG_SYS_MMC_U_BOOT_DST
 CONFIG_SYS_MMC_U_BOOT_OFFS
 CONFIG_SYS_MMC_U_BOOT_SIZE
 CONFIG_SYS_MMC_U_BOOT_START
-CONFIG_SYS_MONITOR_BASE
 CONFIG_SYS_MONITOR_LEN
 CONFIG_SYS_MONITOR_SEC
 CONFIG_SYS_MOR_VAL
@@ -1801,7 +1754,6 @@ CONFIG_SYS_SERIAL0
 CONFIG_SYS_SERIAL1
 CONFIG_SYS_SERIAL2
 CONFIG_SYS_SERIAL3
-CONFIG_SYS_SERIAL_BOOT
 CONFIG_SYS_SFP_ADDR
 CONFIG_SYS_SFP_OFFSET
 CONFIG_SYS_SGMII1_PHY_ADDR
@@ -1885,16 +1837,7 @@ CONFIG_SYS_USB_OHCI_CPU_INIT
 CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
 CONFIG_SYS_USB_OHCI_REGS_BASE
 CONFIG_SYS_USB_OHCI_SLOT_NAME
-CONFIG_SYS_USE_BOOT_NORFLASH
-CONFIG_SYS_USE_DATAFLASH
-CONFIG_SYS_USE_DATAFLASH_CS0
-CONFIG_SYS_USE_DATAFLASH_CS1
-CONFIG_SYS_USE_DATAFLASH_CS3
-CONFIG_SYS_USE_FLASH
-CONFIG_SYS_USE_MMC
 CONFIG_SYS_USE_NAND
-CONFIG_SYS_USE_NANDFLASH
-CONFIG_SYS_USE_NORFLASH
 CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
 CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
 CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT