From 0695169cbaf7454271aa2494f95f2a60bdf6cd18 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 20 Nov 2016 18:57:11 +0100
Subject: [PATCH] Udoo quad boot script adjustments, added onboard firmware to
 small armbian FW package, bugfix in postinstall script for DEFAULT kernel,
 added environment table

---
 bin/firmware-overlay/rt2870.bin               | Bin 0 -> 8192 bytes
 config/bootenv/udoo-default.txt               |   1 +
 config/bootscripts/boot-udoo.cmd              |  49 +++++++++++++-----
 ....14-DEFAULT-with-postinstall-scripts.patch |   2 +-
 4 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 bin/firmware-overlay/rt2870.bin
 create mode 100644 config/bootenv/udoo-default.txt

diff --git a/bin/firmware-overlay/rt2870.bin b/bin/firmware-overlay/rt2870.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9ddac4a4bb190770789b1fbd7e28cea0a6349854
GIT binary patch
literal 8192
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
N^F&_)|NrHke*!^mhMoWb

literal 0
HcmV?d00001

diff --git a/config/bootenv/udoo-default.txt b/config/bootenv/udoo-default.txt
new file mode 100644
index 000000000..b9bafac33
--- /dev/null
+++ b/config/bootenv/udoo-default.txt
@@ -0,0 +1 @@
+verbosity=1
diff --git a/config/bootscripts/boot-udoo.cmd b/config/bootscripts/boot-udoo.cmd
index ab9d57f58..7eda98921 100644
--- a/config/bootscripts/boot-udoo.cmd
+++ b/config/bootscripts/boot-udoo.cmd
@@ -1,23 +1,44 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
 
+# default values
+
+setenv load_addr "0x12000000"
+setenv ramdisk_addr "0x14800000"
 setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv disp_mode "1920x1080M60"
+setenv rootfstype "ext4"
 
-if ext4load mmc 0 0x00000000 /boot/.verbose
-then
-setenv verbosity 7
-else
-setenv verbosity 1
+# Print boot source
+echo "Booting from SD"
+
+if ext4load mmc 0 ${load_addr} /boot/armbianEnv.txt || fatload mmc 0 ${load_addr} armbianEnv.txt; then
+	env import -t ${load_addr} ${filesize}
 fi
-setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 quiet loglevel=1 loglevel=${verbosity} consoleblank=0 ${extraargs}"
-if ext4load mmc 0 0x00000000 /boot/.next
-then
-  setenv fdt_file imx6q-udoo.dtb
+
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttymxc1,115200"; fi
+
+
+setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} ${extraargs}"
+
+ext4load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd
+ext4load mmc 0 ${loadaddr} /boot/zImage || fatload mmc 0 ${loadaddr} zImage
+
+if load mmc 0 0x00000000 /boot/.next || load mmc 0 0x00000000 .next; then
+	setenv fdt_file "imx6q-udoo.dtb"
+	ext4load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file}
 else
-  setenv fdt_file imx6q-udoo-hdmi.dtb
+	setenv fdt_file "imx6q-udoo-hdmi.dtb"
+	ext4load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file}
 fi
-setenv ramdisk_addr 0x14800000
-ext2load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file}
-ext2load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd
-ext2load mmc 0 ${loadaddr} /boot/${image} || fatload mmc 0 ${loadaddr} ${image}
+
 bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}
+
+# Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr 
 
diff --git a/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch b/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
index 49c8bdc8d..cc3842591 100644
--- a/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
+++ b/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
@@ -160,7 +160,7 @@ index 152d4d2..9b30ad2 100644
 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
 +cat >> $tmpdir/DEBIAN/postinst <<EOT 
 +ln -sf $(basename $kernel_tmp_version) /boot/zImage > /dev/null 2>&1 || mv /$kernel_tmp_version /boot/zImage
-+
++rm -f /boot/.next
 +exit 0
 +EOT
 +