Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc/mpc85xx: socrates: rework build process

Browse source 
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>
This commit is contained in:
Heiko Schocher 2023-01-24 18:06:50 +01:00 committed by Tom Rini
parent 01d85e7a0c
commit 12ae7bc83a
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Makefile
View file

@ -1190,19 +1190,22 @@ endif
u-boot.bin: u-boot-fit-dtb.bin FORCE u-boot.bin: u-boot-fit-dtb.bin FORCE
$(call if_changed,copy) $(call if_changed,copy)
u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
$(call if_changed,cat)
else ifeq ($(CONFIG_OF_SEPARATE).$(CONFIG_OF_OMIT_DTB),y.)
u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
$(call if_changed,cat)
ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy) ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy)
u-boot.bin: u-boot-dtb.bin FORCE u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
$(call if_changed,copy) $(call if_changed,cat)
endif endif
else ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy) 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
u-boot.bin: u-boot-dtb.bin FORCE
$(call if_changed,copy)
else
u-boot.bin: u-boot-nodtb.bin FORCE u-boot.bin: u-boot-nodtb.bin FORCE
$(call if_changed,copy) $(call if_changed,copy)
endif endif
@ -1581,7 +1584,7 @@ u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE
endif endif
ifeq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy) 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) $(call if_changed,binman)
OBJCOPYFLAGS_u-boot-br.bin := -O binary -j .bootpg -j .resetvec OBJCOPYFLAGS_u-boot-br.bin := -O binary -j .bootpg -j .resetvec

4
arch/powerpc/dts/socrates-u-boot.dtsi
View file

@ -5,11 +5,11 @@
*/ */
/ { / {
binman { binman {
filename = "u-boot-socrates.bin"; filename = "u-boot-dtb.bin";
pad-byte = <0xff>; pad-byte = <0xff>;
// Place dtb one sector before u-boot-nodtb.bin // Place dtb one sector before u-boot-nodtb.bin
blob { blob {
filename = "dts/dt.dtb"; filename = "u-boot.dtb";
}; };
u-boot-nodtb { u-boot-nodtb {
filename = "u-boot-nodtb.bin"; filename = "u-boot-nodtb.bin";

2
arch/powerpc/dts/u-boot.dtsi
View file

@ -9,7 +9,7 @@
/ { / {
binman { binman {
filename = "u-boot.bin"; filename = "u-boot-dtb.bin";
skip-at-start = <CONFIG_TEXT_BASE>; skip-at-start = <CONFIG_TEXT_BASE>;
sort-by-offset; sort-by-offset;
pad-byte = <0xff>; pad-byte = <0xff>;