From 1b941084137926f879d42c9e7a8e16d076d7d610 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 20 Jan 2019 15:29:07 +0000
Subject: [PATCH] simplify uboot configuration
---
src/freedombone-image-hardware-setup | 35 +++++-----------------------
1 file changed, 6 insertions(+), 29 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 8dfc527e6..e406f3596 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -230,35 +230,12 @@ EOF
arm_repack_kernel "${dtb}" "$arm_loadaddr" "$arm_initrd_addr" "$arm_arch"
else
cat >> /boot/boot.cmd <<EOF
-setenv mmcdev 0
-setenv mmcpart 1
-
-setenv mmcroot /dev/${arm_root_device} ro
-setenv mmcrootfstype $fstype rootwait fixrtc
-setenv mmcrootflags subvol=@
-${arm_boot_dev}
-
-setenv console ${arm_boot_console}
-
-setenv kernel_file $vmlinuz
-setenv initrd_file $initRd
-setenv fdtfile ${dtb}.dtb
-
-setenv loadaddr $arm_loadaddr
-setenv initrd_addr $arm_initrd_addr
-setenv fdtaddr $arm_fdtaddr
-
-setenv initrd_high 0xffffffff
-setenv fdt_high 0xffffffff
-
-setenv loadkernel load ${arm_boot_device} \${loadaddr} \${kernel_file}
-setenv loadinitrd load ${arm_boot_device} \${initrd_addr} \${initrd_file}\\; setenv initrd_size \\\${filesize}
-setenv loadfdt load ${arm_boot_device} \${fdtaddr} /dtbs/\${fdtfile}
-
-setenv loadfiles run loadkernel\\; run loadinitrd\\; run loadfdt
-setenv mmcargs setenv bootargs init=/lib/systemd/systemd console=\${console} earlyprintk root=\${mmcroot} rootfstype=\${mmcrootfstype} rootflags=\${mmcrootflags} ifnames=0 slub_debug=FZP slab_nomerge page_poison=1
-
-${arm_boot_start}run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
+scsi scan
+setenv bootargs init=/lib/systemd/systemd console=ttyO0,115200n8 root=/dev/${arm_root_device} panic=10 rootflags=subvol=@ ro btrfs 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}
+bootz ${arm_loadaddr} ${arm_initrd_addr}:\${filesize} ${arm_fdtaddr}
EOF
# Create boot.scr
mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
--
GitLab