diff options
| author | Max Krummenacher <[email protected]> | 2022-11-28 09:41:22 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-12-08 09:29:02 -0500 |
| commit | 486aef08de091ca35386f32fe961a201c3cfa9d4 (patch) | |
| tree | 7a3717927c146df00678f83459ceeb864be6e6f9 /Makefile | |
| parent | 55b0affd26e5b31868893faf3e69c41157ce56a6 (diff) | |
u-boot-initial-env: rework make target
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]>
Acked-by: Pali Rohár <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -2439,11 +2439,13 @@ 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 = \ + $(objtree)/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) FORCE + $(Q)$(MAKE) $(build)=tools $(objtree)/tools/printinitialenv $(call if_changed,genenv) # Consistency checks |