Armbian framework release: freeze sources and set version

Improved freezing mechanism with README
Board config ayn-odin2 temporally disable broken build
2025-09-24 19:47:06 +07:00 · 2024-08-26 17:54:39 +02:00 · 2024-08-26 17:51:06 +02:00 · 2024-08-24 22:12:29 +02:00 · 2024-08-24 17:15:24 +02:00 · 2024-08-24 15:36:19 +02:00
1361 changed files with 153543 additions and 315655 deletions
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -111,4 +111,4 @@
  description: "Provided input is not in the expected data format or structure"
 - name: "Giveaway"
  color: "DA4C13"
-  description: "Code author was selected to enter contributors giveaway"
+  description: "Code completition was selected to enter contributors giveaway"
--- a/.github/workflows/forked-helper.yml
+++ b/.github/workflows/forked-helper.yml
@@ -9,20 +9,18 @@ on:
  workflow_dispatch:

 jobs:
-  fork-repository-dispatch:
-    name: 📢 Run repository dispatch to default fork branch
-    if: ${{ github.repository_owner != 'armbian' }}
+  dispatch-on-forked-repo:
+    name: 📢 Run repository dispatch on fork
+    env:
+      DISPATCH_SECRET: ${{ secrets.ARMBIAN_SELF_DISPATCH_TOKEN }}
+    if: ${{ github.repository_owner != 'armbian' }} # Run only on forks
    runs-on: ubuntu-latest
    steps:
-      - name: Assign secret
-        id: get_dispatch_secret
-        run: echo "dispatch_secret=${{ secrets.ARMBIAN_SELF_DISPATCH_TOKEN }}" >> $GITHUB_OUTPUT
-
-      - name: Dispatch event on forked repostitory
-        if: steps.get_dispatch_secret.outputs.dispatch_secret
+      - name: Dispatch event on forked repository
+        if: ${{ env.DISPATCH_SECRET != '' }}  # Check that the secret has been set, if not, exit
        uses: peter-evans/repository-dispatch@v3
        with:
-          token: ${{ steps.get_dispatch_secret.outputs.dispatch_secret }}
+          token: ${{ env.DISPATCH_SECRET }}
          repository: ${{ github.repository }}
          event-type: armbian
          client-payload: >
--- a/.github/workflows/merge-announce.yml
+++ b/.github/workflows/merge-announce.yml
@@ -0,0 +1,20 @@
+name: push
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  announcepush:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Send push to Discord
+        run: |
+          curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST --data \
+          "{\"username\": \"Github\", \"avatar_url\": \"${{ secrets.AVATARURL }}\", \"content\": \"\
+          :white_check_mark: **Merged** into [$GITHUB_REPOSITORY](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY>) by [$GITHUB_ACTOR](<$GITHUB_SERVER_URL/$GITHUB_ACTOR>) - \
+          [Link](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA>): *$(git show -s --format=%s)*\"}" ${{ secrets.WEBHOOKURL }}
--- a/.github/workflows/pr-announce.yml
+++ b/.github/workflows/pr-announce.yml
@@ -0,0 +1,25 @@
+name: "Announce PR on Discord for review"
+run-name: 'Announce PR #${{ github.event.pull_request.number }} on Discord for review'
+
+on:
+  pull_request:
+    types: [ labeled ]
+
+jobs:
+  Announce:
+    permissions:
+      pull-requests: read
+
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'armbian/build' && github.event.label.id == '6210849975' }}
+    steps:
+      - name: Get repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Discord webhook
+        run: |
+          curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST --data \
+          "{\"username\": \"Github\", \"avatar_url\": \"${{ secrets.AVATARURL }}\", \"content\": \"\
+          :arrow_heading_up: **Pull request** to [$GITHUB_REPOSITORY](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY>) by [$GITHUB_ACTOR](<$GITHUB_SERVER_URL/$GITHUB_ACTOR>) - **Please review!** \
+          :point_right: [Link](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pull/${{github.event.pull_request.number}}>): *$(git show -s --format=%s)*\"}" ${{ secrets.WEBHOOKURL }}
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -33,7 +33,7 @@ jobs:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.3.3
+        uses: ossf/scorecard-action@v2.4.0
        with:
          results_file: results.sarif
          results_format: sarif
