diff --git a/config/bootscripts/boot-mvebu.cmd b/config/bootscripts/boot-mvebu.cmd
index 9b9b1fd543..8a83e66283 100644
--- a/config/bootscripts/boot-mvebu.cmd
+++ b/config/bootscripts/boot-mvebu.cmd
@@ -3,187 +3,540 @@
 # Please edit /boot/armbianEnv.txt to set supported parameters
 #
 
+# NOTE
+# If you intend to use 'outside' of 'global' variables from U-Boot, make sure that you do not change them!
+# The boot logic will attempt a list of 'boot_targets' that all might rely on (environment) variables that
+# have been set by U-Boot, either compile-time or as part of U-Boot's default 'bootcmd'.
+# Any variable that this bootscript uses needs to be set explicitly and not conflict with any pre-set variables.
+# Variables that we might change will be saved in preset_x and variables we use will be copied into l_x.
+
+# default environment variables
+setenv align_overlap_oboe_avoidance "on"
+setenv align_to "0x00001000"
+setenv console "both"
+setenv docker_optimizations "on"
+setenv earlycon "off"
+setenv emmc_fix "off"
+setenv eth1addr "00:50:43:25:fb:84"
+setenv eth2addr "00:50:43:84:25:2f"
+setenv eth3addr "00:50:43:0d:19:18"
+setenv ethaddr "00:50:43:84:fb:2f"
+setenv exit_on_critical_errors "on"
+setenv fdt_extrasize "0x00010000"
+setenv kver
+setenv load_addr_calc
+setenv overlay_error "false"
+setenv preset_fdtdir "${fdtdir}"
+setenv preset_fdtfile "${fdtfile}"
+setenv preset_kernel_comp_addr_r "${kernel_comp_addr_r}"
+setenv preset_kernel_comp_size "${kernel_comp_size}"
+setenv rootdev "/dev/mmcblk${devnum}p${distro_bootpart}"
+setenv rootfstype "ext4"
+setenv spi_workaround "off"
+setenv vendor "marvell"
+setenv verbosity "1"
+
+# load addresses
 setenv load_addr "0x00300000"
 setenv fdt_addr_r "0x02040000" # max size 256 KiB (=dtb+dto+fdt_extrasize)
 setenv kernel_addr_r "0x02080000" # max size 16 MiB
 setenv ramdisk_addr_r "0x03080000"
 
-# default values
-setenv overlay_error "false"
-setenv rootdev "/dev/mmcblk0p1"
-setenv rootfstype "ext4"
-setenv verbosity "1"
-setenv emmc_fix "off"
-setenv spi_workaround "off"
-setenv ethaddr "00:50:43:84:fb:2f"
-setenv eth1addr "00:50:43:25:fb:84"
-setenv eth2addr "00:50:43:84:25:2f"
-setenv eth3addr "00:50:43:0d:19:18"
-setenv exit_on_critical_errors "on"
-setenv fdt_extrasize "0x00010000"
-setenv align_to "0x00001000"
-setenv align_overlap_oboe_avoidance "on"
-setenv align_addr_next 'if test "${align_overlap_oboe_avoidance}" = "on" ; then setexpr addr_next ${addr_next} + 1 ; fi ; setexpr modulo ${addr_next} % ${align_to} ; if itest ${modulo} -gt 0 ; then setexpr addr_next ${addr_next} / ${align_to} ; setexpr addr_next ${addr_next} + 1 ; setexpr addr_next ${addr_next} * ${align_to} ; fi'
-
-if setexpr setexpr 1 + 1 ; then
-	setenv setexpr "available"
-else
-	echo "** Command `setexpr` not available - using configured load addresses"
-fi
-
-echo "Boot script loaded from ${devtype}"
-
-setenv something "environment ${prefix}armbianEnv.txt from ${devtype} to ${load_addr}"
-echo "Loading ${something} ..."
-if load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt; then
-	env import -t ${load_addr} ${filesize}
-else
-	echo "** Could not load ${something} - using default environment"
-fi
-
-setenv bootargs "console=ttyS0,115200 root=${rootdev} rootwait rootfstype=${rootfstype} ubootdev=${devtype} scandelay loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
-
-setenv something "DT ${prefix}dtb/${fdtfile} from ${devtype} to ${fdt_addr_r}"
-echo "Loading ${something} ..."
-if load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} ; then
-else
-	echo "!! CRITICAL - Could not load ${something}"
+# environment run variables
+setenv func_align_addr_next '
+	test "${align_overlap_oboe_avoidance}" = "on" && setexpr l_addr_next ${l_addr_next} + 1 ;
+	setexpr modulo ${l_addr_next} % ${align_to} ;
+	if itest ${modulo} -gt 0 ; then
+		setexpr l_addr_next ${l_addr_next} / ${align_to} ;
+		setexpr l_addr_next ${l_addr_next} + 1 ;
+		setexpr l_addr_next ${l_addr_next} * ${align_to} ;
+	fi'
+setenv func_inform 'test "${verbosity}" = "" || itest ${verbosity} -gt 0 && echo "${l_message}"'
+setenv func_warn 'echo "** WARNING: ${l_message}"'
+setenv func_critical_error '
+	echo "!! CRITICAL: ${l_message}" ;
+	sleep 10 ;
 	if test "${exit_on_critical_errors}" = "on" ; then
