diff --git a/config/bootenv/pine64-default.txt b/config/bootenv/pine64-default.txt
new file mode 100644
index 0000000000..a73d7caa7f
--- /dev/null
+++ b/config/bootenv/pine64-default.txt
@@ -0,0 +1,3 @@
+verbosity=1
+console=both
+disp_mode=720p60
diff --git a/config/bootenv/pine64-next.txt b/config/bootenv/pine64-next.txt
new file mode 100644
index 0000000000..b9bafac335
--- /dev/null
+++ b/config/bootenv/pine64-next.txt
@@ -0,0 +1 @@
+verbosity=1
diff --git a/config/bootenv/sun8i-default.txt b/config/bootenv/sun8i-default.txt
new file mode 100644
index 0000000000..3edcfc6c4d
--- /dev/null
+++ b/config/bootenv/sun8i-default.txt
@@ -0,0 +1,4 @@
+verbosity=1
+console=both
+machid=1029
+bootm_boot_mode=sec
diff --git a/config/bootenv/sunxi-default.txt b/config/bootenv/sunxi-default.txt
new file mode 100644
index 0000000000..846dba9be8
--- /dev/null
+++ b/config/bootenv/sunxi-default.txt
@@ -0,0 +1,3 @@
+verbosity=1
+console=both
+disp_mode=1920x1080p60
diff --git a/config/bootscripts/boot-pine64-default.cmd b/config/bootscripts/boot-pine64-default.cmd
new file mode 100644
index 0000000000..71e5526d95
--- /dev/null
+++ b/config/bootscripts/boot-pine64-default.cmd
@@ -0,0 +1,65 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+# default values
+
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv disp_mem_reserves "off"
+setenv disp_mode "720p60"
+setenv rootfstype "ext4"
+
+if load mmc 0 ${load_addr} /boot/armbianEnv.txt || load mmc 0 ${load_addr} armbianEnv.txt; then
+	env import -t ${load_addr} ${filesize}
+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,115200n8"; fi
+
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} no_console_suspend earlycon=uart,mmio32,0x01c28000 mac_addr=${ethaddr} panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} ${extraargs} ${extraboardargs}"
+
+ext4load mmc 0 ${fdt_addr} /boot/${pine64_model}.dtb || fatload mmc 0 ${fdt_addr} ${pine64_model}.dtb || ext4load mmc 0 ${fdt_addr} ${pine64_model}.dtb
+ext4load mmc 0 ${initrd_addr} /boot/uInitrd || fatload mmc 0 ${initrd_addr} uInitrd || ext4load mmc 0 ${initrd_addr} uInitrd
+ext4load mmc 0 ${kernel_addr} /boot/Image || fatload mmc 0 ${kernel_addr} Image || ext4load mmc 0 ${kernel_addr} Image
+
+# set display resolution from uEnv.txt or other environment file
+# default to 720p60
+if test "${disp_mode}" = "480i"; then setenv fdt_disp_mode "<0x00000000>"
+elif test "${disp_mode}" = "576i"; then setenv fdt_disp_mode "<0x00000001>"
+elif test "${disp_mode}" = "480p"; then setenv fdt_disp_mode "<0x00000002>"
+elif test "${disp_mode}" = "576p"; then setenv fdt_disp_mode "<0x00000003>"
+elif test "${disp_mode}" = "720p50"; then setenv fdt_disp_mode "<0x00000004>"
+elif test "${disp_mode}" = "720p60"; then setenv fdt_disp_mode "<0x00000005>"
+elif test "${disp_mode}" = "1080i50"; then setenv fdt_disp_mode "<0x00000006>"
+elif test "${disp_mode}" = "1080i60"; then setenv fdt_disp_mode "<0x00000007>"
+elif test "${disp_mode}" = "1080p24"; then setenv fdt_disp_mode "<0x00000008>"
+elif test "${disp_mode}" = "1080p50"; then setenv fdt_disp_mode "<0x00000009>"
+elif test "${disp_mode}" = "1080p60"; then setenv fdt_disp_mode "<0x0000000a>"
+elif test "${disp_mode}" = "2160p30"; then setenv fdt_disp_mode "<0x0000001c>"
+elif test "${disp_mode}" = "2160p25"; then setenv fdt_disp_mode "<0x0000001d>"
+elif test "${disp_mode}" = "2160p24"; then setenv fdt_disp_mode "<0x0000001e>"
+else setenv fdt_disp_mode "<0x00000005>"
+fi
+
+fdt addr ${fdt_addr}
+fdt resize
+fdt set /soc@01c00000/disp@01000000 screen0_output_mode ${fdt_disp_mode}
+#fdt set /soc@01c00000/disp@01000000 screen1_output_mode ${fdt_disp_mode}
+
+# DVI compatibility
+if test ${disp_dvi_compat} = 1 || test ${disp_dvi_compat} = on; then
+	fdt set /soc@01c00000/hdmi@01ee0000 hdmi_hdcp_enable "<0x00000000>"
+	fdt set /soc@01c00000/hdmi@01ee0000 hdmi_cts_compatibility "<0x00000001>"
+fi
+
+if test "${disp_mem_reserves}" = "off"; then
+	# TODO: Remove reserved memory from DT or disable devices?
+fi
+
+booti ${kernel_addr} ${initrd_addr} ${fdt_addr}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
diff --git a/config/bootscripts/boot-pine64-next.cmd b/config/bootscripts/boot-pine64-next.cmd
new file mode 100644
index 0000000000..684fe12270
--- /dev/null
+++ b/config/bootscripts/boot-pine64-next.cmd
@@ -0,0 +1,26 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+# default values
+setenv load_addr "0x44000000"
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv rootfstype "ext4"
+
+if load mmc 0 ${load_addr} /boot/armbianEnv.txt || load mmc 0 ${load_addr} armbianEnv.txt; then
+	env import -t ${load_addr} ${filesize}
+fi
+
+# No display driver yet
+setenv consoleargs "console=ttyS0,115200"
+
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} ${extraargs} ${extraboardargs}"
+load mmc 0 ${fdt_addr_r} /boot/dtb/allwinner/${fdtfile} || load mmc 0 ${fdt_addr_r} /dtb/allwinner/${fdtfile}
+load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || load mmc 0 ${ramdisk_addr_r} uInitrd
+load mmc 0 ${kernel_addr_r} /boot/Image || load mmc 0 ${kernel_addr_r} Image
+booti ${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
diff --git a/config/bootscripts/boot-pine64.cmd b/config/bootscripts/boot-pine64.cmd
deleted file mode 100644
index 1e386c7da2..0000000000
--- a/config/bootscripts/boot-pine64.cmd
+++ /dev/null
@@ -1,50 +0,0 @@
-
-setenv rootdev "/dev/mmcblk0p1"
-
-if ext4load mmc 0 0x00000000 /boot/.next || fatload mmc 0 0x00000000 .next || ext4load mmc 0 0x00000000 .next; then
-	setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=ext4 panic=10 consoleblank=0 enforcing=0 loglevel=1"
-	load mmc 0 ${fdt_addr_r} /boot/dtb/allwinner/${fdtfile} || load mmc 0 ${fdt_addr_r} /dtb/allwinner/${fdtfile}
-	load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || load mmc 0 ${ramdisk_addr_r} uInitrd
-	load mmc 0 ${kernel_addr_r} /boot/Image || load mmc 0 ${kernel_addr_r} Image
-	booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
-else
-	setenv bootargs "console=ttyS0,115200n8 no_console_suspend earlycon=uart,mmio32,0x01c28000 mac_addr=${ethaddr} root=${rootdev} rootwait panic=10 consoleblank=0 enforcing=0 loglevel=2 ${extraargs}"
-	ext4load mmc 0 ${fdt_addr} /boot/${pine64_model}.dtb || fatload mmc 0 ${fdt_addr} ${pine64_model}.dtb || ext4load mmc 0 ${fdt_addr} ${pine64_model}.dtb
-	ext4load mmc 0 ${initrd_addr} /boot/uInitrd || fatload mmc 0 ${initrd_addr} uInitrd || ext4load mmc 0 ${initrd_addr} uInitrd || setenv initrd_addr "-"
-	ext4load mmc 0 ${kernel_addr} /boot/Image || fatload mmc 0 ${kernel_addr} Image || ext4load mmc 0 ${kernel_addr} Image
-
-	# set display resolution from uEnv.txt or other environment file
-	# default to 720p60
-	if test "${disp_mode}" = "480i"; then setenv fdt_disp_mode "<0x00000000>"
-	elif test "${disp_mode}" = "576i"; then setenv fdt_disp_mode "<0x00000001>"
-	elif test "${disp_mode}" = "480p"; then setenv fdt_disp_mode "<0x00000002>"
-	elif test "${disp_mode}" = "576p"; then setenv fdt_disp_mode "<0x00000003>"
-	elif test "${disp_mode}" = "720p50"; then setenv fdt_disp_mode "<0x00000004>"
-	elif test "${disp_mode}" = "720p60"; then setenv fdt_disp_mode "<0x00000005>"
-	elif test "${disp_mode}" = "1080i50"; then setenv fdt_disp_mode "<0x00000006>"
-	elif test "${disp_mode}" = "1080i60"; then setenv fdt_disp_mode "<0x00000007>"
-	elif test "${disp_mode}" = "1080p24"; then setenv fdt_disp_mode "<0x00000008>"
-	elif test "${disp_mode}" = "1080p50"; then setenv fdt_disp_mode "<0x00000009>"
-	elif test "${disp_mode}" = "1080p60"; then setenv fdt_disp_mode "<0x0000000a>"
-	elif test "${disp_mode}" = "2160p30"; then setenv fdt_disp_mode "<0x0000001c>"
-	elif test "${disp_mode}" = "2160p25"; then setenv fdt_disp_mode "<0x0000001d>"
-	elif test "${disp_mode}" = "2160p24"; then setenv fdt_disp_mode "<0x0000001e>"
-	else setenv fdt_disp_mode "<0x00000005>"
-	fi
-
-	fdt addr ${fdt_addr}
-	fdt resize
-	fdt set /soc@01c00000/disp@01000000 screen0_output_mode ${fdt_disp_mode}
-	#fdt set /soc@01c00000/disp@01000000 screen1_output_mode ${fdt_disp_mode}
-
-	# DVI compatibility
-	if test ${disp_dvi_compat} = 1 || test ${disp_dvi_compat} = on; then
-		fdt set /soc@01c00000/hdmi@01ee0000 hdmi_hdcp_enable "<0x00000000>"
-		fdt set /soc@01c00000/hdmi@01ee0000 hdmi_cts_compatibility "<0x00000001>"
-	fi
-
-	booti ${kernel_addr} ${initrd_addr} ${fdt_addr}
-fi
-
-# Recompile with:
-# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
diff --git a/config/bootscripts/boot-sunxi.cmd b/config/bootscripts/boot-sunxi.cmd
index 249c4f0dff..4a24fb4720 100644
--- a/config/bootscripts/boot-sunxi.cmd
+++ b/config/bootscripts/boot-sunxi.cmd
@@ -1,40 +1,38 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
 
+# default values
+setenv load_addr "0x44000000"
 setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv disp_mem_reserves "off"
+setenv disp_mode "1920x1080p60"
+setenv rootfstype "ext4"
 
-if ext4load mmc 0 0x00000000 /boot/.verbose
-then
-setenv verbosity 7
-else
-setenv verbosity 1
+if load mmc 0 ${load_addr} /boot/armbianEnv.txt || load mmc 0 ${load_addr} armbianEnv.txt; then
+	env import -t ${load_addr} ${filesize}
 fi
 
-# nonstandard monitor settings for A10, A20 and A31 based boards
-# screen is initialized before this script -> saving to u-boot environment is mandatory 
-#setenv video-mode sunxi:1024x768-24@60,monitor=dvi,hpd=0,edid=0,overscan_x=1,overscan_y=2
-#saveenv
-# nonstandard monitor settings
+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
 
-setenv bootargs "console=ttyS0,115200 console=tty1 root=${rootdev} rootwait rootfstype=ext4 cgroup_enable=memory swapaccount=1 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} storage_type=${storage_type} ${extraargs}"
-#--------------------------------------------------------------------------------------------------------------------------------
-# Boot loader script to boot with different boot methods for old and new kernel
-#--------------------------------------------------------------------------------------------------------------------------------
-if ext4load mmc 0 0x00000000 /boot/.next || fatload mmc 0 0x00000000 .next || ext4load mmc 0 0x00000000 .next
-then
-# sunxi mainline kernel
-#--------------------------------------------------------------------------------------------------------------------------------
-ext4load mmc 0 ${fdt_addr_r} /boot/dtb/${fdtfile} || fatload mmc 0 ${fdt_addr_r} /dtb/${fdtfile} || ext4load mmc 0 ${fdt_addr_r} /dtb/${fdtfile}
-ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
-ext4load mmc 0 ${kernel_addr_r} /boot/zImage || fatload mmc 0 ${kernel_addr_r} zImage || ext4load mmc 0 ${kernel_addr_r} zImage
-bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
-#--------------------------------------------------------------------------------------------------------------------------------
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} cgroup_enable=memory swapaccount=1 hdmi.audio=EDID:0 disp.screen0_output_mode=${disp_mode} panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} ${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
+
+load mmc 0:1 ${ramdisk_addr_r} /boot/uInitrd || load mmc 0 ${ramdisk_addr_r} uInitrd
+load mmc 0:1 ${kernel_addr_r} /boot/zImage || load mmc 0 ${kernel_addr_r} zImage
+
+if load mmc 0 0x00000000 /boot/.next || load mmc 0 0x00000000 .next; then
+	load mmc 0 ${fdt_addr_r} /boot/dtb/${fdtfile} || load mmc 0 ${fdt_addr_r} /dtb/${fdtfile}
+	bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
 else
-# sunxi android kernel
-#--------------------------------------------------------------------------------------------------------------------------------
-ext4load mmc 0 ${fdt_addr_r} /boot/script.bin || fatload mmc 0 ${fdt_addr_r} script.bin || ext4load mmc 0 ${fdt_addr_r} script.bin
-ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
-ext4load mmc 0 ${kernel_addr_r} /boot/zImage || fatload mmc 0 ${kernel_addr_r} zImage || ext4load mmc 0 ${kernel_addr_r} zImage
-bootz ${kernel_addr_r} ${ramdisk_addr_r}
-#--------------------------------------------------------------------------------------------------------------------------------
+	load mmc 0 ${fdt_addr_r} /boot/script.bin || load mmc 0 ${fdt_addr_r} script.bin
+	bootz ${kernel_addr_r} ${ramdisk_addr_r}
 fi
+
 # Recompile with:
-# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr 
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
diff --git a/config/sources/pine64.conf b/config/sources/pine64.conf
index 46e8855757..7edd231999 100644
--- a/config/sources/pine64.conf
+++ b/config/sources/pine64.conf
@@ -1,11 +1,14 @@
 
 BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-pine64-armbian.git'
 BOOTDIR='u-boot-pine64'
-BOOTSCRIPT="boot-pine64.cmd:boot.cmd"
+
+HAS_UUID_SUPPORT=yes
 
 case $BRANCH in
 	default)
 	BOOTBRANCH='branch:master'
