From d6db0c3818cc2718c4c161b8841e747843496ceb Mon Sep 17 00:00:00 2001 From: Puja Gupta Date: Fri, 10 Feb 2017 15:15:23 -0800 Subject: [PATCH 1/2] scripts: Makefile: add support to use external DTC Add support to use external DTC to compile device tree blobs. Change-Id: I268d2332d5328c3b0050b35c96f91e8ef9e1f6f8 Signed-off-by: Shashank Mittal Signed-off-by: Puja Gupta [eberman@codeaurora.org: Resolve merge conflicts] Signed-off-by: Elliot Berman --- scripts/Makefile.lib | 6 ++++++ scripts/dtc/Makefile | 2 ++ 2 files changed, 8 insertions(+) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 7d9e25a6507b..e4ddafd6d12d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -287,6 +287,12 @@ cmd_dt_S_dtb= \ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE $(call if_changed,dt_S_dtb) +ifneq ($(DTC_EXT),) +DTC = $(DTC_EXT) +else +DTC = $(objtree)/scripts/dtc/dtc +endif + quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 82160808765c..823892e2ebf3 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -2,7 +2,9 @@ # scripts/dtc makefile hostprogs-$(CONFIG_DTC) := 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 From 86bb5dca4b65c51174fecdc87017309f0846cf0f Mon Sep 17 00:00:00 2001 From: Runmin Wang Date: Fri, 11 Aug 2017 14:29:02 -0700 Subject: [PATCH 2/2] scripts: Makefile: Remove flags which are not support by EXT_DTC DTBO relies on external DTC compiler and there are certain flags which are not supported by the external DTC compiler. Add a check to remove those flags for now. Change-Id: I318a1d110bd54a4a888ee8a5456d7c5a39bd9f6b Signed-off-by: Runmin Wang --- scripts/Makefile.lib | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e4ddafd6d12d..e077c55c21ab 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -252,7 +252,10 @@ DTC ?= $(objtree)/scripts/dtc/dtc # Disable noisy checks by default ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) -DTC_FLAGS += -Wno-unit_address_vs_reg \ +DTC_FLAGS += -Wno-unit_address_vs_reg +endif +ifeq ($(DTC_EXT),) +DTC_FLAGS += -Wno-simple_bus_reg \ -Wno-unit_address_format \ -Wno-avoid_unnecessary_addr_size \ -Wno-alias_paths \