-		exit
+		false ;
+	else ;
+		true ;
+	fi'
+
+# set some defaults in case there are no pre-sets
+if test "${envfile}" = "" ; then
+	setenv l_envfile 'armbianEnv.txt'
+else
+	setenv l_envfile "${envfile}"
+fi
+
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}."
+
+# load (merge) on-disk environment
+setenv l_file "${prefix}${l_envfile}"
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${l_file} ; then
+		if env import -t ${load_addr} ${filesize} ; then
+			setenv l_message "Loaded/imported environment ${l_file} to/from ${load_addr}."
+			run func_inform
+		else
+			setenv l_message "Could not import environment ${l_file} - using default environment!"
+			run func_warn
+		fi
+	else
+		setenv l_message "Could not load environment ${l_file} - using default environment!"
+		run func_warn
 	fi
 fi
 
-setenv fdt_filesize ${filesize}
-fdt addr ${fdt_addr_r}
-fdt resize ${fdt_extrasize}
+# compose kernel commandline options (bootargs)
+setenv consoleargs
+if test "${console}" = "display" || test "${console}" = "both" ; then
+	setenv consoleargs "console=tty1"
+fi
+if test "${console}" = "serial" || test "${console}" = "both" ; then
+	setenv consoleargs "console=ttyS0,115200 ${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
 
-for overlay_file in ${overlays}; do
-	setenv something "kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo from ${devtype} to ${load_addr}"
-	echo "Loading ${something} ..."
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
-		fdt apply ${load_addr} || setenv overlay_error "true"
-	else
-		echo "** Could not load ${something}"
+part uuid ${devtype} ${devnum}:${distro_bootpart} l_ubootpart
+
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${l_ubootpart} 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
+
+if test "${vendor}" = "allwinner" ; then
+	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
-done
+fi
+if test "${vendor}" = "marvell" ; then
+	# nothing here yet
+fi
+if test "${vendor}" = "rockchip" ; then
+	# nothing here yet
+fi
 
-for overlay_file in ${user_overlays}; do
-	setenv something "user provided DT overlay ${overlay_file}.dtbo from ${devtype} to ${load_addr}"
-	echo "Loading ${something}"
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
-		fdt apply ${load_addr} || setenv overlay_error "true"
+# check if we are requested (or are able to) use load address calculation
+if test "${load_addr_calc}" = "" ; then
+	if setexpr load_addr_calc 1 + 1 ; then
+		setenv load_addr_calc 'on'
 	else
-		echo "** Could not load ${something}"
+		setenv load_addr_calc 'off'
 	fi
-done
+fi
+if test "${load_addr_calc}" != "on" ; then
+	setenv load_addr_calc 'off'
 
