From 95c829f9e66451f2bff6f42ab3e61d211212c905 Mon Sep 17 00:00:00 2001
From: Werner <EvilOlaf@users.noreply.github.com>
Date: Tue, 21 Feb 2023 18:04:10 +0100
Subject: [PATCH 1/3] Add deprecation note (#4845)

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 11c3f0cabbe0..819f52bd8879 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+# DEPRECATED:
+# This branch will not receive any further updates or fixes. Do NOT open bug reports when using it.
+
 <p align="center">
   <a href="#build-framework">
   <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">

From 6a334b97c2dc2fd277638e7557f2f89caf7f96e8 Mon Sep 17 00:00:00 2001
From: balbes150 <balbes-150@yandex.ru>
Date: Fri, 24 Feb 2023 16:38:13 +0300
Subject: [PATCH 2/3] move edge media to 6.2

---
 config/sources/families/media.conf | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf
index 808561cf6332..c19070c82af3 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"
@@ -68,8 +64,7 @@ case $BRANCH in
 		;;
 
 	edge)
-#		KERNELBRANCH="branch:linux-6.2.y"
-		KERNELBRANCH="tag:v6.2-rc8"
+		KERNELBRANCH="branch:linux-6.2.y"
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH

From d2ff491a524c683503b8f8f21eafc0bb002f1a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= <igor@armbian.com>
Date: Fri, 3 Mar 2023 19:03:24 +0100
Subject: [PATCH 3/3] Update README.md

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 819f52bd8879..11c3f0cabbe0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-# DEPRECATED:
-# This branch will not receive any further updates or fixes. Do NOT open bug reports when using it.
-
 <p align="center">
   <a href="#build-framework">
   <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">