mirror of https://github.com/armbian/build.git
boards / Helios4: rebase previous u-boot patchset to v2025.10
This commit is contained in:
Tom Urlings
Rolf Leggewie
parent
81cd136e29
commit
0f8babdd78
|
|
@ -57,4 +57,3 @@ index 9c5fdecd93..e01e89ca05 100644
|
|||
#define TUNE_TRAINING_PARAMS_RTT_WR_1CS 0x0 /*off*/
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
|
|
@ -6,31 +6,40 @@ From: Aditya Prayoga <aditya@kobol.io>
|
|||
Date: Wed, 26 Jun 2019 10:48:38 +0800
|
||||
Subject: [PATCH 2/2] configs: Enable U-Boot RTC support on Helios4
|
||||
|
||||
2025-11-23: Tom Urlings: Reapplied build/patch/u-boot/legacy/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch
|
||||
|
||||
---
|
||||
configs/helios4_defconfig | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
|
||||
index 699ce06..0a1bb8e 100644
|
||||
index 3fb5f677ce8..f736c790e80 100644
|
||||
--- a/configs/helios4_defconfig
|
||||
+++ b/configs/helios4_defconfig
|
||||
@@ -27,6 +27,7 @@ CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_SF=y
|
||||
@@ -43,10 +43,11 @@ CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_PCI=y
|
||||
CONFIG_CMD_SPI=y
|
||||
CONFIG_CMD_USB=y
|
||||
+CONFIG_CMD_DATE=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TFTPPUT=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
@@ -54,6 +55,8 @@ CONFIG_PHY_GIGE=y
|
||||
CONFIG_CMD_TIME=y
|
||||
CONFIG_ENV_OVERWRITE=y
|
||||
CONFIG_ENV_MIN_ENTRIES=128
|
||||
@@ -70,10 +71,12 @@ CONFIG_PHY_GIGE=y
|
||||
CONFIG_MVNETA=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_SCSI=y
|
||||
CONFIG_MVMDIO=y
|
||||
CONFIG_PCI_MVEBU=y
|
||||
CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
|
||||
+CONFIG_DM_RTC=y
|
||||
+CONFIG_RTC_MVEBU=y
|
||||
CONFIG_DEBUG_UART_SHIFT=2
|
||||
CONFIG_SYS_NS16550=y
|
||||
CONFIG_KIRKWOOD_SPI=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@ 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
|
||||
|
|
@ -29,19 +24,6 @@ index 4993303f..97af842e 100644
|
|||
"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
|
||||
|
|
@ -57,4 +39,3 @@ index df4d8bcb..ef6c4ed6 100644
|
|||
#endif /* CONFIG_SPL_BUILD */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
|
|
@ -82,4 +82,3 @@ index 72c49beb71..f21a817444 100644
|
|||
clocks {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
|
|
@ -36,4 +36,3 @@ index ef6c4ed6..c523f6a7 100644
|
|||
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,31 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Urlings <tom.urlings@gmail.com>
|
||||
Date: Sun, 23 Nov 2025 07:06:18 +0000
|
||||
Subject: Patching u-boot mvebu files arch/arm/Kconfig
|
||||
|
||||
2025-11-23: Tom Urlings: Reapplied build/patch/u-boot/legacy/u-boot-helios4/enable-DT-overlays-support.patch
|
||||
|
||||
Signed-off-by: Tom Urlings <tom.urlings@gmail.com>
|
||||
---
|
||||
arch/arm/Kconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||
index 4a23e32..121f336 100644
|
||||
index 625d2e995d2..731002177a8 100644
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -440,6 +440,8 @@ config ARCH_MVEBU
|
||||
select DM_SPI_FLASH
|
||||
@@ -665,10 +665,12 @@ config ARCH_MVEBU
|
||||
select SPL_DM_SPI if SPL
|
||||
select SPL_DM_SPI_FLASH if SPL
|
||||
select SPL_TIMER if SPL
|
||||
select TIMER if !ARM64
|
||||
select OF_CONTROL
|
||||
select OF_SEPARATE
|
||||
+ select OF_LIBFDT
|
||||
+ select OF_LIBFDT_OVERLAY
|
||||
select SPI
|
||||
imply CMD_DM
|
||||
|
||||
config ARCH_ORION5X
|
||||
bool "Marvell Orion"
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
|
|
|||
|
|
@ -1,13 +1,28 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Urlings <tom.urlings@gmail.com>
|
||||
Date: Sun, 23 Nov 2025 07:20:54 +0000
|
||||
Subject: Enable command `setexpr`
|
||||
|
||||
Signed-off-by: Tom Urlings <tom.urlings@gmail.com>
|
||||
---
|
||||
configs/helios4_defconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
|
||||
index 0a1bb8e0362..c36ae95c336 100644
|
||||
index f736c790e80..2123ca638fe 100644
|
||||
--- a/configs/helios4_defconfig
|
||||
+++ b/configs/helios4_defconfig
|
||||
@@ -28,7 +28,7 @@ CONFIG_CMD_SF=y
|
||||
@@ -43,10 +43,11 @@ CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_PCI=y
|
||||
CONFIG_CMD_SPI=y
|
||||
CONFIG_CMD_USB=y
|
||||
CONFIG_CMD_DATE=y
|
||||
-# CONFIG_CMD_SETEXPR is not set
|
||||
+CONFIG_CMD_SETEXPR=y
|
||||
CONFIG_CMD_DATE=y
|
||||
CONFIG_CMD_TFTPPUT=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
CONFIG_CMD_TIME=y
|
||||
CONFIG_ENV_OVERWRITE=y
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
|
|
|||
|
|
@ -1,23 +1,43 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Urlings <tom.urlings@gmail.com>
|
||||
Date: Sun, 23 Nov 2025 07:38:40 +0000
|
||||
Subject: Patching u-boot mvebu files configs/helios4_defconfig
|
||||
|
||||
Re-applied build/patch/u-boot/legacy/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch
|
||||
|
||||
Signed-off-by: Tom Urlings <tom.urlings@gmail.com>
|
||||
---
|
||||
configs/helios4_defconfig | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
|
||||
index ddd075e..50bdc7e 100644
|
||||
index 2123ca638fe..a4418cbf1ba 100644
|
||||
--- a/configs/helios4_defconfig
|
||||
+++ b/configs/helios4_defconfig
|
||||
@@ -5,7 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
||||
@@ -7,11 +7,11 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
||||
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
||||
CONFIG_NR_DRAM_BANKS=2
|
||||
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
||||
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xff0000
|
||||
CONFIG_TARGET_HELIOS4=y
|
||||
-CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
|
||||
+CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y
|
||||
CONFIG_SPL_SERIAL_SUPPORT=y
|
||||
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
|
||||
CONFIG_SPL=y
|
||||
@@ -34,7 +34,8 @@ CONFIG_CMD_CACHE=y
|
||||
CONFIG_CMD_TIME=y
|
||||
# CONFIG_SPL_PARTITION_UUIDS is not set
|
||||
CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4"
|
||||
-CONFIG_ENV_IS_IN_MMC=y
|
||||
+# CONFIG_ENV_IS_IN_MMC is not set
|
||||
CONFIG_SPL_SERIAL=y
|
||||
CONFIG_SPL_STACK=0x4002c000
|
||||
CONFIG_SPL_TEXT_BASE=0x40000030
|
||||
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
|
||||
@@ -50,10 +50,11 @@ CONFIG_CMD_DATE=y
|
||||
CONFIG_CMD_TFTPPUT=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
CONFIG_CMD_TIME=y
|
||||
CONFIG_ENV_OVERWRITE=y
|
||||
CONFIG_ENV_MIN_ENTRIES=128
|
||||
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||||
CONFIG_ARP_TIMEOUT=200
|
||||
CONFIG_NET_RETRY_COUNT=50
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_SPL_OF_TRANSLATE=y
|
||||
CONFIG_SCSI_AHCI=y
|
||||
CONFIG_AHCI_GENERIC=y
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
|
|
|||
|
|
@ -1,15 +1,35 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Urlings <tom.urlings@gmail.com>
|
||||
Date: Sun, 23 Nov 2025 07:42:00 +0000
|
||||
Subject: Patching u-boot mvebu files include/configs/helios4.h
|
||||
|
||||
Re-applied build/patch/u-boot/legacy/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch
|
||||
|
||||
Signed-off-by: Tom Urlings <tom.urlings@gmail.com>
|
||||
---
|
||||
include/configs/helios4.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
|
||||
index 299c58d..7ccb9e0 100644
|
||||
index b0c23102c40..872b0c7717f 100644
|
||||
--- a/include/configs/helios4.h
|
||||
+++ b/include/configs/helios4.h
|
||||
@@ -159,9 +159,9 @@
|
||||
#endif
|
||||
|
||||
@@ -83,15 +83,15 @@
|
||||
/*
|
||||
* The SCSI buses are attempted in increasing bus order, there is no current
|
||||
* mechanism to alter the default bus priority order for booting.
|
||||
*/
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
- BOOT_TARGET_DEVICES_MMC(func) \
|
||||
BOOT_TARGET_DEVICES_USB(func) \
|
||||
BOOT_TARGET_DEVICES_SATA(func) \
|
||||
BOOT_TARGET_DEVICES_SCSI_BUS0(func) \
|
||||
BOOT_TARGET_DEVICES_SCSI_BUS1(func) \
|
||||
BOOT_TARGET_DEVICES_SCSI_BUS2(func) \
|
||||
+ BOOT_TARGET_DEVICES_MMC(func) \
|
||||
func(PXE, pxe, na) \
|
||||
func(DHCP, dhcp, na)
|
||||
|
||||
#define KERNEL_ADDR_R __stringify(0x2080000)
|
||||
#define FDT_ADDR_R __stringify(0x2040000)
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
|
|
|||
|
|
@ -1,53 +1,27 @@
|
|||
From bf63030982e9b2c555dab11b3f53bfd27a48f567 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <bf63030982e9b2c555dab11b3f53bfd27a48f567.1562323529.git.aditya@kobol.io>
|
||||
From: Aditya Prayoga <aditya@kobol.io>
|
||||
Date: Fri, 5 Jul 2019 18:45:05 +0800
|
||||
Subject: [PATCH] mvebu: helios4: Prepare for UART image
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Urlings <tom.urlings@gmail.com>
|
||||
Date: Sun, 23 Nov 2025 07:54:55 +0000
|
||||
Subject: Patching u-boot mvebu files board/kobol/helios4/helios4.c
|
||||
configs/helios4_defconfig
|
||||
|
||||
SPL failed to continue the booting process if ECC is enabled.
|
||||
So disable the ECC and while at it also disable env storage and
|
||||
autoboot.
|
||||
|
||||
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
|
||||
Signed-off-by: Tom Urlings <tom.urlings@gmail.com>
|
||||
---
|
||||
board/kobol/helios4/helios4.c | 2 +-
|
||||
configs/helios4_defconfig | 3 +--
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
|
||||
index 3c3592ecf5..780bef12a9 100644
|
||||
--- a/board/kobol/helios4/helios4.c
|
||||
+++ b/board/kobol/helios4/helios4.c
|
||||
@@ -66,7 +66,7 @@ static struct mv_ddr_topology_map board_topology_map = {
|
||||
0, 0, /* cas_wl cas_l */
|
||||
MV_DDR_TEMP_LOW, /* temperature */
|
||||
MV_DDR_TIM_DEFAULT} }, /* timing */
|
||||
- BUS_MASK_32BIT_ECC, /* Busses mask */
|
||||
+ BUS_MASK_32BIT, /* Busses mask */
|
||||
MV_DDR_CFG_DEFAULT, /* ddr configuration data source */
|
||||
{ {0} }, /* raw spd data */
|
||||
{0} /* timing parameters */
|
||||
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
|
||||
index 699ce0609f..3ccb613b8d 100644
|
||||
index 2123ca638fe..4e68c861b4f 100644
|
||||
--- a/configs/helios4_defconfig
|
||||
+++ b/configs/helios4_defconfig
|
||||
@@ -14,7 +14,7 @@ CONFIG_DEBUG_UART=y
|
||||
CONFIG_AHCI=y
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_NR_DRAM_BANKS=2
|
||||
-CONFIG_BOOTDELAY=3
|
||||
+CONFIG_BOOTDELAY=-1
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
@@ -33,7 +33,6 @@ CONFIG_CMD_CACHE=y
|
||||
@@ -50,10 +50,12 @@ CONFIG_CMD_DATE=y
|
||||
CONFIG_CMD_TFTPPUT=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
CONFIG_CMD_TIME=y
|
||||
# CONFIG_SPL_PARTITION_UUIDS is not set
|
||||
CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4"
|
||||
-CONFIG_ENV_IS_IN_MMC=y
|
||||
CONFIG_ENV_OVERWRITE=y
|
||||
CONFIG_ENV_MIN_ENTRIES=128
|
||||
+CONFIG_ENV_IS_IN_MMC=n
|
||||
+CONFIG_ENV_IS_IN_SPI=n
|
||||
CONFIG_ARP_TIMEOUT=200
|
||||
CONFIG_NET_RETRY_COUNT=50
|
||||
CONFIG_NET_RANDOM_ETHADDR=y
|
||||
CONFIG_SPL_OF_TRANSLATE=y
|
||||
CONFIG_SCSI_AHCI=y
|
||||
CONFIG_AHCI_GENERIC=y
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
|
|
|||
Loading…
Reference in New Issue