-if test "${overlay_error}" = "true"; then
-	echo "** Error applying DT overlays"
-	setenv something "original DT ${prefix}dtb/${fdtfile} from ${devtype} to ${fdt_addr_r}"
-	echo "Restoring ${something} ..."
-	if load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} ; then
+	setenv l_message "Using fixed load addresses."
+	run func_inform
+	setenv l_message "  fdt_addr_r:     ${fdt_addr_r}"
+	run func_inform
+	setenv l_message "  kernel_addr_r:  ${kernel_addr_r}"
+	run func_inform
+	setenv l_message "  ramdisk_addr_r: ${ramdisk_addr_r}"
+	run func_inform
+fi
+
+if test "${kver}" != "" ; then
+	setenv l_message "Using version override ${kver} for image loading."
+	run func_inform
+fi
+
+# set a default kernel image type in case 'setexpr' not available
+if test "${cpu}" = "armv8" ; then
+	# aarch64 uses a flat kernel image
+	setenv l_kernel_image_type "flat"
+	setenv l_bootfile "Image${kver}"
+else
+	if test "${cpu}" = "armv7" ; then
+		# aarch32 mostly uses compressed kernel image
+		setenv l_kernel_image_type "compressed"
+		setenv l_bootfile "zImage${kver}"
+	else
+		# per default use compressed kernel image
+		setenv l_kernel_image_type "compressed"
+		setenv l_bootfile "zImage${kver}"
+	fi
+fi
+
+setenv l_ramdiskfile "uInitrd${kver}"
+
+# $fdtdir:
+#   some boards use "${prefix}dtb/" others use "${prefix}dtb/${vendor}/" as base location for the DT files
+#   user can also override by specifying an fdtdir=... in armbianEnv.txt
+#   try any U-Boot built-in (or pre-set) fdtdir as last resort
+# $fdtfile:
+#   some boards use a "filename.dts" others use "${vendor}/filename.dts"
+#   user can also override by specifying an fdtfile=... in armbianEnv.txt
+#   strip any leading path components and try any U-Boot built-in (or pre-set) fdtfile as last resort
+
+setenv l_fdtfile_basename
+setexpr l_fdtfile_basename sub ".*/" "" "${fdtfile}"
+if test "${l_fdtfile_basename}" = "" ; then
+	setenv l_fdtfile_basename "${fdtfile}"
+fi
+
+setenv l_fdtdir "${fdtdir}"
+setenv l_fdtfile "${l_fdtfile_basename}"
+if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+	true
+else
+	setenv l_fdtdir "${prefix}dtb${kver}/${vendor}"
+	setenv l_fdtfile "${l_fdtfile_basename}"
+	if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+		true
+	else
+		setenv l_fdtdir "${prefix}dtb${kver}"
+		setenv l_fdtfile "${l_fdtfile_basename}"
+		if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+			true
+		else
+			setenv l_fdtdir "${fdtdir}"
+			setenv l_fdtfile "${fdtfile}"
+			if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+				true
+			else
+				setenv l_fdtdir "${preset_fdtdir}"
+				setenv l_fdtfile "${preset_fdtfile}"
+				if test -e ${devtype} ${devnum}:${distro_bootpart} "${l_fdtdir}/${l_fdtfile}" ; then
+					true
+				else
+					false
+				fi
+			fi
+		fi
+	fi
+fi
+if itest $? -ne 0 ; then
+	setenv l_message "Cannot find DT!"
+	run func_critical_error || exit
+fi
+
+# load the device tree blob
+setenv l_file "${l_fdtdir}/${l_fdtfile}"
+if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${l_file} ; then
+	setenv l_message "Loaded DT ${l_file} to ${fdt_addr_r}."
+	run func_inform
+
+	setenv l_fdt_filesize ${filesize}
+	fdt addr ${fdt_addr_r}
+	fdt resize ${fdt_extrasize}
+else
+	setenv l_message "Could not load DT ${l_file}!"
+	run func_critical_error || exit
+fi
+
+# process "overlays=..." from $l_envfile
+if test "${overlays}" != "" ; then
+	setenv l_message "Loading kernel provided DT overlay(s) from ${l_fdtdir}/overlay to ${load_addr} .."
+	run func_inform
+
+	# as some families offer overlays with different (or no) prefixes, try to guess the most commonly seen ones
+	# just changing overlay_prefix= will not work for all available overlays, as some have prefixes and some do not
+
+	setenv each_overlay
+	for each_overlay in ${overlays} ; do
+		setenv l_overlay_prefix "${overlay_prefix}"
+		setenv l_file "${l_fdtdir}/overlay/${l_overlay_prefix}-${each_overlay}.dtbo"
+		if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+			true
+		else
+			setenv l_overlay_prefix "${vendor}"
+			setenv l_file "${l_fdtdir}/overlay/${l_overlay_prefix}-${each_overlay}.dtbo"
+			if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+				setenv l_message "Found DT overlay ${l_overlay_prefix}-${each_overlay} instead of ${overlay_prefix}-${each_overlay} in ${l_fdtdir}/overlay!"
+				run func_warn
+				setenv l_message "Consider setting overlay_prefix=${l_overlay_prefix} in your ${l_envfile}."
+				run func_inform
+				true
+			else
+				setenv l_overlay_prefix "${vendor}-${soc}"
+				setenv l_file "${l_fdtdir}/overlay/${l_overlay_prefix}-${each_overlay}.dtbo"
+				if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+					setenv l_message "Found DT overlay ${l_overlay_prefix}-${each_overlay} instead of ${overlay_prefix}-${each_overlay} in ${l_fdtdir}/overlay!"
+					run func_warn
+					setenv l_message "Consider setting overlay_prefix=${l_overlay_prefix} in your ${l_envfile}."
+					run func_inform
+					true
+				else
+					false
+				fi
+			fi
+		fi
+		if itest $? -eq 0 ; then
+			if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${l_file} ; then
+				if fdt apply ${load_addr} ; then
+					setenv l_message "Applied DT overlay ${each_overlay} (${l_file})."
+					run func_inform
+				else
+					setenv overlay_error "true"
+					setenv l_message "Could NOT apply DT overlay ${each_overlay} (${l_file})!"
+					run func_warn
+				fi
+			else
+				setenv l_message "Could NOT load DT overlay ${each_overlay} (${l_file})!"
+				run func_warn
+			fi
+		else
+			setenv l_message "Could NOT find DT overlay ${each_overlay}!"
+			run func_warn
+		fi
+	done
+fi
+
+# process "user_overlays=..." from $l_envfile
+if test "${user_overlays}" != "" ; then
+	setenv l_message "Loading user provided DT overlay(s) from ${prefix}overlay-user to ${load_addr} .."
+	run func_inform
+
+	setenv each_user_overlay
+	for each_user_overlay in ${user_overlays} ; do
+		setenv l_file "${prefix}overlay-user/${each_user_overlay}.dtbo"
+		if test -e ${devtype} ${devnum}:${distro_bootpart} ${l_file} ; then
+			if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${l_file} ; then
+				if fdt apply ${load_addr} ; then
+					setenv l_message "Applied user DT overlay ${each_user_overlay} (${l_file})."
+					run func_inform
+				else
+					setenv overlay_error "true"
+					setenv l_message "Could NOT apply user DT overlay ${each_user_overlay} (${l_file})!"
+					run func_warn
+				fi
+			else
+				setenv l_message "Could NOT load user DT overlay ${each_user_overlay} (${l_file})!"
+				run func_warn
+			fi
+		else
+			setenv l_message "Could NOT find user DT overlay ${each_user_overlay} (${l_file})!"
+			run func_warn
+		fi
+	done
+fi
+if test "${overlay_error}" = "true" ; then
+	setenv l_message "Could not apply DT overlays!"
+	run func_warn
+
+	setenv l_file "${l_fdtdir}/${l_fdtfile}"
+	if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${l_file} ; then
+		setenv l_message "Loaded original DT ${l_file} to ${fdt_addr_r}."
+		run func_inform
+
+		setenv l_fdt_filesize ${filesize}
 		fdt addr ${fdt_addr_r}
 		fdt resize ${fdt_extrasize}
 	else
