Makefile: rework u-boot-initial-env target
v3 cover Makefile: rework u-boot-initial-env target
From: Max Krummenacher <[email protected]>
With CONFIG_LTO enabled the current way of extracting the configured environment no longer works, i.e. the object file content changes due to LTO.
Build a host tool which prints the configured environment instead of using objcopy and friends to achive the same.
The code and Makefile changes were mostly stolen from tools/env/ i.e. the target userspace tools to access the environment.
Changes in v3:
- moved the tool from scripts/ to tools/. Suggested by Tom Rini
- changed the dependencies to '$(env_h)' and 'tools'. Suggested by Tom Rini and Pali Rohár.
- removed the sed rule which replaces \x00 with \x0A as this is already done by the tool. Suggested by Pali Rohár.
Changes in v2:
- reworked to build a host tool which prints the configured environment as proposed by Pali Rohár
https://lore.kernel.org/u-boot/[email protected]/
- renamed patch, v1 used "Makefile: fix u-boot-initial-env target if lto is enabled"
Max Krummenacher (1):
Makefile: rework u-boot-initial-env target
Makefile | 9 +++++---- tools/.gitignore | 1 + tools/Makefile | 3 +++ tools/printinitialenv.c | 44 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 tools/printinitialenv.c
Signature · 1 line
2.35.3
PATCH v3 1/1 Makefile: rework u-boot-initial-env target
From: Max Krummenacher <[email protected]>
With LTO enabled the U-Boot initial environment is no longer stored in an easy accessible section in env/common.o. I.e. the section name changes from build to build, its content maybe compressed and it is annotated with additional data.
Drop trying to read the initial env with elf tools from the compiler specific object file in favour of adding and using a host tool with the only functionality of printing the initial env to stdout.
See also:
https://lore.kernel.org/all/[email protected]/
---
Changes in v3:
- moved the tool from scripts/ to tools/. Suggested by Tom Rini
- changed the dependencies to '$(env_h)' and 'tools'. Suggested by Tom Rini and Pali Rohár.
- removed the sed rule which replaces \x00 with \x0A as this is already done by the tool. Suggested by Pali Rohár.
Changes in v2:
- reworked to build a host tool which prints the configured environment as proposed by Pali Rohár
https://lore.kernel.org/u-boot/[email protected]/
- renamed patch, v1 used "Makefile: fix u-boot-initial-env target if lto is enabled"
Makefile | 9 +++++---- tools/.gitignore | 1 + tools/Makefile | 3 +++ tools/printinitialenv.c | 44 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 tools/printinitialenv.c
Makefile +5 -4
@@ -2442,11 +2442,12 @@ endif $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost quiet_cmd_genenv = GENENV $@ -cmd_genenv = $(OBJCOPY) --dump-section .rodata.default_environment=$@ env/common.o; \ - sed --in-place -e 's/\x00/\x0A/g' $@; sed --in-place -e '/^\s*$$/d' $@; \ - sort --field-separator== -k1,1 --stable $@ -o $@ +cmd_genenv = \ + tools/printinitialenv | \ + sed -e '/^\s*$$/d' | \ + sort --field-separator== -k1,1 --stable -o $@ -u-boot-initial-env: u-boot.bin +u-boot-initial-env: $(env_h) tools FORCE $(call if_changed,genenv) # Consistency checks
tools/.gitignore +1 -0
@@ -28,6 +28,7 @@ /mxsboot /ncb /prelink-riscv +/printinitialenv /proftool /relocate-rela /spl_size_limit
tools/Makefile +3 -0
@@ -245,6 +245,9 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include +# host tool to dump the currently configured default environment +hostprogs-y += printinitialenv + HOSTCFLAGS_mkeficapsule.o += \ $(shell pkg-config --cflags gnutls 2> /dev/null || echo "") HOSTCFLAGS_mkeficapsule.o += \
tools/printinitialenv.c new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.35.3
Quoted 43 lines · On Friday 04 November 2022 13:44:57 Max Krummenacher wrote:
From: Max Krummenacher <[email protected]>
With LTO enabled the U-Boot initial environment is no longer stored in an easy accessible section in
env/common.o. I.e. the section name changes from build to build, its content maybe compressed and it is annotated with additional data.Drop trying to read the initial env with elf tools from the compiler specific object file in favour of adding and using a host tool with the only functionality of printing the initial env to stdout.
See also:
https://lore.kernel.org/all/[email protected]/Signed-off-by Max Krummenacher <[email protected]>---
Changes in v3:
- moved the tool fromscripts/totools/. Suggested by Tom Rini
- changed the dependencies to '$(env_h)' and 'tools'. Suggested by Tom Rini and Pali Rohár.
- removed the sed rule which replaces \x00 with \x0A as this is already done by the tool. Suggested by Pali Rohár.Changes in v2:
- reworked to build a host tool which prints the configured environment as proposed by Pali Rohár
https://lore.kernel.org/u-boot/[email protected]/
- renamed patch, v1 used "Makefile: fix u-boot-initial-env target if lto is enabled"Makefile | 9 +++++---- tools/.gitignore | 1 + tools/Makefile | 3 +++ tools/printinitialenv.c | 44 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 tools/printinitialenv.cMakefile +0
-0
Makefile endif · line 2446
Quoted 8 lines
Makefile +2
-3@@ -2442,11 +2442,12 @@ endif $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost quiet_cmd_genenv = GENENV $@ -cmd_genenv = $(OBJCOPY) --dump-section .rodata.default_environment=$@ env/common.o; \ - sed --in-place -e 's/\x00/\x0A/g' $@; sed --in-place -e '/^\s*$$/d' $@; \ - sort --field-separator== -k1,1 --stable $@ -o $@ +cmd_genenv = \ + tools/printinitialenv | \
Missing $(objtree)/
Quoted 87 lines
Makefile +3
-1+ sed -e '/^\s*$$/d' | \ + sort --field-separator== -k1,1 --stable -o $@ -u-boot-initial-env: u-boot.bin +u-boot-initial-env: $(env_h) tools FORCE $(call if_changed,genenv) # Consistency checkstools/.gitignore +1
-0@@ -28,6 +28,7 @@ /mxsboot /ncb /prelink-riscv +/printinitialenv /proftool /relocate-rela /spl_size_limittools/Makefile +3
-0@@ -245,6 +245,9 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include +# host tool to dump the currently configured default environment +hostprogs-y += printinitialenv + HOSTCFLAGS_mkeficapsule.o += \ $(shell pkg-config --cflags gnutls 2> /dev/null || echo "") HOSTCFLAGS_mkeficapsule.o += \tools/printinitialenv.c new file +44
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2022 +* Max Krummenacher, Toradex +* +* Snippets taken from tools/env/fw_env.c +* +* This prints the list of default environment variables as currently +* configured. +* +*/ + +#include <stdio.h> + +/* Pull in the current config to define the default environment */ +#include <linux/kconfig.h> + +#ifndef __ASSEMBLY__ +#define __ASSEMBLY__/* get only #defines from config.h */ +#include <config.h> +#undef __ASSEMBLY__ +#else +#include <config.h> +#endif + +#define DEFAULT_ENV_INSTANCE_STATIC +#include <generated/environment.h> +#include <env_default.h> + +int main (void ) +{ +char *env, *nxt; + +for (env = default_environment; *env; env = nxt +1 ) { +for (nxt = env; *nxt; ++nxt) { +if (nxt >= &default_environment[sizeof (default_environment)]) { +fprintf (stderr,"## Error: environment not terminated\n" ); +return -1 ; + } + } +printf ("%s\n" , env); + } +return 0 ; +}Signature · 1 line
2.35.3