summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-12-23 18:41:32 -0500
committerTom Rini <trini@konsulko.com>2016-12-23 18:41:32 -0500
commit7ceae0eac04154a651caf2b1c8399fefd3de308d (patch)
tree79b088e26b9ad6db58bb05c9a009f87978f3223b /scripts
parent0683e7e0f3cf9e5e1d02c9a0bb57eecb203ab800 (diff)
parentcb71c6d85409715f541261f0bdda4a8060128689 (diff)
downloadu-boot-imx-7ceae0eac04154a651caf2b1c8399fefd3de308d.zip
u-boot-imx-7ceae0eac04154a651caf2b1c8399fefd3de308d.tar.gz
u-boot-imx-7ceae0eac04154a651caf2b1c8399fefd3de308d.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-spi
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 8814841..6d614c6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -176,7 +176,6 @@ CONFIG_ARIA_FPGA
CONFIG_ARM926EJS
CONFIG_ARMADA100
CONFIG_ARMADA100_FEC
-CONFIG_ARMADA100_SPI
CONFIG_ARMADA168
CONFIG_ARMADA_39X
CONFIG_ARMCORTEXA9
@@ -3095,7 +3094,6 @@ CONFIG_MPC5121ADS_REV2
CONFIG_MPC512x_FEC
CONFIG_MPC5200
CONFIG_MPC5200_DDR
-CONFIG_MPC52XX_SPI
CONFIG_MPC555
CONFIG_MPC5xxx_FEC
CONFIG_MPC5xxx_FEC_MII10