-		echo "!! CRITICAL - Could not restore ${something}"
-		if test "${exit_on_critical_errors}" = "on" ; then
-			exit
-		fi
+		setenv l_message "Could not load original DT ${l_file}!"
+		run func_critical_error || exit
 	fi
 else
-	if test -e ${devtype} ${devnum} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr; then
-		setenv something "kernel provided DT fixup script (${overlay_prefix}-fixup.scr) from ${devtype} to ${load_addr}"
-		echo "Loading ${something} ..."
-		if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr ; then
-			source ${load_addr}
-		else
-			echo "** Could not load ${something}"
+	# process any available DT fixup scripts
+	setenv l_fixup_scripts "${prefix}fixup.scr"
+	if test "${overlay_prefix}" != "" ; then
+		setenv l_fixup_scripts "${l_fdtdir}/overlay/${overlay_prefix}-fixup.scr ${l_fixup_scripts}"
+	fi
+	if test "${vendor}" != "" ; then
+		if test "${vendor}" != "${overlay_prefix}" ; then
+			setenv l_fixup_scripts "${l_fdtdir}/overlay/${vendor}-fixup.scr ${l_fixup_scripts}"
 		fi
 	fi
-	if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
-		setenv something "user provided fixup script (fixup.scr) from ${devtype} to ${load_addr}"
-		echo "Loading ${something} ..."
-		if load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr ; then
-			source ${load_addr}
-		else
-			echo "** Could not load ${something}"
+
+	setenv each_fixup_script
+	for each_fixup_script in ${l_fixup_scripts} ; do
+		if test -e ${devtype} ${devnum}:${distro_bootpart} ${each_fixup_script} ; then
+			if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${each_fixup_script} ; then
+				if source ${load_addr} ; then
+					setenv l_message "Loaded/sourced fixup script ${each_fixup_script} to/at ${load_addr}."
+					run func_inform
+				else
+					setenv l_message "Fixup script ${each_fixup_script} returned an error!"
+					run func_warn
+				fi
+			else
+				setenv l_message "Could not load fixup script ${each_fixup_script}!"
+				run func_warn
+			fi
 		fi
