From ce5d22d0db7a9e3a50bec441b128a723ea232e08 Mon Sep 17 00:00:00 2001 From: Oleg Date: Fri, 3 Mar 2023 22:31:07 +0300 Subject: [PATCH] Bump edge-media kernel to 6.2.y (#4863) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add deprecation note (#4845) * move edge media to 6.2 * Update README.md --------- Co-authored-by: Werner Co-authored-by: Igor Pečovnik --- config/sources/families/media.conf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf index 1e82f630cb..f7f71d8472 100644 --- a/config/sources/families/media.conf +++ b/config/sources/families/media.conf @@ -12,14 +12,10 @@ elif [[ $BOARD == quartz64a || $BOARD == quartz64b ]]; then BOOTSOURCE='https://github.com/150balbes/u-boot-rk' BOOTBRANCH='branch:rk35xx' BOOTPATCHDIR="u-boot-station-p2" -elif [[ $BOARD == station-m3 ]]; then +elif [[ $BOARD == station-m3 || $BOARD == khadas-edge2 ]]; then BOOTSOURCE='https://github.com/150balbes/u-boot-rk' BOOTBRANCH='branch:rk3588' BOOTPATCHDIR="u-boot-station-p2" -elif [[ $BOARD == khadas-edge2 ]]; then - BOOTSOURCE='https://github.com/150balbes/u-boot-rk' - BOOTBRANCH='branch:rk3588-next-k' - BOOTPATCHDIR="u-boot-station-p2" else BOOTBRANCH="tag:v2022.04" BOOTPATCHDIR="u-boot-media" @@ -73,7 +69,7 @@ case $BRANCH in edge) export KERNEL_MAJOR_MINOR="6.2" # Major and minor versions of this kernel. - KERNELBRANCH="tag:v6.2-rc8" # KERNELBRANCH="branch:linux-6.2.y" + KERNELBRANCH="branch:linux-6.2.y" KERNELPATCHDIR='media-'$BRANCH LINUXFAMILY=media LINUXCONFIG='linux-media-'$BRANCH