From: "Pali Rohár" <pali@kernel.org>
To: Heiko Schocher <hs@denx.de>, Tom Rini <trini@konsulko.com>
Cc: u-boot@lists.denx.de
Subject: [PATCH v2 u-boot 2/3] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin
Date: Sat, 14 Jan 2023 00:11:22 +0100 [thread overview]
Message-ID: <20230113231123.27427-2-pali@kernel.org> (raw)
In-Reply-To: <20230113231123.27427-1-pali@kernel.org>
U-Boot build process for socrates board produces final U-Boot binary in
file u-boot-socrates.bin (by binman) And as a bonus it produces two
unusable broken binaries u-boot-dtb.bin and u-boot.bin (by Makefile).
So do not build broken u-boot-dtb.bin and u-boot.bin binaries and rename
board specific u-boot-socrates.bin binary to u-boot.bin.
Renaming requires to define a new socrates specific Makefile target for
u-boot.bin (via binman) and also changing output name in socrates binman
config file.
With this change U-Boot build process for socrates board also produces
final U-Boot binary in file u-boot.bin.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
Added make dependency on u-boot.dtb
---
Makefile | 11 +++++++++++
arch/powerpc/dts/socrates-u-boot.dtsi | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a4a14d5d35a8..5473bea25332 100644
--- a/Makefile
+++ b/Makefile
@@ -1195,22 +1195,30 @@ endif
u-boot.bin: u-boot-fit-dtb.bin FORCE
$(call if_changed,copy)
+ifneq ($(CONFIG_TARGET_SOCRATES),y)
u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
$(call if_changed,cat)
+endif
else ifeq ($(CONFIG_OF_SEPARATE).$(CONFIG_OF_OMIT_DTB),y.)
+ifneq ($(CONFIG_TARGET_SOCRATES),y)
u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
$(call if_changed,cat)
+endif
ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
+ifneq ($(CONFIG_TARGET_SOCRATES),y)
u-boot.bin: u-boot-dtb.bin FORCE
$(call if_changed,copy)
endif
+endif
else ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
+ifneq ($(CONFIG_TARGET_SOCRATES),y)
u-boot.bin: u-boot-nodtb.bin FORCE
$(call if_changed,copy)
endif
+endif
# we call Makefile in arch/arm/mach-imx which
# has targets which are dependent on targets defined
@@ -1595,6 +1603,9 @@ u-boot.bin: u-boot-nodtb.bin u-boot.dtb u-boot-br.bin FORCE
OBJCOPYFLAGS_u-boot-br.bin := -O binary -j .bootpg -j .resetvec
u-boot-br.bin: u-boot FORCE
$(call if_changed,objcopy)
+else ifeq ($(CONFIG_TARGET_SOCRATES),y)
+u-boot.bin: u-boot-nodtb.bin u-boot.dtb FORCE
+ $(call if_changed,binman)
endif
quiet_cmd_ldr = LD $@
diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi
index 92e89a11bc01..b012201a32bd 100644
--- a/arch/powerpc/dts/socrates-u-boot.dtsi
+++ b/arch/powerpc/dts/socrates-u-boot.dtsi
@@ -5,7 +5,7 @@
*/
/ {
binman {
- filename = "u-boot-socrates.bin";
+ filename = "u-boot.bin";
pad-byte = <0xff>;
// Place dtb one sector before u-boot-nodtb.bin
blob {
--
2.20.1
next prev parent reply other threads:[~2023-01-13 23:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-28 20:04 [PATCH u-boot 1/2] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin Pali Rohár
2022-12-28 20:04 ` [PATCH u-boot 2/2] Makefile: Build working u-boot-dtb.bin target also for mpc85xx Pali Rohár
2022-12-29 22:39 ` Simon Glass
2022-12-30 12:48 ` Pali Rohár
2022-12-30 15:21 ` Tom Rini
2022-12-30 15:24 ` Pali Rohár
2022-12-30 15:41 ` Tom Rini
2022-12-30 15:44 ` Pali Rohár
2022-12-30 15:49 ` Simon Glass
2022-12-30 16:06 ` Pali Rohár
2022-12-30 17:43 ` Simon Glass
2022-12-30 17:55 ` Pali Rohár
2022-12-30 18:51 ` Simon Glass
2022-12-30 19:12 ` Pali Rohár
2023-01-03 17:02 ` Simon Glass
2023-01-03 17:05 ` Pali Rohár
2023-01-07 0:13 ` Simon Glass
2023-01-11 0:12 ` Pali Rohár
2023-01-11 10:08 ` Heiko Schocher
2023-01-11 12:52 ` Heiko Schocher
2023-01-11 14:01 ` Tom Rini
2023-01-11 17:55 ` Pali Rohár
2023-01-11 18:02 ` Pali Rohár
2023-01-11 18:13 ` Pali Rohár
2023-01-12 6:27 ` Heiko Schocher
2023-01-12 10:50 ` Heiko Schocher
2023-01-12 17:39 ` Pali Rohár
2023-01-13 5:52 ` Heiko Schocher
2023-01-12 5:27 ` Heiko Schocher
2022-12-30 16:06 ` Tom Rini
2023-01-13 23:11 ` [PATCH v2 u-boot 1/3] powerpc/mpc85xx: socrates: Use u-boot.dtb instead of dts/dt.dtb Pali Rohár
2023-01-13 23:11 ` Pali Rohár [this message]
2023-01-13 23:16 ` [PATCH v2 u-boot 2/3] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin Tom Rini
2023-01-14 21:12 ` Pali Rohár
2023-01-14 21:24 ` Tom Rini
2023-01-16 5:37 ` Heiko Schocher
2023-01-13 23:11 ` [PATCH v2 u-boot 3/3] Makefile: Build working u-boot-dtb.bin target also for mpc85xx Pali Rohár
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=20230113231123.27427-2-pali@kernel.org \
--to=pali@kernel.org \
--cc=hs@denx.de \
--cc=trini@konsulko.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