diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-21 13:11:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-21 13:11:06 -0400 |
| commit | 7b80644e271544848db90fb0407d67b3e3749a8e (patch) | |
| tree | 511fd7542260b12f12993e473d6b2c0d03f14548 | |
| parent | b94b19e729895285cd0c9ed170d20038173d4f07 (diff) | |
| parent | e3ada91e49848ddcd3293a737cf08e48b2d72e42 (diff) | |
| download | u-boot-7b80644e271544848db90fb0407d67b3e3749a8e.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- ARM: socfpga: Build sfp image only for Gen5 and Arria10 devices
| -rw-r--r-- | Kconfig | 3 | ||||
| -rw-r--r-- | scripts/Makefile.spl | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -226,7 +226,8 @@ config BUILD_ROM config BUILD_TARGET string "Build target special images" - default "u-boot-with-spl.sfp" if ARCH_SOCFPGA + default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10 + default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5 default "u-boot-spl.kwb" if ARCH_MVEBU && SPL default "u-boot-elf.srec" if RCAR_GEN3 default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 9d5921606e..54b160d72b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -212,7 +212,7 @@ ifdef CONFIG_SAMSUNG ALL-y += $(obj)/$(BOARD)-spl.bin endif -ifdef CONFIG_ARCH_SOCFPGA +ifneq ($(CONFIG_TARGET_SOCFPGA_GEN5)$(CONFIG_TARGET_SOCFPGA_ARRIA10),) ALL-y += $(obj)/$(SPL_BIN).sfp endif |