diff options
| author | Tomasz Maciej Nowak <tomek_n@o2.pl> | 2020-02-10 16:33:26 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-03-01 21:36:00 +0100 |
| commit | 66f80020f9a9d2300ad395e173262d79c282903a (patch) | |
| tree | 39ee54a68def5affe7e2fe2216ac94b8252ca248 | |
| parent | a51b4ec94d93f1874fa4b6981d4bb8cb5d125b48 (diff) | |
| download | upstream-66f80020f9a9d2300ad395e173262d79c282903a.tar.gz upstream-66f80020f9a9d2300ad395e173262d79c282903a.tar.bz2 upstream-66f80020f9a9d2300ad395e173262d79c282903a.zip | |
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 <ttocsr@gmail.com>
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
| -rw-r--r-- | target/linux/mvebu/image/cortexa53.mk | 2 | ||||
| -rw-r--r-- | target/linux/mvebu/patches-4.19/530-add_armada-3820-uDPU-dts.patch | 10 |
2 files changed, 1 insertions, 11 deletions
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 |