Simplify

src/freedombone-image-hardware-setup

@@ -161,7 +161,6 @@ arm_setup_boot() {
     arm_fdtaddr='0x47000000'
     arm_boot_device="mmc \${mmcdev}:\${mmcpart}"
     arm_boot_start=
-    arm_boot_dev=
     arm_boot_console='ttyO0,115200n8'
     arm_arch=arm
     arm_uenv=
@@ -172,21 +171,20 @@ arm_setup_boot() {
                arm_fdtaddr='0x88000000'
                arm_uenv=1
                if [ "$EXTERNAL_DRIVE" ]; then
-                   arm_boot_dev='bootdev=0:1'
-                   arm_boot_device="usb \${bootdev}"
+                   arm_boot_device="usb 0:1"
                    arm_loadaddr='0x80300000'
                    arm_initrd_addr='0x81600000'
                    arm_fdtaddr='0x815f0000'
                    arm_boot_start='usb start; '
                fi
                ;;
-        "sun"*) { echo "rtc_sunxi";
+        "sun"*) arm_boot_device="mmc 0:1"
+                { echo "rtc_sunxi";
                   echo "vfat"; } >> /etc/initramfs-tools/modules
                 ;;
         "rk3328-rock64") arm_arch=arm64
                          cp /root/${PROJECT_NAME}/image_build/dts/rk3328-rock64.dtb /boot/dtbs
-                         arm_boot_dev='bootdev=0:1'
-                         arm_boot_device="usb \${bootdev}"
+                         arm_boot_device="usb 0:1"
                          arm_loadaddr='0x80300000'
                          arm_initrd_addr='0x81600000'
                          arm_fdtaddr='0x815f0000'
@@ -200,7 +198,6 @@ arm_setup_boot() {
 mmcroot=/dev/${arm_root_device} ro
 mmcrootfstype=$fstype rootwait fixrtc
 mmcrootflags=subvol=@
-${arm_boot_dev}
 
 console=${arm_boot_console}
 
@@ -232,9 +229,9 @@ EOF
         cat >> /boot/boot.cmd <<EOF
 scsi scan
 setenv bootargs init=/lib/systemd/systemd console=ttyO0,115200n8 root=/dev/${arm_root_device} panic=10 rootflags=subvol=@ ro ${fstype} rootwait fixrtc earlyprintk ifnames=0 slub_debug=FZP slab_nomerge page_poison=1
-fatload mmc 0:1 ${arm_fdtaddr} /dtbs/${dtb}.dtb
-fatload mmc 0:1 ${arm_loadaddr} ${vmlinuz}
-fatload mmc 0:1 ${arm_initrd_addr} ${initRd}
+fatload ${arm_boot_device} ${arm_fdtaddr} /dtbs/${dtb}.dtb
+fatload ${arm_boot_device} ${arm_loadaddr} ${vmlinuz}
+fatload ${arm_boot_device} ${arm_initrd_addr} ${initRd}
 bootz ${arm_loadaddr} ${arm_initrd_addr}:\${filesize} ${arm_fdtaddr}
 EOF
         # Create boot.scr