+	BOOTSCRIPT='boot-pine64-default.cmd:boot.cmd'
+	BOOTENV_FILE='pine64-default.txt'
 	KERNELSOURCE='https://github.com/longsleep/linux-pine64.git'
 	KERNELBRANCH='branch:pine64-hacks-1.2'
 	KERNELDIR='linux-pine64'
@@ -17,6 +20,8 @@ case $BRANCH in
 
 	dev)
 	BOOTBRANCH='branch:next'
+	BOOTSCRIPT='boot-pine64-next.cmd:boot.cmd'
+	BOOTENV_FILE='pine64-next.txt'
 	KERNELSOURCE='https://github.com/apritzel/linux.git'
 	KERNELBRANCH='branch:a64-v5'
 	KERNELDIR='linux-pine64-dev'
diff --git a/config/sources/sun8i.conf b/config/sources/sun8i.conf
index d1aa824ad8..528c09625d 100644
--- a/config/sources/sun8i.conf
+++ b/config/sources/sun8i.conf
@@ -3,6 +3,8 @@ source "${BASH_SOURCE%/*}/sunxi_common.inc"
 
 case $BRANCH in
 	default)
+	BOOTENV_FILE='sun8i-default.txt'
+
 	KERNELSOURCE='https://github.com/igorpecovnik/linux'
 	KERNELBRANCH='branch:sun8i'
 	KERNELDIR='linux-sun8i'
@@ -40,8 +42,8 @@ family_tweaks()
 		echo "ttyGS0" >> $CACHEDIR/sdcard/etc/securetty
 	fi
 
-	if [[ $LINUXFAMILY == sun8i ]]; then
-		# u-boot default is nonsec. Legacy requires sec, mainline requires nonsec for SMP
+	# u-boot default is nonsec. Legacy requires sec, mainline requires nonsec for SMP
+	if [[ ! -f $CACHEDIR/sdcard/boot/armbianEnv.txt ]]; then
 		local boot_mode=nonsec
 		[[ $BRANCH == default ]] && boot_mode=sec
 		sed -i -e "1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode $boot_mode\n/" \
diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc
index 4aec60eb04..7155fd7fc2 100644
--- a/config/sources/sunxi_common.inc
+++ b/config/sources/sunxi_common.inc
@@ -3,6 +3,9 @@ BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 BOOTDIR=$MAINLINE_UBOOT_DIR
 BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
 BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
+BOOTENV_FILE='sunxi-default.txt'
+
+HAS_UUID_SUPPORT=yes
 
 case $BRANCH in
 	default)
diff --git a/desktop.sh b/desktop.sh
index 3a952cceec..f0b46f5c81 100644
--- a/desktop.sh
+++ b/desktop.sh
@@ -63,7 +63,7 @@ install_desktop ()
 	# Compile Turbo Frame buffer for sunxi
 	if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then
 
