diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-30 08:11:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-30 08:11:50 -0400 |
| commit | 7ce79599a1b8f2078b15fa170f11f2666200b24e (patch) | |
| tree | dcf8df06f13a5cb6ac4903605d96b7b6434a045d /scripts | |
| parent | 4ddc981225288e68d45eb8e33271d1481920086f (diff) | |
| parent | fed329aebe3aaac0928c73547ac6316af2adf0cd (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index e8cf9f38656..e0b0117dc9b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -166,7 +166,7 @@ ifdef CONFIG_ARCH_SOCFPGA ALL-y += $(obj)/$(SPL_BIN).sfp endif -ifdef CONFIG_SUNXI +ifdef CONFIG_ARCH_SUNXI ALL-y += $(obj)/sunxi-spl.bin endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 11b5a221ee6..d476367088c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4355,7 +4355,6 @@ CONFIG_STV0991_HZ CONFIG_STV0991_HZ_CLOCK CONFIG_ST_SMI CONFIG_SUN4 -CONFIG_SUNXI CONFIG_SUNXI_AHCI CONFIG_SUNXI_EMAC CONFIG_SUNXI_GMAC |