summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-04-06 16:28:03 (GMT)
committerTom Rini <trini@konsulko.com>2017-04-07 00:40:24 (GMT)
commitd53ecad92f06d2e38a5cbc13af7473867c7fa277 (patch)
treecd46314f18a4e1b538a7973f1b74935f4ca2b096 /scripts
parent891f7ae63318293cd5807fb611f86f545080b1f6 (diff)
parente7bd15ea156f2a65d6aba167b9b7cd711caae2e6 (diff)
downloadu-boot-d53ecad92f06d2e38a5cbc13af7473867c7fa277.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2 Signed-off-by: Tom Rini <trini@konsulko.com>
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 7fdab58..811ba91 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -6305,7 +6305,6 @@ CONFIG_TI816X_EVM_DDR3
CONFIG_TI816X_USE_EMIF0
CONFIG_TI816X_USE_EMIF1
CONFIG_TI81XX
-CONFIG_TIMER_CLK_FREQ
CONFIG_TIMESTAMP
CONFIG_TIZEN
CONFIG_TI_KEYSTONE_SERDES