RV1106: Switch u-boot from extlinux to bootscript

Switch u-boot autoboot method from extlinux to the typical Armbian bootscript.
This is required in order to support devicetree overlays in this family.

Author: vidplace7

config/bootenv/rv1106.txt

@@ -0,0 +1,3 @@
+verbosity=1
+extraargs=coherent_pool=2M cma=0 video=off udev.children-max=1
+bootlogo=false

config/bootscripts/boot-rv1106.cmd

@@ -0,0 +1,79 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x02080000"
+setenv ramdisk_addr_r "0x02400000"
+setenv overlay_error "false"
+# default values
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "serial"
+setenv bootlogo "false"
+setenv rootfstype "ext4"
+setenv docker_optimizations "off"
+setenv earlycon "on"
+
+echo "Boot script loaded from ${devtype} ${devnum}"
+
+if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum} ${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 "console=ttyFIQ0,115200n8 ${consoleargs}"; fi
+if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
+
+# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
+
+setenv bootargs "earlyprintk root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
+
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
+
+load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage
+
+load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+for overlay_file in ${overlays}; do
+	if load ${devtype} ${devnum} ${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} ${devnum} ${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} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+	if load ${devtype} ${devnum} ${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} ${devnum} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
+		echo "Applying user provided fixup script (fixup.scr)"
+		source ${load_addr}
+	fi
+fi
+
+bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

config/sources/families/rockchip-rv1106.conf

@@ -21,13 +21,8 @@ ARCH=armhf
 BOOTDELAY=1
 SERIALCON="ttyFIQ0"
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
-SRC_EXTLINUX="yes"
-# Bootargs:
-# cma=0 -- disable CMA allocations (used by video / ipc) to save memory
-# video=off -- disable video subsystem to save memory
-# udev.children-max=1 -- limit number of udev child processes to save memory early in boot
-# console=ttyFIQ0,115200n8 -- set console to FIQ0 serial port at 115200 baud
-SRC_CMDLINE="cma=0 video=off udev.children-max=1 console=ttyFIQ0,115200n8"
+BOOTSCRIPT="boot-rv1106.cmd:boot.cmd"
+BOOTENV_FILE="rv1106.txt"
 OVERLAY_PREFIX="rv1106"
 OFFSET=16
 SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_optee.sh"

patch/u-boot/legacy/u-boot-rockchip-buildroot/fix-source-cmd.patch

@@ -0,0 +1,19 @@
+diff --git a/cmd/source.c b/cmd/source.c
+--- a/cmd/source.c
++++ b/cmd/source.c
+@@ -82,12 +82,9 @@
+ 			return 1;
+ 		}
+ 
+-		/*
+-		 * scripts are just multi-image files with one component, seek
+-		 * past the zero-terminated sequence of image lengths to get
+-		 * to the actual image data
+-		 */
+-		while (*data++ != IMAGE_PARAM_INVAL);
++		/* Skip past multi-image header: [u32 length][u32 terminator] */
++		data += 2;
++
+ 		break;
+ #endif
+ #if defined(CONFIG_FIT)

…oot/rv1103-rv1106-sysboot-extlinux.patch …ip-buildroot/rv1103-rv1106-bootscr.patchpatch/u-boot/legacy/u-boot-rockchip-buildroot/rv1103-rv1106-sysboot-extlinux.patch renamed to patch/u-boot/legacy/u-boot-rockchip-buildroot/rv1103-rv1106-bootscr.patch patch/u-boot/legacy/u-boot-rockchip-buildroot/rv1103-rv1106-sysboot-extlinux.patch renamed to patch/u-boot/legacy/u-boot-rockchip-buildroot/rv1103-rv1106-bootscr.patch

@@ -2,29 +2,35 @@ diff --git a/include/configs/rv1103b_common.h b/include/configs/rv1103b_common.h
 index f30d0197e0..5b22db2e42 100644
 --- a/include/configs/rv1103b_common.h
 +++ b/include/configs/rv1103b_common.h
-@@ -78,8 +78,8 @@
+@@ -78,8 +78,11 @@
  	"boot_fit;"
  #else
  #define RKIMG_BOOTCOMMAND		\
 -	"boot_fit;"			\
 -	"boot_android ${devtype} ${devnum};"
++	"setenv devtype mmc;"	\
++	"setenv devnum 1;"	\
++	"setenv prefix /boot/;"	\
 +	"setenv bootargs;"	\
-+	"sysboot mmc 1:1 any ${scriptaddr} /boot/extlinux/extlinux.conf;"
++	"load ${devtype} ${devnum} ${scriptaddr} ${prefix}boot.scr && source ${scriptaddr};"
  #endif
 
  /* Update define for tiny image */
 diff --git a/include/configs/rv1106_common.h b/include/configs/rv1106_common.h
 index d6912a88ba..b5378106e6 100644
 --- a/include/configs/rv1106_common.h
 +++ b/include/configs/rv1106_common.h
-@@ -88,8 +88,8 @@
+@@ -88,8 +88,11 @@
  	"boot_fit;"
  #else
  #define RKIMG_BOOTCOMMAND		\
 -	"boot_fit;"			\
 -	"boot_android ${devtype} ${devnum};"
++	"setenv devtype mmc;"	\
++	"setenv devnum 1;"	\
++	"setenv prefix /boot/;"	\
 +	"setenv bootargs;"	\
-+	"sysboot mmc 1:1 any ${scriptaddr} /boot/extlinux/extlinux.conf;"
++	"load ${devtype} ${devnum} ${scriptaddr} ${prefix}boot.scr && source ${scriptaddr};"
  #endif
 
  /* Update define for tiny image */

patch/u-boot/legacy/u-boot-rockchip-buildroot/rv1103-rv1106-mem_layout.patch

@@ -25,7 +25,7 @@ index f6ee6f88dc..f30d0197e0 100644
 +	"ramdisk_addr_r=0x02400000\0"	\
 +	"fdt_high=0x03900000\0"	\
 +	"initrd_high=0x03900000\0"	\
-+	"load_addr=0x02000000\0"
++	"load_addr=0x02080000\0"
  #endif
 
  #define CONFIG_EXTRA_ENV_SETTINGS	\
@@ -56,7 +56,7 @@ index dc927a8f36..d6912a88ba 100644
 +	"ramdisk_addr_r=0x02400000\0"	\
 +	"fdt_high=0x03900000\0"	\
 +	"initrd_high=0x03900000\0"	\
-+	"load_addr=0x02000000\0"
++	"load_addr=0x02080000\0"
  #endif
 
  #define CONFIG_EXTRA_ENV_SETTINGS	\