]> git.dujemihanovic.xyz Git - u-boot.git/commit
kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL
authorMasahiro Yamada <masahiroy@kernel.org>
Fri, 17 Apr 2020 07:21:37 +0000 (16:21 +0900)
committerTom Rini <trini@konsulko.com>
Tue, 28 Apr 2020 19:44:31 +0000 (15:44 -0400)
commitf34d0ad82e51df9dbd5f80bc0f17c3542de2bc0e
tree4a6a63f161c378285a6a9f73c1398deffff2c595
parent221c4d982698d9f537237108f779b8174ce24c87
kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL

Currently 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/.

Requested-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Kbuild
scripts/Makefile.spl