From: Dalon Westergreen <dwesterg@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [Patch v3] socfpga: clean up sfp generation
Date: Mon, 15 Oct 2018 06:52:42 -0700 [thread overview]
Message-ID: <20181015135242.14893-1-dwesterg@gmail.com> (raw)
From: Dalon Westergreen <dalon.westergreen@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.westergreen@intel.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) $< $@
--
2.17.2
next reply other threads:[~2018-10-15 13:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 13:52 Dalon Westergreen [this message]
2018-10-15 16:01 ` [U-Boot] [Patch v3] socfpga: clean up sfp generation Simon Goldschmidt
2018-10-16 9:21 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181015135242.14893-1-dwesterg@gmail.com \
--to=dwesterg@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox