From 03894def222e9a15e74061e87aa15d3cc6e146f3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 19 Jan 2019 13:53:00 +0000
Subject: [PATCH] Tidying
---
src/freedombone-image-hardware-setup | 33 ++++++++++------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 25046533b..175ee049e 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -142,6 +142,8 @@ arm_setup_boot() {
fstype=ext4
fi
+ mkdir -p /boot/dtbs
+
# shellcheck disable=SC2012,SC2086
kernelVersion=$(ls /usr/lib/*/${dtb}.dtb | head -1 | cut -d/ -f4)
version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
@@ -151,7 +153,6 @@ arm_setup_boot() {
arm_loadaddr='0x46000000'
arm_initrd_addr='0x48000000'
arm_fdtaddr='0x47000000'
- arm_boot_script=/boot/boot.cmd
arm_boot_device="mmc \${mmcdev}:\${mmcpart}"
arm_boot_start=
arm_boot_dev=
@@ -163,7 +164,6 @@ arm_setup_boot() {
"am"*) arm_loadaddr='0x82000000'
arm_initrd_addr='0x88080000'
arm_fdtaddr='0x88000000'
- arm_boot_script=/boot/uEnv.txt
arm_pack_kernel=1
if [ "$EXTERNAL_DRIVE" ]; then
arm_boot_dev='bootdev=0:1'
@@ -182,8 +182,8 @@ arm_setup_boot() {
;;
esac
- case "$dtb" in
- "am"*) cat >> $arm_boot_script <<EOF
+ if [ $arm_pack_kernel ]; then
+ cat >> /boot/uEnv.txt <<EOF
mmcroot=/dev/${arm_root_device} ro
mmcrootfstype=$fstype rootwait fixrtc
mmcrootflags=subvol=@
@@ -210,8 +210,13 @@ mmcargs=setenv bootargs init=/lib/systemd/systemd console=tty0 console=\${consol
uenvcmd=${arm_boot_start}run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
EOF
- ;;
- *) cat >> $arm_boot_script <<EOF
+ # Copy all DTBs
+ cp /usr/lib/linux-image-*-armmp/* /boot/dtbs
+
+ arm_flash "$arm_flash_name"
+ arm_repack_kernel "${dtb}" "$arm_loadaddr" "$arm_initrd_addr" "$arm_arch"
+ else
+ cat >> /boot/boot.cmd <<EOF
setenv mmcdev 0
setenv mmcpart 1
@@ -242,22 +247,6 @@ setenv mmcargs setenv bootargs init=/lib/systemd/systemd console=\${console} ear
${arm_boot_start}run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
EOF
- ;;
- esac
-
- mkdir -p /boot/dtbs
-
- if [ $arm_pack_kernel ]; then
- # Copy all DTBs
- cp /usr/lib/linux-image-*-armmp/* /boot/dtbs
-
- case "$arm_flash_name" in
- "TI "*)
- arm_flash "$arm_flash_name"
- arm_repack_kernel "${dtb}" "$arm_loadaddr" "$arm_initrd_addr" "$arm_arch"
- ;;
- esac
- else
# Create boot.scr
mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
--
GitLab