diff options
| author | Tom Rini <[email protected]> | 2017-09-01 13:30:19 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-09-01 13:30:19 -0400 |
| commit | 0b6e5b2c48f91afec21870502761e27961ac061c (patch) | |
| tree | 0e8b8e618cb3ec432643a628be4eb3bcba10991c /scripts | |
| parent | 1d20170467b079642be96996dcd71db64c3c365c (diff) | |
| parent | 6ff005cf19363382fc867d7876a75fd8a386e894 (diff) | |
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-whitelist.sh | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh index 7d8160d5f26..6feb9b67cf5 100755 --- a/scripts/build-whitelist.sh +++ b/scripts/build-whitelist.sh @@ -13,10 +13,10 @@ export LC_ALL=C LC_COLLATE=C # There are two independent greps. The first pulls out the component parts # of CONFIG_SYS_EXTRA_OPTIONS. An example is: # -# SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) +# SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) # # We want this to produce: -# CONFIG_SUNXI_GMAC +# CONFIG_SUN7I_GMAC # CONFIG_AHCI # CONFIG_SATAPWR # diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d8710958a39..4651bb55e78 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2307,7 +2307,6 @@ CONFIG_STV0991_HZ_CLOCK CONFIG_ST_SMI CONFIG_SUNXI_AHCI CONFIG_SUNXI_EMAC -CONFIG_SUNXI_GMAC CONFIG_SUNXI_GPIO CONFIG_SUNXI_MAX_FB_SIZE CONFIG_SUNXI_USB_PHYS |