From bbd3a78570ed77f3cb4c29b23c3e387c57d4b320 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 5 Jan 2017 23:21:58 +0000
Subject: [PATCH] No generic beaglebone setup

---
 src/freedombone-image-hardware-setup | 43 ++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index d53bf4b1..c962bd56 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -176,6 +176,35 @@ beaglebone_repack_kernel() {
              -d $initRd uInitrd )
 }
 
+beaglebone_wireless_repack_kernel() {
+    echo "info: repacking beaglebone wireless kernel and initrd"
+
+    kernelVersion=$(ls /usr/lib/*/am335x-boneblack-wireless.dtb | head -1 | cut -d/ -f4)
+    version=$(echo $kernelVersion | sed 's/linux-image-\(.*\)/\1/')
+    initRd=initrd.img-$version
+    vmlinuz=vmlinuz-$version
+
+    mkdir /tmp/initrd-repack
+
+    (cd /tmp/initrd-repack ; \
+     zcat /boot/$initRd | cpio -i ; \
+     rm -f conf/param.conf ; \
+     find . | cpio --quiet -o -H newc | \
+         gzip -9 > /boot/$initRd )
+
+    rm -rf /tmp/initrd-repack
+
+    (cd /boot ; \
+     cp /usr/lib/$kernelVersion/am335x-boneblack-wireless.dtb dtb ; \
+     cat $vmlinuz dtb >> temp-kernel ; \
+     mkimage -A arm -O linux -T kernel -n "Debian kernel ${version}" \
+             -C none -a 0x82000000 -e 0x82000000 -d temp-kernel uImage ; \
+     rm -f temp-kernel ; \
+     mkimage -A arm -O linux -T ramdisk -C gzip -a 0x88080000 -e 0x88080000 \
+             -n "Debian ramdisk ${version}" \
+             -d $initRd uInitrd )
+}
+
 a20_setup_boot() {
     dtb="$1"
 
@@ -233,20 +262,18 @@ EOF
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules
 }
 
-function generic_beaglebone_steup {
-    beaglebone_flash
-    beaglebone_repack_kernel
-    enable_serial_console ttyO0
-}
-
 case "$MACHINE" in
     beaglebone)
         beaglebone_setup_boot
-        generic_beaglebone_steup
+        beaglebone_flash
+        beaglebone_repack_kernel
+        enable_serial_console ttyO0
         ;;
     beaglebonewifi)
         beaglebone_wireless_setup_boot
-        generic_beaglebone_steup
+        beaglebone_flash
+        beaglebone_wireless_repack_kernel
+        enable_serial_console ttyO0
         ;;
     cubietruck)
         a20_setup_boot sun7i-a20-cubietruck.dtb