Makefile: Fix u-boot-nodtb.bin target
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when static_rela call (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary and static_rela finish it.
* Do not call static_rela cmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.
Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time now does not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
--- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Makefile +7 -3
@@ -884,7 +884,7 @@ cmd_static_rela = \ tools/relocate-rela $(3) $(4) $$start $$end else quiet_cmd_static_rela = -cmd_static_rela = +cmd_static_rela = true endif # Always append INPUTS so that arch config.mk's can add custom ones
@@ -1317,9 +1317,13 @@ init_sp_bss_offset_check: u-boot.dtb FORCE fi endif +shell_cmd = { $(echo-cmd) $(cmd_$(1)); } + +quiet_cmd_objcopy_uboot = OBJCOPY $@ +cmd_objcopy_uboot = $(cmd_objcopy) && $(call shell_cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) || rm -f $@ + u-boot-nodtb.bin: u-boot FORCE - $(call if_changed,objcopy) - $(call cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) + $(call if_changed,objcopy_uboot) $(BOARD_SIZE_CHECK) u-boot.ldr: u-boot
Signature · 1 line
2.20.1
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
Quoted 15 lines · Pali Roh?r
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when
static_relacall (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary andstatic_relafinish it.* Do not call
static_relacmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Quoted 8 lines
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time now does not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
Signed-off-by Pali Roh?r <[email protected]>--- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
In reply to Pali RohárQuoted 14 lines · Pali Roh?r
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when
static_relacall (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary andstatic_relafinish it.* Do not call
static_relacmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Quoted 6 lines
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time now does not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
Signed-off-by Pali Roh?r <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201024/5d9046c4/attachment.sig>
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
Hi Tom and Pali,
Quoted 20 lines
From: U-Boot <[email protected]> On Behalf Of Tom Rini
Sent: samedi 24 octobre 2020 16:52Quoted 9 lines · Pali Roh?r
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when
static_relacall (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary andstatic_relafinish it.* Do not call
static_relacmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.Quoted 6 lines
Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time now
Quoted 8 lines
does
Quoted 5 lines
not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
Signed-off-by Pali Roh?r <[email protected]>Reviewed-by Simon Glass <[email protected]>Applied to u-boot/master, thanks!
Since this patch is applyied on master branch, I have error when I compile with the verbose option V=1.
I don't found a correction for this issue until now... except revert this commit.
For information: I use stm32mp1 platform = ARMv7 32bits I have the error:
scripts/Kbuild.include:220: *** Recursive variable 'echo-cmd' references itself (eventually). Stop. make[1]: *** Waiting for unfinished jobs....
make -f /local/home/frq07632/views/u-boot/scripts/Makefile.build obj=arch/arm/dts dtbs
Quoted 2 lines
--
Tom
Regards
Patrick
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
Quoted 33 lines · On Monday 02 November 2020 13:25:56 Patrick DELAUNAY wrote:
Hi Tom and Pali,
Quoted 20 lines
From: U-Boot <[email protected]> On Behalf Of Tom Rini
Sent: samedi 24 octobre 2020 16:52Quoted 9 lines · Pali Roh?r
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when
static_relacall (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary andstatic_relafinish it.* Do not call
static_relacmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.Quoted 6 lines
Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time now
Quoted 8 lines
does
Quoted 5 lines
not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
Signed-off-by Pali Roh?r <[email protected]>Reviewed-by Simon Glass <[email protected]>Applied to u-boot/master, thanks!
Since this patch is applyied on master branch, I have error when I compile with the verbose option V=1.
Quoted 8 lines
I don't found a correction for this issue until now... except revert this commit.
For information: I use stm32mp1 platform = ARMv7 32bits I have the error:
scripts/Kbuild.include:220: *** Recursive variable 'echo-cmd' references itself (eventually). Stop. make[1]: *** Waiting for unfinished jobs....
make -f /local/home/frq07632/views/u-boot/scripts/Makefile.build obj=arch/arm/dts dtbs
Hello Patrick!
Now I was able to trigger this issue, but it seems to be present only sometimes. Calling make more times hides that issue, so it looks like something broken in Kconfig dependency generator for Makefiles... Or maybe something dependent on GNU make...
I played a bit with it and after changing following line in that patch
shell_cmd = { $(echo-cmd) $(cmd_$(1)); }
by
shell_cmd = { $(call echo-cmd,$(1)) $(cmd_$(1)); }
that issue disappeared. But because it triggered on my machine only sometimes, I do not know if it finally fixes it.
Could you please try this change? And do you have reproducer how to _always_ trigger it and not only sometimes?
Quoted 7 lines
Quoted 4 lines
--
TomRegards
Patrick
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
Hi Pali,
Quoted 59 lines
From: Pali Roh?r <[email protected]>
Sent: lundi 2 novembre 2020 15:16Quoted 22 lines · On Monday 02 November 2020 13:25:56 Patrick DELAUNAY wrote:
Hi Tom and Pali,
Quoted 20 lines
From: U-Boot <[email protected]> On Behalf Of Tom Rini
Sent: samedi 24 octobre 2020 16:52Quoted 15 lines · Pali Roh?r
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when
static_relacall (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary andstatic_relafinish it.* Do not call
static_relacmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time
now
Quoted 10 lines
Quoted 8 lines
does
Quoted 5 lines
not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
Signed-off-by Pali Roh?r <[email protected]>Reviewed-by Simon Glass <[email protected]>Applied to u-boot/master, thanks!
Since this patch is applyied on master branch, I have error when I compile with
the verbose option V=1.
Quoted 7 lines
I don't found a correction for this issue until now... except revert this commit.
For information: I use stm32mp1 platform = ARMv7 32bits I have the error:
scripts/Kbuild.include:220: *** Recursive variable 'echo-cmd' references itself(eventually). Stop.
Quoted 3 lines
make[1]: *** Waiting for unfinished jobs....
make -f /local/home/frq07632/views/u-boot/scripts/Makefile.build obj=arch/arm/dts dtbsHello Patrick!
Now I was able to trigger this issue, but it seems to be present only sometimes. Calling make more times hides that issue, so it looks like something broken in
Kconfigdependency generator for Makefiles... Or maybe something dependent on GNU make...I played a bit with it and after changing following line in that patch
Quoted 8 lines
shell_cmd= { $(echo-cmd) $(cmd_$(1)); }by
shell_cmd= { $(call echo-cmd,$(1)) $(cmd_$(1)); }that issue disappeared. But because it triggered on my machine only sometimes, I do not know if it finally fixes it.
on my machine (Ubuntu 18.04 / fast laptop with Core i7) it is 100% reproduce with:
1/ gcc version 9.2.1 20191025 (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10))
2/ make --version
GNU Make 4.1
Built for x86_64-pc-linux-gnu
3/ the request
export CROSS_COMPILE="arm-none-linux-gnueabihf-"
make stm32mp15_basic_defconfig
make V=1 all
Quoted 2 lines
Could you please try this change? And do you have reproducer how to _always_ trigger it and not only sometimes?
I test it with the change:
-shell_cmd = { $(echo-cmd) $(cmd_$(1)); } +shell_cmd = { $(call echo-cmd, $(1)) $(cmd_$(1)); }
And I never reproduced the error again and command is correctly displayed with V=1:
arm-none-linux-gnueabihf-objcopy --gap-fill=0xff -j .text -j .secure_text -j .secure_data -j .rodata -j .hash -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn -j .binman_sym_table -j .text_rest -j .dtb.init.rodata -j .efi_runtime -j .efi_runtime_rel -O binary u-boot u-boot-nodtb.bin && { true; } || rm -f u-boot-nodtb.bin
or without option
OBJCOPY u-boot-nodtb.bin
So I think that the issue is fixed.
Regards
Patrick
PATCH 1/1 Makefile: Fix u-boot-nodtb.bin target
Quoted 93 lines · On Wednesday 04 November 2020 08:53:07 Patrick DELAUNAY wrote:
Hi Pali,
Quoted 59 lines
From: Pali Roh?r <[email protected]>
Sent: lundi 2 novembre 2020 15:16Quoted 22 lines · On Monday 02 November 2020 13:25:56 Patrick DELAUNAY wrote:
Hi Tom and Pali,
Quoted 20 lines
From: U-Boot <[email protected]> On Behalf Of Tom Rini
Sent: samedi 24 octobre 2020 16:52Quoted 15 lines · Pali Roh?r
This change fixes two issues when building u-boot-nodtb.bin target:
* Remove intermediate binary u-boot-nodtb.bin from disk when
static_relacall (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary andstatic_relafinish it.* Do not call
static_relacmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call.Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date.
Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time
now
Quoted 10 lines
Quoted 8 lines
does
Quoted 5 lines
not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date.
Signed-off-by Pali Roh?r <[email protected]>Reviewed-by Simon Glass <[email protected]>Applied to u-boot/master, thanks!
Since this patch is applyied on master branch, I have error when I compile with
the verbose option V=1.
Quoted 7 lines
I don't found a correction for this issue until now... except revert this commit.
For information: I use stm32mp1 platform = ARMv7 32bits I have the error:
scripts/Kbuild.include:220: *** Recursive variable 'echo-cmd' references itself(eventually). Stop.
Quoted 3 lines
make[1]: *** Waiting for unfinished jobs....
make -f /local/home/frq07632/views/u-boot/scripts/Makefile.build obj=arch/arm/dts dtbsHello Patrick!
Now I was able to trigger this issue, but it seems to be present only sometimes. Calling make more times hides that issue, so it looks like something broken in
Kconfigdependency generator for Makefiles... Or maybe something dependent on GNU make...I played a bit with it and after changing following line in that patch
Quoted 8 lines
shell_cmd= { $(echo-cmd) $(cmd_$(1)); }by
shell_cmd= { $(call echo-cmd,$(1)) $(cmd_$(1)); }that issue disappeared. But because it triggered on my machine only sometimes, I do not know if it finally fixes it.
on my machine (Ubuntu 18.04 / fast laptop with Core i7) it is 100% reproduce with:
1/ gcc version 9.2.1 20191025 (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10))2/ make --version
GNU Make 4.1
Built for x86_64-pc-linux-gnu3/ the request
export CROSS_COMPILE="arm-none-linux-gnueabihf-"
makestm32mp15_basic_defconfig
make V=1 allQuoted 2 lines
Could you please try this change? And do you have reproducer how to _always_ trigger it and not only sometimes?
I test it with the change:
(quoted diff) +1
-1-shell_cmd = { $(echo-cmd) $(cmd_$(1)); } +shell_cmd = { $(call echo-cmd, $(1)) $(cmd_$(1)); }And I never reproduced the error again and command is correctly displayed with V=1:
Quoted 7 lines
arm-none-linux-gnueabihf-objcopy --gap-fill=0xff -j .text -j .secure_text -j .secure_data -j .rodata -j .hash -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn -j .binman_sym_table -j .text_rest -j .dtb.init.rodata -j .efi_runtime -j .efi_runtime_rel -O binary u-boot u-boot-nodtb.bin && { true; } || rm -f u-boot-nodtb.bin
or without option
OBJCOPY u-boot-nodtb.bin
So I think that the issue is fixed.
Ok, thank you for testing! I will send a proper git format patch to ML.