[U-Boot] scripts: config_whitelist: Handle lines with leading spaces/tabs

diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
index f169eaa..7d8160d 100755
--- a/scripts/build-whitelist.sh
+++ b/scripts/build-whitelist.sh
@@ -39,8 +39,8 @@  git grep CONFIG_ | \
 # Finally, we need a list of the valid Kconfig options to exclude these from
 # the whitelist.
 cat `find . -name "Kconfig*"` |sed -n \
-	-e 's/^config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-	-e 's/^menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+	-e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+	-e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
 	|sort |uniq >scripts/config_whitelist.txt.tmp2
 
 # Use only the options that are present in the first file but not the second.
diff --git a/scripts/check-config.sh b/scripts/check-config.sh
index 97e52dc..2677584 100755
--- a/scripts/check-config.sh
+++ b/scripts/check-config.sh
@@ -33,8 +33,9 @@  cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \
 comm -23 ${configs} ${whitelist} > ${suspects}
 
 cat `find ${srctree} -name "Kconfig*"` |sed -n \
-	-e 's/^config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-	-e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok}
+	-e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+	-e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+	|sort |uniq > ${ok}
 comm -23 ${suspects} ${ok} >${new_adhoc}
 if [ -s ${new_adhoc} ]; then
 	echo >&2 "Error: You must add new CONFIG options using Kconfig"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 31cbb86..ada2762 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -116,7 +116,6 @@  CONFIG_ARMV7_SECURE_MAX_SIZE
 CONFIG_ARMV7_SECURE_RESERVE_SIZE
 CONFIG_ARMV8_SWITCH_TO_EL1
 CONFIG_ARM_ARCH_CP15_ERRATA
-CONFIG_ARM_ASM_UNIFIED
 CONFIG_ARM_DCC
 CONFIG_ARM_FREQ
 CONFIG_ARM_GIC_BASE_ADDRESS
@@ -219,7 +218,6 @@  CONFIG_BMP_16BPP
 CONFIG_BMP_24BPP
 CONFIG_BMP_32BPP
 CONFIG_BOARDDIR
-CONFIG_BOARDINFO
 CONFIG_BOARDNAME
 CONFIG_BOARDNAME_LOCAL
 CONFIG_BOARD_AXM
@@ -297,7 +295,6 @@  CONFIG_BOOT_RETRY_MIN
 CONFIG_BOOT_RETRY_TIME
 CONFIG_BOUNCE_BUFFER
 CONFIG_BPTR_VIRT_ADDR
-CONFIG_BSEIP
 CONFIG_BS_ADDR_DEVICE
 CONFIG_BS_ADDR_RAM
 CONFIG_BS_COPY_CMD
@@ -325,7 +322,6 @@  CONFIG_CDP_POWER_CONSUMPTION
 CONFIG_CDP_TRIGGER
 CONFIG_CDP_VERSION
 CONFIG_CFG_DATA_SECTOR
-CONFIG_CFG_USB
 CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
 CONFIG_CF_DSPI
 CONFIG_CF_SBF
@@ -829,7 +825,6 @@  CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
 CONFIG_FEATURE_SH_EXTRA_QUIET
 CONFIG_FEATURE_SH_FANCY_PROMPT
 CONFIG_FEATURE_SH_STANDALONE_SHELL
-CONFIG_FEC_ENET
 CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_25M_REF_CLK
@@ -952,7 +947,6 @@  CONFIG_FTIDE020S_BASE
 CONFIG_FTIIC010_BASE
 CONFIG_FTINTC010_BASE
 CONFIG_FTLCDC100_BASE
-CONFIG_FTMAC100
 CONFIG_FTMAC100_BASE
 CONFIG_FTMAC110_BASE
 CONFIG_FTPCI100_BASE
@@ -1032,7 +1026,6 @@  CONFIG_HAS_FSL_DR_USB
 CONFIG_HAS_FSL_MPH_USB
 CONFIG_HAS_FSL_XHCI_USB
 CONFIG_HAS_POST
-CONFIG_HAVE_ACPI_RESUME
 CONFIG_HCLK_FREQ
 CONFIG_HDBOOT
 CONFIG_HDMI_ENCODER_I2C_ADDR
@@ -1041,9 +1034,7 @@  CONFIG_HIDE_LOGO_VERSION
 CONFIG_HIGH_BATS
 CONFIG_HIKEY_GPIO
 CONFIG_HIS_DRIVER
-CONFIG_HITACHI_SP19X001_Z1A
 CONFIG_HITACHI_SX14
-CONFIG_HLD1045
 CONFIG_HOSTNAME
 CONFIG_HOST_MAX_DEVICES
 CONFIG_HOTPLUG
@@ -1198,7 +1189,6 @@  CONFIG_HUSH_INIT_VAR
 CONFIG_HVBOOT
 CONFIG_HWCONFIG
 CONFIG_HW_ENV_SETTINGS
-CONFIG_HW_WATCHDOG
 CONFIG_HW_WATCHDOG_TIMEOUT_MS
 CONFIG_I2C
 CONFIG_I2C_CHIPADDRESS
@@ -1284,7 +1274,6 @@  CONFIG_IRAM_SIZE
 CONFIG_IRAM_STACK
 CONFIG_IRAM_TOP
 CONFIG_IRDA_BASE
-CONFIG_ISP1362_USB
 CONFIG_IS_BUILTIN
 CONFIG_IS_ENABLED
 CONFIG_IS_INVALID
@@ -1352,7 +1341,6 @@  CONFIG_KM_ECC_MODE
 CONFIG_KM_ENV_IS_IN_SPI_NOR
 CONFIG_KM_FDT_ADDR
 CONFIG_KM_FPGA_CONFIG
-CONFIG_KM_I2C_ABORT
 CONFIG_KM_IVM_BUS
 CONFIG_KM_KERNEL_ADDR
 CONFIG_KM_KIRKWOOD
@@ -1422,7 +1410,6 @@  CONFIG_KVM_GUEST
 CONFIG_KW88F6192
 CONFIG_KW88F6281
 CONFIG_KW88F6702
-CONFIG_KYOCERA_KCS057QV1AJ
 CONFIG_KZM_A9_GT
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
@@ -1460,7 +1447,6 @@  CONFIG_LOADADDR
 CONFIG_LOADCMD
 CONFIG_LOADS_ECHO
 CONFIG_LOGBUFFER
-CONFIG_LOWBOOT
 CONFIG_LOWPOWER_ADDR
 CONFIG_LOWPOWER_FLAG
 CONFIG_LOW_MCFCLK
@@ -1535,7 +1521,6 @@  CONFIG_MACH_TYPE_COMPAT_REV
 CONFIG_MACRESET_TIMEOUT
 CONFIG_MAC_ADDR_IN_EEPROM
 CONFIG_MAC_ADDR_IN_SPIFLASH
-CONFIG_MAC_OFFSET
 CONFIG_MAKALU
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
@@ -1570,8 +1555,6 @@  CONFIG_MENUKEY
 CONFIG_MENUPROMPT
 CONFIG_MENU_SHOW
 CONFIG_MFG_ENV_SETTINGS
-CONFIG_MGCOGE
-CONFIG_MGCOGE3NE
 CONFIG_MIGO_R
 CONFIG_MII
 CONFIG_MIIM_ADDRESS
@@ -1638,11 +1621,6 @@  CONFIG_MPC83XX_PCI2
 CONFIG_MPC85XX_FEC
 CONFIG_MPC85XX_FEC_NAME
 CONFIG_MPC85XX_PCI2
-CONFIG_MPC860
-CONFIG_MPC860T
-CONFIG_MPC866
-CONFIG_MPC866_FAMILY
-CONFIG_MPC885
 CONFIG_MPC8XXX_SPI
 CONFIG_MPC8xxx_DISABLE_BPTR
 CONFIG_MPLL_FREQ
@@ -1767,9 +1745,6 @@  CONFIG_NCEL2C100_BASE
 CONFIG_NCEMIC100_BASE
 CONFIG_NDS_DLM1_BASE
 CONFIG_NDS_DLM2_BASE
-CONFIG_NEC_NL6448AC33
-CONFIG_NEC_NL6448BC20
-CONFIG_NEC_NL6448BC33_54
 CONFIG_NEEDS_MANUAL_RELOC
 CONFIG_NEO
 CONFIG_NET2BIG_V2
@@ -1809,7 +1784,6 @@  CONFIG_NUM_PAMU
 CONFIG_ODROID_REV_AIN
 CONFIG_OFF_PADCONF
 CONFIG_OF_
-CONFIG_OF_IDE_FIXUP
 CONFIG_OF_SPI
 CONFIG_OF_SPI_FLASH
 CONFIG_OF_STDOUT_PATH
@@ -1819,7 +1793,6 @@  CONFIG_OMAP_EHCI_PHY3_RESET_GPIO
 CONFIG_OMAP_USB2PHY2_HOST
 CONFIG_OMAP_USB3PHY1_HOST
 CONFIG_OMAP_USB_PHY
-CONFIG_OPTREX_BW
 CONFIG_ORIGEN
 CONFIG_OS1_ENV_ADDR
 CONFIG_OS2_ENV_ADDR
@@ -1870,9 +1843,6 @@  CONFIG_PCI_INDIRECT_BRIDGE
 CONFIG_PCI_IO_BUS
 CONFIG_PCI_IO_PHYS
 CONFIG_PCI_IO_SIZE
-CONFIG_PCI_MEMORY_BUS
-CONFIG_PCI_MEMORY_PHYS
-CONFIG_PCI_MEMORY_SIZE
 CONFIG_PCI_MEM_BUS
 CONFIG_PCI_MEM_PHYS
 CONFIG_PCI_MEM_SIZE
@@ -1914,19 +1884,15 @@  CONFIG_PHY_CLK_FREQ
 CONFIG_PHY_CMD_DELAY
 CONFIG_PHY_DYNAMIC_ANEG
 CONFIG_PHY_ET1011C_TX_CLK_FIX
-CONFIG_PHY_GIGE
 CONFIG_PHY_ID
 CONFIG_PHY_INTERFACE_MODE
 CONFIG_PHY_IRAM_BASE
 CONFIG_PHY_KSZ9031
 CONFIG_PHY_M88E1111
 CONFIG_PHY_MAX_ADDR
-CONFIG_PHY_MICREL_KSZ9021
-CONFIG_PHY_MICREL_KSZ9031
 CONFIG_PHY_MODE_NEED_CHANGE
 CONFIG_PHY_RESET
 CONFIG_PHY_RESET_DELAY
-CONFIG_PHY_TYPE
 CONFIG_PHYx_ADDR
 CONFIG_PICOSAM
 CONFIG_PIGGY_MAC_ADRESS_OFFSET
@@ -2037,7 +2003,6 @@  CONFIG_PQ_MDS_PIB
 CONFIG_PQ_MDS_PIB_ATM
 CONFIG_PRAM
 CONFIG_PREBOOT
-CONFIG_PRIMEVIEW_V16C6448AC
 CONFIG_PRINTK
 CONFIG_PROC_FS
 CONFIG_PROFILE_ALL_BRANCHES
@@ -2158,7 +2123,6 @@  CONFIG_ROOTPATH
 CONFIG_RSK7203
 CONFIG_RSK7264
 CONFIG_RSK7269
-CONFIG_RTC_DS1307
 CONFIG_RTC_DS1337
 CONFIG_RTC_DS1337_NOOSC
 CONFIG_RTC_DS1338
@@ -2184,7 +2148,6 @@  CONFIG_RTC_MV
 CONFIG_RTC_MXS
 CONFIG_RTC_PCF8563
 CONFIG_RTC_PT7C4338
-CONFIG_RTC_RV3029
 CONFIG_RTC_RX8025
 CONFIG_RTC_X1205
 CONFIG_RUN_FROM_DDR0
@@ -2192,7 +2155,6 @@  CONFIG_RUN_FROM_DDR1
 CONFIG_RUN_FROM_IRAM_ONLY
 CONFIG_RX_DESCR_NUM
 CONFIG_S32V234
-CONFIG_S3C24X0
 CONFIG_S3D2_CLK_FREQ
 CONFIG_S3D4_CLK_FREQ
 CONFIG_S5P
@@ -2226,8 +2188,6 @@  CONFIG_SATA_ULI5288
 CONFIG_SBC8349
 CONFIG_SBC8548
 CONFIG_SBC8641D
-CONFIG_SCC1_ENET
-CONFIG_SCC2_ENET
 CONFIG_SCF0403_LCD
 CONFIG_SCIF
 CONFIG_SCIF_A
@@ -2298,14 +2258,8 @@  CONFIG_SH7780_PCI_BAR
 CONFIG_SH7780_PCI_LAR
 CONFIG_SH7780_PCI_LSR
 CONFIG_SH7785LCR
-CONFIG_SHARP_16x9
 CONFIG_SHARP_LM8V31
 CONFIG_SHARP_LQ035Q7DH06
-CONFIG_SHARP_LQ057Q3DC02
-CONFIG_SHARP_LQ065T9DR51U
-CONFIG_SHARP_LQ084V1DG21
-CONFIG_SHARP_LQ104V7DS01
-CONFIG_SHARP_LQ64D341
 CONFIG_SHEEVA_88SV131
 CONFIG_SHEEVA_88SV331xV5
 CONFIG_SHELL
@@ -2326,8 +2280,6 @@  CONFIG_SH_ETHER_USE_GETHER
 CONFIG_SH_ETHER_USE_PORT
 CONFIG_SH_GPIO_PFC
 CONFIG_SH_I2C_8BIT
-CONFIG_SH_I2C_BASE0
-CONFIG_SH_I2C_BASE1
 CONFIG_SH_I2C_CLOCK
 CONFIG_SH_I2C_DATA_HIGH
 CONFIG_SH_I2C_DATA_LOW
@@ -2339,7 +2291,6 @@  CONFIG_SH_QSPI_BASE
 CONFIG_SH_SCIF_CLK_FREQ
 CONFIG_SH_SDHI_FREQ
 CONFIG_SH_SDRAM_OFFSET
-CONFIG_SH_SH7734_I2C
 CONFIG_SH_SPI
 CONFIG_SH_SPI_BASE
 CONFIG_SH_TMU_CLK_FREQ
@@ -2405,7 +2356,6 @@  CONFIG_SOC_OMAP3430
 CONFIG_SOFT_I2C_GPIO_SCL
 CONFIG_SOFT_I2C_GPIO_SDA
 CONFIG_SOFT_I2C_READ_REPEATED_START
-CONFIG_SOFT_SPI
 CONFIG_SOURCE
 CONFIG_SPARSE_RCU_POINTER
 CONFIG_SPDDRAM_SILENT
@@ -2458,7 +2408,6 @@  CONFIG_SPLL_FREQ
 CONFIG_SPL_
 CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 CONFIG_SPL_ATMEL_SIZE
-CONFIG_SPL_BOARD_INIT
 CONFIG_SPL_BOARD_LOAD_IMAGE
 CONFIG_SPL_BOOTROM_SAVE
 CONFIG_SPL_BOOT_DEVICE
@@ -2732,10 +2681,8 @@  CONFIG_SYS_BR0_8M
 CONFIG_SYS_BR0_PRELIM
 CONFIG_SYS_BR1_PRELIM
 CONFIG_SYS_BR2_PRELIM
-CONFIG_SYS_BR3_CAN
 CONFIG_SYS_BR3_PRELIM
 CONFIG_SYS_BR4_PRELIM
-CONFIG_SYS_BR5_ISP1362
 CONFIG_SYS_BR5_PRELIM
 CONFIG_SYS_BR6_64M
 CONFIG_SYS_BR6_8M
@@ -2755,8 +2702,6 @@  CONFIG_SYS_CACHE_DCACR
 CONFIG_SYS_CACHE_ICACR
 CONFIG_SYS_CACHE_STASHING
 CONFIG_SYS_CADMUS_BASE_REG