-	fi
+	done
 fi
 
 # eMMC fix
 if test "${emmc_fix}" = "on"; then
-	echo "Applying eMMC compatibility fix to the DT"
+	echo "Applying eMMC compatibility fix to the DT."
 	fdt rm /soc/internal-regs/sdhci@d8000/ cd-gpios
 	fdt set /soc/internal-regs/sdhci@d8000/ non-removable
 fi
 
 # SPI - SATA workaround
 if test "${spi_workaround}" = "on"; then
-	echo "Applying SPI workaround to the DT"
+	echo "Applying SPI workaround to the DT."
 	fdt set /soc/internal-regs/sata@e0000 status "disabled"
 	fdt set /soc/internal-regs/sata@a8000 status "disabled"
 	fdt set /soc/spi@10680 status "okay"
 	fdt set /soc/spi@10680/spi-flash@0 status "okay"
 fi
 
-echo "Trimming DT ..."
+# resize (trim) device tree after all overlays have been applied and fixup scripts have been run
 fdt resize
 
-if test "${setexpr}" = "available" ; then
-	fdt header get fdt_totalsize totalsize
-	if test "${fdt_totalsize}" = "" ; then
-		echo "** Command `fdt header` does not support `get <var> <member>` - calculating DT size"
+# determine the load address for the kernel image
+if test "${load_addr_calc}" = "on" ; then
+	# get the total size of the DT
+	setenv l_fdt_totalsize
+	fdt header get l_fdt_totalsize totalsize
+
+	if test "${l_fdt_totalsize}" = "" ; then
+		# could not get the total size of the DT so calculate it instead
+		setenv l_message "Calculating DT size."
+		run func_inform
 
 		# 'fdt resize' will align upwards to 4k address boundary
-		setexpr fdt_totalsize ${fdt_filesize} / 0x1000
-		setexpr fdt_totalsize ${fdt_totalsize} + 1
-		setexpr fdt_totalsize ${fdt_totalsize} * 0x1000
+		setexpr l_fdt_totalsize ${l_fdt_filesize} / 0x1000
+		setexpr l_fdt_totalsize ${l_fdt_totalsize} + 1
+		setexpr l_fdt_totalsize ${l_fdt_totalsize} * 0x1000
 		if test "${fdt_extrasize}" != "" ; then
-			# add 'extrasize' before aligning
-			setexpr fdt_totalsize ${fdt_totalsize} + ${fdt_extrasize}
+			setexpr l_fdt_totalsize ${l_fdt_totalsize} + ${fdt_extrasize}
 		fi
 	fi
-	setexpr addr_next ${fdt_addr_r} + ${fdt_totalsize}
-	run align_addr_next
-	setenv kernel_addr_r ${addr_next}
+
+	setexpr l_addr_next ${fdt_addr_r} + ${l_fdt_totalsize}
+	run func_align_addr_next
+
+	setenv l_kernel_addr_r ${l_addr_next}
+else
+	setenv l_kernel_addr_r ${kernel_addr_r}
 fi
 
-setenv something "kernel ${prefix}zImage from ${devtype} to ${kernel_addr_r}"
-echo "Loading ${something} ..."
-if load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage ; then
+setenv l_file "${prefix}${l_bootfile}"
+if load ${devtype} ${devnum}:${distro_bootpart} ${l_kernel_addr_r} ${l_file} ; then
+	if test "${load_addr_calc}" = "on" ; then
+		setenv kernel_comp_size ${filesize}
+	fi
+
+	setenv l_message "Loaded ${l_kernel_image_type} kernel image ${l_file} to ${l_kernel_addr_r}."
+	run func_inform
 else
