From 7d8f187201d361e1c0059d18d7e0f119ae4b6472 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 21 Jul 2014 18:42:06 +0000 Subject: [PATCH] target/linux/*/image/Makefile: use new dts path variable Signed-off-by: John Crispin SVN-Revision: 41791 --- target/linux/at91/image/Makefile | 4 ++-- target/linux/bcm53xx/image/Makefile | 2 +- target/linux/imx6/image/Makefile | 2 +- target/linux/kirkwood/image/Makefile | 2 +- target/linux/mpc83xx/image/Makefile | 2 +- target/linux/mpc85xx/image/Makefile | 2 +- target/linux/mvebu/image/Makefile | 2 +- target/linux/mxs/image/Makefile | 6 +++--- target/linux/omap/image/Makefile | 12 ++++++------ target/linux/ppc40x/image/Makefile | 2 +- target/linux/ppc44x/image/Makefile | 2 +- target/linux/sunxi/image/Makefile | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index 5c2f976446..57e5cc45d7 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -25,7 +25,7 @@ define Image/Prepare endef define MkuImageDtb - cat $(KDIR)/zImage $(LINUX_DIR)/arch/arm/boot/dts/$(2).dtb > $(KDIR)/zImage-$(1) + cat $(KDIR)/zImage $(DTS_DIR)/$(2).dtb > $(KDIR)/zImage-$(1) mkimage -A arm -T kernel -C none -a 0x20008000 -e 0x20008000 \ -n "OpenWrt ARM $(LINUX_VERSION)" \ -d $(KDIR)/zImage-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage @@ -33,7 +33,7 @@ endef define MkOftree cp -u $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage - cp $(LINUX_DIR)/arch/arm/boot/dts/$(2).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-oftree.dtb + cp $(DTS_DIR)/$(2).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-oftree.dtb endef # Atmel diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index 13f26f4509..61bc39cfd6 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -43,7 +43,7 @@ endef define Image/Build/DTB rm -f $(KDIR)/$(1)-$(2).lzma rm -f $(KDIR)/$(1)-$(2).dts - cat $(KDIR)/$(1) $(LINUX_DIR)/arch/$(ARCH)/boot/dts/$(2).dtb > $(KDIR)/$(1)-$(2).dts; + cat $(KDIR)/$(1) $(DTS_DIR)/$(2).dtb > $(KDIR)/$(1)-$(2).dts; $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/$(1)-$(2).dts $(KDIR)/$(1)-$(2).lzma -d16 endef diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile index b07dd4fc8c..54cdfd5186 100644 --- a/target/linux/imx6/image/Makefile +++ b/target/linux/imx6/image/Makefile @@ -13,7 +13,7 @@ endef define Image/BuildKernel/Template - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb + $(CP) $(DTS_DIR)/$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb $(call Image/BuildKernel/MkFIT,$(1),$(KDIR)/zImage,$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb,none,0x10008000,0x10008000) $(CP) $(KDIR)/fit-$(1).itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage.itb diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index a3971d47af..d0b1f835af 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -34,7 +34,7 @@ define Image/BuildKernel/Template endif ifneq ($(1),) - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/kirkwood-$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb + $(CP) $(DTS_DIR)/kirkwood-$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb $(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage diff --git a/target/linux/mpc83xx/image/Makefile b/target/linux/mpc83xx/image/Makefile index c7458f1c24..8770390b2d 100644 --- a/target/linux/mpc83xx/image/Makefile +++ b/target/linux/mpc83xx/image/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk define Image/Prepare - $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/mpc8377_wlan.dts > $(BIN_DIR)/openwrt-mpc83xx-mpc8377_wlan.dtb + $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(DTS_DIR)/mpc8377_wlan.dts > $(BIN_DIR)/openwrt-mpc83xx-mpc8377_wlan.dtb endef define Image/BuildKernel diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile index 5ecd100355..0f8373ad52 100644 --- a/target/linux/mpc85xx/image/Makefile +++ b/target/linux/mpc85xx/image/Makefile @@ -33,7 +33,7 @@ endef define Image/BuildKernel cp $(KDIR)/zImage $(zImage) $(foreach dts,$(DTS_TARGETS), - $(LINUX_DIR)/scripts/dtc/dtc -I dts -O dtb $(LINUX_DIR)/arch/powerpc/boot/dts/$(dts).dts > $(BIN_DIR)/$(IMG_PREFIX)-$(dts).fdt + $(LINUX_DIR)/scripts/dtc/dtc -I dts -O dtb $(DTS_DIR)/$(dts).dts > $(BIN_DIR)/$(IMG_PREFIX)-$(dts).fdt ) endef diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index b1682f4db1..9d3b6353a6 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -29,7 +29,7 @@ endef define Image/Build/DTB cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); - cat $(LINUX_DIR)/arch/$(ARCH)/boot/dts/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); + cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); $(call Image/Build/MkuImage,$(KDIR)/zImage$(2)-$(1),$(KDIR)/uImage$(2)-$(1)) cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1); endef diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile index 59a89e9d50..c29925f2d8 100644 --- a/target/linux/mxs/image/Makefile +++ b/target/linux/mxs/image/Makefile @@ -13,7 +13,7 @@ BOARDS:= \ imx28-duckbill define Image/BuildKernel/olinuxino-bootlet - cat $(LINUX_DIR)/arch/arm/boot/zImage $(LINUX_DIR)/arch/arm/boot/dts/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb + cat $(LINUX_DIR)/arch/arm/boot/zImage $(DTS_DIR)/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb (cd $(STAGING_DIR); \ $(STAGING_DIR)/../host/bin/elftosb -z -c ./linux_prebuilt.db -o linux.sb; \ dd if=/dev/zero of=sd_mmc_bootstream.raw bs=512 count=4; \ @@ -41,7 +41,7 @@ define Image/BuildKernel $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage $(foreach board,$(BOARDS), - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/ + $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/ ) endef @@ -55,7 +55,7 @@ define Image/InstallKernel ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) mkdir -p $(TARGET_DIR)/boot $(foreach board,$(BOARDS), - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(TARGET_DIR)/boot/ + $(CP) $(DTS_DIR)/$(board).dtb $(TARGET_DIR)/boot/ ) endif diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile index c2f6f7cd94..ed3d90d222 100644 --- a/target/linux/omap/image/Makefile +++ b/target/linux/omap/image/Makefile @@ -22,14 +22,14 @@ define Image/BuildKernel endif ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) $(INSTALL_DIR) $(TARGET_DIR)/boot - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(TARGET_DIR)/boot/ - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(TARGET_DIR)/boot/ - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(TARGET_DIR)/boot/ + $(CP) $(DTS_DIR)/am335x*.dtb $(TARGET_DIR)/boot/ + $(CP) $(DTS_DIR)/omap3*.dtb $(TARGET_DIR)/boot/ + $(CP) $(DTS_DIR)/omap4*.dtb $(TARGET_DIR)/boot/ endif -mkdir $(BIN_DIR)/dtbs - -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(BIN_DIR)/dtbs/ - -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(BIN_DIR)/dtbs/ - -$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(BIN_DIR)/dtbs/ + -$(CP) $(DTS_DIR)/am335x*.dtb $(BIN_DIR)/dtbs/ + -$(CP) $(DTS_DIR)/omap3*.dtb $(BIN_DIR)/dtbs/ + -$(CP) $(DTS_DIR)/omap4*.dtb $(BIN_DIR)/dtbs/ endef define Image/Build diff --git a/target/linux/ppc40x/image/Makefile b/target/linux/ppc40x/image/Makefile index 86c238a6af..3a955e7bb3 100644 --- a/target/linux/ppc40x/image/Makefile +++ b/target/linux/ppc40x/image/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk JFFS2_BLOCKSIZE=128k 64k define Image/Prepare - $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb + $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(DTS_DIR)/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb endef define Image/BuildKernel diff --git a/target/linux/ppc44x/image/Makefile b/target/linux/ppc44x/image/Makefile index 47a7aedc14..d4b1260fe1 100644 --- a/target/linux/ppc44x/image/Makefile +++ b/target/linux/ppc44x/image/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk JFFS2_BLOCKSIZE=256k define Image/Prepare - $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb + $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(DTS_DIR)/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb endef define Image/BuildKernel diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 0fe47bc59b..c41c51b424 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -36,7 +36,7 @@ define Image/BuildKernel endif $(foreach board,$(BOARDS), - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/ + $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/ ) endef