rk35xx: Remove legacy kernel target from board configs (armbian#6881)

ColorfulRhino · Dangku · commit 0b49ac029c84 · 2024-08-06T16:49:39.000+08:00
Deprecate `legacy`, but only remove from board configs for now.
Print a warning, the whole branch is slated for removal.
diff --git a/config/boards/armsom-sige7.csc b/config/boards/armsom-sige7.csc
@@ -3,8 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="Z-Keven"
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="legacy,vendor,edge,collabora"
-KERNEL_TEST_TARGET="legacy" # in case different then kernel target
+KERNEL_TARGET="vendor,edge,collabora"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"
diff --git a/config/boards/armsom-w3.csc b/config/boards/armsom-w3.csc
@@ -3,8 +3,7 @@ BOARD_NAME="ArmSoM W3"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="armsom-w3-rk3588_defconfig"
-KERNEL_TARGET="legacy,vendor"
-KERNEL_TEST_TARGET="legacy" # in case different then kernel target
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-w3.dtb"
diff --git a/config/boards/bananapim7.conf b/config/boards/bananapim7.conf
@@ -4,5 +4,5 @@ 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="legacy,vendor,edge,collabora"
+KERNEL_TARGET="vendor,edge,collabora"
 BOARDFAMILY="rockchip-rk3588"
diff --git a/config/boards/hinlink-h28k.csc b/config/boards/hinlink-h28k.csc
@@ -3,7 +3,7 @@ BOARD_NAME="HinLink H28k"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="hinlink_rk3528_defconfig"
 BOARD_MAINTAINER="sputnik2019"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-h28k.dtb"
diff --git a/config/boards/hinlink-h66k.csc b/config/boards/hinlink-h66k.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Hinlink H66K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
diff --git a/config/boards/hinlink-h68k.csc b/config/boards/hinlink-h68k.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Hinlink H68K"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
diff --git a/config/boards/hinlink-h88k.csc b/config/boards/hinlink-h88k.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOARD_FIRMWARE_INSTALL="-full"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="legacy,vendor,edge"
+KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-hinlink-h88k.dtb"
diff --git a/config/boards/hinlink-hnas.csc b/config/boards/hinlink-hnas.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Hinlink HNAS"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
diff --git a/config/boards/hinlink-ht2.csc b/config/boards/hinlink-ht2.csc
@@ -3,7 +3,7 @@ BOARD_NAME="HinLink HT2"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="hinlink_rk3528_defconfig"
 BOARD_MAINTAINER="hoochiwetech"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-hinlink-ht2.dtb"
diff --git 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="legacy,vendor,collabora,edge"
+declare -g KERNEL_TARGET="vendor,collabora,edge"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
@@ -29,13 +29,8 @@ function post_family_config__indiedroid-nova_use_stvhay_uboot() {
 }
 
 # BSP kernel uses device name from contract manufacturer rather than production name in mainline
-function post_family_config_branch_legacy__use_9tripod_dtb() {
-	declare -g BOOT_FDT_FILE="rockchip/rk3588s-9tripod-linux.dtb"
-}
-
-# post_family_config hook which also run for vendor kernel
 function post_family_config_branch_vendor__use_9tripod_dtb() {
-post_family_config_branch_legacy__use_9tripod_dtb
+	declare -g BOOT_FDT_FILE="rockchip/rk3588s-9tripod-linux.dtb"
 }
 
 # Add bluetooth packages to the image (not rootfs cache)
@@ -85,6 +80,7 @@ function pre_customize_image__indiedroid_add_bluetooth() {
 	EOD
 	chroot_sdcard systemctl enable bluetooth-rtl8821cs.service
 }
+
 function post_family_tweaks__indiedroid_naming_audios() {
 	display_alert "$BOARD" "Renaming indiedroid audios" "info"
 
diff --git 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="igorpecovnik"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="legacy,vendor,edge"
+declare -g KERNEL_TARGET="vendor,edge"
 declare -g KERNEL_TEST_TARGET="vendor"
 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/lckfb-taishanpi.csc b/config/boards/lckfb-taishanpi.csc
@@ -3,7 +3,7 @@ BOARD_NAME="LCKFB Taishan Pi"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-zero3-rk3566_defconfig"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 BOOT_FDT_FILE="rockchip/rk3566-taishanpi-v10.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/mangopi-m28k.csc b/config/boards/mangopi-m28k.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Mangopi M28K"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="hinlink_rk3528_defconfig"
 BOARD_MAINTAINER="sputnik2019"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3528-mangopi-m28k.dtb"
diff --git 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="legacy,vendor,current,edge,collabora"
+KERNEL_TARGET="vendor,current,edge,collabora"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"
diff --git a/config/boards/nanopct6.csc b/config/boards/nanopct6.csc
@@ -4,7 +4,7 @@ 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="legacy,vendor,current,edge,collabora"
+KERNEL_TARGET="vendor,current,edge,collabora"
 KERNEL_TEST_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
diff --git a/config/boards/nanopi-r6s.csc b/config/boards/nanopi-r6s.csc
@@ -4,7 +4,7 @@ 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="legacy,vendor,edge"
+KERNEL_TARGET="vendor,edge"
 KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
diff --git a/config/boards/orangepi3b.csc b/config/boards/orangepi3b.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi-3b-rk3566_defconfig"
 BOOT_SOC="rk3566"
-KERNEL_TARGET="legacy,vendor,edge"
+KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-orangepi-3b.dtb"
diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf
@@ -4,7 +4,7 @@ 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="legacy,vendor,edge"
+KERNEL_TARGET="vendor,edge"
 KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
diff --git 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="legacy,vendor,edge"
+KERNEL_TARGET="vendor,edge"
 KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
@@ -64,6 +64,7 @@ function post_family_tweaks__orangepi5_naming_audios() {
 	return 0
 }
 
+
 function post_family_config__orangepi5_uboot_add_sata_target() {
 	if [[ $BRANCH == "edge" ]]; then
 		return
diff --git a/config/boards/orangepi5pro.wip b/config/boards/orangepi5pro.wip
@@ -5,8 +5,7 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="orangepi_5_pro_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi_5_pro_sata_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="legacy,vendor"
-KERNEL_TEST_TARGET="legacy"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-orangepi-5-pro.dtb"
@@ -26,7 +25,7 @@ function post_family_tweaks__orangepi5pro_naming_audios() {
 	return 0
 }
 
-function post_family_config_branch_legacy__orangepi5pro_uboot_add_sata_target() {
+function post_family_config_branch_vendor__orangepi5pro_uboot_add_sata_target() {
 	display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
 
 	UBOOT_TARGET_MAP="
diff --git 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="legacy,vendor,current,edge"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-radxa-e25.dtb"
diff --git a/config/boards/radxa-zero3.conf b/config/boards/radxa-zero3.conf
@@ -3,7 +3,7 @@ BOARD_NAME="Radxa ZERO 3"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="Radxa"
 BOOTCONFIG="radxa-zero3-rk3566_defconfig"
-KERNEL_TARGET="legacy,vendor,edge"
+KERNEL_TARGET="vendor,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-radxa-zero3.dtb"
diff --git a/config/boards/rock-3a.csc b/config/boards/rock-3a.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Rock 3A"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="amazingfate ZazaBR vamzii catalinii"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
-KERNEL_TARGET="legacy,vendor,current,edge"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
diff --git a/config/boards/rock-5-cmio.csc b/config/boards/rock-5-cmio.csc
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="radxa-cm5-io-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-radxa-cm5-io.dtb"
diff --git a/config/boards/rock-5-itx.conf b/config/boards/rock-5-itx.conf
@@ -3,8 +3,7 @@ BOARD_NAME="Rock 5 ITX"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="rock-5-itx-rk3588_defconfig"
-KERNEL_TARGET="legacy,vendor"
-KERNEL_TEST_TARGET="legacy" # in case different then kernel target
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-rock-5-itx.dtb"
diff --git 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="legacy,vendor,edge,collabora"
+KERNEL_TARGET="vendor,edge,collabora"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb"
@@ -25,7 +25,7 @@ function post_family_tweaks__rock5a_naming_audios() {
 	return 0
 }
 
-function post_family_config_branch_legacy__dual_uboot_for_rock5a() {
+function post_family_config_branch_vendor__dual_uboot_for_rock5a() {
 	display_alert "$BOARD" "Configuring ($BOARD) normal/SPI uboot target map" "info"
 	UBOOT_TARGET_MAP="
 	BL31=$RKBIN_DIR/$BL31_BLOB rock-5a-spi-rk3588s_defconfig spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img
diff --git 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="legacy,vendor,edge,collabora"
+KERNEL_TARGET="vendor,edge,collabora"
 KERNEL_TEST_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
diff --git 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="legacy,vendor,current,edge"
+KERNEL_TARGET="vendor,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"
diff --git a/config/boards/station-m3.csc b/config/boards/station-m3.csc
@@ -2,7 +2,7 @@
 BOARD_NAME="Station M3"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="chainsx"
-KERNEL_TARGET="legacy,vendor"
+KERNEL_TARGET="vendor"
 BOOTCONFIG="rock-5a-rk3588s_defconfig"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf
@@ -17,6 +17,7 @@ OVERLAY_PREFIX='rk35xx'
 case $BRANCH in
 
 	legacy)
+		display_alert "WARNING: 'legacy' branch" "is deprecated and slated for removal. Please switch to another branch unless you know what you're doing :)" "wrn"
 		BOOTDIR='u-boot-rockchip64'
 		declare -g KERNEL_MAJOR_MINOR="5.10"   # Major and minor versions of this kernel.
 		declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf
@@ -17,6 +17,7 @@ OVERLAY_PREFIX='rockchip-rk3588'
 case $BRANCH in
 
 	legacy)
+		display_alert "WARNING: 'legacy' branch" "is deprecated and slated for removal. Please switch to another branch unless you know what you're doing :)" "wrn"
 		BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd'
 		BOOTDIR='u-boot-rockchip64'
 		declare -g KERNEL_MAJOR_MINOR="5.10"   # Major and minor versions of this kernel.
