From: Tom Rini <trini@konsulko.com>
To: "Pali Rohár" <pali@kernel.org>
Cc: Heiko Schocher <hs@denx.de>, u-boot@lists.denx.de
Subject: Re: [PATCH v2 u-boot 2/3] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin
Date: Fri, 13 Jan 2023 18:16:03 -0500 [thread overview]
Message-ID: <20230113231603.GA3787616@bill-the-cat> (raw)
In-Reply-To: <20230113231123.27427-2-pali@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 2257 bytes --]
On Sat, Jan 14, 2023 at 12:11:22AM +0100, Pali Rohár wrote:
> 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
Simon's point from before still stands. This is the opposite of what we
want. There must not be CONFIG_TARGET_ logic introduced to the
top-level Makefile. socrate is "just" another mpc85xx platform, it
doesn't have a special ROM, we need to adjust it back to acting like
other platforms.
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
next prev parent reply other threads:[~2023-01-13 23:16 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 ` [PATCH v2 u-boot 2/3] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin Pali Rohár
2023-01-13 23:16 ` Tom Rini [this message]
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=20230113231603.GA3787616@bill-the-cat \
--to=trini@konsulko.com \
--cc=hs@denx.de \
--cc=pali@kernel.org \
--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