@@ -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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
        with:
          name: SARIF file
          path: results.sarif
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 - Superuser rights (configured sudo or root access).
 - Make sure your system is up-to-date! Outdated Docker binaries, for example, can cause trouble.

-For stable branch use `--branch=v24.05`
+For stable branch use `--branch=v24.08`

 ```bash
 apt-get -y install git
--- a/2
+++ b/2
@@ -1 +1 @@
-24.8.0-trunk
+24.8.2
--- a/config/boards/README.md
+++ b/config/boards/README.md
@@ -74,7 +74,8 @@ If you are unsure about the documentation then invoke `$ grep -r -A5 -B5 "BUILD_
 		- edge: Use edge kernel
 		- [branch]: Use specified [branch] kernel
 		- [none]: Exits with error
- **KERNEL_TEST_TARGET** ( comma-separated list of kernel releases or branches ): if test targets are different for testings (internal switch)
+- **KERNEL_TEST_TARGET** ( comma-separated list of kernel releases or branches ): if test targets are different for testings. Also applies to build list generation. (internal switch)
+- **KERNEL_UPGRADE_FREEZE** ( comma-separated list of kernels with versions obove which they stop updating, example: KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1,current-rockchip-rk3588@24.8.2" )
 - **FULL_DESKTOP** ( boolean ): defines whether to install desktop stack of applications such as office, thunderbird, etc..
 	- Values:
 		- yes: install desktop stack
--- a/config/boards/aml-a311d-cc.conf
+++ b/config/boards/aml-a311d-cc.conf
@@ -3,6 +3,7 @@ BOARD_NAME="Libre Computer Alta"
 BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER="Tonymac32"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="edge"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/aml-s9xx-box.tvb
+++ b/config/boards/aml-s9xx-box.tvb
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="SteeManMI"
 BOOTSIZE="512"
 BOOTFS_TYPE="fat"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 SERIALCON="ttyAML0"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
--- a/config/boards/aml-t95z-plus.tvb
+++ b/config/boards/aml-t95z-plus.tvb
@@ -5,6 +5,7 @@ BOARDFAMILY="meson-gxl"                         # s912's are actually meson-gxm,
 BOOTCONFIG="meson-gxm-t95z-plus_defconfig"      # patched-in
 BOARD_MAINTAINER=""
 KERNEL_TARGET="edge"
+KERNEL_TEST_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

--- a/config/boards/armsom-sige5.csc
+++ b/config/boards/armsom-sige5.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="ArmSoM Sige5"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="armsom-sige5-rk3576_defconfig"
-KERNEL_TARGET="rk3576"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"
@@ -10,6 +10,7 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 SRC_EXTLINUX="yes"
 MODULES_BLACKLIST="panfrost"
+BOARD_MAINTAINER=""

 function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
        display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
--- a/config/boards/armsom-sige7.csc
+++ b/config/boards/armsom-sige7.csc
@@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Z-Keven"
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"
--- a/config/boards/ayn-odin2.conf
+++ b/config/boards/ayn-odin2.conf
--- a/config/boards/bananapi.conf
+++ b/config/boards/bananapi.conf
@@ -1,9 +1,10 @@
 # Allwinner A20 dual core 1Gb RAM SoC 1xSATA GBE
 BOARD_NAME="Banana Pi"
 BOARDFAMILY="sun7i"
-BOARD_MAINTAINER="DylanHP"
+BOARD_MAINTAINER="janprunk"
 BOOTCONFIG="Bananapi_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"

 function post_config_uboot_target__extra_configs_for_bananapi() {
 	display_alert "$BOARD" "set dram clock" "info"
--- a/config/boards/bananapicm4io.conf
+++ b/config/boards/bananapicm4io.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="bananapi-cm4-cm4io_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/bananapim1plus.csc
+++ b/config/boards/bananapim1plus.csc
@@ -4,3 +4,4 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="bananapi_m1_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/bananapim2.eos
+++ b/config/boards/bananapim2.eos
@@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="Sinovoip_BPI_M2_defconfig"
 OVERLAY_PREFIX="sun6i-a31s"
 KERNEL_TARGET="legacy,current"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/bananapim2plus.csc
+++ b/config/boards/bananapim2plus.csc
@@ -8,3 +8,4 @@ MODULES_CURRENT="g_serial"
 MODULES_LEGACY="g_serial"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/bananapim2pro.conf
+++ b/config/boards/bananapim2pro.conf
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="bretmlw"
 BOOTCONFIG="bananapi-m2-pro_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/bananapim2s.conf
+++ b/config/boards/bananapim2s.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER="pyavitz jeanrhum"
 BOOTCONFIG="bananapi-m2s_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/bananapim2zero.csc
+++ b/config/boards/bananapim2zero.csc
@@ -7,3 +7,4 @@ MODULES_LEGACY="g_serial"
 MODULES_CURRENT="g_serial"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/bananapim3.csc
+++ b/config/boards/bananapim3.csc
@@ -5,3 +5,4 @@ BOARD_MAINTAINER="AaronNGray"
 BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
 OVERLAY_PREFIX="sun8i-a83t"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/bananapim4zero.conf
+++ b/config/boards/bananapim4zero.conf
@@ -6,6 +6,7 @@ BOOTCONFIG="bananapi_m4zero_defconfig"
 OVERLAY_PREFIX="sun50i-h616"
 BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="rtw88_8821c rtw88_8821cu"
 FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTBRANCH_BOARD="tag:v2024.01"
--- a/config/boards/bananapim5.conf
+++ b/config/boards/bananapim5.conf
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="bretmlw"
 BOOTCONFIG="bananapi-m5_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/bananapim64.csc
+++ b/config/boards/bananapim64.csc
@@ -5,4 +5,5 @@ BOARD_MAINTAINER="devdotnetorg"
 BOOTCONFIG_DEFAULT="sun50iw1p1_config"
 BOOTCONFIG="bananapi_m64_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="a64_defconfig"
--- a/config/boards/bananapim7.conf
+++ b/config/boards/bananapim7.conf
@@ -1,8 +1,8 @@
 source "${SRC}/config/boards/armsom-sige7.csc"
 BOARD_NAME="Banana Pi M7"
-BOARD_MAINTAINER="amazingfate"
+BOARD_MAINTAINER="amazingfate,Z-Keven"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
-BOARD_MAINTAINER="Z-Keven"
-KERNEL_TARGET="vendor,edge,collabora"
+KERNEL_TARGET="edge,current,vendor"
+KERNEL_TEST_TARGET="vendor,current"
 BOARDFAMILY="rockchip-rk3588"
--- a/config/boards/bananapipro.csc
+++ b/config/boards/bananapipro.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Bananapro_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"

 function post_config_uboot_target__extra_configs_for_bananapipro() {
 	display_alert "$BOARD" "set dram clock" "info"
--- a/config/boards/bananapir2.csc
+++ b/config/boards/bananapir2.csc
@@ -3,6 +3,7 @@ BOARD_NAME="Banana Pi R2"
 BOARDFAMILY="mt7623"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
 BOOTCONFIG="mt7623n_bpir2_defconfig"
 BOOT_FDT_FILE="mediatek/mt7623n-bananapi-bpi-r2"
 HAS_VIDEO_OUTPUT="yes"
--- a/config/boards/bananapir2pro.csc
+++ b/config/boards/bananapir2pro.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="bpi-r2-pro-rk3568_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-bpi-r2-pro.dtb"
--- a/config/boards/beelinkx2.tvb
+++ b/config/boards/beelinkx2.tvb
@@ -4,3 +4,4 @@ BOARDFAMILY="sun8i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="beelink_x2_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/bigtreetech-cb1.conf
+++ b/config/boards/bigtreetech-cb1.conf
@@ -1,14 +1,19 @@
 # Allwinner H616 quad core 512MB/1GB RAM SoC WiFi
 BOARD_NAME="BigTreeTech CB1"
-BOARDFAMILY="sun50iw9-btt"
-BOARD_MAINTAINER="bigtreetech"
+BOARDFAMILY="sun50iw9"
+BOARD_MAINTAINER="JohnTheCoolingFan"
 BOOTCONFIG="bigtreetech_cb1_defconfig"
-DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0"
-KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="legacy"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTFS_TYPE="fat"
 BOOT_FS_LABEL="BOOT"
 OVERLAY_PREFIX="sun50i-h616"
 BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
+
+post_family_config__fdt_bigtreetech_cb1() {
+	if [[ "${BRANCH}" = "edge" ]]; then
+		BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-pi.dtb"
+	fi
+}
--- a/config/boards/clearfogbase.csc
+++ b/config/boards/clearfogbase.csc
@@ -6,3 +6,4 @@ BOOTCONFIG="clearfog_defconfig"
 #BOOTCONFIG_EDGE="clearfogbase_defconfig"  # This had to be disabled because the clearfog is not yet ready for mainline uboot
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/clockworkpi-a06.csc
+++ b/config/boards/clockworkpi-a06.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="clockworkpi-a06-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="no"
 BOOTBRANCH_BOARD="tag:v2022.04"
--- a/config/boards/cubieboard.csc
+++ b/config/boards/cubieboard.csc
@@ -5,7 +5,7 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="Cubieboard_config"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="ir_lirc_codec lirc_dev sunxi-cir"

 function post_config_uboot_target__extra_configs_for_cubieboard() {
--- a/config/boards/cubieboard2.csc
+++ b/config/boards/cubieboard2.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="Cubieboard2_config"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"

 function post_config_uboot_target__extra_configs_for_cubieboard2() {
 	display_alert "$BOARD" "set dram clock" "info"
--- a/config/boards/cubieboard4.csc
+++ b/config/boards/cubieboard4.csc
@@ -4,3 +4,4 @@ BOARDFAMILY="sun9i"
 BOARD_MAINTAINER=""
 BOOTCONFIG=Cubieboard4_defconfig
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/cubox-i.csc
+++ b/config/boards/cubox-i.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="imx6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="mx6cuboxi_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
--- a/config/boards/fine3399.csc
+++ b/config/boards/fine3399.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="fine3399-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-fine3399.dtb"
--- a/config/boards/firefly-rk3399.csc
+++ b/config/boards/firefly-rk3399.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="firefly-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-firefly.dtb"
--- a/config/boards/gateway-gz80x.conf
+++ b/config/boards/gateway-gz80x.conf
@@ -0,0 +1,19 @@
+# Amlogic A113X quad core 1Gb RAM SoC, eMMC 8Gb
+BOARD_NAME="Gateway GZ80x"
+BOARDFAMILY="meson-axg"
+BOARD_MAINTAINER="pyavitz"
+BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+BOOTBRANCH_BOARD="tag:v2024.04"
+BOOTPATCHDIR="v2024.04"
+BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"
+HAS_VIDEO_OUTPUT="no"
+
+function post_family_tweaks_bsp__gateway_gz80x_udev() {
+	mkdir -p "${destination}"/etc/udev/rules.d
+	display_alert "$BOARD" "Install zwave udev rule" "info"
+	echo 'KERNEL=="ttyAML2", NAME="tts/%n", SYMLINK+="zwave", GROUP="dialout", MODE="0660"' > "${destination}"/etc/udev/rules.d/10-zwave.rules
+}
--- a/config/boards/h96-tvbox-3566.tvb
+++ b/config/boards/h96-tvbox-3566.tvb
@@ -1,11 +1,31 @@
 # Rockchip RK3566 quad core SoC WIFI/BT eMMC USB2/3
 BOARD_NAME="h96-tvbox-3566"
-BOARDFAMILY="rk35xx"
+BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
 BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
+
+# Mainline U-Boot
+function post_family_config__h96_max_use_mainline_uboot() {
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+}
--- a/config/boards/helios4.csc
+++ b/config/boards/helios4.csc
@@ -9,3 +9,4 @@ MODULES_CURRENT="marvell_cesa lm75"
 HAS_VIDEO_OUTPUT="no"
 FORCE_BOOTSCRIPT_UPDATE="yes"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/helios64.conf
+++ b/config/boards/helios64.conf
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="prahal"
 BOOTCONFIG="helios64-rk3399_defconfig"
 BOOT_SCENARIO="tpl-blob-atf-mainline"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES="lm75 ledtrig-netdev"
 MODULES_LEGACY="lm75"
 FULL_DESKTOP="yes"
--- a/config/boards/hikey960.csc
+++ b/config/boards/hikey960.csc
@@ -3,6 +3,7 @@ declare -g BOARD_NAME="HiKey 960"
 declare -g BOARDFAMILY="uefi-arm64"
 declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TEST_TARGET="current"

 declare -g GRUB_CMDLINE_LINUX_DEFAULT="efi=noruntime console=ttyAMA6,115200n8"
 declare -g BOOT_FDT_FILE="hisilicon/hi3660-hikey960.dtb"
--- a/config/boards/indiedroid-nova.csc
+++ b/config/boards/indiedroid-nova.csc
@@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 declare -g BOOT_SOC="rk3588"
-declare -g KERNEL_TARGET="vendor,collabora,edge"
+declare -g KERNEL_TARGET="edge,current,vendor"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
--- a/config/boards/inovato-quadra.conf
+++ b/config/boards/inovato-quadra.conf
@@ -6,7 +6,7 @@ BOOTCONFIG="tanix_tx6_defconfig"
 CRUSTCONFIG="tanix_tx6_defconfig"
 BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"
 KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 BOOT_LOGO="desktop"
 FULL_DESKTOP="yes"
 SRC_EXTLINUX="yes"
--- a/config/boards/jethubj100.conf
+++ b/config/boards/jethubj100.conf
@@ -4,5 +4,9 @@ BOARDFAMILY="jethub"
 BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j100_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex"
+[[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 DEFAULT_CONSOLE="serial"
+HAS_VIDEO_OUTPUT="no"
+MODULES_BLACKLIST="rtw88_8822cs"
--- a/config/boards/jethubj200.conf
+++ b/config/boards/jethubj200.conf
@@ -4,6 +4,9 @@ BOARDFAMILY="jethub"
 BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j200_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog"
+[[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/jethubj80.conf
+++ b/config/boards/jethubj80.conf
@@ -4,5 +4,9 @@ BOARDFAMILY="jethub"
 BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j80_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex"
+[[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 DEFAULT_CONSOLE="serial"
+HAS_VIDEO_OUTPUT="no"
+MODULES_BLACKLIST="rtw88_8822cs"
--- a/config/boards/jetson-nano.csc
+++ b/config/boards/jetson-nano.csc
@@ -3,6 +3,7 @@ declare -g BOARD_NAME="Jetson Nano"
 declare -g BOARDFAMILY="uefi-arm64"
 declare -g BOARD_MAINTAINER="150balbes"
 declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TEST_TARGET="current"

 declare -g BOOT_LOGO=desktop

--- a/config/boards/jp-tvbox-3566.tvb
+++ b/config/boards/jp-tvbox-3566.tvb
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="tdleiyao"
 #BOOTCONFIG="rock-3c-rk3566_defconfig"
 BOOTCONFIG="rk3568_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-jp-tvbox.dtb"
--- a/config/boards/khadas-edge.csc
+++ b/config/boards/khadas-edge.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="khadas-edge-v-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_SUPPORT_SPI=yes
--- a/config/boards/khadas-edge2.conf
+++ b/config/boards/khadas-edge2.conf
@@ -1,11 +1,12 @@
 # Rockchip RK3588s 2GB-16GB GBE eMMC NVMe SATA USB3 WiFi
 declare -g BOARD_NAME="Khadas Edge2"
 declare -g BOARDFAMILY="rockchip-rk3588"
-declare -g BOARD_MAINTAINER="igorpecovnik"
+declare -g BOARD_MAINTAINER="efectn"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="vendor,edge"
-declare -g KERNEL_TEST_TARGET="vendor"
+declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
+declare -g KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board

 declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension
--- a/config/boards/khadas-vim1.conf
+++ b/config/boards/khadas-vim1.conf
@@ -4,5 +4,6 @@ BOARDFAMILY="meson-gxl"
 BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="khadas-vim_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/khadas-vim2.conf
+++ b/config/boards/khadas-vim2.conf
@@ -4,5 +4,6 @@ BOARDFAMILY="meson-gxl"
 BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="khadas-vim2_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/khadas-vim3.conf
+++ b/config/boards/khadas-vim3.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER="rpardini NicoD-SBC"
 BOOTCONFIG="khadas-vim3_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost on the VIM3
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/khadas-vim3l.conf
+++ b/config/boards/khadas-vim3l.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-sm1"
 BOARD_MAINTAINER="rpardini"
 BOOTCONFIG="khadas-vim3l_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/lafrite.conf
+++ b/config/boards/lafrite.conf
@@ -5,6 +5,7 @@ BOARD_MAINTAINER="Tonymac32"
 BOOTCONFIG="libretech-ac_defconfig"
 BOOT_FDT_FILE="amlogic/meson-gxl-s805x-libretech-ac.dtb"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
 BOOT_LOGO="desktop"
--- a/config/boards/leez-p710.csc
+++ b/config/boards/leez-p710.csc
@@ -8,3 +8,4 @@ BOOT_LOGO="desktop"
 BOOT_SCENARIO="blobless"
 FULL_DESKTOP="yes"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/lepotato.conf
+++ b/config/boards/lepotato.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-gxl"
 BOARD_MAINTAINER="Tonymac32"
 BOOTCONFIG="libretech-cc_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 SERIALCON="ttyAML0"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.lepotato"
--- a/config/boards/licheepi-4a.csc
+++ b/config/boards/licheepi-4a.csc
@@ -3,6 +3,7 @@ BOARD_NAME="LicheePi 4A"
 BOARDFAMILY="thead"
 BOARD_MAINTAINER="chainsx"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="thead/th1520-lichee-pi-4a.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth=\$ethaddr tsched=0 rootrwoptions=rw,noatime rootrwreset=yes"
--- a/config/boards/lime-a33.csc
+++ b/config/boards/lime-a33.csc
@@ -6,3 +6,4 @@ HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="A33-OLinuXino_defconfig"
 OVERLAY_PREFIX="sun8i-a33"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/lime.csc
+++ b/config/boards/lime.csc
@@ -4,3 +4,4 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="A20-OLinuXino-Lime_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/lime2.csc
+++ b/config/boards/lime2.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="A20-OLinuXino-Lime2-eMMC_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"

 function post_config_uboot_target__extra_configs_for_lime2() {
 	run_host_command_logged scripts/config --enable CONFIG_PHY_MICREL
--- a/config/boards/macchiatobin-doubleshot.csc
+++ b/config/boards/macchiatobin-doubleshot.csc
@@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="mvebu_mcbin-88f8040_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/melea1000.csc
+++ b/config/boards/melea1000.csc
@@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="Mele_A1000_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/mk808c.csc
+++ b/config/boards/mk808c.csc
@@ -5,3 +5,4 @@ BOARD_MAINTAINER=""
 HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="MK808C_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/nanopc-cm3588-nas.csc
+++ b/config/boards/nanopc-cm3588-nas.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopc_cm3588_defconfig" # Enables booting from NVMe. Vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge,collabora"
+KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/nanopct4.csc
+++ b/config/boards/nanopct4.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopc-t4-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
 BOOT_LOGO="desktop"
--- a/config/boards/nanopct6.conf
+++ b/config/boards/nanopct6.conf
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge,collabora"
-KERNEL_TEST_TARGET="vendor,edge"
+KERNEL_TARGET="edge,current,vendor"
+KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6.dtb"
--- a/config/boards/nanopi-r1s-h5.csc
+++ b/config/boards/nanopi-r1s-h5.csc
@@ -9,5 +9,6 @@ DEFAULT_OVERLAYS="usbhost1 usbhost2"
 DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 HAS_VIDEO_OUTPUT="no"
 CRUSTCONFIG="h5_defconfig"
--- a/config/boards/nanopi-r2c.csc
+++ b/config/boards/nanopi-r2c.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi-r2s-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 DEFAULT_CONSOLE="serial"
 MODULES="g_serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
--- a/config/boards/nanopi-r2s.csc
+++ b/config/boards/nanopi-r2s.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi-r2s-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 DEFAULT_CONSOLE="serial"
 MODULES="g_serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
--- a/config/boards/nanopi-r4se.csc
+++ b/config/boards/nanopi-r4se.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi-r4se-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"
--- a/config/boards/nanopi-r5c.csc
+++ b/config/boards/nanopi-r5c.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3568-nanopi-r5c.dtb"
 SRC_EXTLINUX="no"
 ASOUND_STATE="asound.state.station-m2" # TODO verify me
@@ -11,8 +12,8 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="no"
 BOOT_LOGO="desktop"

-BOOTBRANCH_BOARD="tag:v2024.04"
-BOOTPATCHDIR="v2024.04"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07"
 BOOTCONFIG="nanopi-r5c-rk3568_defconfig"

 OVERLAY_PREFIX="rockchip-rk3568"
--- a/config/boards/nanopi-r5s.csc
+++ b/config/boards/nanopi-r5s.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="utlark"
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3568-nanopi-r5s.dtb"
 SRC_EXTLINUX="no"
 ASOUND_STATE="asound.state.station-m2" # TODO verify me
--- a/config/boards/nanopi-r6c.csc
+++ b/config/boards/nanopi-r6c.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,current,edge"
+KERNEL_TARGET="edge,current,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/nanopi-r6s.csc
+++ b/config/boards/nanopi-r6s.csc
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="edge,current,vendor"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
--- a/config/boards/nanopia64.csc
+++ b/config/boards/nanopia64.csc
@@ -4,5 +4,6 @@ BOARDFAMILY="sun50iw1"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi_a64_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 CRUSTCONFIG="a64_defconfig"
--- a/config/boards/nanopiair.csc
+++ b/config/boards/nanopiair.csc
@@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/nanopiduo.csc
+++ b/config/boards/nanopiduo.csc
@@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
 HAS_VIDEO_OUTPUT="no"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/nanopiduo2.csc
+++ b/config/boards/nanopiduo2.csc
@@ -10,5 +10,6 @@ DEFAULT_CONSOLE="serial"
 HAS_VIDEO_OUTPUT="no"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="sun8i-h3-nanopi-duo2.dtb"
 CRUSTCONFIG="nanopi_m1_plus_defconfig"
--- a/config/boards/nanopik1plus.csc
+++ b/config/boards/nanopik1plus.csc
@@ -5,4 +5,5 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi_k1_plus_defconfig"
 DEFAULT_OVERLAYS="analog-codec"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="h5_defconfig"
--- a/config/boards/nanopik2-s905.csc
+++ b/config/boards/nanopik2-s905.csc
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-gxbb"
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi-k2_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
 BOOT_LOGO="desktop"
--- a/config/boards/nanopim4v2.conf
+++ b/config/boards/nanopim4v2.conf
@@ -1,9 +1,10 @@
 # Rockchip RK3399 hexa core 4GB RAM SoC GBE eMMC USB3 USB-C WiFi/BT
 BOARD_NAME="NanoPi M4V2"
 BOARDFAMILY="rockchip64" # Used to be rk3399
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
 BOOT_LOGO="desktop"
--- a/config/boards/nanopineo.csc
+++ b/config/boards/nanopineo.csc
@@ -10,3 +10,4 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/config/boards/nanopineo2.csc
+++ b/config/boards/nanopineo2.csc
@@ -10,4 +10,5 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="h5_defconfig"
--- a/config/boards/nanopineo2black.csc
+++ b/config/boards/nanopineo2black.csc
@@ -10,4 +10,5 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS1,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="h5_defconfig"
--- a/config/boards/nanopineo4.csc
+++ b/config/boards/nanopineo4.csc
@@ -4,5 +4,6 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER=""
 BOOTCONFIG="nanopi-neo4-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/nanopineocore2.csc
+++ b/config/boards/nanopineocore2.csc
@@ -10,4 +10,5 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="h5_defconfig"
--- a/config/boards/nanopineoplus2.csc
+++ b/config/boards/nanopineoplus2.csc
@@ -10,6 +10,7 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 CRUSTCONFIG="h5_defconfig"

 function post_config_uboot_target__extra_configs_for_nanopi_neo_plus2() {
--- a/config/boards/odroidc1.csc
+++ b/config/boards/odroidc1.csc
@@ -3,6 +3,7 @@ BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"

 BOOTDIR='u-boot-odroidc1'
 BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-gxbb"
 BOARD_MAINTAINER="teknoid"
 BOOTCONFIG="odroid-c2_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
 BOOTBRANCH_BOARD="tag:v2022.01"
--- a/config/boards/odroidc4.conf
+++ b/config/boards/odroidc4.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-sm1"
 BOARD_MAINTAINER=""
 BOOTCONFIG="odroid-c4_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
--- a/config/boards/odroidhc4.conf
+++ b/config/boards/odroidhc4.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="meson-sm1"
 BOARD_MAINTAINER=""
 BOOTCONFIG="odroid-c4_defconfig" # for the SD card; but also 'odroid-hc4_defconfig', see below at pre_config_uboot_target
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="no"
 SERIALCON="ttyAML0"
--- a/config/boards/odroidm1.conf
+++ b/config/boards/odroidm1.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="rpardini"
 BOOT_SOC="rk3568"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3568-odroid-m1.dtb"
 SRC_EXTLINUX="no"
 ASOUND_STATE="asound.state.station-m2"
--- a/config/boards/odroidn2.conf
+++ b/config/boards/odroidn2.conf
@@ -3,6 +3,7 @@ BOARD_NAME="Odroid N2"
 BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER="NicoD-SBC"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 FORCE_BOOTSCRIPT_UPDATE="yes"
--- a/config/boards/odroidn2l.csc
+++ b/config/boards/odroidn2l.csc
@@ -3,6 +3,7 @@ BOARD_NAME="Odroid N2L"
 BOARDFAMILY="meson-g12b"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
--- a/config/boards/olimex-a20-olinuxino-micro.csc
+++ b/config/boards/olimex-a20-olinuxino-micro.csc
@@ -4,3 +4,4 @@ BOARDFAMILY="sun7i"
 BOARD_MAINTAINER=""
 BOOTCONFIG="A20-OLinuXino_MICRO-eMMC_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
--- a/Show More
+++ b/Show More