Re: [PATCH] xtensa: Put U-Boot version string at correct place by linker script

Max Filippov
2021-09-17T05:14:24Z

On Thu, Sep 16, 2021 at 10:30 AM Tom Rini <trini@konsulko.com> wrote:
>
> Update the linker script macros to know that we need to include the
> .text_version_string section now as well.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> arch/xtensa/include/asm/ldscript.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/xtensa/include/asm/ldscript.h b/arch/xtensa/include/asm/ldscript.h
> index 08f5d0135ed0..84c496e09f1b 100644
> --- a/arch/xtensa/include/asm/ldscript.h
> +++ b/arch/xtensa/include/asm/ldscript.h
> @@ -72,6 +72,7 @@
> { \
> _text_start = ABSOLUTE(.); \
> *(.literal .text) \
> + *(.literal .text_version_string) \

This does not belong to .text, as far as I understand it's rodata and so
it should go with rodata, probably like this:
---8<---
diff --git a/arch/xtensa/include/asm/ldscript.h
b/arch/xtensa/include/asm/ldscript.h
index 08f5d0135ed0..e03fcffdd6f1 100644
--- a/arch/xtensa/include/asm/ldscript.h
+++ b/arch/xtensa/include/asm/ldscript.h
@@ -87,6 +87,7 @@
_rodata_start = ABSOLUTE(.); \
*(.rodata) \
*(.rodata.*) \
+ *(.text_version_string) \
*(.dtb.init.rodata) \
*(.gnu.linkonce.r.*) \
*(.rodata1) \
---8<---

--
Thanks.
-- Max