summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-08-26 09:37:37 -0400
committerTom Rini <trini@konsulko.com>2019-08-26 09:37:37 -0400
commit6f9656d726235b4cbb4f469a82c30e5006a75b53 (patch)
tree2b8afde3d7a06a3778bd24cf4243dd0856a07add /scripts
parent50b4b80f597b9f59b98adbdbad691b1027bd501a (diff)
parent1ee774d20914fb89ad1b236aedb4178912f77c77 (diff)
downloadu-boot-6f9656d726235b4cbb4f469a82c30e5006a75b53.tar.gz
u-boot-6f9656d726235b4cbb4f469a82c30e5006a75b53.tar.xz
u-boot-6f9656d726235b4cbb4f469a82c30e5006a75b53.zip
Merge branch '2019-08-24-master-imports'
- Migrate SYS_SPI_U_BOOT_OFFS, SYS_NAND_USE_FLASH_BBT and ARCH_CPU_INIT to Kconfig
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 661c8b6427..b18eab1707 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -35,7 +35,6 @@ CONFIG_APER_1_BASE
CONFIG_APER_SIZE
CONFIG_APUS_FAST_EXCEPT
CONFIG_ARCH_ADPAG101P
-CONFIG_ARCH_CPU_INIT
CONFIG_ARCH_HAS_ILOG2_U32
CONFIG_ARCH_HAS_ILOG2_U64
CONFIG_ARCH_KIRKWOOD
@@ -3334,7 +3333,6 @@ CONFIG_SYS_NAND_SELECT_DEVICE
CONFIG_SYS_NAND_SIZE
CONFIG_SYS_NAND_SPL_KERNEL_OFFS
CONFIG_SYS_NAND_SPL_SIZE
-CONFIG_SYS_NAND_USE_FLASH_BBT
CONFIG_SYS_NAND_U_BOOT_DST
CONFIG_SYS_NAND_U_BOOT_RELOC
CONFIG_SYS_NAND_U_BOOT_RELOC_SP
@@ -3939,7 +3937,6 @@ CONFIG_SYS_SPI_KERNEL_OFFS
CONFIG_SYS_SPI_MXC_WAIT
CONFIG_SYS_SPI_RTC_DEVID
CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
-CONFIG_SYS_SPI_U_BOOT_OFFS
CONFIG_SYS_SPI_U_BOOT_SIZE
CONFIG_SYS_SPI_WRITE_TOUT
CONFIG_SYS_SPL_ARGS_ADDR