summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-08-04 19:41:30 -0400
committerTom Rini <trini@konsulko.com>2018-08-04 19:41:30 -0400
commit0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7 (patch)
treef5160ba496f6e75862800726c989a616f5551547 /scripts
parentd64caaf77dec2f0a576d0d1f7c7f4f463ebc7de8 (diff)
parent89a897fc4d78e31332e5899e977d8bf3c82abafa (diff)
downloadu-boot-0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7.tar.gz
u-boot-0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7.tar.xz
u-boot-0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7.zip
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
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 7ced4099f2..0d60da3f28 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2011,7 +2011,6 @@ CONFIG_ST_SMI
CONFIG_SUNXI_AHCI
CONFIG_SUNXI_GPIO
CONFIG_SUNXI_MAX_FB_SIZE
-CONFIG_SUNXI_USB_PHYS
CONFIG_SUPERH_ON_CHIP_R8A66597
CONFIG_SUPPORT_EMMC_BOOT
CONFIG_SUVD3