From 81cd136e29711e562270d6a98fc3e545d1a6c143 Mon Sep 17 00:00:00 2001 From: Tom Urlings Date: Sun, 23 Nov 2025 21:22:44 +0800 Subject: [PATCH] boards / Helios4: reenable Armbian patchset --- config/sources/families/include/mvebu-helios4.inc | 2 +- .../board_helios4}/0001-ARMADA-A388-SOM-U-Boot-ODT-Update.patch | 0 .../board_helios4}/0002-Add-RTC-to-helios4.patch | 0 .../0003-add-boot-marvell.cmd-backward-compatibility.patch | 0 ...m-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch | 0 .../0005-arm-mvebu-helios4-Update-Load-address.patch | 0 .../board_helios4}/0006-enable-DT-overlays-support.patch | 0 .../0007-helios4_defconfig-0002-enable-setexpr-command.patch | 0 .../target_spi/0101-helios4-config-set-boot-device-spinor.patch | 0 .../target_spi/0102-helios4-reorder-boot-device.patch | 0 .../target_uart/0201-helios4-prepare-for-uart-image.patch | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0001-ARMADA-A388-SOM-U-Boot-ODT-Update.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0002-Add-RTC-to-helios4.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0003-add-boot-marvell.cmd-backward-compatibility.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0004-arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0005-arm-mvebu-helios4-Update-Load-address.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0006-enable-DT-overlays-support.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/0007-helios4_defconfig-0002-enable-setexpr-command.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/target_spi/0101-helios4-config-set-boot-device-spinor.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/target_spi/0102-helios4-reorder-boot-device.patch (100%) rename patch/u-boot/{legacy/u-boot-helios4 => v2025.10/board_helios4}/target_uart/0201-helios4-prepare-for-uart-image.patch (100%) diff --git a/config/sources/families/include/mvebu-helios4.inc b/config/sources/families/include/mvebu-helios4.inc index 1686e20241..f17cb04baa 100644 --- a/config/sources/families/include/mvebu-helios4.inc +++ b/config/sources/families/include/mvebu-helios4.inc @@ -13,7 +13,7 @@ case $BRANCH in BOOTSOURCE=$MAINLINE_UBOOT_SOURCE BOOTBRANCH='tag:v2025.10' BOOTDIR=$MAINLINE_UBOOT_DIR - #BOOTPATCHDIR='legacy/u-boot-helios4' + BOOTPATCHDIR="${BOOTBRANCH#tag:}/board_${BOARD:?}" BOOTSCRIPT='boot-mvebu.cmd:boot.cmd' UBOOT_TARGET_MAP=";sdhc;u-boot-with-spl.kwb:u-boot.mmc diff --git a/patch/u-boot/legacy/u-boot-helios4/0001-ARMADA-A388-SOM-U-Boot-ODT-Update.patch b/patch/u-boot/v2025.10/board_helios4/0001-ARMADA-A388-SOM-U-Boot-ODT-Update.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0001-ARMADA-A388-SOM-U-Boot-ODT-Update.patch rename to patch/u-boot/v2025.10/board_helios4/0001-ARMADA-A388-SOM-U-Boot-ODT-Update.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/0002-Add-RTC-to-helios4.patch b/patch/u-boot/v2025.10/board_helios4/0002-Add-RTC-to-helios4.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0002-Add-RTC-to-helios4.patch rename to patch/u-boot/v2025.10/board_helios4/0002-Add-RTC-to-helios4.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/0003-add-boot-marvell.cmd-backward-compatibility.patch b/patch/u-boot/v2025.10/board_helios4/0003-add-boot-marvell.cmd-backward-compatibility.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0003-add-boot-marvell.cmd-backward-compatibility.patch rename to patch/u-boot/v2025.10/board_helios4/0003-add-boot-marvell.cmd-backward-compatibility.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/0004-arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch b/patch/u-boot/v2025.10/board_helios4/0004-arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0004-arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch rename to patch/u-boot/v2025.10/board_helios4/0004-arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/0005-arm-mvebu-helios4-Update-Load-address.patch b/patch/u-boot/v2025.10/board_helios4/0005-arm-mvebu-helios4-Update-Load-address.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0005-arm-mvebu-helios4-Update-Load-address.patch rename to patch/u-boot/v2025.10/board_helios4/0005-arm-mvebu-helios4-Update-Load-address.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/0006-enable-DT-overlays-support.patch b/patch/u-boot/v2025.10/board_helios4/0006-enable-DT-overlays-support.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0006-enable-DT-overlays-support.patch rename to patch/u-boot/v2025.10/board_helios4/0006-enable-DT-overlays-support.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/0007-helios4_defconfig-0002-enable-setexpr-command.patch b/patch/u-boot/v2025.10/board_helios4/0007-helios4_defconfig-0002-enable-setexpr-command.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/0007-helios4_defconfig-0002-enable-setexpr-command.patch rename to patch/u-boot/v2025.10/board_helios4/0007-helios4_defconfig-0002-enable-setexpr-command.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/target_spi/0101-helios4-config-set-boot-device-spinor.patch b/patch/u-boot/v2025.10/board_helios4/target_spi/0101-helios4-config-set-boot-device-spinor.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/target_spi/0101-helios4-config-set-boot-device-spinor.patch rename to patch/u-boot/v2025.10/board_helios4/target_spi/0101-helios4-config-set-boot-device-spinor.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/target_spi/0102-helios4-reorder-boot-device.patch b/patch/u-boot/v2025.10/board_helios4/target_spi/0102-helios4-reorder-boot-device.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/target_spi/0102-helios4-reorder-boot-device.patch rename to patch/u-boot/v2025.10/board_helios4/target_spi/0102-helios4-reorder-boot-device.patch diff --git a/patch/u-boot/legacy/u-boot-helios4/target_uart/0201-helios4-prepare-for-uart-image.patch b/patch/u-boot/v2025.10/board_helios4/target_uart/0201-helios4-prepare-for-uart-image.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-helios4/target_uart/0201-helios4-prepare-for-uart-image.patch rename to patch/u-boot/v2025.10/board_helios4/target_uart/0201-helios4-prepare-for-uart-image.patch