summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-12-02 22:05:35 -0500
committerTom Rini <trini@konsulko.com>2019-12-02 22:05:35 -0500
commita4ef0657e3075d0f951d78cc1398cb7e05af648a (patch)
tree9a4387de5845e6fd1331f0af32bfd82fac9eb039 /scripts
parent357040645f9f56b33909520483df9f840be7e181 (diff)
parentcb3ef6810a27c8ddf5db8694bcef9337f27d12ce (diff)
downloadu-boot-a4ef0657e3075d0f951d78cc1398cb7e05af648a.tar.gz
u-boot-a4ef0657e3075d0f951d78cc1398cb7e05af648a.tar.xz
u-boot-a4ef0657e3075d0f951d78cc1398cb7e05af648a.zip
Merge branch '2019-12-02-master-imports'
- A large series of clean-ups to reduce common.h contents
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 7784922693..f3ed80e6c4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1567,7 +1567,6 @@ CONFIG_SHARP_LM8V31
CONFIG_SHARP_LQ035Q7DH06
CONFIG_SHEEVA_88SV131
CONFIG_SHEEVA_88SV331xV5
-CONFIG_SHOW_ACTIVITY
CONFIG_SH_CMT_CLK_FREQ
CONFIG_SH_DSP
CONFIG_SH_ETHER_ALIGNE_SIZE