From 007a60c5ba27cfd129c4dfa7cd8c4b75b36a30e1 Mon Sep 17 00:00:00 2001
From: Johan Gunnarsson <johan.gunnarsson@gmail.com>
Date: Tue, 25 Jul 2023 19:47:59 +0200
Subject: [PATCH] zz-update-uimg: Don't mkimage of initrd

---
 .../etc/initramfs/post-update.d/zz-update-uimg               | 5 +----
 .../etc/initramfs/post-update.d/zz-update-uimg               | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg b/2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
index 0642954..789f476 100755
--- a/2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
+++ b/2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
@@ -4,9 +4,6 @@
 # Kernel ABI string
 ABI="${1}"
 
-# Create U-Boot ramdisk image
-mkimage -A arm64 -T ramdisk -C none -d "/boot/initrd.img-${ABI}" "/boot/initrd.uimg-${ABI}"
-
 # List of paths to search for fdtfile in
 FDT="\
 /lib/firmware/${ABI}/device-tree/\${vendor} \
@@ -19,7 +16,7 @@ FDT="\
 # Create U-Boot boot script
 cat << EOF > /boot/boot.cmd
 load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r} /boot/vmlinuz-${ABI}
-load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.uimg-${ABI}
+load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.img-${ABI}
 setexpr kernel_comp_addr_r \${ramdisk_addr_r} + \${filesize}
 setexpr kernel_comp_size 0x4000000
 setenv ramdisk_size \${filesize}
diff --git a/2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg b/2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
index 2682083..11ff46a 100755
--- a/2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
+++ b/2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
@@ -4,9 +4,6 @@
 # Kernel ABI string
 ABI="${1}"
 
-# Create U-Boot ramdisk image
-mkimage -A arm -T ramdisk -C none -d "/boot/initrd.img-${ABI}" "/boot/initrd.uimg-${ABI}"
-
 # List of paths to search for fdtfile in
 FDT="\
 /lib/firmware/${ABI}/device-tree/\${vendor} \
@@ -19,7 +16,7 @@ FDT="\
 # Create U-Boot boot script
 cat << EOF > /boot/boot.cmd
 load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r} /boot/vmlinuz-${ABI}
-load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.uimg-${ABI}
+load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.img-${ABI}
 setenv ramdisk_size \${filesize}
 part uuid \${devtype} \${devnum}:\${distro_bootpart} partuuid
 setenv bootargs root=PARTUUID=\${partuuid} rw rootwait