aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2023-01-24 18:06:50 +0100
committerTom Rini <trini@konsulko.com>2023-02-06 13:04:53 -0500
commit12ae7bc83a9b16a43be805ff168845e7d2ed8472 (patch)
treebba2112094c47062cde3f892fcff81b008fbf0b1 /Makefile
parent01d85e7a0c78c0c56ca0bf98712489a899bab3a4 (diff)
downloadu-boot-12ae7bc83a9b16a43be805ff168845e7d2ed8472.zip
u-boot-12ae7bc83a9b16a43be805ff168845e7d2ed8472.tar.gz
u-boot-12ae7bc83a9b16a43be805ff168845e7d2ed8472.tar.bz2
powerpc/mpc85xx: socrates: rework build process
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). Clean this up, so final U-Boot binary is in u-boot-dtb.bin Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index fa4f38b..518ad39 100644
--- a/Makefile
+++ b/Makefile
@@ -1190,19 +1190,22 @@ endif
u-boot.bin: u-boot-fit-dtb.bin FORCE
$(call if_changed,copy)
+ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
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_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
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)
u-boot.bin: u-boot-dtb.bin FORCE
$(call if_changed,copy)
-endif
-else ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
+else
u-boot.bin: u-boot-nodtb.bin FORCE
$(call if_changed,copy)
endif
@@ -1581,7 +1584,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE
endif
ifeq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
-u-boot.bin: u-boot-nodtb.bin u-boot.dtb u-boot-br.bin FORCE
+u-boot-dtb.bin: u-boot-nodtb.bin u-boot.dtb u-boot-br.bin FORCE
$(call if_changed,binman)
OBJCOPYFLAGS_u-boot-br.bin := -O binary -j .bootpg -j .resetvec