Adjust parameters for several boards

armbian · Aug 19, 2024 · d381a9b · d381a9b
1 parent 4ffe5bc
commit d381a9b
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/config/boards/bananapim7.conf b/config/boards/bananapim7.conf
@@ -4,5 +4,6 @@ BOARD_MAINTAINER="amazingfate"
 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="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 BOARDFAMILY="rockchip-rk3588"
diff --git a/config/boards/clearfogpro.csc b/config/boards/clearfogpro.csc
@@ -5,4 +5,4 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="clearfog_defconfig"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
diff --git a/config/boards/khadas-edge2.conf b/config/boards/khadas-edge2.conf
@@ -1,10 +1,10 @@
 # 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="vendor,current,edge"
+declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board
 

diff --git a/config/boards/nanopi-r4s.conf b/config/boards/nanopi-r4s.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER="Manouchehri"
 BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"

diff --git 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="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

diff --git a/config/boards/odroidxu4.conf b/config/boards/odroidxu4.conf
@@ -6,4 +6,4 @@ BOOTCONFIG="odroid-xu4_defconfig"
 SERIALCON="ttySAC2"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
@@ -4,8 +4,8 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-plus-rk3588_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="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"

diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf
@@ -5,8 +5,8 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="vendor,edge"
-KERNEL_TEST_TARGET="vendor"
+KERNEL_TARGET="vendor,current,edge"
+KERNEL_TEST_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"

diff --git a/config/boards/orangepioneplus.csc b/config/boards/orangepioneplus.csc
@@ -4,5 +4,5 @@ BOARDFAMILY="sun50iw6"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_one_plus_defconfig"
 KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 CRUSTCONFIG="orangepi_3_lts_defconfig"
diff --git a/config/boards/rockpi-4b.csc b/config/boards/rockpi-4b.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rock-pi-4-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current"
+KERNEL_TEST_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"