rk35xx-vendor: bump to 6.1 rkr4.1 sdk kernel

also include the tiny fixMACaddress script in the S0 image to assign end0 MAC address from CPU serial #in case running U-Boot earlier than 2024.10

config/boards/armsom-cm5-io.csc

@@ -11,7 +11,7 @@ IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
 function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
-        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
 	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"

config/boards/armsom-cm5-rpi-cm4-io.csc

@@ -11,7 +11,7 @@ IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
 function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
-        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
 	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"

config/boards/armsom-sige5.csc

@@ -11,7 +11,7 @@ IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
 function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
-        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
+	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
 	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"

config/boards/bananapif3.csc

@@ -12,7 +12,7 @@ PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
 
 function post_config_uboot_target__extra_configs_for_bananapi_f3() {
 	display_alert "u-boot for ${BOARD}" "u-boot: enabling extra configs" "info"
-	
+
 	run_host_command_logged scripts/config --enable CONFIG_SD_BOOT
 	run_host_command_logged scripts/config --enable CONFIG_EXT4_WRITE
 	run_host_command_logged scripts/config --enable CONFIG_FS_BTRFS

config/boards/cherryba-m1.csc

@@ -1,4 +1,4 @@
- # Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
+# Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
 BOARD_NAME="CherryBa M1"
 BOARDFAMILY="sun50iw9"
 BOOTCONFIG="cherryba-m1_defconfig"

config/boards/oneplus-kebab.conf

@@ -54,7 +54,7 @@ function post_family_tweaks__oneplus-kebab_enable_services() {
 		return 0
 	fi
 
-	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]];then
+	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
 		display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
 		do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
 	fi

config/boards/orangepi3b.csc

@@ -68,7 +68,7 @@ function post_family_tweaks__orangepi3b_naming_audios() {
 	mkdir -p $SDCARD/etc/udev/rules.d/
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi-sound", ENV{SOUND_DESCRIPTION}="HDMI Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
 	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-rk809-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # vendor dts
-	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # mainline dts
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules       # mainline dts
 
 	return 0
 }

config/boards/orangepi5-plus.conf

@@ -77,9 +77,9 @@ function post_family_config_branch_current__orangepi5plus_use_mainline_uboot() {
 function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
 	[[ "${BRANCH}" != "edge" && "${BRANCH}" != "current" ]] && return 0
 
-	 display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
 	run_host_command_logged scripts/config --set-val CONFIG_BOARD_RNG_SEED "y"
-	run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n" #broken as per 2024.10-rc3
-	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n" #broken as per 2024.10-rc3
+	run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n"    #broken as per 2024.10-rc3
+	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n"   #broken as per 2024.10-rc3
 	run_host_command_logged scripts/config --set-val ARMV8_CE_SHA256 "n" #broken as per 2024.10-rc3
 }

config/boards/radxa-e20c.csc

@@ -8,5 +8,4 @@ FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-radxa-e20c.dtb"
 BOOT_SCENARIO="spl-blobs"
-WIREGUARD="no"
 IMAGE_PARTITION_TABLE="gpt"

config/boards/retro-lite-cm5.csc

@@ -23,4 +23,3 @@ function post_family_tweaks__retrolitecm5_naming_audios() {
 
 	return 0
 }
-

config/boards/retroidpocket-rp5.csc

@@ -0,0 +1,123 @@
+# Retroid Pocket RP5 Configuration
+declare -g BOARD_NAME="Retroid Pocket RP5"
+declare -g BOARD_MAINTAINER="tjstyle"
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="panel_ddic_ch13726a"
+declare -g BOOTCONFIG="none"
+
+declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics in grub, for the Armbian wallpaper.
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime fbcon=rotate:3 console=ttyMSM0,115200n8"
+declare -g BOOT_FDT_FILE="qcom/sm8250-retroidpocket-rp5.dtb"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+# declare -g BOOT_LOGO=desktop
+
+# Use the full firmware, complete linux-firmware plus Armbian's
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function retroidpocket-rp5_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function pre_customize_image__retroidpocket-rp5_alsa_ucm_conf() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		return 0
+	fi
+
+	display_alert "Add alsa-ucm-conf for ${BOARD}" "${RELEASE}" "warn"
+	(
+		cd "${SDCARD}/usr/share/alsa" || exit 6
+		curl -L "https://github.com/RetroidPocket/alsa-ucm-conf/archive/refs/heads/rp/v1.2.13.tar.gz" | tar xvzf - --strip-components=1
+	)
+}
+
+function post_family_tweaks_bsp__retroidpocket-rp5_add_services() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Add services" "info"
+
+	# Bluetooth MAC addr setup service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Haptic and Gamepad rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules $destination/etc/udev/rules.d/90-feedbackd-spmi-haptics.rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/99-ignore-gamepad.rules $destination/etc/udev/rules.d/99-ignore-gamepad.rules
+}
+
+function post_family_tweaks__retroidpocket-rp5_enable_services() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Enable services" "info"
+
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_config__retroidpocket-rp5_extra_packages() {
+	if ! retroidpocket-rp5_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "Setting up extra packages for ${BOARD}" "${RELEASE}" "info"
+	add_packages_to_image "bluez" "bluetooth"        # for bluetooth stuff
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "zstd"                     # for zstd compression of initrd
+}
+
+function post_family_tweaks_bsp__retroidpocket-rp5_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/retroidpocket-rp5-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__retroidpocket-rp5_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		panel-ddic-ch13726a
+	EXTRA_MODULES
+}
+
+# armbian-firstrun waits for systemd to be ready, but snapd.seeded might cause it to hang due to wrong clock.
+# if the battery runs out, the clock is reset to 1970. This causes snapd.seeded to hang, and armbian-firstrun to hang.
+function pre_customize_image__disable_snapd_seeded() {
+	[[ "${DISTRIBUTION}" != "Ubuntu" ]] && return 0 # only needed for Ubuntu
+	display_alert "Disabling snapd.seeded" "${BOARD}" "info"
+	chroot_sdcard systemctl disable snapd.seeded.service "||" true
+}

config/boards/retroidpocket-rpmini.csc

@@ -0,0 +1,123 @@
+# Retroid Pocket RPMini Configuration
+declare -g BOARD_NAME="Retroid Pocket RPMini"
+declare -g BOARD_MAINTAINER="tjstyle"
+declare -g BOARDFAMILY="sm8250"
+declare -g KERNEL_TARGET="current"
+declare -g EXTRAWIFI="no"
+declare -g MODULES="panel_ddic_ch13726a"
+declare -g BOOTCONFIG="none"
+
+declare -g UEFI_GRUB_TERMINAL="gfxterm" # Use graphics in grub, for the Armbian wallpaper.
+declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime fbcon=rotate:1 console=ttyMSM0,115200n8"
+declare -g BOOT_FDT_FILE="qcom/sm8250-retroidpocket-rpmini.dtb"
+
+declare -g SERIALCON="${SERIALCON:-tty1}"
+
+enable_extension "grub"
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
+
+# declare -g BOOT_LOGO=desktop
+
+# Use the full firmware, complete linux-firmware plus Armbian's
+declare -g BOARD_FIRMWARE_INSTALL="-full"
+
+function retroidpocket-rpmini_is_userspace_supported() {
+	[[ "${RELEASE}" == "bookworm" ]] && return 0
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	return 1
+}
+
+function pre_customize_image__retroidpocket-rpmini_alsa_ucm_conf() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		return 0
+	fi
+
+	display_alert "Add alsa-ucm-conf for ${BOARD}" "${RELEASE}" "warn"
+	(
+		cd "${SDCARD}/usr/share/alsa" || exit 6
+		curl -L "https://github.com/RetroidPocket/alsa-ucm-conf/archive/refs/heads/rp/v1.2.13.tar.gz" | tar xvzf - --strip-components=1
+	)
+}
+
+function post_family_tweaks_bsp__retroidpocket-rpmini_add_services() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Add services" "info"
+
+	# Bluetooth MAC addr setup service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	install -Dm655 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.sh $destination/usr/local/bin/
+	install -Dm644 $SRC/packages/bsp/generate-bt-mac-addr/bt-fixed-mac.service $destination/usr/lib/systemd/system/
+
+	# Haptic and Gamepad rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules $destination/etc/udev/rules.d/90-feedbackd-spmi-haptics.rules
+	install -Dm644 $SRC/packages/bsp/retroidpocket/99-ignore-gamepad.rules $destination/etc/udev/rules.d/99-ignore-gamepad.rules
+}
+
+function post_family_tweaks__retroidpocket-rpmini_enable_services() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "$BOARD" "Enable services" "info"
+
+	chroot_sdcard systemctl enable bt-fixed-mac.service
+	return 0
+}
+
+function post_family_config__retroidpocket-rpmini_extra_packages() {
+	if ! retroidpocket-rpmini_is_userspace_supported; then
+		if [[ "${RELEASE}" != "" ]]; then
+			display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
+		fi
+		return 0
+	fi
+
+	display_alert "Setting up extra packages for ${BOARD}" "${RELEASE}" "info"
+	add_packages_to_image "bluez" "bluetooth"        # for bluetooth stuff
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "zstd"                     # for zstd compression of initrd
+}
+
+function post_family_tweaks_bsp__retroidpocket-rpmini_bsp_firmware_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
+	declare file_added_to_bsp_destination # will be filled in by add_file_from_stdin_to_bsp_destination
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/retroidpocket-rpmini-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8250/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a650_sqe.fw" # extra one for dpu
+		add_firmware "qcom/a650_gmu.bin" # extra one for gpu
+	FIRMWARE_HOOK
+	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
+}
+
+## Modules, required to boot, add them to initrd
+function post_family_tweaks_bsp__retroidpocket-rpmini_bsp_modules_in_initrd() {
+	display_alert "Adding to bsp-cli" "${BOARD}: modules in initrd" "info"
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/modules" <<- 'EXTRA_MODULES'
+		panel-ddic-ch13726a
+	EXTRA_MODULES
+}
+
+# armbian-firstrun waits for systemd to be ready, but snapd.seeded might cause it to hang due to wrong clock.
+# if the battery runs out, the clock is reset to 1970. This causes snapd.seeded to hang, and armbian-firstrun to hang.
+function pre_customize_image__disable_snapd_seeded() {
+	[[ "${DISTRIBUTION}" != "Ubuntu" ]] && return 0 # only needed for Ubuntu
+	display_alert "Disabling snapd.seeded" "${BOARD}" "info"
+	chroot_sdcard systemctl disable snapd.seeded.service "||" true
+}

config/boards/rock-3a.conf

@@ -18,7 +18,7 @@ function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
 	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
 	unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway
 	declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
-	declare -g BOOTDELAY=1                           
+	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
 	declare -g BOOTBRANCH="tag:v2024.10"
 	declare -g BOOTPATCHDIR="v2024.10"

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

@@ -34,12 +34,12 @@ function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
 	# temporary override until DT in armbian/rockchip-linux is renamed
 	declare -g BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
 
-	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"                       # override the default for the board/family
-	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 tree
-	declare -g BOOTBRANCH="tag:v2024.10"                                  #
-	declare -g BOOTPATCHDIR="v2024.10"                                    # empty; defconfig changes are done in hook below
-	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
+	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"              # override the default for the board/family
+	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 tree
+	declare -g BOOTBRANCH="tag:v2024.10"                         #
+	declare -g BOOTPATCHDIR="v2024.10"                           # empty; defconfig changes are done in hook below
+	declare -g BOOTDIR="u-boot-${BOARD}"                         # do not share u-boot directory
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 

config/boards/rock-s0.conf

@@ -28,5 +28,21 @@ function post_family_config__rocks0() {
 	declare -g BOOTDIR="u-boot-${BOARD}"
 	declare -g BOOTSCRIPT=boot-rockchip64-ttyS0.cmd:boot.cmd
 
-	unset family_tweaks_bsp # disable from rockchip64_common
+	family_tweaks_bsp() { #overrides rockchip64_common.inc
+		#Install udev script that derives fixed, unique MAC addresses for net interfaces
+		#that are assigned random ones
+		bsp=$SRC/packages/bsp/rockpis
+		rules=etc/udev/rules.d
+
+		install -m 755 $bsp/lib/udev/fixEtherAddr $destination/lib/udev
+	}
+}
+
+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/turing-rk1.csc

@@ -1,4 +1,4 @@
-# Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3 
+# Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3
 BOARD_NAME="Turing RK1"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
@@ -18,10 +18,10 @@ function post_family_config__turing-rk1_default_serial_console_by_branch() {
 
 	case $BRANCH in
 		vendor)
-			declare -g  SERIALCON="ttyS9"
+			declare -g SERIALCON="ttyS9"
 			;;
 		*)
-			declare -g  SERIALCON="ttyS0"
+			declare -g SERIALCON="ttyS0"
 			;;
 	esac
 
