From db35548372eaee835fbf9bae68c08362ba59d49d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 28 Jan 2022 15:22:09 +0100 Subject: build: Include dts/include/ after include/ dts/include/ contains Kernel upstream dt-binding include files. includes are searched for in this directory before our own include directories are used. This becomes a problem when we have files existing in the barebox include directory which then appear in dts/include/ due to a dts update. Make sure that we still use the barebox files in this case so that we can later drop the barebox custom file explicitly along with the fixes that might be needed to use the upstream file. Signed-off-by: Sascha Hauer --- Makefile | 3 ++- scripts/Makefile.lib | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3125d62811..a79773513b 100644 --- a/Makefile +++ b/Makefile @@ -431,8 +431,9 @@ USERINCLUDE := \ # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option -LINUXINCLUDE := -Iinclude -I$(srctree)/dts/include \ +LINUXINCLUDE := -Iinclude \ $(if $(building_out_of_srctree), -I$(srctree)/include) \ + -I$(srctree)/dts/include \ -I$(srctree)/arch/$(SRCARCH)/include \ -I$(objtree)/arch/$(SRCARCH)/include \ $(USERINCLUDE) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 13b1789c01..b5ff621b07 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -203,8 +203,8 @@ ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) dtc_cpp_flags = -Wp,-MD,$(depfile).pre -nostdinc \ -Wp,-MT,$(basename $(notdir $@)).o \ -I$(srctree)/arch/$(SRCARCH)/dts/include \ - -I$(srctree)/dts/include \ -I$(srctree)/include \ + -I$(srctree)/dts/include \ -I$(srctree)/dts/src/ \ $(DTC_CPP_FLAGS_$(basetarget).dtb) \ -undef -D__DTS__ -- cgit v1.2.3