On Mon, Jul 03, 2023 at 04:21:22PM +0200, Ahmad Fatoum wrote:
> 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@xxxxxxxxxxxxxx>
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> firmware/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/firmware/Makefile b/firmware/Makefile
> index 8d3bfb0752ff..d7f35853a404 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\"" ;\
> --
> 2.39.2
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
