diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-12-10 12:39:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-12-10 12:39:32 +0000 |
| commit | 1ebac7694539b9d274e6fe070f0199e2009409c8 (patch) | |
| tree | 3323d1f9c395ab4c5cffcc5f76f8fea1096bd514 | |
| parent | fb3414f349d22335eff63a8368f9531ed2fd0db0 (diff) | |
| download | master-187ad058-1ebac7694539b9d274e6fe070f0199e2009409c8.tar.gz master-187ad058-1ebac7694539b9d274e6fe070f0199e2009409c8.tar.bz2 master-187ad058-1ebac7694539b9d274e6fe070f0199e2009409c8.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47823 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/image.mk | 6 | ||||
| -rw-r--r-- | target/linux/ramips/image/Makefile | 2 |
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 |