From 3851e940bff59309d5d6c18f175a69fb0d966cda Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 11 Feb 2025 13:28:50 +0100 Subject: [PATCH] Cosmetical: switch edge and current kernel order, so that current shows as primary When using TUI, this is important. --- config/boards/armsom-sige7.csc | 2 +- config/boards/bananapim7.conf | 2 +- config/boards/cm3588-nas.csc | 2 +- config/boards/indiedroid-nova.csc | 2 +- config/boards/khadas-edge2.conf | 2 +- config/boards/nanopct6-lts.conf | 2 +- config/boards/nanopct6.conf | 2 +- config/boards/nanopi-m6.conf | 2 +- config/boards/nanopi-r6c.csc | 2 +- config/boards/nanopi-r6s.conf | 2 +- config/boards/orangepi5-plus.conf | 2 +- config/boards/orangepi5.conf | 2 +- config/boards/radxa-e25.csc | 2 +- config/boards/rock-3a.conf | 2 +- config/boards/rock-5a.conf | 2 +- config/boards/rock-5b.conf | 2 +- config/boards/station-m2.csc | 2 +- config/boards/turing-rk1.csc | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/boards/armsom-sige7.csc b/config/boards/armsom-sige7.csc index 0a9ac06fc8..908b0d7f7c 100644 --- 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="" BOOTCONFIG="armsom-sige7-rk3588_defconfig" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb" diff --git a/config/boards/bananapim7.conf b/config/boards/bananapim7.conf index 42f188f445..e3043386f6 100644 --- a/config/boards/bananapim7.conf +++ b/config/boards/bananapim7.conf @@ -3,6 +3,6 @@ BOARD_NAME="Banana Pi M7" 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 -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" BOARDFAMILY="rockchip-rk3588" diff --git a/config/boards/cm3588-nas.csc b/config/boards/cm3588-nas.csc index 2226389831..1876111ff0 100644 --- a/config/boards/cm3588-nas.csc +++ b/config/boards/cm3588-nas.csc @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="ColorfulRhino" BOOTCONFIG="cm3588-nas-rk3588_defconfig" # Mainline defconfig, enables booting from NVMe BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" FULL_DESKTOP="yes" BOOT_LOGO="desktop" IMAGE_PARTITION_TABLE="gpt" diff --git a/config/boards/indiedroid-nova.csc b/config/boards/indiedroid-nova.csc index fbd90036df..1b2e1b8050 100644 --- 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="edge,current,vendor" +declare -g KERNEL_TARGET="current,edge,vendor" declare -g FULL_DESKTOP="yes" declare -g BOOT_LOGO="desktop" declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb" diff --git a/config/boards/khadas-edge2.conf b/config/boards/khadas-edge2.conf index bb9fccfd63..d64f74aca5 100644 --- a/config/boards/khadas-edge2.conf +++ b/config/boards/khadas-edge2.conf @@ -3,7 +3,7 @@ declare -g BOARD_NAME="Khadas Edge2" declare -g BOARDFAMILY="rockchip-rk3588" declare -g BOARD_MAINTAINER="efectn" declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon -declare -g KERNEL_TARGET="edge,current,vendor" +declare -g KERNEL_TARGET="current,edge,vendor" declare -g KERNEL_TEST_TARGET="vendor,current" declare -g IMAGE_PARTITION_TABLE="gpt" declare -g KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1" diff --git a/config/boards/nanopct6-lts.conf b/config/boards/nanopct6-lts.conf index b216d281ec..d4b8f12e85 100644 --- a/config/boards/nanopct6-lts.conf +++ b/config/boards/nanopct6-lts.conf @@ -5,5 +5,5 @@ BOARD_NAME="NanoPC T6 LTS" BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="SuperKali Tonymac32" BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" diff --git a/config/boards/nanopct6.conf b/config/boards/nanopct6.conf index aff6802de5..9e17d2bd09 100644 --- a/config/boards/nanopct6.conf +++ b/config/boards/nanopct6.conf @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="SuperKali Tonymac32" BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/nanopi-m6.conf b/config/boards/nanopi-m6.conf index fbd7b97285..abf93a6f62 100644 --- a/config/boards/nanopi-m6.conf +++ b/config/boards/nanopi-m6.conf @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="efectn" BOOTCONFIG="nanopi-m6-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/nanopi-r6c.csc b/config/boards/nanopi-r6c.csc index 3be3d7e36e..aa1f20f724 100644 --- 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" # Mainline defconfig, enables booting from NVMe BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" FULL_DESKTOP="yes" BOOT_LOGO="desktop" IMAGE_PARTITION_TABLE="gpt" diff --git a/config/boards/nanopi-r6s.conf b/config/boards/nanopi-r6s.conf index c8fde5a4e3..71eef1820e 100644 --- a/config/boards/nanopi-r6s.conf +++ b/config/boards/nanopi-r6s.conf @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="efectn" BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # Mainline defconfig BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf index 141e6153d4..f2aa79cb14 100644 --- a/config/boards/orangepi5-plus.conf +++ b/config/boards/orangepi5-plus.conf @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="alexl83" BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf index f67170646f..c49518be0a 100644 --- a/config/boards/orangepi5.conf +++ b/config/boards/orangepi5.conf @@ -5,7 +5,7 @@ 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="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/radxa-e25.csc b/config/boards/radxa-e25.csc index 7ad93fe811..4fda6bb92e 100644 --- a/config/boards/radxa-e25.csc +++ b/config/boards/radxa-e25.csc @@ -3,7 +3,7 @@ BOARD_NAME="Radxa E25" BOARDFAMILY="rk35xx" BOARD_MAINTAINER="krachlatte" BOOTCONFIG="radxa-e25-rk3568_defconfig" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf index 368b6fa2f6..59d3556133 100644 --- a/config/boards/rock-3a.conf +++ b/config/boards/rock-3a.conf @@ -4,7 +4,7 @@ BOARDFAMILY="rk35xx" BOARD_MAINTAINER="ZazaBR amazingfate catalinii vamzii" BOOTCONFIG="rock-3a-rk3568_defconfig" BOOTCONFIG_SATA="rock-3a-sata-rk3568_defconfig" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/rock-5a.conf b/config/boards/rock-5a.conf index 0047cd7ed3..648b6bbd6c 100644 --- a/config/boards/rock-5a.conf +++ b/config/boards/rock-5a.conf @@ -3,7 +3,7 @@ BOARD_NAME="Rock 5A" BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="amazingfate" BOOTCONFIG="rock-5a-rk3588s_defconfig" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/rock-5b.conf b/config/boards/rock-5b.conf index e961d1568f..46da1f0c2d 100644 --- a/config/boards/rock-5b.conf +++ b/config/boards/rock-5b.conf @@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B" BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="amazingfate linhz0hz" BOOTCONFIG="rock-5b-rk3588_defconfig" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/station-m2.csc b/config/boards/station-m2.csc index b3f9630ea6..fb41692032 100644 --- a/config/boards/station-m2.csc +++ b/config/boards/station-m2.csc @@ -3,7 +3,7 @@ BOARD_NAME="Station M2" BOARDFAMILY="rk35xx" BOARD_MAINTAINER="" BOOTCONFIG="station-m2-rk3566_defconfig" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="current" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/config/boards/turing-rk1.csc b/config/boards/turing-rk1.csc index 8339e9acbe..e264c73492 100644 --- a/config/boards/turing-rk1.csc +++ b/config/boards/turing-rk1.csc @@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588" BOARD_MAINTAINER="" BOOTCONFIG="turing-rk1-rk3588_defconfig" BOOT_SOC="rk3588" -KERNEL_TARGET="edge,current,vendor" +KERNEL_TARGET="current,edge,vendor" KERNEL_TEST_TARGET="vendor,current" FULL_DESKTOP="yes" BOOT_LOGO="desktop"