From f4db7ead2052dd3881467404376c7b5507975829 Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@lineageos.org>
Date: Wed, 29 Sep 2021 17:16:46 +0200
Subject: [PATCH] HACK: sm7125: force use prebuilt Android DTC

Change-Id: I5f1101cc5f85212b2b597d5d607f625a5c25e285
---
 scripts/Makefile.lib | 13 +------------
 scripts/dtc/Makefile |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 9645a09f1467..e9542ffef5c8 100755
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -274,13 +274,6 @@ DTC ?= $(objtree)/scripts/dtc/dtc
 ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
 DTC_FLAGS += -Wno-unit_address_vs_reg
 endif
-ifeq ($(DTC_EXT),)
-DTC_FLAGS += -Wno-simple_bus_reg \
-	-Wno-unit_address_format \
-	-Wno-pci_bridge \
-	-Wno-pci_device_bus_num \
-	-Wno-pci_device_reg
-endif
 
 ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),2)
 DTC_FLAGS += -Wnode_name_chars_strict \
@@ -307,11 +300,7 @@ cmd_dt_S_dtb=						\
 $(obj)/%.dtb.S: $(obj)/%.dtb
 	$(call cmd,dt_S_dtb)
 
-ifneq ($(DTC_EXT),)
-DTC = $(DTC_EXT)
-else
-DTC = $(objtree)/scripts/dtc/dtc
-endif
+DTC = $(srctree)/tools/dtc
 
 quiet_cmd_dtc = DTC     $@
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index f8dc39887762..a0a523af92a4 100755
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -2,9 +2,6 @@
 # scripts/dtc makefile
 
 hostprogs-y	:= dtc
-ifeq ($(DTC_EXT),)
-always		:= $(hostprogs-y)
-endif
 
 dtc-objs	:= dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
 		   srcpos.o checks.o util.o