From 678a8ec6c73db9e8d957f17be04c9c98763d4770 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 20 Jan 2019 18:35:20 +0000
Subject: [PATCH] Use backports version of linux-image-armmp-lpae
---
src/freedombone-image-hardware-setup | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index e611accbc..9623f8001 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -164,12 +164,14 @@ arm_setup_boot() {
arm_boot_console='ttyO0,115200n8'
arm_arch=arm
arm_uenv=
+ arm_repack=
case "$dtb" in
"am"*) arm_loadaddr='0x82000000'
arm_initrd_addr='0x88080000'
arm_fdtaddr='0x88000000'
arm_uenv=1
+ arm_repack=1
if [ "$EXTERNAL_DRIVE" ]; then
arm_boot_device="usb 0:1"
arm_loadaddr='0x80300000'
@@ -178,7 +180,8 @@ arm_setup_boot() {
arm_boot_start='usb start; '
fi
;;
- "sun"*) arm_boot_device="mmc 0:1"
+ "sun"*) $INSTALL_PACKAGES_BACKPORTS linux-image-armmp-lpae
+ arm_boot_device="mmc 0:1"
{ echo "rtc_sunxi";
echo "vfat"; } >> /etc/initramfs-tools/modules
;;
@@ -222,9 +225,6 @@ uenvcmd=${arm_boot_start}run loadfiles; run mmcargs; bootz \${loadaddr} \${initr
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
scsi scan
@@ -241,6 +241,11 @@ EOF
cp /usr/lib/$kernelVersion/* /boot/dtbs
fi
+ if [ $arm_repack ]; then
+ arm_flash "$arm_flash_name"
+ arm_repack_kernel "${dtb}" "$arm_loadaddr" "$arm_initrd_addr" "$arm_arch"
+ fi
+
enable_serial_console ttyS0
}
--
GitLab