(#9400 P1b) configuration: change-tracking: replace eval with nameref

The original code used eval to read an array variable with a dynamic name: eval "var_value=\"\${${var_name}[@]}\"" # sorry eval works, but it executes arbitrary code — if $var_name were ever a crafted string, it could inject commands. bash 4.3+ nameref (local -n) creates an alias to the variable named in $var_name without executing any code: local -n _ct_arr_ref="${var_name}" var_value="${_ct_arr_ref[*]}" unset -n _ct_arr_ref unset -n removes only the alias (not the referenced array), preventing "already a nameref" warnings on subsequent loop iterations. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(#9400 P1b) configuration: interactive: replace eval with declare -g
2026-03-02 02:55:58 +02:00 · 2026-03-02 02:51:26 +02:00 · 2026-03-02 02:50:49 +02:00
385 changed files with 37198 additions and 70687 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -25,10 +25,7 @@ config/boards/armsom-forge1.csc		@amazingfate
 config/boards/armsom-sige1.csc		@amazingfate
 config/boards/armsom-sige3.csc		@amazingfate
 config/boards/avaota-a1.csc		@chainsx
-config/boards/ayn-odin2.csc		@FantasyGmm @Squishy123 @kasimling
-config/boards/ayn-odin2mini.csc		@Squishy123
-config/boards/ayn-odin2portal.csc		@Squishy123
-config/boards/ayn-thor.csc		@Squishy123
+config/boards/ayn-odin2.csc		@Squishy123 @kasimling
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
 config/boards/bananapif3.conf		@pyavitz
@ -187,7 +184,7 @@ config/boards/rockpi-e.conf		@paolosabatino
 config/boards/rockpi-s.conf		@brentr
 config/boards/rockpro64.csc		@joekhoobyar
 config/boards/rpi4b.conf		@PanderMusubi @teknoid
-config/boards/sakurapi-rk3308b.conf		@TheSnowfield
+config/boards/sakurapi-rk3308b.csc		@TheSnowfield
 config/boards/sk-am62-lp.conf		@jonaswood01
 config/boards/sk-am62-sip.conf		@jonaswood01
 config/boards/sk-am62b.conf		@jonaswood01
@ -238,7 +235,7 @@ config/kernel/linux-rockchip-*.config		@amazingfate @paolosabatino @vidplace7
 config/kernel/linux-rockchip-rv1106-*.config		@vidplace7
 config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Lemon1151 @SuperKali @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @chainsx @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @rbqvq @redrathnure @retro98boy @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@amazingfate
-config/kernel/linux-sm8550-*.config		@FantasyGmm @Squishy123 @kasimling
+config/kernel/linux-sm8550-*.config		@Squishy123 @kasimling
 config/kernel/linux-spacemit-*.config		@pyavitz @sven-ola
 config/kernel/linux-starfive2-*.config		@libiunc
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
@ -261,7 +258,7 @@ patch/atf/atf-qcs6490/		@HeyMeco
 patch/atf/atf-rockchip64/v2.13/		@150balbes @ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @ahoneybun @alexl83 @amazingfate @andyshrk @fridtjof @joekhoobyar @linhz0hz @paolosabatino @prahal
 patch/atf/atf-rockchip64/v2.14/		@HeyMeco
 patch/atf/atf-sm8250/		@amazingfate
-patch/atf/atf-sm8550/		@FantasyGmm @Squishy123 @kasimling
+patch/atf/atf-sm8550/		@Squishy123 @kasimling
 patch/atf/atf-spacemit/		@pyavitz @sven-ola
 patch/atf/atf-sun55iw3-syterkit/		@chainsx
 patch/atf/atf-sunxi64/		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
@ -281,7 +278,7 @@ patch/kernel/archive/realtek-rtd1619b-*/		@wei633
 patch/kernel/archive/rockchip-*/		@paolosabatino
 patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Lemon1151 @SuperKali @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @chainsx @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @pyavitz @rbqvq @redrathnure @retro98boy @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 patch/kernel/archive/sm8250-*/		@amazingfate
-patch/kernel/archive/sm8550-*/		@FantasyGmm @Squishy123 @kasimling
+patch/kernel/archive/sm8550-*/		@Squishy123 @kasimling
 patch/kernel/archive/spacemit-*/		@pyavitz @sven-ola
 patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @PanderMusubi @Qvy-png @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @igorpecovnik @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/kernel/archive/uefi-arm64-*/		@PeterChrz @rpardini
@ -323,7 +320,7 @@ patch/u-boot/v2024.07/		@igorpecovnik
 patch/u-boot/v2024.07/board_station-m1/		@150balbes
 patch/u-boot/v2024.10/		@brentr @pyavitz
 patch/u-boot/v2024.10/board_bigtreetech-cb2/		@JohnTheCoolingFan
-patch/u-boot/v2025-sunxi/		@The-going @alexl83 @chraac
+patch/u-boot/v2025-sunxi/		@The-going @alexl83 @chraac @igorpecovnik
 patch/u-boot/v2025.01-rc3-coolpi-cm5/		@andyshrk
 patch/u-boot/v2025.01/		@joekhoobyar @torte71
 patch/u-boot/v2025.01/board_h96-tvbox-3566/		@hqnicolas
@ -333,7 +330,7 @@ patch/u-boot/v2025.10/board_9tripod-x3568-v4/		@rbqvq
 patch/u-boot/v2025.10/board_helios4/		@leggewie
 patch/u-boot/v2026.01/		@150balbes @ColorfulRhino @NicoD-SBC @SuperKali @Tonymac32 @alexl83 @amazingfate @igorpecovnik @jeanrhum @linhz0hz @pyavitz @retro98boy @rpardini @schwar3kat
 patch/u-boot/v2026.01/board_helios64/		@prahal
-patch/u-boot/v2026.04/		@HeyMeco @efectn
+patch/u-boot/v2026.04/		@HeyMeco
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/genio.conf		@HeyMeco
 sources/families/imx8m.conf		@schmiedelm
@ -360,7 +357,7 @@ sources/families/rockchip-rv1106.conf		@vidplace7
 sources/families/rockchip.conf		@amazingfate @paolosabatino @vidplace7
 sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @Lemon1151 @TheSnowfield @Tonymac32 @ahoneybun @andyshrk @brentr @hqnicolas @igorpecovnik @joekhoobyar @mlegenovic @paolosabatino @prahal @rbqvq @redrathnure @retro98boy @rpardini @sicXnull @torte71 @utlark
 sources/families/sm8250.conf		@amazingfate
-sources/families/sm8550.conf		@FantasyGmm @Squishy123 @kasimling
+sources/families/sm8550.conf		@Squishy123 @kasimling
 sources/families/spacemit.conf		@pyavitz @sven-ola
 sources/families/starfive2.conf		@libiunc
 sources/families/sun50iw1.conf		@Kreyren @PanderMusubi @Qvy-png @devdotnetorg @eliasbakken
--- a/.github/workflows/data-sync-board-list.yml
+++ b/.github/workflows/data-sync-board-list.yml
@ -7,9 +7,6 @@ on:
      - "config/boards/*.*"
    branches: [main]

-permissions:
-  contents: read
-
 jobs:
  update-board-list-dispatch:
    name: Send dispatch
--- a/.github/workflows/data-sync-labels.yml
+++ b/.github/workflows/data-sync-labels.yml
@ -12,9 +12,6 @@ on:
    paths:
      - ".github/labels.yml"

-permissions:
-  contents: read
-
 jobs:
  labeler:
    permissions:
@ -30,7 +27,7 @@ jobs:
        uses: actions/checkout@v6

      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v6
+        uses: crazy-max/ghaction-github-labeler@v5
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          yaml-file: .github/labels.yml
--- a/.github/workflows/infrastructure-dispatch-to-fork.yml
+++ b/.github/workflows/infrastructure-dispatch-to-fork.yml
@ -8,9 +8,6 @@ on:
  pull_request:
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  dispatch-on-forked-repo:
    name: 📢 Run repository dispatch on fork
--- a/.github/workflows/maintenance-announce-merge.yml
+++ b/.github/workflows/maintenance-announce-merge.yml
@ -4,9 +4,6 @@ on:
  push:
    branches: [ main ]

-permissions:
-  contents: read
-
 jobs:
  announcepush:
    # Do not run this workflow in forks
--- a/.github/workflows/maintenance-announce-pr.yml
+++ b/.github/workflows/maintenance-announce-pr.yml
@ -5,14 +5,11 @@ on:
  pull_request:
    types: [ labeled ]

-permissions:
-  contents: read
-
 jobs:
  Announce:
    permissions:
      pull-requests: read
-      contents: read
+
    runs-on: ubuntu-latest
    if: ${{ github.repository == 'armbian/build' && github.event.label.id == '6210849975' }}
    steps:
--- a/.github/workflows/maintenance-check-board-assets.yml
+++ b/.github/workflows/maintenance-check-board-assets.yml
@ -13,9 +13,6 @@ env:
  BOARD_IMAGES_DIR: "board-images"
  VENDOR_LOGOS_DIR: "board-vendor-logos"

-permissions:
-  contents: read
-
 jobs:
  Check:
    name: "Verify assets for newly added boards"
--- a/.github/workflows/maintenance-clean-workflow-logs.yml
+++ b/.github/workflows/maintenance-clean-workflow-logs.yml
@ -15,9 +15,6 @@ env:
  SCHEDULED_RUNS_OLDER_THAN: "10"
  SCHEDULED_RUNS_TO_KEEP: "0"

-permissions:
-  contents: read
-
 jobs:
  clean-logs:
    runs-on: ubuntu-latest
--- a/.github/workflows/maintenance-label-on-approval.yml
+++ b/.github/workflows/maintenance-label-on-approval.yml
@ -4,22 +4,18 @@ on:
    workflows: ["Maintenance: Listen PR review"]
    types: [completed]

-permissions:
-  contents: read
-
 jobs:
  label:
    if: ${{ github.event.workflow_run.conclusion == 'success' }}
    runs-on: ubuntu-latest
    permissions:
-      actions: read
      contents: read
      issues: write
      pull-requests: write

    steps:
      - name: Download PR number artifact from upstream run
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: pr-number-${{ github.event.workflow_run.id }}   # same unique name
          path: .
--- a/.github/workflows/maintenance-listen-review.yml
+++ b/.github/workflows/maintenance-listen-review.yml
@ -3,9 +3,6 @@ on:
  pull_request_review:
    types: [submitted]

-permissions:
-  contents: read
-
 jobs:
  ping:
    if: ${{ github.event.review.state == 'approved' }}
@ -16,7 +13,7 @@ jobs:
      - name: Save PR number
        run: echo "${{ github.event.pull_request.number }}" > pr.txt

-      - uses: actions/upload-artifact@v7.0.0
+      - uses: actions/upload-artifact@v6.0.0
        with:
          # unique name: includes workflow run id
          name: pr-number-${{ github.run_id }}
--- a/.github/workflows/maintenance-rewrite-kernel-configs.yml
+++ b/.github/workflows/maintenance-rewrite-kernel-configs.yml
@ -162,7 +162,7 @@ jobs:

      - name: Upload artifact (per job; unique; overwrite safe)
        if: steps.collect.outputs.nothing_to_upload != 'true'
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v6.0.0
        with:
          name: changes-${{ matrix.linuxfamily }}-${{ matrix.branch }}-${{ matrix.board }}-${{ github.run_attempt }}
          path: artifact/${{ matrix.linuxfamily }}-${{ matrix.branch }}-${{ matrix.board }}
@ -181,7 +181,7 @@ jobs:

      - name: Download all change artifacts (no merge)
        continue-on-error: true
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          path: _artifacts
          pattern: changes-*
--- a/.github/workflows/maintenance-security-scan.yml
+++ b/.github/workflows/maintenance-security-scan.yml
@ -52,7 +52,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: SARIF file
          path: results.sarif
--- a/.github/workflows/maintenance-welcome-issue.yml
+++ b/.github/workflows/maintenance-welcome-issue.yml
@ -4,9 +4,6 @@ on:
  issues:
    types: opened

-permissions:
-  contents: read
-
 jobs:
  welcome-first-time-contributor:
    runs-on: ubuntu-latest
--- a/.github/workflows/maintenance-welcome-pr.yml
+++ b/.github/workflows/maintenance-welcome-pr.yml
@ -4,9 +4,6 @@ on:
  pull_request_target:
    types: opened

-permissions:
-  contents: read
-
 jobs:
  welcome-first-time-contributor:
    runs-on: ubuntu-latest
--- a/.gitignore
+++ b/.gitignore
@ -22,7 +22,7 @@ ubuntu-*-cloudimg-console.log
 .DS_Store
 *~
 *.swp
-**/__pycache__/
+/__pycache__/*

 # Mainly generated by merge tools like 'meld'
 *.orig
--- a/action.yml
+++ b/action.yml
@ -109,7 +109,7 @@ runs:

    - name: "Import GPG key"
      if: ${{ inputs.armbian_pgp_key != '' }}
-      uses: crazy-max/ghaction-import-gpg@v7
+      uses: crazy-max/ghaction-import-gpg@v6
      with:
        gpg_private_key: ${{ inputs.armbian_pgp_key }}
        passphrase: ${{ inputs.armbian_pgp_password }}
--- a/config/boards/ayn-odin2.csc
+++ b/config/boards/ayn-odin2.csc
@ -1,66 +1,42 @@
-# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
+# Ayn Odin2 Configuration
 declare -g BOARD_NAME="Ayn Odin2"
 declare -g BOARD_VENDOR="ayntec"
-declare -g BOARD_MAINTAINER="FantasyGmm Squishy123 kasimling"
+declare -g BOARD_MAINTAINER="Squishy123 kasimling"
 declare -g BOARDFAMILY="sm8550"
 declare -g KERNEL_TARGET="current,edge"
-declare -g KERNEL_TEST_TARGET="current"
+declare -g KERNEL_TEST_TARGET="edge"
 declare -g EXTRAWIFI="no"
 declare -g BOOTCONFIG="none"
+declare -g BOOTFS_TYPE="fat"
+declare -g BOOTSIZE="256"
+declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused rw quiet rootwait"

 # Use the full firmware, complete linux-firmware plus Armbian's
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 declare -g DESKTOP_AUTOLOGIN="yes"

-# Check to make sure variants are supported
-declare -g VALID_BOARDS=("ayn-odin2" "ayn-odin2portal" "ayn-odin2mini" "ayn-thor")
-
-declare -g WITH_GRUB="${WITH_GRUB:-no}"
-
-if [[ ! " ${VALID_BOARDS[*]} " =~ " ${BOARD} " ]]; then
-	exit_with_error "Error: Invalid board '$BOARD'. Valid options are: ${VALID_BOARDS[*]}" >&2
-fi
-
-# set grub
-if [[ "${WITH_GRUB}" == "yes" ]]; then
-	display_alert "GRUB DETECTED"
-	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/qcs8550-${BOARD}.dtb"
-	declare -g SERIALCON="${SERIALCON:-tty1}"
-
-	enable_extension "grub"
-	enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
-else
-	declare -g BOOTFS_TYPE="fat"
-	declare -g BOOTSIZE="256"
-	declare -g IMAGE_PARTITION_TABLE="gpt"
-	declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused rw quiet rootwait"
-
-	function pre_umount_final_image__update_ABL_settings() {
-		if [ -z "$BOOTFS_TYPE" ]; then
-			return 0
-		fi
-		display_alert "Update ABL settings for " "${BOARD}" "info"
-		uuid_line=$(head -n 1 "${SDCARD}"/etc/fstab)
-		rootfs_image_uuid=$(echo "${uuid_line}" | awk '{print $1}' | awk -F '=' '{print $2}')
-		initrd_name=$(find "${SDCARD}/boot/" -type f -name "config-*" | sed 's/.*config-//')
-		sed -i "s/UUID_PLACEHOLDER/${rootfs_image_uuid}/g" "${MOUNT}"/boot/LinuxLoader.cfg
-		sed -i "s/INITRD_PLACEHOLDER/${initrd_name}/g" "${MOUNT}"/boot/LinuxLoader.cfg
-	}
-fi
+function ayn-odin2_is_userspace_supported() {
+	[[ "${RELEASE}" == "jammy" ]] && return 0
+	[[ "${RELEASE}" == "trixie" ]] && return 0
+	[[ "${RELEASE}" == "noble" ]] && return 0
+	return 1
+}

 function pre_customize_image__ayn-odin2_alsa_ucm_conf() {
+	if ! ayn-odin2_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 -o temp.zip "https://github.com/AYNTechnologies/alsa-ucm-conf/archive/refs/heads/ayn/v1.2.13.zip"
 		unzip -o temp.zip
 		unzip_dir=$(unzip -Z1 temp.zip | head -n1 | cut -d/ -f1)
 		cp -rf "${unzip_dir}/"* .
 		rm -rf "$unzip_dir" temp.zip
-	)	)
+	)
 }

 function post_family_tweaks_bsp__ayn-odin2_firmware() {
@ -82,11 +58,23 @@ function post_family_tweaks_bsp__ayn-odin2_firmware() {
 }

 function post_family_tweaks__ayn-odin2_enable_services() {
+	if ! ayn-odin2_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
+
+	if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
+		display_alert "Adding Mesa PPA For Ubuntu ${BOARD}" "warn"
+		do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
+	fi
+
 	# We need unudhcpd from armbian repo, so enable it
 	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.sources

 	do_with_retries 3 chroot_sdcard_apt_get_update
-	display_alert "Installing ${BOARD} tweaks" "warn"
+		display_alert "Installing ${BOARD} tweaks" "warn"
 	do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf qbootctl qrtr-tools unudhcpd mkbootimg
 	# disable armbian repo back
 	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled
@ -99,35 +87,45 @@ function post_family_tweaks__ayn-odin2_enable_services() {
 	chroot_sdcard systemctl mask suspend.target

 	chroot_sdcard systemctl enable usbgadget-rndis.service
-	cp "${SRC}/packages/bsp/${BOARD}/LinuxLoader.cfg" "${SDCARD}"/boot/
+	cp $SRC/packages/bsp/ayn-odin2/LinuxLoader.cfg "${SDCARD}"/boot/

 	return 0
 }

-
 function post_family_tweaks_bsp__ayn-odin2_bsp_firmware_in_initrd() {
 	display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "warn"
 	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/ayn-firmware" <<- 'FIRMWARE_HOOK'
-#!/bin/bash
-[[ "$1" == "prereqs" ]] && exit 0
-. /usr/share/initramfs-tools/hook-functions
-for f in $(find /lib/firmware/qcom/sm8550 -type f) ; do
-add_firmware "${f#/lib/firmware/}"
-done
-add_firmware "qcom/a740_sqe.fw" # Extra one for dpu
-add_firmware "qcom/gmu_gen70200.bin" # Extra one for gpu
-add_firmware "qcom/vpu/vpu30_p4.mbn" # Extra one for vpu
-# Extra one for wifi
-for f in $(find /lib/firmware/ath12k/WCN7850/hw2.0 -type f) ; do
-add_firmware "${f#/lib/firmware/}"
-done
-# Extra one for bt
-for f in $(find /lib/firmware/qca -type f) ; do
-add_firmware "${f#/lib/firmware/}"
-done
-FIRMWARE_HOOK
+	# Using odin2's firmware for now
+	add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/ayn-odin2-firmware" <<- 'FIRMWARE_HOOK'
+		#!/bin/bash
+		[[ "$1" == "prereqs" ]] && exit 0
+		. /usr/share/initramfs-tools/hook-functions
+		for f in /lib/firmware/qcom/sm8550/ayn/odin2portal/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		add_firmware "qcom/a740_sqe.fw" # Extra one for dpu
+		add_firmware "qcom/gmu_gen70200.bin" # Extra one for gpu
+		add_firmware "qcom/vpu/vpu30_p4.mbn" # Extra one for vpu
+		# Extra one for wifi
+		for f in /lib/firmware/ath12k/WCN7850/hw2.0/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+		# Extra one for bt
+		for f in /lib/firmware/qca/* ; do
+			add_firmware "${f#/lib/firmware/}"
+		done
+	FIRMWARE_HOOK
 	run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
 }

-
+function pre_umount_final_image__update_ABL_settings() {
+	if [ -z "$BOOTFS_TYPE" ]; then
+		return 0
+	fi
+	display_alert "Update ABL settings for " "${BOARD}" "info"
+	uuid_line=$(head -n 1 "${SDCARD}"/etc/fstab)
+	rootfs_image_uuid=$(echo "${uuid_line}" | awk '{print $1}' | awk -F '=' '{print $2}')
+	initrd_name=$(find "${SDCARD}/boot/" -type f -name "config-*" | sed 's/.*config-//')
+	sed -i "s/UUID_PLACEHOLDER/${rootfs_image_uuid}/g" "${MOUNT}"/boot/LinuxLoader.cfg
+	sed -i "s/INITRD_PLACEHOLDER/${initrd_name}/g" "${MOUNT}"/boot/LinuxLoader.cfg
+}
--- a/config/boards/ayn-odin2mini.csc
+++ b/config/boards/ayn-odin2mini.csc
@ -1,5 +0,0 @@
-# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
-source "${SRC}/config/boards/ayn-odin2.csc"
-declare -g BOARD_NAME="Ayn Odin2 Mini"
-declare -g BOARD_VENDOR="ayntec"
-declare -g BOARD_MAINTAINER="Squishy123"
--- a/config/boards/ayn-odin2portal.csc
+++ b/config/boards/ayn-odin2portal.csc
@ -1,5 +0,0 @@
-# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
-source "${SRC}/config/boards/ayn-odin2.csc"
-declare -g BOARD_NAME="Ayn Odin2 Portal"
-declare -g BOARD_VENDOR="ayntec"
-declare -g BOARD_MAINTAINER="Squishy123"
--- a/config/boards/ayn-thor.csc
+++ b/config/boards/ayn-thor.csc
@ -1,5 +0,0 @@
-# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
-source "${SRC}/config/boards/ayn-odin2.csc"
-declare -g BOARD_NAME="Ayn Thor"
-declare -g BOARD_VENDOR="ayntec"
-declare -g BOARD_MAINTAINER="Squishy123"
--- a/config/boards/bananapif3.conf
+++ b/config/boards/bananapif3.conf
@ -4,7 +4,7 @@ BOARD_VENDOR="sinovoip"
 BOARDFAMILY="spacemit"
 BOARD_MAINTAINER="pyavitz"
 BOARD_VENDOR="spacemit"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge"
 BOOT_FDT_FILE="spacemit/k1-bananapi-f3.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
--- a/config/boards/musepipro.conf
+++ b/config/boards/musepipro.conf
@ -3,7 +3,7 @@ BOARD_NAME="SpacemiT MusePi Pro"
 BOARDFAMILY="spacemit"
 BOARD_MAINTAINER="pyavitz"
 BOARD_VENDOR="spacemit"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge"
 BOOT_FDT_FILE="spacemit/k1-musepi-pro.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
--- a/config/boards/nanopi-zero2.csc
+++ b/config/boards/nanopi-zero2.csc
@ -4,7 +4,7 @@ BOARD_VENDOR="friendlyelec"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="hinlink_rk3528_defconfig"
 BOARD_MAINTAINER=""
-KERNEL_TARGET="vendor,current,edge"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="no"
 HAS_VIDEO_OUTPUT="no"
 BOOT_FDT_FILE="rockchip/rk3528-nanopi-rev01.dtb"
@ -12,26 +12,3 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOOTFS_TYPE="ext4"
 BOOTSIZE="512"
-
-# Mainline kernel (current/edge) uses a different DTB filename than vendor kernel
-# and RK3528 debug UART is UART0 (ttyS0), not UART2 (ttyS2) like other RK35xx SoCs
-function post_family_config__nanopi_zero2_mainline() {
-	case "${BRANCH}" in
-		current|edge)
-			declare -g BOOT_FDT_FILE="rockchip/rk3528-nanopi-zero2.dtb"
-			declare -g SERIALCON="ttyS0"
-			display_alert "$BOARD" "Using ${BOOT_FDT_FILE} and SERIALCON=${SERIALCON} for ${BRANCH}" "info"
-			;;
-	esac
-}
-
-# Patch boot script: RK3528 NanoPi Zero2 uses UART0 (ttyS0) for serial console, not UART2 (ttyS2)
-function post_family_tweaks__nanopi_zero2_serial_console() {
-	case "${BRANCH}" in
-		current|edge)
-			display_alert "$BOARD" "Adjusting boot.cmd serial console to ttyS0 for ${BRANCH}" "info"
-			sed -i 's/console=ttyS2,1500000/console=ttyS0,1500000/g' "${SDCARD}"/boot/boot.cmd
-			mkimage -C none -A arm -T script -d "${SDCARD}"/boot/boot.cmd "${SDCARD}"/boot/boot.scr
-			;;
-	esac
-}
--- a/config/boards/orangepir2s.wip
+++ b/config/boards/orangepir2s.wip
@ -3,7 +3,7 @@ BOARD_NAME="Orange Pi R2S"
 BOARD_VENDOR="xunlong"
 BOARDFAMILY="spacemit"
 BOARD_MAINTAINER="sven-ola"
-KERNEL_TARGET="legacy,current"
+KERNEL_TARGET="current,edge"
 BOOT_FDT_FILE="spacemit/x1_orangepi-r2s.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
--- a/config/boards/orangepirv2.wip
+++ b/config/boards/orangepirv2.wip
@ -3,14 +3,14 @@ BOARD_NAME="Orange Pi RV2"
 BOARD_VENDOR="xunlong"
 BOARDFAMILY="spacemit"
 BOARD_MAINTAINER="sven-ola"
-KERNEL_TARGET="legacy,current"
+KERNEL_TARGET="current,edge"
 BOOT_FDT_FILE="spacemit/x1_orangepi-rv2.dtb"
 BOOTDELAY=1
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="earlycon=sbi console=tty1 console=ttyS0,115200 loglevel=1"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools pciutils"

-case "${BRANCH}" in current)
+case "${BRANCH}" in edge)
 	BCMDHD_SPACEMIT_TYPE="sdio"
 	BCMDHD_SPACEMIT_TAG="v101.10.591.84.37-4"
 	enable_extension "bcmdhd-spacemit"
--- a/config/boards/rock-5b-plus.conf
+++ b/config/boards/rock-5b-plus.conf
@ -4,8 +4,8 @@ BOARD_VENDOR="radxa"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="HeyMeco fridtjof"
 BOOTCONFIG="rock5b-rk3588_defconfig"
-KERNEL_TARGET="vendor,current,edge"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="edge,vendor"
+KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
--- a/config/boards/rock-5t.conf
+++ b/config/boards/rock-5t.conf
@ -4,8 +4,8 @@ BOARD_VENDOR="radxa"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="HeyMeco"
 BOOTCONFIG="rock-5t-rk3588_defconfig"
-KERNEL_TARGET="vendor,current"
-KERNEL_TEST_TARGET="vendor,current"
+KERNEL_TARGET="vendor"
+KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5t.dtb"
--- a/config/boards/sakurapi-rk3308b.conf
+++ b/config/boards/sakurapi-rk3308b.conf
--- a/config/kernel/linux-meson64-edge.config
+++ b/config/kernel/linux-meson64-edge.config
@ -1,4 +1,4 @@
-# Armbian defconfig generated with 7.0
+# Armbian defconfig generated with 6.19
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@ -7,6 +7,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_BPF_LSM=y
 CONFIG_PREEMPT=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
@ -237,25 +238,28 @@ CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES_COMPAT=y
-CONFIG_NETFILTER_XTABLES_LEGACY=y
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
 CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@ -355,13 +359,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@ -376,23 +374,14 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_CONNTRACK_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
 CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
@ -1130,6 +1119,7 @@ CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822CS=m
+CONFIG_RTL8192EU=m
 CONFIG_RTL8189FS=m
 CONFIG_RTL8189ES=m
 CONFIG_ZD1211RW=m
@ -2392,43 +2382,13 @@ CONFIG_VIDEO_GS1662=m
 CONFIG_DVB_DUMMY_FE=m
 CONFIG_AUXDISPLAY=y
 CONFIG_DRM=y
+CONFIG_DRM_SIMPLEDRM=m
 CONFIG_DRM_HDLCD=m
 CONFIG_DRM_HDLCD_SHOW_UNDERRUN=y
 CONFIG_DRM_MALI_DISPLAY=m
-CONFIG_DRM_CHIPONE_ICN6211=m
-CONFIG_DRM_CROS_EC_ANX7688=m
-CONFIG_DRM_ITE_IT6505=m
-CONFIG_DRM_LONTIUM_LT8912B=m
-CONFIG_DRM_LONTIUM_LT9211=m
-CONFIG_DRM_LONTIUM_LT9611=m
-CONFIG_DRM_LONTIUM_LT9611UXC=m
-CONFIG_DRM_ITE_IT66121=m
-CONFIG_DRM_LVDS_CODEC=m
-CONFIG_DRM_NWL_MIPI_DSI=m
-CONFIG_DRM_PARADE_PS8640=m
-CONFIG_DRM_SII9234=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_THINE_THC63LVD1024=m
-CONFIG_DRM_TOSHIBA_TC358762=m
-CONFIG_DRM_TOSHIBA_TC358764=m
-CONFIG_DRM_TOSHIBA_TC358768=m
-CONFIG_DRM_TOSHIBA_TC358775=m
-CONFIG_DRM_TI_DLPC3433=m
-CONFIG_DRM_TI_SN65DSI83=m
-CONFIG_DRM_TI_TPD12S015=m
-CONFIG_DRM_ANALOGIX_ANX6345=m
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-CONFIG_DRM_ANALOGIX_ANX7625=m
-CONFIG_DRM_CDNS_DSI=m
-CONFIG_DRM_CDNS_MHDP8546=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_DW_HDMI_GP_AUDIO=m
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_GUD=m
-CONFIG_DRM_HISI_KIRIN=m
-CONFIG_DRM_LIMA=m
-CONFIG_DRM_LOGICVC=m
-CONFIG_DRM_MESON=y
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_PANEL_ABT_Y030XX067A=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
@ -2488,12 +2448,38 @@ CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
 CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
-CONFIG_DRM_PANFROST=m
-CONFIG_DRM_SSD130X=m
-CONFIG_DRM_SSD130X_I2C=m
-CONFIG_DRM_SSD130X_SPI=m
-CONFIG_DRM_SIMPLEDRM=m
-CONFIG_DRM_TIDSS=m
+CONFIG_DRM_CHIPONE_ICN6211=m
+CONFIG_DRM_CROS_EC_ANX7688=m
+CONFIG_DRM_ITE_IT6505=m
+CONFIG_DRM_LONTIUM_LT8912B=m
+CONFIG_DRM_LONTIUM_LT9211=m
+CONFIG_DRM_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=m
+CONFIG_DRM_ITE_IT66121=m
+CONFIG_DRM_LVDS_CODEC=m
+CONFIG_DRM_NWL_MIPI_DSI=m
+CONFIG_DRM_PARADE_PS8640=m
+CONFIG_DRM_SII9234=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
+CONFIG_DRM_THINE_THC63LVD1024=m
+CONFIG_DRM_TOSHIBA_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=m
+CONFIG_DRM_TI_DLPC3433=m
+CONFIG_DRM_TI_SN65DSI83=m
+CONFIG_DRM_TI_TPD12S015=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_ANX7625=m
+CONFIG_DRM_CDNS_DSI=m
+CONFIG_DRM_CDNS_MHDP8546=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_GP_AUDIO=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_DRM_LOGICVC=m
+CONFIG_DRM_MESON=y
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=m
@ -2504,10 +2490,14 @@ CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_ILI9486=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
-CONFIG_DRM_UDL=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_TIDSS=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_SSD130X=m
+CONFIG_DRM_SSD130X_I2C=m
+CONFIG_DRM_SSD130X_SPI=m
 CONFIG_FB=y
 CONFIG_FB_UVESA=m
 CONFIG_FB_SM501=m
@ -3112,6 +3102,7 @@ CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_WUSB3801=m
 CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_MUX_GPIO_SWITCH=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_MMC=y
 CONFIG_PWRSEQ_SD8787=m
@ -3832,6 +3823,7 @@ CONFIG_NFS_V2=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_NFS_V4_1_MIGRATION=y
 CONFIG_NFS_FSCACHE=y
@ -3943,6 +3935,7 @@ CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARIA=m
 CONFIG_CRYPTO_BLOWFISH=m
@ -3970,6 +3963,7 @@ CONFIG_CRYPTO_WP512=y
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@ -3977,9 +3971,11 @@ CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_SM3_NEON=m
 CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_BS=y
 CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_SM4_ARM64_CE_BLK=m
@ -4012,6 +4008,7 @@ CONFIG_SECONDARY_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_XZ_DEC_TEST=m
 CONFIG_CMA_SIZE_MBYTES=128
+CONFIG_GLOB_SELFTEST=m
 CONFIG_IRQ_POLL=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
@ -4035,6 +4032,7 @@ CONFIG_KUNIT=m
 CONFIG_KUNIT_ALL_TESTS=m
 CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_TEST_LIST_SORT is not set
+CONFIG_TEST_MIN_HEAP=m
 # CONFIG_TEST_SORT is not set
 CONFIG_TEST_DIV64=m
 CONFIG_REED_SOLOMON_TEST=m
--- a/config/kernel/linux-rockchip-vendor.config
+++ b/config/kernel/linux-rockchip-vendor.config
@ -96,7 +96,6 @@ CONFIG_INET=y
 CONFIG_INET_ESP=m
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6=m
-CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=m
 CONFIG_NETFILTER_NETLINK_HOOK=m
@ -277,8 +276,6 @@ CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_MISC=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BLOCK=y
-# CONFIG_DTC_OMIT_DISABLED is not set
-# CONFIG_DTC_OMIT_EMPTY is not set
 CONFIG_ZRAM=m
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
@ -289,11 +286,9 @@ CONFIG_BLK_DEV_SD=m
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
-CONFIG_WIREGUARD=m
 CONFIG_MACVLAN=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
-CONFIG_TUN=m
 CONFIG_VETH=m
 # CONFIG_NET_VENDOR_ALACRITECH is not set
 # CONFIG_NET_VENDOR_AMAZON is not set
@ -398,8 +393,8 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 CONFIG_I2C_RK3X=y
 CONFIG_SPI=y
-CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_ROCKCHIP_FLEXBUS_FSPI=y
+CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_ROCKCHIP_SFC=y
 CONFIG_SPI_SPIDEV=y
 # CONFIG_PTP_1588_CLOCK_KVM is not set
@ -495,6 +490,8 @@ CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
 CONFIG_RK_CONSOLE_THREAD=y
 CONFIG_ROCKCHIP_DEBUG=y
 CONFIG_ROCKCHIP_MINI_KERNEL=y
+# CONFIG_DTC_OMIT_DISABLED is not set
+# CONFIG_DTC_OMIT_EMPTY is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
--- a/config/kernel/linux-rockchip64-current.config
+++ b/config/kernel/linux-rockchip64-current.config
@ -8,6 +8,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_BPF_LSM=y
 CONFIG_PREEMPT=y
 CONFIG_SCHED_CORE=y
@ -79,7 +80,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT=m
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
@ -233,25 +234,28 @@ CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES_COMPAT=y
-CONFIG_NETFILTER_XTABLES_LEGACY=y
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
 CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@ -350,13 +354,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@ -371,23 +369,14 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_CONNTRACK_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
 CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_802_3=m
 CONFIG_BRIDGE_EBT_AMONG=m
 CONFIG_BRIDGE_EBT_ARP=m
@ -2618,11 +2607,11 @@ CONFIG_USB_G_MULTI_CDC=y
 CONFIG_USB_G_HID=m
 CONFIG_USB_G_WEBCAM=m
 CONFIG_USB_RAW_GADGET=m
-CONFIG_TYPEC=y
-CONFIG_TYPEC_TCPM=y
-CONFIG_TYPEC_TCPCI=y
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_RT1711H=m
-CONFIG_TYPEC_FUSB302=y
+CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_CCG=m
 CONFIG_TYPEC_TPS6598X=m
@ -3114,7 +3103,7 @@ CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
 CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PHY_ROCKCHIP_USB=y
-CONFIG_PHY_ROCKCHIP_USBDP=y
+CONFIG_PHY_ROCKCHIP_USBDP=m
 CONFIG_PHY_SAMSUNG_USB2=y
 CONFIG_ARM_CCI_PMU=m
 # CONFIG_ARM_CCI400_PMU is not set
--- a/config/kernel/linux-sm8550-current.config
+++ b/config/kernel/linux-sm8550-current.config
@ -1,4 +1,4 @@
-# Armbian defconfig generated with 6.18
+# Armbian defconfig generated with 6.12
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="@DEVICENAME@"
 CONFIG_SYSVIPC=y
@ -16,7 +16,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_NUMA_BALANCING=y
@ -38,13 +37,6 @@ CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_RD_LZ4 is not set
-# CONFIG_RD_ZSTD is not set
-CONFIG_SYSFS_SYSCALL=y
 CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
@ -53,6 +45,9 @@ CONFIG_KEXEC_FILE=y
 CONFIG_ARCH_QCOM=y
 # CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
 # CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
 CONFIG_NUMA=y
 CONFIG_PARAVIRT=y
 CONFIG_COMPAT=y
@ -74,7 +69,6 @@ CONFIG_ARM_QCOM_CPUFREQ_HW=y
 CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ACPI=y
-# CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HMAT=y
 CONFIG_ACPI_APEI=y
@ -84,7 +78,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
-# CONFIG_SCHED_SMT is not set
+CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_BLK_DEV_INTEGRITY=y
@ -94,6 +88,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_ZSWAP=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
@ -107,24 +102,11 @@ CONFIG_UNIX=y
 CONFIG_XFRM_USER=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_MROUTE=y
 CONFIG_INET_ESP=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_SIT=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_PIMSM_V2=y
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=m
 CONFIG_NETFILTER_NETLINK_HOOK=m
@ -168,22 +150,18 @@ CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
 CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@ -248,6 +226,15 @@ CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
@ -261,8 +248,15 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
@ -275,10 +269,7 @@ CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_DEFAULT=y
-CONFIG_DEFAULT_FQ_CODEL=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_FLOWER=m
@ -297,17 +288,16 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BT=m
 CONFIG_BT_HIDP=m
+# CONFIG_BT_LE is not set
 CONFIG_BT_LEDS=y
 # CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
-CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
-CONFIG_RFKILL=y
+CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_PAGE_POOL_STATS=y
 CONFIG_PCI=y
@ -337,8 +327,6 @@ CONFIG_MHI_BUS=y
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_EFI_ZBOOT=y
-CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
 CONFIG_QCOM_QSEECOM=y
 CONFIG_QCOM_QSEECOM_UEFISECAPP=y
@ -374,20 +362,22 @@ CONFIG_ZRAM_BACKEND_842=y
 CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_QCOM_COINCELL=m
 CONFIG_QCOM_FASTRPC=y
 CONFIG_SRAM=y
 CONFIG_PCI_ENDPOINT_TEST=m
-CONFIG_NTSYNC=m
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_93CX6=y
 CONFIG_UACCE=m
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_MD=y
+# CONFIG_MD_BITMAP_FILE is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=m
 CONFIG_WIREGUARD=m
@ -470,7 +460,6 @@ CONFIG_MHI_NET=m
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 CONFIG_REALTEK_PHY=m
-CONFIG_REALTEK_PHY_HWMON=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
@ -510,9 +499,6 @@ CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_RSINPUT=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GOODIX=y
-CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=y
-CONFIG_TOUCHSCREEN_HYNITRON_ALL=y
 CONFIG_TOUCHSCREEN_EDT_FT5X06=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PM8941_PWRKEY=y
@ -578,7 +564,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_LPASS_LPI=m
 CONFIG_PINCTRL_SM8550_LPASS_LPI=m
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_AGGREGATOR=m
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_QCOM_PON=y
@ -615,7 +600,6 @@ CONFIG_REGULATOR_QCOM_RPMH=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_QCOM_USB_VBUS=y
-CONFIG_REGULATOR_SGM3804=y
 CONFIG_REGULATOR_VCTRL=m
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
@ -629,31 +613,23 @@ CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_DRM=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV=y
-CONFIG_DRM_SIMPLEDRM=y
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_MSM=y
-CONFIG_DRM_PANEL_AR06_4INCH=y
-CONFIG_DRM_PANEL_AR02_3INCH=y
-CONFIG_DRM_PANEL_AR11_5INCH=y
-CONFIG_DRM_PANEL_BOE_XM91080G=y
-CONFIG_DRM_PANEL_CHIPONE_ICNA35XX=y
-CONFIG_DRM_PANEL_DDIC_CH13726A=y
+CONFIG_DRM_PANEL_CHIPONE_ICNA3512=y
 CONFIG_DRM_PANEL_LVDS=m
-CONFIG_DRM_PANEL_RETROID_POCKET_6=y
 CONFIG_DRM_PANEL_EDP=y
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_SYNAPTICS_TD4328=y
 CONFIG_DRM_DISPLAY_CONNECTOR=y
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_LONTIUM_LT8912B=y
 CONFIG_DRM_SIMPLE_BRIDGE=m
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_FB=y
-CONFIG_FB_EFI=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_ODIN2MINI=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
-CONFIG_BACKLIGHT_SY7758=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@ -686,7 +662,6 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_WCD938X_SDW=m
-CONFIG_SND_SOC_WSA884X=m
 CONFIG_SND_SOC_LPASS_WSA_MACRO=m
 CONFIG_SND_SOC_LPASS_VA_MACRO=m
 CONFIG_SND_SOC_LPASS_RX_MACRO=m
@ -694,9 +669,7 @@ CONFIG_SND_SOC_LPASS_TX_MACRO=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD2=m
-CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
-CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_BELKIN=y
 CONFIG_HID_CHERRY=y
@ -712,15 +685,14 @@ CONFIG_HID_PLAYSTATION=y
 CONFIG_PLAYSTATION_FF=y
 CONFIG_HID_SONY=y
 CONFIG_SONY_FF=y
+CONFIG_USB_HIDDEV=y
 CONFIG_I2C_HID_ACPI=m
 CONFIG_I2C_HID_OF=m
 CONFIG_I2C_HID_OF_ELAN=m
-CONFIG_USB_HIDDEV=y
 CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
@ -756,7 +728,7 @@ CONFIG_TYPEC_TPS6598X=m
 CONFIG_TYPEC_HD3SS3220=m
 CONFIG_TYPEC_MUX_FSA4480=y
 CONFIG_TYPEC_MUX_GPIO_SBU=y
-CONFIG_TYPEC_MUX_NB7VPQ904M=y
+CONFIG_TYPEC_MUX_NB7VPQ904M=m
 CONFIG_TYPEC_DP_ALTMODE=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
@ -766,6 +738,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_MSM=y
+CONFIG_MMC_SDHCI_MSM_DOWNSTREAM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_HSQ=y
@ -779,7 +752,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=y
 CONFIG_LEDS_HTR3212=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_PWM=y
-CONFIG_LEDS_GROUP_MULTICOLOR=y
 CONFIG_LEDS_PWM_MULTICOLOR=y
 CONFIG_LEDS_QCOM_LPG=y
 CONFIG_LEDS_TRIGGER_TIMER=y
@ -790,7 +762,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_EDAC=y
 CONFIG_EDAC_GHES=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_PM8XXX=y
 CONFIG_DMADEVICES=y
 CONFIG_QCOM_BAM_DMA=y
@ -821,7 +792,6 @@ CONFIG_SM_TCSRCC_8550=y
 CONFIG_SM_VIDEOCC_8550=y
 CONFIG_SPMI_PMIC_CLKDIV=y
 CONFIG_QCOM_HFPLL=y
-CONFIG_CLK_GFM_LPASS_SM8250=m
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
 # CONFIG_FSL_ERRATUM_A008585 is not set
@ -890,7 +860,6 @@ CONFIG_QCOM_MPM=y
 CONFIG_RESET_GPIO=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=y
-CONFIG_PHY_SNPS_EUSB2=y
 CONFIG_PHY_CAN_TRANSCEIVER=m
 CONFIG_PHY_CADENCE_TORRENT=m
 CONFIG_PHY_CADENCE_DPHY_RX=m
@ -901,6 +870,7 @@ CONFIG_PHY_QCOM_PCIE2=m
 CONFIG_PHY_QCOM_QMP=y
 CONFIG_PHY_QCOM_QMP_PCIE_8996=m
 CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_SNPS_EUSB2=y
 CONFIG_PHY_QCOM_EUSB2_REPEATER=y
 CONFIG_PHY_QCOM_M31_USB=m
 CONFIG_PHY_QCOM_USB_HS=m
@ -920,9 +890,6 @@ CONFIG_ARM_DMC620_PMU=m
 CONFIG_HISI_PMU=y
 CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder,anbox-binder,anbox-hwbinder,anbox-vndbinder"
 CONFIG_NVMEM_LAYOUT_SL28_VPD=m
 CONFIG_NVMEM_QCOM_QFPROM=y
 CONFIG_NVMEM_QCOM_SEC_QFPROM=y
@ -933,6 +900,7 @@ CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+CONFIG_SLIM_QCOM_CTRL=m
 CONFIG_SLIM_QCOM_NGD_CTRL=m
 CONFIG_INTERCONNECT_QCOM=y
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
@ -975,44 +943,36 @@ CONFIG_PSTORE_RAM=m
 CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFSD=y
-CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_DEFAULT="utf-8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,apparmor,bpf"
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf"
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ECDH=y
-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_ECHAINIV=y
-CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_XXHASH=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_USER_API_RNG=y
-CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA3_ARM64=m
 CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 CONFIG_CRYPTO_DEV_QCE=y
 CONFIG_CRYPTO_DEV_QCOM_RNG=y
 CONFIG_CRYPTO_DEV_CCREE=m
@ -1023,6 +983,7 @@ CONFIG_CRYPTO_DEV_HISI_TRNG=m
 CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
 CONFIG_PACKING=y
 CONFIG_INDIRECT_PIO=y
+CONFIG_CRC_CCITT=m
 CONFIG_DMA_RESTRICTED_POOL=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=32
@ -1037,6 +998,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_SCHED_DEBUG is not set
 CONFIG_FUNCTION_TRACER=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_MEMTEST=y
--- a/config/kernel/linux-sm8550-edge.config
+++ b/config/kernel/linux-sm8550-edge.config
@ -7,8 +7,6 @@ CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_LSM=y
 CONFIG_PREEMPT=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_BSD_PROCESS_ACCT=y
@ -16,11 +14,9 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_NUMA_BALANCING=y
-CONFIG_CGROUP_FAVOR_DYNMODS=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CFS_BANDWIDTH=y
@ -33,18 +29,10 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_BPF=y
-CONFIG_CGROUP_MISC=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_RD_LZ4 is not set
-# CONFIG_RD_ZSTD is not set
-CONFIG_SYSFS_SYSCALL=y
 CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
@ -53,6 +41,7 @@ CONFIG_KEXEC_FILE=y
 CONFIG_ARCH_QCOM=y
 # CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set
 # CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
+CONFIG_ARM64_VA_BITS_48=y
 CONFIG_NUMA=y
 CONFIG_PARAVIRT=y
 CONFIG_COMPAT=y
@ -74,7 +63,6 @@ CONFIG_ARM_QCOM_CPUFREQ_HW=y
 CONFIG_ARM_SCMI_CPUFREQ=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ACPI=y
-# CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HMAT=y
 CONFIG_ACPI_APEI=y
@ -84,12 +72,10 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
-# CONFIG_SCHED_SMT is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
@ -107,24 +93,11 @@ CONFIG_UNIX=y
 CONFIG_XFRM_USER=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_MROUTE=y
 CONFIG_INET_ESP=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BBR=y
-CONFIG_DEFAULT_BBR=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_SIT=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_PIMSM_V2=y
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=m
 CONFIG_NETFILTER_NETLINK_HOOK=m
@ -248,6 +221,7 @@ CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
 CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
@ -275,10 +249,7 @@ CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_DEFAULT=y
-CONFIG_DEFAULT_FQ_CODEL=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_FLOWER=m
@ -294,9 +265,9 @@ CONFIG_QRTR_TUN=y
 CONFIG_QRTR_MHI=y
 CONFIG_NET_NCSI=y
 CONFIG_CGROUP_NET_PRIO=y
-CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BT=m
 CONFIG_BT_HIDP=m
+# CONFIG_BT_LE is not set
 CONFIG_BT_LEDS=y
 # CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_HCIUART=m
@ -307,7 +278,7 @@ CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
-CONFIG_RFKILL=y
+CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y
 CONFIG_PAGE_POOL_STATS=y
 CONFIG_PCI=y
@ -337,7 +308,6 @@ CONFIG_MHI_BUS=y
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_EFI_ZBOOT=y
 CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
 CONFIG_QCOM_QSEECOM=y
@ -374,6 +344,7 @@ CONFIG_ZRAM_BACKEND_842=y
 CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_QCOM_COINCELL=m
@ -470,7 +441,6 @@ CONFIG_MHI_NET=m
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 CONFIG_REALTEK_PHY=m
-CONFIG_REALTEK_PHY_HWMON=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
@ -510,9 +480,6 @@ CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_RSINPUT=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GOODIX=y
-CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=y
-CONFIG_TOUCHSCREEN_HYNITRON_ALL=y
 CONFIG_TOUCHSCREEN_EDT_FT5X06=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PM8941_PWRKEY=y
@ -578,7 +545,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_PINCTRL_LPASS_LPI=m
 CONFIG_PINCTRL_SM8550_LPASS_LPI=m
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_AGGREGATOR=m
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_QCOM_PON=y
@ -615,7 +581,6 @@ CONFIG_REGULATOR_QCOM_RPMH=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_QCOM_USB_VBUS=y
-CONFIG_REGULATOR_SGM3804=y
 CONFIG_REGULATOR_VCTRL=m
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
@ -631,29 +596,20 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV=y
 CONFIG_DRM_SIMPLEDRM=y
 CONFIG_DRM_MSM=y
-CONFIG_DRM_PANEL_AR06_4INCH=y
-CONFIG_DRM_PANEL_AR02_3INCH=y
-CONFIG_DRM_PANEL_AR11_5INCH=y
-CONFIG_DRM_PANEL_BOE_XM91080G=y
-CONFIG_DRM_PANEL_CHIPONE_ICNA35XX=y
-CONFIG_DRM_PANEL_DDIC_CH13726A=y
+CONFIG_DRM_PANEL_CHIPONE_ICNA3512=y
 CONFIG_DRM_PANEL_LVDS=m
-CONFIG_DRM_PANEL_RETROID_POCKET_6=y
 CONFIG_DRM_PANEL_EDP=y
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_SYNAPTICS_TD4328=y
 CONFIG_DRM_DISPLAY_CONNECTOR=y
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_LONTIUM_LT8912B=y
 CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_FB=y
 CONFIG_FB_EFI=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_ODIN2MINI=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
-CONFIG_BACKLIGHT_SY7758=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@ -686,7 +642,6 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_WCD938X_SDW=m
-CONFIG_SND_SOC_WSA884X=m
 CONFIG_SND_SOC_LPASS_WSA_MACRO=m
 CONFIG_SND_SOC_LPASS_VA_MACRO=m
 CONFIG_SND_SOC_LPASS_RX_MACRO=m
@ -694,9 +649,7 @@ CONFIG_SND_SOC_LPASS_TX_MACRO=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD2=m
-CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
-CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_BELKIN=y
 CONFIG_HID_CHERRY=y
@ -720,7 +673,6 @@ CONFIG_USB_ULPI_BUS=y
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
@ -756,7 +708,7 @@ CONFIG_TYPEC_TPS6598X=m
 CONFIG_TYPEC_HD3SS3220=m
 CONFIG_TYPEC_MUX_FSA4480=y
 CONFIG_TYPEC_MUX_GPIO_SBU=y
-CONFIG_TYPEC_MUX_NB7VPQ904M=y
+CONFIG_TYPEC_MUX_NB7VPQ904M=m
 CONFIG_TYPEC_DP_ALTMODE=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
@ -766,6 +718,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_MSM=y
+CONFIG_MMC_SDHCI_MSM_DOWNSTREAM=y
 CONFIG_MMC_SPI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_HSQ=y
@ -779,7 +732,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=y
 CONFIG_LEDS_HTR3212=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_PWM=y
-CONFIG_LEDS_GROUP_MULTICOLOR=y
 CONFIG_LEDS_PWM_MULTICOLOR=y
 CONFIG_LEDS_QCOM_LPG=y
 CONFIG_LEDS_TRIGGER_TIMER=y
@ -884,7 +836,7 @@ CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_QCOM_SPMI_VADC=y
 CONFIG_QCOM_SPMI_ADC5=y
 CONFIG_PWM=y
-CONFIG_PWM_SN3112=y
+CONFIG_PWM_SN3112=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_MPM=y
 CONFIG_RESET_GPIO=m
@ -920,9 +872,6 @@ CONFIG_ARM_DMC620_PMU=m
 CONFIG_HISI_PMU=y
 CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder,anbox-binder,anbox-hwbinder,anbox-vndbinder"
 CONFIG_NVMEM_LAYOUT_SL28_VPD=m
 CONFIG_NVMEM_QCOM_QFPROM=y
 CONFIG_NVMEM_QCOM_SEC_QFPROM=y
@ -975,43 +924,30 @@ CONFIG_PSTORE_RAM=m
 CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFSD=y
-CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_DEFAULT="utf-8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,apparmor,bpf"
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf"
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_ECDH=y
-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_ECHAINIV=y
-CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_XXHASH=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_USER_API_RNG=y
-CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_SHA3_ARM64=m
 CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
+CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_DEV_QCE=y
 CONFIG_CRYPTO_DEV_QCOM_RNG=y
@ -1032,11 +968,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4
 CONFIG_CONSOLE_LOGLEVEL_QUIET=1
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO_DWARF5=y
-CONFIG_DEBUG_INFO_REDUCED=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
+# CONFIG_FTRACE is not set
 CONFIG_MEMTEST=y
--- a/config/kernel/linux-spacemit-current.config
+++ b/config/kernel/linux-spacemit-current.config
--- a/config/kernel/linux-spacemit-edge.config
+++ b/config/kernel/linux-spacemit-edge.config
@ -1,16 +1,19 @@
+# Armbian defconfig generated with 6.18
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME=""
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_LSM=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_DYNAMIC=y
-CONFIG_RCU_EXPERT=y
-CONFIG_RCU_BOOST=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
+CONFIG_CGROUP_FAVOR_DYNMODS=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_SCHED=y
@ -33,17 +36,12 @@ CONFIG_BOOT_CONFIG=y
 CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PERF_EVENTS=y
-CONFIG_ARCH_SPACEMIT=y
+CONFIG_SOC_SPACEMIT=y
+CONFIG_SOC_SPACEMIT_K1X=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
-CONFIG_NUMA=y
-CONFIG_RISCV_SBI_V01=y
-# CONFIG_RISCV_BOOT_SPINWAIT is not set
 CONFIG_PARAVIRT=y
 CONFIG_RANDOMIZE_BASE=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP=y
-CONFIG_ENERGY_MODEL=y
 CONFIG_CPU_IDLE=y
 CONFIG_RISCV_SBI_CPUIDLE=y
 CONFIG_CPU_FREQ=y
@ -52,8 +50,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPUFREQ_DT=m
-CONFIG_CPUFREQ_VIRT=m
+CONFIG_SPACEMIT_K1X_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_MODULES=y
@ -61,20 +58,20 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_COMPRESS=y
 CONFIG_MODULE_COMPRESS_XZ=y
 CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_OF_PARTITION=y
-CONFIG_IOSCHED_BFQ=y
 CONFIG_BINFMT_MISC=y
 CONFIG_ZSWAP=y
 CONFIG_ZSWAP_DEFAULT_ON=y
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_PAGE_REPORTING=y
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_SYSFS=y
-CONFIG_CMA_AREAS=8
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
@ -118,6 +115,7 @@ CONFIG_TCP_CONG_CDG=m
 CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
@ -168,17 +166,26 @@ CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
 CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
@ -194,6 +201,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
@ -201,6 +209,7 @@ CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
@ -209,6 +218,7 @@ CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
@ -326,7 +336,7 @@ CONFIG_L2TP=m
 CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
-CONFIG_BRIDGE=m
+CONFIG_BRIDGE=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_TAG_NONE=m
@ -366,6 +376,7 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
 CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS_CGROUP=m
 CONFIG_BATMAN_ADV=m
 CONFIG_OPENVSWITCH=m
 CONFIG_VSOCKETS=m
@ -391,6 +402,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
 # CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_MTK=y
@ -422,8 +434,10 @@ CONFIG_BT_INTEL_PCIE=m
 CONFIG_AF_RXRPC=m
 CONFIG_AF_KCM=m
 CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
 CONFIG_MAC80211=m
 CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=m
@ -468,20 +482,15 @@ CONFIG_LWTUNNEL=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_EXTRA_FIRMWARE="esos.elf"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_MOXTET=m
+CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_BUS_EP=m
 CONFIG_CONNECTOR=y
-CONFIG_SYSFB_SIMPLEFB=y
-CONFIG_EFI_BOOTLOADER_CONTROL=m
-CONFIG_EFI_CAPSULE_LOADER=m
-CONFIG_RESET_ATTACK_MITIGATION=y
 CONFIG_GNSS=y
 CONFIG_GNSS_MTK_SERIAL=m
 CONFIG_GNSS_SIRF_SERIAL=m
@ -500,8 +509,8 @@ CONFIG_ZRAM_BACKEND_ZSTD=y
 CONFIG_ZRAM_BACKEND_DEFLATE=y
 CONFIG_ZRAM_BACKEND_842=y
 CONFIG_ZRAM_BACKEND_LZO=y
+CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
-CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_BLK_DEV_NVME=y
@ -512,15 +521,14 @@ CONFIG_NVME_TARGET=m
 CONFIG_NVME_TARGET_PASSTHRU=y
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_DUMMY_IRQ=m
-CONFIG_RPMB=y
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_SRAM=y
+CONFIG_NTSYNC=m
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_UACCE=m
-CONFIG_MISC_RP1=m
 CONFIG_RAID_ATTRS=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
@ -531,14 +539,8 @@ CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_DH=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_AHCI_DWC=m
-CONFIG_SATA_DWC=m
-CONFIG_SATA_DWC_OLD_DMA=y
-CONFIG_ATA_GENERIC=m
 CONFIG_MD=y
 CONFIG_MD_LINEAR=y
 CONFIG_BCACHE=y
@ -568,28 +570,20 @@ CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_SWITCH=y
 CONFIG_DM_LOG_WRITES=y
 CONFIG_DM_INTEGRITY=y
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_REMOTE_TARGET=m
 CONFIG_NETDEVICES=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_WIREGUARD=m
-CONFIG_OVPN=m
-CONFIG_MACVLAN=y
-CONFIG_IPVLAN=y
-CONFIG_VXLAN=y
+CONFIG_MACVLAN=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
 CONFIG_PFCP=m
 CONFIG_AMT=m
 CONFIG_MACSEC=m
 CONFIG_TUN=m
-CONFIG_VETH=y
+CONFIG_VETH=m
 CONFIG_VIRTIO_NET=y
+CONFIG_NETKIT=y
 CONFIG_CAIF_DRIVERS=y
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_VIRTIO=m
@ -630,10 +624,10 @@ CONFIG_CAIF_VIRTIO=m
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 # CONFIG_NET_VENDOR_MICROSOFT is not set
-# CONFIG_NET_VENDOR_MUCSE is not set
 # CONFIG_NET_VENDOR_MYRI is not set
 # CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
@ -645,6 +639,7 @@ CONFIG_CAIF_VIRTIO=m
 # CONFIG_NET_VENDOR_RDC is not set
 CONFIG_R8169=m
 CONFIG_R8169_LEDS=y
+CONFIG_R8125=m
 # CONFIG_NET_VENDOR_RENESAS is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
@ -654,7 +649,7 @@ CONFIG_R8169_LEDS=y
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SOCIONEXT is not set
-CONFIG_SPACEMIT_K1_EMAC=y
+CONFIG_K1X_EMAC=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
@ -668,16 +663,19 @@ CONFIG_SPACEMIT_K1_EMAC=y
 CONFIG_FDDI=m
 CONFIG_DEFXX=m
 CONFIG_SKFP=m
-CONFIG_LED_TRIGGER_PHY=y
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+CONFIG_ROADRUNNER_LARGE_RINGS=y
 CONFIG_MOTORCOMM_PHY=m
 CONFIG_REALTEK_PHY=y
 CONFIG_REALTEK_PHY_HWMON=y
 CONFIG_SMSC_PHY=m
-CONFIG_MDIO_BITBANG=y
-CONFIG_MDIO_GPIO=y
-CONFIG_MDIO_BUS_MUX_GPIO=y
-CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_CAN_FLEXCAN=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_PPP=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_FILTER=y
@ -690,64 +688,14 @@ CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_USB_RTL8152=m
-CONFIG_ADM8211=m
-CONFIG_ATH5K=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_DYNACK=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCI_NO_EEPROM=m
-CONFIG_ATH9K_HTC=m
-CONFIG_ATH9K_HWRNG=y
-CONFIG_CARL9170=m
-# CONFIG_CARL9170_LEDS is not set
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_TRACING=y
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_TRACING=y
-# CONFIG_WIL6210_DEBUGFS is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-CONFIG_ATH10K_AHB=y
-CONFIG_WCN36XX=m
-CONFIG_ATH11K=m
-CONFIG_ATH11K_AHB=m
-CONFIG_ATH11K_PCI=m
-CONFIG_ATH11K_TRACING=y
-CONFIG_ATH12K=m
-CONFIG_ATH12K_AHB=y
-CONFIG_ATH12K_TRACING=y
-CONFIG_AT76C50X_USB=m
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+# CONFIG_WLAN_VENDOR_ATH is not set
+# CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_WLAN_VENDOR_BROADCOM is not set
 # CONFIG_WLAN_VENDOR_INTEL is not set
 # CONFIG_WLAN_VENDOR_INTERSIL is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SPI=m
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_MT7601U=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x0E=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-CONFIG_MT7603E=m
-CONFIG_MT7615E=m
-CONFIG_MT7663U=m
-CONFIG_MT7915E=m
-CONFIG_MT7921E=m
-CONFIG_MT7921U=m
-CONFIG_MT7996E=m
-CONFIG_MT7925E=m
-CONFIG_MT7925U=m
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
 # CONFIG_WLAN_VENDOR_MICROCHIP is not set
 # CONFIG_WLAN_VENDOR_PURELIFI is not set
 CONFIG_RT2X00=m
@ -764,6 +712,8 @@ CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_8822BE=m
 CONFIG_RTW88_8822BS=m
@ -784,20 +734,17 @@ CONFIG_RTW88_8814AE=m
 CONFIG_RTW88_8814AU=m
 CONFIG_RTW89=m
 CONFIG_RTW89_8851BE=m
-CONFIG_RTW89_8851BU=m
 CONFIG_RTW89_8852AE=m
-CONFIG_RTW89_8852AU=m
 CONFIG_RTW89_8852BE=m
-CONFIG_RTW89_8852BU=m
 CONFIG_RTW89_8852BTE=m
 CONFIG_RTW89_8852CE=m
-CONFIG_RTW89_8852CU=m
 CONFIG_RTW89_8922AE=m
+CONFIG_RTL8852BS=m
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_SILABS is not set
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
-CONFIG_ZD1211RW=m
+# CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
 CONFIG_VIRT_WIFI=m
 CONFIG_WAN=y
@ -816,15 +763,15 @@ CONFIG_WWAN=m
 CONFIG_RPMSG_WWAN_CTRL=m
 CONFIG_IOSM=m
 CONFIG_MTK_T7XX=m
-CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=y
 CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_SPACEMIT_POWERKEY=y
+CONFIG_HALL_SENSOR_AS1911=y
 CONFIG_RMI4_CORE=y
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SPI=m
@ -832,28 +779,15 @@ CONFIG_RMI4_SMB=m
 CONFIG_RMI4_F03=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
-CONFIG_RMI4_F1A=y
-CONFIG_RMI4_F21=y
 CONFIG_RMI4_F30=y
 CONFIG_RMI4_F34=y
 CONFIG_RMI4_F3A=y
 CONFIG_RMI4_F54=y
-CONFIG_SERIO_GPIO_PS2=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
 # CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_FINTEK=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_DW=y
-CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_SPACEMIT_K1X=y
+CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=y
@ -868,25 +802,22 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
-CONFIG_I2C_CADENCE=m
+CONFIG_I2C_SPACEMIT_K1X=y
 CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_GPIO_FAULT_INJECTOR=y
-CONFIG_I2C_K1=y
 CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-CONFIG_I2C_SLAVE_TESTUNIT=m
+CONFIG_I2C_SLAVE_EEPROM=y
 CONFIG_I3C=y
-CONFIG_ADI_I3C_MASTER=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
 CONFIG_SVC_I3C_MASTER=m
 CONFIG_MIPI_I3C_HCI=m
 CONFIG_MIPI_I3C_HCI_PCI=m
 CONFIG_SPI=y
+CONFIG_SPI_K1X=y
+CONFIG_SPI_K1X_QSPI=y
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_DMA=y
 CONFIG_SPI_DW_PCI=m
@ -905,12 +836,14 @@ CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_GENERATOR=m
 CONFIG_PTP_1588_CLOCK_IDTCM=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_SPACEMIT_PMIC=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CADENCE=m
-CONFIG_GPIO_DWAPB=y
-CONFIG_GPIO_SPACEMIT_K1=y
-CONFIG_GPIO_SYSCON=y
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_SYSCON=m
+CONFIG_GPIO_K1X=y
 CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_FXL6408=m
 CONFIG_GPIO_DS4520=m
@ -922,7 +855,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA9570=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
-CONFIG_GPIO_QIXIS_FPGA=m
 CONFIG_GPIO_BT8XX=m
 CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
@ -933,7 +865,6 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 CONFIG_GPIO_XRA1403=m
-CONFIG_GPIO_MOXTET=m
 CONFIG_GPIO_MPSSE=m
 CONFIG_GPIO_AGGREGATOR=m
 CONFIG_GPIO_LATCH=m
@ -967,17 +898,14 @@ CONFIG_W1_SLAVE_DS28E17=m
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_POWER_RESET_REGULATOR=y
-CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_SYSCON_REBOOT_MODE=m
 CONFIG_NVMEM_REBOOT_MODE=m
 CONFIG_BATTERY_SBS=y
+CONFIG_CHARGER_SBS_VIRTUAL=y
 CONFIG_SENSORS_DRIVETEMP=m
-CONFIG_SENSORS_GPIO_FAN=y
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_PMBUS=y
+CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_PWM_FAN=y
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
@ -994,27 +922,22 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
-CONFIG_DEVFREQ_THERMAL=y
 CONFIG_PCIE_THERMAL=y
-CONFIG_THERMAL_MMIO=m
-CONFIG_SPACEMIT_K1_TSENSOR=y
-CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_K1X_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_REGULATOR_USERSPACE_CONSUMER=y
-CONFIG_REGULATOR_NETLINK_EVENTS=y
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_FAN53880=m
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_VCTRL=y
+CONFIG_SPACEMIT_WATCHDOG=y
+CONFIG_MFD_SPACEMIT_PMIC=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_VCTRL=m
+CONFIG_REGULATOR_SPACEMIT=y
+CONFIG_RC_CORE=y
+CONFIG_RC_DEVICES=y
+CONFIG_IR_SPACEMIT=y
 CONFIG_CEC_CH7322=m
-CONFIG_CEC_NXP_TDA9950=m
 CONFIG_CEC_GPIO=m
-CONFIG_USB_EXTRON_DA_HD_4K_PLUS_CEC=m
 CONFIG_USB_PULSE8_CEC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 CONFIG_MEDIA_SUPPORT=y
@ -1055,6 +978,7 @@ CONFIG_DVB_PLATFORM_DRIVERS=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 CONFIG_VIDEO_MUX=y
+CONFIG_VIDEO_LINLON_K1X=m
 CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_RTL2830=m
@ -1065,20 +989,38 @@ CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
 CONFIG_LCD2S=m
 CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
 CONFIG_MAX6959=m
 CONFIG_SEG_LED_GPIO=m
 CONFIG_DRM=y
+CONFIG_DRM_SPACEMIT=y
+CONFIG_SPACEMIT_MIPI_PANEL=y
+CONFIG_SPACEMIT_HDMI=y
+# CONFIG_DRM_LT8911EXB is not set
+# CONFIG_DRM_LT9711 is not set
 CONFIG_FB=y
 CONFIG_FB_SIMPLE=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_BACKLIGHT_GPIO=y
+CONFIG_BACKLIGHT_LED=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_K1_I2S=y
+CONFIG_SND_SOC_SPACEMIT=y
+CONFIG_SPACEMIT_CARD=y
+CONFIG_SPACEMIT_PCM=y
+CONFIG_SPACEMIT_I2S=y
+CONFIG_SPACEMIT_HDMIAUDIO=y
 CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ES7210=y
+CONFIG_SND_SOC_ES8156=y
+CONFIG_SND_SOC_ES8323=y
 CONFIG_SND_SOC_ES8326=y
 CONFIG_SND_SIMPLE_CARD=y
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@ -1088,20 +1030,17 @@ CONFIG_UHID=y
 CONFIG_HID_MULTITOUCH=y
 CONFIG_I2C_HID_OF=y
 CONFIG_USB_HIDDEV=y
-CONFIG_USB_LED_TRIG=y
 CONFIG_USB_CONN_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_EHCI_K1X=y
 CONFIG_USB_WDM=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
 CONFIG_USB_DWC3=y
-CONFIG_USB_DWC3_OF_SIMPLE=m
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC3_OF_SIMPLE is not set
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
@ -1156,134 +1095,46 @@ CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
 CONFIG_USB_SERIAL_XR=m
 CONFIG_USB_SERIAL_DEBUG=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LCD=m
-CONFIG_USB_ONBOARD_DEV=y
-CONFIG_USB_ONBOARD_DEV_USB5744=y
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_ISP1301=m
+CONFIG_USB_K1XCI_OTG=y
+CONFIG_K1XCI_USB2_PHY=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_K1X_UDC=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
-CONFIG_TYPEC=y
-CONFIG_TYPEC_TCPM=m
-CONFIG_TYPEC_TCPCI=m
-CONFIG_TYPEC_RT1711H=m
-CONFIG_TYPEC_TCPCI_MAXIM=m
-CONFIG_TYPEC_FUSB302=m
-CONFIG_TYPEC_UCSI=m
-CONFIG_UCSI_CCG=m
-CONFIG_UCSI_STM32G0=m
-CONFIG_TYPEC_TPS6598X=m
-CONFIG_TYPEC_ANX7411=m
-CONFIG_TYPEC_RT1719=m
-CONFIG_TYPEC_HD3SS3220=m
-CONFIG_TYPEC_STUSB160X=m
-CONFIG_TYPEC_WUSB3801=m
-CONFIG_TYPEC_MUX_FSA4480=m
-CONFIG_TYPEC_MUX_GPIO_SBU=m
-CONFIG_TYPEC_MUX_PI3USB30532=m
-CONFIG_TYPEC_MUX_IT5205=m
-CONFIG_TYPEC_MUX_NB7VPQ904M=m
-CONFIG_TYPEC_MUX_PS883X=m
-CONFIG_TYPEC_MUX_PTN36502=m
-CONFIG_TYPEC_MUX_TUSB1046=m
-CONFIG_TYPEC_MUX_WCD939X_USBSS=m
-CONFIG_TYPEC_DP_ALTMODE=m
-CONFIG_TYPEC_NVIDIA_ALTMODE=m
-CONFIG_TYPEC_TBT_ALTMODE=m
 CONFIG_MMC=y
-CONFIG_PWRSEQ_SD8787=m
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF_DWCMSHC=y
-CONFIG_MMC_SDHCI_OF_K1=y
-CONFIG_MMC_SPI=y
-CONFIG_MMC_DW=y
-CONFIG_MMC_DW_K3=m
-CONFIG_MMC_DW_PCI=y
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_HSQ=y
-CONFIG_NEW_LEDS=y
+CONFIG_MMC_SDHCI_OF_K1X=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-CONFIG_LEDS_CLASS_MULTICOLOR=m
-CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_REGULATOR=y
-CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_USER=y
-CONFIG_LEDS_SPI_BYTE=m
-CONFIG_LEDS_GROUP_MULTICOLOR=m
-CONFIG_LEDS_PWM_MULTICOLOR=m
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_LEDS_TRIGGER_CAMERA=y
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGER_PATTERN=y
-CONFIG_LEDS_TRIGGER_TTY=y
-CONFIG_LEDS_TRIGGER_INPUT_EVENTS=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1307_CENTURY=y
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_HYM8563=m
-CONFIG_RTC_DRV_DS1302=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1343=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_CADENCE=m
+CONFIG_RTC_DRV_SPT_PMIC=y
+CONFIG_RTC_DRV_SA1100=y
 CONFIG_DMADEVICES=y
-CONFIG_DW_AXI_DMAC=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_DW_EDMA=m
-CONFIG_DW_EDMA_PCIE=m
+CONFIG_MMP_PDMA_DRIVER=y
+CONFIG_MMP_PDMA_SPACEMIT_K1X=y
+CONFIG_ADMA_SPACEMIT_K1X=y
+CONFIG_USERSPACE_DMA=y
 CONFIG_UDMABUF=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS_CMA=y
 CONFIG_UIO=y
-CONFIG_UIO_PDRV_GENIRQ=y
-CONFIG_UIO_DMEM_GENIRQ=y
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PMEM=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_VIRTIO_RTC=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+# CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
 CONFIG_STAGING=y
 CONFIG_ADIS16203=m
@ -1296,20 +1147,56 @@ CONFIG_AD5933=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_AV7110=m
 CONFIG_VIDEO_MAX96712=m
-CONFIG_COMMON_CLK_AXI_CLKGEN=m
-CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_FIXED_MMIO=y
-CONFIG_COMMON_CLK_RPMI=m
-CONFIG_SPACEMIT_K1_CCU=y
-CONFIG_SPACEMIT_K3_CCU=y
+CONFIG_FB_TFT=y
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SEPS525=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_SPACEMIT_K1X_CCU=y
 CONFIG_MAILBOX=y
-CONFIG_PLATFORM_MHU=m
-CONFIG_IOMMUFD=y
+CONFIG_SPACEMIT_MAILBOX=y
+CONFIG_K1X_MAILBOX=y
+CONFIG_IOMMUFD=m
 CONFIG_REMOTEPROC=y
 CONFIG_REMOTEPROC_CDEV=y
-CONFIG_RPMSG_CHAR=m
-CONFIG_RPMSG_CTRL=m
+CONFIG_K1X_REMOTEPROC=y
 CONFIG_RPMSG_VIRTIO=y
+CONFIG_SPACEMIT_PM_DOMAINS=y
+CONFIG_SPACEMIT_REBOOT_CONTROL=y
+CONFIG_SPACEMIT_LID_CONTROL=y
+CONFIG_SPACEMI_K1X_DMA_RANGE=y
+CONFIG_SPACEMI_SOCINFO=y
+CONFIG_SPACEMIT_DDRBW=y
+CONFIG_CHIP_MEDIA_JPU=y
+CONFIG_SPACEMIT_V2D=y
+CONFIG_SPACEMIT_RFKILL=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 CONFIG_DEVFREQ_GOV_PERFORMANCE=m
@ -1317,8 +1204,7 @@ CONFIG_DEVFREQ_GOV_POWERSAVE=m
 CONFIG_DEVFREQ_GOV_USERSPACE=m
 CONFIG_DEVFREQ_GOV_PASSIVE=m
 CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_GPIO=y
+CONFIG_EXTCON_USB_K1XCI=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER_HW_CONSUMER=m
@ -1463,6 +1349,7 @@ CONFIG_TI_TLC4541=m
 CONFIG_TI_TSC2046=m
 CONFIG_VF610_ADC=m
 CONFIG_XILINX_XADC=m
+CONFIG_SPACEMIT_P1_ADC=m
 CONFIG_AD74115=m
 CONFIG_AD74413R=m
 CONFIG_IIO_RESCALE=m
@ -1500,6 +1387,7 @@ CONFIG_AD5064=m
 CONFIG_AD5360=m
 CONFIG_AD5380=m
 CONFIG_AD5421=m
+CONFIG_AD5446=m
 CONFIG_AD5449=m
 CONFIG_AD5592R=m
 CONFIG_AD5593R=m
@ -1702,6 +1590,7 @@ CONFIG_ICP10100=m
 CONFIG_MPL115_I2C=m
 CONFIG_MPL115_SPI=m
 CONFIG_MPL3115=m
+CONFIG_MPRLS0025PA=m
 CONFIG_MS5611=m
 CONFIG_MS5611_I2C=m
 CONFIG_MS5611_SPI=m
@ -1747,26 +1636,15 @@ CONFIG_MAX31856=m
 CONFIG_MAX31865=m
 CONFIG_MCP9600=m
 CONFIG_PWM=y
-CONFIG_PWM_PROVIDE_GPIO=y
-CONFIG_PWM_ARGON_FAN_HAT=m
-CONFIG_PWM_CLK=y
-CONFIG_PWM_DWC=y
-CONFIG_PWM_GPIO=y
+CONFIG_PWM_CLK=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_GPIO=m
 CONFIG_ACLINT_SSWI=y
-CONFIG_IPACK_BUS=y
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_GPIO=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_TI_SYSCON=m
-CONFIG_RESET_TI_TPS380X=m
-CONFIG_PHY_SPACEMIT_K1_USB2=y
-CONFIG_DWC_PCIE_PMU=m
+CONFIG_RESET_GPIO=m
+CONFIG_RESET_K1X_SPACEMIT=y
 CONFIG_LIBNVDIMM=y
-CONFIG_NVMEM_RMEM=m
-CONFIG_NVMEM_SPMI_SDAM=m
-CONFIG_NVMEM_U_BOOT_ENV=m
+CONFIG_NVMEM_SPACEMIT_EFUSE=y
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
 CONFIG_VALIDATE_FS_PARSER=y
@ -1781,9 +1659,9 @@ CONFIG_XFS_FS=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
-CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS=y
+CONFIG_F2FS_FS=m
 CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_CHECK_FS=y
 CONFIG_F2FS_FS_COMPRESSION=y
@ -1792,7 +1670,7 @@ CONFIG_FANOTIFY=y
 CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=y
+CONFIG_OVERLAY_FS=m
 CONFIG_NETFS_STATS=y
 CONFIG_CACHEFILES=y
 CONFIG_ISO9660_FS=y
@ -1815,9 +1693,11 @@ CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_ZSTD=y
+CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
 CONFIG_NFS_V4=y
 CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_NFS_V4_1_MIGRATION=y
 CONFIG_ROOT_NFS=y
@ -1832,7 +1712,8 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_UNICODE=y
-CONFIG_ENCRYPTED_KEYS=m
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_APPARMOR=y
@ -1845,15 +1726,21 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=y
+CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
+CONFIG_SPACEMIT_REE_ENGINE=y
+CONFIG_SPACEMIT_REE_AES=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=8
 CONFIG_CONSOLE_LOGLEVEL_QUIET=8
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_BTF=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
+CONFIG_FTRACE_SYSCALLS=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
--- a/config/kernel/linux-spacemit-legacy.config
+++ b/config/kernel/linux-spacemit-legacy.config
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@ -42,7 +42,7 @@ case $BRANCH in
 		declare -g KERNEL_MAJOR_MINOR="6.18"
 		;;
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="7.0"
+		declare -g KERNEL_MAJOR_MINOR="6.19"
 		;;

 esac
--- a/config/sources/families/include/meson_common.inc
+++ b/config/sources/families/include/meson_common.inc
@ -25,7 +25,6 @@ case $BRANCH in

 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.12"
-		declare -g KERNELBRANCH="tag:v6.12.28" # frozen on this version
 		;;
 esac

--- a/config/sources/families/rockchip.conf
+++ b/config/sources/families/rockchip.conf
@ -226,7 +226,7 @@ elif [[ "$BOOT_SOC" == "rk3506" ]]; then
 		local logging_prelude=""
 		[[ $(type -t run_host_command_logged) == function ]] && logging_prelude="run_host_command_logged"

-		if [[ -f "$1/u-boot-rockchip.bin" ]]; then #"$BOOT_SCENARIO" == binman
+		if [ -f $1/u-boot-rockchip.bin ]; then #"$BOOT_SCENARIO" == binman
 			${logging_prelude} dd if=$1/u-boot-rockchip.bin of=$2 bs=32k seek=1 conv=notrunc status=none
 		fi
 	}
--- a/config/sources/families/sm8550.conf
+++ b/config/sources/families/sm8550.conf
@ -14,9 +14,10 @@ declare -g BOOTENV_FILE="qcom-abl.txt"
 enable_extension "image-output-abl"

 case $BRANCH in
+
 	current)
-		declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH='branch:linux-6.18.y'
+		declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH='branch:linux-6.12.y'
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
 		;;

--- a/config/sources/families/spacemit.conf
+++ b/config/sources/families/spacemit.conf
@ -27,24 +27,19 @@ declare -g BOOTCONFIG="k1_defconfig" # Boot with generic SpacemiT K1 config

 # Linux
 case "${BRANCH}" in
-	legacy)
+	current)
 		declare -g KERNELSOURCE="https://github.com/jmontleon/linux-bianbu.git"
 		declare -g KERNELBRANCH="branch:linux-6.6.y"
 		declare -g EXTRAWIFI="no" # WiFi drivers are already included in the kernel
 		declare -g KERNEL_MAJOR_MINOR="6.6"
-		declare -g LINUXCONFIG="linux-${LINUXFAMILY}-legacy"
+		declare -g LINUXCONFIG="linux-${LINUXFAMILY}-current"
 		;;
-	current)
+	edge)
 		declare -g KERNELSOURCE="https://github.com/jmontleon/linux-bianbu.git"
 		declare -g KERNELBRANCH="branch:linux-6.18.y"
 		declare -g EXTRAWIFI="no" # WiFi drivers are already included in the kernel
 		declare -g KERNEL_MAJOR_MINOR="6.18"
-		declare -g LINUXCONFIG="linux-${LINUXFAMILY}-current"
-		;;
-	edge)
-		declare -g KERNEL_MAJOR_MINOR="7.0" # Major and minor versions of this kernel.
 		declare -g LINUXCONFIG="linux-${LINUXFAMILY}-edge"
-		declare -g EXTRAWIFI="no"
 		;;
 esac

@ -66,7 +61,7 @@ pre_prepare_partitions() {

 write_uboot_platform() {
 	local device=${2}
-	if [[ -b "${2}boot0" ]]; then
+	if [ -b ${2}boot0 ]; then
 		echo "eMMC"
 		DEVICE=`ls /dev/mmcblk*boot0 | sed 's/^.....//'`
 		echo 0 > /sys/block/${DEVICE}/force_ro
--- a/config/sources/mainline-kernel.conf.sh
+++ b/config/sources/mainline-kernel.conf.sh
@ -8,7 +8,7 @@
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	[[ -n "${KERNELBRANCH}" ]] && return 0           # if already set, don't touch it; that way other hooks can run in any order
 	if [[ "${KERNEL_MAJOR_MINOR}" == "7.0" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v7.0-rc2"
+		declare -g KERNELBRANCH="tag:v7.0-rc1"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }
--- a/extensions/gxlimg.sh
+++ b/extensions/gxlimg.sh
@ -60,7 +60,7 @@ function gxlimg_repack_fip_with_new_uboot() {
 				-s raw-u-boot.bin \
 				"${EXTRACT_DIR}/bl33.enc"

-			if [[ -e "${EXTRACT_DIR}/lpddr3_1d.fw" ]]; then
+			if [ -e "${EXTRACT_DIR}/lpddr3_1d.fw" ]; then
 				run_host_command_logged gxlimg \
 					-t fip \
 					--bl2 "${EXTRACT_DIR}/bl2.sign" \
@ -101,7 +101,7 @@ function gxlimg_repack_fip_with_new_uboot() {
 			;;
 	esac

-	if [[ ! -s u-boot.bin ]]; then
+	if [ ! -s u-boot.bin ]; then
 		exit_with_error "FIP repack produced empty u-boot.bin"
 	fi
 }
--- a/extensions/jethub-burn.sh
+++ b/extensions/jethub-burn.sh
@ -100,7 +100,7 @@ function make_burn__run() {
  cp "$uboot_bin"          "$tmpdir/u-boot.bin"

  display_alert "make_burn" "Packing burn image..." "info"
-  env -u QEMU_CPU "$PACKER" -r "$tmpdir/image.cfg" "$tmpdir" "$OUT_IMG" || exit_with_error "Image pack FAILED"
+  "$PACKER" -r "$tmpdir/image.cfg" "$tmpdir" "$OUT_IMG" || exit_with_error "Image pack FAILED"

  [[ -f "$OUT_IMG" ]] || exit_with_error "Burn image not produced"
  display_alert "make_burn" "Burn image created: $(basename "$OUT_IMG")" "ok"
--- a/extensions/lowmem.sh
+++ b/extensions/lowmem.sh
@ -13,7 +13,7 @@ function post_family_tweaks_bsp__initramfs() {
 	display_alert "${EXTENSION}" "Set initramfs config for low memory" "debug"

 	# Create /etc/initramfs-tools/conf.d/armbian-lowmem.conf configuration file
-	if [[ ! -f "$destination/etc/initramfs-tools/conf.d/armbian-lowmem.conf" ]]; then
+	if [ ! -f "$destination/etc/initramfs-tools/conf.d/armbian-lowmem.conf" ]; then
 		mkdir -p "$destination/etc/initramfs-tools/conf.d"
 		install -m 644 /dev/null "$destination/etc/initramfs-tools/conf.d/armbian-lowmem.conf"

@ -35,7 +35,7 @@ function post_family_tweaks_bsp__copy_lowmem_config() {

 	# Copy /etc/default/armbian-lowmem configuration file
 	# Allows user to customize swapfile size / location
-	if [[ ! -f "$destination/etc/default/armbian-lowmem" ]]; then
+	if [ ! -f "$destination/etc/default/armbian-lowmem" ]; then
 		install -m 664 "$SRC/packages/bsp/armbian-lowmem/etc/default/armbian-lowmem.dpkg-dist" "$destination/etc/default/armbian-lowmem"
 	fi

--- a/extensions/mesa-vpu.sh
+++ b/extensions/mesa-vpu.sh
@ -46,17 +46,9 @@ function post_install_kernel_debs__3d() {
 	declare -a pkgs=("libgl1-mesa-dri")

 	if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
-		pkgs+=("libglx-mesa0") # Mesa OpenGL extension library for X11
-		pkgs+=("mesa-utils") # Mesa utilities for OpenGL information and testing
-		pkgs+=("mesa-utils-extra") # Additional Mesa demonstration programs
-		pkgs+=("glmark2") # OpenGL 2.0/3.0 benchmark suite
-		pkgs+=("glmark2-wayland") # Glmark2 Wayland backend for benchmarking
-		pkgs+=("glmark2-es2-wayland") # Glmark2 OpenGL ES 2.0 Wayland backend
-		pkgs+=("glmark2-es2") # Glmark2 OpenGL ES 2.0 benchmark support
-		pkgs+=("glmark2-x11") # Glmark2 X11 backend for benchmarking
-		pkgs+=("glmark2-es2-x11") # Glmark2 OpenGL ES 2.0 X11 backend
-		pkgs+=("vulkan-tools") # Vulkan utilities for testing and debugging (vulkaninfo, etc.)
-		pkgs+=("mesa-vulkan-drivers") # Vulkan drivers for Mesa GPUs (Panfrost, Lima, Radeon, Intel, etc.)
+		pkgs+=("libglx-mesa0") # x11 stuff all the way
+		pkgs+=("mesa-utils" "mesa-utils-extra")
+		pkgs+=("glmark2" "glmark2-wayland" "glmark2-es2-wayland" "glmark2-es2" "glmark2-x11" "glmark2-es2-x11")
 	fi

 	if [[ "${BUILD_DESKTOP}" == "yes" ]]; then # if desktop, add amazingfated's multimedia PPAs and rockchip-multimedia-config utility, chromium, gstreamer, etc
--- a/extensions/odin2-preset-firstrun.sh
+++ b/extensions/odin2-preset-firstrun.sh
@ -1,79 +0,0 @@
-function post_family_tweaks__preset_configs() {
-	display_alert "$BOARD" "preset configs for rootfs" "info"
-	# Set PRESET_NET_CHANGE_DEFAULTS to 1 to apply any network related settings below
-	echo "PRESET_NET_CHANGE_DEFAULTS=1" > "${SDCARD}"/root/.not_logged_in_yet
-
-	# Enable WiFi or Ethernet.
-	#      NB: If both are enabled, WiFi will take priority and Ethernet will be disabled.
-	echo "PRESET_NET_ETHERNET_ENABLED=1" >> "${SDCARD}"/root/.not_logged_in_yet
-	echo "PRESET_NET_WIFI_ENABLED=1" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	#Enter your WiFi creds
-	#      SECURITY WARN: Your wifi keys will be stored in plaintext, no encryption.
-	#echo "PRESET_NET_WIFI_SSID='MySSID'" >> "${SDCARD}"/root/.not_logged_in_yet
-	#echo "PRESET_NET_WIFI_KEY='MyWiFiKEY'" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	#      Country code to enable power ratings and channels for your country. eg: GB US DE | https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-	#echo "PRESET_NET_WIFI_COUNTRYCODE='GB'" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	#If you want to use a static ip, set it here
-	#echo "PRESET_NET_USE_STATIC=1" >> "${SDCARD}"/root/.not_logged_in_yet
-	#echo "PRESET_NET_STATIC_IP='192.168.0.100'" >> "${SDCARD}"/root/.not_logged_in_yet
-	#echo "PRESET_NET_STATIC_MASK='255.255.255.0'" >> "${SDCARD}"/root/.not_logged_in_yet
-	#echo "PRESET_NET_STATIC_GATEWAY='192.168.0.1'" >> "${SDCARD}"/root/.not_logged_in_yet
-	#echo "PRESET_NET_STATIC_DNS='8.8.8.8 8.8.4.4'" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset user default shell, you can choose bash or  zsh
-	echo "PRESET_USER_SHELL=bash" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Set PRESET_CONNECT_WIRELESS=y if you want to connect wifi manually at first login
-	echo "PRESET_CONNECT_WIRELESS=n" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Set SET_LANG_BASED_ON_LOCATION=n if you want to choose "Set user language based on your location?" with "n" at first login
-	echo "SET_LANG_BASED_ON_LOCATION=y" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset default locale
-	echo "PRESET_LOCALE=en_US.UTF-8" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset timezone
-	echo "PRESET_TIMEZONE=Etc/UTC" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset root password
-	echo "PRESET_ROOT_PASSWORD=1234" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset username
-	echo "PRESET_USER_NAME=odin2" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset user password
-	echo "PRESET_USER_PASSWORD=1234" >> "${SDCARD}"/root/.not_logged_in_yet
-
-	# Preset user default realname
-	echo "PRESET_DEFAULT_REALNAME=Odin2" >> "${SDCARD}"/root/.not_logged_in_yet
-}
-
-function pre_customize_image__add_odin2_scripts() {
-	display_alert "Adding Odin2 Scripts" "${EXTENSION}" "info"
-
-	local launcher_dir="${SDCARD}/usr/local"
-	run_host_command_logged mkdir -pv "${launcher_dir}"
-
-	chroot_sdcard git clone https://github.com/Squishy123/odin2-scripts.git "$launcher_dir/odin2-scripts"
-
-
-	local launcher_dir="${SDCARD}/usr/local/bin"
-	local launcher_file="${launcher_dir}/install-odin2-scripts"
-	run_host_command_logged mkdir -pv "${launcher_dir}"
-
-	cat <<- 'INSTALL_ODIN_2_SCRIPT' > "${launcher_file}"
-		#!/usr/bin/env bash
-		if [[ ! -d ~/sys/odin2-scripts ]]; then
-			mkdir -p ~/sys
-			git clone https://github.com/Squishy123/odin2-scripts.git ~/sys/odin2-scripts
-		fi
-		cd ~/sys/odin2-scripts
-	INSTALL_ODIN_2_SCRIPT
-
-	run_host_command_logged chmod -v +x "${launcher_file}"
-	display_alert "Added Odin2 Scripts" "${EXTENSION}" "info"
-}
-
--- a/lib/functions/bsp/armbian-bsp-cli-deb.sh
+++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh
@ -305,7 +305,7 @@ function get_bootscript_info() {
 		bootscript_info[bootscript_file_contents]=""

 		bootscript_info[bootscript_file_fullpath]="${SRC}/config/bootscripts/${bootscript_source}"
-		if [[ -f "${USERPATCHES_PATH}/bootscripts/${bootscript_source}" ]]; then
+		if [ -f "${USERPATCHES_PATH}/bootscripts/${bootscript_source}" ]; then
 			bootscript_info[bootscript_file_fullpath]="${USERPATCHES_PATH}/bootscripts/${bootscript_source}"
 		fi
 		bootscript_info[bootscript_file_contents]="$(cat "${bootscript_info[bootscript_file_fullpath]}")"
@ -329,8 +329,8 @@ function get_bootscript_info() {
 function board_side_bsp_cli_postinst_update_uboot_bootscript() {
 	if [[ ${BOOTSCRIPT_FORCE_UPDATE} == yes || ! -f /boot/${BOOTSCRIPT_DST} ]]; then

-		[[ -z "${BOOTSCRIPT_BACKUP_VERSION}" ]] && BOOTSCRIPT_BACKUP_VERSION="$(date +%s)"
-		if [[ -f "/boot/${BOOTSCRIPT_DST}" ]]; then
+		[ -z ${BOOTSCRIPT_BACKUP_VERSION} ] && BOOTSCRIPT_BACKUP_VERSION="$(date +%s)"
+		if [ -f /boot/${BOOTSCRIPT_DST} ]; then
 			cp -v /boot/${BOOTSCRIPT_DST} /usr/share/armbian/${BOOTSCRIPT_DST}-${BOOTSCRIPT_BACKUP_VERSION}
 			echo "NOTE: You can find previous bootscript versions in /usr/share/armbian !"
 		fi
@ -341,23 +341,23 @@ function board_side_bsp_cli_postinst_update_uboot_bootscript() {
 		rootfstype=$(sed -e 's/^.*rootfstype=//' -e 's/ .*$//' < /proc/cmdline)

 		# recreate armbianEnv.txt if it and extlinux does not exists
-		if [[ ! -f /boot/armbianEnv.txt && ! -f /boot/extlinux/extlinux.conf ]]; then
+		if [ ! -f /boot/armbianEnv.txt ] && [ ! -f /boot/extlinux/extlinux.conf ]; then
 			cp -v /usr/share/armbian/armbianEnv.txt /boot
 			echo "rootdev="\$rootdev >> /boot/armbianEnv.txt
 			echo "rootfstype="\$rootfstype >> /boot/armbianEnv.txt
 		fi

 		# update boot.ini if it exists? @TODO: why? who uses this?
-		[[ -f /boot/boot.ini ]] && sed -i "s/setenv rootdev.*/setenv rootdev \\"$rootdev\\"/" /boot/boot.ini
-		[[ -f /boot/boot.ini ]] && sed -i "s/setenv rootfstype.*/setenv rootfstype \\"$rootfstype\\"/" /boot/boot.ini
+		[ -f /boot/boot.ini ] && sed -i "s/setenv rootdev.*/setenv rootdev \\"$rootdev\\"/" /boot/boot.ini
+		[ -f /boot/boot.ini ] && sed -i "s/setenv rootfstype.*/setenv rootfstype \\"$rootfstype\\"/" /boot/boot.ini

-		[[ -f /boot/boot.cmd ]] && mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr > /dev/null 2>&1
+		[ -f /boot/boot.cmd ] && mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr > /dev/null 2>&1
 	fi
 }

 function board_side_bsp_cli_preinst() {
 	# tell people to reboot at next login
-	[[ "$1" == "upgrade" ]] && touch /var/run/.reboot_required
+	[ "$1" = "upgrade" ] && touch /var/run/.reboot_required

 	# fixing ramdisk corruption when using lz4 compression method
 	sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" /etc/initramfs-tools/initramfs.conf
@ -374,39 +374,39 @@ function board_side_bsp_cli_preinst() {
 	esac
 	sysctl -p > /dev/null 2>&1
 	# replace canonical advertisement
-	if [[ -d "/var/lib/ubuntu-advantage/messages/" ]]; then
+	if [ -d "/var/lib/ubuntu-advantage/messages/" ]; then
 		echo -e "\nSupport Armbian! \nLearn more at https://armbian.com/donate" > /var/lib/ubuntu-advantage/messages/apt-pre-invoke-esm-service-status
 		cp /var/lib/ubuntu-advantage/messages/apt-pre-invoke-esm-service-status /var/lib/ubuntu-advantage/messages/apt-pre-invoke-no-packages-apps.tmpl
 		cp /var/lib/ubuntu-advantage/messages/apt-pre-invoke-esm-service-status /var/lib/ubuntu-advantage/messages/apt-pre-invoke-packages-apps
 		cp /var/lib/ubuntu-advantage/messages/apt-pre-invoke-esm-service-status /var/lib/ubuntu-advantage/messages/apt-pre-invoke-packages-apps.tmpl
 	fi
 	# disable deprecated services
-	[[ -f "/etc/profile.d/activate_psd_user.sh" ]] && rm /etc/profile.d/activate_psd_user.sh
-	[[ -f "/etc/profile.d/check_first_login.sh" ]] && rm /etc/profile.d/check_first_login.sh
-	[[ -f "/etc/profile.d/check_first_login_reboot.sh" ]] && rm /etc/profile.d/check_first_login_reboot.sh
-	[[ -f "/etc/profile.d/ssh-title.sh" ]] && rm /etc/profile.d/ssh-title.sh
-	[[ -f "/etc/update-motd.d/10-header" ]] && rm /etc/update-motd.d/10-header
-	[[ -f "/etc/update-motd.d/30-sysinfo" ]] && rm /etc/update-motd.d/30-sysinfo
-	[[ -f "/etc/update-motd.d/35-tips" ]] && rm /etc/update-motd.d/35-tips
-	[[ -f "/etc/update-motd.d/40-updates" ]] && rm /etc/update-motd.d/40-updates
-	[[ -f "/etc/update-motd.d/98-autoreboot-warn" ]] && rm /etc/update-motd.d/98-autoreboot-warn
-	[[ -f "/etc/update-motd.d/99-point-to-faq" ]] && rm /etc/update-motd.d/99-point-to-faq
-	[[ -f "/etc/update-motd.d/80-esm" ]] && rm /etc/update-motd.d/80-esm
-	[[ -f "/etc/update-motd.d/80-livepatch" ]] && rm /etc/update-motd.d/80-livepatch
-	[[ -f "/etc/apt/apt.conf.d/02compress-indexes" ]] && rm /etc/apt/apt.conf.d/02compress-indexes
-	[[ -f "/etc/apt/apt.conf.d/02periodic" ]] && rm /etc/apt/apt.conf.d/02periodic
-	[[ -f "/etc/apt/apt.conf.d/no-languages" ]] && rm /etc/apt/apt.conf.d/no-languages
-	[[ -f "/etc/init.d/armhwinfo" ]] && rm /etc/init.d/armhwinfo
-	[[ -f "/etc/logrotate.d/armhwinfo" ]] && rm /etc/logrotate.d/armhwinfo
-	[[ -f "/etc/init.d/firstrun" ]] && rm /etc/init.d/firstrun
-	[[ -f "/etc/init.d/resize2fs" ]] && rm /etc/init.d/resize2fs
-	[[ -f "/lib/systemd/system/firstrun-config.service" ]] && rm /lib/systemd/system/firstrun-config.service
-	[[ -f "/lib/systemd/system/firstrun.service" ]] && rm /lib/systemd/system/firstrun.service
-	[[ -f "/lib/systemd/system/resize2fs.service" ]] && rm /lib/systemd/system/resize2fs.service
-	[[ -f "/usr/lib/armbian/apt-updates" ]] && rm /usr/lib/armbian/apt-updates
-	[[ -f "/usr/lib/armbian/firstrun-config.sh" ]] && rm /usr/lib/armbian/firstrun-config.sh
+	[ -f "/etc/profile.d/activate_psd_user.sh" ] && rm /etc/profile.d/activate_psd_user.sh
+	[ -f "/etc/profile.d/check_first_login.sh" ] && rm /etc/profile.d/check_first_login.sh
+	[ -f "/etc/profile.d/check_first_login_reboot.sh" ] && rm /etc/profile.d/check_first_login_reboot.sh
+	[ -f "/etc/profile.d/ssh-title.sh" ] && rm /etc/profile.d/ssh-title.sh
+	[ -f "/etc/update-motd.d/10-header" ] && rm /etc/update-motd.d/10-header
+	[ -f "/etc/update-motd.d/30-sysinfo" ] && rm /etc/update-motd.d/30-sysinfo
+	[ -f "/etc/update-motd.d/35-tips" ] && rm /etc/update-motd.d/35-tips
+	[ -f "/etc/update-motd.d/40-updates" ] && rm /etc/update-motd.d/40-updates
+	[ -f "/etc/update-motd.d/98-autoreboot-warn" ] && rm /etc/update-motd.d/98-autoreboot-warn
+	[ -f "/etc/update-motd.d/99-point-to-faq" ] && rm /etc/update-motd.d/99-point-to-faq
+	[ -f "/etc/update-motd.d/80-esm" ] && rm /etc/update-motd.d/80-esm
+	[ -f "/etc/update-motd.d/80-livepatch" ] && rm /etc/update-motd.d/80-livepatch
+	[ -f "/etc/apt/apt.conf.d/02compress-indexes" ] && rm /etc/apt/apt.conf.d/02compress-indexes
+	[ -f "/etc/apt/apt.conf.d/02periodic" ] && rm /etc/apt/apt.conf.d/02periodic
+	[ -f "/etc/apt/apt.conf.d/no-languages" ] && rm /etc/apt/apt.conf.d/no-languages
+	[ -f "/etc/init.d/armhwinfo" ] && rm /etc/init.d/armhwinfo
+	[ -f "/etc/logrotate.d/armhwinfo" ] && rm /etc/logrotate.d/armhwinfo
+	[ -f "/etc/init.d/firstrun" ] && rm /etc/init.d/firstrun
+	[ -f "/etc/init.d/resize2fs" ] && rm /etc/init.d/resize2fs
+	[ -f "/lib/systemd/system/firstrun-config.service" ] && rm /lib/systemd/system/firstrun-config.service
+	[ -f "/lib/systemd/system/firstrun.service" ] && rm /lib/systemd/system/firstrun.service
+	[ -f "/lib/systemd/system/resize2fs.service" ] && rm /lib/systemd/system/resize2fs.service
+	[ -f "/usr/lib/armbian/apt-updates" ] && rm /usr/lib/armbian/apt-updates
+	[ -f "/usr/lib/armbian/firstrun-config.sh" ] && rm /usr/lib/armbian/firstrun-config.sh
 	# fix for https://bugs.launchpad.net/ubuntu/+source/lightdm-gtk-greeter/+bug/1897491
-	[[ -d "/var/lib/lightdm" ]] && (
+	[ -d "/var/lib/lightdm" ] && (
 		chown -R lightdm:lightdm /var/lib/lightdm
 		chmod 0750 /var/lib/lightdm
 	)
@ -423,20 +423,20 @@ function board_side_bsp_cli_postrm() { # not run here
 function board_side_bsp_cli_postinst_base() {
 	# Source the armbian-release information file
 	# shellcheck source=/dev/null
-	[[ -f /etc/armbian-release ]] && . /etc/armbian-release
+	[ -f /etc/armbian-release ] && . /etc/armbian-release

 	# ARMBIAN_PRETTY_NAME is now set in armbian-base-files.

 	# Force ramlog to be enabled if it exists. @TODO: why?
-	[[ -f /etc/lib/systemd/system/armbian-ramlog.service ]] && systemctl --no-reload enable armbian-ramlog.service
+	[ -f /etc/lib/systemd/system/armbian-ramlog.service ] && systemctl --no-reload enable armbian-ramlog.service

 	# check if it was disabled in config and disable in new service
-	if [[ -n "$(grep -w '^ENABLED=false' /etc/default/log2ram 2> /dev/null)" ]]; then
+	if [ -n "$(grep -w '^ENABLED=false' /etc/default/log2ram 2> /dev/null)" ]; then
 		sed -i "s/^ENABLED=.*/ENABLED=false/" /etc/default/armbian-ramlog
 	fi

 	# fix boot delay "waiting for suspend/resume device"
-	if [[ -f "/etc/initramfs-tools/initramfs.conf" ]]; then
+	if [ -f "/etc/initramfs-tools/initramfs.conf" ]; then
 		if ! grep --quiet "RESUME=none" /etc/initramfs-tools/initramfs.conf; then
 			echo "RESUME=none" >> /etc/initramfs-tools/initramfs.conf
 		fi
@ -447,20 +447,20 @@ function board_side_bsp_cli_postinst_finish() {
 	ln -sf /var/run/motd /etc/motd
 	rm -f /etc/update-motd.d/00-header /etc/update-motd.d/10-help-text

-	if [[ ! -f "/etc/default/armbian-motd" ]]; then
+	if [ ! -f "/etc/default/armbian-motd" ]; then
 		mv /etc/default/armbian-motd.dpkg-dist /etc/default/armbian-motd
 	fi
-	if [[ ! -f "/etc/default/armbian-ramlog" && -f /etc/default/armbian-ramlog.dpkg-dist ]]; then
+	if [ ! -f "/etc/default/armbian-ramlog" ] && [ -f /etc/default/armbian-ramlog.dpkg-dist ]; then
 		mv /etc/default/armbian-ramlog.dpkg-dist /etc/default/armbian-ramlog
 	fi
-	if [[ ! -f "/etc/default/armbian-zram-config" && -f /etc/default/armbian-zram-config.dpkg-dist ]]; then
+	if [ ! -f "/etc/default/armbian-zram-config" ] && [ -f /etc/default/armbian-zram-config.dpkg-dist ]; then
 		mv /etc/default/armbian-zram-config.dpkg-dist /etc/default/armbian-zram-config
 	fi
-	if [[ ! -f "/etc/default/armbian-firstrun" ]]; then
+	if [ ! -f "/etc/default/armbian-firstrun" ]; then
 		mv /etc/default/armbian-firstrun.dpkg-dist /etc/default/armbian-firstrun
 	fi

-	if [[ -L "/usr/lib/chromium-browser/master_preferences.dpkg-dist" ]]; then
+	if [ -L "/usr/lib/chromium-browser/master_preferences.dpkg-dist" ]; then
 		mv /usr/lib/chromium-browser/master_preferences.dpkg-dist /usr/lib/chromium-browser/master_preferences
 	fi

--- a/lib/functions/bsp/utils-bsp.sh
+++ b/lib/functions/bsp/utils-bsp.sh
@ -24,7 +24,7 @@ copy_all_packages_files_for() {

 	for package_src_dir in ${PACKAGES_SEARCH_ROOT_ABSOLUTE_DIRS}; do
 		local package_dirpath="${package_src_dir}/${package_name}"
-		if [[ -d "${package_dirpath}" ]]; then
+		if [ -d "${package_dirpath}" ]; then
 			display_alert "Adding found files" "${package_dirpath} for '${package_name}'" "info"
 			run_host_command_logged cp -rv "${package_dirpath}/"* "${destination}/"
 		else
--- a/lib/functions/cli/utils-cli.sh
+++ b/lib/functions/cli/utils-cli.sh
@ -65,7 +65,7 @@ function apply_cmdline_params_to_env() {
 		if [[ -z "${!param_name+x}" ]] || [[ "${current_env_value}" != "${param_value}" ]]; then
 			display_alert "Applying cmdline param" "'$param_name': '${current_env_value_desc}' --> '${param_value_desc}' ${__my_reason}" "cmdline"
 			# use `declare -g` to make it global, we're in a function.
-			eval "declare -g $param_name=\"$param_value\""
+			declare -g "${param_name}=${param_value}"
 		else
 			# rpardini: strategic amount of spacing in log files show the kinda neuroticism that drives me.
 			display_alert "Skip     cmdline param" "'$param_name': already set to '${param_value_desc}' ${__my_reason}" "info"
--- a/lib/functions/compilation/kernel-debs.sh
+++ b/lib/functions/compilation/kernel-debs.sh
@ -34,7 +34,7 @@ is_enabled() {
 if_enabled_echo() {
 	if is_enabled "$1"; then
 		echo -n "$2"
-	elif [[ $# -ge 3 ]]; then
+	elif [ $# -ge 3 ]; then
 		echo -n "$3"
 	fi
 }
--- a/lib/functions/compilation/patch/drivers_network.sh
+++ b/lib/functions/compilation/patch/drivers_network.sh
@ -140,7 +140,7 @@ driver_rtl8192EU() {

 	# Wireless drivers for Realtek 8192EU chipsets

-	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" lt 7.0; then
+	if linux-version compare "${version}" ge 3.14; then

 		# Attach to specific commit (was "branch:realtek-4.4.x")
 		local rtl8192euver='commit:c2f491f0e42c438a29b207e96429b4d76c581a03' # Commit date: 2025-06-23 (please update when updating commit ref)
--- a/lib/functions/configuration/change-tracking.sh
+++ b/lib/functions/configuration/change-tracking.sh
@ -18,7 +18,13 @@ function track_config_variables() {

 		# if the var is an array...
 		if [[ "${array_values:-"no"}" == "yes" ]]; then
-			eval "var_value=\"\${${var_name}[@]}\"" # sorry
+			# bash nameref (local -n) creates an alias for the variable named in $var_name —
+			# no eval needed, no code-injection risk. Works for arrays and scalars alike.
+			# unset -n removes the alias only (not the referenced array) to avoid
+			# "already a nameref" warnings on the next loop iteration.
+			local -n _ct_arr_ref="${var_name}"
+			var_value="${_ct_arr_ref[*]}"
+			unset -n _ct_arr_ref
 			value_text="${blue_color:-}(${bright_blue_color:-}${var_value}${blue_color:-})"
 		else
 			var_value="${!var_name}"
--- a/lib/functions/configuration/interactive.sh
+++ b/lib/functions/configuration/interactive.sh
@ -30,8 +30,8 @@ function interactive_config_prepare_terminal() {
 # $1: variable name
 # $2: variable value
 function set_interactive_config_value() {
-	eval "$1"='$2'
-	eval "ARMBIAN_INTERACTIVE_CONFIGS[${1}]"='$2'
+	declare -g "${1}=${2}"
+	ARMBIAN_INTERACTIVE_CONFIGS["${1}"]="${2}"
 }

 function interactive_finish() {
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@ -23,7 +23,7 @@ function do_main_configuration() {
 	# common options
 	declare revision_from="set in env or command-line parameter"
 	if [[ "${REVISION}" == "" ]]; then
-		if [[ -f "${USERPATCHES_PATH}/VERSION" ]]; then
+		if [ -f "${USERPATCHES_PATH}"/VERSION ]; then
 			REVISION=$(cat "${USERPATCHES_PATH}"/VERSION)
 			revision_from="userpatches VERSION file"
 		else
@ -598,13 +598,13 @@ function check_filesystem_compatibility_on_host() {
 		fi

 		# For f2fs, check if support for extended attributes is enabled in kernel config (otherwise will fail later when using rsync)
-		if [[ "$ROOTFS_TYPE" == "f2fs" ]]; then
+		if [ "$ROOTFS_TYPE" = "f2fs" ]; then
 			local build_host_kernel_config=""

 			# Try to find kernel config in different places
-			if [[ -f "/boot/config-$(uname -r)" ]]; then
+			if [ -f "/boot/config-$(uname -r)" ]; then
 				build_host_kernel_config="/boot/config-$(uname -r)"
-			elif [[ -f "/proc/config.gz" ]]; then
+			elif [ -f "/proc/config.gz" ]; then
 				# Try to extract kernel config from /proc/config.gz
 				if command -v gzip &> /dev/null; then
 					gzip -dc /proc/config.gz > /tmp/build_host_kernel_config
@ -617,7 +617,7 @@ function check_filesystem_compatibility_on_host() {
 			fi

 			# Check if required configurations are set
-			if [[ -n "$build_host_kernel_config" ]]; then
+			if [ -n "$build_host_kernel_config" ]; then
 				if ! grep -q '^CONFIG_F2FS_FS_XATTR=y$' "$build_host_kernel_config" ||
 					! grep -q '^CONFIG_F2FS_FS_SECURITY=y$' "$build_host_kernel_config"; then
 					exit_with_error "Required kernel configurations for f2fs filesystem not enabled." "Please enable CONFIG_F2FS_FS_XATTR and CONFIG_F2FS_FS_SECURITY in your host kernel configuration." "err"
@ -638,7 +638,7 @@ function pre_install_distribution_specific__disable_cnf_apt_hook() {
 }

 function post_post_debootstrap_tweaks__restore_cnf_apt_hook() {
-	if [[ -f "${SDCARD}/etc/apt/apt.conf.d/50command-not-found.disabled" ]]; then # (re-enable command-not-found after building rootfs if it's been disabled)
+	if [ -f "${SDCARD}"/etc/apt/apt.conf.d/50command-not-found.disabled ]; then # (re-enable command-not-found after building rootfs if it's been disabled)
 		display_alert "Enabling command-not-found after build-time " "${BOARD}:${RELEASE}-${BRANCH}" "info"
 		run_host_command_logged mv "${SDCARD}"/etc/apt/apt.conf.d/50command-not-found.disabled "${SDCARD}"/etc/apt/apt.conf.d/50command-not-found
 	fi
--- a/lib/functions/host/prepare-host.sh
+++ b/lib/functions/host/prepare-host.sh
@ -41,7 +41,7 @@ function prepare_host_noninteractive() {

 	# The 'offline' variable must always be set to 'true' or 'false'
 	declare offline=false
-	if [[ "$OFFLINE_WORK" == "yes" ]]; then
+	if [ "$OFFLINE_WORK" == "yes" ]; then
 		offline=true
 	fi

--- a/lib/functions/image/fingerprint.sh
+++ b/lib/functions/image/fingerprint.sh
@ -28,7 +28,7 @@ function fingerprint_image() {
 		Support:        ${VENDORSUPPORT}
 	EOF

-	if [[ -n "$2" ]]; then
+	if [ -n "$2" ]; then
 		cat <<- EOF >> "${1}"
 			---------------------------------------------------------------------------
 			Partitioning configuration: $IMAGE_PARTITION_TABLE offset: $OFFSET
--- a/lib/functions/image/initrd.sh
+++ b/lib/functions/image/initrd.sh
@ -32,7 +32,7 @@ update_initramfs() {
 		# disabled; if debugging, we want the full output, even if it is huge.
 		# logging_filter="2>&1 | { grep --line-buffered -v -e '.xz' -e 'ORDER ignored' -e 'Adding binary ' -e 'Adding module ' -e 'Adding firmware ' -e 'microcode bundle' -e ', pf_mask' || true ; }"
 	fi
-	if [[ "$target_dir" != "" ]]; then
+	if [ "$target_dir" != "" ]; then
 		initrd_kern_ver="$(basename "$target_dir")"
 		initrd_file="${chroot_target}/boot/initrd.img-${initrd_kern_ver}"
 		update_initramfs_cmd="TMPDIR=/tmp update-initramfs -u${initrd_debug} -k ${initrd_kern_ver}" # @TODO: why? TMPDIR=/tmp
--- a/lib/functions/image/partitioning.sh
+++ b/lib/functions/image/partitioning.sh
@ -248,7 +248,7 @@ function prepare_partitions() {
 		# Check sfdisk version to determine if --sector-size is supported
 		sfdisk_version=$(sfdisk --version | awk '/util-linux/ {print $NF}')
 		sfdisk_version_num=$(echo "$sfdisk_version" | awk -F. '{printf "%d%02d%02d\n", $1, $2, $3}')
-		if [[ "$sfdisk_version_num" -ge "24100" ]]; then
+		if [ "$sfdisk_version_num" -ge "24100" ]; then
 			echo "${partition_script_output}" | run_host_command_logged sfdisk --sector-size "$SECTOR_SIZE" "${SDCARD}".raw || exit_with_error "Partitioning failed!"
 		else
 			echo "${partition_script_output}" | run_host_command_logged sfdisk "${SDCARD}".raw || exit_with_error "Partitioning failed!"
@ -267,7 +267,7 @@ function prepare_partitions() {

 	declare -g LOOP
 	#--partscan is using to force the kernel for scaning partition table in preventing of partprobe errors
-	if [[ "$sfdisk_version_num" -ge "24100" ]]; then
+	if [ "$sfdisk_version_num" -ge "24100" ]; then
 		LOOP=$(losetup --show --partscan --find -b "$SECTOR_SIZE" "${SDCARD}".raw) || exit_with_error "Unable to find free loop device"
 	else
 		LOOP=$(losetup --show --partscan --find "${SDCARD}".raw) || exit_with_error "Unable to find free loop device"
@ -482,7 +482,7 @@ function prepare_partitions() {

 	# recompile .cmd to .scr if boot.cmd exists
 	if [[ -f "${SDCARD}/boot/boot.cmd" ]]; then
-		if [[ -z "${BOOTSCRIPT_OUTPUT}" ]]; then
+		if [ -z ${BOOTSCRIPT_OUTPUT} ]; then
 			BOOTSCRIPT_OUTPUT=boot.scr
 		fi
 		case ${LINUXFAMILY} in
--- a/lib/functions/main/config-prepare.sh
+++ b/lib/functions/main/config-prepare.sh
@ -167,7 +167,7 @@ function config_early_init() {
 	display_alert "Starting single build process" "${BOARD:-"no BOARD set"}" "info"

 	# Do not initialize an empty array if it exists.
-	if [[ "${KERNEL_DRIVERS_SKIP[*]}" == "" ]]; then
+	if [ "${KERNEL_DRIVERS_SKIP[*]}" == "" ]; then
 		# Prepare array to be filled in by board/family/extensions
 		declare -g -a KERNEL_DRIVERS_SKIP=()
 	fi
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@ -565,7 +565,7 @@ function install_distribution_agnostic() {
 	VENDORPRETTYNAME="$VENDORPRETTYNAME" >> "${SDCARD}"/etc/armbian-image-release

 	# DNS fix. package resolvconf is not available everywhere
-	if [[ -d "${SDCARD}/etc/resolvconf/resolv.conf.d" && -n "$NAMESERVER" ]]; then
+	if [ -d "${SDCARD}"/etc/resolvconf/resolv.conf.d ] && [ -n "$NAMESERVER" ]; then
 		echo "nameserver $NAMESERVER" > "${SDCARD}"/etc/resolvconf/resolv.conf.d/head
 	fi

--- a/lib/functions/rootfs/distro-specific.sh
+++ b/lib/functions/rootfs/distro-specific.sh
@ -79,7 +79,7 @@ function install_distribution_specific() {
 	install_rclocal

 	# use list modules INITRAMFS
-	if [[ -f "${SRC}/config/modules/${MODULES_INITRD}" ]]; then
+	if [ -f "${SRC}"/config/modules/"${MODULES_INITRD}" ]; then
 		display_alert "Use file list modules MODULES_INITRD" "${MODULES_INITRD}"
 		sed -i "s/^MODULES=.*/MODULES=list/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf
 		cat "${SRC}"/config/modules/"${MODULES_INITRD}" >> "${SDCARD}"/etc/initramfs-tools/modules
@ -111,7 +111,7 @@ function fetch_distro_keyring() {
 		#FIXME: there may be a point where we need an *older* keyring pkg
 		# NOTE: this will be most likely an unsupported case like a user wanting to build using an ancient debian/ubuntu release
 		debian)
-			if [[ -e "${CACHEDIR}/debian-archive-keyring.gpg" ]]; then
+			if [ -e "${CACHEDIR}/debian-archive-keyring.gpg" ]; then
 				display_alert "fetch_distro_keyring($release)" "cache found, skipping" "info"
 			else
 			# for details of how this gets into this mirror, see
@ -138,7 +138,7 @@ function fetch_distro_keyring() {
 			fi
 			;;
 		ubuntu)
-			if [[ -e "${CACHEDIR}/ubuntu-archive-keyring.gpg" ]]; then
+			if [ -e "${CACHEDIR}/ubuntu-archive-keyring.gpg" ]; then
 				display_alert "fetch_distro_keyring($release)" "cache found, skipping" "info"
 			else
 				PKG_URL="https://github.armbian.com/keyrings/latest-ubuntu-keyring.deb"
@ -203,7 +203,7 @@ function create_sources_list_and_deploy_repo_key() {
 			Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 			EOF

-			if [[ ${#security_suites[@]} -gt 0 ]]; then
+			if [ ${#security_suites[@]} -gt 0 ]; then
 				echo "" >> "${basedir}/etc/apt/sources.list.d/${distro}.sources" # it breaks if there is no line space in between
 				cat <<- EOF >> "${basedir}/etc/apt/sources.list.d/${distro}.sources"
 				Types: deb
--- a/lib/tools/common/patching_utils.py
+++ b/lib/tools/common/patching_utils.py
@ -760,13 +760,10 @@ class PatchInPatchFile:
 			files_to_touch = [f for f in files_to_touch if f not in self.deleted_file_names]

 		for file_name in files_to_touch:
+			# log.debug(f"Setting mtime of '{file_name}' to '{final_mtime}'.")
 			file_path = os.path.join(working_dir, file_name)
 			try:
-				# Only bump mtime; never lower it. Multiple patches may touch the same file,
-				# and a later patch with an older timestamp must not override the timestamp
-				# set by an earlier patch with a newer one (#9028).
-				if final_mtime > os.path.getmtime(file_path):
-					os.utime(file_path, (final_mtime, final_mtime))
+				os.utime(file_path, (final_mtime, final_mtime))
 			except FileNotFoundError:
 				log.warning(f"File '{file_path}' not found in patch {self}, can't set mtime.")

--- a/packages/bsp/ayn-odin2mini/AYN-Odin2.conf
+++ b/packages/bsp/ayn-odin2mini/AYN-Odin2.conf
@ -1,31 +0,0 @@
-# Use case configuration for AYN Odin2
-# Author: Teguh Sobirin <teguh@sobir.in>
-
-Syntax 4
-
-SectionUseCase."HiFi" {
-	File "/AYN/Odin2/HiFi.conf"
-	Comment "HiFi quality Music."
-}
-
-BootSequence [
-	cset "name='RX_RX0 Digital Volume' 84"
-	cset "name='RX_RX1 Digital Volume' 84"
-	cset "name='HPHL Volume' 20"
-	cset "name='HPHR Volume' 20"
-	cset "name='ADC2 Volume' 10"
-]
-
-LibraryConfig.remap.Config {
-
-	ctl.default.map {
-		"name='HP Volume'" {
-			"name='HPHL Volume'".vindex.0 0
-			"name='HPHR Volume'".vindex.1 0
-		}
-	}
-}
-
-Include.card-init.File "/lib/card-init.conf"
-Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.wcd-init.File "/codecs/wcd938x/init.conf"
--- a/packages/bsp/ayn-odin2mini/HiFi.conf
+++ b/packages/bsp/ayn-odin2mini/HiFi.conf
@ -1,91 +0,0 @@
-# Use case configuration for AYN Odin2
-# Author: Teguh Sobirin <teguh@sobir.in>
-
-SectionVerb {
-	EnableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
-	]
-
-	DisableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker playback"
-
-	Value {
-		PlaybackPriority 150
-		PlaybackPCM "hw:${CardId},0"
-		PlaybackChannels 2
-	}
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones Playback"
-
-	Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf"
-	Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
-	Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
-	Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
-
-	Value {
-		PlaybackPriority 200
-		PlaybackPCM "hw:${CardId},1"
-		PlaybackMixer "default:${CardId}"
-		PlaybackMixerElem "HP"
-		PlaybackChannels 2
-		JackControl "Headphone Jack"
-		JackHWMute "Speaker"
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headphone Microphone"
-
-	Include.wcdmice.File "/codecs/wcd938x/HeadphoneMicEnableSeq.conf"
-	Include.wcdmicd.File "/codecs/wcd938x/HeadphoneMicDisableSeq.conf"
-	Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic1EnableSeq.conf"
-	Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf"
-
-	Value {
-		CapturePriority 200
-		CapturePCM "hw:${CardId},2"
-		CaptureMixerElem "ADC2"
-		CaptureChannels 1
-		JackControl "Mic Jack"
-	}
-}
-
-SectionDevice."DisplayPort" {
-	Comment "DisplayPort playback"
-
-	EnableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 1"
-	]
-
-	DisableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-	]
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},1"
-		JackControl "DP0 Jack"
-		JackHWMute "Speaker"
-	}
-}
--- a/packages/bsp/ayn-odin2mini/LinuxLoader.cfg
+++ b/packages/bsp/ayn-odin2mini/LinuxLoader.cfg
@ -1,58 +0,0 @@
-#
-# Configure the LinuxLoader settings
-#
-
-[LinuxLoader]
-
-# Controls on-screen logging
-# This setting can persist without config file or sdcard being present
-Debug = true
-
-# Boot target. Can be one of the following:
-# "default" (ABL default)
-# "Linux" (direct Linux Image load)
-# "EFI"
-# "UEFI Shell" (will execute startup.nsh automatically if found on any FAT partition)
-# "Mass Storage" (will mount the UFS LUN specified below as mass storage)
-Target = "default"
-
-# Default UFS LUN to mount as mass storage
-# Allowed values: 0, 1, 2, 3, 4, 5
-MassStorageLUN = 0
-
-# Volume up boot target. Can be one of the following:
-# "BDS Menu" (will enter the UEFI boot menu provided by Qualcomm, don't touch anything there unless you know what you are doing!)
-# "UEFI Shell" (will execute startup.nsh automatically if found on any FAT partition)
-# "recovery"
-# "Linux"
-DefaultVolUp = "Linux"
-
-# Setting this to *true* will enable USB Host mode in UEFI
-# This might be useful if you want to play with UEFI.
-# Note that you will need an externally powered type-C hub to connect USB devices. (at least for now)
-UsbHostMode = false
-
-# Controls hypervisor UART enablement
-#
-# Setting *true* here will force enable the hypervisor UART
-# Setting *false* here will force disable the hypervisor UART
-# Removing this line will avoid changing the default behavior
-# Please leave it to *false* unless you know what you are doing
-HypUartEnable = false
-
-# Controls display hardware status during exit boot services
-#
-# The dispcc driver from mainline Linux kernel has a bug, which
-# prevents the display hardware from initializing properly if
-# the display hardware is not disabled before exiting boot services.
-#
-# Set this to *true* if you are trying to boot a mainline kernel.
-DisableDisplayHW = true
-
-[Linux]
-# Accept both gzipped and non-gzipped kernel images
-Image = "Image"
-initrd = "initrd.img-INITRD_PLACEHOLDER"
-devicetree = "dtb/qcom/qcs8550-ayn-odin2mini.dtb"
-cmdline = "clk_ignore_unused pd_ignore_unused arm64.nopauthfbcon=rotate:3 console=ttyMSM0,115200n8 root=UUID=UUID_PLACEHOLDER"
-
--- a/packages/bsp/ayn-odin2mini/zz-update-abl-kernel
+++ b/packages/bsp/ayn-odin2mini/zz-update-abl-kernel
@ -1,20 +0,0 @@
-#!/bin/bash
-set -ex
-new_rootfs_image_uuid=$(sed -e 's/^.*root=UUID=//' -e 's/ .*$//' < /proc/cmdline)
-gzip -c /boot/vmlinuz-*-sm8550-arm64 > /tmp/Image.gz
-
-cat /tmp/Image.gz /usr/lib/linux-image-*-sm8550-arm64/qcom/qcs8550-ayn-odin2-hypdtbo.dtb > /tmp/Image.gz-dtb
-
-source /boot/armbianEnv.txt
-/usr/bin/mkbootimg \
-        --kernel /tmp/Image.gz-dtb \
-        --ramdisk /boot/initrd.img-*-sm8550-arm64 \
-        --base 0x0 \
-        --second_offset 0x00f00000 \
-        --cmdline "clk_ignore_unused pd_ignore_unused panic=30 audit=0 allow_mismatched_32bit_el0 rw mem_sleep_default=s2idle root=UUID=${new_rootfs_image_uuid}" \
-        --kernel_offset 0x8000 \
-        --ramdisk_offset 0x1000000 \
-        --tags_offset 0x100 \
-        --pagesize 4096 \
-        -o /boot/armbian-kernel.img
-rm -f /tmp/Image.gz /tmp/Image.gz-dtb
--- a/packages/bsp/ayn-odin2portal/AYN-Odin2.conf
+++ b/packages/bsp/ayn-odin2portal/AYN-Odin2.conf
@ -1,31 +0,0 @@
-# Use case configuration for AYN Odin2
-# Author: Teguh Sobirin <teguh@sobir.in>
-
-Syntax 4
-
-SectionUseCase."HiFi" {
-	File "/AYN/Odin2/HiFi.conf"
-	Comment "HiFi quality Music."
-}
-
-BootSequence [
-	cset "name='RX_RX0 Digital Volume' 84"
-	cset "name='RX_RX1 Digital Volume' 84"
-	cset "name='HPHL Volume' 20"
-	cset "name='HPHR Volume' 20"
-	cset "name='ADC2 Volume' 10"
-]
-
-LibraryConfig.remap.Config {
-
-	ctl.default.map {
-		"name='HP Volume'" {
-			"name='HPHL Volume'".vindex.0 0
-			"name='HPHR Volume'".vindex.1 0
-		}
-	}
-}
-
-Include.card-init.File "/lib/card-init.conf"
-Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.wcd-init.File "/codecs/wcd938x/init.conf"
--- a/packages/bsp/ayn-odin2portal/HiFi.conf
+++ b/packages/bsp/ayn-odin2portal/HiFi.conf
@ -1,91 +0,0 @@
-# Use case configuration for AYN Odin2
-# Author: Teguh Sobirin <teguh@sobir.in>
-
-SectionVerb {
-	EnableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
-	]
-
-	DisableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker playback"
-
-	Value {
-		PlaybackPriority 150
-		PlaybackPCM "hw:${CardId},0"
-		PlaybackChannels 2
-	}
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones Playback"
-
-	Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf"
-	Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
-	Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
-	Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
-
-	Value {
-		PlaybackPriority 200
-		PlaybackPCM "hw:${CardId},1"
-		PlaybackMixer "default:${CardId}"
-		PlaybackMixerElem "HP"
-		PlaybackChannels 2
-		JackControl "Headphone Jack"
-		JackHWMute "Speaker"
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headphone Microphone"
-
-	Include.wcdmice.File "/codecs/wcd938x/HeadphoneMicEnableSeq.conf"
-	Include.wcdmicd.File "/codecs/wcd938x/HeadphoneMicDisableSeq.conf"
-	Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic1EnableSeq.conf"
-	Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf"
-
-	Value {
-		CapturePriority 200
-		CapturePCM "hw:${CardId},2"
-		CaptureMixerElem "ADC2"
-		CaptureChannels 1
-		JackControl "Mic Jack"
-	}
-}
-
-SectionDevice."DisplayPort" {
-	Comment "DisplayPort playback"
-
-	EnableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 1"
-	]
-
-	DisableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-	]
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},1"
-		JackControl "DP0 Jack"
-		JackHWMute "Speaker"
-	}
-}
--- a/packages/bsp/ayn-odin2portal/LinuxLoader.cfg
+++ b/packages/bsp/ayn-odin2portal/LinuxLoader.cfg
@ -1,58 +0,0 @@
-#
-# Configure the LinuxLoader settings
-#
-
-[LinuxLoader]
-
-# Controls on-screen logging
-# This setting can persist without config file or sdcard being present
-Debug = true
-
-# Boot target. Can be one of the following:
-# "default" (ABL default)
-# "Linux" (direct Linux Image load)
-# "EFI"
-# "UEFI Shell" (will execute startup.nsh automatically if found on any FAT partition)
-# "Mass Storage" (will mount the UFS LUN specified below as mass storage)
-Target = "default"
-
-# Default UFS LUN to mount as mass storage
-# Allowed values: 0, 1, 2, 3, 4, 5
-MassStorageLUN = 0
-
-# Volume up boot target. Can be one of the following:
-# "BDS Menu" (will enter the UEFI boot menu provided by Qualcomm, don't touch anything there unless you know what you are doing!)
-# "UEFI Shell" (will execute startup.nsh automatically if found on any FAT partition)
-# "recovery"
-# "Linux"
-DefaultVolUp = "Linux"
-
-# Setting this to *true* will enable USB Host mode in UEFI
-# This might be useful if you want to play with UEFI.
-# Note that you will need an externally powered type-C hub to connect USB devices. (at least for now)
-UsbHostMode = false
-
-# Controls hypervisor UART enablement
-#
-# Setting *true* here will force enable the hypervisor UART
-# Setting *false* here will force disable the hypervisor UART
-# Removing this line will avoid changing the default behavior
-# Please leave it to *false* unless you know what you are doing
-HypUartEnable = false
-
-# Controls display hardware status during exit boot services
-#
-# The dispcc driver from mainline Linux kernel has a bug, which
-# prevents the display hardware from initializing properly if
-# the display hardware is not disabled before exiting boot services.
-#
-# Set this to *true* if you are trying to boot a mainline kernel.
-DisableDisplayHW = true
-
-[Linux]
-# Accept both gzipped and non-gzipped kernel images
-Image = "Image"
-initrd = "initrd.img-INITRD_PLACEHOLDER"
-devicetree = "dtb/qcom/qcs8550-ayn-odin2portal.dtb"
-cmdline = "clk_ignore_unused pd_ignore_unused arm64.nopauthfbcon=rotate:3 console=ttyMSM0,115200n8 root=UUID=UUID_PLACEHOLDER"
-
--- a/packages/bsp/ayn-odin2portal/zz-update-abl-kernel
+++ b/packages/bsp/ayn-odin2portal/zz-update-abl-kernel
@ -1,20 +0,0 @@
-#!/bin/bash
-set -ex
-new_rootfs_image_uuid=$(sed -e 's/^.*root=UUID=//' -e 's/ .*$//' < /proc/cmdline)
-gzip -c /boot/vmlinuz-*-sm8550-arm64 > /tmp/Image.gz
-
-cat /tmp/Image.gz /usr/lib/linux-image-*-sm8550-arm64/qcom/qcs8550-ayn-odin2-hypdtbo.dtb > /tmp/Image.gz-dtb
-
-source /boot/armbianEnv.txt
-/usr/bin/mkbootimg \
-        --kernel /tmp/Image.gz-dtb \
-        --ramdisk /boot/initrd.img-*-sm8550-arm64 \
-        --base 0x0 \
-        --second_offset 0x00f00000 \
-        --cmdline "clk_ignore_unused pd_ignore_unused panic=30 audit=0 allow_mismatched_32bit_el0 rw mem_sleep_default=s2idle root=UUID=${new_rootfs_image_uuid}" \
-        --kernel_offset 0x8000 \
-        --ramdisk_offset 0x1000000 \
-        --tags_offset 0x100 \
-        --pagesize 4096 \
-        -o /boot/armbian-kernel.img
-rm -f /tmp/Image.gz /tmp/Image.gz-dtb
--- a/packages/bsp/ayn-thor/AYN-Odin2.conf
+++ b/packages/bsp/ayn-thor/AYN-Odin2.conf
@ -1,31 +0,0 @@
-# Use case configuration for AYN Odin2
-# Author: Teguh Sobirin <teguh@sobir.in>
-
-Syntax 4
-
-SectionUseCase."HiFi" {
-	File "/AYN/Odin2/HiFi.conf"
-	Comment "HiFi quality Music."
-}
-
-BootSequence [
-	cset "name='RX_RX0 Digital Volume' 84"
-	cset "name='RX_RX1 Digital Volume' 84"
-	cset "name='HPHL Volume' 20"
-	cset "name='HPHR Volume' 20"
-	cset "name='ADC2 Volume' 10"
-]
-
-LibraryConfig.remap.Config {
-
-	ctl.default.map {
-		"name='HP Volume'" {
-			"name='HPHL Volume'".vindex.0 0
-			"name='HPHR Volume'".vindex.1 0
-		}
-	}
-}
-
-Include.card-init.File "/lib/card-init.conf"
-Include.ctl-remap.File "/lib/ctl-remap.conf"
-Include.wcd-init.File "/codecs/wcd938x/init.conf"
--- a/packages/bsp/ayn-thor/HiFi.conf
+++ b/packages/bsp/ayn-thor/HiFi.conf
@ -1,91 +0,0 @@
-# Use case configuration for AYN Odin2
-# Author: Teguh Sobirin <teguh@sobir.in>
-
-SectionVerb {
-	EnableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
-	]
-
-	DisableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 0"
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker playback"
-
-	Value {
-		PlaybackPriority 150
-		PlaybackPCM "hw:${CardId},0"
-		PlaybackChannels 2
-	}
-}
-
-SectionDevice."Headphones" {
-	Comment "Headphones Playback"
-
-	Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf"
-	Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
-	Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
-	Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
-
-	Value {
-		PlaybackPriority 200
-		PlaybackPCM "hw:${CardId},1"
-		PlaybackMixer "default:${CardId}"
-		PlaybackMixerElem "HP"
-		PlaybackChannels 2
-		JackControl "Headphone Jack"
-		JackHWMute "Speaker"
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headphone Microphone"
-
-	Include.wcdmice.File "/codecs/wcd938x/HeadphoneMicEnableSeq.conf"
-	Include.wcdmicd.File "/codecs/wcd938x/HeadphoneMicDisableSeq.conf"
-	Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic1EnableSeq.conf"
-	Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf"
-
-	Value {
-		CapturePriority 200
-		CapturePCM "hw:${CardId},2"
-		CaptureMixerElem "ADC2"
-		CaptureChannels 1
-		JackControl "Mic Jack"
-	}
-}
-
-SectionDevice."DisplayPort" {
-	Comment "DisplayPort playback"
-
-	EnableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 1"
-	]
-
-	DisableSequence [
-		cset "name='PRIMARY_MI2S_RX Audio Mixer MultiMedia1' 1"
-		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia2' 0"
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-	]
-
-	Value {
-		PlaybackPriority 100
-		PlaybackPCM "hw:${CardId},1"
-		JackControl "DP0 Jack"
-		JackHWMute "Speaker"
-	}
-}
--- a/packages/bsp/ayn-thor/LinuxLoader.cfg
+++ b/packages/bsp/ayn-thor/LinuxLoader.cfg
@ -1,58 +0,0 @@
-#
-# Configure the LinuxLoader settings
-#
-
-[LinuxLoader]
-
-# Controls on-screen logging
-# This setting can persist without config file or sdcard being present
-Debug = true
-
-# Boot target. Can be one of the following:
-# "default" (ABL default)
-# "Linux" (direct Linux Image load)
-# "EFI"
-# "UEFI Shell" (will execute startup.nsh automatically if found on any FAT partition)
-# "Mass Storage" (will mount the UFS LUN specified below as mass storage)
-Target = "default"
-
-# Default UFS LUN to mount as mass storage
-# Allowed values: 0, 1, 2, 3, 4, 5
-MassStorageLUN = 0
-
-# Volume up boot target. Can be one of the following:
-# "BDS Menu" (will enter the UEFI boot menu provided by Qualcomm, don't touch anything there unless you know what you are doing!)
-# "UEFI Shell" (will execute startup.nsh automatically if found on any FAT partition)
-# "recovery"
-# "Linux"
-DefaultVolUp = "Linux"
-
-# Setting this to *true* will enable USB Host mode in UEFI
-# This might be useful if you want to play with UEFI.
-# Note that you will need an externally powered type-C hub to connect USB devices. (at least for now)
-UsbHostMode = false
-
-# Controls hypervisor UART enablement
-#
-# Setting *true* here will force enable the hypervisor UART
-# Setting *false* here will force disable the hypervisor UART
-# Removing this line will avoid changing the default behavior
-# Please leave it to *false* unless you know what you are doing
-HypUartEnable = false
-
-# Controls display hardware status during exit boot services
-#
-# The dispcc driver from mainline Linux kernel has a bug, which
-# prevents the display hardware from initializing properly if
-# the display hardware is not disabled before exiting boot services.
-#
-# Set this to *true* if you are trying to boot a mainline kernel.
-DisableDisplayHW = true
-
-[Linux]
-# Accept both gzipped and non-gzipped kernel images
-Image = "Image"
-initrd = "initrd.img-INITRD_PLACEHOLDER"
-devicetree = "dtb/qcom/qcs8550-ayn-thor.dtb"
-cmdline = "clk_ignore_unused pd_ignore_unused arm64.nopauthfbcon=rotate:3 console=ttyMSM0,115200n8 root=UUID=UUID_PLACEHOLDER"
-
--- a/packages/bsp/ayn-thor/zz-update-abl-kernel
+++ b/packages/bsp/ayn-thor/zz-update-abl-kernel
@ -1,20 +0,0 @@
-#!/bin/bash
-set -ex
-new_rootfs_image_uuid=$(sed -e 's/^.*root=UUID=//' -e 's/ .*$//' < /proc/cmdline)
-gzip -c /boot/vmlinuz-*-sm8550-arm64 > /tmp/Image.gz
-
-cat /tmp/Image.gz /usr/lib/linux-image-*-sm8550-arm64/qcom/qcs8550-ayn-odin2-hypdtbo.dtb > /tmp/Image.gz-dtb
-
-source /boot/armbianEnv.txt
-/usr/bin/mkbootimg \
-        --kernel /tmp/Image.gz-dtb \
-        --ramdisk /boot/initrd.img-*-sm8550-arm64 \
-        --base 0x0 \
-        --second_offset 0x00f00000 \
-        --cmdline "clk_ignore_unused pd_ignore_unused panic=30 audit=0 allow_mismatched_32bit_el0 rw mem_sleep_default=s2idle root=UUID=${new_rootfs_image_uuid}" \
-        --kernel_offset 0x8000 \
-        --ramdisk_offset 0x1000000 \
-        --tags_offset 0x100 \
-        --pagesize 4096 \
-        -o /boot/armbian-kernel.img
-rm -f /tmp/Image.gz /tmp/Image.gz-dtb
--- a/patch/kernel/archive/meson-6.12/0052-drm-meson-Describe-the-HDMI-PHY-frequency-limits-of-.patch
+++ b/patch/kernel/archive/meson-6.12/0052-drm-meson-Describe-the-HDMI-PHY-frequency-limits-of-.patch
@ -43,7 +43,7 @@ index 111111111111..222222222222 100644
 +	 */
 	{
 		.limits = {
- 			.max_hdmi_phy_freq = 1650000,
+ 			.max_hdmi_phy_freq = 1650000000,
 		},
 		.attrs = (const struct soc_device_attribute []) {
 			{ .soc_id = "GXL (S805*)", },
--- a/patch/kernel/archive/meson64-6.19/0000.patching_config.yaml
+++ b/patch/kernel/archive/meson64-6.19/0000.patching_config.yaml
@ -1,10 +1,10 @@
 config:

  # Just some info stuff; not used by the patching scripts
-  name: meson64-7.0
+  name: meson64-6.19
  kind: kernel
  type: mainline # or: vendor
-  branch: linux-7.0.y
+  branch: linux-6.19.y
  last-known-good-tag: v6.7.0
  maintainers:
    - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini }
--- a/patch/kernel/archive/meson64-6.19/board-bananapi-cm4-cm4io.patch
+++ b/patch/kernel/archive/meson64-6.19/board-bananapi-cm4-cm4io.patch
@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
 		};
 	};
 
-@@ -119,6 +120,10 @@ codec {
+@@ -120,6 +121,10 @@ codec {
 	};
 };
 
@ -62,7 +62,7 @@ index 111111111111..222222222222 100644
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
-@@ -347,8 +356,7 @@ &uart_A {
+@@ -359,8 +368,7 @@ &uart_A {
 
 	bluetooth {
 		compatible = "realtek,rtl8822cs-bt";
--- a/patch/kernel/archive/meson64-6.19/board-bananapi-m2s.patch
+++ b/patch/kernel/archive/meson64-6.19/board-bananapi-m2s.patch
--- a/patch/kernel/archive/meson64-6.19/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
+++ b/patch/kernel/archive/meson64-6.19/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
 
 / {
 	adc-keys {
-@@ -379,6 +380,8 @@ &sd_emmc_b {
+@@ -387,6 +388,8 @@ &sd_emmc_b {
 	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
 	vmmc-supply = <&tflash_vdd>;
 	vqmmc-supply = <&vddio_c>;
@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
 };
 
 /* eMMC */
-@@ -398,6 +401,8 @@ &sd_emmc_c {
+@@ -406,6 +409,8 @@ &sd_emmc_c {
 	mmc-pwrseq = <&emmc_pwrseq>;
 	vmmc-supply = <&vddao_3v3>;
 	vqmmc-supply = <&emmc_1v8>;
--- a/patch/kernel/archive/meson64-6.19/board-bananapim5-002-add-wifi-bt-support.patch
+++ b/patch/kernel/archive/meson64-6.19/board-bananapim5-002-add-wifi-bt-support.patch
@ -37,7 +37,7 @@ index 111111111111..222222222222 100644
 	sound {
 		compatible = "amlogic,axg-sound-card";
 		model = "BPI-M5";
-@@ -152,7 +166,6 @@ &acodec {
+@@ -153,7 +167,6 @@ &acodec {
 	status = "okay";
 };
 
@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
 &clkc_audio {
 	status = "okay";
 };
-@@ -175,6 +188,42 @@ &frddr_c {
+@@ -176,6 +189,42 @@ &frddr_c {
 	status = "okay";
 };
 
@ -88,7 +88,7 @@ index 111111111111..222222222222 100644
 &tdmif_b {
 	status = "okay";
 };
-@@ -222,3 +271,18 @@ &toddr_b {
+@@ -223,3 +272,18 @@ &toddr_b {
 &toddr_c {
 	status = "okay";
 };
--- a/patch/kernel/archive/meson64-6.19/board-bananapism1-add-uart_A-and-AO_B.patch
+++ b/patch/kernel/archive/meson64-6.19/board-bananapism1-add-uart_A-and-AO_B.patch
@ -47,7 +47,7 @@ index 111111111111..222222222222 100644
 	sound {
 		compatible = "amlogic,axg-sound-card";
 		model = "BPI-M2-PRO";
-@@ -98,3 +102,9 @@ &tdmout_b {
+@@ -99,3 +103,9 @@ &tdmout_b {
 &tohdmitx {
 	status = "okay";
 };
@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
 		ethernet0 = &ethmac;
 	};
 
-@@ -411,6 +412,12 @@ &uart_AO {
+@@ -419,6 +420,12 @@ &uart_AO {
 	pinctrl-names = "default";
 };
 
--- a/patch/kernel/archive/meson64-6.19/board-khadas-vim3-add-npu-node.patch
+++ b/patch/kernel/archive/meson64-6.19/board-khadas-vim3-add-npu-node.patch
--- a/patch/kernel/archive/meson64-6.19/board-khadas-vim3-fix-missing-i2c3-nod.patch
+++ b/patch/kernel/archive/meson64-6.19/board-khadas-vim3-fix-missing-i2c3-nod.patch
@ -18,7 +18,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
-@@ -335,6 +335,13 @@ hdmi_tx_tmds_out: endpoint {
+@@ -336,6 +336,13 @@ hdmi_tx_tmds_out: endpoint {
 	};
 };
 
--- a/patch/kernel/archive/meson64-6.19/board-khadas-vims-add-rtc-vrtc-aliases.patch
+++ b/patch/kernel/archive/meson64-6.19/board-khadas-vims-add-rtc-vrtc-aliases.patch
--- a/patch/kernel/archive/meson64-6.19/board-nanopi-k2-add-uartC-alias.patch
+++ b/patch/kernel/archive/meson64-6.19/board-nanopi-k2-add-uartC-alias.patch
--- a/patch/kernel/archive/meson64-6.19/board-nanopi-k2-enable-emmc.patch
+++ b/patch/kernel/archive/meson64-6.19/board-nanopi-k2-enable-emmc.patch
@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/b
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-@@ -359,7 +359,7 @@ &sd_emmc_b {
+@@ -360,7 +360,7 @@ &sd_emmc_b {
 
 /* eMMC */
 &sd_emmc_c {
@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
 	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
 	pinctrl-1 = <&emmc_clk_gate_pins>;
 	pinctrl-names = "default", "clk-gate";
-@@ -369,8 +369,6 @@ &sd_emmc_c {
+@@ -370,8 +370,6 @@ &sd_emmc_c {
 	non-removable;
 	disable-wp;
 	cap-mmc-highspeed;
--- a/patch/kernel/archive/meson64-6.19/board-odroid-sm1-reset.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroid-sm1-reset.patch
--- a/patch/kernel/archive/meson64-6.19/board-odroidc2-add-uartA-uartC.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroidc2-add-uartA-uartC.patch
@ -26,7 +26,7 @@ index 111111111111..222222222222 100644
 		ethernet0 = &ethmac;
 	};
 
-@@ -382,6 +384,18 @@ &uart_AO {
+@@ -383,6 +385,18 @@ &uart_AO {
 	pinctrl-names = "default";
 };
 
--- a/patch/kernel/archive/meson64-6.19/board-odroidc2-enable-SPI.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroidc2-enable-SPI.patch
--- a/patch/kernel/archive/meson64-6.19/board-odroidc2-enable-scpi-dvfs.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroidc2-enable-scpi-dvfs.patch
@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/bo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -363,7 +363,8 @@ &saradc {
+@@ -364,7 +364,8 @@ &saradc {
 };
 
 &scpi_clocks {
--- a/patch/kernel/archive/meson64-6.19/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch
--- a/patch/kernel/archive/meson64-6.19/board-odroidhc4-enable-fan1_input.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroidhc4-enable-fan1_input.patch
--- a/patch/kernel/archive/meson64-6.19/board-odroidn2plus-Add-missing-CPU-opp.patch
+++ b/patch/kernel/archive/meson64-6.19/board-odroidn2plus-Add-missing-CPU-opp.patch
@ -27,7 +27,7 @@ index 111111111111..222222222222 100644
 	};
 
 	cpub_opp_table_1: opp-table-1 {
-@@ -107,6 +115,14 @@ opp-2208000000 {
+@@ -107,5 +115,13 @@ opp-2208000000 {
                         opp-hz = /bits/ 64 <2208000000>;
                         opp-microvolt = <1011000>;
                 };
@ -41,7 +41,6 @@ index 111111111111..222222222222 100644
 +		};
 	};
 };
- 
 -- 
 Armbian

--- a/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch
+++ b/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch
--- a/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
+++ b/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
@ -41,7 +41,7 @@ index 111111111111..222222222222 100644
 	ao_5v: regulator-ao-5v {
 		compatible = "regulator-fixed";
 		regulator-name = "AO_5V";
-@@ -205,6 +213,18 @@ wifi32k: wifi32k {
+@@ -206,6 +214,18 @@ wifi32k: wifi32k {
 	};
 };
 
@ -60,7 +60,7 @@ index 111111111111..222222222222 100644
 &arb {
 	status = "okay";
 };
-@@ -280,6 +300,26 @@ &ir {
+@@ -289,6 +309,26 @@ &ir {
 	pinctrl-names = "default";
 };
 
@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
 &pwm_AO_cd {
 	pinctrl-0 = <&pwm_ao_d_e_pins>;
 	pinctrl-names = "default";
-@@ -400,3 +440,11 @@ &uart_AO {
+@@ -409,3 +449,11 @@ &uart_AO {
 &usb {
 	status = "okay";
 };
--- a/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch
+++ b/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch
@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-@@ -396,7 +396,7 @@ &sd_emmc_c {
+@@ -405,7 +405,7 @@ &sd_emmc_c {
 	cap-mmc-highspeed;
 	mmc-ddr-1_8v;
 	mmc-hs200-1_8v;
--- a/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch
+++ b/patch/kernel/archive/meson64-6.19/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch
@ -15,7 +15,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-@@ -348,7 +348,7 @@ &sd_emmc_a {
+@@ -357,7 +357,7 @@ &sd_emmc_a {
 
 	bus-width = <4>;
 	cap-sd-highspeed;
--- a/patch/kernel/archive/meson64-6.19/board-radxa-zero2-arm64-dts-amlogic-Enable-the-npu-node-for-Radxa-Zero2.patch
+++ b/patch/kernel/archive/meson64-6.19/board-radxa-zero2-arm64-dts-amlogic-Enable-the-npu-node-for-Radxa-Zero2.patch
@ -14,7 +14,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
-@@ -419,6 +419,10 @@ &npu {
+@@ -394,6 +394,10 @@ &pwm_AO_cd {
 	status = "okay";
 };
 
--- a/patch/kernel/archive/meson64-6.19/board-radxa-zero2-dts-amlogic-describe-the-FUSB302-on-Radxa-Zero-2.patch
+++ b/patch/kernel/archive/meson64-6.19/board-radxa-zero2-dts-amlogic-describe-the-FUSB302-on-Radxa-Zero-2.patch
@ -0,0 +1,516 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ricardo Pardini <ricardo@pardini.net>
+Date: Wed, 14 Jan 2026 02:49:48 +0100
+Subject: arm64: dts: amlogic: add the type-c controller on Radxa Zero 2
+
+The Radxa Zero2 has an FUSB302 controller on i2c3 at address 0x22 and
+INT# wired to GPIOA-13; include a minimal connector.
+
+Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 34 ++++++++++
+ 1 file changed, 34 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+@@ -364,12 +364,46 @@ hdmi_tx_tmds_out: endpoint {
+ 	};
+ };
+ 
+/* Also exposed on the 40-pin header: SDA pin 3, SCL pin 5 */
+&i2c3 {
+	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	fusb0: typec-portc@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+
+		pinctrl-0 = <&fusb302_irq_pins>;
+		pinctrl-names = "default";
+		interrupt-parent = <&gpio_intc>;
+		interrupts = <74 IRQ_TYPE_LEVEL_LOW>;
+
+		vbus-supply = <&ao_5v>;
+
+		connector {
+			compatible = "usb-c-connector";
+		};
+	};
+};
+
+ &ir {
+ 	status = "disabled";
+ 	pinctrl-0 = <&remote_input_ao_pins>;
+ 	pinctrl-names = "default";
+ };
+ 
+&periphs_pinctrl {
+	fusb302_irq_pins: fusb302-irq {
+		mux {
+			groups = "GPIOA_13";
+			function = "gpio_periphs";
+			bias-pull-up;
+			output-disable;
+		};
+	};
+};
+
+ &pwm_ab {
+ 	pinctrl-0 = <&pwm_a_e_pins>;
+ 	pinctrl-names = "default";
+-- 
+Armbian
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 31 Jan 2023 04:02:59 +0000
+Subject: dt-bindings: add wch vendor prefix
+
+Add vendor prefix for Nanjing Qinheng Microelectronics Co., Ltd
+operating as WinChipHead (wch).
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
+index 111111111111..222222222222 100644
+--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
+@@ -1789,6 +1789,8 @@ patternProperties:
+     description: Wandbord (Technexion)
+   "^waveshare,.*":
+     description: Waveshare Electronics
+  "^wch,.*":
+    description: Nanjing Qinheng Microelectronics Co., Ltd (WinChipHead)
+   "^wd,.*":
+     description: Western Digital Corp.
+   "^we,.*":
+-- 
+Armbian
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Mon, 30 Jan 2023 15:50:30 +0000
+Subject: dt-bindings: usb: add USB superspeed GPIO based switch
+
+Introduce a binding for the CH482D GPIO-based switch hardware used for
+switching USB SuperSpeed lanes from the USB Type-C plug orientation
+signal provided by the Type-C Port Manager.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ Documentation/devicetree/bindings/usb/gpio-superspeed-switch.yaml | 120 ++++++++++
+ 1 file changed, 120 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/usb/gpio-superspeed-switch.yaml b/Documentation/devicetree/bindings/usb/gpio-superspeed-switch.yaml
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/gpio-superspeed-switch.yaml
+@@ -0,0 +1,120 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/usb/gpio-superspeed-switch.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: GPIO-based SuperSpeed switch
+
+maintainers:
+  - Neil Armstrong <neil.armstrong@linaro.org>
+
+description:
+  In USB Type-C applications the USB SuperSpeed lanes must be switched depending
+  on the orientation of the Type-C plug. This binding describes a family of
+  hardware solutions which analog switches pairs of differential high-speed
+  lanes using a GPIO signal.
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - wcn,ch482d
+      - const: gpio-superspeed-switch
+
+  enable-gpios:
+    description: Switch enable GPIO
+
+  select-gpios:
+    description: Orientation select
+
+  vcc-supply:
+    description: power supply
+
+  orientation-switch:
+    description: Flag the port as possible handler of orientation switching
+    type: boolean
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    properties:
+      port@0:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: Super Speed output lanes
+
+      port@1:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: Super Speed input lanes
+
+required:
+  - compatible
+  - select-gpios
+  - orientation-switch
+  - ports
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+
+    tcpm {
+        connector {
+            compatible = "usb-c-connector";
+
+            ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+                    tcpm_hs_out: endpoint {
+                        remote-endpoint = <&usb_hs_phy_in>;
+                    };
+                };
+
+                port@1 {
+                    reg = <1>;
+                    tcpm_ss_out: endpoint {
+                        remote-endpoint = <&usb_ss_switch_in>;
+                    };
+                };
+
+                port@2 {
+                    reg = <2>;
+                    tcpm_sbu_out: endpoint {
+                        remote-endpoint = <&sbu_mux_in>;
+                    };
+                };
+            };
+        };
+    };
+
+    superspeed-mux {
+        compatible = "wcn,ch482d", "gpio-superspeed-switch";
+
+        select-gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+
+        orientation-switch;
+
+        ports {
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            port@0 {
+                reg = <0>;
+                usb_ss_switch_out: endpoint {
+                    remote-endpoint = <&tcpm_ss_out>;
+                };
+            };
+
+            port@1 {
+                reg = <1>;
+                usb_ss_switch_in: endpoint {
+                    remote-endpoint = <&usb_ss_phy_in>;
+                };
+            };
+        };
+    };
+...
+-- 
+Armbian
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Mon, 30 Jan 2023 15:37:29 +0000
+Subject: usb: typec: mux: Add generic GPIO based SuperSpeed switch driver
+
+Add a simple driver to register a GPIO Based SuperSpeed lanes
+switch device used to flip the lanes depending on the Type-C
+plug orientation.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ drivers/usb/typec/mux/Kconfig                  |   6 +
+ drivers/usb/typec/mux/Makefile                 |   1 +
+ drivers/usb/typec/mux/gpio-superspeed-switch.c | 119 ++++++++++
+ 3 files changed, 126 insertions(+)
+
+diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig
+index 111111111111..222222222222 100644
+--- a/drivers/usb/typec/mux/Kconfig
+++ b/drivers/usb/typec/mux/Kconfig
+@@ -95,4 +95,10 @@ config TYPEC_MUX_WCD939X_USBSS
+ 	  common USB Type-C connector.
+ 	  If compiled as a module, the module will be named wcd939x-usbss.
+ 
+config TYPEC_MUX_GPIO_SWITCH
+	tristate "GPIO based USB Type-C SuperSpeed switch"
+	help
+	  Say Y or M if your system uses a GPIO based analog switch mux for
+	  flipping the SuperSpeed lanes connected to a Type-C port.
+
+ endmenu
+diff --git a/drivers/usb/typec/mux/Makefile b/drivers/usb/typec/mux/Makefile
+index 111111111111..222222222222 100644
+--- a/drivers/usb/typec/mux/Makefile
+++ b/drivers/usb/typec/mux/Makefile
+@@ -10,3 +10,4 @@ obj-$(CONFIG_TYPEC_MUX_PS883X)		+= ps883x.o
+ obj-$(CONFIG_TYPEC_MUX_PTN36502)	+= ptn36502.o
+ obj-$(CONFIG_TYPEC_MUX_TUSB1046)	+= tusb1046.o
+ obj-$(CONFIG_TYPEC_MUX_WCD939X_USBSS)	+= wcd939x-usbss.o
+obj-$(CONFIG_TYPEC_MUX_GPIO_SWITCH)	+= gpio-superspeed-switch.o
+diff --git a/drivers/usb/typec/mux/gpio-superspeed-switch.c b/drivers/usb/typec/mux/gpio-superspeed-switch.c
+new file mode 100644
+index 000000000000..111111111111
+--- /dev/null
+++ b/drivers/usb/typec/mux/gpio-superspeed-switch.c
+@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2024 Linaro Ltd.
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/mod_devicetable.h>
+#include <linux/mutex.h>
+#include <linux/gpio/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/usb/typec_mux.h>
+
+struct gpio_ss_switch {
+	struct gpio_desc *enable_gpio;
+	struct gpio_desc *select_gpio;
+
+	struct typec_switch_dev *sw;
+
+	bool enabled;
+	bool swapped;
+};
+
+static int gpio_ss_switch_set(struct typec_switch_dev *sw,
+			      enum typec_orientation orientation)
+{
+	struct gpio_ss_switch *gpio_ss_switch = typec_switch_get_drvdata(sw);
+	bool enabled;
+	bool swapped;
+
+	enabled = gpio_ss_switch->enabled;
+	swapped = gpio_ss_switch->swapped;
+
+	switch (orientation) {
+	case TYPEC_ORIENTATION_NONE:
+		enabled = false;
+		break;
+	case TYPEC_ORIENTATION_NORMAL:
+		swapped = false;
+		break;
+	case TYPEC_ORIENTATION_REVERSE:
+		swapped = true;
+		break;
+	}
+
+	if (enabled != gpio_ss_switch->enabled)
+		gpiod_set_value_cansleep(gpio_ss_switch->enable_gpio, enabled);
+
+	if (swapped != gpio_ss_switch->swapped)
+		gpiod_set_value_cansleep(gpio_ss_switch->select_gpio, swapped);
+
+	gpio_ss_switch->enabled = enabled;
+	gpio_ss_switch->swapped = swapped;
+
+	return 0;
+}
+
+static int gpio_ss_switch_probe(struct platform_device *pdev)
+{
+	struct typec_switch_desc sw_desc = { };
+	struct device *dev = &pdev->dev;
+	struct gpio_ss_switch *gpio_ss_switch;
+
+	gpio_ss_switch = devm_kzalloc(dev, sizeof(*gpio_ss_switch), GFP_KERNEL);
+	if (!gpio_ss_switch)
+		return -ENOMEM;
+
+	gpio_ss_switch->enable_gpio = devm_gpiod_get_optional(dev, "enable",
+							      GPIOD_OUT_LOW);
+	if (IS_ERR(gpio_ss_switch->enable_gpio))
+		return dev_err_probe(dev, PTR_ERR(gpio_ss_switch->enable_gpio),
+				     "unable to acquire enable gpio\n");
+
+	gpio_ss_switch->select_gpio = devm_gpiod_get(dev, "select", GPIOD_OUT_LOW);
+	if (IS_ERR(gpio_ss_switch->select_gpio))
+		return dev_err_probe(dev, PTR_ERR(gpio_ss_switch->select_gpio),
+				     "unable to acquire select gpio\n");
+
+	sw_desc.drvdata = gpio_ss_switch;
+	sw_desc.fwnode = dev_fwnode(dev);
+	sw_desc.set = gpio_ss_switch_set;
+
+	gpio_ss_switch->sw = typec_switch_register(dev, &sw_desc);
+	if (IS_ERR(gpio_ss_switch->sw))
+		return dev_err_probe(dev, PTR_ERR(gpio_ss_switch->sw),
+				     "failed to register gpio_ss_switch switch\n");
+
+	platform_set_drvdata(pdev, gpio_ss_switch);
+
+	return 0;
+}
+
+static void gpio_ss_switch_remove(struct platform_device *pdev)
+{
+	struct gpio_ss_switch *gpio_ss_switch = platform_get_drvdata(pdev);
+
+	gpiod_set_value_cansleep(gpio_ss_switch->enable_gpio, 0);
+
+	typec_switch_unregister(gpio_ss_switch->sw);
+}
+
+static const struct of_device_id gpio_ss_switch_match[] = {
+	{ .compatible = "gpio-superspeed-switch" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, gpio_ss_switch_match);
+
+static struct platform_driver gpio_ss_switch_driver = {
+	.probe = gpio_ss_switch_probe,
+	.remove = gpio_ss_switch_remove,
+	.driver = {
+		.name = "gpio_ss_switch",
+		.of_match_table = gpio_ss_switch_match,
+	},
+};
+module_platform_driver(gpio_ss_switch_driver);
+
+MODULE_DESCRIPTION("GPIO based USB TYPE-C SuperSpeed switch driver");
+MODULE_LICENSE("GPL");
+-- 
+Armbian
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Mon, 30 Jan 2023 06:21:27 +0100
+Subject: arm64: dts: meson: radxa-zero2: add FUSB302 support
+
+Add support for the FUSB302 TYPE-C connector
+- rpardini: reworked on top of minimal submission to ML
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
+---
+ arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 51 ++++++++++
+ 1 file changed, 51 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+index 111111111111..222222222222 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+@@ -12,8 +12,10 @@
+ #include "meson-g12b-a311d.dtsi"
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/leds/common.h>
+#include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/gpio/meson-g12a-gpio.h>
+ #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
+#include <dt-bindings/usb/pd.h>
+ 
+ / {
+ 	compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b";
+@@ -84,6 +86,26 @@ sdio_pwrseq: sdio-pwrseq {
+ 		clock-names = "ext_clock";
+ 	};
+ 
+	superspeed-switch {
+		compatible = "wcn,ch482d", "gpio-superspeed-switch";
+
+		select-gpios = <&gpio GPIOC_7 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+
+		orientation-switch;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				usb_ss_switch_out: endpoint {
+					remote-endpoint = <&usb_con_ss>;
+				};
+			};
+		};
+	};
+
+ 	ao_5v: regulator-ao-5v {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "AO_5V";
+@@ -92,6 +114,14 @@ ao_5v: regulator-ao-5v {
+ 		regulator-always-on;
+ 	};
+ 
+	typec2_vbus: regulator-typec2-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "TYPEC2_VBUS";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&ao_5v>;
+	};
+
+ 	vcc_1v8: regulator-vcc-1v8 {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "VCC_1V8";
+@@ -383,6 +413,22 @@ fusb0: typec-portc@22 {
+ 
+ 		connector {
+ 			compatible = "usb-c-connector";
+			label = "USB-C";
+			data-role = "host";
+			power-role = "source";
+			source-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				port@0 {
+					reg = <0>;
+					usb_con_ss: endpoint {
+						remote-endpoint = <&usb_ss_switch_out>;
+					};
+				};
+			};
+ 		};
+ 	};
+ };
+@@ -539,3 +585,8 @@ &uart_AO {
+ &usb {
+ 	status = "okay";
+ };
+
+&usb3_pcie_phy {
+	status = "okay";
+	phy-supply = <&typec2_vbus>;
+};
+-- 
+Armbian
+
--- a/Show More
+++ b/Show More