From 7473ec31947975e808e6f89013103a13c26d4570 Mon Sep 17 00:00:00 2001
From: Shaun Mulligan <shaun@resin.io>
Date: Thu, 13 Jul 2017 15:21:35 +0200
Subject: [PATCH] override bsp boot.cmd in our integration layer

---
 .../recipes-bsp/u-boot/u-boot/boot.cmd        | 75 +++++++++++++++++++
 .../recipes-bsp/u-boot/u-boot_%.bbappend      |  1 +
 2 files changed, 76 insertions(+)
 create mode 100644 layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/boot.cmd

diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/boot.cmd b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/boot.cmd
new file mode 100644
index 0000000..10b0c8a
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/boot.cmd
@@ -0,0 +1,75 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x44000000"
+setenv overlay_error "false"
+# default values
+setenv rootdev "/dev/mmcblk0p2"
+setenv verbosity "1"
+setenv console "both"
+setenv disp_mem_reserves "off"
+setenv disp_mode "1920x1080p60"
+setenv rootfstype "ext4"
+setenv docker_optimizations "on"
+
+# Print boot source
+itest.b *0x28 == 0x00 && echo "U-boot loaded from SD"
+itest.b *0x28 == 0x02 && echo "U-boot loaded from eMMC or secondary SD"
+itest.b *0x28 == 0x03 && echo "U-boot loaded from SPI"
+
+echo "Boot script loaded from ${devtype}"
+
+if test -e ${devtype} 0 ${prefix}armbianEnv.txt; then
+	load ${devtype} 0 ${load_addr} ${prefix}armbianEnv.txt
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
+
+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=ttyS0,115200"; fi
+
+# get PARTUUID of first partition on SD/eMMC it was loaded from
+# mmc 0 is always mapped to device u-boot (2016.09+) was loaded from
+if test "${devtype}" = "mmc"; then part uuid mmc 0:1 partuuid; fi
+
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} hdmi.audio=EDID:0 disp.screen0_output_mode=${disp_mode} panic=10 consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} ubootsource=${devtype} ${extraargs} ${extraboardargs}"
+
+if test "${disp_mem_reserves}" = "off"; then setenv bootargs "${bootargs} sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16"; fi
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi
+
+echo "Found mainline kernel configuration"
+load ${devtype} 0 ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+for overlay_file in ${overlays}; do
+	if load ${devtype} 0 ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+for overlay_file in ${user_overlays}; do
+	if load ${devtype} 0 ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+if test "${overlay_error}" = "true"; then
+	echo "Error applying DT overlays, restoring original DT"
+	load ${devtype} 0 ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+	if load ${devtype} 0 ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr; then
+		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+		source ${load_addr}
+	fi
+	if test -e ${devtype} 0 ${prefix}fixup.scr; then
+		load ${devtype} 0 ${load_addr} ${prefix}fixup.scr
+		echo "Applying user provided fixup script (fixup.scr)"
+		source ${load_addr}
+	fi
+fi
+
+load ${devtype} 0 ${kernel_addr_r} ${prefix}uImage
+bootm ${kernel_addr_r} - ${fdt_addr_r}
\ No newline at end of file
diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_%.bbappend b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_%.bbappend
index c2d1416..23588f3 100644
--- a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -10,6 +10,7 @@ SRC_URI_append = " \
     file://h3-set-safe-axi_apb-clock-dividers.patch \
     file://h3-adjust-dram-frequency.patch \
     file://enable-DT-overlays-support.patch \
+    file://boot.cmd \
     file://armbianEnv.txt \
     "