support separate asm-offsets.h for SPL and TPL
v2 cover support separate asm-offsets.h for SPL and TPL
Bin Meng asked me how to generate correct asm-offsets headers for SPL/TPL.
1/3: fix a bug that I just happened to find when touching this line 2/3: cherry-pick some Kbuild changes. This is a good resync regardless of 3/3 3/3: change as Bin Meng requested. This complicates the build process
a bit more, but if we want this, just go ahead.
Changes in v2:
- Check-pick two more while I am here
- Rebase on the mainline
Masahiro Yamada (3):
kbuild: add FORCE to dependency of $(obj)/dts/dt-platdata.o
kbuild: cherry-pick kbuild changes from Linux
kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Kbuild | 49 +++++------------------------------------- Makefile | 3 +-- scripts/Kbuild.include | 15 +++++++------ scripts/Makefile.build | 18 +++++----------- scripts/Makefile.host | 12 ----------- scripts/Makefile.lib | 42 ++++++++++++++++++++++++++++-------- scripts/Makefile.spl | 13 ++++++++--- 7 files changed, 62 insertions(+), 90 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 kbuild: add FORCE to dependency of $(obj)/dts/dt-platdata.o
if_changed must have FORCE as a prerequisite.
Add $(obj)/dts/dt-platdata.o to 'targets' so that the corresponding .cmd file is included.
---
Changes in v2: None
scripts/Makefile.spl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/Makefile.spl +3 -2
@@ -307,10 +307,11 @@ quiet_cmd_dtoch = DTOC H $@ cmd_dtoch = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ struct quiet_cmd_plat = PLAT $@ -cmd_plat = $(CC) $(c_flags) -c $< -o $@ +cmd_plat = $(CC) $(c_flags) -c $< -o $(filter-out $(PHONY),$@) +targets += $(obj)/dts/dt-platdata.o $(obj)/dts/dt-platdata.o: $(obj)/dts/dt-platdata.c \ - include/generated/dt-structs-gen.h + include/generated/dt-structs-gen.h FORCE $(call if_changed,plat) PHONY += dts_dir
Signature · 1 line
2.25.1
PATCH v2 2/3 kbuild: cherry-pick kbuild changes from Linux
In reply to Masahiro Yamadab42841b7bb62 kbuild: Get rid of KBUILD_STR2aedcd098a94 kbuild: suppress annoying "... is up to date." message 9c8fa9bc08f6 kbuild: fix if_change and friends to consider argument order ebf003f0cfb3 kbuild: Consolidate header generation from ASM offset information 2982c953570b kbuild: remove redundant $(wildcard ...) for cmd_files calculation 8a78756eb545 kbuild: create object directories simpler and faster 4d4b5c2e3b6e treewide: remove explicit rules for *offsets.s 01d509a48b46 kbuild: remove unimportant comments from ./Kbuild
---
Changes in v2:
- Check-pick two more while I am here
- Rebase on the mainline
Kbuild | 45 +++--------------------------------------- Makefile | 3 +-- scripts/Kbuild.include | 15 +++++++------- scripts/Makefile.build | 18 +++++------------ scripts/Makefile.host | 12 ----------- scripts/Makefile.lib | 42 ++++++++++++++++++++++++++++++--------- 6 files changed, 50 insertions(+), 85 deletions(-)
Kbuild +3 -42
@@ -1,54 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0 # # Kbuild for top-level directory of U-Boot -# This file takes care of the following: -# 1) Generate generic-asm-offsets.h -# 2) Generate asm-offsets.h - -# Default sed regexp - multiline due to syntax constraints -define sed-y - "s:[[:space:]]*\.ascii[[:space:]]*\"\(.*\)\":\1:; \ - /^->/{s:->#\(.*\):/* \1 */:; \ - s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \ - s:->::; p;}" -endef - -# Use filechk to avoid rebuilds when a header changes, but the resulting file -# does not -define filechk_offsets - (set -e; \ - echo "#ifndef $2"; \ - echo "#define $2"; \ - echo "/*"; \ - echo " * DO NOT MODIFY."; \ - echo " *"; \ - echo " * This file was generated by Kbuild"; \ - echo " */"; \ - echo ""; \ - sed -ne $(sed-y); \ - echo ""; \ - echo "#endif" ) -endef ##### -# 1) Generate generic-asm-offsets.h +# Generate generic-asm-offsets.h generic-offsets-file := include/generated/generic-asm-offsets.h always := $(generic-offsets-file) targets := lib/asm-offsets.s -# We use internal kbuild rules to avoid the "is up to date" message from make -lib/asm-offsets.s: lib/asm-offsets.c FORCE - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cc_s_c) - $(obj)/$(generic-offsets-file): lib/asm-offsets.s FORCE $(call filechk,offsets,__GENERIC_ASM_OFFSETS_H__) ##### -# 2) Generate asm-offsets.h -# +# Generate asm-offsets.h ifneq ($(wildcard $(srctree)/arch/$(ARCH)/lib/asm-offsets.c),) offsets-file := include/generated/asm-offsets.h
@@ -59,10 +25,5 @@ targets += arch/$(ARCH)/lib/asm-offsets.s CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY -# We use internal kbuild rules to avoid the "is up to date" message from make -arch/$(ARCH)/lib/asm-offsets.s: arch/$(ARCH)/lib/asm-offsets.c FORCE - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cc_s_c) - $(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s FORCE $(call filechk,offsets,__ASM_OFFSETS_H__)
Makefile +1 -2
@@ -2239,8 +2239,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) # read all saved command lines -targets := $(wildcard $(sort $(targets))) -cmd_files := $(wildcard .*.cmd $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd)) +cmd_files := $(wildcard .*.cmd $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd)) ifneq ($(cmd_files),) $(cmd_files): ; # Do not try to update included dependency files
scripts/Kbuild.include +8 -7
@@ -7,6 +7,7 @@ quote := " squote := ' empty := space := $(empty) $(empty) +space_escape := _-_SPACE_-_ pound := \# ###
@@ -234,10 +235,10 @@ objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o))) # See Documentation/kbuild/makefiles.txt for more info ifneq ($(KBUILD_NOCMDDEP),1) -# Check if both arguments has same arguments. Result is empty string if equal. -# User may override this check using make KBUILD_NOCMDDEP=1 -arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ - $(filter-out $(cmd_$@), $(cmd_$(1))) ) +# Check if both arguments are the same including their order. Result is empty +# string if equal. User may override this check using make KBUILD_NOCMDDEP=1 +arg-check = $(filter-out $(subst $(space),$(space_escape),$(strip $(cmd_$@))), \ + $(subst $(space),$(space_escape),$(strip $(cmd_$1)))) else arg-check = $(if $(strip $(cmd_$@)),,1) endif
@@ -259,7 +260,7 @@ any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ @set -e; \ $(echo-cmd) $(cmd_$(1)); \ - printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) + printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) # Execute the command and also postprocess generated .d dependencies file. if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
@@ -267,14 +268,14 @@ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ $(echo-cmd) $(cmd_$(1)); \ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\ rm -f $(depfile); \ - mv -f $(dot-target).tmp $(dot-target).cmd) + mv -f $(dot-target).tmp $(dot-target).cmd, @:) # Usage: $(call if_changed_rule,foo) # Will check if $(cmd_foo) or any of the prerequisites changed, # and if so will execute $(rule_foo). if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \ @set -e; \ - $(rule_$(1))) + $(rule_$(1)), @:) ### # why - tell why a a target got build
scripts/Makefile.build +5 -13
@@ -75,17 +75,6 @@ ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(h include scripts/Makefile.host endif -# Uncommented for U-Boot -# We need to create output dicrectory for SPL and TPL even for in-tree build -#ifneq ($(KBUILD_SRC),) -# Create output directory if not already present -_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) - -# Create directories for object files if directory does not exist -# Needed when obj-y := dir/file.o syntax is used -_dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d))) -#endif - ifndef obj $(warning kbuild: Makefile.build is included improperly) endif
@@ -441,11 +430,14 @@ FORCE: # optimization, we don't need to read them if the target does not # exist, we will rebuild anyway in that case. -targets := $(wildcard $(sort $(targets))) -cmd_files := $(wildcard $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd)) +cmd_files := $(wildcard $(foreach f,$(sort $(targets)),$(dir $(f)).$(notdir $(f)).cmd)) ifneq ($(cmd_files),) include $(cmd_files) endif +# Create directories for object files if they do not exist +obj-dirs := $(sort $(obj) $(patsubst %/,%, $(dir $(targets)))) +$(shell mkdir -p $(obj-dirs)) + .PHONY: $(PHONY)
scripts/Makefile.host +0 -12
@@ -53,15 +53,6 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs)))) host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs)))) -# output directory for programs/.o files -# hostprogs-y := tools/build may have been specified. -# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation -host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs)) - -host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs)))) - - -__hostprogs := $(addprefix $(obj)/,$(__hostprogs)) host-csingle := $(addprefix $(obj)/,$(host-csingle)) host-cmulti := $(addprefix $(obj)/,$(host-cmulti)) host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
@@ -72,9 +63,6 @@ host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib)) host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs)) host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs)) host-shared := $(addprefix $(obj)/,$(host-shared)) -host-objdirs := $(addprefix $(obj)/,$(host-objdirs)) - -obj-dirs += $(host-objdirs) ##### # Handle options to gcc. Support building with separate output directory
scripts/Makefile.lib +33 -9
75 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
In reply to Masahiro YamadaCurrently generic-asm-offsets.h and asm-offsets.h are generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.
This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.h
spl/include/generated/(generic-)asm-offsets.h is generated if CONFIG_SPL=y, and included when building SPL.
tpl/include/generated/(generic-)asm-offsets.h is generated if CONFIG_TPL=y, and included when building TPL.
They are created before Kbuild descends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.
Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
Kbuild +2 -2
@@ -10,7 +10,7 @@ generic-offsets-file := include/generated/generic-asm-offsets.h always := $(generic-offsets-file) targets := lib/asm-offsets.s -$(obj)/$(generic-offsets-file): lib/asm-offsets.s FORCE +$(obj)/$(generic-offsets-file): $(obj)/lib/asm-offsets.s FORCE $(call filechk,offsets,__GENERIC_ASM_OFFSETS_H__) #####
@@ -25,5 +25,5 @@ targets += arch/$(ARCH)/lib/asm-offsets.s CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY -$(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s FORCE +$(obj)/$(offsets-file): $(obj)/arch/$(ARCH)/lib/asm-offsets.s FORCE $(call filechk,offsets,__ASM_OFFSETS_H__)
scripts/Makefile.spl +8 -2
@@ -22,6 +22,8 @@ include $(srctree)/scripts/Kbuild.include -include include/config/auto.conf -include $(obj)/include/autoconf.mk +UBOOTINCLUDE := -I$(obj)/include $(UBOOTINCLUDE) + KBUILD_CPPFLAGS += -DCONFIG_SPL_BUILD ifeq ($(CONFIG_TPL_BUILD),y) KBUILD_CPPFLAGS += -DCONFIG_TPL_BUILD
@@ -311,7 +313,7 @@ cmd_plat = $(CC) $(c_flags) -c $< -o $(filter-out $(PHONY),$@) targets += $(obj)/dts/dt-platdata.o $(obj)/dts/dt-platdata.o: $(obj)/dts/dt-platdata.c \ - include/generated/dt-structs-gen.h FORCE + include/generated/dt-structs-gen.h prepare FORCE $(call if_changed,plat) PHONY += dts_dir
@@ -422,9 +424,13 @@ $(obj)/$(SPL_BIN): $(u-boot-spl-platdata) $(u-boot-spl-init) \ $(sort $(u-boot-spl-init) $(u-boot-spl-main)): $(u-boot-spl-dirs) ; PHONY += $(u-boot-spl-dirs) -$(u-boot-spl-dirs): $(u-boot-spl-platdata) +$(u-boot-spl-dirs): $(u-boot-spl-platdata) prepare $(Q)$(MAKE) $(build)=$@ +PHONY += prepare +prepare: + $(Q)$(MAKE) $(build)=$(obj)/. + quiet_cmd_cpp_lds = LDS $@ cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ -D__ASSEMBLY__ -x assembler-with-cpp -std=c99 -P -o $@ $<
Signature · 1 line
2.25.1
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Quoted 25 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>
Quoted 8 lines
---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
It works like a charm. Thanks!
PATCH v2 1/3 kbuild: add FORCE to dependency of $(obj)/dts/dt-platdata.o
In reply to Masahiro YamadaQuoted 6 lines · Masahiro Yamada
if_changedmust have FORCE as a prerequisite.Add $(obj)/dts/dt-platdata.o to 'targets' so that the corresponding .cmd file is included.
Signed-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200426/7ed82a19/attachment.sig>
PATCH v2 2/3 kbuild: cherry-pick kbuild changes from Linux
In reply to Masahiro YamadaQuoted 10 lines · Masahiro Yamada
b42841b7bb62kbuild: Get rid ofKBUILD_STR2aedcd098a94kbuild: suppress annoying "... is up to date." message9c8fa9bc08f6kbuild: fixif_changeand friends to consider argument orderebf003f0cfb3kbuild: Consolidate header generation from ASM offset information2982c953570bkbuild: remove redundant $(wildcard ...) forcmd_filescalculation8a78756eb545kbuild: create object directories simpler and faster4d4b5c2e3b6etreewide: remove explicit rules for *offsets.s01d509a48b46kbuild: remove unimportant comments from ./KbuildSigned-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200426/ffaf1c50/attachment.sig>
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
In reply to Bin MengHi Tom,
Quoted 31 lines · Bin Meng
Quoted 29 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 8 lines
Quoted 4 lines
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>
It looks only patch 1 and 2 in this series were applied. This patch was missed.
Regards,
Bin
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I thought this was something we wanted to ensure was consistent from stage to stage to facilitate sharing of information. But I also am happy to assume I just missed an explanation along the way. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/4083a6fb/attachment.sig>
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Hi Tom,
Quoted 41 lines · Tom Rini
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I
Because currently the offsets {spl,tpl}/include/generated/(generic-)asm-offsets.h are generated per the U-Boot config options. But SPL and TPL are not guaranteed to have the same config options.
For example it's possible to have SPL/TPL turned on {SPL,TPL}_CONFIG_XXX but U-Boot to turn off CONFIG_XXX, or vice verse.
To me this is more like a bug fix other than a feature.
Quoted 3 lines
thought this was something we wanted to ensure was consistent from stage to stage to facilitate sharing of information. But I also am happy to assume I just missed an explanation along the way. Thanks!
Regards,
Bin
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Quoted 58 lines · Bin Meng
Hi Tom,
Quoted 41 lines · Tom Rini
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I
Because currently the offsets {spl,tpl}/include/generated/(generic-)asm-offsets.h are generated per the U-Boot config options. But SPL and TPL are not guaranteed to have the same config options.
Quoted 4 lines
For example it's possible to have SPL/TPL turned on {SPL,TPL}_CONFIG_XXX but U-Boot to turn off
CONFIG_XXX, or vice verse.To me this is more like a bug fix other than a feature.
Ah, OK. But shouldn't we make sure that asm-offsets are consistent between SPL/TPL/U-Boot? Or is there a use-case where it makes sense for them to differ intentionally?
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200428/e1545c90/attachment.sig>
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Hi Tom,
Quoted 60 lines · Tom Rini
Quoted 58 lines · Bin Meng
Hi Tom,
Quoted 41 lines · Tom Rini
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I
Because currently the offsets {spl,tpl}/include/generated/(generic-)asm-offsets.h are generated per the U-Boot config options. But SPL and TPL are not guaranteed to have the same config options.
Quoted 8 lines
Quoted 4 lines
For example it's possible to have SPL/TPL turned on {SPL,TPL}_CONFIG_XXX but U-Boot to turn off
CONFIG_XXX, or vice verse.To me this is more like a bug fix other than a feature.
Ah, OK. But shouldn't we make sure that asm-offsets are consistent between SPL/TPL/U-Boot? Or is there a use-case where it makes sense for them to differ intentionally?
I don't know other boards, but for now RISC-V does turn on SPL_SMP in SPL, but does not turn on SMP in U-Boot S-mode. U-Boot M-mode can still turn on SMP.
Regards,
Bin
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Quoted 68 lines · Bin Meng
Hi Tom,
Quoted 65 lines · Tom Rini
Quoted 62 lines · Bin Meng
Hi Tom,
Quoted 41 lines · Tom Rini
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I
Because currently the offsets {spl,tpl}/include/generated/(generic-)asm-offsets.h are generated per the U-Boot config options. But SPL and TPL are not guaranteed to have the same config options.
For example it's possible to have SPL/TPL turned on {SPL,TPL}_CONFIG_XXX but U-Boot to turn off
CONFIG_XXX, or vice verse.To me this is more like a bug fix other than a feature.
Quoted 7 lines
Quoted 3 lines
Ah, OK. But shouldn't we make sure that asm-offsets are consistent between SPL/TPL/U-Boot? Or is there a use-case where it makes sense for them to differ intentionally?
I don't know other boards, but for now RISC-V does turn on
SPL_SMPin SPL, but does not turn on SMP in U-Boot S-mode. U-Boot M-mode can still turn on SMP.
OK. I'd really like to have it confirmed that it's a good idea to have that value differ between the modes and it's not a bug that should be fixed. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200428/4d265674/attachment.sig>
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
In reply to Bin MengQuoted 72 lines · Bin Meng
Hi Tom,
Quoted 68 lines · Tom Rini
Quoted 58 lines · Bin Meng
Hi Tom,
Quoted 41 lines · Tom Rini
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I
Because currently the offsets {spl,tpl}/include/generated/(generic-)asm-offsets.h are generated per the U-Boot config options. But SPL and TPL are not guaranteed to have the same config options.
Quoted 4 lines
For example it's possible to have SPL/TPL turned on {SPL,TPL}_CONFIG_XXX but U-Boot to turn off
CONFIG_XXX, or vice verse.To me this is more like a bug fix other than a feature.
Ah, OK. But shouldn't we make sure that asm-offsets are consistent between SPL/TPL/U-Boot? Or is there a use-case where it makes sense for them to differ intentionally?
Maybe, save memory for SPL/TPL ?
We can say "do not do that", but it is fragile.
People are adding #ifdef around to all sort of structs, and it is difficult to guess which ones are used to construct asm-offsets.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
Quoted 74 lines · Masahiro Yamada
Quoted 72 lines · Bin Meng
Hi Tom,
Quoted 68 lines · Tom Rini
Quoted 58 lines · Bin Meng
Hi Tom,
Quoted 41 lines · Tom Rini
Quoted 39 lines · Bin Meng
Hi Tom,
Quoted 36 lines · Bin Meng
Quoted 33 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Kbuild | 4 ++-- scripts/Makefile.spl | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
It works like a charm. Thanks!
Tested-by Bin Meng <[email protected]>It looks only patch 1 and 2 in this series were applied. This patch was missed.
So, I was going to ask and forgot, sorry. Why do we need to have these differ between TPL/SPL/U-Boot itself, and then why is that good? I
Because currently the offsets {spl,tpl}/include/generated/(generic-)asm-offsets.h are generated per the U-Boot config options. But SPL and TPL are not guaranteed to have the same config options.
Quoted 4 lines
For example it's possible to have SPL/TPL turned on {SPL,TPL}_CONFIG_XXX but U-Boot to turn off
CONFIG_XXX, or vice verse.To me this is more like a bug fix other than a feature.
Ah, OK. But shouldn't we make sure that asm-offsets are consistent between SPL/TPL/U-Boot? Or is there a use-case where it makes sense for them to differ intentionally?
Quoted 6 lines
Maybe, save memory for SPL/TPL ?
We can say "do not do that", but it is fragile.People are adding #ifdef around to all sort of structs, and it is difficult to guess which ones are used to construct asm-offsets.
So, you're right. I'm doing a build now to check the differences, but fairly often SPL and TPL disagree here, related to malloc and similar it looks like. So this is a bug-fix and I'll apply it shortly. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200428/802957f9/attachment.sig>
PATCH v2 3/3 kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
In reply to Masahiro YamadaQuoted 19 lines · Masahiro Yamada
Currently
generic-asm-offsets.handasm-offsets.hare generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL.This commit adds:
spl/include/generated/(generic-)asm-offsets.h
tpl/include/generated/(generic-)asm-offsets.hspl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_SPL=y, and included when building SPL.tpl/include/generated/(generic-)asm-offsets.h is generated if
CONFIG_TPL=y, and included when building TPL.They are created before
Kbuilddescends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers.
Quoted 6 lines
Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/.
Requested-by Bin Meng <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>Tested-by Bin Meng <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200429/ff2dc3fa/attachment.sig>