Merge remote-tracking branch 'armbian/main'

.github/CODEOWNERS

@@ -34,6 +34,7 @@ config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
+config/boards/bigtreetech-cb2.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
 config/boards/clearfogpro.csc		@Heisath
 config/boards/cm3588-nas.csc		@ColorfulRhino
@@ -85,6 +86,7 @@ config/boards/nanopiduo.csc		@sgjava
 config/boards/nanopim4v2.conf		@igorpecovnik
 config/boards/nanopineocore2.csc		@AGM1968
 config/boards/nanopineoplus2.csc		@teknoid
+config/boards/odroidc1.conf		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
@@ -159,7 +161,7 @@ config/kernel/linux-arm64-*.config		@FantasyGmm
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
 config/kernel/linux-imx8m-*.config		@schmiedelm
 config/kernel/linux-k3-*.config		@glneo
-config/kernel/linux-meson-*.config		@hzyitc
+config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
 config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 config/kernel/linux-mvebu-*.config		@Heisath
@@ -168,7 +170,7 @@ config/kernel/linux-phytium-embedded-*.config		@chainsx
 config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
 config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
-config/kernel/linux-rockchip64-*.config		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
+config/kernel/linux-rockchip64-*.config		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
 config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava
@@ -184,15 +186,15 @@ patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/bcm2711-*/		@PanderMusubi @teknoid
 patch/kernel/imx8m-*/		@schmiedelm
 patch/kernel/k3-*/		@glneo
-patch/kernel/meson-*/		@hzyitc
+patch/kernel/meson-*/		@hzyitc @juanlufont
 patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
 patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
 patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
-patch/kernel/rockchip64-*/		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
+patch/kernel/rockchip64-*/		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/sm8550-*/		@FantasyGmm
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
@@ -202,15 +204,15 @@ sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/imx8m.conf		@schmiedelm
 sources/families/k3.conf		@glneo
 sources/families/meson-s4t7.conf		@adeepn @rpardini @viraniac
-sources/families/meson.conf		@hzyitc
+sources/families/meson.conf		@hzyitc @juanlufont
 sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
 sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
-sources/families/rockchip64.conf		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
+sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 sources/families/sm8250.conf		@FantasyGmm @amazingfate
 sources/families/sun55iw3-syterkit.conf		@chainsx
 sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava

VERSION

@@ -1 +1 @@
-24.11.0-trunk
+25.02.0-trunk

action.yml

@@ -87,6 +87,10 @@ inputs:
     required: false
     default: "Build with [Armbian tools](https://github.com/armbian/build)"
 
+  armbian_release_tag:
+    description: "Armbian release tag"
+    required: false
+
 runs:
   using: "composite"
 
@@ -122,7 +126,7 @@ runs:
       uses: actions/checkout@v4
       with:
         repository: armbian/build
-        fetch-depth: 0
+        ref: ${{ inputs.armbian_branch }}
         clean: false
         path: build
 
@@ -163,9 +167,8 @@ runs:
           DESKTOP_ENVIRONMENT_CONFIG_NAME="config_base"
         fi
 
-        # go to build folder and checkout
+        # go to build folder
         cd build
-        git checkout ${{ inputs.armbian_branch }}
 
         # execute build command
         ./compile.sh "${{ inputs.armbian_target }}" \
@@ -194,7 +197,7 @@ runs:
 
     - uses: ncipollo/release-action@v1
       with:
-        tag: "${{ env.ARMBIAN_VERSION }}"
+        tag: ${{ inputs.armbian_release_tag != '' && inputs.armbian_release_tag || env.ARMBIAN_VERSION }}
         name: "${{ inputs.armbian_release_tittle }}"
         artifacts: "${{ inputs.armbian_artifacts }}*"
         allowUpdates: true

config/boards/bananapim4zero.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw9-bpi"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="bananapi_m4zero_defconfig"
 OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="allwinner/sun50i-h618-bananapi-m4-zero.dtb"
+BOOT_FDT_FILE="sun50i-h618-bananapi-m4-zero.dtb"
 BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"

config/boards/bigtreetech-cb1.conf

@@ -10,4 +10,4 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTFS_TYPE="fat"
 BOOT_FS_LABEL="BOOT"
 OVERLAY_PREFIX="sun50i-h616"
-BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
+BOOT_FDT_FILE="sun50i-h616-bigtreetech-cb1-sd.dtb"

config/boards/hinlink-h66k.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Hinlink H66K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"

config/boards/hinlink-h68k.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Hinlink H68K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"

config/boards/hinlink-hnas.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Hinlink HNAS"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"

config/boards/inovato-quadra.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER="NicoD-SBC"
 BOOTCONFIG="tanix_tx6_defconfig"
 CRUSTCONFIG="tanix_tx6_defconfig"
-BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"
+BOOT_FDT_FILE="sun50i-h6-inovato-quadra.dtb"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
 BOOT_LOGO="desktop"

config/boards/longanpi-3h.csc

@@ -0,0 +1,15 @@
+# Allwinner H618 quad core 1GB/2GB/4GB RAM
+BOARD_NAME="Longan Pi 3H"
+BOARDFAMILY="sun50iw9"
+BOARD_MAINTAINER=""
+BOOTCONFIG="longanpi_3h_defconfig"
+BOOTBRANCH="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
+BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+BOOT_LOGO="desktop"
+OVERLAY_PREFIX="sun50i-h616"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+FORCE_BOOTSCRIPT_UPDATE="yes"
+enable_extension "radxa-aic8800" # compatible with radxa-aic8800
+AIC8800_TYPE="usb"

config/boards/mixtile-edge2.csc

@@ -40,7 +40,7 @@ function post_family_config_branch_vendor__kernel_and_uboot_rk35xx_mixtile_edge2
 	# Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way!
 	declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
 	declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
-	declare -g KERNELBRANCH='branch:rk-6.1-rkr3'
+	declare -g KERNELBRANCH='branch:rk-6.1-rkr4.1'
 	declare -g KERNELPATCHDIR='rk35xx-vendor-6.1'
 	declare -g LINUXFAMILY=rk35xx
 	declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes

config/boards/mkspi.csc

@@ -0,0 +1,18 @@
+# Rockchip RK3328 quad core 1GB RAM, 1x100M Ethernet, eMMC, USB3, USB2
+# Supported boards:
+# - MKS-PI - https://github.com/makerbase-mks/MKS-PI
+# - MKS-SKIPR - https://github.com/makerbase-mks/MKS-SKIPR
+# - QIDI X-4 and X-6 (made by Makerbase for 'X-Plus 3' and 'X-Max 3' 3D printers) - partially supported
+#
+# These boards and related configuration is very close to Renegade board ("roc-cc-rk3328_defconfig" and "rk3328-roc-cc" DT)
+BOARD_NAME="mkspi"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER="redrathnure"
+BOOTCONFIG="mkspi-rk3328_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+MODULES="ads7846 spidev"
+BOOTFS_TYPE="fat"
+PACKAGE_LIST_BOARD="build-essential usb-modeswitch"

config/boards/odroidc1.csc → config/boards/odroidc1.conf

@@ -1,7 +1,7 @@
 # Amlogic S805 C1 quad core 1GB RAM SoC GBE
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="juanlufont"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 

config/boards/pineh64-b.csc

@@ -5,5 +5,5 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="pine_h64_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
-BOOT_FDT_FILE="allwinner/sun50i-h6-pine-h64-model-b.dtb"
+BOOT_FDT_FILE="sun50i-h6-pine-h64-model-b.dtb"
 CRUSTCONFIG="h6_defconfig"

config/boards/youyeetoo-r1-v3.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali"
 BOOTCONFIG="generic-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
@@ -37,8 +37,8 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 	declare -g BOOTCONFIG="generic-rk3588_defconfig"             # Use generic defconfig which should boot all RK3588 boards
 	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07"
+	declare -g BOOTBRANCH="tag:v2024.10"
+	declare -g BOOTPATCHDIR="v2024.10"
 	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
