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

u-boot-rockchip64-v2022.04: rebase/archeology patches against 22.04

Browse Source
This commit is contained in:
Ricardo Pardini
2023-06-13 15:56:34 +02:00
committed by Igor
parent 6d7467fc68
commit 165c55377b
35 changed files with 1405 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-clockworkpi-a06.patch
View File

@@ -1,10 +1,78 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Fri, 24 Jan 2020 14:21:27 +0100
Subject: [ARCHEOLOGY] OrangePi 4 preliminary support (kernel dt from NanoPi
M4)
> X-Git-Archeology: - Revision a22b07948a898485db733189edea0f1e4b753071: https://github.com/armbian/build/commit/a22b07948a898485db733189edea0f1e4b753071
> X-Git-Archeology: Date: Fri, 24 Jan 2020 14:21:27 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: OrangePi 4 preliminary support (kernel dt from NanoPi M4)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e4be7bcfd8dcc556ea38b0b286e4d8ba0c8c5881: https://github.com/armbian/build/commit/e4be7bcfd8dcc556ea38b0b286e4d8ba0c8c5881
> X-Git-Archeology: Date: Fri, 24 Jan 2020 19:17:26 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: OrangePi 4 preliminary support (fixed default FDT file name)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 75d0f64e3d75e7c34466871b9723ef1a238609d8: https://github.com/armbian/build/commit/75d0f64e3d75e7c34466871b9723ef1a238609d8
> X-Git-Archeology: Date: Fri, 17 Apr 2020 21:30:37 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rk3399 to u-boot v2020.04 (#1873)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 88a585a3fe56bf9eb8c1df8993fe34830597ca77: https://github.com/armbian/build/commit/88a585a3fe56bf9eb8c1df8993fe34830597ca77
> X-Git-Archeology: Date: Sat, 18 Jul 2020 00:06:01 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Update mainline u-boot for rockchip64 / rk3399 to v2020.07 (#2086)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6e4078974bcf69c5e49bb78b920d52d62dc29f6b: https://github.com/armbian/build/commit/6e4078974bcf69c5e49bb78b920d52d62dc29f6b
> X-Git-Archeology: Date: Sun, 19 Jul 2020 00:07:03 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Adjusted patches for rockchip64 mainline u-boot (fuzzines, upstreamed file)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 3ce107f35826cc51a42d24d0140f8f27325b46c9: https://github.com/armbian/build/commit/3ce107f35826cc51a42d24d0140f8f27325b46c9
> X-Git-Archeology: Date: Sun, 24 Jan 2021 21:24:06 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Disable excessive logging for OrangePi 4 in u-boot
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1f54bc33b8dda678de473d7d006a9a7f6ab0b86b: https://github.com/armbian/build/commit/1f54bc33b8dda678de473d7d006a9a7f6ab0b86b
> X-Git-Archeology: Date: Wed, 11 May 2022 21:47:28 +0200
> X-Git-Archeology: From: CXM <16154023+littlecxm@users.noreply.github.com>
> X-Git-Archeology: Subject: Add clockworkpi-a06 support (#3768)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3399-clockworkpi-a06-u-boot.dtsi | 23 ++
arch/arm/dts/rk3399-clockworkpi-a06.dts | 162 ++++++++++
configs/clockworkpi-a06-rk3399_defconfig | 56 ++++
4 files changed, 242 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 9fb38682e6..a6d8361602 100644
index 644ba961a2..aab5db79e5 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -120,6 +120,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
@@ -133,6 +133,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
rk3368-px5-evb.dtb \
dtb-$(CONFIG_ROCKCHIP_RK3399) += \
+ rk3399-clockworkpi-a06.dtb \
rk3399-evb.dtb \
@@ -12,7 +80,7 @@ index 9fb38682e6..a6d8361602 100644
rk3399-firefly.dtb \
diff --git a/arch/arm/dts/rk3399-clockworkpi-a06-u-boot.dtsi b/arch/arm/dts/rk3399-clockworkpi-a06-u-boot.dtsi
new file mode 100644
index 0000000000..82d4a5db44
index 0000000000..6288a01368
--- /dev/null
+++ b/arch/arm/dts/rk3399-clockworkpi-a06-u-boot.dtsi
@@ -0,0 +1,23 @@
@@ -41,7 +109,7 @@ index 0000000000..82d4a5db44
+};
diff --git a/arch/arm/dts/rk3399-clockworkpi-a06.dts b/arch/arm/dts/rk3399-clockworkpi-a06.dts
new file mode 100644
index 0000000000..b32b74abb5
index 0000000000..a17d6412dd
--- /dev/null
+++ b/arch/arm/dts/rk3399-clockworkpi-a06.dts
@@ -0,0 +1,162 @@
@@ -209,7 +277,7 @@ index 0000000000..b32b74abb5
+};
diff --git a/configs/clockworkpi-a06-rk3399_defconfig b/configs/clockworkpi-a06-rk3399_defconfig
new file mode 100644
index 0000000000..398ed3592f
index 0000000000..e7c13da4c3
--- /dev/null
+++ b/configs/clockworkpi-a06-rk3399_defconfig
@@ -0,0 +1,56 @@
@@ -269,6 +337,6 @@ index 0000000000..398ed3592f
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
--
2.25.1
--
Armbian

74
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-helios64.patch
View File

@@ -1,39 +1,29 @@
From 0ad85609017068d93c0311c34438db4e43588090 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io>
Date: Tue, 15 Sep 2020 18:41:54 +0700
Subject: [PATCH] Patching something
Subject: Patching something
Signed-off-by: Aditya Prayoga <aditya@kobol.io>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3399-kobol-helios64-u-boot.dtsi | 136 ++
arch/arm/dts/rk3399-kobol-helios64.dts | 1146 +++++++++++++++++
arch/arm/mach-rockchip/rk3399/Kconfig | 17 +
board/kobol/helios64/Kconfig | 24 +
board/kobol/helios64/MAINTAINERS | 6 +
board/kobol/helios64/Makefile | 5 +
board/kobol/helios64/helios64.c | 304 +++++
board/kobol/helios64/sys_otp.c | 248 ++++
board/kobol/helios64/sys_otp.h | 10 +
configs/helios64-rk3399_defconfig | 145 +++
include/configs/helios64.h | 47 +
12 files changed, 2089 insertions(+)
create mode 100644 arch/arm/dts/rk3399-kobol-helios64-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-kobol-helios64.dts
create mode 100644 board/kobol/helios64/Kconfig
create mode 100644 board/kobol/helios64/MAINTAINERS
create mode 100644 board/kobol/helios64/Makefile
create mode 100644 board/kobol/helios64/helios64.c
create mode 100644 board/kobol/helios64/sys_otp.c
create mode 100644 board/kobol/helios64/sys_otp.h
create mode 100644 configs/helios64-rk3399_defconfig
create mode 100644 include/configs/helios64.h
arch/arm/dts/rk3399-kobol-helios64.dts | 1149 ++++++++++
arch/arm/mach-rockchip/rk3399/Kconfig | 17 +
board/kobol/helios64/Kconfig | 24 +
board/kobol/helios64/MAINTAINERS | 6 +
board/kobol/helios64/Makefile | 5 +
board/kobol/helios64/helios64.c | 321 +++
board/kobol/helios64/sys_otp.c | 248 ++
board/kobol/helios64/sys_otp.h | 10 +
configs/helios64-rk3399_defconfig | 147 ++
include/configs/helios64.h | 47 +
12 files changed, 2111 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 530d60bf..d9fd6cf1 100644
index aab5db79e5..67b3257902 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -143,6 +143,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
@@ -139,6 +139,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-firefly.dtb \
rk3399-gru-bob.dtb \
rk3399-gru-kevin.dtb \
@@ -43,7 +33,7 @@ index 530d60bf..d9fd6cf1 100644
rk3399-khadas-edge-v.dtb \
diff --git a/arch/arm/dts/rk3399-kobol-helios64-u-boot.dtsi b/arch/arm/dts/rk3399-kobol-helios64-u-boot.dtsi
new file mode 100644
index 00000000..2988a209
index 0000000000..411d9abc87
--- /dev/null
+++ b/arch/arm/dts/rk3399-kobol-helios64-u-boot.dtsi
@@ -0,0 +1,136 @@
@@ -185,7 +175,7 @@ index 00000000..2988a209
+};
diff --git a/arch/arm/dts/rk3399-kobol-helios64.dts b/arch/arm/dts/rk3399-kobol-helios64.dts
new file mode 100644
index 00000000..9d067505
index 0000000000..32061b84da
--- /dev/null
+++ b/arch/arm/dts/rk3399-kobol-helios64.dts
@@ -0,0 +1,1149 @@
@@ -1339,13 +1329,13 @@ index 00000000..9d067505
+ status = "okay";
+};
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
index 254b9c5b..5f89bf6e 100644
index 0833e083d9..80e0d1c182 100644
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
@@ -26,6 +26,22 @@ config TARGET_PINEBOOK_PRO_RK3399
@@ -39,6 +39,22 @@ config TARGET_PINEBOOK_PRO_RK3399
with 4Gb RAM, onboard eMMC, USB-C, a USB3 and USB2 port,
1920*1080 screen and all the usual laptop features.
+config TARGET_HELIOS64
+ bool "Kobol Innovations Helios64"
+ select BOARD_LATE_INIT
@@ -1365,7 +1355,7 @@ index 254b9c5b..5f89bf6e 100644
config TARGET_PUMA_RK3399
bool "Theobroma Systems RK3399-Q7 (Puma)"
help
@@ -153,6 +169,7 @@ endif # BOOTCOUNT_LIMIT
@@ -164,6 +180,7 @@ endif # BOOTCOUNT_LIMIT
source "board/firefly/roc-pc-rk3399/Kconfig"
source "board/google/gru/Kconfig"
@@ -1375,7 +1365,7 @@ index 254b9c5b..5f89bf6e 100644
source "board/rockchip/evb_rk3399/Kconfig"
diff --git a/board/kobol/helios64/Kconfig b/board/kobol/helios64/Kconfig
new file mode 100644
index 00000000..644cdbd8
index 0000000000..644cdbd8f3
--- /dev/null
+++ b/board/kobol/helios64/Kconfig
@@ -0,0 +1,24 @@
@@ -1405,7 +1395,7 @@ index 00000000..644cdbd8
+endif
diff --git a/board/kobol/helios64/MAINTAINERS b/board/kobol/helios64/MAINTAINERS
new file mode 100644
index 00000000..a9c88c79
index 0000000000..a9c88c79e3
--- /dev/null
+++ b/board/kobol/helios64/MAINTAINERS
@@ -0,0 +1,6 @@
@@ -1417,7 +1407,7 @@ index 00000000..a9c88c79
+F: configs/helios64_defconfig
diff --git a/board/kobol/helios64/Makefile b/board/kobol/helios64/Makefile
new file mode 100644
index 00000000..ab34245a
index 0000000000..ab34245a6d
--- /dev/null
+++ b/board/kobol/helios64/Makefile
@@ -0,0 +1,5 @@
@@ -1428,7 +1418,7 @@ index 00000000..ab34245a
+obj-y := helios64.o sys_otp.o
diff --git a/board/kobol/helios64/helios64.c b/board/kobol/helios64/helios64.c
new file mode 100644
index 00000000..c7a0efa4
index 0000000000..8e97693c1f
--- /dev/null
+++ b/board/kobol/helios64/helios64.c
@@ -0,0 +1,321 @@
@@ -1755,7 +1745,7 @@ index 00000000..c7a0efa4
+#endif
diff --git a/board/kobol/helios64/sys_otp.c b/board/kobol/helios64/sys_otp.c
new file mode 100644
index 00000000..3a278346
index 0000000000..3a27834641
--- /dev/null
+++ b/board/kobol/helios64/sys_otp.c
@@ -0,0 +1,248 @@
@@ -2009,7 +1999,7 @@ index 00000000..3a278346
+}
diff --git a/board/kobol/helios64/sys_otp.h b/board/kobol/helios64/sys_otp.h
new file mode 100644
index 00000000..61f6f3b3
index 0000000000..61f6f3b380
--- /dev/null
+++ b/board/kobol/helios64/sys_otp.h
@@ -0,0 +1,10 @@
@@ -2025,7 +2015,7 @@ index 00000000..61f6f3b3
+#endif
diff --git a/configs/helios64-rk3399_defconfig b/configs/helios64-rk3399_defconfig
new file mode 100644
index 00000000..62210055
index 0000000000..12f2dc0c40
--- /dev/null
+++ b/configs/helios64-rk3399_defconfig
@@ -0,0 +1,147 @@
@@ -2178,7 +2168,7 @@ index 00000000..62210055
+CONFIG_HEXDUMP=y
diff --git a/include/configs/helios64.h b/include/configs/helios64.h
new file mode 100644
index 00000000..6fca9a6b
index 0000000000..6fca9a6be0
--- /dev/null
+++ b/include/configs/helios64.h
@@ -0,0 +1,47 @@
@@ -2229,6 +2219,6 @@ index 00000000..6fca9a6b
+#endif
+
+#endif
--
Created with Armbian build tools https://github.com/armbian/build
--
Armbian

87
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-nanopi-m4v2.patch
View File

