From: Tom Rini <trini@konsulko.com>
Date: Thu, 3 Mar 2022 21:51:24 +0000 (-0500)
Subject: Merge branch '2022-03-03-Kconfig-migrations' into next
X-Git-Tag: v2022.07~124^2~21
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fkernel%2Fu-boot.git;a=commitdiff_plain;h=fd690a5e932010d0309a859169aeb77af94dff24

Merge branch '2022-03-03-Kconfig-migrations' into next

- Assorted Kconfig migrations and related cleanups.
---

fd690a5e932010d0309a859169aeb77af94dff24
diff --cc scripts/config_whitelist.txt
index a6bc234,1e78d26..0b964f6
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -29,26 -29,25 +29,11 @@@ CONFIG_ATMEL_SPI
  CONFIG_AUTO_ZRELADDR
  CONFIG_BACKSIDE_L2_CACHE
  CONFIG_BCM2835_GPIO
--CONFIG_BIOSEMU
  CONFIG_BITBANGMII_MULTI
--CONFIG_BL1_OFFSET
--CONFIG_BL1_SIZE
--CONFIG_BL2_OFFSET
--CONFIG_BL2_SIZE
  CONFIG_BOARDDIR
  CONFIG_BOARDNAME
- CONFIG_BOARD_COMMON
--CONFIG_BOARD_ECC_SUPPORT
  CONFIG_BOARD_NAME
--CONFIG_BOARD_POSTCLK_INIT
  CONFIG_BOARD_SIZE_LIMIT
--CONFIG_BOOTFILE
--CONFIG_BOOTMODE
--CONFIG_BOOTP_BOOTFILESIZE
--CONFIG_BOOTP_MAY_FAIL
--CONFIG_BOOTP_NISDOMAIN
--CONFIG_BOOTP_TIMEOFFSET
--CONFIG_BOOTP_VENDOREX
  CONFIG_BOOTROM_ERR_REG
  CONFIG_BOOTSCRIPT_ADDR
  CONFIG_BOOTSCRIPT_COPY_RAM
@@@ -64,12 -63,12 +49,9 @@@ CONFIG_BS_HDR_ADDR_DEVIC
  CONFIG_BS_HDR_ADDR_RAM
  CONFIG_BS_HDR_SIZE
  CONFIG_BS_SIZE
--CONFIG_BTB
--CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
  CONFIG_CF_DSPI
  CONFIG_CF_SBF
  CONFIG_CHAIN_BOOT_CMD
--CONFIG_CHIP_SELECTS_PER_CTRL
  CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
  CONFIG_CI_UDC_HAS_HOSTPC
  CONFIG_CLK_1000_400_200
@@@ -83,7 -82,7 +65,6 @@@ CONFIG_CM_REMA
  CONFIG_CM_SPD_DETECT
  CONFIG_CM_TCRAM
  CONFIG_COMMON_BOOT
--CONFIG_CONS_ON_SCC
  CONFIG_CONS_SCIF0
  CONFIG_CONS_SCIF1
  CONFIG_CONS_SCIF2
@@@ -91,7 -90,7 +72,6 @@@ CONFIG_CONS_SCIF
  CONFIG_CON_ROT
  CONFIG_CPLD_BR_PRELIM
  CONFIG_CPLD_OR_PRELIM
--CONFIG_CPM2
  CONFIG_CQSPI_REF_CLK
  CONFIG_CUSTOMER_BOARD_SUPPORT
  CONFIG_DB_784MP_GP
@@@ -274,7 -273,7 +254,6 @@@ CONFIG_HAS_ETH
  CONFIG_HAS_ETH1
  CONFIG_HAS_ETH2
  CONFIG_HAS_ETH3
--CONFIG_HAS_FEC
  CONFIG_HAS_FSL_DR_USB
  CONFIG_HAS_FSL_MPH_USB
  CONFIG_HDMI_ENCODER_I2C_ADDR
@@@ -689,7 -688,7 +668,6 @@@ CONFIG_RESET_PHY_
  CONFIG_RESET_TO_RETRY
  CONFIG_RESET_VECTOR_ADDRESS
  CONFIG_RESTORE_FLASH
--CONFIG_RES_BLOCK_SIZE
  CONFIG_RMII
  CONFIG_ROCKCHIP_CHIP_TAG
  CONFIG_ROCKCHIP_MAX_INIT_SIZE
@@@ -727,8 -726,8 +705,6 @@@ CONFIG_SC_TIMER_CL
  CONFIG_SDCARD
  CONFIG_SDRAM_OFFSET_FOR_RT
  CONFIG_SECBOOT
--CONFIG_SECURE_BL1_ONLY
--CONFIG_SEC_FW_SIZE
  CONFIG_SERIAL_BOOT
  CONFIG_SERIAL_FLASH
  CONFIG_SERIAL_SOFTWARE_FIFO
@@@ -845,7 -844,7 +821,6 @@@ CONFIG_SYS_AUTOMATIC_SDRAM_DETECTIO
  CONFIG_SYS_AUXCORE_BOOTDATA
  CONFIG_SYS_BARGSIZE
  CONFIG_SYS_BAUDRATE_TABLE
--CONFIG_SYS_BCSR
  CONFIG_SYS_BFTIC3_BASE
  CONFIG_SYS_BFTIC3_SIZE
  CONFIG_SYS_BMAN_CENA_BASE
@@@ -1446,11 -1445,11 +1421,6 @@@ CONFIG_SYS_LBC_CACHE_BAS
  CONFIG_SYS_LBC_FLASH_BASE
  CONFIG_SYS_LBC_LBCR
  CONFIG_SYS_LBC_LCRR
--CONFIG_SYS_LBC_LSDMR_1
--CONFIG_SYS_LBC_LSDMR_2
--CONFIG_SYS_LBC_LSDMR_3
--CONFIG_SYS_LBC_LSDMR_4
--CONFIG_SYS_LBC_LSDMR_5
  CONFIG_SYS_LBC_LSDMR_COMMON
  CONFIG_SYS_LBC_LSRT
  CONFIG_SYS_LBC_MRTPR
@@@ -1535,8 -1534,8 +1505,6 @@@ CONFIG_SYS_MPC83xx_ESDHC_OFFSE
  CONFIG_SYS_MPC83xx_USB1_ADDR
  CONFIG_SYS_MPC83xx_USB1_OFFSET
  CONFIG_SYS_MPC85XX_NO_RESETVEC
--CONFIG_SYS_MPC85xx_CPM_ADDR
--CONFIG_SYS_MPC85xx_CPM_OFFSET
  CONFIG_SYS_MPC85xx_DMA
  CONFIG_SYS_MPC85xx_DMA1_OFFSET
  CONFIG_SYS_MPC85xx_DMA2_OFFSET
@@@ -1825,10 -1824,10 +1793,6 @@@ CONFIG_SYS_RCAR_I2C3_BAS
  CONFIG_SYS_RFD
  CONFIG_SYS_RGMII1_PHY_ADDR
  CONFIG_SYS_RGMII2_PHY_ADDR
--CONFIG_SYS_RIO_MEM_BUS
--CONFIG_SYS_RIO_MEM_PHYS
--CONFIG_SYS_RIO_MEM_SIZE
--CONFIG_SYS_RIO_MEM_VIRT
  CONFIG_SYS_ROM_BASE
  CONFIG_SYS_RSTC_RMR_VAL
  CONFIG_SYS_RTC_BUS_NUM