From 07b9bfea75529948b33c0280b6fb162e11971d8e Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Sun, 4 Feb 2024 21:10:59 +0000
Subject: [PATCH] Amlogic: fix updates and align with the rest of the project

---
 projects/Amlogic/bootloader/boot.ini               | 2 +-
 projects/Amlogic/bootloader/extlinux/extlinux.conf | 2 +-
 projects/Amlogic/bootloader/update.sh              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/Amlogic/bootloader/boot.ini b/projects/Amlogic/bootloader/boot.ini
index b6d038b1bd..e5a6711a1c 100644
--- a/projects/Amlogic/bootloader/boot.ini
+++ b/projects/Amlogic/bootloader/boot.ini
@@ -3,7 +3,7 @@ JELOS-UBOOT-CONFIG
 setenv dtb_loadaddr "0x10000000"
 setenv loadaddr "0x1B00000"
 
-setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@"
+setenv bootargs "boot=UUID=@UUID_SYSTEM@ disk=UUID=@UUID_STORAGE@ @EXTRA_CMDLINE@"
 
 load mmc ${devno}:1 ${loadaddr} KERNEL
 load mmc ${devno}:1 ${dtb_loadaddr} ${fdtfile}
diff --git a/projects/Amlogic/bootloader/extlinux/extlinux.conf b/projects/Amlogic/bootloader/extlinux/extlinux.conf
index bfa8f7e106..583261da77 100644
--- a/projects/Amlogic/bootloader/extlinux/extlinux.conf
+++ b/projects/Amlogic/bootloader/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 LABEL JELOS
   LINUX /KERNEL
   FDTDIR /
-  APPEND boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@
+  APPEND boot=UUID=@UUID_SYSTEM@ disk=UUID=@UUID_STORAGE@ @EXTRA_CMDLINE@
diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh
index 53da44dc07..c2f22b8688 100755
--- a/projects/Amlogic/bootloader/update.sh
+++ b/projects/Amlogic/bootloader/update.sh
@@ -97,8 +97,8 @@ if [ -f $BOOT_ROOT/extlinux/extlinux.conf ] || [ -n "${1}" ]; then
       mkdir "${BOOT_ROOT}/extlinux"
     fi
     cp -p $SYSTEM_ROOT/usr/share/bootloader/extlinux/extlinux.conf $BOOT_ROOT/extlinux
-    sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
-        -e "s/@DISK_UUID@/$DISK_UUID/" \
+    sed -e "s/@UUID_SYSTEM@/$UUID_SYSTEM/" \
+        -e "s/@UUID_STORAGE@/$UUID_STORAGE/" \
         -i $BOOT_ROOT/extlinux/extlinux.conf
   fi
 fi
@@ -107,8 +107,8 @@ if [ -f $BOOT_ROOT/boot.ini ] || [ -n "${1}" ]; then
   if [ -f /usr/share/bootloader/boot.ini ]; then
     echo "Updating boot.ini"
     cp -p /usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini
-    sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \
-        -e "s/@DISK_UUID@/$DISK_UUID/" \
+    sed -e "s/@UUID_SYSTEM@/$UUID_SYSTEM/" \
+        -e "s/@UUID_STORAGE@/$UUID_STORAGE/" \
         -i $BOOT_ROOT/boot.ini
   fi
 fi