@@ -1,18 +1,90 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Thu, 28 Nov 2019 22:29:54 +0000
Subject: [ARCHEOLOGY] Initial addition of NanoPi M4V2
> X-Git-Archeology: - Revision c4eecbcef0d4dc499baf0155449e71dc774bc7c4: https://github.com/armbian/build/commit/c4eecbcef0d4dc499baf0155449e71dc774bc7c4
> X-Git-Archeology: Date: Thu, 28 Nov 2019 22:29:54 +0000
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Initial addition of NanoPi M4V2
> X-Git-Archeology:
> X-Git-Archeology: - Revision 83cf87922b93cb27e03a59e6c4121c7d99bb41c4: https://github.com/armbian/build/commit/83cf87922b93cb27e03a59e6c4121c7d99bb41c4
> X-Git-Archeology: Date: Fri, 07 Feb 2020 22:21:01 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: FDT file configurable per board
> X-Git-Archeology:
> X-Git-Archeology: - Revision 75d0f64e3d75e7c34466871b9723ef1a238609d8: https://github.com/armbian/build/commit/75d0f64e3d75e7c34466871b9723ef1a238609d8
> X-Git-Archeology: Date: Fri, 17 Apr 2020 21:30:37 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rk3399 to u-boot v2020.04 (#1873)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 88a585a3fe56bf9eb8c1df8993fe34830597ca77: https://github.com/armbian/build/commit/88a585a3fe56bf9eb8c1df8993fe34830597ca77
> X-Git-Archeology: Date: Sat, 18 Jul 2020 00:06:01 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Update mainline u-boot for rockchip64 / rk3399 to v2020.07 (#2086)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6e4078974bcf69c5e49bb78b920d52d62dc29f6b: https://github.com/armbian/build/commit/6e4078974bcf69c5e49bb78b920d52d62dc29f6b
> X-Git-Archeology: Date: Sun, 19 Jul 2020 00:07:03 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Adjusted patches for rockchip64 mainline u-boot (fuzzines, upstreamed file)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2: https://github.com/armbian/build/commit/2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2
> X-Git-Archeology: Date: Mon, 04 Jan 2021 01:02:20 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64/rk3399 to u-boot v2020.10 (#2512)
> X-Git-Archeology:
> X-Git-Archeology: - Revision a6ee913fae3afc7ae74bb1fdaf1f571ec30493ac: https://github.com/armbian/build/commit/a6ee913fae3afc7ae74bb1fdaf1f571ec30493ac
> X-Git-Archeology: Date: Tue, 02 Mar 2021 21:07:22 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: NanoPi M4V2 stability fix for current and dev (#2663)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0: https://github.com/armbian/build/commit/71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0
> X-Git-Archeology: Date: Thu, 11 Nov 2021 23:49:52 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2021.07 (#3233)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi | 31 ++++
arch/arm/dts/rk3399-nanopi-m4v2.dts | 77 +++++++++
configs/nanopi-m4v2-rk3399_defconfig | 79 ++++++++++
4 files changed, 188 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 9900b442..afa9ec81 100644
index 67b3257902..42fe9f7411 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -128,6 +128,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
@@ -148,6 +148,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-m4.dtb \
rk3399-nanopi-m4-2gb.dtb \
rk3399-nanopi-m4b.dtb \
+ rk3399-nanopi-m4v2.dtb \
rk3399-nanopi-neo4.dtb \
rk3399-nanopi-r4s.dtb \
rk3399-orangepi.dtb \
rk3399-pinebook-pro.dtb \
diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi
new file mode 100644
index 00000000..4b775f6d
index 0000000000..2e3dba00c7
--- /dev/null
+++ b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi
@@ -0,0 +1,31 @@
@@ -49,7 +121,7 @@ index 00000000..4b775f6d
+};
diff --git a/arch/arm/dts/rk3399-nanopi-m4v2.dts b/arch/arm/dts/rk3399-nanopi-m4v2.dts
new file mode 100644
index 00000000..eac77f2a
index 0000000000..81d245e48d
--- /dev/null
+++ b/arch/arm/dts/rk3399-nanopi-m4v2.dts
@@ -0,0 +1,77 @@
@@ -132,7 +204,7 @@ index 00000000..eac77f2a
+};
diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig
new file mode 100644
index 00000000..dd26f73d
index 0000000000..e8a8a5fe44
--- /dev/null
+++ b/configs/nanopi-m4v2-rk3399_defconfig
@@ -0,0 +1,79 @@
@@ -215,3 +287,6 @@ index 00000000..dd26f73d
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
--
Armbian

78
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-orangepi-4.patch
View File

@@ -1,10 +1,73 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Fri, 24 Jan 2020 14:21:27 +0100
Subject: [ARCHEOLOGY] OrangePi 4 preliminary support (kernel dt from NanoPi
M4)
> X-Git-Archeology: - Revision a22b07948a898485db733189edea0f1e4b753071: https://github.com/armbian/build/commit/a22b07948a898485db733189edea0f1e4b753071
> X-Git-Archeology: Date: Fri, 24 Jan 2020 14:21:27 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: OrangePi 4 preliminary support (kernel dt from NanoPi M4)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e4be7bcfd8dcc556ea38b0b286e4d8ba0c8c5881: https://github.com/armbian/build/commit/e4be7bcfd8dcc556ea38b0b286e4d8ba0c8c5881
> X-Git-Archeology: Date: Fri, 24 Jan 2020 19:17:26 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: OrangePi 4 preliminary support (fixed default FDT file name)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 75d0f64e3d75e7c34466871b9723ef1a238609d8: https://github.com/armbian/build/commit/75d0f64e3d75e7c34466871b9723ef1a238609d8
> X-Git-Archeology: Date: Fri, 17 Apr 2020 21:30:37 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rk3399 to u-boot v2020.04 (#1873)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 88a585a3fe56bf9eb8c1df8993fe34830597ca77: https://github.com/armbian/build/commit/88a585a3fe56bf9eb8c1df8993fe34830597ca77
> X-Git-Archeology: Date: Sat, 18 Jul 2020 00:06:01 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Update mainline u-boot for rockchip64 / rk3399 to v2020.07 (#2086)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6e4078974bcf69c5e49bb78b920d52d62dc29f6b: https://github.com/armbian/build/commit/6e4078974bcf69c5e49bb78b920d52d62dc29f6b
> X-Git-Archeology: Date: Sun, 19 Jul 2020 00:07:03 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Adjusted patches for rockchip64 mainline u-boot (fuzzines, upstreamed file)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 3ce107f35826cc51a42d24d0140f8f27325b46c9: https://github.com/armbian/build/commit/3ce107f35826cc51a42d24d0140f8f27325b46c9
> X-Git-Archeology: Date: Sun, 24 Jan 2021 21:24:06 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Disable excessive logging for OrangePi 4 in u-boot
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3399-orangepi-4-u-boot.dtsi | 13 +
arch/arm/dts/rk3399-orangepi-4.dts | 206 ++++++++++
configs/orangepi-4-rk3399_defconfig | 79 ++++
4 files changed, 299 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 0ba45ff7..530d60bf 100644
index 42fe9f7411..8d6b9b462b 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -132,6 +132,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-m4v2.dtb \
@@ -152,6 +152,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-neo4.dtb \
rk3399-nanopi-r4s.dtb \
rk3399-orangepi.dtb \
+ rk3399-orangepi-4.dtb \
rk3399-pinebook-pro.dtb \
@@ -12,7 +75,7 @@ index 0ba45ff7..530d60bf 100644
rk3399-roc-pc.dtb \
diff --git a/arch/arm/dts/rk3399-orangepi-4-u-boot.dtsi b/arch/arm/dts/rk3399-orangepi-4-u-boot.dtsi
new file mode 100644
index 00000000..5bd86966
index 0000000000..5bd8696666
--- /dev/null
+++ b/arch/arm/dts/rk3399-orangepi-4-u-boot.dtsi
@@ -0,0 +1,13 @@
@@ -31,7 +94,7 @@ index 00000000..5bd86966
+};
diff --git a/arch/arm/dts/rk3399-orangepi-4.dts b/arch/arm/dts/rk3399-orangepi-4.dts
new file mode 100644
index 00000000..65e9c44b
index 0000000000..65e9c44b7c
--- /dev/null
+++ b/arch/arm/dts/rk3399-orangepi-4.dts
@@ -0,0 +1,206 @@
@@ -243,7 +306,7 @@ index 00000000..65e9c44b
+};
diff --git a/configs/orangepi-4-rk3399_defconfig b/configs/orangepi-4-rk3399_defconfig
new file mode 100644
index 00000000..18ec369f
index 0000000000..57a07a2a9f
--- /dev/null
+++ b/configs/orangepi-4-rk3399_defconfig
@@ -0,0 +1,79 @@
@@ -326,3 +389,6 @@ index 00000000..18ec369f
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
--
Armbian

103
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-orangepi-r1-plus-0.patch
View File

@@ -1,8 +1,96 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Sat, 20 Jun 2020 22:39:57 +0200
Subject: [ARCHEOLOGY] Initial ROCK Pi E support (as WIP) (#2042)
> X-Git-Archeology: > recovered message: > * WIP: Adding RockpiE config
> X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: > recovered message: > * Mainline u-boot for ROCK Pi E
> X-Git-Archeology: > recovered message: > * Initial ROCK Pi E device tree in kernel
> X-Git-Archeology: > recovered message: > * Fixed supplies for ROCK Pi E device tree
> X-Git-Archeology: > recovered message: > * Adjusted u-boot load address for rockchip64 boards with 256MB eg. ROCK Pi E
> X-Git-Archeology: > recovered message: > * Blacklisted lima on ROCK Pi E
> X-Git-Archeology: > recovered message: > * Fixed ROCK Pi E patch after merge from master
> X-Git-Archeology: > recovered message: > * Removed mode settings from rk805 regulators
> X-Git-Archeology: > recovered message: > * Fixed issues with offloading for gigabit interface of RockPi E
> X-Git-Archeology: > recovered message: > * Adjusted ROCK Pi E board config
> X-Git-Archeology: > recovered message: > * Added dev branch for ROCK Pi E
> X-Git-Archeology: > recovered message: > * Add build targets
> X-Git-Archeology: > recovered message: > Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: > recovered message: > * Exchange legacy to current in ROCK Pi E build targets
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision e1ecb098330dc372740371dc2386f911833a0529: https://github.com/armbian/build/commit/e1ecb098330dc372740371dc2386f911833a0529
> X-Git-Archeology: Date: Sat, 20 Jun 2020 22:39:57 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Initial ROCK Pi E support (as WIP) (#2042)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 72257bd0648c28fca32962126bb885a4a2c188cc: https://github.com/armbian/build/commit/72257bd0648c28fca32962126bb885a4a2c188cc
> X-Git-Archeology: Date: Tue, 23 Jun 2020 16:37:54 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Make USB3 support of ROCK Pi E on par with other rk3328 boards (#2050)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e36ce875b025e112127cf8cc2d34825ebfe36569: https://github.com/armbian/build/commit/e36ce875b025e112127cf8cc2d34825ebfe36569
> X-Git-Archeology: Date: Tue, 10 Nov 2020 21:43:13 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64-current to linux 5.9.y (#2309)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ccbc888b3f5731790128684959b55b6552e26190: https://github.com/armbian/build/commit/ccbc888b3f5731790128684959b55b6552e26190
> X-Git-Archeology: Date: Sat, 28 Nov 2020 16:52:34 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add dts rk3328-roc-pc, fix WIFI and USB 3.0 rk3328 (#2390)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 25bd76527e1276c4c00829f68c0ca0742ecc94c1: https://github.com/armbian/build/commit/25bd76527e1276c4c00829f68c0ca0742ecc94c1
> X-Git-Archeology: Date: Sat, 28 Nov 2020 18:10:53 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Fix roc-rk3328-pc device tree reference to missing RK_FUNC_1
> X-Git-Archeology:
> X-Git-Archeology: - Revision dfd5cf9692e97774f7f0bfd72227144e36f58070: https://github.com/armbian/build/commit/dfd5cf9692e97774f7f0bfd72227144e36f58070
> X-Git-Archeology: Date: Sun, 13 Dec 2020 22:13:03 -0500
> X-Git-Archeology: From: tonymac32 <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: [ rockchip64 ] Clean up patchset
> X-Git-Archeology:
> X-Git-Archeology: - Revision 25e0f1633467c020f6ae68d09964a522fbfbe613: https://github.com/armbian/build/commit/25e0f1633467c020f6ae68d09964a522fbfbe613
> X-Git-Archeology: Date: Mon, 18 Jan 2021 23:21:40 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Adjusted power and pmic configuration for Station M1 in current/dev
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision d8dbefd61838e5b0cfc2b93d2d168f3fb2666dfb: https://github.com/armbian/build/commit/d8dbefd61838e5b0cfc2b93d2d168f3fb2666dfb
> X-Git-Archeology: Date: Tue, 27 Jul 2021 00:05:09 -0400
> X-Git-Archeology: From: tonymac32 <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: [ rockchip64 ] rk3328 change to mainline USB3
> X-Git-Archeology:
> X-Git-Archeology: - Revision a16699260fb786a4d89a1c335722e9fed49d19d2: https://github.com/armbian/build/commit/a16699260fb786a4d89a1c335722e9fed49d19d2
> X-Git-Archeology: Date: Fri, 08 Jul 2022 22:35:59 +1200
> X-Git-Archeology: From: schwar3kat <61094841+schwar3kat@users.noreply.github.com>
> X-Git-Archeology: Subject: Refactored orangepi-r1plus-lts dts in kernel add board patch
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8648dde23ff090b5fb704adab036ed14cd944ba3: https://github.com/armbian/build/commit/8648dde23ff090b5fb704adab036ed14cd944ba3
> X-Git-Archeology: Date: Thu, 22 Sep 2022 10:25:28 +0200
> X-Git-Archeology: From: aiamadeus <42570690+aiamadeus@users.noreply.github.com>
> X-Git-Archeology: Subject: rockchip: fixes support for orangepi-r1plus (#4215)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 38 +
arch/arm/dts/rk3328-orangepi-r1-plus.dts | 366 ++++++++++
configs/orangepi_r1_plus_rk3328_defconfig | 101 +++
4 files changed, 506 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 06ccc03e..a2657ebe 100644
index 8d6b9b462b..261aa8fb58 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -109,6 +109,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
@@ -122,6 +122,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
rk3328-evb.dtb \
rk3328-nanopi-r2s.dtb \
@@ -12,7 +100,7 @@ index 06ccc03e..a2657ebe 100644
rk3328-rock-pi-e.dtb
diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
new file mode 100644
index 00000000..cf3452ea
index 0000000000..477cd37e1e
--- /dev/null
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
@@ -0,0 +1,38 @@
@@ -56,7 +144,7 @@ index 00000000..cf3452ea
+};
diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus.dts b/arch/arm/dts/rk3328-orangepi-r1-plus.dts
new file mode 100644
index 00000000..23023ad0
index 0000000000..5a323ae3b3
--- /dev/null
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus.dts
@@ -0,0 +1,366 @@
@@ -428,7 +516,9 @@ index 00000000..23023ad0
+};
diff --git a/configs/orangepi_r1_plus_rk3328_defconfig b/configs/orangepi_r1_plus_rk3328_defconfig
new file mode 100644
index 00000000..ddbe9715
index 0000000000..b5a5333e46
--- /dev/null
+++ b/configs/orangepi_r1_plus_rk3328_defconfig
@@ -0,0 +1,101 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
@@ -531,3 +621,6 @@ index 00000000..ddbe9715
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_TPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
--
Armbian

116
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-orangepi-r1-plus-lts.patch
View File

@@ -1,23 +1,98 @@
From: schwar3kat <61094841+schwar3kat@users.noreply.github.com>
Date: Wed, 08 Jun 2022 13:47:03 +1300
Subject: Add u-boot support rk3328-orangepi-r1-plus
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Mon, 9 Mar 2020 00:03:27 +0100
Subject: [ARCHEOLOGY] WIP: Add initial support for FriendlyARM Nanopi R2S
(#1793)
Signed-off-by: schwar3kat <61094841+schwar3kat@users.noreply.github.com>
> X-Git-Archeology: > recovered message: > * Add initial support for FriendlyARM Nanopi R2s
> X-Git-Archeology: > recovered message: > One net port not working yet.
> X-Git-Archeology: > recovered message: > * Enable 2nd network, rename it to lan0, adjust motd to see lan*
> X-Git-Archeology: > recovered message: > * Added rk3328 dmc devfreq driver
> X-Git-Archeology: > recovered message: > * Fixed SD card issues for NanoPi R2s
> X-Git-Archeology: > recovered message: > * Added usb serial gadget console for NanoPi R2s
> X-Git-Archeology: > recovered message: > Co-authored-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision a0e009a73e06511ef25b948306dfe553c3cde70e: https://github.com/armbian/build/commit/a0e009a73e06511ef25b948306dfe553c3cde70e
> X-Git-Archeology: Date: Mon, 09 Mar 2020 00:03:27 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: WIP: Add initial support for FriendlyARM Nanopi R2S (#1793)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 7efb5014a2afc174e8c55c92d0f0d746be3a9496: https://github.com/armbian/build/commit/7efb5014a2afc174e8c55c92d0f0d746be3a9496
> X-Git-Archeology: Date: Tue, 26 May 2020 22:20:31 +0200
> X-Git-Archeology: From: Jayantajit Gogoi <30702133+jayanta525@users.noreply.github.com>
> X-Git-Archeology: Subject: Enable vcc_sd regulator on boot for NanoPi R2S (#1990)
> X-Git-Archeology:
> X-Git-Archeology: - Revision e36ce875b025e112127cf8cc2d34825ebfe36569: https://github.com/armbian/build/commit/e36ce875b025e112127cf8cc2d34825ebfe36569
> X-Git-Archeology: Date: Tue, 10 Nov 2020 21:43:13 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64-current to linux 5.9.y (#2309)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 18cf7aff702832cf672117f5dc1fe4ad37598837: https://github.com/armbian/build/commit/18cf7aff702832cf672117f5dc1fe4ad37598837
> X-Git-Archeology: Date: Tue, 05 Jan 2021 23:35:03 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Consolidate all dts Makefile changes in a single patch in rockchip64-current (#2535)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 05a72b8954e932089d4867b55da0d353dc4ba1ac: https://github.com/armbian/build/commit/05a72b8954e932089d4867b55da0d353dc4ba1ac
> X-Git-Archeology: Date: Mon, 12 Apr 2021 22:32:21 +0200
> X-Git-Archeology: From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
> X-Git-Archeology: Subject: rockchip: add Orange Pi R1 Plus support (#2755)
> X-Git-Archeology:
> X-Git-Archeology: - Revision d8dbefd61838e5b0cfc2b93d2d168f3fb2666dfb: https://github.com/armbian/build/commit/d8dbefd61838e5b0cfc2b93d2d168f3fb2666dfb
> X-Git-Archeology: Date: Tue, 27 Jul 2021 00:05:09 -0400
> X-Git-Archeology: From: tonymac32 <tonymckahan@gmail.com>
> X-Git-Archeology: Subject: [ rockchip64 ] rk3328 change to mainline USB3
> X-Git-Archeology:
> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
> X-Git-Archeology: Date: Tue, 09 Nov 2021 18:06:34 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 29335b0c99aae81a37d94dc65ad617224e89fbe8: https://github.com/armbian/build/commit/29335b0c99aae81a37d94dc65ad617224e89fbe8
> X-Git-Archeology: Date: Thu, 11 Nov 2021 22:31:07 +0100
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rk3328: dmc driver fixes:
> X-Git-Archeology:
> X-Git-Archeology: - Revision 6ff15fe54f0423267ef464927e3780bc47703eed: https://github.com/armbian/build/commit/6ff15fe54f0423267ef464927e3780bc47703eed
> X-Git-Archeology: Date: Sat, 26 Feb 2022 15:03:33 +0100
> X-Git-Archeology: From: schwar3kat <61094841+schwar3kat@users.noreply.github.com>
> X-Git-Archeology: Subject: Add orangepi r1 plus lts (#3514)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 4df997bcf1027ac25eedce0a46cbde528dff20d1: https://github.com/armbian/build/commit/4df997bcf1027ac25eedce0a46cbde528dff20d1
> X-Git-Archeology: Date: Sat, 25 Jun 2022 13:40:09 +1200
> X-Git-Archeology: From: schwar3kat <61094841+schwar3kat@users.noreply.github.com>
> X-Git-Archeology: Subject: Refactored dts for orangepi-r1-lts
> X-Git-Archeology:
> X-Git-Archeology: - Revision f99b356ff47757f59bee370a6c2b0329b0a028e6: https://github.com/armbian/build/commit/f99b356ff47757f59bee370a6c2b0329b0a028e6
> X-Git-Archeology: Date: Fri, 14 Oct 2022 09:19:50 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump Rockchip64 u-boot to 2022.07 (#4246)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 607 ++++++++++++++++++
configs/orangepi_r1_plus_lts_rk3328_defconfig | 95 +++
drivers/net/phy/phy.c | 9 +
3 files changed, 716 insertions(+)
create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
create mode 100644 configs/orangepi_r1_plus_lts_rk3328_defconfig
arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 607 ++++++++++
configs/orangepi_r1_plus_lts_rk3328_defconfig | 99 ++
drivers/net/phy/phy.c | 6 +
4 files changed, 713 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index becf5c9d..bc6f8b09 100644
index 261aa8fb58..ce5f8c27c5 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -110,7 +110,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
@@ -123,6 +123,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3328) += \
rk3328-evb.dtb \
rk3328-nanopi-r2s.dtb \
rk3328-orangepi-r1-plus.dtb \
@@ -27,7 +102,7 @@ index becf5c9d..bc6f8b09 100644
rk3328-rock-pi-e.dtb
diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts b/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
new file mode 100644
index 00000000..3a446b4e
index 0000000000..08c90d695b
--- /dev/null
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts
@@ -0,0 +1,607 @@
@@ -638,10 +713,9 @@ index 00000000..3a446b4e
+&uart1 {
+ status = "okay";
+};
+
diff --git a/configs/orangepi_r1_plus_lts_rk3328_defconfig b/configs/orangepi_r1_plus_lts_rk3328_defconfig
new file mode 100644
index 000000000..627797f91
index 0000000000..6ed17d82bc
--- /dev/null
+++ b/configs/orangepi_r1_plus_lts_rk3328_defconfig
@@ -0,0 +1,99 @@
@@ -745,10 +819,10 @@ index 000000000..627797f91
+CONFIG_ERRNO_STR=y
+CONFIG_SMBIOS_MANUFACTURER="rockchip64"
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ed197fa4..6a14eada 100644
index c9fc20855b..801eeddbf7 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -639,6 +642,8 @@ static struct phy_driver *generic_for_interface(phy_interface_t interface)
@@ -642,6 +642,8 @@ static struct phy_driver *generic_for_interface(phy_interface_t interface)
return &genphy_driver;
}
@@ -757,7 +831,7 @@ index ed197fa4..6a14eada 100644
static struct phy_driver *get_phy_driver(struct phy_device *phydev,
phy_interface_t interface)
{
@@ -646,6 +651,10 @@ static struct phy_driver *get_phy_driver(struct phy_device *phydev,
@@ -649,6 +651,10 @@ static struct phy_driver *get_phy_driver(struct phy_device *phydev,
int phy_id = phydev->phy_id;
struct phy_driver *drv = NULL;
@@ -768,6 +842,6 @@ index ed197fa4..6a14eada 100644
list_for_each(entry, &phy_drivers) {
drv = list_entry(entry, struct phy_driver, list);
if ((drv->uid & drv->mask) == (phy_id & drv->mask))
--
Armbian

65
patch/u-boot/u-boot-rockchip64-v2022.04/add-board-rock-pi-s.patch
View File

@@ -1,6 +1,41 @@
--- a/arch/arm/dts/Makefile 2020-12-25 15:14:09.980329455 +0200
+++ b/arch/arm/dts/Makefile 2020-12-25 15:14:47.952271432 +0200
@@ -106,7 +106,8 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
Date: Thu, 10 Jun 2021 11:58:00 +0200
Subject: [ARCHEOLOGY] Fix mainline kernel boot on Rockpi S (#2823)
> X-Git-Archeology: > recovered message: > https://armbian.atlassian.net/browse/AR-785
> X-Git-Archeology: - Revision 17b3da0a44d70b42c391f7c93f0683e2901486c9: https://github.com/armbian/build/commit/17b3da0a44d70b42c391f7c93f0683e2901486c9
> X-Git-Archeology: Date: Thu, 10 Jun 2021 11:58:00 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Fix mainline kernel boot on Rockpi S (#2823)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 3 +-
arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 17 +
arch/arm/dts/rk3308-rock-pi-s.dts | 215 ++++++++++
configs/rock-pi-s-rk3308_defconfig | 105 +++++
4 files changed, 339 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index ce5f8c27c5..4cad0dfc9c 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -117,7 +117,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
dtb-$(CONFIG_ROCKCHIP_RK3308) += \
rk3308-evb.dtb \
@@ -10,8 +45,11 @@
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
rk3328-evb.dtb \
--- /dev/null 2020-12-23 11:47:50.044000030 +0200
+++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi 2020-12-25 15:00:18.561552517 +0200
diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
new file mode 100644
index 0000000000..40bb917ba9
--- /dev/null
+++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
@@ -30,8 +68,11 @@
+ clock-frequency = <24000000>;
+ status = "okay";
+};
--- /dev/null 2020-12-23 11:47:50.044000030 +0200
+++ b/arch/arm/dts/rk3308-rock-pi-s.dts 2020-12-25 15:53:15.775897762 +0200
diff --git a/arch/arm/dts/rk3308-rock-pi-s.dts b/arch/arm/dts/rk3308-rock-pi-s.dts
new file mode 100644
index 0000000000..678e7d704f
--- /dev/null
+++ b/arch/arm/dts/rk3308-rock-pi-s.dts
@@ -0,0 +1,215 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
@@ -248,8 +289,11 @@
+ pinctrl-0 = <&uart4_xfer &uart4_rts &uart4_cts>;
+ status = "okay";
+};
--- /dev/null 2020-12-23 11:47:50.044000030 +0200
+++ b/configs/rock-pi-s-rk3308_defconfig 2020-12-25 17:35:28.269897086 +0200
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
new file mode 100644
index 0000000000..2b4ab51d23
--- /dev/null
+++ b/configs/rock-pi-s-rk3308_defconfig
@@ -0,0 +1,105 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
@@ -356,3 +400,6 @@
+CONFIG_LZO=y
+CONFIG_ERRNO_STR=y
+# CONFIG_EFI_LOADER is not set
--
Armbian

54
patch/u-boot/u-boot-rockchip64-v2022.04/add-trust-ini.patch
View File

@@ -1,6 +1,55 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Wed, 16 Aug 2017 20:17:57 +0300
Subject: [ARCHEOLOGY] [WIP] Initial Rock64 support
> X-Git-Archeology: - Revision 43b3beed8b35cf4ea325068cf5a07dcfd33d98ec: https://github.com/armbian/build/commit/43b3beed8b35cf4ea325068cf5a07dcfd33d98ec
> X-Git-Archeology: Date: Wed, 16 Aug 2017 20:17:57 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: [WIP] Initial Rock64 support
> X-Git-Archeology:
> X-Git-Archeology: - Revision 9531d1bc7ecd0f468e29e402ba00cbc7b7dd683f: https://github.com/armbian/build/commit/9531d1bc7ecd0f468e29e402ba00cbc7b7dd683f
> X-Git-Archeology: Date: Sat, 20 Jan 2018 18:58:33 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Fix rk3328 ATF build configuration
> X-Git-Archeology:
> X-Git-Archeology: - Revision 518ef98107a6705ba6649acdb1481cafedc9766d: https://github.com/armbian/build/commit/518ef98107a6705ba6649acdb1481cafedc9766d
> X-Git-Archeology: Date: Fri, 16 Feb 2018 19:29:22 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: RK3399. More fixes but Odroid N1 refuses to boot :( ... ATF builds now (after apt install gcc-arm-none-eabi ?). Tested building/booting with 4-byte skip and u-boot with and without loading address. Enough for today.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 8ce464f04930dc1589b7df6efdaa82c180e3c9b8: https://github.com/armbian/build/commit/8ce464f04930dc1589b7df6efdaa82c180e3c9b8
> X-Git-Archeology: Date: Wed, 06 Nov 2019 18:33:43 +0000
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Rock Pi 4A fixed build with correct add-trust-ini.patch
> X-Git-Archeology:
> X-Git-Archeology: - Revision 91f2700eea18d9886fefa69d54bbbef44682083d: https://github.com/armbian/build/commit/91f2700eea18d9886fefa69d54bbbef44682083d
> X-Git-Archeology: Date: Wed, 06 May 2020 23:45:09 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Fixes and cleanups after rockchip64 preparation for mainline u-boot (#1945)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1c75b8fb91fccb8d58600ff18113ed04017fe3cb: https://github.com/armbian/build/commit/1c75b8fb91fccb8d58600ff18113ed04017fe3cb
> X-Git-Archeology: Date: Fri, 12 Nov 2021 07:22:10 +0100
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Fix broken u-boot compilation on Rockpi S
> X-Git-Archeology:
> X-Git-Archeology: - Revision de26797423e22d58ec2882d7032c67f77196ecc5: https://github.com/armbian/build/commit/de26797423e22d58ec2882d7032c67f77196ecc5
> X-Git-Archeology: Date: Sun, 06 Nov 2022 20:32:46 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move all legacy u-boot patches under one general legacy folder (#4386)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
trust.ini | 15 ++++++++++
1 file changed, 15 insertions(+)
diff --git a/trust.ini b/trust.ini
new file mode 100644
index 0000000..4af021a
index 0000000000..8cd7b97683
--- /dev/null
+++ b/trust.ini
@@ -0,0 +1,15 @@
@@ -19,3 +68,6 @@ index 0000000..4af021a
+SEC=0
+[OUTPUT]
+PATH=trust.bin
--
Armbian

32
patch/u-boot/u-boot-rockchip64-v2022.04/board-nanopi-r4se.patch
View File

@@ -1,18 +1,35 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bochun Bai <bbc@dongxi.ca>
Date: Mon, 15 May 2023 17:33:03 +0200
Subject: [ARCHEOLOGY] add support for NanoPi R4SE
> X-Git-Archeology: - Revision 3cb92f620433d4f90f40dd66edbb98bc0b88b55d: https://github.com/armbian/build/commit/3cb92f620433d4f90f40dd66edbb98bc0b88b55d
> X-Git-Archeology: Date: Mon, 15 May 2023 17:33:03 +0200
> X-Git-Archeology: From: Bochun Bai <bbc@dongxi.ca>
> X-Git-Archeology: Subject: add support for NanoPi R4SE
> X-Git-Archeology:
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi | 16 +++
arch/arm/dts/rk3399-nanopi-r4se.dts | 29 +++++
configs/nanopi-r4se-rk3399_defconfig | 64 ++++++++++
4 files changed, 110 insertions(+)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 644ba961..11dcac8f 100644
index 4cad0dfc9c..11dcac8fea 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -154,6 +154,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-m4b.dtb \
rk3399-nanopi-m4v2.dtb \
rk3399-nanopi-neo4.dtb \
rk3399-nanopi-r4s.dtb \
+ rk3399-nanopi-r4se.dtb \
rk3399-orangepi.dtb \
rk3399-orangepi-4.dtb \
rk3399-pinebook-pro.dtb \
rk3399-puma-haikou.dtb \
diff --git a/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi
new file mode 100644
index 00000000..cd164252
index 0000000000..cd1642527b
--- /dev/null
+++ b/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi
@@ -0,0 +1,16 @@
@@ -34,7 +51,7 @@ index 00000000..cd164252
+#include "rk3399-sdram-lpddr4-100.dtsi"
diff --git a/arch/arm/dts/rk3399-nanopi-r4se.dts b/arch/arm/dts/rk3399-nanopi-r4se.dts
new file mode 100755
index 00000000..19e12eaf
index 0000000000..fdb275019d
--- /dev/null
+++ b/arch/arm/dts/rk3399-nanopi-r4se.dts
@@ -0,0 +1,29 @@
@@ -69,7 +86,7 @@ index 00000000..19e12eaf
+};
diff --git a/configs/nanopi-r4se-rk3399_defconfig b/configs/nanopi-r4se-rk3399_defconfig
new file mode 100644
index 00000000..7d176ce2
index 0000000000..2155559abb
--- /dev/null
+++ b/configs/nanopi-r4se-rk3399_defconfig
@@ -0,0 +1,64 @@
@@ -137,3 +154,6 @@ index 00000000..7d176ce2
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
--
Armbian

18
patch/u-boot/u-boot-rockchip64-v2022.04/board-pinebook-pro-0001-usb-regulator.patch
View File

@@ -1,17 +1,17 @@
From 6ad924ab3b6b2a4d8c73a9871d0e94245cce6fcf Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sat, 20 Jun 2020 01:41:22 +0200
Subject: [PATCH 1/3] Add regulator needed for usage of USB
Subject: Add regulator needed for usage of USB
---
arch/arm/dts/rk3399-pinebook-pro.dts | 21 +++++++++++++++++++--
arch/arm/dts/rk3399-pinebook-pro.dts | 21 +++++++++-
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
index 294d21bf45..6214887a1c 100644
index 2b5f001ff4..05aa7ce0ff 100644
--- a/arch/arm/dts/rk3399-pinebook-pro.dts
+++ b/arch/arm/dts/rk3399-pinebook-pro.dts
@@ -207,6 +207,16 @@
@@ -220,6 +220,16 @@
};
};
@@ -28,7 +28,7 @@ index 294d21bf45..6214887a1c 100644
/* 5 V USB power supply */
vcc5v0_usb: pa_5v: vcc5v0-usb-regulator {
compatible = "regulator-fixed";
@@ -610,8 +620,8 @@
@@ -623,8 +633,8 @@
};
};
@@ -39,7 +39,7 @@ index 294d21bf45..6214887a1c 100644
regulator-always-on;
regulator-boot-on;
@@ -872,6 +882,11 @@
@@ -902,6 +912,11 @@
rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -51,7 +51,7 @@ index 294d21bf45..6214887a1c 100644
vcc5v0_host_en_pin: vcc5v0-host-en-pin {
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -1054,10 +1069,12 @@
@@ -1084,10 +1099,12 @@
};
&usb_host1_ehci {
@@ -65,5 +65,5 @@ index 294d21bf45..6214887a1c 100644
};
--
2.27.0
Armbian

18
patch/u-boot/u-boot-rockchip64-v2022.04/board-pinebook-pro-0002-light-up-leds.patch
View File

@@ -1,18 +1,18 @@
From 1a01021c9361c4e017cb5b032300f5555c393710 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: dhivael <dhivael.git@eno.space>
Date: Sat, 11 Jan 2020 15:04:46 +0100
Subject: rk3399: light pinebook power and standby leds during early boot
this is a hack, but it works for now.
---
arch/arm/mach-rockchip/rk3399/rk3399.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/rk3399/rk3399.c | 12 ++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 4fda93b152..e24b39486d 100644
index 01a05599cd..8127e95216 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -19,6 +19,8 @@
@@ -20,6 +20,8 @@
#include <asm/arch-rockchip/hardware.h>
#include <linux/bitops.h>
#include <power/regulator.h>
@@ -21,9 +21,9 @@ index 4fda93b152..e24b39486d 100644
DECLARE_GLOBAL_DATA_PTR;
@@ -153,6 +155,16 @@ void board_debug_uart_init(void)
spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 4), GPIO_PULL_NORMAL);
#endif /* CONFIG_TARGET_CHROMEBOOK_BOB */
@@ -157,6 +159,16 @@ void board_debug_uart_init(void)
GPIO_PULL_NORMAL);
}
+#ifdef CONFIG_TARGET_PINEBOOK_PRO_RK3399
+ {
@@ -39,5 +39,5 @@ index 4fda93b152..e24b39486d 100644
rk_clrsetreg(&grf->gpio4c_iomux,
GRF_GPIO4C3_SEL_MASK,
--
2.27.0
Armbian

20
patch/u-boot/u-boot-rockchip64-v2022.04/board-pinebook-pro-0003-spi-flash-support.patch
View File

@@ -1,7 +1,7 @@
From 662f6044341d0435cf238cfa683ec6b8868ecb22 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: pcm720 <pcm720@users.noreply.github.com>
Date: Sun, 28 Jun 2020 21:00:59 +0300
Subject: [PATCH 3/4] support SPI flash boot
Subject: support SPI flash boot
Port dhivael's commit to current upstream
@@ -23,19 +23,19 @@ available, rkdeveloptool, or possibly other methods.
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index 1a2e24d3ef..4a5a0969b5 100644
index 2d87bea933..8263257377 100644
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
@@ -12,7 +12,7 @@
};
@@ -8,7 +8,7 @@
/ {
chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
+ u-boot,spl-boot-order = "same-as-spl", &spiflash, &sdhci, &sdmmc;
};
};
@@ -41,3 +41,7 @@
config {
@@ -45,3 +45,7 @@
&vdd_log {
regulator-init-microvolt = <950000>;
};
@@ -44,10 +44,10 @@ index 1a2e24d3ef..4a5a0969b5 100644
+ u-boot,dm-pre-reloc;
+};
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
index 0c129b9aeb..76e5f36d58 100644
index d7378f5eb3..b8dae24860 100644
--- a/configs/pinebook-pro-rk3399_defconfig
+++ b/configs/pinebook-pro-rk3399_defconfig
@@ -78,3 +78,12 @@ CONFIG_VIDEO_ROCKCHIP=y
@@ -93,3 +93,12 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_EDP=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
@@ -61,5 +61,5 @@ index 0c129b9aeb..76e5f36d58 100644
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
--
2.27.0
Armbian

8
patch/u-boot/u-boot-rockchip64-v2022.04/board-pinebook-pro-0005-panel-reset.patch
View File

@@ -1,7 +1,7 @@
From 352cb7b28bf4a16330f148043e8d10b0141bbfcb Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Arnaud Patard <arnaud.patard@rtp-net.org>
Date: Wed, 8 Jul 2020 21:43:36 -0400
Subject: [PATCH 4/4] PBP: Fix panel reset
Subject: PBP: Fix panel reset
On warm reset, the pinebook pro panel is not working correctly.
The issue is not yet debugged so, for now, this hack seems to be
@@ -17,7 +17,7 @@ Origin: http://people.hupstream.com/~rtp/pbp/20200706/patches/hack-reset.patch
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
index 516292aaa59..ff9c916bcb7 100644
index 516292aaa5..ff9c916bcb 100644
--- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
@@ -7,13 +7,15 @@
@@ -58,5 +58,5 @@ index 516292aaa59..ff9c916bcb7 100644
}
#endif
--
2.25.4
Armbian

10
patch/u-boot/u-boot-rockchip64-v2022.04/board-pinebook-pro-0007-increase-nvme-timeout.patch
View File

@@ -1,7 +1,7 @@
From 656ccd6ac62714b11b163b6eb62370a78c7bc808 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: pcm720 <pcm720@users.noreply.github.com>
Date: Mon, 20 Jul 2020 20:33:26 +0300
Subject: [PATCH] drivers: nvme: address NVMe instability for Pinebook Pro
Subject: drivers: nvme: address NVMe instability for Pinebook Pro
Apparently, some NVMe SSDs on Pinebook Pro don't become ready before timeout specified in drive's CAP register expires.
The workaround is to increase timeout. Tested and confirmed to work on Intel 660p.
@@ -10,10 +10,10 @@ The workaround is to increase timeout. Tested and confirmed to work on Intel 660
1 file changed, 6 insertions(+)
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index fc64d93ab8..138b9f8fbb 100644
index 1d56517e99..5f90d9d608 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -61,6 +61,12 @@ static int nvme_wait_ready(struct nvme_dev *dev, bool enabled)
@@ -35,6 +35,12 @@ static int nvme_wait_ready(struct nvme_dev *dev, bool enabled)
/* Timeout field in the CAP register is in 500 millisecond units */
timeout = NVME_CAP_TIMEOUT(dev->cap) * 500;
@@ -27,5 +27,5 @@ index fc64d93ab8..138b9f8fbb 100644
start = get_timer(0);
while (get_timer(start) < timeout) {
--
2.27.0
Armbian

106
patch/u-boot/u-boot-rockchip64-v2022.04/board-rock-pi-4-enable-spi-flash.patch
View File

@@ -1,8 +1,79 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Sat, 17 Oct 2020 23:38:05 +0200
Subject: [ARCHEOLOGY] Reserve last 32KiB for environment in SPI for ROCK Pi 4
> X-Git-Archeology: - Revision 5d68d4a68e58b402bbf9c14532a27bea241adaa5: https://github.com/armbian/build/commit/5d68d4a68e58b402bbf9c14532a27bea241adaa5
> X-Git-Archeology: Date: Sat, 17 Oct 2020 23:38:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Reserve last 32KiB for environment in SPI for ROCK Pi 4
> X-Git-Archeology:
> X-Git-Archeology: - Revision 20242214ecbc845da2615d757899bb3db8af701f: https://github.com/armbian/build/commit/20242214ecbc845da2615d757899bb3db8af701f
> X-Git-Archeology: Date: Sat, 17 Oct 2020 23:38:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Split ROCK Pi 4 into 4A, 4B and 4C in u-boot (4A uses 4B DT)
> X-Git-Archeology:
> X-Git-Archeology: - Revision c43c4e9cbd08e136c098eabe4c92b465ca377d0c: https://github.com/armbian/build/commit/c43c4e9cbd08e136c098eabe4c92b465ca377d0c
> X-Git-Archeology: Date: Sat, 17 Oct 2020 23:38:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Add SPI flash boot support to rockchip64/rk3399
> X-Git-Archeology:
> X-Git-Archeology: - Revision 20e661846473f946bb003d0df584dfd6cc7fa9d3: https://github.com/armbian/build/commit/20e661846473f946bb003d0df584dfd6cc7fa9d3
> X-Git-Archeology: Date: Sat, 17 Oct 2020 23:38:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enabled SPI flash for ROCK Pi 4
> X-Git-Archeology:
> X-Git-Archeology: - Revision b3ad046d4ce26732342df22a886b7f0f51fe5498: https://github.com/armbian/build/commit/b3ad046d4ce26732342df22a886b7f0f51fe5498
> X-Git-Archeology: Date: Fri, 04 Dec 2020 00:19:05 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable additional SPI flash chips for ROCK Pi 4 in u-boot (#2408)
> X-Git-Archeology:
> X-Git-Archeology: - Revision ef96d0862b82582cef2cb4ad711a169106d18eab: https://github.com/armbian/build/commit/ef96d0862b82582cef2cb4ad711a169106d18eab
> X-Git-Archeology: Date: Fri, 04 Dec 2020 22:21:50 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable additional SPI flash chips for ROCK Pi 4 in u-boot (also for C model)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2: https://github.com/armbian/build/commit/2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2
> X-Git-Archeology: Date: Mon, 04 Jan 2021 01:02:20 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64/rk3399 to u-boot v2020.10 (#2512)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0: https://github.com/armbian/build/commit/71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0
> X-Git-Archeology: Date: Thu, 11 Nov 2021 23:49:52 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2021.07 (#3233)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision f99b356ff47757f59bee370a6c2b0329b0a028e6: https://github.com/armbian/build/commit/f99b356ff47757f59bee370a6c2b0329b0a028e6
> X-Git-Archeology: Date: Fri, 14 Oct 2022 09:19:50 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump Rockchip64 u-boot to 2022.07 (#4246)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 22 +++++++++-
configs/rock-pi-4-rk3399_defconfig | 13 +++++-
configs/rock-pi-4c-rk3399_defconfig | 13 +++++-
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
index c17e769f..30f977db 100644
index c17e769f64..bd8c60b4cd 100644
--- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
@@ -8,7 +7,27 @@
@@ -8,7 +8,27 @@
/ {
chosen {
@@ -32,10 +103,10 @@ index c17e769f..30f977db 100644
};
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
index 764e2b56..11b57434 100644
index 4f15627d59..63d04ced6e 100644
--- a/configs/rock-pi-4-rk3399_defconfig
+++ b/configs/rock-pi-4-rk3399_defconfig
@@ -2,12 +2,16 @@ CONFIG_ARM=y
@@ -3,12 +3,16 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00200000
CONFIG_NR_DRAM_BANKS=1
@@ -50,9 +121,9 @@ index 764e2b56..11b57434 100644
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x800800
# CONFIG_ANDROID_BOOT_IMAGE is not set
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb"
@@ -16,6 +20,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -18,6 +22,7 @@ CONFIG_MISC_INIT_R=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
@@ -60,7 +131,7 @@ index 764e2b56..11b57434 100644
CONFIG_TPL=y
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPT=y
@@ -26,8 +31,9 @@ CONFIG_CMD_USB=y
@@ -28,8 +33,9 @@ CONFIG_CMD_USB=y
CONFIG_CMD_TIME=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
@@ -71,7 +142,7 @@ index 764e2b56..11b57434 100644
CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y
@@ -35,6 +41,10 @@ CONFIG_MMC_DW=y
@@ -38,6 +44,10 @@ CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ROCKCHIP=y
@@ -82,7 +153,7 @@ index 764e2b56..11b57434 100644
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
@@ -50,6 +60,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
@@ -53,6 +63,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
CONFIG_DM_RESET=y
CONFIG_BAUDRATE=1500000
CONFIG_DEBUG_UART_SHIFT=2
@@ -91,10 +162,10 @@ index 764e2b56..11b57434 100644
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig
index 671c0c10..874f4061 100644
index 0381a1ca3f..77c9b9d98f 100644
--- a/configs/rock-pi-4c-rk3399_defconfig
+++ b/configs/rock-pi-4c-rk3399_defconfig
@@ -2,12 +2,16 @@ CONFIG_ARM=y
@@ -3,12 +3,16 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SYS_TEXT_BASE=0x00200000
CONFIG_NR_DRAM_BANKS=1
@@ -109,9 +180,9 @@ index 671c0c10..874f4061 100644
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x800800
# CONFIG_ANDROID_BOOT_IMAGE is not set
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb"
@@ -16,6 +20,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -18,6 +22,7 @@ CONFIG_MISC_INIT_R=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
@@ -119,7 +190,7 @@ index 671c0c10..874f4061 100644
CONFIG_TPL=y
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPT=y
@@ -26,8 +31,9 @@ CONFIG_CMD_USB=y
@@ -28,8 +33,9 @@ CONFIG_CMD_USB=y
CONFIG_CMD_TIME=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
@@ -130,7 +201,7 @@ index 671c0c10..874f4061 100644
CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y
@@ -35,6 +41,10 @@ CONFIG_MMC_DW=y
@@ -38,6 +44,10 @@ CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ROCKCHIP=y
@@ -141,7 +212,7 @@ index 671c0c10..874f4061 100644
CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
@@ -50,6 +60,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
@@ -53,6 +63,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
CONFIG_DM_RESET=y
CONFIG_BAUDRATE=1500000
CONFIG_DEBUG_UART_SHIFT=2
@@ -149,3 +220,6 @@ index 671c0c10..874f4061 100644
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
--
Armbian

48
patch/u-boot/u-boot-rockchip64-v2022.04/board-rockpro64-advanced-recovery.patch
View File

@@ -1,8 +1,47 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Mon, 5 Oct 2020 23:17:55 +0200
Subject: [ARCHEOLOGY] Switched RockPro64 to mainline u-boot (#2218)
> X-Git-Archeology: > recovered message: > * Switched RockPro64 to mainline u-boot
> X-Git-Archeology: > recovered message: > * Enabled rockusb and ums for RockPro64 in mainline u-boot
> X-Git-Archeology: > recovered message: > * Switched RockPro64 u-boot to TPL/SPL/BLOB scenario
> X-Git-Archeology: > recovered message: > * Enabled advanced recovery button support for RockPro64
> X-Git-Archeology: > recovered message: > * Disabled SDR104 mode for RockPro64 in legacy
> X-Git-Archeology: - Revision f2db96252530d2f5585755b518e7fd020b5f0392: https://github.com/armbian/build/commit/f2db96252530d2f5585755b518e7fd020b5f0392
> X-Git-Archeology: Date: Mon, 05 Oct 2020 23:17:55 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched RockPro64 to mainline u-boot (#2218)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 3699d1bb68e29f1745ec214a37120afb0753a682: https://github.com/armbian/build/commit/3699d1bb68e29f1745ec214a37120afb0753a682
> X-Git-Archeology: Date: Sat, 17 Oct 2020 23:39:29 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Configurable rockchip64 advanced u-boot recovery (#2255)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2: https://github.com/armbian/build/commit/2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2
> X-Git-Archeology: Date: Mon, 04 Jan 2021 01:02:20 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64/rk3399 to u-boot v2020.10 (#2512)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
configs/rockpro64-rk3399_defconfig | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
index ad0c6ab2..57e129ac 100644
index d5e98a4f73..3f24728f20 100644
--- a/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-rk3399_defconfig
@@ -24,6 +24,11 @@ CONFIG_CMD_GPT=y
@@ -28,6 +28,11 @@ CONFIG_CMD_GPT=y
CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y
CONFIG_CMD_USB=y
@@ -14,7 +53,7 @@ index ad0c6ab2..57e129ac 100644
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TIME=y
CONFIG_SPL_OF_CONTROL=y
@@ -71,6 +76,10 @@ CONFIG_USB_EHCI_HCD=y
@@ -74,6 +79,10 @@ CONFIG_USB_OHCI_GENERIC=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_KEYBOARD=y
@@ -25,3 +64,6 @@ index ad0c6ab2..57e129ac 100644
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_ASIX88179=y
--
Armbian

50
patch/u-boot/u-boot-rockchip64-v2022.04/board-rockpro64-disable-preboot.patch
View File

@@ -1,13 +1,46 @@
It disables PREBOOT enabled in:
https://github.com/u-boot/u-boot/commit/f81f9f0ebac596bae7f27db095f4f0272b606cc3
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Mon, 4 Jan 2021 01:02:20 +0100
Subject: [ARCHEOLOGY] Switched rockchip64/rk3399 to u-boot v2020.10 (#2512)
Booting with PREBOOT enabled leads to boot hangs at:
"Booting using the fdt blob at 0x1f00000"
Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: > recovered message: > * Switched rockchip64/rk3399 to u-boot v2020.10
> X-Git-Archeology: > recovered message: > * Some tweaks for SPI booting on ROCK Pi 4 in u-boot v2020.10
> X-Git-Archeology: > recovered message: > * Adjusted NanoPi M4V2 config for u-boot v2020.10
> X-Git-Archeology: > recovered message: > * Disabled PREBOOT for RockPro64 in u-boot v2020.10
> X-Git-Archeology: > recovered message: > It breaks boot during fdt loading
> X-Git-Archeology: > recovered message: > * Fix issues with booting from SPI flash for RockPro64
> X-Git-Archeology: > recovered message: > * Moved NanoPi R4S patches to board specific folder
> X-Git-Archeology: - Revision 2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2: https://github.com/armbian/build/commit/2a3c216d4107ddf30abadc6ba3c5707c1fa59ff2
> X-Git-Archeology: Date: Mon, 04 Jan 2021 01:02:20 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64/rk3399 to u-boot v2020.10 (#2512)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision f99b356ff47757f59bee370a6c2b0329b0a028e6: https://github.com/armbian/build/commit/f99b356ff47757f59bee370a6c2b0329b0a028e6
> X-Git-Archeology: Date: Fri, 14 Oct 2022 09:19:50 +0200
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Bump Rockchip64 u-boot to 2022.07 (#4246)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
configs/rockpro64-rk3399_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
index ce1adc53..9fa371c4 100644
index 3f24728f20..9d6d60c669 100644
--- a/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-rk3399_defconfig
@@ -14,7 +14,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
@@ -18,3 +51,6 @@ index ce1adc53..9fa371c4 100644
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_MISC_INIT_R=y
--
Armbian

60
patch/u-boot/u-boot-rockchip64-v2022.04/enable-DT-overlays-support.patch
View File

@@ -1,13 +1,65 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Thu, 17 Aug 2017 20:13:41 +0300
Subject: [ARCHEOLOGY] Enable DT overlay support in rk3328 u-boot
> X-Git-Archeology: - Revision 64f5514ea06c30ecd9be8b3a994c52fddbc0c09e: https://github.com/armbian/build/commit/64f5514ea06c30ecd9be8b3a994c52fddbc0c09e
> X-Git-Archeology: Date: Thu, 17 Aug 2017 20:13:41 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Enable DT overlay support in rk3328 u-boot
> X-Git-Archeology:
> X-Git-Archeology: - Revision 88b43456663d83114a56a0fc21bbb657b85fd0a2: https://github.com/armbian/build/commit/88b43456663d83114a56a0fc21bbb657b85fd0a2
> X-Git-Archeology: Date: Sun, 20 Aug 2017 16:13:47 +0300
> X-Git-Archeology: From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
> X-Git-Archeology: Subject: Update rk3328 patches and config
> X-Git-Archeology:
> X-Git-Archeology: - Revision 41b589372f2c1a8450033db78f3d8ed9db1b2196: https://github.com/armbian/build/commit/41b589372f2c1a8450033db78f3d8ed9db1b2196
> X-Git-Archeology: Date: Sun, 26 Aug 2018 14:14:14 +0200
> X-Git-Archeology: From: Igor Pecovnik <igor.pecovnik@gmail.com>
> X-Git-Archeology: Subject: Creating new family rockchip64. 3288 and 3399 was merged in, except Nanopi which stays in RK3399 family with sources attached to FA repository until we manage to join that in. Enabled Nanopc T4, Nanopi M4, Renegade. Tested on Rock64 and Nanopc T4.
> X-Git-Archeology:
> X-Git-Archeology: - Revision c989a9b205ad4d27900b61b941f3f863a5d112e6: https://github.com/armbian/build/commit/c989a9b205ad4d27900b61b941f3f863a5d112e6
> X-Git-Archeology: Date: Tue, 27 Nov 2018 12:51:39 +0100
> X-Git-Archeology: From: Przemyslaw Sztoch <psztoch@finn.pl>
> X-Git-Archeology: Subject: Repaired broken Rock patch for current Kconfig (patch is not synchronized with current codebase,
> X-Git-Archeology:
> X-Git-Archeology: - Revision b202f8824858c945f56a03999b5e058784789222: https://github.com/armbian/build/commit/b202f8824858c945f56a03999b5e058784789222
> X-Git-Archeology: Date: Tue, 05 Mar 2019 18:20:58 -0500
> X-Git-Archeology: From: Martin Ayotte <martinayotte@yahoo.ca>
> X-Git-Archeology: Subject: add missing overlay in RK3399 U-boot
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1f3fa15..f559fa4 100644
index 4567c183fb..eb479660f5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1358,6 +1358,8 @@ config ARCH_ROCKCHIP
@@ -1926,6 +1926,8 @@ config ARCH_ROCKCHIP
imply SYS_NS16550
imply TPL_SYSRESET
imply USB_FUNCTION_FASTBOOT
+ select OF_LIBFDT
+ select OF_LIBFDT_OVERLAY
config TARGET_THUNDERX_88XX
bool "Support ThunderX 88xx"
config ARCH_OCTEONTX
bool "Support OcteonTX SoCs"
--
Armbian

52
patch/u-boot/u-boot-rockchip64-v2022.04/general-add-xtx-spi-nor-chips.patch
View File

@@ -1,10 +1,35 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Sat, 17 Oct 2020 23:38:05 +0200
Subject: [ARCHEOLOGY] Added XTX spi flash chips to kernel and u-boot
> X-Git-Archeology: - Revision c41cb4c45457012714ad3238f6b901fbf3aa773c: https://github.com/armbian/build/commit/c41cb4c45457012714ad3238f6b901fbf3aa773c
> X-Git-Archeology: Date: Sat, 17 Oct 2020 23:38:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Added XTX spi flash chips to kernel and u-boot
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
drivers/mtd/spi/Kconfig | 6 ++++++
drivers/mtd/spi/spi-nor-ids.c | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 018e8c59..8b0033b8 100644
index f350c7e5dc..ae901b6d87 100644
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -152,6 +152,12 @@ config SPI_FLASH_XMC
Add support for various XMC (Wuhan Xinxin Semiconductor
Manufacturing Corp.) SPI flash chips (XM25xxx)
@@ -202,6 +202,12 @@ config SPI_FLASH_XTX
Add support for various XTX (XTX Technology Limited)
SPI flash chips (XT25xxx).
+config SPI_FLASH_XTX
+ bool "XTX SPI flash support"
@@ -16,18 +41,21 @@ index 018e8c59..8b0033b8 100644
config SPI_FLASH_USE_4K_SECTORS
diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c
index 114ebacd..3526a20b 100644
index 763bab04c6..56b96f7db1 100644
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -319,6 +319,11 @@ const struct flash_info spi_nor_ids[] = {
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ INFO("XM25QH64A", 0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
@@ -378,6 +378,11 @@ const struct flash_info spi_nor_ids[] = {
{ INFO("XM25QH64C", 0x204017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("XM25QH128A", 0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+#endif
#endif
+#ifdef CONFIG_SPI_FLASH_XTX
+ /* XTX (Shenzhen Xin Tian Xia Tech) */
+ { INFO("XT25F32B", 0x0b4016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { INFO("XT25F128B", 0x0b4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
#endif
{ },
};
+#endif
#ifdef CONFIG_SPI_FLASH_XTX
/* XTX Technology (Shenzhen) Limited */
{ INFO("xt25f128b", 0x0b4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
--
Armbian

42
patch/u-boot/u-boot-rockchip64-v2022.04/general-dwc-otg-usb-fix.patch
View File

@@ -1,8 +1,43 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Fri, 12 Mar 2021 20:20:12 +0000
Subject: [ARCHEOLOGY] Changes and fixes to rk322x uboot and kernel config
> X-Git-Archeology: > recovered message: > - Enabled nfc on rk322x-dev and disable on rk322x-current (need further development)
> X-Git-Archeology: > recovered message: > - Tidied up rk322x-current device tree
> X-Git-Archeology: > recovered message: > - enabled nfc rockchip driver enabled in rk322x-dev kernel config
> X-Git-Archeology: > recovered message: > - Enabled EHCI controller in u-boot (added patch for inno-phy, device tree and config bits), better device detection for dwc2 usb otg port
> X-Git-Archeology: > recovered message: > - Removed SPL_FIT_GENERATOR from u-boot configuration, fixed .its file to use binman
> X-Git-Archeology: > recovered message: > - fixed rk322x its file (now includes dtb), reverted u-boot to v2020.10 and changed dev_* into log_debug() calls
> X-Git-Archeology: - Revision 95425c27b9d3bbb96e7936cc531638c9150538f9: https://github.com/armbian/build/commit/95425c27b9d3bbb96e7936cc531638c9150538f9
> X-Git-Archeology: Date: Fri, 12 Mar 2021 20:20:12 +0000
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Changes and fixes to rk322x uboot and kernel config
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5130cc32fd9b18ecf71d5d26b688859ede0ffe03: https://github.com/armbian/build/commit/5130cc32fd9b18ecf71d5d26b688859ede0ffe03
> X-Git-Archeology: Date: Mon, 20 Jun 2022 08:35:13 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip64: fix u-boot USB OTG patch name
> X-Git-Archeology:
> X-Git-Archeology: - Revision d4daf41404853fc13813dc4eb9f6cad76f95945c: https://github.com/armbian/build/commit/d4daf41404853fc13813dc4eb9f6cad76f95945c
> X-Git-Archeology: Date: Mon, 20 Jun 2022 08:35:13 +0200
> X-Git-Archeology: From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: rockchip64: add sdmmc_ext node, mmc reset properties and otg usb fix to u-boot
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
drivers/usb/host/dwc2.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
index cefe9d83..f7288203 100644
index 23060fc369..687f5a0110 100644
--- a/drivers/usb/host/dwc2.c
+++ b/drivers/usb/host/dwc2.c
@@ -440,6 +440,8 @@ static void dwc_otg_core_init(struct dwc2_priv *priv)
@@ -445,6 +445,8 @@ static void dwc_otg_core_init(struct udevice *dev)
writel(usbcfg, &regs->gusbcfg);
@@ -11,3 +46,6 @@ index cefe9d83..f7288203 100644
/* Program the GAHBCFG Register. */
switch (readl(&regs->ghwcfg2) & DWC2_HWCFG2_ARCHITECTURE_MASK) {
case DWC2_HWCFG2_ARCHITECTURE_SLAVE_ONLY:
--
Armbian

32
patch/u-boot/u-boot-rockchip64-v2022.04/general-set-eth1addr.patch
View File

@@ -1,8 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Sun, 3 May 2020 20:42:50 +0200
Subject: [ARCHEOLOGY] Added rk3328 efuse driver and stable secondary mac
address to u-boot (#1939)
> X-Git-Archeology: - Revision 7113913be8597cd269f61a7f8fd82da41d7b03a4: https://github.com/armbian/build/commit/7113913be8597cd269f61a7f8fd82da41d7b03a4
> X-Git-Archeology: Date: Sun, 03 May 2020 20:42:50 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Added rk3328 efuse driver and stable secondary mac address to u-boot (#1939)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/mach-rockchip/misc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c
index 6dbb9bde..89f3a918 100644
index 87eebd9872..0c610e0284 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -50,6 +50,11 @@ int rockchip_setup_macaddr(void)
@@ -52,6 +52,11 @@ int rockchip_setup_macaddr(void)
mac_addr[0] &= 0xfe; /* clear multicast bit */
mac_addr[0] |= 0x02; /* set local assignment bit (IEEE802) */
eth_env_set_enetaddr("ethaddr", mac_addr);
@@ -14,3 +39,6 @@ index 6dbb9bde..89f3a918 100644
#endif
return 0;
}
--
Armbian

35
patch/u-boot/u-boot-rockchip64-v2022.04/general-support-recovery-button.patch
View File

@@ -1,25 +1,20 @@
From ff72515d3f6e65e22baa8cb1fbefe15540256310 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Sun, 4 Oct 2020 18:19:02 +0200
Subject: [PATCH] Enabled advanced recovery button support for rockchip
Subject: Enabled advanced recovery button support for rockchip
It allows to enter either ums, fastboot or rockusb based on the time the
button is pressed.
SD (mmc0) is preferred if present with eMMC (mmc1) set as fallback.
Based on:
https://github.com/ayufan-rock64/linux-u-boot/commit/ea6efecdfecc57c853a6f32f78469d1b2417329b
https://github.com/ayufan-rock64/linux-u-boot/commit/1abc9ab51306200880c434c2069eceb4be7789e9
Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
---
arch/arm/mach-rockchip/Kconfig | 25 ++
arch/arm/mach-rockchip/boot_mode.c | 148 ++++++++++
2 files changed, 173 insertions(+)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 0cb1f23d..09807cdc 100644
index 308dc09b03..5140495849 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -366,6 +366,31 @@ config TPL_ROCKCHIP_EARLYRETURN_TO_BROM
config SPL_MMC_SUPPORT
default y if !SPL_ROCKCHIP_BACK_TO_BROM
@@ -393,6 +393,31 @@ config ROCKCHIP_SPI_IMAGE
config LNX_KRNL_IMG_TEXT_OFFSET_BASE
default SYS_TEXT_BASE
+config ROCKCHIP_ADVANCED_RECOVERY
+ bool "Advanced recovery button for Rockchip boards"
@@ -50,10 +45,11 @@ index 0cb1f23d..09807cdc 100644
source "arch/arm/mach-rockchip/rk3036/Kconfig"
source "arch/arm/mach-rockchip/rk3128/Kconfig"
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
index 21589341..c4dcb15e 100644
index 1a1a887fc2..a8d6c1f2b5 100644
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@@ -8,6 +8,9 @@
@@ -7,7 +7,10 @@
#include <adc.h>
#include <command.h>
#include <env.h>
+#include <led.h>
@@ -63,7 +59,7 @@ index 21589341..c4dcb15e 100644
#include <asm/io.h>
#include <asm/arch-rockchip/boot_mode.h>
#include <dm/device.h>
@@ -70,13 +71,158 @@ __weak int rockchip_dnl_key_pressed(void)
@@ -70,13 +73,158 @@ __weak int rockchip_dnl_key_pressed(void)
return false;
}
@@ -222,3 +218,6 @@ index 21589341..c4dcb15e 100644
}
int setup_boot_mode(void)
--
Armbian

165
patch/u-boot/u-boot-rockchip64-v2022.04/general-support-rmii-integrated-phy.patch
View File

@@ -1,3 +1,61 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo <paolo.sabatino@gmail.com>
Date: Fri, 19 Jun 2020 17:27:27 +0200
Subject: [ARCHEOLOGY] Introducing Rockchip RK322X SoC support (#2032)
> X-Git-Archeology: > recovered message: > * Introducing Rockchip rk322x SoC support
> X-Git-Archeology: > recovered message: > Main features:
> X-Git-Archeology: > recovered message: > - Legacy kernel flavour based upon stable v2.x rk3288 Rockchip branch (https://github.com/rockchip-linux/kernel/tree/stable-4.4-rk3288-linux-v2.x)
> X-Git-Archeology: > recovered message: > - Current kernel flavour based on mainline 5.6.y kernel
> X-Git-Archeology: > recovered message: > - Mainline u-boot (v2020.04)
> X-Git-Archeology: > recovered message: > - Single generic tv box target (rk322x-box) which boots on all the known tv boxes
> X-Git-Archeology: > recovered message: > - Hardware devices (eMMC/NAND, led wiring configuration, SoC variant selection) modulation done by user at runtime via device tree overlays - a script (rk322x-config) is provided for autodetection and simple configuration by inexperienced users;
> X-Git-Archeology: > recovered message: > - Bits added to armbian-hardware-optimization to set affinity for irq handlers
> X-Git-Archeology: > recovered message: > - rk322x-box targets already added to targets.conf for automatic image creation
> X-Git-Archeology: > recovered message: > * Removed disabled patches
> X-Git-Archeology: > recovered message: > * Restored mysteriously removed comment character
> X-Git-Archeology: - Revision 23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7: https://github.com/armbian/build/commit/23604e8a0dcdf81ec6c28ccd4b2a64b90816d8e7
> X-Git-Archeology: Date: Fri, 19 Jun 2020 17:27:27 +0200
> X-Git-Archeology: From: Paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Introducing Rockchip RK322X SoC support (#2032)
> X-Git-Archeology:
> X-Git-Archeology: - Revision bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076: https://github.com/armbian/build/commit/bd17d4dbd0025908b6f0aa58d74f2bc8cfedb076
> X-Git-Archeology: Date: Sat, 19 Sep 2020 15:20:16 +0000
> X-Git-Archeology: From: paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Many changes for rk322x target:
> X-Git-Archeology:
> X-Git-Archeology: - Revision c0c099e78cc4a4536c38b7b070d24cd814ab9d9e: https://github.com/armbian/build/commit/c0c099e78cc4a4536c38b7b070d24cd814ab9d9e
> X-Git-Archeology: Date: Sun, 17 Jan 2021 11:23:47 +0000
> X-Git-Archeology: From: paolo <paolo.sabatino@gmail.com>
> X-Git-Archeology: Subject: Added support for rk3328 FE gmac in u-boot, useful for stable ethernet MAC address
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0: https://github.com/armbian/build/commit/71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0
> X-Git-Archeology: Date: Thu, 11 Nov 2021 23:49:52 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2021.07 (#3233)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
arch/arm/dts/rk3229-evb.dts | 32 +-
arch/arm/dts/rk322x.dtsi | 8 +-
arch/arm/include/asm/arch-rockchip/cru_rk322x.h | 1 +
configs/evb-rk3229_defconfig | 2 +
configs/evb-rk3328_defconfig | 2 +
doc/device-tree-bindings/net/phy.txt | 13 +
drivers/clk/rockchip/clk_rk322x.c | 14 +-
drivers/clk/rockchip/clk_rk3328.c | 86 +++
drivers/net/gmac_rockchip.c | 341 +++++++++-
9 files changed, 453 insertions(+), 46 deletions(-)
diff --git a/arch/arm/dts/rk3229-evb.dts b/arch/arm/dts/rk3229-evb.dts
index 632cdc9bc3..f868524ae1 100644
--- a/arch/arm/dts/rk3229-evb.dts
@@ -64,10 +122,10 @@ index 4a8be5dabb..3c2861f271 100644
status = "disabled";
};
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
index c87c830716..15039c87be 100644
index ee12fa831f..cfbc7e92f7 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h
@@ -12,6 +12,7 @@
@@ -10,6 +10,7 @@
#define APLL_HZ (600 * MHz)
#define GPLL_HZ (594 * MHz)
@@ -76,10 +134,10 @@ index c87c830716..15039c87be 100644
#define CORE_PERI_HZ 150000000
#define CORE_ACLK_HZ 300000000
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index f8e648bbb4..5fd2bd3ba2 100644
index 5dc6d9577e..eee41c86e9 100644
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -58,6 +58,8 @@ CONFIG_GMAC_ROCKCHIP=y
@@ -63,6 +63,8 @@ CONFIG_GMAC_ROCKCHIP=y
CONFIG_PHY=y
CONFIG_PINCTRL=y
CONFIG_RAM=y
@@ -89,10 +147,10 @@ index f8e648bbb4..5fd2bd3ba2 100644
CONFIG_TPL_RAM=y
CONFIG_BAUDRATE=1500000
diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
index 5bbdc00214..19c09e4503 100644
index 8b59b8c118..82effff933 100644
--- a/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@ -71,6 +71,8 @@ CONFIG_DM_REGULATOR_FIXED=y
@@ -73,6 +73,8 @@ CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y
@@ -126,10 +184,10 @@ index 6599c667b5..ca1a4a8526 100644
ethernet-phy@0 {
diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
index ef33adbf29..c427e0438b 100644
index dbef606d88..925aacc6d6 100644
--- a/drivers/clk/rockchip/clk_rk322x.c
+++ b/drivers/clk/rockchip/clk_rk322x.c
@@ -38,6 +38,7 @@ enum {
@@ -43,6 +43,7 @@ enum {
/* use integer mode*/
static const struct pll_div apll_init_cfg = PLL_DIVISORS(APLL_HZ, 1, 3, 1);
static const struct pll_div gpll_init_cfg = PLL_DIVISORS(GPLL_HZ, 2, 2, 1);
@@ -137,7 +195,7 @@ index ef33adbf29..c427e0438b 100644
static int rkclk_set_pll(struct rk322x_cru *cru, enum rk_clk_id clk_id,
const struct pll_div *div)
@@ -87,11 +88,13 @@ static void rkclk_init(struct rk322x_cru *cru)
@@ -92,11 +93,13 @@ static void rkclk_init(struct rk322x_cru *cru)
rk_clrsetreg(&cru->cru_mode_con,
GPLL_MODE_MASK | APLL_MODE_MASK,
GPLL_MODE_SLOW << GPLL_MODE_SHIFT |
@@ -152,7 +210,7 @@ index ef33adbf29..c427e0438b 100644
/*
* select apll as cpu/core clock pll source and
@@ -164,7 +167,8 @@ static void rkclk_init(struct rk322x_cru *cru)
@@ -169,7 +172,8 @@ static void rkclk_init(struct rk322x_cru *cru)
rk_clrsetreg(&cru->cru_mode_con,
GPLL_MODE_MASK | APLL_MODE_MASK,
GPLL_MODE_NORM << GPLL_MODE_SHIFT |
@@ -162,7 +220,7 @@ index ef33adbf29..c427e0438b 100644
}
/* Get pll rate by id */
@@ -254,11 +258,10 @@ static ulong rk322x_mac_set_clk(struct rk322x_cru *cru, uint freq)
@@ -259,11 +263,10 @@ static ulong rk322x_mac_set_clk(struct rk322x_cru *cru, uint freq)
ulong pll_rate;
u8 div;
@@ -176,7 +234,7 @@ index ef33adbf29..c427e0438b 100644
div = DIV_ROUND_UP(pll_rate, freq) - 1;
if (div <= 0x1f)
@@ -387,6 +390,7 @@ static ulong rk322x_clk_set_rate(struct clk *clk, ulong rate)
@@ -392,6 +395,7 @@ static ulong rk322x_clk_set_rate(struct clk *clk, ulong rate)
case CLK_DDR:
new_rate = rk322x_ddr_set_clk(priv->cru, rate);
break;
@@ -185,10 +243,10 @@ index ef33adbf29..c427e0438b 100644
new_rate = rk322x_mac_set_clk(priv->cru, rate);
break;
diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
index 8e867c58df..ba2b34c626 100644
index b825ff4cf8..7add1df309 100644
--- a/drivers/clk/rockchip/clk_rk3328.c
+++ b/drivers/clk/rockchip/clk_rk3328.c
@@ -93,6 +93,14 @@ enum {
@@ -97,6 +97,14 @@ enum {
PCLK_DBG_DIV_SHIFT = 0,
PCLK_DBG_DIV_MASK = 0xF << PCLK_DBG_DIV_SHIFT,
@@ -203,7 +261,7 @@ index 8e867c58df..ba2b34c626 100644
/* CLKSEL_CON27 */
GMAC2IO_PLL_SEL_SHIFT = 7,
GMAC2IO_PLL_SEL_MASK = 1 << GMAC2IO_PLL_SEL_SHIFT,
@@ -440,6 +448,39 @@ static ulong rk3328_gmac2io_set_clk(struct rk3328_cru *cru, ulong rate)
@@ -444,6 +452,39 @@ static ulong rk3328_gmac2io_set_clk(struct rk3328_cru *cru, ulong rate)
return ret;
}
@@ -243,7 +301,7 @@ index 8e867c58df..ba2b34c626 100644
static ulong rk3328_mmc_get_clk(struct rk3328_cru *cru, uint clk_id)
{
u32 div, con, con_id;
@@ -608,6 +649,12 @@ static ulong rk3328_clk_set_rate(struct clk *clk, ulong rate)
@@ -640,6 +681,12 @@ static ulong rk3328_clk_set_rate(struct clk *clk, ulong rate)
case SCLK_MAC2IO:
ret = rk3328_gmac2io_set_clk(priv->cru, rate);
break;
@@ -256,7 +314,7 @@ index 8e867c58df..ba2b34c626 100644
case SCLK_PWM:
ret = rk3328_pwm_set_clk(priv->cru, rate);
break;
@@ -728,6 +775,43 @@ static int rk3328_gmac2io_ext_set_parent(struct clk *clk, struct clk *parent)
@@ -763,6 +810,43 @@ static int rk3328_gmac2io_ext_set_parent(struct clk *clk, struct clk *parent)
return -EINVAL;
}
@@ -300,7 +358,7 @@ index 8e867c58df..ba2b34c626 100644
static int rk3328_clk_set_parent(struct clk *clk, struct clk *parent)
{
switch (clk->id) {
@@ -735,6 +819,8 @@ static int rk3328_clk_set_parent(struct clk *clk, struct clk *parent)
@@ -770,6 +854,8 @@ static int rk3328_clk_set_parent(struct clk *clk, struct clk *parent)
return rk3328_gmac2io_set_parent(clk, parent);
case SCLK_MAC2IO_EXT:
return rk3328_gmac2io_ext_set_parent(clk, parent);
@@ -310,27 +368,27 @@ index 8e867c58df..ba2b34c626 100644
case SCLK_PDM:
case SCLK_RTC32K:
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index e152faf083..d3f6973043 100644
index 04008d2b19..200fa3b96f 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -9,6 +9,7 @@
#include <dm.h>
#include <clk.h>
@@ -11,6 +11,7 @@
#include <log.h>
#include <net.h>
#include <phy.h>
+#include <reset.h>
#include <syscon.h>
#include <asm/global_data.h>
#include <asm/io.h>
@@ -23,6 +24,8 @@
@@ -26,6 +27,8 @@
#include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch-rockchip/grf_rv1108.h>
#include <dm/pinctrl.h>
+#include <dm/of_access.h>
+#include <linux/delay.h>
#include <dt-bindings/clock/rk3288-cru.h>
#include <linux/bitops.h>
#include "designware.h"
@@ -39,21 +41,29 @@ DECLARE_GLOBAL_DATA_PTR;
@@ -43,21 +46,29 @@ DECLARE_GLOBAL_DATA_PTR;
struct gmac_rockchip_plat {
struct dw_eth_pdata dw_eth_pdata;
bool clock_input;
@@ -361,7 +419,7 @@ index e152faf083..d3f6973043 100644
string = dev_read_string(dev, "clock_in_out");
if (!strcmp(string, "input"))
@@ -61,6 +71,25 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
@@ -65,6 +76,25 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
else
pdata->clock_input = false;
@@ -387,7 +445,7 @@ index e152faf083..d3f6973043 100644
/* Check the new naming-style first... */
pdata->tx_delay = dev_read_u32_default(dev, "tx_delay", -ENOENT);
pdata->rx_delay = dev_read_u32_default(dev, "rx_delay", -ENOENT);
@@ -74,7 +103,8 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
@@ -78,7 +108,8 @@ static int gmac_rockchip_of_to_plat(struct udevice *dev)
return designware_eth_of_to_plat(dev);
}
@@ -397,7 +455,7 @@ index e152faf083..d3f6973043 100644
{
struct px30_grf *grf;
struct clk clk_speed;
@@ -115,7 +145,43 @@ static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -119,7 +150,43 @@ static int px30_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -442,7 +500,7 @@ index e152faf083..d3f6973043 100644
{
struct rk322x_grf *grf;
int clk;
@@ -148,7 +214,8 @@ static int rk3228_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -152,7 +219,8 @@ static int rk3228_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -452,7 +510,7 @@ index e152faf083..d3f6973043 100644
{
struct rk3288_grf *grf;
int clk;
@@ -174,7 +241,8 @@ static int rk3288_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -178,7 +246,8 @@ static int rk3288_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -462,7 +520,7 @@ index e152faf083..d3f6973043 100644
{
struct rk3308_grf *grf;
struct clk clk_speed;
@@ -215,7 +283,43 @@ static int rk3308_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -219,7 +288,43 @@ static int rk3308_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -507,7 +565,7 @@ index e152faf083..d3f6973043 100644
{
struct rk3328_grf_regs *grf;
int clk;
@@ -248,7 +352,8 @@ static int rk3328_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -252,7 +357,8 @@ static int rk3328_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -517,7 +575,7 @@ index e152faf083..d3f6973043 100644
{
struct rk3368_grf *grf;
int clk;
@@ -280,7 +385,8 @@ static int rk3368_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -284,7 +390,8 @@ static int rk3368_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -527,7 +585,7 @@ index e152faf083..d3f6973043 100644
{
struct rk3399_grf_regs *grf;
int clk;
@@ -306,7 +412,8 @@ static int rk3399_gmac_fix_mac_speed(struct dw_eth_dev *priv)
@@ -310,7 +417,8 @@ static int rk3399_gmac_fix_mac_speed(struct dw_eth_dev *priv)
return 0;
}
@@ -537,7 +595,7 @@ index e152faf083..d3f6973043 100644
{
struct rv1108_grf *grf;
int clk, speed;
@@ -357,6 +464,28 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
@@ -361,6 +469,28 @@ static void px30_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
PX30_GMAC_PHY_INTF_SEL_RMII);
}
@@ -566,7 +624,7 @@ index e152faf083..d3f6973043 100644
static void rk3228_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
{
struct rk322x_grf *grf;
@@ -435,6 +564,25 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
@@ -439,6 +569,25 @@ static void rk3308_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
RK3308_GMAC_PHY_INTF_SEL_RMII);
}
@@ -592,7 +650,7 @@ index e152faf083..d3f6973043 100644
static void rk3328_gmac_set_to_rgmii(struct gmac_rockchip_plat *pdata)
{
struct rk3328_grf_regs *grf;
@@ -550,6 +698,126 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
@@ -554,6 +703,126 @@ static void rv1108_gmac_set_to_rmii(struct gmac_rockchip_plat *pdata)
RV1108_GMAC_PHY_INTF_SEL_RMII);
}
@@ -719,7 +777,7 @@ index e152faf083..d3f6973043 100644
static int gmac_rockchip_probe(struct udevice *dev)
{
struct gmac_rockchip_plat *pdata = dev_get_plat(dev);
@@ -569,6 +837,9 @@ static int gmac_rockchip_probe(struct udevice *dev)
@@ -573,6 +842,9 @@ static int gmac_rockchip_probe(struct udevice *dev)
if (ret)
return ret;
@@ -729,7 +787,16 @@ index e152faf083..d3f6973043 100644
switch (eth_pdata->phy_interface) {
case PHY_INTERFACE_MODE_RGMII:
/* Set to RGMII mode */
@@ -652,7 +923,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
@@ -620,7 +892,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
if (!pdata->clock_input) {
rate = clk_set_rate(&clk, 50000000);
- if (rate != 50000000)
+ if (rate != 50000000 && rate != 49500000)
return -EINVAL;
}
break;
@@ -656,7 +928,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
break;
default:
@@ -738,7 +805,7 @@ index e152faf083..d3f6973043 100644
return -ENXIO;
}
@@ -661,18 +932,33 @@ static int gmac_rockchip_probe(struct udevice *dev)
@@ -665,18 +937,33 @@ static int gmac_rockchip_probe(struct udevice *dev)
static int gmac_rockchip_eth_start(struct udevice *dev)
{
@@ -777,7 +844,7 @@ index e152faf083..d3f6973043 100644
ret = designware_eth_enable(priv);
if (ret)
return ret;
@@ -690,42 +976,48 @@ const struct eth_ops gmac_rockchip_eth_ops = {
@@ -694,42 +981,48 @@ const struct eth_ops gmac_rockchip_eth_ops = {
};
const struct rk_gmac_ops px30_gmac_ops = {
@@ -834,16 +901,6 @@ index e152faf083..d3f6973043 100644
.set_to_rmii = rv1108_gmac_set_to_rmii,
};
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index ae9fe9da..92514af1 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -891,7 +891,7 @@ static int gmac_rockchip_probe(struct udevice *dev)
if (!pdata->clock_input) {
rate = clk_set_rate(&clk, 50000000);
- if (rate != 50000000)
+ if (rate != 50000000 && rate != 49500000)
return -EINVAL;
}
break;
--
Armbian

47
patch/u-boot/u-boot-rockchip64-v2022.04/rk3328-efuse-driver.patch
View File

@@ -1,5 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Sun, 3 May 2020 20:42:50 +0200
Subject: [ARCHEOLOGY] Added rk3328 efuse driver and stable secondary mac
address to u-boot (#1939)
> X-Git-Archeology: - Revision 7113913be8597cd269f61a7f8fd82da41d7b03a4: https://github.com/armbian/build/commit/7113913be8597cd269f61a7f8fd82da41d7b03a4
> X-Git-Archeology: Date: Sun, 03 May 2020 20:42:50 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Added rk3328 efuse driver and stable secondary mac address to u-boot (#1939)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 88a585a3fe56bf9eb8c1df8993fe34830597ca77: https://github.com/armbian/build/commit/88a585a3fe56bf9eb8c1df8993fe34830597ca77
> X-Git-Archeology: Date: Sat, 18 Jul 2020 00:06:01 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Update mainline u-boot for rockchip64 / rk3399 to v2020.07 (#2086)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0: https://github.com/armbian/build/commit/71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0
> X-Git-Archeology: Date: Thu, 11 Nov 2021 23:49:52 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2021.07 (#3233)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
drivers/misc/rockchip-efuse.c | 85 +++++++++-
include/configs/rk3328_common.h | 4 +
2 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 2520c6a3..c3e58188 100644
index 083ee65e0a..40a7db6278 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -13,8 +13,18 @@
@@ -115,7 +151,7 @@ index 2520c6a3..c3e58188 100644
}
static const struct misc_ops rockchip_efuse_ops = {
@@ -146,7 +220,14 @@ static int rockchip_efuse_ofdata_to_platdata(struct udevice *dev)
@@ -146,7 +220,14 @@ static int rockchip_efuse_of_to_plat(struct udevice *dev)
}
static const struct udevice_id rockchip_efuse_ids[] = {
@@ -132,10 +168,10 @@ index 2520c6a3..c3e58188 100644
};
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 407e5d29..0552e476 100644
index c1e26a019b..67a951673a 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -23,6 +23,10 @@
@@ -21,6 +21,10 @@
#define CONFIG_SPL_BSS_START_ADDR 0x2000000
#define CONFIG_SPL_BSS_MAX_SIZE 0x2000
@@ -146,3 +182,6 @@ index 407e5d29..0552e476 100644
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
/* FAT sd card locations. */
--
Armbian

14
patch/u-boot/u-boot-rockchip64-v2022.04/rk3328-resets-for-mmc-controllers.patch
View File

@@ -1,17 +1,17 @@
From 91b83f2920631e3104fd5691bde107e39a98feee Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Fri, 5 Nov 2021 16:03:11 +0000
Subject: [PATCH 1/2] rk3328: resets for mmc controllers
Subject: rk3328: resets for mmc controllers
---
arch/arm/dts/rk3328.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
index 945387e5..3314d5e4 100644
index 27e45d5886..3fb78acd13 100644
--- a/arch/arm/dts/rk3328.dtsi
+++ b/arch/arm/dts/rk3328.dtsi
@@ -859,6 +859,8 @@
@@ -856,6 +856,8 @@
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@@ -20,7 +20,7 @@ index 945387e5..3314d5e4 100644
fifo-depth = <0x100>;
max-frequency = <150000000>;
status = "disabled";
@@ -871,6 +873,8 @@
@@ -868,6 +870,8 @@
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@@ -29,7 +29,7 @@ index 945387e5..3314d5e4 100644
fifo-depth = <0x100>;
max-frequency = <150000000>;
status = "disabled";
@@ -883,8 +887,11 @@
@@ -880,8 +884,11 @@
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@@ -42,5 +42,5 @@ index 945387e5..3314d5e4 100644
};
--
2.30.2
Armbian

12
patch/u-boot/u-boot-rockchip64-v2022.04/rk3328-sdmmc_ext-node.patch
View File

@@ -1,17 +1,17 @@
From 073b28838387a4f7c5947d7a3f07d326f13b72f4 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Fri, 5 Nov 2021 16:03:53 +0000
Subject: [PATCH 2/2] rk3328: sdmmc_ext node
Subject: rk3328: sdmmc_ext node
---
arch/arm/dts/rk3328.dtsi | 14 ++++++++++++++
arch/arm/dts/rk3328.dtsi | 14 ++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
index 3314d5e4..a1fedc56 100644
index 3fb78acd13..4b7b7db72f 100644
--- a/arch/arm/dts/rk3328.dtsi
+++ b/arch/arm/dts/rk3328.dtsi
@@ -895,6 +895,20 @@
@@ -892,6 +892,20 @@
status = "disabled";
};
@@ -33,5 +33,5 @@ index 3314d5e4..a1fedc56 100644
compatible = "rockchip,rk3328-gmac";
reg = <0x0 0xff540000 0x0 0x10000>;
--
2.30.2
Armbian

51
patch/u-boot/u-boot-rockchip64-v2022.04/rk3399-always-init-rkclk.patch
View File

@@ -1,14 +1,44 @@
This patch forces clk initialisation of rk3399 cpu in u-boot proper.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Mon, 23 Mar 2020 18:44:03 +0100
Subject: [ARCHEOLOGY] Fixed slow boot of rk3399 with mainline (#1852)
Normally it should only be initialised in SPL as it is "time consuming".
Doing so however leaves cpus clocked to low frequencies
for Rockchip's DDR/loader/trust with mainline u-boot scenario
which does not involve SPL phase.
Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: - Revision aa1b639535858362b31f5a34780aa359407bd6e9: https://github.com/armbian/build/commit/aa1b639535858362b31f5a34780aa359407bd6e9
> X-Git-Archeology: Date: Mon, 23 Mar 2020 18:44:03 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Fixed slow boot of rk3399 with mainline (#1852)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 75d0f64e3d75e7c34466871b9723ef1a238609d8: https://github.com/armbian/build/commit/75d0f64e3d75e7c34466871b9723ef1a238609d8
> X-Git-Archeology: Date: Fri, 17 Apr 2020 21:30:37 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switch rk3399 to u-boot v2020.04 (#1873)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0: https://github.com/armbian/build/commit/71ff7b3b989dcb7e86b7e1c00a408a2f53744ea0
> X-Git-Archeology: Date: Thu, 11 Nov 2021 23:49:52 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2021.07 (#3233)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
drivers/clk/rockchip/clk_rk3399.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index f8cbda44..687c3ad7 100644
index 7d31a9f22a..e82a545c96 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -1394,7 +1394,7 @@ static int rk3399_clk_probe(struct udevice *dev)
@@ -17,6 +47,9 @@ index f8cbda44..687c3ad7 100644
- if (init_clocks)
+ if (init_clocks || 1 == 1)
rkclk_init(priv->cru);
rkclk_init(priv->cru);
return 0;
--
Armbian

23
patch/u-boot/u-boot-rockchip64-v2022.04/rk3399-disable-hdmi-roc-pc.patch
View File

@@ -1,3 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Wed, 17 Nov 2021 07:22:04 +0100
Subject: [ARCHEOLOGY] fix sound HDMI rk3399 and bootsplash (#3260)
> X-Git-Archeology: - Revision 21d5340b35f43dda30c86320433ab3fb82997594: https://github.com/armbian/build/commit/21d5340b35f43dda30c86320433ab3fb82997594
> X-Git-Archeology: Date: Wed, 17 Nov 2021 07:22:04 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: fix sound HDMI rk3399 and bootsplash (#3260)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
include/configs/roc-pc-rk3399.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h
index 59fe22289c..4055e4563e 100644
--- a/include/configs/roc-pc-rk3399.h
+++ b/include/configs/roc-pc-rk3399.h
@@ -6,10 +6,6 @@
@@ -11,4 +32,6 @@
#include <configs/rk3399_common.h>
--
Armbian

26
patch/u-boot/u-boot-rockchip64-v2022.04/rk3399-disable-hdmi.patch
View File

@@ -1,5 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Wed, 17 Nov 2021 07:22:04 +0100
Subject: [ARCHEOLOGY] fix sound HDMI rk3399 and bootsplash (#3260)
> X-Git-Archeology: - Revision 21d5340b35f43dda30c86320433ab3fb82997594: https://github.com/armbian/build/commit/21d5340b35f43dda30c86320433ab3fb82997594
> X-Git-Archeology: Date: Wed, 17 Nov 2021 07:22:04 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: fix sound HDMI rk3399 and bootsplash (#3260)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
include/configs/evb_rk3399.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index 2d3db228..c0b03588 100644
index 492b7b4df1..6320914207 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -6,11 +6,6 @@
@@ -13,4 +32,7 @@ index 2d3db228..c0b03588 100644
-
#include <configs/rk3399_common.h>
#if defined(CONFIG_ENV_IS_IN_MMC)
#define SDRAM_BANK_SIZE (2UL << 30)
--
Armbian

39
patch/u-boot/u-boot-rockchip64-v2022.04/rk3399-enable-stable-mac.patch
View File

@@ -1,10 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Mon, 9 Dec 2019 07:39:09 +0100
Subject: [ARCHEOLOGY] Enable derivation of stable MAC address from cpuid on
rk3399 (#1660)
> X-Git-Archeology: - Revision cd9800498d1ff5ade84f701dcd50ecfedfcc7091: https://github.com/armbian/build/commit/cd9800498d1ff5ade84f701dcd50ecfedfcc7091
> X-Git-Archeology: Date: Mon, 09 Dec 2019 07:39:09 +0100
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Enable derivation of stable MAC address from cpuid on rk3399 (#1660)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 86abac1fd4e169712a44d245cf7adef4ee17c420: https://github.com/armbian/build/commit/86abac1fd4e169712a44d245cf7adef4ee17c420
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:14:41 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Cleanup u-boot configurations for rockchip64 derivatives (#3150)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
include/configs/rk3399_common.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 126c3476..c6dccf4f 100644
index ed72c8bb6b..836206b4e0 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -19,6 +19,10 @@
@@ -17,6 +17,10 @@
#define CONFIG_SYS_INIT_SP_ADDR 0x00300000
#define CONFIG_SYS_LOAD_ADDR 0x00800800
+#define CONFIG_MISC 1
+#define CONFIG_MISC_INIT_R 1
@@ -13,3 +43,6 @@ index 126c3476..c6dccf4f 100644
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
#define CONFIG_SPL_STACK 0x00400000
#define CONFIG_SPL_MAX_SIZE 0x40000
--
Armbian

17
patch/u-boot/u-boot-rockchip64-v2022.04/rk3399-populate-child-node-of-syscon.patch
View File

@@ -1,10 +1,7 @@
From 91cbd5f4fb25281319034c33b6e0c0f9b7d1e12b Mon Sep 17 00:00:00 2001
Message-Id: <91cbd5f4fb25281319034c33b6e0c0f9b7d1e12b.1585676333.git.aditya@kobol.io>
In-Reply-To: <ef8793354dbb6bce3027a3492ffc1fee3588f41f.1585676333.git.aditya@kobol.io>
References: <ef8793354dbb6bce3027a3492ffc1fee3588f41f.1585676333.git.aditya@kobol.io>
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aditya@kobol.io>
Date: Wed, 4 Mar 2020 22:10:31 +0700
Subject: [PATCH 4/4] arm:rockchip:rk3399: Populate child node of syscon
Subject: arm:rockchip:rk3399: Populate child node of syscon
U-Boot only populate first level of node.
Scan child node so device such as PHY can be initialized.
@@ -13,12 +10,12 @@ Scan child node so device such as PHY can be initialized.
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
index 259ca44d68..81b04aa7f8 100644
index 2b5746cb31..ec2f037e16 100644
--- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
@@ -21,6 +21,9 @@ U_BOOT_DRIVER(syscon_rk3399) = {
.name = "rk3399_syscon",
.id = UCLASS_SYSCON,
@@ -25,6 +25,9 @@ U_BOOT_DRIVER(syscon_rk3399) = {
.bind = dm_scan_fdt_dev,
#endif
.of_match = rk3399_syscon_ids,
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+ .bind = dm_scan_fdt_dev,
@@ -27,5 +24,5 @@ index 259ca44d68..81b04aa7f8 100644
#if CONFIG_IS_ENABLED(OF_PLATDATA)
--
2.17.1
Armbian

20
patch/u-boot/u-boot-rockchip64-v2022.04/sdmmc-force-fifo-mode-in-spl.patch
View File

@@ -1,14 +1,17 @@
From b0693aeb9ceab57ffc9d9f4ceca610bd82d5ca07 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Mon, 21 May 2018 02:00:19 +0200
Subject: [PATCH] ayufan: rock64: for SPL build always use fifo-mode
Subject: ayufan: rock64: for SPL build always use fifo-mode
---
drivers/mmc/rockchip_dw_mmc.c | 4 ++++
1 file changed, 4 insertions(+)
Change-Id: I9ac012ce4aaf03a151f7c5c818829d631efdd7ed
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
index fc0f0fad76..d1f26e41fe 100644
index 7f8dea1e34..4cb6be42af 100644
--- a/drivers/mmc/rockchip_dw_mmc.c
+++ b/drivers/mmc/rockchip_dw_mmc.c
@@ -70,7 +70,11 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev)
@@ -74,7 +74,11 @@ static int rockchip_dwmmc_of_to_plat(struct udevice *dev)
if (priv->fifo_depth < 0)
return -EINVAL;
@@ -18,5 +21,8 @@ index fc0f0fad76..d1f26e41fe 100644
priv->fifo_mode = dev_read_bool(dev, "fifo-mode");
+#endif
/*
* 'clock-freq-min-max' is deprecated
#ifdef CONFIG_SPL_BUILD
if (!priv->fifo_mode)
--
Armbian

39
patch/u-boot/u-boot-rockchip64-v2022.04/u-boot-rk-rk3399-usb-start-firefly-rk3399.patch
View File

@@ -1,15 +1,46 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Tue, 26 Oct 2021 08:52:40 +0200
Subject: [ARCHEOLOGY] fix firefly-rk3399 (#3227)
> X-Git-Archeology: - Revision 103ddb1adb9d3aba8ebb420762ac91d137c143c5: https://github.com/armbian/build/commit/103ddb1adb9d3aba8ebb420762ac91d137c143c5
> X-Git-Archeology: Date: Tue, 26 Oct 2021 08:52:40 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: fix firefly-rk3399 (#3227)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5fc2d639889e35319d9f51b15129cf96b2d80ab8: https://github.com/armbian/build/commit/5fc2d639889e35319d9f51b15129cf96b2d80ab8
> X-Git-Archeology: Date: Tue, 26 Oct 2021 22:19:01 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Moved missing firefly-rk3399 u-boot patch to a new location
> X-Git-Archeology:
> X-Git-Archeology: - Revision 320bf63430b442700cf1cea7e290b9ef7bdde0e9: https://github.com/armbian/build/commit/320bf63430b442700cf1cea7e290b9ef7bdde0e9
> X-Git-Archeology: Date: Mon, 15 Nov 2021 12:46:38 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: Added usb boot support for NanoPC T4 (#3256)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
configs/firefly-rk3399_defconfig | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
index fe1c019f1d..a123e817d8 100644
--- a/configs/firefly-rk3399_defconfig
+++ b/configs/firefly-rk3399_defconfig
@@ -41,6 +41,8 @@
@@ -43,6 +43,8 @@ CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
CONFIG_NVME=y
CONFIG_NVME_PCI=y
CONFIG_PCI=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
@@ -58,11 +60,18 @@
@@ -60,11 +62,18 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
@@ -28,4 +59,6 @@
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
--
Armbian

36
patch/u-boot/u-boot-rockchip64-v2022.04/u-boot-rk-rk3399-usb-start-nanopc-t4.patch
View File

@@ -1,6 +1,32 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Mon, 15 Nov 2021 12:46:38 +0100
Subject: [ARCHEOLOGY] Added usb boot support for NanoPC T4 (#3256)
> X-Git-Archeology: - Revision 320bf63430b442700cf1cea7e290b9ef7bdde0e9: https://github.com/armbian/build/commit/320bf63430b442700cf1cea7e290b9ef7bdde0e9
> X-Git-Archeology: Date: Mon, 15 Nov 2021 12:46:38 +0100
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: Added usb boot support for NanoPC T4 (#3256)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 26437e36c18bb09484f4150e396a1784cc6471b7: https://github.com/armbian/build/commit/26437e36c18bb09484f4150e396a1784cc6471b7
> X-Git-Archeology: Date: Thu, 16 Jun 2022 12:27:05 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Switched rockchip64 u-boot to v2022.04 (#3871)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
configs/nanopc-t4-rk3399_defconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
index 3b3da3870b..2abc75bd45 100644
--- a/configs/nanopc-t4-rk3399_defconfig
+++ b/configs/nanopc-t4-rk3399_defconfig
@@ -28,6 +28,7 @@
@@ -30,6 +30,7 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y
@@ -8,16 +34,16 @@
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
@@ -37,6 +38,8 @@
@@ -39,6 +40,8 @@ CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
CONFIG_NVME=y
CONFIG_NVME_PCI=y
CONFIG_PCI=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
@@ -51,6 +54,7 @@
@@ -53,6 +56,7 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_DWC3=y
@@ -25,4 +51,6 @@
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
--
Armbian

38
patch/u-boot/u-boot-rockchip64-v2022.04/u-boot-rk-rk3399-usb-start.patch
View File

@@ -1,3 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Oleg <balbes-150@yandex.ru>
Date: Wed, 27 Oct 2021 18:56:02 +0200
Subject: [ARCHEOLOGY] u-boot usb m1 (#3221)
> X-Git-Archeology: - Revision 7789fef83f10954ab442401a86a0e5a166e5db55: https://github.com/armbian/build/commit/7789fef83f10954ab442401a86a0e5a166e5db55
> X-Git-Archeology: Date: Wed, 27 Oct 2021 18:56:02 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: u-boot usb m1 (#3221)
> X-Git-Archeology:
> X-Git-Archeology: - Revision aba9e063c0cf94674f38a46e5ab0e5596d88cd9c: https://github.com/armbian/build/commit/aba9e063c0cf94674f38a46e5ab0e5596d88cd9c
> X-Git-Archeology: Date: Wed, 27 Oct 2021 19:05:45 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: add start usb Station P1 (#3220)
> X-Git-Archeology:
> X-Git-Archeology: - Revision fd33c6545bbb4bf2383fc212dd305f3b09e47fac: https://github.com/armbian/build/commit/fd33c6545bbb4bf2383fc212dd305f3b09e47fac
> X-Git-Archeology: Date: Wed, 27 Oct 2021 20:28:50 +0200
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology: Subject: Moved remaining u-boot rockchip64 mainline patches to new directory
> X-Git-Archeology:
> X-Git-Archeology: - Revision b74ced147675075d4bd13111dead23803b6c2267: https://github.com/armbian/build/commit/b74ced147675075d4bd13111dead23803b6c2267
> X-Git-Archeology: Date: Fri, 08 Jul 2022 15:52:27 +0200
> X-Git-Archeology: From: Oleg <balbes-150@yandex.ru>
> X-Git-Archeology: Subject: media u-boot-2022.07 (#3960)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 2813365dd25e3ad110936cbf014b95b38d7090ec: https://github.com/armbian/build/commit/2813365dd25e3ad110936cbf014b95b38d7090ec
> X-Git-Archeology: Date: Mon, 07 Nov 2022 21:29:00 +0100
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology: Subject: Move known non working rockhip64 boards to previous boot loader (#4392)
> X-Git-Archeology:
---
include/configs/rockchip-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index ba7061a287..5dc92373b2 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -55,9 +55,9 @@
@@ -11,4 +47,6 @@
BOOT_TARGET_PXE(func) \
BOOT_TARGET_DHCP(func) \
BOOT_TARGET_SF(func)
--
Armbian