Bump bcm, imx, mvebu64 and xu4 EDGE to 6.1.y (#4560)

* Bump bcm, imx, mvebu64, xu4 and rockchip to 6.1.y * Add configs for imx6 and xu4 * Add broadcom kernel config * Move XU4 edge to mainline kernel as hardkernel branch contain nothing for it * Move Rockchip64 EDGE to 6.1 * Move rockchip (32 bit) edge to kernel 6.1 * Move rk322x edge kernel to 6.1 Co-authored-by: Paolo Sabatino <paolo.sabatino@gmail.com>
armbian · Dec 14, 2022 · c0001d5 · c0001d5
1 parent cbbbaf7
commit c0001d5
Show file tree

Hide file tree

Showing 99 changed files with 543,414 additions and 1,445 deletions.
diff --git a/config/kernel/linux-bcm2711-edge.config b/config/kernel/linux-bcm2711-edge.config
diff --git a/config/kernel/linux-imx6-edge.config b/config/kernel/linux-imx6-edge.config
diff --git a/config/kernel/linux-odroidxu4-edge.config b/config/kernel/linux-odroidxu4-edge.config
diff --git a/config/kernel/linux-rk322x-edge.config b/config/kernel/linux-rk322x-edge.config
diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config
diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config
diff --git a/config/sources/families/bcm2711.conf b/config/sources/families/bcm2711.conf
@@ -26,7 +26,7 @@ case "${BRANCH}" in
 	edge)
 		export RASPI_DISTRO_KERNEL=no
 		export KERNELSOURCE='https://github.com/raspberrypi/linux'
-		export KERNELBRANCH="branch:rpi-6.0.y"
+		export KERNELBRANCH="branch:rpi-6.1.y"
 		export KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
 		export LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 		;;

diff --git a/config/sources/families/imx6.conf b/config/sources/families/imx6.conf
@@ -16,7 +16,7 @@ case $BRANCH in
 
 	edge)
 
-		KERNELBRANCH='branch:linux-6.0.y'
+		KERNELBRANCH='branch:linux-6.1.y'
 
 		;;
 

diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
@@ -125,7 +125,7 @@ case $BRANCH in
 	edge)
 
 		KERNELPATCHDIR='rockchip64-'$BRANCH
-		KERNELBRANCH="branch:linux-6.0.y"
+		KERNELBRANCH="branch:linux-6.1.y"
 		LINUXFAMILY=rockchip64
 		LINUXCONFIG='linux-rockchip64-'$BRANCH
 

diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf
@@ -41,7 +41,7 @@ case $BRANCH in
 
 	edge)
 
-		KERNELBRANCH='branch:linux-6.0.y'
+		KERNELBRANCH='branch:linux-6.1.y'
 		;;
 
 esac

diff --git a/config/sources/families/odroidxu4.conf b/config/sources/families/odroidxu4.conf
@@ -17,8 +17,7 @@ case $BRANCH in
 
 	edge)
 
-		KERNELSOURCE='https://github.com/tobetter/linux'
-		KERNELBRANCH='branch:odroid-6.0.y'
+		KERNELBRANCH='branch:linux-6.1.y'
 		KERNELDIR='linux-odroidxu4'
 		;;
 

diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf
@@ -25,7 +25,7 @@ case $BRANCH in
 
 	edge)
 
-		KERNELBRANCH='branch:linux-6.0.y'
+		KERNELBRANCH='branch:linux-6.1.y'
 
 		;;
 

diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf
@@ -33,7 +33,7 @@ case $BRANCH in
 
 	edge)
 
-		KERNELBRANCH='branch:linux-6.0.y'
+		KERNELBRANCH='branch:linux-6.1.y'
 		;;
 
 esac

diff --git a/lib/functions/compilation/patch/kernel-bootsplash-and-drivers.sh b/lib/functions/compilation/patch/kernel-bootsplash-and-drivers.sh
@@ -184,6 +184,7 @@ compilation_prepare() {
 		if linux-version compare "${version}" ge 5.15.41 && linux-version compare "${version}" le 5.16; then aufstag="5.15.41"; fi
 		if linux-version compare "${version}" ge 5.17.3 && linux-version compare "${version}" le 5.18; then aufstag="5.17.3"; fi
 
+
 		# check if Mr. Okajima already made a branch for this version
 		improved_git ls-remote --exit-code --heads $GITHUB_SOURCE/sfjro/aufs5-standalone "aufs${aufstag}" > /dev/null
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ case $BRANCH in @@
     	edge)
-    		KERNELBRANCH='branch:linux-6.0.y'
+    		KERNELBRANCH='branch:linux-6.1.y'
     		;;
@@ Expand Down @@