From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Jan 2022 15:34:35 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nDSKh-00G7Q1-RR for lore@lore.pengutronix.de; Fri, 28 Jan 2022 15:34:35 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDSKg-0006WB-FL for lore@pengutronix.de; Fri, 28 Jan 2022 15:34:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=vLNt1egDp5Ijwvpk6VSzDlIbuZtAtbMuevUitvLggIk=; b=4ArulysVTpM2Wu SWEi5eWfacaerxaVvzK63iSUzrt16xn8eD5G3ZtZgx6Ti1UTYV/ICsR/gVEUBJp7aw7I4xLdeFf1h TYnceGiXgCJ0DNcaSwEOzploLMcrSCYeP8qs2pIQmX2NatIsX9eH7GtquJW9EydiDQFNngkGt1aDn 7T5OVkvLBlMvtzjrKAXg20CgQXL/844D116qeFvqo9YSaQCg0uLO2VOOtZtZ9sIM/2jN9n7GNc21N 6cXiaoUHYl9QC3Fj/t3HurC2Wqa/NmWGYpu6vDvXR5E0eCGbai+1MWhHFYPiDc1BvkKAClLvhoGvM AY/yRSMY/yyHuFx9EaDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDSIb-002ZZC-I0; Fri, 28 Jan 2022 14:32:25 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDSIX-002ZXv-8u for barebox@lists.infradead.org; Fri, 28 Jan 2022 14:32:22 +0000 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nDSIV-00067S-CR; Fri, 28 Jan 2022 15:32:19 +0100 Received: from sha by dude02.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nDSIU-00GaDv-RX; Fri, 28 Jan 2022 15:32:18 +0100 From: Sascha Hauer To: Barebox List Date: Fri, 28 Jan 2022 15:32:12 +0100 Message-Id: <20220128143212.3950286-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220128_063221_336184_D308C594 X-CRM114-Status: GOOD ( 13.26 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] build: Include dts/include/ after include/ X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) 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__ -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox