[pull] main from armbian:main

.github/CODEOWNERS

@@ -123,7 +123,7 @@ config/boards/rk3328-heltec.csc		@sicXnull
 config/boards/rock-3a.conf		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5-itx.conf		@amazingfate @prahal
 config/boards/rock-5a.conf		@amazingfate
-config/boards/rock-5b-plus.csc		@HeyMeco
+config/boards/rock-5b-plus.conf		@HeyMeco @fridtjof
 config/boards/rock-5b.conf		@amazingfate @linhz0hz
 config/boards/rock-5c.conf		@schwar3kat
 config/boards/rock-s0.conf		@brentr
@@ -164,7 +164,7 @@ config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+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 @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @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
@@ -188,7 +188,7 @@ patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee
 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 @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+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 @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @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
@@ -206,7 +206,7 @@ sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw
 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 @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+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 @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @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

README.md

@@ -26,7 +26,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.
 
-For stable branch use `--branch=v24.08`
+For stable branch use `--branch=v24.11`
 
 ```bash
 apt-get -y install git
@@ -82,9 +82,10 @@ Generated image will be uploaded to your repository release. Note: GitHub upload
 
 ## More information:
 
-- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start, how to automate)
-- [Build options](https://docs.armbian.com/Developer-Guide_Build-Options/) (all build options)
+- [Building Armbian](https://docs.armbian.com/Developer-Guide_Build-Preparation/) (how to start)
+- [Build commands](https://docs.armbian.com/Developer-Guide_Build-Commands/) and [switches](https://docs.armbian.com/Developer-Guide_Build-Switches/) (build options)
 - [User configuration](https://docs.armbian.com/Developer-Guide_User-Configurations/) (how to add packages, patches, and override sources config)
+- [System config](https://docs.armbian.com/User-Guide_Armbian-Config/) (menu driven utility to setup OS and HW features)
 
 ## Download prebuilt images releases
 

config/boards/bananapim2pro.conf

@@ -10,8 +10,8 @@ MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
-BOOTBRANCH_BOARD="tag:v2023.07.02"
-BOOTPATCHDIR="v2023.07.02"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"
 
 function fetch_sources_tools__libreelec_amlogic_fip_pre_m2-pro_blob_update() {
 	fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master"

config/boards/fxblox-rk1.csc

@@ -5,55 +5,12 @@ BOARD_MAINTAINER="mahdichi"
 BOOTCONFIG="fxblox-rk1-rk3588_defconfig"
 BOOT_SOC="rk3588"
 KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-fxblox-rk1.dtb"
 BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-
-# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'
-
-function post_family_tweaks__fxblox-rk1_naming_audios() {
-	display_alert "$BOARD" "Renaming fxblox rk1 audios" "info"
-
-	mkdir -p $SDCARD/etc/udev/rules.d/
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp0-sound", ENV{SOUND_DESCRIPTION}="DP0 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-dp1-sound", ENV{SOUND_DESCRIPTION}="DP1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
-	return 0
-}
-
-function post_family_config_branch_legacy__fxblox-rk1_uboot_add_sata_target() {
-	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
-
-	UBOOT_TARGET_MAP="
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
-	BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img
-	"
-}
-
-function post_uboot_custom_postprocess__create_sata_spi_image() {
-	display_alert "$BOARD" "Create rkspi_loader_sata.img" "info"
-
-	dd if=/dev/zero of=rkspi_loader_sata.img bs=1M count=0 seek=16
-	/sbin/parted -s rkspi_loader_sata.img mklabel gpt
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart idbloader 64 7167
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart vnvm 7168 7679
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved_space 7680 8063
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved1 8064 8127
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot_env 8128 8191
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved2 8192 16383
-	/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot 16384 32734
-	dd if=idbloader.img of=rkspi_loader_sata.img seek=64 conv=notrunc
-	dd if=u-boot.itb of=rkspi_loader_sata.img seek=16384 conv=notrunc
-}
-
-# Override family config for this board; let's avoid conditionals in family config.
-function post_family_config__fxblox-rk1_use_vendor_uboot() {
-	BOOTSOURCE='https://github.com/functionland/u-boot.git'
-	BOOTBRANCH='branch:next-dev'
-	BOOTPATCHDIR="legacy"
-}
+declare -g UEFI_EDK2_BOARD_ID="fxblox-rk1" # This _only_ used for uefi-edk2-rk3588 extension

config/boards/rock-5-cm-rpi-cm4-io.csc

@@ -0,0 +1,14 @@
+# Rockchip RK3588S octa core 4/8/16GB RAM SoC NVMe USB3 USB-C GbE
+BOARD_NAME="Radxa CM5 on RPi CM4 IO"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="radxa-cm5-rpi-cm4-io-rk3588s_defconfig"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588s-radxa-cm5-rpi-cm4-io.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"

config/boards/rock-5b-plus.conf

@@ -1,7 +1,7 @@
 # Rockchip RK3588 SoC octa core 4-16GB SoC 2.5GBe eMMC USB3 NvME
 BOARD_NAME="Rock 5B Plus"
 BOARDFAMILY="rockchip-rk3588"
-BOARD_MAINTAINER="HeyMeco"
+BOARD_MAINTAINER="HeyMeco fridtjof"
 BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
 KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"

config/boards/rockpi-s.conf

@@ -66,7 +66,16 @@ function post_family_config___uboot_config() {
 		rules=etc/udev/rules.d
 
 		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev &&
-			install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
+		install -m 644 $bsp/$rules/05-fixMACaddress.rules $destination/$rules
 	}
 
 }
+
+function pre_install_kernel_debs__enforce_cma() {
+	# Set CMA to 16 megabytes, to provide more usable RAM since Rock Pi S
+	# has usually a small amount of DRAM (512MB)
+	display_alert "$BOARD" "set CMA size to 16MB due to small DRAM size"
+	run_host_command_logged echo "extraargs=cma=16M" ">>" "${SDCARD}"/boot/armbianEnv.txt
+
+        return 0
+}

config/boards/thinkpad-x13s.wip

@@ -28,9 +28,9 @@ enable_extension "grub-with-dtb" # important, puts the whole DTB handling in pla
 # Use the full firmware, complete linux-firmware plus Armbian's
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
-function post_family_config_branch_sc8280xp__jhovolds_69y_kernel() {
+function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
 	declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc2' # @TODO: this is down to 35 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc4' # @TODO: this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"

config/boards/youyeetoo-r1-v3.csc

@@ -4,8 +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="edge,current,vendor"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

config/kernel/linux-rockchip-rk3588-current.config

@@ -0,0 +1 @@
+linux-rockchip-rk3588-edge.config