Merge branch '2022-06-28-Kconfig-migrations' into next
- Convert a large number of CONFIG symbols to Kconfig. Of note is a large chunk of USB symbols (and dead code removal), ensuring all SPL/TPL/VPL symbols have an appropriate dependency, largely (but not entirely) removing the testing of CONFIG_SPL_BUILD in board headers, and allowing CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS to co-exist as this facilities migration of many platforms.
This commit is contained in:
@@ -253,7 +253,7 @@ endif
|
||||
|
||||
INPUTS-y += $(obj)/$(SPL_BIN).bin $(obj)/$(SPL_BIN).sym
|
||||
|
||||
ifdef CONFIG_SAMSUNG
|
||||
ifneq ($(CONFIG_ARCH_EXYNOS)$(CONFIG_ARCH_S5PC1XX),)
|
||||
INPUTS-y += $(obj)/$(BOARD)-spl.bin
|
||||
endif
|
||||
|
||||
@@ -367,8 +367,8 @@ $(platdata-hdr) $(u-boot-spl-platdata_c) &: $(obj)/$(SPL_BIN).dtb
|
||||
@rm -f $(u-boot-spl-all-platdata_c) $(u-boot-spl-all-platdata)
|
||||
$(call if_changed,dtoc)
|
||||
|
||||
ifdef CONFIG_SAMSUNG
|
||||
ifdef CONFIG_VAR_SIZE_SPL
|
||||
ifneq ($(CONFIG_ARCH_EXYNOS)$(CONFIG_ARCH_S5PC1XX),)
|
||||
ifeq ($(CONFIG_EXYNOS5420),y)
|
||||
VAR_SIZE_PARAM = --vs
|
||||
else
|
||||
VAR_SIZE_PARAM =
|
||||
|
||||
@@ -26,28 +26,15 @@ CONFIG_DM9000_NO_SROM
|
||||
CONFIG_DM9000_USE_16BIT
|
||||
CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR
|
||||
CONFIG_DSP_CLUSTER_START
|
||||
CONFIG_DWC_AHSATA_BASE_ADDR
|
||||
CONFIG_DWC_AHSATA_PORT_ID
|
||||
CONFIG_DW_ALTDESCRIPTOR
|
||||
CONFIG_DW_GMAC_DEFAULT_DMA_PBL
|
||||
CONFIG_DW_WDT_BASE
|
||||
CONFIG_DW_WDT_CLOCK_KHZ
|
||||
CONFIG_E1000_NO_NVM
|
||||
CONFIG_EFLASH_PROTSECTORS
|
||||
CONFIG_EHCI_DESC_BIG_ENDIAN
|
||||
CONFIG_EHCI_HCD_INIT_AFTER_RESET
|
||||
CONFIG_EHCI_MMIO_BIG_ENDIAN
|
||||
CONFIG_EHCI_MXS_PORT0
|
||||
CONFIG_EHCI_MXS_PORT1
|
||||
CONFIG_EMU
|
||||
CONFIG_ENABLE_36BIT_PHYS
|
||||
CONFIG_ENABLE_MMU
|
||||
CONFIG_ENV_FLAGS_LIST_STATIC
|
||||
CONFIG_ENV_IS_EMBEDDED
|
||||
CONFIG_ENV_MAX_ENTRIES
|
||||
CONFIG_ENV_MIN_ENTRIES
|
||||
CONFIG_ENV_RANGE
|
||||
CONFIG_ENV_REFLASH
|
||||
CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS
|
||||
CONFIG_ENV_SETTINGS_NAND_V1
|
||||
CONFIG_ENV_SETTINGS_NAND_V2
|
||||
@@ -55,32 +42,15 @@ CONFIG_ENV_SETTINGS_V1
|
||||
CONFIG_ENV_SETTINGS_V2
|
||||
CONFIG_ENV_SROM_BANK
|
||||
CONFIG_ENV_TOTAL_SIZE
|
||||
CONFIG_ENV_VERSION
|
||||
CONFIG_ESBC_ADDR_64BIT
|
||||
CONFIG_ESBC_HDR_LS
|
||||
CONFIG_ESDHC_DETECT_QUIRK
|
||||
CONFIG_ESDHC_HC_BLK_ADDR
|
||||
CONFIG_ESPRESSO7420
|
||||
CONFIG_ET1100_BASE
|
||||
CONFIG_ETHBASE
|
||||
CONFIG_EXTRA_CLOCK
|
||||
CONFIG_EXTRA_ENV
|
||||
CONFIG_EXTRA_ENV_SETTINGS
|
||||
CONFIG_EXTRA_ENV_SETTINGS_COMMON
|
||||
CONFIG_EXYNOS4
|
||||
CONFIG_EXYNOS4210
|
||||
CONFIG_EXYNOS5
|
||||
CONFIG_EXYNOS5250
|
||||
CONFIG_EXYNOS5420
|
||||
CONFIG_EXYNOS5_DT
|
||||
CONFIG_EXYNOS_ACE_SHA
|
||||
CONFIG_EXYNOS_DP
|
||||
CONFIG_EXYNOS_FB
|
||||
CONFIG_EXYNOS_MIPI_DSIM
|
||||
CONFIG_EXYNOS_RELOCATE_CODE_BASE
|
||||
CONFIG_EXYNOS_SPL
|
||||
CONFIG_EXYNOS_TMU
|
||||
CONFIG_FACTORYSET
|
||||
CONFIG_FB_ADDR
|
||||
CONFIG_FDTADDR
|
||||
CONFIG_FDTFILE
|
||||
@@ -95,8 +65,6 @@ CONFIG_FLASH_SHOW_PROGRESS
|
||||
CONFIG_FLASH_SPANSION_S29WS_N
|
||||
CONFIG_FLASH_VERIFY
|
||||
CONFIG_FM_PLAT_CLK_DIV
|
||||
CONFIG_FPGA_COUNT
|
||||
CONFIG_FPGA_STRATIX_V
|
||||
CONFIG_FSL_CADMUS
|
||||
CONFIG_FSL_CORENET
|
||||
CONFIG_FSL_CPLD
|
||||
@@ -115,7 +83,6 @@ CONFIG_FSL_PMIC_BUS
|
||||
CONFIG_FSL_PMIC_CLK
|
||||
CONFIG_FSL_PMIC_CS
|
||||
CONFIG_FSL_PMIC_MODE
|
||||
CONFIG_FSL_SATA_V2
|
||||
CONFIG_FSL_SDHC_V2_3
|
||||
CONFIG_FSL_SERDES
|
||||
CONFIG_FSL_SERDES1
|
||||
@@ -131,8 +98,6 @@ CONFIG_G_DNL_THOR_PRODUCT_NUM
|
||||
CONFIG_G_DNL_THOR_VENDOR_NUM
|
||||
CONFIG_G_DNL_UMS_PRODUCT_NUM
|
||||
CONFIG_G_DNL_UMS_VENDOR_NUM
|
||||
CONFIG_HAS_FSL_DR_USB
|
||||
CONFIG_HAS_FSL_MPH_USB
|
||||
CONFIG_HDMI_ENCODER_I2C_ADDR
|
||||
CONFIG_HETROGENOUS_CLUSTERS
|
||||
CONFIG_HIDE_LOGO_VERSION
|
||||
@@ -291,7 +256,6 @@ CONFIG_I2C_MVTWSI_BASE0
|
||||
CONFIG_I2C_MVTWSI_BASE1
|
||||
CONFIG_I2C_RTC_ADDR
|
||||
CONFIG_ICS307_REFCLK_HZ
|
||||
CONFIG_IDE_PREINIT
|
||||
CONFIG_IMX
|
||||
CONFIG_IMX6_PWM_PER_CLK
|
||||
CONFIG_IMX_HDMI
|
||||
@@ -343,7 +307,6 @@ CONFIG_KSNET_SERDES_SGMII_BASE
|
||||
CONFIG_L1_INIT_RAM
|
||||
CONFIG_L2_CACHE
|
||||
CONFIG_LAYERSCAPE_NS_ACCESS
|
||||
CONFIG_LBA48
|
||||
CONFIG_LCD_ALIGNMENT
|
||||
CONFIG_LCD_MENU
|
||||
CONFIG_LD9040
|
||||
@@ -418,7 +381,6 @@ CONFIG_NORBOOT
|
||||
CONFIG_NS16550_MIN_FUNCTIONS
|
||||
CONFIG_NUM_DSP_CPUS
|
||||
CONFIG_ODROID_REV_AIN
|
||||
CONFIG_ORIGEN
|
||||
CONFIG_OTHBOOTARGS
|
||||
CONFIG_OVERWRITE_ETHADDR_ONCE
|
||||
CONFIG_PALMAS_POWER
|
||||
@@ -490,7 +452,6 @@ CONFIG_RAMBOOT_TEXT_BASE
|
||||
CONFIG_RAMDISK_ADDR
|
||||
CONFIG_RD_LVL
|
||||
CONFIG_RESET_VECTOR_ADDRESS
|
||||
CONFIG_RESTORE_FLASH
|
||||
CONFIG_ROCKCHIP_CHIP_TAG
|
||||
CONFIG_ROCKCHIP_MAX_INIT_SIZE
|
||||
CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
|
||||
@@ -504,12 +465,7 @@ CONFIG_RTC_MC13XXX
|
||||
CONFIG_RTC_MCFRRTC
|
||||
CONFIG_RTC_MXS
|
||||
CONFIG_RTC_PT7C4338
|
||||
CONFIG_S5P
|
||||
CONFIG_S5PC100
|
||||
CONFIG_S5PC110
|
||||
CONFIG_S5P_PA_SYSRAM
|
||||
CONFIG_SAMA5D3_LCD_BASE
|
||||
CONFIG_SAMSUNG
|
||||
CONFIG_SAMSUNG_ONENAND
|
||||
CONFIG_SANDBOX_ARCH
|
||||
CONFIG_SANDBOX_SDL
|
||||
@@ -517,8 +473,6 @@ CONFIG_SANDBOX_SPI_MAX_BUS
|
||||
CONFIG_SANDBOX_SPI_MAX_CS
|
||||
CONFIG_SAR2_REG
|
||||
CONFIG_SAR_REG
|
||||
CONFIG_SATA1
|
||||
CONFIG_SATA2
|
||||
CONFIG_SCIF_A
|
||||
CONFIG_SCSI_DEV_LIST
|
||||
CONFIG_SC_TIMER_CLK
|
||||
@@ -577,7 +531,6 @@ CONFIG_STACKBASE
|
||||
CONFIG_STANDALONE_LOAD_ADDR
|
||||
CONFIG_STD_DEVICES_SETTINGS
|
||||
CONFIG_SYS_64BIT
|
||||
CONFIG_SYS_64BIT_LBA
|
||||
CONFIG_SYS_83XX_DDR_USES_CS0
|
||||
CONFIG_SYS_AMASK0
|
||||
CONFIG_SYS_AMASK1
|
||||
@@ -592,7 +545,6 @@ CONFIG_SYS_AT91_MAIN_CLOCK
|
||||
CONFIG_SYS_AT91_PLLA
|
||||
CONFIG_SYS_AT91_PLLB
|
||||
CONFIG_SYS_AT91_SLOW_CLOCK
|
||||
CONFIG_SYS_AUTOLOAD
|
||||
CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
|
||||
CONFIG_SYS_AUXCORE_BOOTDATA
|
||||
CONFIG_SYS_BAUDRATE_TABLE
|
||||
@@ -820,7 +772,6 @@ CONFIG_SYS_DV_NOR_BOOT_CFG
|
||||
CONFIG_SYS_EEPROM_BUS_NUM
|
||||
CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
|
||||
CONFIG_SYS_EEPROM_WREN
|
||||
CONFIG_SYS_EHCI_USB1_ADDR
|
||||
CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
|
||||
CONFIG_SYS_ENET_BD_BASE
|
||||
CONFIG_SYS_ENV_SECT_SIZE
|
||||
@@ -1208,9 +1159,6 @@ CONFIG_SYS_MPC83xx_DMA_ADDR
|
||||
CONFIG_SYS_MPC83xx_DMA_OFFSET
|
||||
CONFIG_SYS_MPC83xx_ESDHC_ADDR
|
||||
CONFIG_SYS_MPC83xx_ESDHC_OFFSET
|
||||
CONFIG_SYS_MPC83xx_USB1_ADDR
|
||||
CONFIG_SYS_MPC83xx_USB1_OFFSET
|
||||
CONFIG_SYS_MPC85XX_NO_RESETVEC
|
||||
CONFIG_SYS_MPC85xx_DMA
|
||||
CONFIG_SYS_MPC85xx_DMA1_OFFSET
|
||||
CONFIG_SYS_MPC85xx_DMA2_OFFSET
|
||||
@@ -1498,12 +1446,6 @@ CONFIG_SYS_RTC_BUS_NUM
|
||||
CONFIG_SYS_RTC_CNT
|
||||
CONFIG_SYS_RTC_SETUP
|
||||
CONFIG_SYS_SATA
|
||||
CONFIG_SYS_SATA1
|
||||
CONFIG_SYS_SATA1_FLAGS
|
||||
CONFIG_SYS_SATA1_OFFSET
|
||||
CONFIG_SYS_SATA2
|
||||
CONFIG_SYS_SATA2_FLAGS
|
||||
CONFIG_SYS_SATA2_OFFSET
|
||||
CONFIG_SYS_SATA_FAT_BOOT_PARTITION
|
||||
CONFIG_SYS_SBFHDR_DATA_OFFSET
|
||||
CONFIG_SYS_SBFHDR_SIZE
|
||||
@@ -1630,7 +1572,6 @@ CONFIG_SYS_UEC2_TX_CLK
|
||||
CONFIG_SYS_UEC2_UCC_NUM
|
||||
CONFIG_SYS_ULB_CLK
|
||||
CONFIG_SYS_UNIFY_CACHE
|
||||
CONFIG_SYS_USB_FAT_BOOT_PARTITION
|
||||
CONFIG_SYS_USB_OHCI_BOARD_INIT
|
||||
CONFIG_SYS_USB_OHCI_CPU_INIT
|
||||
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
|
||||
@@ -1668,7 +1609,6 @@ CONFIG_TEGRA_BOARD_STRING
|
||||
CONFIG_TEGRA_CLOCK_SCALING
|
||||
CONFIG_TEGRA_ENABLE_UARTA
|
||||
CONFIG_TEGRA_ENABLE_UARTD
|
||||
CONFIG_TEGRA_GPU
|
||||
CONFIG_TEGRA_LP0
|
||||
CONFIG_TEGRA_PMU
|
||||
CONFIG_TEGRA_SLINK_CTRLS
|
||||
@@ -1681,11 +1621,9 @@ CONFIG_TESTPIN_MASK
|
||||
CONFIG_TESTPIN_REG
|
||||
CONFIG_THOR_RESET_OFF
|
||||
CONFIG_THUNDERX
|
||||
CONFIG_TIZEN
|
||||
CONFIG_TMU_TIMER
|
||||
CONFIG_TPM_TIS_BASE_ADDRESS
|
||||
CONFIG_TPS6586X_POWER
|
||||
CONFIG_TRATS
|
||||
CONFIG_TSEC
|
||||
CONFIG_TSEC1
|
||||
CONFIG_TSEC1_NAME
|
||||
@@ -1722,13 +1660,11 @@ CONFIG_USB_ATMEL_CLK_SEL_UPLL
|
||||
CONFIG_USB_BOOTING
|
||||
CONFIG_USB_DEVICE
|
||||
CONFIG_USB_EHCI_EXYNOS
|
||||
CONFIG_USB_EHCI_TXFIFO_THRESH
|
||||
CONFIG_USB_EXT2_BOOT
|
||||
CONFIG_USB_FAT_BOOT
|
||||
CONFIG_USB_GADGET_AT91
|
||||
CONFIG_USB_GADGET_DWC2_OTG_PHY
|
||||
CONFIG_USB_ISP1301_I2C_ADDR
|
||||
CONFIG_USB_MAX_CONTROLLER_COUNT
|
||||
CONFIG_USB_OHCI_LPC32XX
|
||||
CONFIG_USB_OHCI_NEW
|
||||
CONFIG_USB_TTY
|
||||
@@ -1748,4 +1684,3 @@ CONFIG_X86EMU_RAW_IO
|
||||
CONFIG_X86_MRC_ADDR
|
||||
CONFIG_X86_REFCODE_ADDR
|
||||
CONFIG_X86_REFCODE_RUN_ADDR
|
||||
CONFIG_XTFPGA
|
||||
|
||||
Reference in New Issue
Block a user