@@ -51,15 +51,15 @@ function post_family_config__turing-rk1_use_mainline_uboot() {
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
 	declare -g BOOTBRANCH='tag:v2024.04'
 	declare -g BOOTPATCHDIR="v2024.04"
-    declare -g BOOTDELAY=1
+	declare -g BOOTDELAY=1
 	# 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"
 
-    # Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
 
-    # Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}

config/boards/xt-q8l-v10.tvb

@@ -12,7 +12,7 @@ PACKAGE_LIST_BOARD="bluez"
 function post_family_config__uboot_config() {
 	# Overwrite UBOOT_TARGET_MAP to use the proprietary rockchip
 	# ddrbin in place of u-boot TPL. The reason is that the board
-	# uses DDR2 memories and u-boot TPL is not capable of 
+	# uses DDR2 memories and u-boot TPL is not capable of
 	# initializing DDR2.
 	UBOOT_TARGET_MAP="ROCKCHIP_TPL=$SRC/cache/sources/rkbin-tools/rk32/rk3288_ddr_400MHz_v1.08.bin;;u-boot-rockchip-with-spl.bin"
 }

config/kernel/linux-rk35xx-vendor.config

@@ -3401,6 +3401,7 @@ CONFIG_TOUCHSCREEN_FTS=y
 # CONFIG_TOUCHSCREEN_FT5726 is not set
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_GOODIX_GTX8=y
 CONFIG_TOUCHSCREEN_GSL3673=y
 CONFIG_TOUCHSCREEN_GSL3673_800X1280=m
 CONFIG_TOUCHSCREEN_GSLX680_PAD=m
@@ -5810,7 +5811,7 @@ CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RADXA_DISPLAY_8HD=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
+CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m

config/kernel/linux-rockchip-edge.config

@@ -1,22 +1,24 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.11.0 Kernel Configuration
+# Linux/arm 6.12.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0"
+CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110300
+CONFIG_GCC_VERSION=130200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=0
+CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=122
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -169,6 +171,7 @@ CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
@@ -177,6 +180,7 @@ CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -482,6 +486,8 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN is not set
+CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
+CONFIG_STACKPROTECTOR_PER_TASK=y
 # end of Kernel Features
 
 #
@@ -497,6 +503,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
 CONFIG_ARCH_SUPPORTS_KEXEC=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_EFI is not set
 # end of Boot options
@@ -597,6 +604,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 
 CONFIG_AS_VFP_VMRS_FPINST=y
 CONFIG_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 
 #
 # General architecture-dependent options
@@ -702,10 +710,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -815,12 +820,12 @@ CONFIG_ZSWAP_SHRINKER_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED=y
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
 CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold"
 CONFIG_ZBUD=y
+CONFIG_Z3FOLD_DEPRECATED=y
 CONFIG_Z3FOLD=y
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -848,7 +853,7 @@ CONFIG_FLATMEM=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_COMPACTION=y
 CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
@@ -898,6 +903,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_NET_XGRESS=y
 CONFIG_NET_REDIRECT=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1672,6 +1678,7 @@ CONFIG_BT_HCIUART_RTL=y
 # CONFIG_BT_HCIUART_QCA is not set
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIUART_AML is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 CONFIG_BT_HCIBFUSB=y
@@ -1715,7 +1722,6 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_RFKILL=y
@@ -1783,6 +1789,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
@@ -1824,12 +1831,26 @@ CONFIG_PROC_EVENTS=y
 #
 CONFIG_ARM_SCMI_PROTOCOL=m
 # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
+
+#
+# SCMI Transport Drivers
+#
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
-# CONFIG_ARM_SCMI_TRANSPORT_OPTEE is not set
-CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=m
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+# CONFIG_ARM_SCMI_TRANSPORT_OPTEE is not set
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+# end of SCMI Transport Drivers
+
+#
+# ARM SCMI NXP i.MX Vendor Protocols
+#
+# CONFIG_IMX_SCMI_BBM_EXT is not set
+# CONFIG_IMX_SCMI_MISC_EXT is not set
+# end of ARM SCMI NXP i.MX Vendor Protocols
+
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol
 
@@ -1880,13 +1901,17 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_CDROM=y
 CONFIG_ZRAM=m
-CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4HC is not set
+CONFIG_ZRAM_BACKEND_ZSTD=y
+CONFIG_ZRAM_BACKEND_DEFLATE=y
+# CONFIG_ZRAM_BACKEND_842 is not set
+CONFIG_ZRAM_BACKEND_LZO=y
+# CONFIG_ZRAM_DEF_COMP_LZORLE is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_COMP_842 is not set
-CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
+# CONFIG_ZRAM_DEF_COMP_DEFLATE is not set
+CONFIG_ZRAM_DEF_COMP="zstd"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
@@ -1925,6 +1950,7 @@ CONFIG_NVME_TCP=m
 #
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
+CONFIG_RPMB=y
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_APDS9802ALS is not set
@@ -2180,6 +2206,7 @@ CONFIG_NET_VENDOR_NI=y
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_ETHOC is not set
+# CONFIG_OA_TC6 is not set
 CONFIG_NET_VENDOR_PENSANDO=y
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
@@ -2289,13 +2316,16 @@ CONFIG_CAN_TI_HECC=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_CC770=m
+# CONFIG_CAN_CC770_ISA is not set
 CONFIG_CAN_CC770_PLATFORM=m
 # CONFIG_CAN_CTUCANFD_PLATFORM is not set
 CONFIG_CAN_IFI_CANFD=m
 CONFIG_CAN_M_CAN=m
 CONFIG_CAN_M_CAN_PLATFORM=m
 CONFIG_CAN_M_CAN_TCAN4X5X=m
+# CONFIG_CAN_ROCKCHIP_CANFD is not set
 CONFIG_CAN_SJA1000=m
+# CONFIG_CAN_SJA1000_ISA is not set
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_SOFTING=m
 
@@ -2468,7 +2498,6 @@ CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_PROTO_BCDC=y
 CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCMFMAC_USB is not set
-# CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
@@ -2640,7 +2669,6 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
@@ -2723,7 +2751,6 @@ CONFIG_TOUCHSCREEN_BU21029=m
 # CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
@@ -2748,7 +2775,6 @@ CONFIG_TOUCHSCREEN_ELAN=y
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
@@ -2954,6 +2980,7 @@ CONFIG_HW_RANDOM_OPTEE=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
+CONFIG_HW_RANDOM_ROCKCHIP=y
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
 CONFIG_TCG_TPM=y
@@ -2980,7 +3007,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
 #
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 
@@ -3010,6 +3036,8 @@ CONFIG_I2C_ALGOBIT=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_SLAVE=y
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
@@ -3506,6 +3534,7 @@ CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 # CONFIG_THERMAL_STATISTICS is not set
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@@ -3565,6 +3594,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ADP5585 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMPRO is not set
@@ -4077,7 +4107,6 @@ CONFIG_VIDEO_MUX=m
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -4114,7 +4143,6 @@ CONFIG_VIDEO_MUX=m
 #
 # Raspberry Pi media platform drivers
 #
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
 
 #
 # Renesas media platform drivers
@@ -4148,6 +4176,7 @@ CONFIG_DVB_C8SECTPFE=m
 # Verisilicon media platform drivers
 #
 CONFIG_VIDEO_HANTRO=m
+# CONFIG_VIDEO_HANTRO_HEVC_RFC is not set
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 
 #
@@ -4632,6 +4661,7 @@ CONFIG_VIDEO=y
 CONFIG_DRM=y
 # CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -4711,6 +4741,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_EDP is not set
@@ -4899,10 +4930,10 @@ CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
+# CONFIG_SND_UTIMER is not set
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
@@ -5183,6 +5214,7 @@ CONFIG_SND_SOC_WM8904=m
 # CONFIG_SND_SOC_ZL38060 is not set
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+# CONFIG_SND_SOC_MT6357 is not set
 CONFIG_SND_SOC_MT6358=m
 # CONFIG_SND_SOC_MT6660 is not set
 # CONFIG_SND_SOC_NAU8315 is not set
@@ -5250,6 +5282,7 @@ CONFIG_HID_GFRM=m
 # CONFIG_HID_GLORIOUS is not set
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+# CONFIG_HID_GOODIX_SPI is not set
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 # CONFIG_HID_VIVALDI is not set
 CONFIG_HID_GT683R=m
@@ -5862,6 +5895,7 @@ CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3028=m
 # CONFIG_RTC_DRV_RV3032 is not set
 CONFIG_RTC_DRV_RV8803=m
+# CONFIG_RTC_DRV_SD2405AL is not set
 CONFIG_RTC_DRV_SD3078=m
 
 #
@@ -5948,6 +5982,7 @@ CONFIG_PL330_DMA=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
+# CONFIG_AMD_QDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 CONFIG_DW_DMAC_CORE=m
@@ -6080,7 +6115,6 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 # CONFIG_MOST_COMPONENTS is not set
-# CONFIG_KS7010 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 CONFIG_FIELDBUS_DEV=m
 CONFIG_HMS_ANYBUSS_BUS=m
@@ -6299,6 +6333,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_RT8973A is not set
@@ -6338,6 +6373,8 @@ CONFIG_ADXL345_SPI=m
 # CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
+# CONFIG_ADXL380_SPI is not set
+# CONFIG_ADXL380_I2C is not set
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
@@ -6375,7 +6412,9 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 #
 # Analog to digital converters
 #
+# CONFIG_AD4000 is not set
 # CONFIG_AD4130 is not set
+# CONFIG_AD4695 is not set
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
@@ -6427,6 +6466,7 @@ CONFIG_AD7768_1=m
 # CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
 CONFIG_ROCKCHIP_SARADC=y
 # CONFIG_RICHTEK_RTQ6056 is not set
@@ -6558,6 +6598,7 @@ CONFIG_AD5758=m
 # CONFIG_DS4424 is not set
 # CONFIG_LTC1660 is not set
 # CONFIG_LTC2632 is not set
+# CONFIG_LTC2664 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5522 is not set
@@ -6644,6 +6685,7 @@ CONFIG_MAX30102=m
 #
 # CONFIG_AM2315 is not set
 # CONFIG_DHT11 is not set
+# CONFIG_ENS210 is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
@@ -6692,6 +6734,7 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
 # CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
+# CONFIG_BH1745 is not set
 # CONFIG_BH1750 is not set
 # CONFIG_BH1780 is not set
 # CONFIG_CM32181 is not set
@@ -6831,6 +6874,7 @@ CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_MPRLS0025PA is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
+# CONFIG_SDP500 is not set
 # CONFIG_IIO_ST_PRESS is not set
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
@@ -6846,6 +6890,7 @@ CONFIG_HID_SENSOR_PRESS=m
 #
 # Proximity and distance sensors
 #
+# CONFIG_HX9023S is not set
 # CONFIG_IRSD200 is not set
 CONFIG_ISL29501=m
 # CONFIG_LIDAR_LITE_V2 is not set
@@ -6860,6 +6905,7 @@ CONFIG_MB1232=m
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
 # CONFIG_VL53L0X_I2C is not set
+# CONFIG_AW96103 is not set
 # end of Proximity and distance sensors
 
 #
@@ -6997,6 +7043,7 @@ CONFIG_NVMEM_LAYOUTS=y
 #
 # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
 # end of Layout Types
 
 # CONFIG_NVMEM_RMEM is not set
@@ -7116,6 +7163,7 @@ CONFIG_BCACHEFS_POSIX_ACL=y
 # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
 # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
 CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
@@ -7254,6 +7302,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
 # CONFIG_EROFS_FS_ZIP is not set
 # CONFIG_EROFS_FS_ONDEMAND is not set
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -7292,6 +7341,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -7316,6 +7366,7 @@ CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
+CONFIG_CIFS_COMPRESSION=y
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
@@ -7389,6 +7440,9 @@ CONFIG_KEYS=y
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -7412,6 +7466,7 @@ CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set
+# CONFIG_SECURITY_IPE is not set
 CONFIG_INTEGRITY=y
 # CONFIG_INTEGRITY_SIGNATURE is not set
 CONFIG_INTEGRITY_AUDIT=y
@@ -7428,7 +7483,12 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -7763,7 +7823,9 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
@@ -7791,7 +7853,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_DMA_DECLARE_COHERENT=y

config/kernel/linux-rockchip64-current.config

@@ -7666,7 +7666,7 @@ CONFIG_VHOST=m
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
-# CONFIG_VHOST_VSOCK is not set
+CONFIG_VHOST_VSOCK=m
 CONFIG_VHOST_VDPA=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 

config/kernel/linux-rockchip64-edge.config

@@ -1,16 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.4 Kernel Configuration
+# Linux/arm64 6.12.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110400
+CONFIG_GCC_VERSION=130200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=0
+CONFIG_RUSTC_LLVM_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
@@ -107,6 +109,7 @@ CONFIG_PREEMPT_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RT is not set
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 # CONFIG_PREEMPT_DYNAMIC is not set
@@ -179,6 +182,7 @@ CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
@@ -188,6 +192,7 @@ CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -284,6 +289,7 @@ CONFIG_CRASH_DUMP=y
 # end of General setup
 
 CONFIG_ARM64=y
+CONFIG_RUSTC_SUPPORTS_ARM64=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -439,6 +445,7 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_ARCH_SUPPORTS_KEXEC=y
@@ -447,6 +454,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
 CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
 CONFIG_TRANS_TABLE=y
 CONFIG_XEN_DOM0=y
@@ -522,8 +530,14 @@ CONFIG_ARM64_MTE=y
 CONFIG_ARM64_EPAN=y
 # end of ARMv8.7 architectural features
 
+#
+# ARMv8.9 architectural features
+#
+CONFIG_ARM64_POE=y
+CONFIG_ARCH_PKEY_BITS=3
+# end of ARMv8.9 architectural features
+
 CONFIG_ARM64_SVE=y
-CONFIG_ARM64_SME=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
@@ -650,7 +664,9 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 # CONFIG_NVHE_EL2_DEBUG is not set
+# CONFIG_PTDUMP_STAGE2_DEBUGFS is not set
 CONFIG_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 
 #
 # General architecture-dependent options
@@ -710,6 +726,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
+# CONFIG_SHADOW_CALL_STACK is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
@@ -744,6 +762,7 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@@ -758,6 +777,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -789,10 +809,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -896,7 +913,6 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold"
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD_DEPRECATED=y
 CONFIG_Z3FOLD=y
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -923,14 +939,16 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@@ -955,6 +973,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y
+CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -974,7 +994,9 @@ CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
 CONFIG_GET_FREE_REGION=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_USES_PG_ARCH_X=y
+CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
+CONFIG_ARCH_USES_PG_ARCH_3=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
@@ -993,6 +1015,8 @@ CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_EXECMEM=y
+CONFIG_NUMA_MEMBLKS=y
+# CONFIG_NUMA_EMU is not set
 
 #
 # Data Access Monitoring
@@ -1009,6 +1033,7 @@ CONFIG_NET_XGRESS=y
 CONFIG_NET_REDIRECT=y
 CONFIG_SKB_DECRYPTED=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1809,6 +1834,7 @@ CONFIG_BT_HCIUART_RTL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
+# CONFIG_BT_HCIUART_AML is not set
 CONFIG_BT_HCIBCM203X=m
 # CONFIG_BT_HCIBCM4377 is not set
 CONFIG_BT_HCIBPA10X=m
@@ -1877,6 +1903,7 @@ CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
+# CONFIG_NET_9P_USBG is not set
 # CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
 CONFIG_CEPH_LIB=m
@@ -1976,6 +2003,7 @@ CONFIG_PCI_ATS=y
 CONFIG_PCI_DOE=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_IOV=y
+# CONFIG_PCI_NPEM is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
 CONFIG_PCI_LABEL=y
@@ -2151,12 +2179,26 @@ CONFIG_CONNECTOR=m
 #
 CONFIG_ARM_SCMI_PROTOCOL=y
 # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
+
+#
+# SCMI Transport Drivers
+#
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+# end of SCMI Transport Drivers
+
+#
+# ARM SCMI NXP i.MX Vendor Protocols
+#
+# CONFIG_IMX_SCMI_BBM_EXT is not set
+# CONFIG_IMX_SCMI_MISC_EXT is not set
+# end of ARM SCMI NXP i.MX Vendor Protocols
+
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol
 
@@ -2339,6 +2381,7 @@ CONFIG_OF_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
+# CONFIG_OF_OVERLAY_KUNIT_TEST is not set
 CONFIG_OF_NUMA=y
 CONFIG_OF_CONFIGFS=y
 # CONFIG_PARPORT is not set
@@ -2347,12 +2390,15 @@ CONFIG_BLK_DEV=y
 CONFIG_CDROM=m
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_BACKEND_LZ4 is not set
+# CONFIG_ZRAM_BACKEND_LZ4HC is not set
+# CONFIG_ZRAM_BACKEND_ZSTD is not set
+# CONFIG_ZRAM_BACKEND_DEFLATE is not set
+# CONFIG_ZRAM_BACKEND_842 is not set
+CONFIG_ZRAM_BACKEND_FORCE_LZO=y
+CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_COMP_842 is not set
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
@@ -2406,6 +2452,7 @@ CONFIG_NVME_TARGET_AUTH=y
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
 CONFIG_PHANTOM=m
+# CONFIG_RPMB is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 # CONFIG_ICS932S401 is not set
@@ -2999,9 +3046,11 @@ CONFIG_ENC28J60=m
 CONFIG_ENC28J60_WRITEVERIFY=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
+# CONFIG_LAN865X is not set
 CONFIG_LAN966X_SWITCH=m
 # CONFIG_LAN966X_DCB is not set
 CONFIG_VCAP=y
+CONFIG_FDMA=y
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
@@ -3024,6 +3073,7 @@ CONFIG_NET_VENDOR_NVIDIA=y
 # CONFIG_FORCEDETH is not set
 CONFIG_NET_VENDOR_OKI=y
 # CONFIG_ETHOC is not set
+# CONFIG_OA_TC6 is not set
 CONFIG_NET_VENDOR_PACKET_ENGINES=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -3049,6 +3099,7 @@ CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139TOO is not set
 CONFIG_R8169=m
 CONFIG_R8169_LEDS=y
+# CONFIG_RTASE is not set
 CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_ROCKER=m
@@ -3200,6 +3251,7 @@ CONFIG_CAN_C_CAN=m
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_C_CAN_PCI=m
 CONFIG_CAN_CC770=m
+# CONFIG_CAN_CC770_ISA is not set
 CONFIG_CAN_CC770_PLATFORM=m
 CONFIG_CAN_CTUCANFD=m
 CONFIG_CAN_CTUCANFD_PCI=m
@@ -3211,6 +3263,7 @@ CONFIG_CAN_M_CAN_PCI=m
 CONFIG_CAN_M_CAN_PLATFORM=m
 CONFIG_CAN_M_CAN_TCAN4X5X=m
 CONFIG_CAN_PEAK_PCIEFD=m
+# CONFIG_CAN_ROCKCHIP_CANFD is not set
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_F81601=m
@@ -3218,6 +3271,7 @@ CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_PEAK_PCIEC=y
 CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_SJA1000_ISA is not set
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_SOFTING=m
 
@@ -3587,7 +3641,24 @@ CONFIG_RTW88_8821CS=m
 CONFIG_RTW88_8821CU=m
 # CONFIG_RTW88_DEBUG is not set
 # CONFIG_RTW88_DEBUGFS is not set
-# CONFIG_RTW89 is not set
+CONFIG_RTW89=m
+CONFIG_RTW89_CORE=m
+CONFIG_RTW89_PCI=m
+CONFIG_RTW89_8851B=m
+CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B_COMMON=m
+CONFIG_RTW89_8852B=m
+CONFIG_RTW89_8852BT=m
+CONFIG_RTW89_8852C=m
+CONFIG_RTW89_8922A=m
+CONFIG_RTW89_8851BE=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852BTE=m
+CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_8922AE=m
+# CONFIG_RTW89_DEBUGMSG is not set
+# CONFIG_RTW89_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
@@ -3717,7 +3788,6 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
@@ -3810,9 +3880,6 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
@@ -3837,7 +3904,6 @@ CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
@@ -4071,11 +4137,11 @@ CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
-CONFIG_HW_RANDOM_ROCKCHIP=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
 CONFIG_HW_RANDOM_CN10K=m
+CONFIG_HW_RANDOM_ROCKCHIP=m
 # CONFIG_APPLICOM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -4090,7 +4156,6 @@ CONFIG_XILLYUSB=m
 #
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=m
 
@@ -4107,6 +4172,7 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# CONFIG_I2C_MUX_MULE is not set
 # end of Multiplexer I2C Chip support
 
 CONFIG_I2C_HELPER_AUTO=y
@@ -4773,6 +4839,7 @@ CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_DEBUGFS is not set
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@@ -4867,6 +4934,7 @@ CONFIG_BCMA_DRIVER_PCI=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ADP5585 is not set
 # CONFIG_MFD_ACT8945A is not set
 CONFIG_MFD_AS3711=y
 # CONFIG_MFD_SMPRO is not set
@@ -5146,6 +5214,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_CH7322 is not set
 # CONFIG_CEC_CROS_EC is not set
 # CONFIG_CEC_GPIO is not set
+# CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC is not set
 CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # end of CEC support
@@ -5540,6 +5609,7 @@ CONFIG_VIDEO_ROCKCHIP_RGA=m
 # Verisilicon media platform drivers
 #
 CONFIG_VIDEO_HANTRO=m
+# CONFIG_VIDEO_HANTRO_HEVC_RFC is not set
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 
 #
@@ -6048,6 +6118,7 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_KUNIT_TEST is not set
 CONFIG_DRM_KMS_HELPER=y
+# CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -6123,6 +6194,7 @@ CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
 CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
 # CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
+# CONFIG_DRM_PANEL_BOE_TV101WUM_LL2 is not set
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
@@ -6455,10 +6527,10 @@ CONFIG_SND_PCM_TIMER=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_CTL_INPUT_VALIDATION is not set
+# CONFIG_SND_UTIMER is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
@@ -6847,6 +6919,7 @@ CONFIG_SND_SOC_WM8985=m
 # CONFIG_SND_SOC_ZL38060 is not set
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MT6351=m
+# CONFIG_SND_SOC_MT6357 is not set
 CONFIG_SND_SOC_MT6358=m
 CONFIG_SND_SOC_MT6660=m
 CONFIG_SND_SOC_NAU8315=m
@@ -6919,6 +6992,7 @@ CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_VIVALDI_COMMON=m
+# CONFIG_HID_GOODIX_SPI is not set
 CONFIG_HID_GOOGLE_HAMMER=m
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 # CONFIG_HID_VIVALDI is not set
@@ -7644,6 +7718,7 @@ CONFIG_RTC_DRV_RV3028=m
 # CONFIG_RTC_DRV_RV3032 is not set
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
+# CONFIG_RTC_DRV_SD2405AL is not set
 CONFIG_RTC_DRV_SD3078=m
 
 #
@@ -7733,6 +7808,7 @@ CONFIG_PLX_DMA=m
 # CONFIG_XILINX_XDMA is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
+# CONFIG_AMD_QDMA is not set
 CONFIG_QCOM_HIDMA_MGMT=y
 CONFIG_QCOM_HIDMA=y
 # CONFIG_DW_DMAC is not set
@@ -7797,6 +7873,7 @@ CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
 CONFIG_NITRO_ENCLAVES=m
+# CONFIG_ARM_PKVM_GUEST is not set
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=y
@@ -7828,7 +7905,7 @@ CONFIG_VHOST=m
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
-# CONFIG_VHOST_VSOCK is not set
+CONFIG_VHOST_VSOCK=m
 CONFIG_VHOST_VDPA=m
 # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
@@ -7960,7 +8037,6 @@ CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
 # CONFIG_MOST_COMPONENTS is not set
-# CONFIG_KS7010 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 CONFIG_FIELDBUS_DEV=m
 CONFIG_HMS_ANYBUSS_BUS=m
@@ -8033,10 +8109,12 @@ CONFIG_CLK_RK3328=y
 CONFIG_CLK_RK3368=y
 CONFIG_CLK_RK3399=y
 CONFIG_CLK_RK3568=y
+CONFIG_CLK_RK3576=y
 CONFIG_CLK_RK3588=y
 # CONFIG_XILINX_VCU is not set
 CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 # CONFIG_CLK_KUNIT_TEST is not set
+# CONFIG_CLK_FIXED_RATE_KUNIT_TEST is not set
 # CONFIG_CLK_GATE_KUNIT_TEST is not set
 # CONFIG_CLK_FD_KUNIT_TEST is not set
 # CONFIG_HWSPINLOCK is not set
@@ -8224,6 +8302,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
 CONFIG_EXTCON_PTN5150=m
 # CONFIG_EXTCON_RT8973A is not set
@@ -8267,6 +8346,8 @@ CONFIG_ADXL355_SPI=m
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
+# CONFIG_ADXL380_SPI is not set
+# CONFIG_ADXL380_I2C is not set
 CONFIG_BMA180=m
 CONFIG_BMA220=m
 CONFIG_BMA400=m
@@ -8318,7 +8399,9 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD4000 is not set
 # CONFIG_AD4130 is not set
+# CONFIG_AD4695 is not set
 CONFIG_AD7091R=m
 CONFIG_AD7091R5=m
 # CONFIG_AD7091R8 is not set
@@ -8371,6 +8454,7 @@ CONFIG_LTC2496=m
 # CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
+# CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
@@ -8515,6 +8599,7 @@ CONFIG_AD7293=m
 # CONFIG_DS4424 is not set
 CONFIG_LTC1660=m
 # CONFIG_LTC2632 is not set
+# CONFIG_LTC2664 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MAX5522 is not set
@@ -8611,6 +8696,7 @@ CONFIG_ITG3200=m
 #
 CONFIG_AM2315=m
 CONFIG_DHT11=m
+# CONFIG_ENS210 is not set
 CONFIG_HDC100X=m
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
@@ -8664,6 +8750,7 @@ CONFIG_APDS9300=m
 # CONFIG_APDS9306 is not set
 CONFIG_APDS9960=m
 # CONFIG_AS73211 is not set
+# CONFIG_BH1745 is not set
 CONFIG_BH1750=m
 CONFIG_BH1780=m
 CONFIG_CM32181=m
@@ -8820,6 +8907,7 @@ CONFIG_ICP10100=m
 # CONFIG_MPRLS0025PA is not set
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
+# CONFIG_SDP500 is not set
 # CONFIG_IIO_ST_PRESS is not set
 # CONFIG_T5403 is not set
 # CONFIG_HP206C is not set
@@ -8836,6 +8924,7 @@ CONFIG_ICP10100=m
 # Proximity and distance sensors
 #
 CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_HX9023S is not set
 # CONFIG_IRSD200 is not set
 CONFIG_ISL29501=m
 # CONFIG_LIDAR_LITE_V2 is not set
@@ -8850,6 +8939,7 @@ CONFIG_PING=m
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
 CONFIG_VL53L0X_I2C=m
+# CONFIG_AW96103 is not set
 # end of Proximity and distance sensors
 
 #
@@ -8906,7 +8996,6 @@ CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
 CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
 # CONFIG_LAN966X_OIC is not set
@@ -8978,6 +9067,7 @@ CONFIG_ARM_CCI_PMU=m
 # CONFIG_ARM_CCI5xx_PMU is not set
 # CONFIG_ARM_CCN is not set
 # CONFIG_ARM_CMN is not set
+# CONFIG_ARM_NI is not set
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_SMMU_V3_PMU is not set
 CONFIG_ARM_PMUV3=y
@@ -9015,6 +9105,7 @@ CONFIG_NVMEM_LAYOUTS=y
 #
 # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 # end of Layout Types
 
 # CONFIG_NVMEM_RAVE_SP_EEPROM is not set
@@ -9145,6 +9236,7 @@ CONFIG_BCACHEFS_POSIX_ACL=y
 # CONFIG_BCACHEFS_LOCK_TIME_STATS is not set
 # CONFIG_BCACHEFS_NO_LATENCY_ACCT is not set
 CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
+# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
 # CONFIG_MEAN_AND_VARIANCE_UNIT_TEST is not set
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_POSIX_ACL=y
@@ -9242,6 +9334,7 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=m
@@ -9329,6 +9422,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_XATTR=y
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
 # CONFIG_EROFS_FS_ZIP is not set
 CONFIG_EROFS_FS_ONDEMAND=y
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -9368,6 +9462,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -9395,6 +9490,7 @@ CONFIG_CIFS_DEBUG=y
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
@@ -9525,6 +9621,7 @@ CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_SAFESETID=y
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
 # CONFIG_SECURITY_LANDLOCK is not set
+# CONFIG_SECURITY_IPE is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -9550,7 +9647,12 @@ CONFIG_LSM="lockdown,yama,integrity,apparmor"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -9922,7 +10024,9 @@ CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_XZ_DEC_TEST=m
@@ -9952,7 +10056,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_FLAGS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -10002,6 +10106,7 @@ CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@@ -10306,6 +10411,7 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set
@@ -10314,6 +10420,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_SORT is not set
 CONFIG_TEST_DIV64=m
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_TEST_IOV_ITER is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
@@ -10381,3 +10488,5 @@ CONFIG_MEMTEST=y
 #
 # end of Rust hacking
 # end of Kernel hacking
+
+# CONFIG_INT_POW_TEST is not set

config/kernel/linux-sm8250-current.config

@@ -2776,7 +2776,37 @@ CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADC is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+# CONFIG_JOYSTICK_AS5011 is not set
+# CONFIG_JOYSTICK_JOYDUMP is not set
+# CONFIG_JOYSTICK_XPAD is not set
+CONFIG_JOYSTICK_ODIN2=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+# CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
+# CONFIG_JOYSTICK_FSIA6B is not set
+# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_JOYSTICK_SEESAW is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_NT36523_SPI=m
@@ -2830,7 +2860,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_ONCELL=m
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
@@ -2864,6 +2894,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_E3X0_BUTTON is not set
 CONFIG_INPUT_PM8941_PWRKEY=y
 CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_QCOM_SPMI_HAPTICS=m
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_GPIO_DECODER is not set
@@ -2944,9 +2975,10 @@ CONFIG_LDISC_AUTOLOAD=y
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 # CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MSM is not set
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_QCOM_GENI=y
-# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set
+CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
@@ -3455,6 +3487,8 @@ CONFIG_BATTERY_BQ27XXX_I2C=y
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
 # CONFIG_CHARGER_QCOM_SMB2 is not set
+CONFIG_CHARGER_QCOM_SMB5=m
+CONFIG_BATTERY_QCOM_FG=m
 # CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4337,6 +4371,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
+CONFIG_DRM_PANEL_DDIC_CH13726A=m
 # CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
@@ -4603,7 +4638,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 # end of Console display driver support
 
@@ -4953,7 +4988,7 @@ CONFIG_SND_SOC_WCD938X_SDW=m
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_WSA881X is not set
+CONFIG_SND_SOC_WSA881X=m
 # CONFIG_SND_SOC_WSA883X is not set
 # CONFIG_SND_SOC_WSA884X is not set
 # CONFIG_SND_SOC_ZL38060 is not set
@@ -5463,10 +5498,15 @@ CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_RT1711H is not set
+# CONFIG_TYPEC_MT6360 is not set
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
-# CONFIG_TYPEC_FUSB302 is not set
+CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC_QCOM_PMIC=m
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+# CONFIG_UCSI_ACPI is not set
+# CONFIG_UCSI_STM32G0 is not set
+CONFIG_UCSI_PMIC_GLINK=m
 CONFIG_TYPEC_TPS6598X=m
 # CONFIG_TYPEC_ANX7411 is not set
 # CONFIG_TYPEC_RT1719 is not set
@@ -5477,11 +5517,11 @@ CONFIG_TYPEC_HD3SS3220=m
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
-# CONFIG_TYPEC_MUX_FSA4480 is not set
-# CONFIG_TYPEC_MUX_GPIO_SBU is not set
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_GPIO_SBU=m
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_MUX_IT5205 is not set
-# CONFIG_TYPEC_MUX_NB7VPQ904M is not set
+CONFIG_TYPEC_MUX_NB7VPQ904M=m
 # CONFIG_TYPEC_MUX_PTN36502 is not set
 # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -5489,11 +5529,72 @@ CONFIG_TYPEC_HD3SS3220=m
 #
 # USB Type-C Alternate Mode drivers
 #
-# CONFIG_TYPEC_DP_ALTMODE is not set
+CONFIG_TYPEC_DP_ALTMODE=m
+# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # end of USB Type-C Alternate Mode drivers
 
 CONFIG_USB_ROLE_SWITCH=y
-# CONFIG_MMC is not set
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=32
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_QCOM_DML=y
+# CONFIG_MMC_STM32_SDMMC is not set
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+# CONFIG_MMC_SDHCI_PCI is not set
+# CONFIG_MMC_SDHCI_ACPI is not set
+CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+# CONFIG_MMC_SDHCI_OF_SPARX5 is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
+# CONFIG_MMC_SDHCI_ESDHC_IMX is not set
+# CONFIG_MMC_SDHCI_TEGRA is not set
+# CONFIG_MMC_SDHCI_S3C is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
+# CONFIG_MMC_SDHCI_IPROC is not set
+# CONFIG_MMC_SDHCI_NPCM is not set
+# CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MESON_MX_SDIO is not set
+CONFIG_MMC_SDHCI_MSM=y
+# CONFIG_MMC_MXC is not set
+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_SDHCI_SPRD is not set
+# CONFIG_MMC_SDHI is not set
+# CONFIG_MMC_UNIPHIER is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_SH_MMCIF is not set
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MMC_USDHI6ROL0 is not set
+# CONFIG_MMC_SUNXI is not set
+CONFIG_MMC_CQHCI=y
+# CONFIG_MMC_HSQ is not set
+# CONFIG_MMC_TOSHIBA_PCI is not set
+# CONFIG_MMC_BCM2835 is not set
+# CONFIG_MMC_MTK is not set
+# CONFIG_MMC_SDHCI_BRCMSTB is not set
+# CONFIG_MMC_SDHCI_XENON is not set
+# CONFIG_MMC_SDHCI_AM654 is not set
+# CONFIG_MMC_OWL is not set
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFS_BSG=y
 # CONFIG_SCSI_UFS_HWMON is not set
@@ -5506,7 +5607,7 @@ CONFIG_SCSI_UFS_QCOM=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_CLASS_MULTICOLOR is not set
+CONFIG_LEDS_CLASS_MULTICOLOR=y
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
 
 #
@@ -5519,6 +5620,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
 # CONFIG_LEDS_EL15203000 is not set
+CONFIG_LEDS_HTR3212=m
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3532 is not set
 # CONFIG_LEDS_LM3642 is not set
@@ -5562,6 +5664,11 @@ CONFIG_LEDS_SYSCON=y
 #
 # RGB LED drivers
 #
+CONFIG_LEDS_GROUP_MULTICOLOR=y
+# CONFIG_LEDS_KTD202X is not set
+# CONFIG_LEDS_NCP5623 is not set
+CONFIG_LEDS_PWM_MULTICOLOR=y
+CONFIG_LEDS_QCOM_LPG=y
 
 #
 # LED Triggers

config/sources/amd64.conf

@@ -17,12 +17,12 @@ declare -g QEMU_BINARY='qemu-x86_64-static' # Hopefully you have this installed.
 # See https://uapi-group.org/specifications/specs/discoverable_partitions_specification/
 declare -g PARTITION_TYPE_UUID_ROOT="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709" # "Linux root (x86-64)"
 
-declare -g MAIN_CMDLINE=''                  # we set it in common, it was not set before
-declare -g KERNEL_COMPILER=' '              # hack: use single space for host gcc. won't work on arm64 hosts
-declare -g KERNEL_USE_GCC=' '               # more hacks.
-declare -g KERNEL_EXTRA_TARGETS='modules'   # default is "modules dtb" but x86_64 has no DTB
-declare -g KERNEL_BUILD_DTBS="no"           # amd64 has no DTBs. that I know of.
-declare -g UBOOT_USE_GCC='none'             # required by configuration.sh
+declare -g MAIN_CMDLINE=''                # we set it in common, it was not set before
+declare -g KERNEL_COMPILER=' '            # hack: use single space for host gcc. won't work on arm64 hosts
+declare -g KERNEL_USE_GCC=' '             # more hacks.
+declare -g KERNEL_EXTRA_TARGETS='modules' # default is "modules dtb" but x86_64 has no DTB
+declare -g KERNEL_BUILD_DTBS="no"         # amd64 has no DTBs. that I know of.
+declare -g UBOOT_USE_GCC='none'           # required by configuration.sh
 #declare -g INITRD_ARCH=amd64               # Used by u-boot for mkimage in initramfs. No u-boot for x86 yet.
 
 # Defaults, if not set by board or family.

config/sources/families/rk35xx.conf

@@ -37,7 +37,7 @@ case $BRANCH in
 		declare -g KERNEL_MAJOR_MINOR="6.1"    # Major and minor versions of this kernel.
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
 		KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
-		KERNELBRANCH='branch:rk-6.1-rkr3'
+		KERNELBRANCH='branch:rk-6.1-rkr4.1'
 		KERNELPATCHDIR='rk35xx-vendor-6.1'
 		;;
 esac

config/sources/families/rockchip-rk3588.conf

@@ -34,7 +34,7 @@ case $BRANCH in
 		declare -g KERNEL_MAJOR_MINOR="6.1"    # Major and minor versions of this kernel.
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
 		KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
-		KERNELBRANCH='branch:rk-6.1-rkr3'
+		KERNELBRANCH='branch:rk-6.1-rkr4.1'
 		KERNELPATCHDIR='rk35xx-vendor-6.1'
 		LINUXFAMILY=rk35xx
 		;;
@@ -42,7 +42,7 @@ case $BRANCH in
 	current)
 		# Branch based on a stable kernel release (will stay on the next LTS kernel release once released, 6.12? LTS)
 		LINUXFAMILY=rockchip-rk3588
