[openwrt/openwrt] mvebu: omnia: make initramfs image usable out of the box

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/5ac0b2b431ba4a62e8e7dbc7ae4094a033032870

commit 5ac0b2b431ba4a62e8e7dbc7ae4094a033032870
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sat Jan 30 13:32:43 2021 +0100

    mvebu: omnia: make initramfs image usable out of the box
    
    Currently it's not possible to boot the device with just initramfs image
    without additional effort as the initramfs image doesn't contain device
    tree.  Fix it by producing FIT based image which could be booted with
    following commands:
    
     setenv bootargs earlyprintk console=ttyS0,115200
     tftpboot ${kernel_addr_r} openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin
     bootm ${kernel_addr_r}
    
    Acked-by: Klaus Kudielka <klaus.kudielka at gmail.com>
    Reviewed-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    (cherry-picked from commit 337ff74894110b35b61118918b7eb30bb6e60756)
---
 target/linux/mvebu/image/cortex-a9.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk
index 0e0bbcac45..5b50108d70 100644
--- a/target/linux/mvebu/image/cortex-a9.mk
+++ b/target/linux/mvebu/image/cortex-a9.mk
@@ -168,7 +168,8 @@ TARGET_DEVICES += globalscale_mirabox
 define Device/cznic_turris-omnia
   KERNEL_INSTALL := 1
   KERNEL := kernel-bin
-  KERNEL_INITRAMFS := kernel-bin
+  DEVICE_DTS := armada-385-turris-omnia
+  KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb
   DEVICE_TITLE := Turris Omnia
   DEVICE_PACKAGES :=  \
     mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
@@ -178,7 +179,6 @@ define Device/cznic_turris-omnia
   IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata
   IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip
   IMAGE_NAME = $$(2)
-  DEVICE_DTS := armada-385-turris-omnia
   SUPPORTED_DEVICES += armada-385-turris-omnia
   BOOT_SCRIPT := turris-omnia
 endef