Merge branch 'main' into 5BPlus-5T-MainlineUboot

Author: HeyMeco

.github/CODEOWNERS

@@ -199,7 +199,8 @@ config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
 config/kernel/linux-genio-*.config		@HeyMeco
 config/kernel/linux-k3-*.config		@Grippy98 @glneo @jonaswood01
 config/kernel/linux-k3-beagle-*.config		@Grippy98
-config/kernel/linux-k3-beagle-current-*.config		@Grippy98
+config/kernel/linux-k3-beagle-vendor-*.config		@Grippy98
+config/kernel/linux-k3-vendor-*.config		@Grippy98 @glneo @jonaswood01
 config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @leggewie @pyavitz @rpardini
 config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @biot @engineer-80 @igorpecovnik @jeanrhum @jomadeto @pyavitz @retro98boy @rpardini @teknoid
@@ -297,7 +298,7 @@ patch/u-boot/v2022.07/		@Tonymac32 @igorpecovnik
 patch/u-boot/v2022.10/		@NicoD-SBC
 patch/u-boot/v2023.07.02/		@engineer-80
 patch/u-boot/v2023.10/		@adeepn
-patch/u-boot/v2024.01/		@Tonymac32 @rpardini
+patch/u-boot/v2024.01/		@Tonymac32
 patch/u-boot/v2024.04-rock5b-radxa/		@amazingfate @linhz0hz
 patch/u-boot/v2024.04/		@Tonymac32 @utlark
 patch/u-boot/v2024.07-coolpi-cm5/		@andyshrk
@@ -307,12 +308,13 @@ patch/u-boot/v2024.10/		@brentr @pyavitz
 patch/u-boot/v2024.10/board_bigtreetech-cb2/		@JohnTheCoolingFan
 patch/u-boot/v2025-sunxi/		@The-going @alexl83 @chraac
 patch/u-boot/v2025.01-rc3-coolpi-cm5/		@andyshrk
-patch/u-boot/v2025.01/		@ColorfulRhino @efectn @jeanrhum @joekhoobyar @pyavitz @torte71
+patch/u-boot/v2025.01/		@jeanrhum @joekhoobyar @pyavitz @torte71
 patch/u-boot/v2025.01/board_h96-tvbox-3566/		@hqnicolas
 patch/u-boot/v2025.04/		@HeyMeco @IsMrX @NicoD-SBC @TheSnowfield @andyshrk @fridtjof @mlegenovic @retro98boy @rpardini
-patch/u-boot/v2025.07/		@efectn @pyavitz
-patch/u-boot/v2025.10/		@ColorfulRhino @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @biot @catalinii @efectn @igorpecovnik @paolosabatino @pyavitz @rpardini @vamzii
+patch/u-boot/v2025.07/		@pyavitz
+patch/u-boot/v2025.10/		@SuperKali @ZazaBR @alexl83 @amazingfate @catalinii @efectn @igorpecovnik @paolosabatino @pyavitz @rpardini @vamzii
 patch/u-boot/v2025.10/board_9tripod-x3568-v4/		@rbqvq
+patch/u-boot/v2026.01/		@ColorfulRhino @SuperKali @Tonymac32 @biot @rpardini
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/genio.conf		@HeyMeco
 sources/families/imx8m.conf		@schmiedelm

action.yml

@@ -140,9 +140,33 @@ runs:
     - shell: bash
       run: |
 
-        # read version from upstream Armbian OS
-        cat os/stable.json | jq '.version' | sed "s/\"//g" | sed 's/^/ARMBIAN_VERSION=/' >> $GITHUB_ENV
-        [[ "${{ inputs.armbian_version }}" != '' ]] && echo "ARMBIAN_VERSION=${{ inputs.armbian_version }}" >> $GITHUB_ENV
+        # Resolve base version (prefer workflow input if provided)
+        BASE_VERSION="${{ inputs.armbian_version }}"
+        if [ -z "$BASE_VERSION" ]; then
+          BASE_VERSION="$(jq -r '.version' os/stable.json)"
+        fi
+
+        # Preserve optional 'v' prefix but strip it for math
+        PREFIX=''
+        if [[ "$BASE_VERSION" == v* ]]; then
+          PREFIX='v'
+          BASE_NO_PREFIX="${BASE_VERSION#v}"
+        else
+          BASE_NO_PREFIX="$BASE_VERSION"
+        fi
+
+        # Drop any pre-release/build metadata (e.g., -rc1, +meta)
+        CORE="${BASE_NO_PREFIX%%[-+]*}"
+
+        # Split and increment patch
+        IFS='.' read -r MAJOR MINOR PATCH <<<"$CORE"
+        PATCH=${PATCH:-0}
+        NEXT_PATCH=$((PATCH + 1))
+        NEXT_VERSION="${PREFIX}${MAJOR}.${MINOR}.${NEXT_PATCH}"
+
+        {
+          echo "ARMBIAN_VERSION=${NEXT_VERSION}"
+        } >> "$GITHUB_ENV"
 
         # copy os userpatches and custom
         mkdir -pv build/userpatches