@@ -51,3 +51,15 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+function post_family_tweaks__youyeetoo_r1 {
+	if [[ "${BRANCH}" != "vendor" ]]; then
+		display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
+		cat <<- EOF > "${SDCARD}/etc/modprobe.d/rtw8852be.conf"
+			options rtw89_pci disable_aspm_l1=y disable_aspm_l1ss=y
+			options rtw89pci disable_aspm_l1=y disable_aspm_l1ss=y
+			options rtw89_core disable_ps_mode=y
+			options rtw89core disable_ps_mode=y
+		EOF
+	fi
+}

config/bootscripts/boot-sun50i-next.cmd

@@ -13,14 +13,16 @@ setenv console "both"
 setenv docker_optimizations "on"
 setenv bootlogo "false"
 
-# Remember the default u-boot fdtfile
-setenv deffdt_file ${fdtfile}
+setenv vendor "allwinner"
+
+# Remember the default fdtfile provided by u-boot and delete the vendor name
+if setexpr subfdt sub ${vendor}/ "" ${fdtfile};then
+	setenv deffdt_file ${subfdt}
+fi
 
 # Remember the default u-boot fdtdir
 setenv deffdt_dir "${prefix}dtb"
-if test "$fdtdir" = ""; then setenv fdtdir "${deffdt_dir}";fi
-
-setenv vendor "allwinner"
+if test "$fdtdir" = ""; then setenv fdtdir "${deffdt_dir}/${vendor}";fi
 
 # Print boot source
 itest.b *0x10028 == 0x00 && echo "U-boot loaded from SD"
@@ -34,32 +36,32 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	env import -t ${load_addr} ${filesize}
 fi
 
+# Delete the vendor's name from the fdtfile variable and record the result
+# after the file with the environment variables has been read
+if setexpr subfdt sub ${vendor}/ "" ${fdtfile};then
+	setenv fdtfile ${subfdt}
+fi
+
 # In this shell, we can only check the existence of the file.
 # Make a check of reasonable ways to find the dtb file.
 # Set the true value of the paths.
 if test -e ${devtype} ${devnum} "${fdtdir}/${fdtfile}"; then
-	:
+	echo "Load fdt: ${fdtdir}/${fdtfile}"
 else
-	echo "File ${fdtdir}/${fdtfile} does not exists"
-	if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${fdtfile}"; then
-		setenv fdtdir "${deffdt_dir}/${vendor}"
+	echo "The file ${fdtfile} was not found in the path ${fdtdir}"
+	if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
+		setenv fdtdir "${deffdt_dir}"
+		echo "Load fdt: ${fdtdir}/${fdtfile}"
 	else
-		echo "File ${deffdt_dir}/${vendor}/${fdtfile} does not exists"
-		if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
-			setenv fdtdir "${deffdt_dir}"
+		if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${deffdt_file}"; then
+			setenv fdtdir "${deffdt_dir}/${vendor}"
+			setenv fdtfile "${deffdt_file}"
+			echo "Load fdt: ${fdtdir}/${fdtfile}"
 		else
-			echo "File ${deffdt_dir}/${fdtfile} does not exists"
-			if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${deffdt_file}"; then
-				setenv fdtdir "${deffdt_dir}/${vendor}"
+			if test -e ${devtype} ${devnum} "${deffdt_dir}/${deffdt_file}"; then
+				setenv fdtdir "${deffdt_dir}"
 				setenv fdtfile "${deffdt_file}"
-			else
-				echo "File ${deffdt_dir}/${vendor}/${deffdt_file} does not exists"
-				if test -e ${devtype} ${devnum} "${deffdt_dir}/${deffdt_file}"; then
-					setenv fdtdir "${deffdt_dir}"
-					setenv fdtfile "${deffdt_file}"
-				else
-					echo "File ${deffdt_dir}/${deffdt_file} does not exists"
-				fi
+				echo "Load fdt: ${fdtdir}/${fdtfile}"
 			fi
 		fi
 	fi