aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-10-25 10:16:21 -0400
committerTom Rini <trini@konsulko.com>2018-10-25 10:16:21 -0400
commitcf033e04da315ba949e804c127abae0134bda30f (patch)
tree77100d0a1c7ac1ce879509df57b845184f058550 /scripts
parent1ed3c0954bd160dafcad8847a51c3ddd5f992f51 (diff)
parent3c28576bb0f0990d699fd330089412e620706941 (diff)
downloadu-boot-cf033e04da315ba949e804c127abae0134bda30f.zip
u-boot-cf033e04da315ba949e804c127abae0134bda30f.tar.gz
u-boot-cf033e04da315ba949e804c127abae0134bda30f.tar.bz2
Merge tag 'u-boot-imx-20181025' of git://git.denx.de/u-boot-imx
Merged imx8 architecture, fix build for imx8 + warnings
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2126315..94c0f1f 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -310,7 +310,6 @@ CONFIG_D2NET_V2
CONFIG_DA850_AM18X_EVM
CONFIG_DA850_EVM_MAX_CPU_CLK
CONFIG_DBGU
-CONFIG_DBG_MONITOR
CONFIG_DB_784MP_GP
CONFIG_DCACHE
CONFIG_DCACHE_OFF
@@ -962,7 +961,6 @@ CONFIG_IMX_HDMI
CONFIG_IMX_NAND
CONFIG_IMX_OTP
CONFIG_IMX_VIDEO_SKIP
-CONFIG_IMX_WATCHDOG
CONFIG_INETSPACE_V2
CONFIG_INITRD_TAG
CONFIG_INIT_CRITICAL