From 644f7e870ab1e485e19a82890a5f19c3e6ed58de Mon Sep 17 00:00:00 2001
From: Pratham Patel <thefirst1322@gmail.com>
Date: Sun, 8 Oct 2023 13:35:57 +0530
Subject: [PATCH] finalfinalllll

---
 boot.cmd      | 15 ++++++---------
 opi5-efi.spec |  2 +-
 post.sh       |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/boot.cmd b/boot.cmd
index c788a00..26cf11e 100644
--- a/boot.cmd
+++ b/boot.cmd
@@ -14,7 +14,6 @@ setenv docker_optimizations "on"
 setenv earlycon "off"
 setenv devtype "mmc"
 setenvrootdev
-setenvuname_r
 
 if test -e ${devtype} ${devnum}:1 uEnv.txt; then
 	load ${devtype} ${devnum}:1 ${load_addr} uEnv.txt
@@ -39,16 +38,14 @@ setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs
 
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi
 
-#load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd
-#load ${devtype} ${devnum}:2 ${kernel_addr_r} Image
-load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd-${uname_r}
-load ${devtype} ${devnum}:2 ${kernel_addr_r} vmlinuz-${uname_r}.old
+load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd
+load ${devtype} ${devnum}:2 ${kernel_addr_r} vmlinuz
 
-load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb-${uname_r}/${fdtfile}
+load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum}:2 ${load_addr} dtb-${uname_r}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum}:2 ${load_addr} dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
@@ -61,9 +58,9 @@ for overlay_file in ${user_overlays}; do
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb-${uname_r}/${fdtfile}
+	load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb/${fdtfile}
 else
-	if load ${devtype} ${devnum}:2 ${load_addr} dtb-${uname_r}/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+	if load ${devtype} ${devnum}:2 ${load_addr} dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi
diff --git a/opi5-efi.spec b/opi5-efi.spec
index 1056f50..784c8c0 100644
--- a/opi5-efi.spec
+++ b/opi5-efi.spec
@@ -5,7 +5,7 @@
 
 Name: opi5-efi
 Version: 0.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Necessary files for booting from vendor U-Boot on Orange Pi 5
 License: GPL
 Provides: %{name}-%{version}
diff --git a/post.sh b/post.sh
index 12fbbb1..f1be168 100644
--- a/post.sh
+++ b/post.sh
@@ -21,7 +21,6 @@ fi
 
 echo "rootdev=${BOOT_PART}" >> "/boot/efi/uEnv.txt"
 sed -i "s/setenvrootdev/setenv rootdev \"${BOOT_PART}\"/" "/boot/efi/boot.cmd"
-sed -i "s/setenvuname_r/setenv uname_r \"${UNAME_R}\"/" "/boot/efi/boot.cmd"
 
 mkimage -A arm -T ramdisk -C none -n uInitrd -d "/boot/initramfs-${UNAME_R}.img" "/boot/uInitrd-${UNAME_R}"
 mkimage -C none -A arm -T script -d "/boot/efi/boot.cmd" "/boot/efi/boot.scr"