-		KERNEL_MAJOR_MINOR="6.12"                                  # Major and minor versions of this kernel.
+		KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
 		LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
 		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
 		;;
@@ -50,7 +50,7 @@ case $BRANCH in
 	edge)
 		# Branch based on the latest kernel release including RC releases, to benefit from the latest RK3588 mainline advancements. Might be unstable!
 		LINUXFAMILY=rockchip-rk3588
-		KERNEL_MAJOR_MINOR="6.12"                                 # Major and minor versions of this kernel.
+		KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
 		LINUXCONFIG="linux-rockchip-rk3588-${BRANCH}"
 		# No need to set KERNELPATCHDIR, since default is: KERNELPATCHDIR='archive/rockchip-rk3588-${KERNEL_MAJOR_MINOR}'
 		;;

config/sources/families/rockchip.conf

@@ -56,7 +56,7 @@ case $BRANCH in
 
 	edge)
 
-		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
 		;;
 
 esac
@@ -97,7 +97,7 @@ if [[ "$BOOT_SOC" == "rk3288" ]]; then
 		# fi
 		#
 		# run_host_command_logged cat spl/u-boot-spl-dtb.bin >> u-boot-rockchip-with-spl.bin
-		
+
 		run_host_command_logged cat idbloader.img > u-boot-rockchip-with-spl.bin
 		run_host_command_logged dd if=u-boot-dtb.img of=u-boot-rockchip-with-spl.bin seek=$((0x200 - 0x40)) conv=notrunc
 

