JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

meson64 / rockchip64 / uefi / rk3568-odroid: edge 6.6: bump to 6.6-rc7; rebase/rewrite patches for 6.6-rc7

Browse Source
This commit is contained in:
Ricardo Pardini
2023-10-25 14:31:07 +02:00
committed by Igor
parent 95229ffdef
commit 98c0ab47f5
9 changed files with 10 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/families/include/meson64_common.inc
View File

@@ -47,7 +47,7 @@ case $BRANCH in
edge) edge)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. For mainline caching. declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. For mainline caching.
#KERNELBRANCH='branch:linux-6.6.y' #KERNELBRANCH='branch:linux-6.6.y'
KERNELBRANCH='tag:v6.6-rc6' KERNELBRANCH='tag:v6.6-rc7'
KERNELPATCHDIR='meson64-edge' KERNELPATCHDIR='meson64-edge'
;; ;;

2
config/sources/families/include/rockchip64_common.inc
View File

@@ -155,7 +155,7 @@ case $BRANCH in
KERNELPATCHDIR='rockchip64-'$BRANCH KERNELPATCHDIR='rockchip64-'$BRANCH
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
#KERNELBRANCH="branch:linux-6.6.y" #KERNELBRANCH="branch:linux-6.6.y"
KERNELBRANCH='tag:v6.6-rc6' KERNELBRANCH='tag:v6.6-rc7'
LINUXFAMILY=rockchip64 LINUXFAMILY=rockchip64
LINUXCONFIG='linux-rockchip64-'$BRANCH LINUXCONFIG='linux-rockchip64-'$BRANCH

2
config/sources/families/include/uefi_common.inc
View File

@@ -42,7 +42,7 @@ case "${BRANCH}" in
declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}" declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
#declare -g KERNELBRANCH='branch:linux-6.6.y' #declare -g KERNELBRANCH='branch:linux-6.6.y'
declare -g KERNELBRANCH='tag:v6.6-rc6' declare -g KERNELBRANCH='tag:v6.6-rc7'
declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty. declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
;; ;;
esac esac

2
config/sources/families/rk3568-odroid.conf
View File

@@ -18,7 +18,7 @@ case $BRANCH in
edge) edge)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel (for armbian-next) declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel (for armbian-next)
#declare -g KERNELBRANCH='branch:linux-6.6.y' #declare -g KERNELBRANCH='branch:linux-6.6.y'
KERNELBRANCH='tag:v6.6-rc6' KERNELBRANCH='tag:v6.6-rc7'
KERNELPATCHDIR='archive/rk3568-odroid-6.6' # @TODO fix # patches for overlays et al KERNELPATCHDIR='archive/rk3568-odroid-6.6' # @TODO fix # patches for overlays et al
;; ;;

2
patch/kernel/archive/meson64-6.6/board-odroidc2-enable-SPI.patch
View File

@@ -11,7 +11,7 @@ Odroid C2 enable SPI
1 file changed, 26 insertions(+) 1 file changed, 26 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index c6a38d890db5..09b6b2bea02b 100644 index c6a38d890db5..73ad65fad0d7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -176,6 +176,32 @@ hdmi_connector_in: endpoint { @@ -176,6 +176,32 @@ hdmi_connector_in: endpoint {

2
patch/kernel/archive/meson64-6.6/board-odroidc2-enable-scpi-dvfs.patch
View File

@@ -9,7 +9,7 @@ Enable odroidc2-dev DVFS (#763)
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index 09b6b2bea02b..b4862f5f6347 100644 index 73ad65fad0d7..f99f8414d8e0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -360,7 +360,8 @@ &saradc { @@ -360,7 +360,8 @@ &saradc {

6
patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-aliases-for-serial-i2c-and-spi.patch
View File

@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@xxxxx.com> From: Patrick Yavitz <pyavitz@xxxxx.com>
Date: Tue, 24 Oct 2023 08:17:17 -0400 Date: Tue, 24 Oct 2023 08:17:17 -0400
Subject: [PATCH] arm64: dts: Radxa Zero: set aliases for serial, i2c and spi Subject: arm64: dts: Radxa Zero: set aliases for serial, i2c and spi
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com> Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
--- ---
.../arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 12 ++++++++++++ arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 12 ++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
index cf0a9be83fc4..384f39afeba8 100644 index fcd7e1d8e16f..2e4646e255ad 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -15,6 +15,18 @@ / { @@ -15,6 +15,18 @@ / {

2
patch/kernel/archive/meson64-6.6/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
View File

@@ -19,7 +19,7 @@ Suggested-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Yuntian Zhang <yt@radxa.com> Signed-off-by: Yuntian Zhang <yt@radxa.com>
--- ---
.../dts/amlogic/meson-g12a-radxa-zero.dts | 48 +++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 48 ++++++++++
1 file changed, 48 insertions(+) 1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts

33
patch/kernel/archive/rk3568-odroid-6.6/5001-montjoie-crypto-rk35xx.patch
View File

@@ -97,35 +97,6 @@ index 000000000000..fbe1e1b33dab
-- --
Armbian Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Mon, 26 Sep 2022 13:38:25 +0200
Subject: MAINTAINERS: add new dt-binding doc to the right entry
Rockchip crypto driver have a new file to be added.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 208cfcc1aee3..03e47802653a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18617,6 +18617,7 @@ M: Corentin Labbe <clabbe@baylibre.com>
L: linux-crypto@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml
+F: Documentation/devicetree/bindings/crypto/rockchip,rk3588-crypto.yaml
F: drivers/crypto/rockchip/
ROCKCHIP I2S TDM DRIVER
--
Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe.montjoie@gmail.com> From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Wed, 20 Sep 2023 16:04:18 +0200 Date: Wed, 20 Sep 2023 16:04:18 +0200
@@ -165,7 +136,6 @@ index 5544f66c6ff4..ffffe084a966 100644
-- --
Armbian Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe.montjoie@gmail.com> From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Thu, 22 Sep 2022 19:38:13 +0200 Date: Thu, 22 Sep 2022 19:38:13 +0200
@@ -206,7 +176,6 @@ index abee88911982..b9cbab2246e2 100644
-- --
Armbian Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe.montjoie@gmail.com> From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Wed, 20 Sep 2023 16:06:43 +0200 Date: Wed, 20 Sep 2023 16:06:43 +0200
@@ -365,7 +334,6 @@ index d4264db2a07f..c0d08ae78cd5 100644
-- --
Armbian Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe.montjoie@gmail.com> From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Wed, 20 Sep 2023 15:53:17 +0200 Date: Wed, 20 Sep 2023 15:53:17 +0200
@@ -2381,7 +2349,6 @@ index 000000000000..9b6cc29847d7
-- --
Armbian Armbian
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Corentin Labbe <clabbe.montjoie@gmail.com> From: Corentin Labbe <clabbe.montjoie@gmail.com>
Date: Wed, 4 Oct 2023 12:24:35 +0200 Date: Wed, 4 Oct 2023 12:24:35 +0200