From 12a70c8c29bfc683179f04f760d9be30c8e1c542 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 18 Jan 2019 21:00:57 +0000
Subject: [PATCH] repack variable
---
src/freedombone-image-hardware-setup | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 7afae95c1..9a1bd7b27 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -157,12 +157,14 @@ arm_setup_boot() {
arm_boot_dev=
arm_boot_console='ttyO0,115200n8'
arm_arch=arm
+ arm_pack_kernel=
case "$dtb" in
"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'
arm_boot_device="usb \${bootdev}"
@@ -245,24 +247,22 @@ EOF
mkdir -p /boot/dtbs
- if [ "$arm_boot_script" = "/boot/boot.cmd" ]; then
- # Create boot.scr
- mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
-
- # shellcheck disable=SC2086
- cp /usr/lib/$kernelVersion/* /boot/dtbs
- else
+ if [ $arm_pack_kernel ]; then
# Copy all DTBs
cp /usr/lib/linux-image-*-armmp/* /boot/dtbs
- fi
- if [ "$arm_flash_name" ]; then
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
+
+ # shellcheck disable=SC2086
+ cp /usr/lib/$kernelVersion/* /boot/dtbs
fi
enable_serial_console ttyS0
--
GitLab