summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-12-03 09:43:47 -0500
committerTom Rini <trini@konsulko.com>2020-12-03 09:43:47 -0500
commitee1e04558ff8c8ed812b986939447f129bb0b0bb (patch)
tree3a8e867ec03a87263834725b5815c43465a81f88 /scripts
parentab31883ae7e54ded8396b13a9057f861bf916ea4 (diff)
parenta6cd384b9c37596ca9035f26922dd65991ddcb85 (diff)
downloadu-boot-ee1e04558ff8c8ed812b986939447f129bb0b0bb.tar.gz
u-boot-ee1e04558ff8c8ed812b986939447f129bb0b0bb.tar.xz
u-boot-ee1e04558ff8c8ed812b986939447f129bb0b0bb.zip
Merge branch '2020-12-02-master-imports'
- Assorted minor fixes
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 8b4fcba395..c0339dcc00 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -848,7 +848,6 @@ CONFIG_IRAM_STACK
CONFIG_IRAM_TOP
CONFIG_IRDA_BASE
CONFIG_IS_ENABLED
-CONFIG_JFFS2_CMDLINE
CONFIG_JFFS2_DEV
CONFIG_JFFS2_LZO
CONFIG_JFFS2_NAND