Changeset 47823


Ignore:
Timestamp:
2015-12-10T13:39:32+01:00 (2 years ago)
Author:
nbd
Message:

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@…>

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/image.mk

    r47411 r47823  
    1717KDIR=$(KERNEL_BUILD_DIR) 
    1818KDIR_TMP=$(KDIR)/tmp 
    19 DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/ 
     19DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts 
    2020 
    2121IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) 
     
    144144define Image/BuildDTB 
    145145        $(CPP) -nostdinc -x assembler-with-cpp \ 
    146                 -I$(LINUX_DIR)/arch/$(ARCH)/boot/dts \ 
    147                 -I$(LINUX_DIR)/arch/$(ARCH)/boot/dts/include \ 
     146                -I$(DTS_DIR) \ 
     147                -I$(DTS_DIR)/include \ 
    148148                -undef -D__DTS__ $(3) \ 
    149149                -o $(2).tmp $(1) 
  • trunk/target/linux/ramips/image/Makefile

    r47627 r47823  
    4040 
    4141define Build/patch-dtb 
    42         $(LINUX_DIR)/scripts/dtc/dtc -O dtb -o $@.dtb ../dts/$(DTS).dts 
     42        $(call Image/BuildDTB,../dts/$(DTS).dts,$@.dtb) 
    4343        $(STAGING_DIR_HOST)/bin/patch-dtb $@ $@.dtb 
    4444endef 
Note: See TracChangeset for help on using the changeset viewer.