Message ID | 20200131154620.25773-8-tomek_n@o2.pl |
---|---|
State | Superseded |
Headers | show |
Series | mvebu: Second round of clean-ups | expand |
Hi Scott. W dniu 31.01.2020 o 17:12, ttocsr pisze: > Kernel 4.19 doesn't have armada-3720-uDPU.dts. Won't we need to patch > openwrt because of this? No, that won't be a problem. Check the ininclude/image.mk line 523, this assures that every DEVICE_DTS will be compiled to dtb. The only thing that differs is the location where it'll end up. Regards > > Scott > > On Fri, Jan 31, 2020 at 8:47 AM Tomasz Maciej Nowak <tomek_n@o2.pl> wrote: > >> 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> >> --- >> target/linux/mvebu/image/cortexa53.mk | 2 +- >> .../patches-4.19/530-add_armada-3820-uDPU-dts.patch | 10 ---------- >> 2 files changed, 1 insertion(+), 11 deletions(-) >> delete mode 100644 >> target/linux/mvebu/patches-4.19/530-add_armada-3820-uDPU-dts.patch >> >> 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 >> -- >> 2.25.0 >> >> >
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
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> --- target/linux/mvebu/image/cortexa53.mk | 2 +- .../patches-4.19/530-add_armada-3820-uDPU-dts.patch | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 target/linux/mvebu/patches-4.19/530-add_armada-3820-uDPU-dts.patch