From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Mon, 27 Apr 2020 09:36:58 -0400 Subject: [PATCH v2 3/3] kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPL In-Reply-To: References: <20200417072137.801234-1-masahiroy@kernel.org> <20200417072137.801234-4-masahiroy@kernel.org> Message-ID: <20200427133658.GT4555@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, Apr 27, 2020 at 09:37:28AM +0800, Bin Meng wrote: > Hi Tom, > > On Sat, Apr 18, 2020 at 8:37 PM Bin Meng wrote: > > > > On Fri, Apr 17, 2020 at 3:22 PM Masahiro Yamada wrote: > > > > > > 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 > > > Signed-off-by: Masahiro Yamada > > > --- > > > > > > Changes in v2: None > > > > > > Kbuild | 4 ++-- > > > scripts/Makefile.spl | 10 ++++++++-- > > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > > > > It works like a charm. Thanks! > > > > Tested-by: Bin Meng > > 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! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: