summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-04 19:58:09 -0400
committerTom Rini <trini@konsulko.com>2019-05-04 19:58:09 -0400
commit2dc426418f275a934178df41905fabe6f7cfac95 (patch)
treed15f8b1e029b94bf1decda3b675c01625b7bfced /scripts
parent4862830b696a6d0750e19d32a82553cdb41a85f8 (diff)
parent7225a27ffae5d1119eb25b6b9c9e091a852e6b13 (diff)
downloadu-boot-2dc426418f275a934178df41905fabe6f7cfac95.tar.gz
u-boot-2dc426418f275a934178df41905fabe6f7cfac95.tar.xz
u-boot-2dc426418f275a934178df41905fabe6f7cfac95.zip
Merge branch '2019-05-04-master-imports'
- Remove dead code from davinci - Migrate CONFIG_SUPPORT_EMMC_BOOT
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 48ef03149e..bc86b848a2 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1937,7 +1937,6 @@ CONFIG_ST_SMI
CONFIG_SUNXI_GPIO
CONFIG_SUNXI_MAX_FB_SIZE
CONFIG_SUPERH_ON_CHIP_R8A66597
-CONFIG_SUPPORT_EMMC_BOOT
CONFIG_SUVD3
CONFIG_SXNI855T
CONFIG_SYSFLAGS_ADDR