diff options
| author | Tomasz Maciej Nowak <tomek_n@o2.pl> | 2019-05-11 19:37:28 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-11 23:11:04 +0200 |
| commit | f0c2bac25287858dedd0756e6ba75677f8320da9 (patch) | |
| tree | 8dccb54824923b3fa493af7417778df3573ce225 | |
| parent | aecd0e09c940219c163d79ffa42e2a935df7db8c (diff) | |
| download | upstream-f0c2bac25287858dedd0756e6ba75677f8320da9.tar.gz upstream-f0c2bac25287858dedd0756e6ba75677f8320da9.tar.bz2 upstream-f0c2bac25287858dedd0756e6ba75677f8320da9.zip | |
mvebu: remove unnecessary code building dtbs
Even if dts is not included in upstream Makefile, it is built anyway by
recipe specified in include/image.mk. Also remove Build/dtb, it's not
used since 3f72f3a ("mvebu: clearfog: include DTB for all variants in
image").
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
| -rw-r--r-- | target/linux/mvebu/image/Makefile | 10 | ||||
| -rw-r--r-- | target/linux/mvebu/patches-4.14/105-build_new_dtbs.patch | 10 |
2 files changed, 3 insertions, 17 deletions
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 88790777d9..72b14e344b 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -15,10 +15,6 @@ KERNEL_LOADADDR := 0x00008000 SIGNATURE:=$(shell printf "%.8s" $(SOURCE_DATE_EPOCH)) -define Build/dtb - $(call Image/BuildDTB,$(DTS_DIR)/$(DEVICE_DTS).dts,$@.dtb) -endef - define Build/boot-scr rm -f $@-boot.scr sed -e 's#@ROOT@#$(SIGNATURE)#g' \ @@ -29,7 +25,7 @@ endef define Build/boot-img rm -f $@.boot mkfs.fat -C $@.boot $$(( $(CONFIG_TARGET_KERNEL_PARTSIZE) * 1024 )) - $(foreach dts,$(DEVICE_DTS), mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::$(dts).dtb;) + $(foreach dts,$(DEVICE_DTS), mcopy -i $@.boot $(KDIR)/image-$(dts).dtb ::$(dts).dtb;) mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_NAME) -mcopy -i $@.boot $@-boot.scr ::boot.scr endef @@ -37,7 +33,7 @@ endef define Build/boot-img-ext4 rm -fR $@.boot mkdir -p $@.boot - $(foreach dts,$(DEVICE_DTS), $(CP) $(DTS_DIR)/$(dts).dtb $@.boot;) + $(foreach dts,$(DEVICE_DTS), $(CP) $(KDIR)/image-$(dts).dtb $@.boot/$(dts).dtb;) $(CP) $(IMAGE_KERNEL) $@.boot/$(KERNEL_NAME) -$(CP) $@-boot.scr $@.boot/boot.scr make_ext4fs -J -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M $@.bootimg $@.boot @@ -70,7 +66,7 @@ define Build/omnia-medkit-initramfs rm -rf $(dir $(IMAGE_KERNEL))boot mkdir -p $(dir $(IMAGE_KERNEL))boot/boot/ cp $(KDIR)/zImage-initramfs $(dir $(IMAGE_KERNEL))boot/boot/zImage - cp $(DTS_DIR)/$(DEVICE_DTS).dtb $(dir $(IMAGE_KERNEL))boot/boot/dtb + cp $(KDIR)/image-$(DEVICE_DTS).dtb $(dir $(IMAGE_KERNEL))boot/boot/dtb $(TAR) -rp --numeric-owner --owner=0 --group=0 --sort=name \ $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ --file=$@ -C $(dir $(IMAGE_KERNEL))boot/ . diff --git a/target/linux/mvebu/patches-4.14/105-build_new_dtbs.patch b/target/linux/mvebu/patches-4.14/105-build_new_dtbs.patch deleted file mode 100644 index 92880b9971..0000000000 --- a/target/linux/mvebu/patches-4.14/105-build_new_dtbs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1027,6 +1027,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ - armada-385-linksys-cobra.dtb \ - armada-385-linksys-rango.dtb \ - armada-385-linksys-shelby.dtb \ -+ armada-385-linksys-venom.dtb \ - armada-385-synology-ds116.dtb \ - armada-385-turris-omnia.dtb \ - armada-388-clearfog.dtb \ |