From cb4893ddbe656d6ea8be99e45fa70eccd2485005 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Wed, 27 Dec 2023 16:18:20 +0100
Subject: [PATCH] rockchip64: family common: drop KERNELBRANCH, rely on
 KERNEL_MAJOR_MINOR only, no more symlinks

- rockchip64_common is used by BOARDFAMILY's with their own LINUXFAMILY, so we can't be very generic here
---
 .../families/include/rockchip64_common.inc    | 41 ++++++++-----------
 patch/kernel/rockchip64-current               |  1 -
 patch/kernel/rockchip64-edge                  |  1 -
 3 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 120000 patch/kernel/rockchip64-current
 delete mode 120000 patch/kernel/rockchip64-edge

diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index f5a4999c4c..a14fd5f1cc 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -19,9 +19,25 @@ GOVERNOR="ondemand"
 ATFPATCHDIR='atf-rockchip64'
 BOOTPATCHDIR="${BOOTPATCHDIR:-"u-boot-rockchip64"}"
 PACKAGE_LIST_FAMILY="ethtool"
-
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
 
+# Important, we don't set LINUXFAMILY and LINUXCONFIG -- unless it is current or edge. Specifically, we don't do it for legacy branches, which are used by BOARDFAMILY's other than rockchip64.
+
+case $BRANCH in
+
+	current)
+		declare -g KERNEL_MAJOR_MINOR="6.1"
+		declare -g LINUXFAMILY=rockchip64
+		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
+		;;
+
+	edge)
+		declare -g KERNEL_MAJOR_MINOR="6.6"
+		declare -g LINUXFAMILY=rockchip64
+		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
+		;;
+esac
+
 # rockchip64 (used mainly for RK3399) legacy kernel 4.4 is dead code
 
 # Common variables:
@@ -139,29 +155,6 @@ elif [[ $BOARD == rockpi-s ]]; then
 	fi
 fi
 
-case $BRANCH in
-
-	current)
-
-		declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
-		KERNELBRANCH="branch:linux-6.1.y"
-		KERNELPATCHDIR='rockchip64-'$BRANCH
-		LINUXFAMILY=rockchip64
-		LINUXCONFIG='linux-rockchip64-'$BRANCH
-		;;
-
-	edge)
-
-		KERNELPATCHDIR='rockchip64-'$BRANCH
-		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		KERNELBRANCH="branch:linux-6.6.y"
-		LINUXFAMILY=rockchip64
-		LINUXCONFIG='linux-rockchip64-'$BRANCH
-
-		;;
-
-esac
-
 prepare_boot_configuration() {
 	if [[ $BOOT_SCENARIO == "blobless" || $BOOT_SCENARIO == "tpl-blob-atf-mainline" ]]; then
 
diff --git a/patch/kernel/rockchip64-current b/patch/kernel/rockchip64-current
deleted file mode 120000
index 47e3cd8482..0000000000
--- a/patch/kernel/rockchip64-current
+++ /dev/null
@@ -1 +0,0 @@
-archive/rockchip64-6.1
\ No newline at end of file
diff --git a/patch/kernel/rockchip64-edge b/patch/kernel/rockchip64-edge
deleted file mode 120000
index a483fb8f25..0000000000
--- a/patch/kernel/rockchip64-edge
+++ /dev/null
@@ -1 +0,0 @@
-archive/rockchip64-6.6
\ No newline at end of file