aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-09-24 20:35:50 -0400
committerTom Rini <trini@konsulko.com>2021-09-24 20:35:50 -0400
commitbf0491f8d8c2f259b6b7356744b9e6e05be8f6f2 (patch)
treedecd8c20bc02d9039ce2ea6952e4642a71bc8190 /scripts
parent7d1fcaea128ff689aea75deaf7f75d75d1b553d3 (diff)
parentcc5afabc9d32933578536401114f91bbecff158b (diff)
downloadu-boot-bf0491f8d8c2f259b6b7356744b9e6e05be8f6f2.zip
u-boot-bf0491f8d8c2f259b6b7356744b9e6e05be8f6f2.tar.gz
u-boot-bf0491f8d8c2f259b6b7356744b9e6e05be8f6f2.tar.bz2
Merge branch '2021-09-24-assorted-updates' into next
- A few minor updates
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 bf7a7d3..0fab768 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3194,7 +3194,6 @@ CONFIG_U_BOOT_HDR_SIZE
CONFIG_VAL
CONFIG_VAR_SIZE_SPL
CONFIG_VERY_BIG_RAM
-CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
CONFIG_VIDEO_BCM2835
CONFIG_VIDEO_BMP_LOGO
CONFIG_VIDEO_DA8XX