summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-04-10 12:07:29 (GMT)
committerTom Rini <trini@konsulko.com>2017-04-10 12:07:29 (GMT)
commit01cce5fdd098add2b8aa570468cb35fca5d778fe (patch)
tree279174c700f36ef4c8a38b30e8c39be8b32e80e6 /scripts
parente391b1e64b0bd65709a28a4764afe4f32d408243 (diff)
parentca0d29e4f06095fd39f3125aef8f427aa1728ee5 (diff)
downloadu-boot-01cce5fdd098add2b8aa570468cb35fca5d778fe.tar.xz
Merge git://git.denx.de/u-boot-x86
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 04b6a95..330bc58 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -6663,7 +6663,6 @@ CONFIG_YAFFS_WINCE
CONFIG_YELLOWSTONE
CONFIG_YELLOW_LED
CONFIG_YOSEMITE
-CONFIG_ZBOOT_32
CONFIG_ZC770_XM010
CONFIG_ZC770_XM011
CONFIG_ZC770_XM012