-		if [[ $RELEASE == jessie ]]; then
+		if [[ $RELEASE == jessie || $RELEASE == xenial ]]; then
 			# Disable compositing by default
 			sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $CACHEDIR/sdcard/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
 			sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $CACHEDIR/sdcard/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -83,8 +83,11 @@ install_desktop ()
 		EOF
 
 		# enable memory reservations
-		sed "s/sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16 //g" -i $CACHEDIR/sdcard/boot/boot.cmd
-		mkimage -C none -A arm -T script -d $CACHEDIR/sdcard/boot/boot.cmd $CACHEDIR/sdcard/boot/boot.scr >> /dev/null
+		if [[ -f $CACHEDIR/sdcard/boot/armbianEnv.txt ]]; then
+			echo "disp_mem_reserves=on" >> $CACHEDIR/sdcard/boot/armbianEnv.txt
+		else
+			sed "s/sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16 //g" -i $CACHEDIR/sdcard/boot/boot.cmd
+		fi
 	fi
 
 	umount $CACHEDIR/sdcard/tmp/bin && rm -rf $CACHEDIR/sdcard/tmp/bin
diff --git a/scripts/nand-sata-install/usr/lib/nand-sata-install/boot-sunxi.cmd b/scripts/nand-sata-install/usr/lib/nand-sata-install/boot-sunxi.cmd
new file mode 100644
index 0000000000..249c4f0dff
--- /dev/null
+++ b/scripts/nand-sata-install/usr/lib/nand-sata-install/boot-sunxi.cmd
@@ -0,0 +1,40 @@
+
+setenv rootdev "/dev/mmcblk0p1"
+
+if ext4load mmc 0 0x00000000 /boot/.verbose
+then
+setenv verbosity 7
+else
+setenv verbosity 1
+fi
+
+# nonstandard monitor settings for A10, A20 and A31 based boards
+# screen is initialized before this script -> saving to u-boot environment is mandatory 
+#setenv video-mode sunxi:1024x768-24@60,monitor=dvi,hpd=0,edid=0,overscan_x=1,overscan_y=2
+#saveenv
+# nonstandard monitor settings
+
+setenv bootargs "console=ttyS0,115200 console=tty1 root=${rootdev} rootwait rootfstype=ext4 cgroup_enable=memory swapaccount=1 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} storage_type=${storage_type} ${extraargs}"
+#--------------------------------------------------------------------------------------------------------------------------------
+# Boot loader script to boot with different boot methods for old and new kernel
+#--------------------------------------------------------------------------------------------------------------------------------
+if ext4load mmc 0 0x00000000 /boot/.next || fatload mmc 0 0x00000000 .next || ext4load mmc 0 0x00000000 .next
+then
+# sunxi mainline kernel
+#--------------------------------------------------------------------------------------------------------------------------------
+ext4load mmc 0 ${fdt_addr_r} /boot/dtb/${fdtfile} || fatload mmc 0 ${fdt_addr_r} /dtb/${fdtfile} || ext4load mmc 0 ${fdt_addr_r} /dtb/${fdtfile}
+ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
+ext4load mmc 0 ${kernel_addr_r} /boot/zImage || fatload mmc 0 ${kernel_addr_r} zImage || ext4load mmc 0 ${kernel_addr_r} zImage
+bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+#--------------------------------------------------------------------------------------------------------------------------------
+else
+# sunxi android kernel
+#--------------------------------------------------------------------------------------------------------------------------------
+ext4load mmc 0 ${fdt_addr_r} /boot/script.bin || fatload mmc 0 ${fdt_addr_r} script.bin || ext4load mmc 0 ${fdt_addr_r} script.bin
+ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
+ext4load mmc 0 ${kernel_addr_r} /boot/zImage || fatload mmc 0 ${kernel_addr_r} zImage || ext4load mmc 0 ${kernel_addr_r} zImage
+bootz ${kernel_addr_r} ${ramdisk_addr_r}
+#--------------------------------------------------------------------------------------------------------------------------------
+fi
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr