On 15.10.2018 15:52, Dalon Westergreen wrote:
From: Dalon Westergreen <dalon.westergr...@intel.com>
Move the sfp file generation entirely to the root Makefile. This
means that the u-boot-spl.sfp will only be generated when required
and only for the socfpga variants that require it.
sfp generation is now entirely controlled by CONFIG_BUILD_TARGET
being set to either spl/u-boot-spl.sfp or more likely
u-boot-with-spl.sfp
Signed-off-by: Dalon Westergreen <dalon.westergr...@intel.com>
Tested with socfpga_socrates_defconfig to not break the build:
Tested-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
---
v3:
-> Change ifdef to ifneq
-> Fix error, should not use $(SPL_BIN) as it was not defined
in Makefile
v2:
-> condense changes to 1 patch to avoid breaking git bisect
---
Makefile | 11 ++++++++---
scripts/Makefile.spl | 12 ------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index aadd1ec8c6..5f03e534a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1207,6 +1207,14 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE
$(call if_changed,pad_cat)
ifneq ($(CONFIG_ARCH_SOCFPGA),)
+ifneq ($(CONFIG_TARGET_SOCFPGA_ARRIA10),)
+MKIMAGEFLAGS_u-boot-spl.sfp = -T socfpgaimage_v1
+else
+MKIMAGEFLAGS_u-boot-spl.sfp = -T socfpgaimage
+endif
+spl/u-boot-spl.sfp: spl/u-boot-spl.bin FORCE
+ $(call if_changed,mkimage)
+
quiet_cmd_socboot = SOCBOOT $@
cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \
spl/u-boot-spl.sfp spl/u-boot-spl.sfp \
@@ -1542,9 +1550,6 @@ spl/sunxi-spl.bin: spl/u-boot-spl
spl/sunxi-spl-with-ecc.bin: spl/sunxi-spl.bin
@:
-spl/u-boot-spl.sfp: spl/u-boot-spl
- @:
-
spl/boot.bin: spl/u-boot-spl
@:
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 7416abec62..a58113cee2 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -198,10 +198,6 @@ ifdef CONFIG_SAMSUNG
ALL-y += $(obj)/$(BOARD)-spl.bin
endif
-ifdef CONFIG_ARCH_SOCFPGA
-ALL-y += $(obj)/$(SPL_BIN).sfp
-endif
-
ifdef CONFIG_ARCH_SUNXI
ALL-y += $(obj)/sunxi-spl.bin
@@ -324,14 +320,6 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
endif
endif
-ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
-MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1
-else
-MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
-endif
-$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
- $(call if_changed,mkimage)
-
quiet_cmd_mksunxiboot = MKSUNXI $@
cmd_mksunxiboot = $(objtree)/tools/mksunxiboot \
--default-dt $(CONFIG_DEFAULT_DEVICE_TREE) $< $@
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
