summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-16 00:16:02 (GMT)
committerTom Rini <trini@konsulko.com>2017-05-16 00:16:02 (GMT)
commitd09ec7f81650425140776995fc9752189ddf7956 (patch)
treef8de42cc54511ff75ef5b4d2a695be25a1d0b070 /scripts
parentcb33bda44f4bbf6fb58adf41dced313ca38da6fc (diff)
parent940aed8f6bacfc8c0dbaf9da0008e0a6a76463a8 (diff)
downloadu-boot-d09ec7f81650425140776995fc9752189ddf7956.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-video
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 3350185..fa9c3fc 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -236,7 +236,6 @@ CONFIG_BL1_SIZE
CONFIG_BL2_OFFSET
CONFIG_BL2_SIZE
CONFIG_BMP_16BPP
-CONFIG_BMP_24BMP
CONFIG_BMP_24BPP
CONFIG_BMP_32BPP
CONFIG_BOARDDIR