From: Tomasz Maciej Nowak Date: Mon, 10 Feb 2020 15:33:26 +0000 (+0100) Subject: mvebu: uDPU: drop patch compiling dtb X-Git-Url: http://git.openwrt.org/project/luci.git;master?a=commitdiff_plain;h=66f80020f9a9d2300ad395e173262d79c282903a;p=openwrt%2Fstaging%2Fjogo.git mvebu: uDPU: drop patch compiling dtb If device recipe has specified DEVICE_DTS variable, the dtb is built anyway by OpenWrt buildroot image rules. Drop the patch and adjust the location of compiled dtb. Cc: Scott Roberts Signed-off-by: Tomasz Maciej Nowak --- diff --git a/target/linux/mvebu/image/cortexa53.mk b/target/linux/mvebu/image/cortexa53.mk index 987d904597..77f5c79972 100644 --- a/target/linux/mvebu/image/cortexa53.mk +++ b/target/linux/mvebu/image/cortexa53.mk @@ -60,7 +60,7 @@ define Device/methode_udpu DEVICE_MODEL := micro-DPU (uDPU) DEVICE_DTS := armada-3720-uDPU KERNEL_LOADADDR := 0x00080000 - KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb KERNEL_INITRAMFS_SUFFIX := .itb DEVICE_PACKAGES += f2fs-tools fdisk kmod-i2c-pxa IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2) diff --git a/target/linux/mvebu/patches-4.19/530-add_armada-3820-uDPU-dts.patch b/target/linux/mvebu/patches-4.19/530-add_armada-3820-uDPU-dts.patch deleted file mode 100644 index bd4f0aef9a..0000000000 --- a/target/linux/mvebu/patches-4.19/530-add_armada-3820-uDPU-dts.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm64/boot/dts/marvell/Makefile -+++ b/arch/arm64/boot/dts/marvell/Makefile -@@ -2,6 +2,7 @@ - # Mvebu SoC Family - dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb - dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb -+dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-uDPU.dtb - dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb - dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb - dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb