enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add boot-marvell.cmd backward compatibility

Browse Source 
The patches added missing variable that used on boot-marvell.cmd and
also adjust the some memory addresses to prevent crash due to usage of
fdt_high and initrd_high.

Signed-off-by: Aditya Prayoga <aditya@kobol.io>
This commit is contained in:
Aditya Prayoga 2019-06-26 15:11:05 +08:00
parent de4c82b688
commit cd2429c12d
4 changed files with 173 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
patch/u-boot/u-boot-mvebu-next/add-boot-marvell.cmd-backward-compatibility.patch Normal file
View File

@ -0,0 +1,60 @@
From 68876ccdd2fdb5bf450d9d546e18286b4508cf33 Mon Sep 17 00:00:00 2001
Message-Id: <68876ccdd2fdb5bf450d9d546e18286b4508cf33.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:42:30 +0800
Subject: [PATCH] mvebu: configs: add boot-marvell.cmd backward compatibility
On system that still use boot.scr derived from boot-marvell.cmd, new
u-boot 2018 will failed to 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 <aditya@kobol.io>
---
include/config_distro_bootcmd.h | 1 +
include/configs/clearfog.h | 2 ++
include/configs/helios4.h | 2 ++
3 files changed, 5 insertions(+)
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 4993303f..97af842e 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -411,6 +411,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/clearfog.h b/include/configs/clearfog.h
index c51cf284..bbbfff71 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -148,6 +148,8 @@
LOAD_ADDRESS_ENV_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
+ "loadaddr=0x02000000\0" \
+ "fdt_addr=" FDT_ADDR_R "\0" \
BOOTENV
#endif /* CONFIG_SPL_BUILD */
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index df4d8bcb..ef6c4ed6 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -174,6 +174,8 @@
LOAD_ADDRESS_ENV_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
+ "loadaddr=0x02000000\0" \
+ "fdt_addr=" FDT_ADDR_R "\0" \
BOOTENV
#endif /* CONFIG_SPL_BUILD */
--
2.17.1

37
patch/u-boot/u-boot-mvebu-next/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch Normal file
View File

@ -0,0 +1,37 @@
From 1e9b721fe025578f00b7150665909e74f4f9fe9d Mon Sep 17 00:00:00 2001
Message-Id: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:46:02 +0800
Subject: [PATCH 1/2] arm: mvebu: clearfog: Update Load address
Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/configs/clearfog.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index bbbfff71..5707ea24 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -128,11 +128,11 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-#define KERNEL_ADDR_R __stringify(0x800000)
-#define FDT_ADDR_R __stringify(0x100000)
-#define RAMDISK_ADDR_R __stringify(0x1800000)
-#define SCRIPT_ADDR_R __stringify(0x200000)
-#define PXEFILE_ADDR_R __stringify(0x300000)
+#define KERNEL_ADDR_R __stringify(0x2080000)
+#define FDT_ADDR_R __stringify(0x2040000)
+#define RAMDISK_ADDR_R __stringify(0x2880000)
+#define SCRIPT_ADDR_R __stringify(0x3000000)
+#define PXEFILE_ADDR_R __stringify(0x3100000)
#define LOAD_ADDRESS_ENV_SETTINGS \
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
--
2.17.1

37
patch/u-boot/u-boot-mvebu-next/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch Normal file
View File

@ -0,0 +1,37 @@
From 1e9b721fe025578f00b7150665909e74f4f9fe9d Mon Sep 17 00:00:00 2001
Message-Id: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:46:02 +0800
Subject: [PATCH 1/2] arm: mvebu: clearfog: Update Load address
Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/configs/clearfog.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index bbbfff71..5707ea24 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -128,11 +128,11 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-#define KERNEL_ADDR_R __stringify(0x800000)
-#define FDT_ADDR_R __stringify(0x100000)
-#define RAMDISK_ADDR_R __stringify(0x1800000)
-#define SCRIPT_ADDR_R __stringify(0x200000)
-#define PXEFILE_ADDR_R __stringify(0x300000)
+#define KERNEL_ADDR_R __stringify(0x2080000)
+#define FDT_ADDR_R __stringify(0x2040000)
+#define RAMDISK_ADDR_R __stringify(0x2880000)
+#define SCRIPT_ADDR_R __stringify(0x3000000)
+#define PXEFILE_ADDR_R __stringify(0x3100000)
#define LOAD_ADDRESS_ENV_SETTINGS \
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
--
2.17.1

39
patch/u-boot/u-boot-mvebu-next/board_helios4/arm-mvebu-helios4-Update-Load-address.patch Normal file
View File

@ -0,0 +1,39 @@
From 86c6ccfc00e36152348dc74f98915d12a4adcb47 Mon Sep 17 00:00:00 2001
Message-Id: <86c6ccfc00e36152348dc74f98915d12a4adcb47.1561531622.git.aditya@kobol.io>
In-Reply-To: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
References: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io>
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 26 Jun 2019 14:46:30 +0800
Subject: [PATCH 2/2] arm: mvebu: helios4: Update Load address
Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
include/configs/helios4.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index ef6c4ed6..c523f6a7 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -154,11 +154,11 @@
func(PXE, pxe, na) \
func(DHCP, dhcp, na)
-#define KERNEL_ADDR_R __stringify(0x800000)
-#define FDT_ADDR_R __stringify(0x100000)
-#define RAMDISK_ADDR_R __stringify(0x1800000)
-#define SCRIPT_ADDR_R __stringify(0x200000)
-#define PXEFILE_ADDR_R __stringify(0x300000)
+#define KERNEL_ADDR_R __stringify(0x2080000)
+#define FDT_ADDR_R __stringify(0x2040000)
+#define RAMDISK_ADDR_R __stringify(0x2880000)
+#define SCRIPT_ADDR_R __stringify(0x3000000)
+#define PXEFILE_ADDR_R __stringify(0x3100000)
#define LOAD_ADDRESS_ENV_SETTINGS \
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
--
2.17.1