summaryrefslogtreecommitdiff
path: root/scripts/config_whitelist.txt
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-14 09:09:27 -0400
committerTom Rini <trini@konsulko.com>2020-07-14 09:09:27 -0400
commit3f126c764d63ddf6f26bc742a96938a0ecd8b8dc (patch)
tree6cbe4b72ea6b7e3874415058b713f711bd6df996 /scripts/config_whitelist.txt
parent959a481f8f49cb01d757363ae816d83e9c145ab7 (diff)
parent865fdfddce467f446b64f2aa7ba77f9dd0a48a6b (diff)
Merge tag 'ti-v2020.10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Sync DMA and CPSW DT bindings for K3 devices - Other minor fixes for mmc and other TI devices
Diffstat (limited to 'scripts/config_whitelist.txt')
-rw-r--r--scripts/config_whitelist.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ca40b9beb0..e3bebe94c4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -312,7 +312,6 @@ CONFIG_DFU_ENV_SETTINGS
CONFIG_DHCP_MIN_EXT_LEN
CONFIG_DIALOG_POWER
CONFIG_DIMM_SLOTS_PER_CTLR
-CONFIG_DIRECT_NOR_BOOT
CONFIG_DISCONTIGMEM
CONFIG_DISCOVER_PHY
CONFIG_DISPLAY_AER_xxxx
@@ -4150,7 +4149,6 @@ CONFIG_USB_XHCI_EXYNOS
CONFIG_USB_XHCI_OMAP
CONFIG_USER_LOWLEVEL_INIT
CONFIG_USE_INTERRUPT
-CONFIG_USE_NOR
CONFIG_USE_ONENAND_BOARD_INIT
CONFIG_USE_SPIFLASH
CONFIG_UTBIPAR_INIT_TBIPA