On Wed, Oct 25, 2023 at 10:02:36AM +0100, Aishwarya TCV wrote: > On 11/10/2023 20:57, Oliver Upton wrote: > > Start generating sysreg-defs.h for arm64 builds in anticipation of > > updating sysreg.h to a version that depends on it. > > > > Reviewed-by: Mark Brown <broonie@xxxxxxxxxx> > > Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx> > > --- > > tools/testing/selftests/kvm/Makefile | 23 ++++++++++++++++++++--- > > 1 file changed, 20 insertions(+), 3 deletions(-) > > > > Hi Oliver, > > > Currently when building kselftest against next-master with arm64 arch > and defconfig+kselftest-kvm “make[4]: *** [Makefile:26: prepare] Error > 2” is observed. Looks like we're descending into tools/arch/arm64/tools/ w/ $(srctree) == ".", which I believe is coming from the top makefile. The following diff fixes it for me, care to give it a go? diff --git a/tools/arch/arm64/tools/Makefile b/tools/arch/arm64/tools/Makefile index f867e6036c62..7f64b8bb5107 100644 --- a/tools/arch/arm64/tools/Makefile +++ b/tools/arch/arm64/tools/Makefile @@ -1,13 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 -ifeq ($(srctree),) -srctree := $(patsubst %/,%,$(dir $(CURDIR))) -srctree := $(patsubst %/,%,$(dir $(srctree))) -srctree := $(patsubst %/,%,$(dir $(srctree))) -srctree := $(patsubst %/,%,$(dir $(srctree))) +ifeq ($(top_srcdir),) +top_srcdir := $(patsubst %/,%,$(dir $(CURDIR))) +top_srcdir := $(patsubst %/,%,$(dir $(top_srcdir))) +top_srcdir := $(patsubst %/,%,$(dir $(top_srcdir))) +top_srcdir := $(patsubst %/,%,$(dir $(top_srcdir))) endif -include $(srctree)/tools/scripts/Makefile.include +include $(top_srcdir)/tools/scripts/Makefile.include AWK ?= awk MKDIR ?= mkdir @@ -19,10 +19,10 @@ else Q = @ endif -arm64_tools_dir = $(srctree)/arch/arm64/tools +arm64_tools_dir = $(top_srcdir)/arch/arm64/tools arm64_sysreg_tbl = $(arm64_tools_dir)/sysreg arm64_gen_sysreg = $(arm64_tools_dir)/gen-sysreg.awk -arm64_generated_dir = $(srctree)/tools/arch/arm64/include/generated +arm64_generated_dir = $(top_srcdir)/tools/arch/arm64/include/generated arm64_sysreg_defs = $(arm64_generated_dir)/asm/sysreg-defs.h all: $(arm64_sysreg_defs) -- Thanks, Oliver
