aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-12-10 12:39:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-12-10 12:39:32 +0000
commit09335a0a2f2d92b756871882028c0966070c0e4b (patch)
treedf52416390e26283c5881b74ff4c33c127b2fa3f
parent6b04b44e21a8ca08a6af5e2ac1da5edacf5069b8 (diff)
downloadupstream-09335a0a2f2d92b756871882028c0966070c0e4b.tar.gz
upstream-09335a0a2f2d92b756871882028c0966070c0e4b.tar.bz2
upstream-09335a0a2f2d92b756871882028c0966070c0e4b.zip
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 <mar.kolya@gmail.com> SVN-Revision: 47823
-rw-r--r--include/image.mk6
-rw-r--r--target/linux/ramips/image/Makefile2
2 files changed, 4 insertions, 4 deletions
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 \
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index e58d012699..01e3fcbf11 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -39,7 +39,7 @@ define Device/Default
endef
define Build/patch-dtb
- $(LINUX_DIR)/scripts/dtc/dtc -O dtb -o $@.dtb ../dts/$(DTS).dts
+ $(call Image/BuildDTB,../dts/$(DTS).dts,$@.dtb)
$(STAGING_DIR_HOST)/bin/patch-dtb $@ $@.dtb
endef