summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-08-18 18:24:08 -0400
committerTom Rini <trini@konsulko.com>2017-08-18 18:24:08 -0400
commita6dd10c70be9be863488d9d7afede057a4d99823 (patch)
treeeecb41d497e192080b309a0f3692557c698f3c5a /scripts
parent804f1d9938ddbf65848bd9c8868005b8d083a8d1 (diff)
parenta373024e7f70a04b7fed1c11be1fcd50fc21aac2 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index db284571f7..b3dac2dceb 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2294,6 +2294,7 @@ CONFIG_STM32_GPIO
CONFIG_STM32_HSE_HZ
CONFIG_STM32_HZ
CONFIG_STM32_SERIAL
+CONFIG_STMARK2
CONFIG_STRIDER
CONFIG_STRIDER_CON
CONFIG_STRIDER_CON_DP