From 1ebac7694539b9d274e6fe070f0199e2009409c8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 10 Dec 2015 12:39:32 +0000 Subject: build: fix arch used during dts compilation Use kernel arch for dts compilation. Also use Image/BuildDTB to build dts for ramips. Signed-off-by: Nikolay Martynov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47823 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/image.mk') diff --git a/include/image.mk b/include/image.mk index fd5e3f4b62..6b2fb1afd8 100644 --- a/include/image.mk +++ b/include/image.mk @@ -16,7 +16,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) KDIR=$(KERNEL_BUILD_DIR) KDIR_TMP=$(KDIR)/tmp -DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/ +DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) @@ -143,8 +143,8 @@ endef # $(4) extra DTC flags define Image/BuildDTB $(CPP) -nostdinc -x assembler-with-cpp \ - -I$(LINUX_DIR)/arch/$(ARCH)/boot/dts \ - -I$(LINUX_DIR)/arch/$(ARCH)/boot/dts/include \ + -I$(DTS_DIR) \ + -I$(DTS_DIR)/include \ -undef -D__DTS__ $(3) \ -o $(2).tmp $(1) $(LINUX_DIR)/scripts/dtc/dtc -O dtb \ -- cgit v1.2.3