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
This commit is contained in:
Ricardo Pardini 2023-12-27 16:18:20 +01:00 committed by Igor
parent b9766185fb
commit cb4893ddbe
3 changed files with 17 additions and 26 deletions

View File

@ -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

View File

@ -1 +0,0 @@
archive/rockchip64-6.1

View File

@ -1 +0,0 @@
archive/rockchip64-6.6