From 99fc03cdf1aeeaf80b4ae1375bfefe603c5840ac Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 10 Jan 2019 21:40:30 +0000
Subject: [PATCH] Reuse original a20 boot script
---
src/freedombone-image-hardware-setup | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index f30b75f2c..228f1ead8 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -154,8 +154,6 @@ arm_setup_boot() {
arm_loadaddr='0x46000000'
arm_initrd_addr='0x48000000'
arm_fdtaddr='0x47000000'
- arm_uenvcmd=
-
arm_boot_script=/boot/boot.cmd
case "$dtb" in
@@ -163,8 +161,11 @@ arm_setup_boot() {
arm_initrd_addr='0x88080000'
arm_fdtaddr='0x88000000'
arm_boot_script=/boot/uEnv.txt
- arm_uenvcmd='uenvcmd='
- cat >> $arm_boot_script <<EOF
+ ;;
+ esac
+
+ case "$dtb" in
+ "am"*) cat >> $arm_boot_script <<EOF
mmcroot=/dev/${arm_root_device} ro
mmcrootfstype=$fstype rootwait fixrtc
mmcrootflags=subvol=@
@@ -203,23 +204,23 @@ setenv console ttyS0,115200n8
setenv kernel_file $vmlinuz
setenv initrd_file $initRd
-setenv fdtfile ${dtb}.dtb
+setenv fdtfile $dtb
-setenv loadaddr $arm_loadaddr
-setenv initrd_addr $arm_initrd_addr
-setenv fdtaddr $arm_fdtaddr
+setenv loadaddr 0x46000000
+setenv initrd_addr 0x48000000
+setenv fdtaddr 0x47000000
setenv initrd_high 0xffffffff
setenv fdt_high 0xffffffff
setenv loadkernel load mmc \${mmcdev}:\${mmcpart} \${loadaddr} \${kernel_file}
-setenv loadinitrd load mmc \${mmcdev}:\${mmcpart} \${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
+setenv loadinitrd load mmc \${mmcdev}:\${mmcpart} \${initrd_addr} \${initrd_file}\\; setenv initrd_size \\\${filesize}
setenv loadfdt load mmc \${mmcdev}:\${mmcpart} \${fdtaddr} /dtbs/\${fdtfile}
-setenv loadfiles=run loadkernel; run loadinitrd; run loadfdt
-setenv 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
+setenv loadfiles run loadkernel\\; run loadinitrd\\; run loadfdt
+setenv mmcargs setenv bootargs init=/lib/systemd/systemd console=\${console} root=\${mmcroot} rootfstype=\${mmcrootfstype} rootflags=\${mmcrootflags} ifnames=0 slub_debug=FZP slab_nomerge page_poison=1
-${arm_uenvcmd}run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
+run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
EOF
;;
esac
--
GitLab