-	echo "!! CRITICAL - Could not load ${something}"
-	if test "${exit_on_critical_errors}" = "on" ; then
-		exit
+	if test "${load_addr_calc}" = "on" ; then
+		setenv kernel_comp_addr_r "${preset_kernel_comp_addr_r}"
+		setenv kernel_comp_size "${preset_kernel_comp_size}"
+	fi
+	setenv l_message "Could not load ${l_kernel_image_type} kernel image ${l_file}!"
+	run func_critical_error || exit
+fi
+
+# determine the load address for the initial ramdisk
+if test "${load_addr_calc}" = "on" ; then
+	# vmlinux image + 0x38 contain magic (le-double) 'ARMd'
+	setexpr l_ptr ${l_kernel_addr_r} + 0x00000038
+	setexpr.w l_magic_lsw *${l_ptr}
+
+	setexpr l_ptr ${l_kernel_addr_r} + 0x0000003a
+	setexpr.w l_magic_msw *${l_ptr}
+
+	if test "${l_magic_msw}${l_magic_lsw}" != "" && itest "${l_magic_msw}${l_magic_lsw}" -eq 0x644d5241 ; then
+		setenv l_kernel_image_type "flat"
+	else
+		setenv l_kernel_image_type "compressed"
+	fi
+
+	if test "${l_kernel_image_type}" = "flat" ; then
+		# vmlinux image + 0x10 contains image_size
+		setexpr l_ptr ${l_kernel_addr_r} + 0x00000010
+		setexpr.l l_image_size *${l_ptr}
+
+		setenv l_message "Using ${l_kernel_image_type} kernel image image_size 0x${l_image_size} bytes to calculate initial ramdisk load address."
+		run func_inform
+
+		# vmlinux image + 0x08 contains text_offset
+		setexpr l_ptr ${l_kernel_addr_r} + 0x00000008
+		setexpr.l l_text_offset *${l_ptr}
+
+		setenv l_message "Using ${l_kernel_image_type} kernel image text_offset 0x${l_text_offset} bytes to offset initial ramdisk load address."
+		run func_inform
+
+		setexpr l_addr_next ${l_kernel_addr_r} + ${l_image_size}
+		run func_align_addr_next
+
+		# take into account that U-Boot's booti_setup() might relocate the kernel image
+		setexpr l_addr_next ${l_addr_next} + ${l_text_offset}
+	else
+		setexpr l_addr_next ${l_kernel_addr_r} + ${filesize}
+		run func_align_addr_next
+
+		setenv l_message "Using ${l_kernel_image_type} kernel image filesize 0x${filesize} bytes to calculate initial ramdisk load address."
+		run func_inform
+	fi
+
+	setenv l_ramdisk_addr_r ${l_addr_next}
+else
+	setenv l_ramdisk_addr_r ${ramdisk_addr_r}
+fi
+
+setenv l_file "${prefix}${l_ramdiskfile}"
+if load ${devtype} ${devnum}:${distro_bootpart} ${l_ramdisk_addr_r} ${l_file} ; then
+	if test "${load_addr_calc}" = "on" ; then
+		setexpr l_addr_next ${l_ramdisk_addr_r} + ${filesize}
+		run func_align_addr_next
+
+		setenv kernel_comp_addr_r ${l_addr_next}
+	fi
+
+	setenv l_message "Loaded initial ramdisk ${l_file} to ${l_ramdisk_addr_r}."
+	run func_inform
+else
+	if test "${load_addr_calc}" = "on" ; then
+		setenv kernel_comp_addr_r "${preset_kernel_comp_addr_r}"
+		setenv kernel_comp_size "${preset_kernel_comp_size}"
+	fi
+	setenv l_message "Could not load initial ramdisk ${l_file}!"
+	run func_critical_error || exit
+fi
+
+# attempt to prepare for kernel address space randomization
+if kaslrseed ; then
+else
+	setenv l_message "Not able to prepare for KASLR."
+	run func_inform
+fi
+
+setenv l_message "Kernel commandline arguments:"
+run func_inform
+
+setenv each_bootarg
+for each_bootarg in ${bootargs} ; do
+	setenv l_message "  ${each_bootarg}"
+	run func_inform
+done
+
+if test "${l_kernel_image_type}" = "flat" ; then
+	booti ${l_kernel_addr_r} ${l_ramdisk_addr_r} ${fdt_addr_r}
+else
+	if test "${l_kernel_image_type}" = "compressed" ; then
+		bootz ${l_kernel_addr_r} ${l_ramdisk_addr_r} ${fdt_addr_r}
+	else
+		# default booting command
+		bootz ${l_kernel_addr_r} ${l_ramdisk_addr_r} ${fdt_addr_r}
 	fi
 fi
 
-if test "${setexpr}" = "available" ; then
-	setexpr addr_next ${kernel_addr_r} + ${filesize}
-	run align_addr_next
-	setenv ramdisk_addr_r ${addr_next}
+# booting failed, restore environment variables that are not unique
+# to this bootmeth
+if test "${load_addr_calc}" = "on" ; then
+	# restore original presets
+	setenv kernel_comp_addr_r "${preset_kernel_comp_addr_r}"
+	setenv kernel_comp_size "${preset_kernel_comp_size}"
 fi
 
-setenv something "initial ramdisk ${prefix}uInitrd from ${devtype} to ${ramdisk_addr_r}"
-echo "Loading ${something} ..."
-if load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd ; then
-else
-	echo "!! CRITICAL - Could not load ${something}"
-	if test "${exit_on_critical_errors}" = "on" ; then
-		exit
-	fi
-fi
-
-setenv something "kernel from ${kernel_addr_r}"
-echo "Booting ${something} ..."
-if bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} ; then
-else
-	echo "!! CRITICAL - Could not boot ${something}"
-	if test "${exit_on_critical_errors}" = "on" ; then
-		exit
-	fi
-fi
+setenv l_message "Could not boot kernel!"
+run func_critical_error || exit
 
 # Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr