From f5e1cd9a110b64aa2aaa7d6cfc8f98fc6ce7e543 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Tue, 18 May 2021 09:39:47 +0200 Subject: [PATCH] arm64: dts: Exclude standard dts if vendor dts exists Change-Id: I11f68b27a45fa02861bd5b6526bf49664bfccfb8 --- arch/arm64/boot/dts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index 2de6d07c89ca..d19f9cea50fc 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -1,4 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 +dtstree := $(srctree)/$(src) +vendor := $(dtstree)/vendor +ifneq "$(wildcard $(vendor)/Makefile)" "" + subdir-y += vendor +else subdir-y += actions subdir-y += al subdir-y += allwinner @@ -28,9 +33,4 @@ subdir-y += synaptics subdir-y += ti subdir-y += xilinx subdir-y += zte - -dtstree := $(srctree)/$(src) -vendor := $(dtstree)/vendor -ifneq "$(wildcard $(vendor)/Makefile)" "" - subdir-y += vendor endif