config/boards/9tripod-x3568-v4.csc

@@ -18,7 +18,7 @@ function post_family_config__9tripod_x3568_v4_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTCONFIG="9tripod-x3568-v4-rk3568_defconfig"
-	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
 	declare -g BOOTBRANCH="tag:v2025.10"
 	declare -g BOOTPATCHDIR="v2025.10/board_${BOARD}"
 

config/boards/README.md

@@ -63,6 +63,11 @@ If you are unsure about the documentation then invoke `$ grep -r -A5 -B5 "BUILD_
     - Values:
         - yes: Include (default)
         - no: Do NO include
+- **POWER_MANAGEMENT_FEATURES** (boolean): Controls whether system sleep functionality (suspend, hibernate, hybrid sleep) is allowed on the built image.
+    - Values:
+         - yes: Enable power-management sleep features (allow systemd sleep modes)
+         - no: Disable all sleep modes (default), as suspend/hibernate are unstable
+      on most single-board computers
 - **HAS_VIDEO_OUTPUT** ( boolean ): defines whether the system has video output such as eye candy, bootsplash, etc..
 	- Values:
 		- yes: Enable video-related configuration

config/boards/bananapim5pro.conf

@@ -4,6 +4,7 @@ BOARD_NAME="Banana Pi M5 Pro"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="bananapi-m5-pro-rk3576_defconfig"
 BOOT_FDT_FILE="rockchip/rk3576-bananapi-m5-pro.dtb"
-# Those are included in armsom-sige5.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
+# Those are included in armsom-sige5.csc, but this file is parsed directly
+# by the JSON matrix generator and thus those need to be in here
 KERNEL_TARGET="edge,vendor"
 BOARDFAMILY="rk35xx"

config/boards/bananapim7.conf

@@ -3,7 +3,8 @@ source "${SRC}/config/boards/armsom-sige7.csc"
 BOARD_NAME="Banana Pi M7"
 BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
-# Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
+# Those are included in armsom-sige7.csc, but this file is parsed directly
+# by the JSON matrix generator and thus those need to be in here
 KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 BOARDFAMILY="rockchip-rk3588"

config/boards/beaglebone-ai64.conf

@@ -1,4 +1,4 @@
-# BeagleBone® AI-64 dual core 4GB GBE USB3 OSPI DisplayPort HDMI
+# BeagleBone AI-64 Texas Instruments TDA4VM dual core 4GB GBE USB3 OSPI DisplayPort HDMI
 
 BOARD_NAME="BeagleBone AI-64"
 BOARDFAMILY="k3"
@@ -12,8 +12,8 @@ SYSFW_FILE="sysfw-j721e-gp-evm.itb"
 TISPL_FILE="tispl.bin_unsigned"
 UBOOT_FILE="u-boot.img_unsigned"
 DEFAULT_CONSOLE="serial"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TARGET="vendor,vendor-rt,edge"
+KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
 OPTEE_ARGS=""

config/boards/beagleplay.conf

@@ -1,4 +1,4 @@
-# TI AM62 quad core 2GB DDR4 16GB eMMC 1xGBE 1xSPE HDMI
+# BeaglePlay Texas Instruments AM62 quad core 2GB DDR4 eMMC GBE SPE HDMI
 
 BOARD_NAME="BeaglePlay"
 BOARDFAMILY="k3"
@@ -11,8 +11,8 @@ TIBOOT3_FILE="tiboot3-am62x-gp-evm.bin"
 TISPL_FILE="tispl.bin_unsigned"
 UBOOT_FILE="u-boot.img_unsigned"
 DEFAULT_CONSOLE="serial"
-KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TARGET="vendor,vendor-rt,edge"
+KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
 OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"

config/boards/beagley-ai.conf

@@ -1,4 +1,4 @@
-# Texas Instruments AM67A quad core 4GB USB3 DDR4 4TOPS
+# BeagleY-AI Texas Instruments AM67A quad core 4GB DDR4 USB3  4TOPS
 
 BOARD_NAME="BeagleY-AI"
 BOARDFAMILY="k3-beagle"
@@ -9,8 +9,8 @@ BOOT_FDT_FILE="k3-am67a-beagley-ai.dts"
 TIBOOT3_BOOTCONFIG="am67a_beagley_ai_r5_defconfig"
 TIBOOT3_FILE="tiboot3-j722s-hs-fs-evm.bin"
 DEFAULT_CONSOLE="serial"
-KERNEL_TARGET="current"
-KERNEL_TEST_TARGET="current"
+KERNEL_TARGET="vendor,vendor-rt,edge"
+KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
 OPTEE_ARGS=""

config/boards/bestv-r3300-l.csc

@@ -10,9 +10,11 @@ SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-gxl-s905x-bestv-r3300-l.dtb"
 PACKAGE_LIST_BOARD="alsa-ucm-conf" # Contain ALSA UCM top-level configuration file
-
 BOOTBRANCH_BOARD="tag:v2025.04"
-BOOTPATCHDIR="v2025.04" # This has a patch that adds support for BesTV R3300-L.
+BOOTPATCHDIR="v2025.04"
+
+enable_extension "gxlimg"
+enable_extension "amlogic-fip-blobs"
 
 function post_family_config__use_repacked_fip() {
 	declare -g UBOOT_TARGET_MAP="u-boot.bin"
@@ -24,22 +26,24 @@ function post_family_config__use_repacked_fip() {
 }
 
 function post_uboot_custom_postprocess__repack_vendor_fip_with_mainline_uboot() {
-	gxlimg_repack_fip_with_new_uboot "${SRC}/cache/sources/amlogic-fip-blobs/bestv-r3300-l/bootloader.PARTITION" gxl
+	gxlimg_repack_fip_with_new_uboot \
+		"${SRC}/cache/sources/amlogic-fip-blobs/bestv-r3300-l/bootloader.PARTITION" \
+		gxl
 }
 
 function post_family_tweaks_bsp__bestv-r3300-l() {
 	display_alert "${BOARD}" "Installing ALSA UCM configuration files" "info"
 
-	# Use ALSA UCM via GUI: Install a desktop environment such as GNOME, PipeWire, and WirePlumber.
-
 	# Use ALSA UCM via CLI:
 	# alsactl init && alsaucm set _verb "HiFi" set _enadev "HDMI"
 	# or
 	# alsactl init && alsaucm set _verb "HiFi" set _enadev "Lineout"
 	# playback: aplay -D plughw:S905XP212,0 /usr/share/sounds/alsa/Front_Center.wav
 
-	install -Dm644 "${SRC}/packages/bsp/S905X-P212/S905X-P212-HiFi.conf" "${destination}/usr/share/alsa/ucm2/Amlogic/gx-sound-card/S905X-P212-HiFi.conf"
-	install -Dm644 "${SRC}/packages/bsp/S905X-P212/S905X-P212.conf" "${destination}/usr/share/alsa/ucm2/Amlogic/gx-sound-card/S905X-P212.conf"
+	install -Dm644 "${SRC}/packages/bsp/S905X-P212/S905X-P212-HiFi.conf" \
+		"${destination}/usr/share/alsa/ucm2/Amlogic/gx-sound-card/S905X-P212-HiFi.conf"
+	install -Dm644 "${SRC}/packages/bsp/S905X-P212/S905X-P212.conf" \
+		"${destination}/usr/share/alsa/ucm2/Amlogic/gx-sound-card/S905X-P212.conf"
 
 	if [ ! -d "${destination}/usr/share/alsa/ucm2/conf.d/gx-sound-card" ]; then
 		mkdir -p "${destination}/usr/share/alsa/ucm2/conf.d/gx-sound-card"