summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-17 09:19:45 -0400
committerTom Rini <trini@konsulko.com>2019-04-17 09:19:45 -0400
commit4b37f36d68ebb79cdc7d68a539de71e28e954d11 (patch)
treec982cc1d42e8eeb28dc1dc31d027e1fe145f113d /scripts
parent14b8c420b88a90e7ca0c979a2ee413bf459941e8 (diff)
parentf8c8669760610b2949d8d9ccaeef8231a44d4205 (diff)
downloadu-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Convert DM_MMC and DM_SCSI - A20, R40, H6 Linux dts(i) sync - CLK, RESET support for sunxi, sun8_emac net drivers
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 31c1ba3477..7d1ea243b1 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1939,7 +1939,6 @@ CONFIG_STV0991
CONFIG_STV0991_HZ
CONFIG_STV0991_HZ_CLOCK
CONFIG_ST_SMI
-CONFIG_SUNXI_AHCI
CONFIG_SUNXI_GPIO
CONFIG_SUNXI_MAX_FB_SIZE
CONFIG_SUPERH_ON_CHIP_R8A66597