From 946099f1bf9964d7def1befdc42ff801bbba1952 Mon Sep 17 00:00:00 2001 From: Aditya Prayoga Date: Thu, 13 Dec 2018 17:37:56 +0800 Subject: [PATCH] Sync with armbian patch --- ...mainline-armbian-boot-script-support.patch | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/docs/files/uboot/u-boot-mainline-armbian-boot-script-support.patch b/docs/files/uboot/u-boot-mainline-armbian-boot-script-support.patch index 3f38823..062e1f0 100644 --- a/docs/files/uboot/u-boot-mainline-armbian-boot-script-support.patch +++ b/docs/files/uboot/u-boot-mainline-armbian-boot-script-support.patch @@ -1,23 +1,38 @@ -From f25165a2bcac2ec1b33b541a04ece0eef420674a Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io> -References: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io> +From 61ddc75ecb082cba51fe7da4d0bc4c73c56abf38 Mon Sep 17 00:00:00 2001 +Message-Id: <61ddc75ecb082cba51fe7da4d0bc4c73c56abf38.1543232476.git.aditya@kobol.io> From: Aditya Prayoga -Date: Thu, 18 Oct 2018 13:40:13 +0800 -Subject: arm: mvebu: helios4: Add extra environment variable to - support Armbian +Date: Mon, 26 Nov 2018 19:07:49 +0800 +Subject: [PATCH] helios4: add boot-marvell.cmd backward compatibility -Armbian boot script use different env variable name to load armbianEnv.txt -and device tree +On system that still use boot.scr derived from boot-marvell.cmd, new +u-boot 2018 will failed load dtb and script due to missing some +variables. This will render the system unbootable. + +These changes added the missing variables. + +Signed-off-by: Aditya Prayoga --- - include/configs/helios4.h | 2 ++ - 1 file changed, 2 insertions(+) + include/config_distro_bootcmd.h | 1 + + include/configs/helios4.h | 2 ++ + 2 files changed, 3 insertions(+) +diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h +index 373fee7..f469b2d 100644 +--- a/include/config_distro_bootcmd.h ++++ b/include/config_distro_bootcmd.h +@@ -371,6 +371,7 @@ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ ++ "setenv boot_interface ${devtype};" \ + "source ${scriptaddr}\0" \ + \ + "scan_dev_for_scripts=" \ diff --git a/include/configs/helios4.h b/include/configs/helios4.h -index c289490..9a9bb4f 100644 +index 6943378..299c58d 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h -@@ -165,6 +165,8 @@ +@@ -185,6 +185,8 @@ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "console=ttyS0,115200\0" \