-CONFIG_SYS_CAN_BASE
-CONFIG_SYS_CAN_OR_AM
 CONFIG_SYS_CBSIZE
 CONFIG_SYS_CCCR
 CONFIG_SYS_CCI400_ADDR
@@ -2822,7 +2767,6 @@  CONFIG_SYS_CPLD_FTIM2
 CONFIG_SYS_CPLD_FTIM3
 CONFIG_SYS_CPLD_SIZE
 CONFIG_SYS_CPMFCR_RAMTYPE
-CONFIG_SYS_CPM_BOOTCOUNT_ADDR
 CONFIG_SYS_CPM_INTERRUPT
 CONFIG_SYS_CPRI
 CONFIG_SYS_CPRI_CLK
@@ -3307,8 +3251,6 @@  CONFIG_SYS_FLASH_BASE
 CONFIG_SYS_FLASH_BASE0
 CONFIG_SYS_FLASH_BASE1
 CONFIG_SYS_FLASH_BASE2
-CONFIG_SYS_FLASH_BASE_1
-CONFIG_SYS_FLASH_BASE_2
 CONFIG_SYS_FLASH_BASE_PHYS
 CONFIG_SYS_FLASH_BASE_PHYS_EARLY
 CONFIG_SYS_FLASH_BASE_PHYS_H
@@ -3338,8 +3280,6 @@  CONFIG_SYS_FLASH_READ2
 CONFIG_SYS_FLASH_SECT_SIZE
 CONFIG_SYS_FLASH_SECT_SZ
 CONFIG_SYS_FLASH_SIZE
-CONFIG_SYS_FLASH_SIZE_1
-CONFIG_SYS_FLASH_SIZE_2
 CONFIG_SYS_FLASH_UNLOCK_TOUT
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE
@@ -3788,7 +3728,6 @@  CONFIG_SYS_GBL_DATA_SIZE
 CONFIG_SYS_GENERIC_BOARD
 CONFIG_SYS_GENERIC_GLOBAL_DATA
 CONFIG_SYS_GIC400_ADDR
-CONFIG_SYS_GLOBAL_SDRAM_LIMIT
 CONFIG_SYS_GP1DIR
 CONFIG_SYS_GP1ODR
 CONFIG_SYS_GP2DIR
@@ -3895,9 +3834,6 @@  CONFIG_SYS_HRCW_HIGH
 CONFIG_SYS_HRCW_HIGH_BASE
 CONFIG_SYS_HRCW_LOW
 CONFIG_SYS_HSDRAMC
-CONFIG_SYS_HWINFO_MAGIC
-CONFIG_SYS_HWINFO_OFFSET
-CONFIG_SYS_HWINFO_SIZE
 CONFIG_SYS_HZ_CLOCK
 CONFIG_SYS_I2C
 CONFIG_SYS_I2C2_FSL_OFFSET
@@ -3937,22 +3873,18 @@  CONFIG_SYS_I2C_EEPROM_ADDR
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
 CONFIG_SYS_I2C_EEPROM_BUS
-CONFIG_SYS_I2C_EEPROM_BUS_NUM
 CONFIG_SYS_I2C_EEPROM_CCID
 CONFIG_SYS_I2C_EEPROM_CPU_ADDR
-CONFIG_SYS_I2C_EEPROM_MAC_OFFSET
 CONFIG_SYS_I2C_EEPROM_MB_ADDR
 CONFIG_SYS_I2C_EEPROM_NXID
 CONFIG_SYS_I2C_EEPROM_NXID_MAC
 CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS
 CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS
 CONFIG_SYS_I2C_EXPANDER_ADDR
-CONFIG_SYS_I2C_FACT_ADDR
 CONFIG_SYS_I2C_FPGA_ADDR
 CONFIG_SYS_I2C_FRAM
 CONFIG_SYS_I2C_G762_ADDR
 CONFIG_SYS_I2C_GENERIC_MAC
-CONFIG_SYS_I2C_HWMON_ADDR
 CONFIG_SYS_I2C_IDT6V49205B
 CONFIG_SYS_I2C_IFDR_DIV
 CONFIG_SYS_I2C_IHS
@@ -3999,12 +3931,10 @@  CONFIG_SYS_I2C_MAC2_DATA_ADDR
 CONFIG_SYS_I2C_MAC_OFFSET
 CONFIG_SYS_I2C_MAX1237_ADDR
 CONFIG_SYS_I2C_MAX_HOPS
-CONFIG_SYS_I2C_MODULE
 CONFIG_SYS_I2C_MXC_I2C1
 CONFIG_SYS_I2C_MXC_I2C2
 CONFIG_SYS_I2C_MXC_I2C3
 CONFIG_SYS_I2C_MXC_I2C4
-CONFIG_SYS_I2C_MXS
 CONFIG_SYS_I2C_NCT72_ADDR
 CONFIG_SYS_I2C_NOPROBES
 CONFIG_SYS_I2C_OFFSET
@@ -4092,7 +4022,6 @@  CONFIG_SYS_I2C_ZYNQ_SLAVE
 CONFIG_SYS_I2C_ZYNQ_SPEED
 CONFIG_SYS_I2ODMA_BASE
 CONFIG_SYS_I2ODMA_PHYS_ADDR
-CONFIG_SYS_I2c_INIT_MPC5XXX
 CONFIG_SYS_IBAT
 CONFIG_SYS_IBAT0L
 CONFIG_SYS_IBAT0U
@@ -4116,7 +4045,6 @@  CONFIG_SYS_ICACHE_INV
 CONFIG_SYS_ICACHE_LINESZ
 CONFIG_SYS_ICACHE_SACR_VALUE
 CONFIG_SYS_ICS8N3QV01_I2C
-CONFIG_SYS_ICTRL
 CONFIG_SYS_IDE_MAXBUS
 CONFIG_SYS_IDE_MAXDEVICE
 CONFIG_SYS_ID_EEPROM
@@ -4162,7 +4090,6 @@  CONFIG_SYS_INTSRAMSZ
 CONFIG_SYS_INT_FLASH_BASE
 CONFIG_SYS_INT_FLASH_ENABLE
 CONFIG_SYS_IO_BASE
-CONFIG_SYS_IPBCLK_EQUALS_XLBCLK
 CONFIG_SYS_IR_REG_BASE_ADDR
 CONFIG_SYS_ISA_BASE
 CONFIG_SYS_ISA_IO
@@ -4308,14 +4235,9 @@  CONFIG_SYS_MACB2_BASE
 CONFIG_SYS_MACB3_BASE
 CONFIG_SYS_MAIN_PWR_ON
 CONFIG_SYS_MALLOC_BASE
-CONFIG_SYS_MALLOC_CLEAR_ON_INIT
 CONFIG_SYS_MALLOC_LEN
 CONFIG_SYS_MALLOC_SIMPLE
 CONFIG_SYS_MAMR
-CONFIG_SYS_MAMR_10COL
-CONFIG_SYS_MAMR_8COL
-CONFIG_SYS_MAMR_9COL
-CONFIG_SYS_MAMR_PTA
 CONFIG_SYS_MAPLE
 CONFIG_SYS_MAPLE_MEM_PHYS
 CONFIG_SYS_MAPPED_RAM_BASE
@@ -4490,7 +4412,6 @@  CONFIG_SYS_MPC8xxx_PIC_ADDR
 CONFIG_SYS_MPC92469AC
 CONFIG_SYS_MRAM_BASE
 CONFIG_SYS_MRAM_SIZE
-CONFIG_SYS_MRS_OFFS
 CONFIG_SYS_MSC0_VAL
 CONFIG_SYS_MSC1_VAL
 CONFIG_SYS_MSC2_VAL
@@ -4702,24 +4623,18 @@  CONFIG_SYS_OR0_64M
 CONFIG_SYS_OR0_8M
 CONFIG_SYS_OR0_PRELIM
 CONFIG_SYS_OR0_REMAP
-CONFIG_SYS_OR1
 CONFIG_SYS_OR1_PRELIM
 CONFIG_SYS_OR1_REMAP
 CONFIG_SYS_OR2_PRELIM
-CONFIG_SYS_OR3_CAN
 CONFIG_SYS_OR3_PRELIM
 CONFIG_SYS_OR4_PRELIM
-CONFIG_SYS_OR5_ISP1362
 CONFIG_SYS_OR5_PRELIM
-CONFIG_SYS_OR5_REMAP
 CONFIG_SYS_OR6_64M
 CONFIG_SYS_OR6_8M
 CONFIG_SYS_OR6_PRELIM
 CONFIG_SYS_OR7_PRELIM
 CONFIG_SYS_OR_TIMING_FLASH
-CONFIG_SYS_OR_TIMING_FLASH_AT_50MHZ
 CONFIG_SYS_OR_TIMING_MRAM
-CONFIG_SYS_OR_TIMING_SDRAM
 CONFIG_SYS_OSC0_HZ
 CONFIG_SYS_OSC1_HZ
 CONFIG_SYS_OSCIN_FREQ
@@ -4953,7 +4868,6 @@  CONFIG_SYS_PCI_CFG_SIZE
 CONFIG_SYS_PCI_CLASSCODE
 CONFIG_SYS_PCI_CLASSCODE_MONARCH
 CONFIG_SYS_PCI_CLASSCODE_NONMONARCH
-CONFIG_SYS_PCI_CON_DEVICE
 CONFIG_SYS_PCI_EP_MEMORY_BASE
 CONFIG_SYS_PCI_FORCE_PCI_CONV
 CONFIG_SYS_PCI_IO_BASE
@@ -5007,16 +4921,10 @@  CONFIG_SYS_PCI_TBATR3
 CONFIG_SYS_PCI_TBATR4
 CONFIG_SYS_PCI_TBATR5
 CONFIG_SYS_PCI_VIRT
-CONFIG_SYS_PCMCIA_ATTRB_ADDR
-CONFIG_SYS_PCMCIA_ATTRB_SIZE
 CONFIG_SYS_PCMCIA_ATTR_BASE
 CONFIG_SYS_PCMCIA_CIS_WIN
 CONFIG_SYS_PCMCIA_CIS_WIN_SIZE
-CONFIG_SYS_PCMCIA_DMA_ADDR
-CONFIG_SYS_PCMCIA_DMA_SIZE
-CONFIG_SYS_PCMCIA_IO_ADDR
 CONFIG_SYS_PCMCIA_IO_BASE
-CONFIG_SYS_PCMCIA_IO_SIZE
 CONFIG_SYS_PCMCIA_IO_WIN
 CONFIG_SYS_PCMCIA_IO_WIN_SIZE
 CONFIG_SYS_PCMCIA_MEM_ADDR
@@ -5173,7 +5081,6 @@  CONFIG_SYS_RCAR_I2C3_SPEED
 CONFIG_SYS_RCWH_PCIHOST
 CONFIG_SYS_READ_SPD
 CONFIG_SYS_REDUNDAND_ENVIRONMENT
-CONFIG_SYS_REMAP_OR_AM
 CONFIG_SYS_RESET_ADDR
 CONFIG_SYS_RESET_ADDRESS
 CONFIG_SYS_RESET_BASE
@@ -5209,7 +5116,6 @@  CONFIG_SYS_SATA_FAT_BOOT_PARTITION
 CONFIG_SYS_SATA_MAX_DEVICE
 CONFIG_SYS_SBFHDR_DATA_OFFSET
 CONFIG_SYS_SBFHDR_SIZE
-CONFIG_SYS_SCCR
 CONFIG_SYS_SCCR_ENCCM
 CONFIG_SYS_SCCR_PCICM
 CONFIG_SYS_SCCR_PCIEXP1CM
@@ -5310,7 +5216,6 @@  CONFIG_SYS_SDRAM_DRVSTRENGTH
 CONFIG_SYS_SDRAM_DRV_STRENGTH
 CONFIG_SYS_SDRAM_EMOD
 CONFIG_SYS_SDRAM_LDF
-CONFIG_SYS_SDRAM_LIST
 CONFIG_SYS_SDRAM_LOWER
 CONFIG_SYS_SDRAM_MODE
 CONFIG_SYS_SDRAM_PLBADDUHB
@@ -5565,14 +5470,10 @@  CONFIG_SYS_UPDATE_FLASH_SIZE
 CONFIG_SYS_USB2D0_BASE
 CONFIG_SYS_USBCTRL
 CONFIG_SYS_USBD_BASE
-CONFIG_SYS_USB_BRGCLK
 CONFIG_SYS_USB_DEVICE
 CONFIG_SYS_USB_EHCI_CPU_INIT
 CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS
 CONFIG_SYS_USB_EHCI_REGS_BASE
-CONFIG_SYS_USB_EVENT_POLL
-CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
-CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
 CONFIG_SYS_USB_FAT_BOOT_PARTITION
 CONFIG_SYS_USB_HOST
 CONFIG_SYS_USB_OHCI_BOARD_INIT
@@ -5596,7 +5497,6 @@  CONFIG_SYS_USE_NAND
 CONFIG_SYS_USE_NANDFLASH
 CONFIG_SYS_USE_NOR
 CONFIG_SYS_USE_NORFLASH
-CONFIG_SYS_USE_PPCENV
 CONFIG_SYS_USE_SERIALFLASH
 CONFIG_SYS_USE_SPIFLASH
 CONFIG_SYS_USE_UBI
@@ -5672,7 +5572,6 @@  CONFIG_TEGRA_SLINK_CTRLS
 CONFIG_TEGRA_SPI
 CONFIG_TEGRA_UARTA_GPU
 CONFIG_TEGRA_UARTA_SDIO1
-CONFIG_TEGRA_UARTA_UAA_UAB
 CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
 CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
 CONFIG_TESTPIN_MASK
@@ -5684,7 +5583,6 @@  CONFIG_TFTP_FILE_NAME_MAX_LEN
 CONFIG_TFTP_PORT
 CONFIG_TFTP_TSIZE
 CONFIG_THOR_RESET_OFF
-CONFIG_THUMB2_KERNEL
 CONFIG_THUNDERX
 CONFIG_TIMESTAMP
 CONFIG_TIZEN
@@ -5696,17 +5594,7 @@  CONFIG_TPL_DRIVERS_MISC_SUPPORT
 CONFIG_TPL_PAD_TO
 CONFIG_TPM_TIS_BASE_ADDRESS
 CONFIG_TPS6586X_POWER
-CONFIG_TQM823L
-CONFIG_TQM823M
 CONFIG_TQM834X
-CONFIG_TQM850L
-CONFIG_TQM850M
-CONFIG_TQM855L
-CONFIG_TQM855M
-CONFIG_TQM860L
-CONFIG_TQM860M
-CONFIG_TQM862L
-CONFIG_TQM862M
 CONFIG_TRACE
 CONFIG_TRACE_BUFFER_SIZE
 CONFIG_TRACE_EARLY
@@ -5937,7 +5825,6 @@  CONFIG_UTBIPAR_INIT_TBIPA
 CONFIG_U_BOOT_HDR_ADDR
 CONFIG_U_BOOT_HDR_SIZE
 CONFIG_U_QE
-CONFIG_V38B
 CONFIG_VAL
 CONFIG_VAR_SIZE_SPL
 CONFIG_VCT_NOR
@@ -5964,9 +5851,7 @@  CONFIG_VIDEO_MXS_MODE_SYSTEM
 CONFIG_VIDEO_OMAP3
 CONFIG_VIDEO_ONBOARD
 CONFIG_VIDEO_SM501
-CONFIG_VIDEO_SM501_16BPP
 CONFIG_VIDEO_SM501_32BPP
-CONFIG_VIDEO_SM501_8BPP
 CONFIG_VIDEO_SM501_PCI
 CONFIG_VIDEO_STD_TIMINGS
 CONFIG_VIDEO_SUNXI