config/sources/families/spacemit.conf

@@ -76,8 +76,8 @@ write_uboot_platform() {
 
 	declare -A d
 	d=(
-	[${1}/bootinfo_emmc.bin]="0:$(du -b ${1}/bootinfo_emmc.bin | awk '{print $1}')"
-	[${1}/FSBL.bin]="512:$(du -b ${1}/FSBL.bin | awk '{print $1}')"
+		[${1} / bootinfo_emmc.bin]="0:$(du -b ${1}/bootinfo_emmc.bin | awk '{print $1}')"
+		[${1} / FSBL.bin]="512:$(du -b ${1}/FSBL.bin | awk '{print $1}')"
 	)
 
 	if [ -b ${2}boot0 ]; then
@@ -86,11 +86,9 @@ write_uboot_platform() {
 		sync
 	fi
 
-	for f in "${!d[@]}"
-	do
+	for f in "${!d[@]}"; do
 		if $(dd if=${device} bs=1 skip="${d[$f]%:*}" count="${d[$f]#*:}" \
-			conv=notrunc status=noxfer 2>/dev/null | cmp --quiet "${f}")
-		then
+			conv=notrunc status=noxfer 2> /dev/null | cmp --quiet "${f}"); then
 			echo "Skip $(basename $f), it is equal to the existing one"
 		else
 			echo "# Write =: $(basename $f) to ${device}"

extensions/image-output-abl.sh

@@ -5,6 +5,11 @@ function add_host_dependencies__abl_host_deps() {
 function post_build_image__900_convert_to_abl_img() {
 	[[ -z $version ]] && exit_with_error "version is not set"
 
+	if [ ! -z "$UEFI_GRUB_TARGET" ]; then
+		display_alert "Ignore" "${EXTENSION}" "info"
+		return 0
+	fi
+
 	if [ ! -z "$BOOTFS_TYPE" ]; then
 		return 0
 	fi

lib/functions/artifacts/artifact-armbian-bsp-cli.sh

@@ -60,7 +60,7 @@ function artifact_armbian-bsp-cli_prepare_version() {
 		"INITRD_ARCH: ${INITRD_ARCH}"                                 # /etc/armbian-release
 		"KERNEL_IMAGE_TYPE: ${KERNEL_IMAGE_TYPE}"                     # /etc/armbian-release
 		"VENDOR: ${VENDOR}"                                           # /etc/armbian-release
-		"OVERLAY_DIR: ${OVERLAY_DIR}"                                   # /etc/armbian-release
+		"OVERLAY_DIR: ${OVERLAY_DIR}"                                 # /etc/armbian-release
 		"KERNEL_TARGET: ${KERNEL_TARGET}"                             # /etc/armbian-release
 		"KERNEL_TEST_TARGET: ${KERNEL_TEST_TARGET}"                   # /etc/armbian-release
 		"BOOT_SOC: ${BOOT_SOC}"                                       # /etc/armbian-release # See https://github.com/armbian/build/pull/6411

lib/functions/compilation/kernel-make.sh

@@ -53,7 +53,7 @@ function run_kernel_make_internal() {
 		"ARCH=${ARCHITECTURE}"                   # Key param. Everything depends on this.
 		"LOCALVERSION=-${BRANCH}-${LINUXFAMILY}" # Change the internal kernel version to include the family. Changing this causes recompiles # @TODO change hack at .config; that might handles mtime better
 
-		"${cc_name}=${CCACHE} ${DISTCC_CROSS_COMPILE_PREFIX[@]} ${KERNEL_COMPILER}"                    # added as prefix to every compiler invocation by make
+		"${cc_name}=${CCACHE} ${DISTCC_CROSS_COMPILE_PREFIX[@]} ${KERNEL_COMPILER}"                                         # added as prefix to every compiler invocation by make
 		"KCFLAGS=-fdiagnostics-color=always -Wno-error=misleading-indentation ${extra_warnings} ${KERNEL_EXTRA_CFLAGS:-""}" # Force GCC colored messages, downgrade misleading indentation to warning
 
 		"SOURCE_DATE_EPOCH=${kernel_base_revision_ts}"        # https://reproducible-builds.org/docs/source-date-epoch/ and https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html

lib/functions/compilation/packages/armbian-config-deb.sh

@@ -66,7 +66,7 @@ compile_armbian-config() {
 
 	# Add development repository to keep rooling release of this tool
 	cat <<- END > ${tmp_dir}/${armbian_config_dir}/etc/apt/sources.list.d/armbian-config.list
-	deb [signed-by=/usr/share/keyrings/armbian.gpg] https://github.armbian.com/configng stable main
+		deb [signed-by=/usr/share/keyrings/armbian.gpg] https://github.armbian.com/configng stable main
 	END
 
 	dpkg_deb_build "${tmp_dir}/${armbian_config_dir}" "armbian-config"

lib/functions/compilation/patch/drivers_network.sh

@@ -381,7 +381,7 @@ driver_rtl8852bs() {
 
 		# Bugfix/workaround: Comment undefined RTW_WARN_LMT
 		# @TODO Check on update if this fix is still needed (added 2024-July-10)
-		sed -i  "s/RTW_WARN_LMT(/\/\/RTW_WARN_LMT(/g"  \
+		sed -i "s/RTW_WARN_LMT(/\/\/RTW_WARN_LMT(/g" \
 			"$kerneldir/drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c"
 
 		# Add to section Makefile

lib/functions/general/oci-oras.sh

@@ -85,7 +85,7 @@ function run_tool_oras() {
 	display_alert "Running ORAS ${ACTUAL_VERSION}" "HOME='${ORAS_HOME}'; retries='${retries:-1}'; cmdline: $*" "debug"
 	if [[ "${retries:-1}" -gt 1 ]]; then
 		display_alert "Calling ORAS with retries ${retries}" "$*" "debug"
-		sleep_seconds="30" do_with_retries "${retries}" env -i "HOME=${ORAS_HOME}" "HTTPS_PROXY=${HTTPS_PROXY}"  "${ORAS_BIN}" "$@"
+		sleep_seconds="30" do_with_retries "${retries}" env -i "HOME=${ORAS_HOME}" "HTTPS_PROXY=${HTTPS_PROXY}" "${ORAS_BIN}" "$@"
 	else
 		# If any parameters passed, call ORAS, otherwise exit. We call it this way (sans-parameters) early to prepare ORAS tooling.
 		if [[ $# -eq 0 ]]; then

lib/functions/rootfs/apt-install.sh

@@ -103,7 +103,7 @@ function install_deb_chroot() {
 	# install in chroot via apt-get, not dpkg, so dependencies are also installed from repo if needed.
 	declare -g if_error_detail_message="Installation of $install_target failed ${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
 	declare -a extra_apt_envs=()
-	extra_apt_envs+=("ARMBIAN_IMAGE_BUILD_BOOTFS_TYPE=${BOOTFS_TYPE:-"unset"}")                             # used by package postinst scripts to bevahe
+	extra_apt_envs+=("ARMBIAN_IMAGE_BUILD_BOOTFS_TYPE=${BOOTFS_TYPE:-"unset"}")                                              # used by package postinst scripts to bevahe
 	DONT_MAINTAIN_APT_CACHE="yes" chroot_sdcard_apt_get --no-install-recommends "${apt_options}" install "${install_target}" # don't auto-maintain apt cache when installing from packages.
 	unset extra_apt_envs
 

lib/functions/rootfs/distro-agnostic.sh

@@ -390,11 +390,11 @@ function install_distribution_agnostic() {
 	# enable additional services, if they exist.
 	display_alert "Enabling Armbian services" "systemd" "info"
 	if [[ -f "${SDCARD}"/lib/systemd/system/armbian-firstrun.service ]]; then
-	    # Note: armbian-firstrun starts before the user has a chance to edit the env file's values.
-	    # Exceptionaly, the env file can be edited during image build time
-        if test -n "$OPENSSHD_REGENERATE_HOST_KEYS"; then
-            sed -i "s/\(^OPENSSHD_REGENERATE_HOST_KEYS *= *\).*/\1$OPENSSHD_REGENERATE_HOST_KEYS/" "${SDCARD}"/etc/default/armbian-firstrun
-        fi
+		# Note: armbian-firstrun starts before the user has a chance to edit the env file's values.
+		# Exceptionaly, the env file can be edited during image build time
+		if test -n "$OPENSSHD_REGENERATE_HOST_KEYS"; then
+			sed -i "s/\(^OPENSSHD_REGENERATE_HOST_KEYS *= *\).*/\1$OPENSSHD_REGENERATE_HOST_KEYS/" "${SDCARD}"/etc/default/armbian-firstrun
+		fi
 		chroot_sdcard systemctl --no-reload enable armbian-firstrun.service
 	fi
 	[[ -f "${SDCARD}"/lib/systemd/system/armbian-zram-config.service ]] && chroot_sdcard systemctl --no-reload enable armbian-zram-config.service

packages/bsp/common/usr/bin/armbianmonitor

@@ -82,7 +82,7 @@
 ############################################################################
 
 # Config:
-declare -a paste_servers=("paste.armbian.com" "paste.next.armbian.com")
+declare -a paste_servers=("paste.armbian.com" "paste.next.armbian.com" "paste.armbian.de")
 if [[ "${PASTE_SERVER_HOST}" != "" ]]; then
 	echo "Using custom paste server: '${PASTE_SERVER_HOST}'"
 	paste_servers=("${PASTE_SERVER_HOST}" "${paste_servers[@]}")

packages/bsp/retroidpocket/90-feedbackd-spmi-haptics.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", SUBSYSTEMS=="input", ATTRS{name}=="spmi_haptics", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"

packages/bsp/retroidpocket/99-ignore-gamepad.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="input", ATTRS{name}=="Retroid Pocket Controller", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"

packages/bsp/rockpis/etc/udev/rules.d/05-fixMACaddress.rules

@@ -1,6 +1,13 @@
-#If a network interface is being assigned a new, different address on each boot,
-#enable the corresponding line below to derive its MAC addr from UUID of rootfs
-#Beware that all the two digit hex code prefixes below must be unique!
+#If a network interface is being assigned a different MAC address on each boot,
+#or the MAC address is based on a disk image (rather than a hardware serial #),
+#enable the corresponding line below to derive that interface's MAC address from
+#the RK3308 SOC's unique serial number.
+
+#All the two digit hex code prefixes passed to fixEtherAddr should be unique
+#and chosen such that (n-2)%4 == 0
 
 KERNEL=="wlan0", ACTION=="add" RUN+="fixEtherAddr %k 0a"
 KERNEL=="p2p0", ACTION=="add" RUN+="fixEtherAddr %k 0e"
+
+#U-Boot >=V2024.10 sets the built-in Ethernet MAC adr from the SOC serial number
+#KERNEL=="end0", ACTION=="add" RUN+="fixEtherAddr %k 06"

patch/kernel/archive/rockchip-6.11/patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch

@@ -1,63 +0,0 @@
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index 0370bb247fcb..55c0b8dddad5 100644
---- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c	2023-06-25 03:23:55.724209412 +0000
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c	2023-06-25 04:16:27.469899470 +0000
-@@ -254,35 +245,31 @@
- 			    const struct drm_display_info *info,
- 			    const struct drm_display_mode *mode)
- {
--	struct rockchip_hdmi *hdmi = data;
--	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
--	int pclk = mode->clock * 1000;
--	bool exact_match = hdmi->plat_data->phy_force_vendor;
--	int i;
--
--	if (hdmi->ref_clk) {
--		int rpclk = clk_round_rate(hdmi->ref_clk, pclk);
--
--		if (abs(rpclk - pclk) > pclk / 1000)
--			return MODE_NOCLOCK;
--	}
--
--	for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
--		/*
--		 * For vendor specific phys force an exact match of the pixelclock
--		 * to preserve the original behaviour of the driver.
--		 */
--		if (exact_match && pclk == mpll_cfg[i].mpixelclock)
--			return MODE_OK;
--		/*
--		 * The Synopsys phy can work with pixelclocks up to the value given
--		 * in the corresponding mpll_cfg entry.
--		 */
--		if (!exact_match && pclk <= mpll_cfg[i].mpixelclock)
--			return MODE_OK;
-+	struct dw_hdmi_plat_data *pdata = (struct dw_hdmi_plat_data *)data;
-+	const struct dw_hdmi_mpll_config *mpll_cfg = pdata->mpll_cfg;
-+	int clock = mode->clock;
-+	unsigned int i = 0;
-+
-+	if (pdata->ycbcr_420_allowed && drm_mode_is_420(info, mode) &&
-+	    (info->color_formats & DRM_COLOR_FORMAT_YCBCR420)) {
-+		clock /= 2;
-+		mpll_cfg = pdata->mpll_cfg_420;
-+	}
-+
-+	if ((!mpll_cfg && clock > 340000) ||
-+	    (info->max_tmds_clock && clock > info->max_tmds_clock))
-+		return MODE_CLOCK_HIGH;
-+
-+	if (mpll_cfg) {
-+		while ((clock * 1000) < mpll_cfg[i].mpixelclock &&
-+		       mpll_cfg[i].mpixelclock != (~0UL))
-+		       i++;
-+
-+		if (mpll_cfg[i].mpixelclock == (~0UL))
-+			return MODE_CLOCK_HIGH;
- 	}
- 
--	return MODE_BAD;
-+	return MODE_OK;
- }
- 
- static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder)

patch/kernel/archive/rockchip-6.12/0000.patching_config.yaml

@@ -1,10 +1,10 @@
 config:
   # Just some info stuff; not used by the patching scripts
-  name: rockchip-6.11
+  name: rockchip-6.12
   kind: kernel
   type: mainline # or: vendor
-  branch: linux-6.11.y
-  last-known-good-tag: v6.11
+  branch: linux-6.12.y
+  last-known-good-tag: v6.12
   maintainers:
     - { github: paolo.sabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock }
 

patch/kernel/archive/rockchip-6.12/libreelec.series

@@ -4,6 +4,5 @@
 	patches.libreelec/linux-1000-drm-rockchip.patch
 	patches.libreelec/linux-1001-v4l2-rockchip.patch
 	patches.libreelec/linux-1002-for-libreelec.patch
-	patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch
 	patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch
 	patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch