KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

target/linux/*/image/Makefile: use new dts path variable

Browse source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41791
This commit is contained in:
John Crispin 2014-07-21 18:42:06 +00:00
parent 941dab02d5
commit 7d8f187201
12 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/at91/image/Makefile
View file

@ -25,7 +25,7 @@ define Image/Prepare
endef endef
define MkuImageDtb 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 \ mkimage -A arm -T kernel -C none -a 0x20008000 -e 0x20008000 \
-n "OpenWrt ARM $(LINUX_VERSION)" \ -n "OpenWrt ARM $(LINUX_VERSION)" \
-d $(KDIR)/zImage-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage -d $(KDIR)/zImage-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-uImage
@ -33,7 +33,7 @@ endef
define MkOftree define MkOftree
cp -u $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage 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 endef
# Atmel # Atmel

2
target/linux/bcm53xx/image/Makefile
View file

@ -43,7 +43,7 @@ endef
define Image/Build/DTB define Image/Build/DTB
rm -f $(KDIR)/$(1)-$(2).lzma rm -f $(KDIR)/$(1)-$(2).lzma
rm -f $(KDIR)/$(1)-$(2).dts 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 $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/$(1)-$(2).dts $(KDIR)/$(1)-$(2).lzma -d16
endef endef

2
target/linux/imx6/image/Makefile
View file

@ -13,7 +13,7 @@ endef
define Image/BuildKernel/Template 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) $(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 $(CP) $(KDIR)/fit-$(1).itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage.itb

2
target/linux/kirkwood/image/Makefile
View file

@ -34,7 +34,7 @@ define Image/BuildKernel/Template
endif endif
ifneq ($(1),) 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 $(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 cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage

2
target/linux/mpc83xx/image/Makefile
View file

@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk
define Image/Prepare 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 endef
define Image/BuildKernel define Image/BuildKernel

2
target/linux/mpc85xx/image/Makefile
View file

@ -33,7 +33,7 @@ endef
define Image/BuildKernel define Image/BuildKernel
cp $(KDIR)/zImage $(zImage) cp $(KDIR)/zImage $(zImage)
$(foreach dts,$(DTS_TARGETS), $(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 endef

2
target/linux/mvebu/image/Makefile
View file

@ -29,7 +29,7 @@ endef
define Image/Build/DTB define Image/Build/DTB
cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); 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)) $(call Image/Build/MkuImage,$(KDIR)/zImage$(2)-$(1),$(KDIR)/uImage$(2)-$(1))
cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1); cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1);
endef endef

6
target/linux/mxs/image/Makefile
View file

@ -13,7 +13,7 @@ BOARDS:= \
imx28-duckbill imx28-duckbill
define Image/BuildKernel/olinuxino-bootlet 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); \ (cd $(STAGING_DIR); \
$(STAGING_DIR)/../host/bin/elftosb -z -c ./linux_prebuilt.db -o linux.sb; \ $(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; \ 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 $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage
$(foreach board,$(BOARDS), $(foreach board,$(BOARDS),
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/ $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/
) )
endef endef
@ -55,7 +55,7 @@ define Image/InstallKernel
ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
mkdir -p $(TARGET_DIR)/boot mkdir -p $(TARGET_DIR)/boot
$(foreach board,$(BOARDS), $(foreach board,$(BOARDS),
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(TARGET_DIR)/boot/ $(CP) $(DTS_DIR)/$(board).dtb $(TARGET_DIR)/boot/
) )
endif endif

12
target/linux/omap/image/Makefile
View file

@ -22,14 +22,14 @@ define Image/BuildKernel
endif endif
ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
$(INSTALL_DIR) $(TARGET_DIR)/boot $(INSTALL_DIR) $(TARGET_DIR)/boot
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(TARGET_DIR)/boot/ $(CP) $(DTS_DIR)/am335x*.dtb $(TARGET_DIR)/boot/
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(TARGET_DIR)/boot/ $(CP) $(DTS_DIR)/omap3*.dtb $(TARGET_DIR)/boot/
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(TARGET_DIR)/boot/ $(CP) $(DTS_DIR)/omap4*.dtb $(TARGET_DIR)/boot/
endif endif
-mkdir $(BIN_DIR)/dtbs -mkdir $(BIN_DIR)/dtbs
-$(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(BIN_DIR)/dtbs/ -$(CP) $(DTS_DIR)/am335x*.dtb $(BIN_DIR)/dtbs/
-$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(BIN_DIR)/dtbs/ -$(CP) $(DTS_DIR)/omap3*.dtb $(BIN_DIR)/dtbs/
-$(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(BIN_DIR)/dtbs/ -$(CP) $(DTS_DIR)/omap4*.dtb $(BIN_DIR)/dtbs/
endef endef
define Image/Build define Image/Build

2
target/linux/ppc40x/image/Makefile
View file

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE=128k 64k JFFS2_BLOCKSIZE=128k 64k
define Image/Prepare 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 endef
define Image/BuildKernel define Image/BuildKernel

2
target/linux/ppc44x/image/Makefile
View file

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE=256k JFFS2_BLOCKSIZE=256k
define Image/Prepare 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 endef
define Image/BuildKernel define Image/BuildKernel

2
target/linux/sunxi/image/Makefile
View file

@ -36,7 +36,7 @@ define Image/BuildKernel
endif endif
$(foreach board,$(BOARDS), $(foreach board,$(BOARDS),
$(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/ $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/
) )
endef endef