diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-07-03 16:21:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-07-04 09:35:45 +0200 |
| commit | 90a24cf72f8c7f511c7706e1f23de62f59fae90b (patch) | |
| tree | f4616666a12fc1ef6b27da54b69a29a6c9e8a7d6 /firmware | |
| parent | cb4c8b11ef1f71b3eac408c9f46526b2afb402f1 (diff) | |
| download | barebox-90a24cf72f8c7f511c7706e1f23de62f59fae90b.tar.gz barebox-90a24cf72f8c7f511c7706e1f23de62f59fae90b.tar.xz | |
firmware: fix alignment of firmware images
ASM_LGPTR is a preprocessor symbol, not a Make variable, so expanding it
in the Makefile results in .p2align without an argument, which disables
alignment requirement. Fix this to restore the sizeof(void *) alignment
we had before.
Fixes: a59e2740b4a7 ("firmware: reference pointer alignment defined in <asm-generic/pointer.h>")
Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20230703142122.1522533-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 8d3bfb0752..d7f35853a4 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -49,7 +49,7 @@ filechk_fwbin = { \ echo "\#include <asm-generic/pointer.h>" ;\ echo ".section .note.GNU-stack,\"\",%progbits" ;\ echo " .section $2,\"$3\"" ;\ - echo " .p2align $(ASM_LGPTR)" ;\ + echo " .p2align ASM_LGPTR" ;\ echo ".global _fw_$(FWSTR)_start" ;\ echo "_fw_$(FWSTR)_start:" ;\ echo "\#if $(FWNAME_EXISTS)" ;\ @@ -68,7 +68,7 @@ filechk_fwbin = { \ __fwbin_sha = { \ echo " .section .rodata.$(FWSTR).sha" ;\ - echo " .p2align $(ASM_LGPTR)" ;\ + echo " .p2align ASM_LGPTR" ;\ echo ".global _fw_$(FWSTR)_sha_start" ;\ echo "_fw_$(FWSTR)_sha_start:" ;\ echo " .incbin \"$(fwobjdir)/$(FWNAME).sha.bin\"" ;\ |