From 641c668927efc73a1d4fb973d1cdf82d3a35a250 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 10 Jan 2019 21:36:34 +0000
Subject: [PATCH] Return of two boot scripts
---
src/freedombone-image-hardware-setup | 32 +++++++++++++++++++++++++---
1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index b3d38d73a..f30b75f2c 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -164,10 +164,34 @@ arm_setup_boot() {
arm_fdtaddr='0x88000000'
arm_boot_script=/boot/uEnv.txt
arm_uenvcmd='uenvcmd='
- ;;
- esac
+ cat >> $arm_boot_script <<EOF
+mmcroot=/dev/${arm_root_device} ro
+mmcrootfstype=$fstype rootwait fixrtc
+mmcrootflags=subvol=@
+
+console=ttyO0,115200n8
+
+kernel_file=$vmlinuz
+initrd_file=$initRd
+
+loadaddr=$arm_loadaddr
+initrd_addr=$arm_initrd_addr
+fdtaddr=$arm_fdtaddr
+
+initrd_high=0xffffffff
+fdt_high=0xffffffff
- cat >> $arm_boot_script <<EOF
+loadkernel=load mmc \${mmcdev}:\${mmcpart} \${loadaddr} \${kernel_file}
+loadinitrd=load mmc \${mmcdev}:\${mmcpart} \${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
+loadfdt=load mmc \${mmcdev}:\${mmcpart} \${fdtaddr} /dtbs/\${fdtfile}
+
+loadfiles=run loadkernel; run loadinitrd; run loadfdt
+mmcargs=setenv bootargs init=/lib/systemd/systemd console=tty0 console=\${console} root=\${mmcroot} rootfstype=\${mmcrootfstype} rootflags=\${mmcrootflags} ifnames=0 slub_debug=FZP slab_nomerge page_poison=1
+
+uenvcmd=run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
+EOF
+ ;;
+ *) cat >> $arm_boot_script <<EOF
setenv mmcdev 0
setenv mmcpart 1
@@ -197,6 +221,8 @@ setenv mmcargs setenv bootargs init=/lib/systemd/systemd console=tty0 console=\$
${arm_uenvcmd}run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
EOF
+ ;;
+ esac
mkdir -p /boot/dtbs
--
GitLab