Skip to contentSkip to conversation

rockchip: rk3588s: Add support for ROC-PC-RK3588S

PATCH In review Fabio Estevam via U-Boot 3 participants 5 messages Jul 22 – Jul 24

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 rockchip: rk3588s: Add support for ROC-PC-RK3588S

From: Fabio Estevam <[email protected]>

The ROC-PC-RK3588S board is an SBC made by Firefly, based on the RK3588S SoC.

Add support for it.

---
Changes since v2:
- Drop the USB device-mode DT changes until they are available through devicetree-rebasing.
- Drop the corresponding USBDP, DWC3, gadget and UMS options.
- Run savedefconfig, which drops CONFIG_SYS_HAS_NONCACHED_MEMORY and CONFIG_ENV_OFFSET, as 0x3f8000 is already the Rockchip default.

 arch/arm/mach-rockchip/rk3588/Kconfig    |  7 ++
 board/firefly/roc-pc-rk3588s/Kconfig     | 12 ++++
 board/firefly/roc-pc-rk3588s/MAINTAINERS |  6 ++
 configs/roc-pc-rk3588s_defconfig         | 81 ++++++++++++++++++++++++
 doc/board/rockchip/rockchip.rst          |  1 +
 include/configs/roc-pc-rk3588s.h         |  8 +++
 6 files changed, 115 insertions(+)
 create mode 100644 board/firefly/roc-pc-rk3588s/Kconfig
 create mode 100644 board/firefly/roc-pc-rk3588s/MAINTAINERS
 create mode 100644 configs/roc-pc-rk3588s_defconfig
 create mode 100644 include/configs/roc-pc-rk3588s.h
arch/arm/mach-rockchip/rk3588/Kconfig +7 -0
index 675f13ab66d7..841ae490e85a 100644
@@ -208,6 +208,12 @@ config TARGET_RK3588_NEU6
 	  IO board and Neu6a needs to mount on top of this IO board in order to
 	  create complete Edgeble Neural Compute Module 6B(Neu6B) IO platform.
 
+config TARGET_ROC_PC_RK3588S
+	bool "Firefly ROC PC RK3588S"
+	help
+	  ROC-PC-RK3588S is a single board computer from Firefly
+	  using the Rockchip RK3588S.
+
 config TARGET_ROCK5A_RK3588
 	bool "Radxa ROCK5A RK3588 board"
 	help
@@ -421,6 +427,7 @@ config SYS_SOC
 source "board/armsom/sige7-rk3588/Kconfig"
 source "board/coolpi/genbook_cm5_rk3588/Kconfig"
 source "board/edgeble/neural-compute-module-6/Kconfig"
+source "board/firefly/roc-pc-rk3588s/Kconfig"
 source "board/friendlyelec/cm3588-nas-rk3588/Kconfig"
 source "board/friendlyelec/nanopc-t6-rk3588/Kconfig"
 source "board/friendlyelec/nanopi-r6c-rk3588s/Kconfig"
board/firefly/roc-pc-rk3588s/Kconfig new file +12 -0
new file mode 100644
index 000000000000..bded7a2fcba1
@@ -0,0 +1,12 @@
+if TARGET_ROC_PC_RK3588S
+
+config SYS_BOARD
+	default "roc-pc-rk3588s"
+
+config SYS_VENDOR
+	default "firefly"
+
+config SYS_CONFIG_NAME
+	default "roc-pc-rk3588s"
+
+endif
board/firefly/roc-pc-rk3588s/MAINTAINERS new file +6 -0
new file mode 100644
index 000000000000..a0316cab1b92
@@ -0,0 +1,6 @@
+ROC-PC-RK3588S
+M:	Fabio Estevam <[email protected]>
+S:	Maintained
+F:	board/firefly/roc-pc-rk3588s/
+F:	configs/roc-pc-rk3588s_defconfig
+F:	include/configs/roc-pc-rk3588s.h
configs/roc-pc-rk3588s_defconfig new file +81 -0

81 lines not on this page · raw message

doc/board/rockchip/rockchip.rst +1 -0
index b565aea311e9..d56d245dc114 100644
@@ -155,6 +155,7 @@ List of mainline supported Rockchip boards:
      - Rockchip EVB (evb-rk3588)
      - Edgeble Neural Compute Module 6A SoM - Neu6a (neu6a-io-rk3588)
      - Edgeble Neural Compute Module 6B SoM - Neu6b (neu6b-io-rk3588)
+     - Firefly ROC-PC-RK3588S (roc-pc-rk3588s)
      - FriendlyElec CM3588 NAS (cm3588-nas-rk3588)
      - FriendlyElec NanoPC-T6 (nanopc-t6-rk3588)
      - FriendlyElec NanoPi R6C (nanopi-r6c-rk3588s)
include/configs/roc-pc-rk3588s.h new file +8 -0
new file mode 100644
index 000000000000..c9316687c38f
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ROC_PC_RK3588S_H
+#define __ROC_PC_RK3588S_H
+
+#include <configs/rk3588_common.h>
+
+#endif /* __ROC_PC_RK3588S_H */
Signature · 1 line
2.43.0
Reviewed-by on v3 1/1
#1 lore raw

Hi Fabio,

Quoted 5 lines · Fabio Estevam via U-Boot

From: Fabio Estevam <[email protected]>

The ROC-PC-RK3588S board is an SBC made by Firefly, based on the RK3588S SoC.

Quoted 8 lines

Add support for it.

---
Changes since v2:
- Drop the USB device-mode DT changes until they are available through devicetree-rebasing.
- Drop the corresponding USBDP, DWC3, gadget and UMS options.

Just to be sure this isn't an oversight, DWC3 is used for usb_host0_xhci, which is enabled on ROC-PC-RK3588S. I see there are a USB-A port marked as USB3 on the product datasheet, and also USB OTG that is capable of doing USB3. I couldn't quickly find schematics to verify what's what, so does the full USB-A marked as being USB3 capable still working?

[...]

board/firefly/roc-pc-rk3588s/MAINTAINERS line 1

Quoted 7 lines
board/firefly/roc-pc-rk3588s/MAINTAINERS new file +1 -0
new file mode 100644
index 000000000000..a0316cab1b92
@@ -0,0 +1,6 @@
+ROC-PC-RK3588S

It's actually ROC-RK3588S-PC (c.f. https://wiki.t-firefly.com/en/ROC-RK3588S-PC/), I can fix this up when applying if you want, if there's no need for a v4 based on feedback above.

The files are "fine" like that as all other Firefly ROC-* products also make the same "mistake" so better stay consistent :D

[...]

doc/board/rockchip/rockchip.rst List of mainline supported Rockchip boards: · line 158

Quoted 9 lines
doc/board/rockchip/rockchip.rst +1 -0
index b565aea311e9..d56d245dc114 100644
@@ -155,6 +155,7 @@ List of mainline supported Rockchip boards:
       - Rockchip EVB (evb-rk3588)
       - Edgeble Neural Compute Module 6A SoM - Neu6a (neu6a-io-rk3588)
       - Edgeble Neural Compute Module 6B SoM - Neu6b (neu6b-io-rk3588)
+     - Firefly ROC-PC-RK3588S (roc-pc-rk3588s)

Ditto for typo (the defconfig part is fine).

Thanks!
Quentin

#2 lore raw

Hi Quentin,

Quoted 6 lines · Quentin Schulz

Just to be sure this isn't an oversight, DWC3 is used for usb_host0_xhci, which is enabled on ROC-PC-RK3588S. I see there are a USB-A port marked as USB3 on the product datasheet, and also USB OTG that is capable of doing USB3. I couldn't quickly find schematics to verify what's what, so does the full USB-A marked as being USB3 capable still working?

Personally, I am not using any of the two USB host ports in U-Boot.

USB host support in U-Boot can be added later if someone needs it.

Quoted 3 lines

It's actually ROC-RK3588S-PC (c.f.
https://wiki.t-firefly.com/en/ROC-RK3588S-PC/), I can fix this up when applying if you want, if there's no need for a v4 based on feedback above.

Please fix this up while applying.

Thanks.

#3 lore raw

Hi Fabio,

Quoted 11 lines · Fabio Estevam

Hi Quentin,

Quoted 6 lines · Quentin Schulz

Just to be sure this isn't an oversight, DWC3 is used for usb_host0_xhci, which is enabled on ROC-PC-RK3588S. I see there are a USB-A port marked as USB3 on the product datasheet, and also USB OTG that is capable of doing USB3. I couldn't quickly find schematics to verify what's what, so does the full USB-A marked as being USB3 capable still working?

Quoted 4 lines

Personally, I am not using any of the two USB host ports in U-Boot.

USB host support in U-Boot can be added later if someone needs it.

Fair enough.

Quoted 6 lines
Quoted 3 lines

It's actually ROC-RK3588S-PC (c.f.
https://wiki.t-firefly.com/en/ROC-RK3588S-PC/), I can fix this up when applying if you want, if there's no need for a v4 based on feedback above.

Please fix this up while applying.

Thanks!
Quentin

#4 lore raw
In reply to Fabio Estevam via U-Boot
Quoted 4 lines · Fabio Estevam

The ROC-PC-RK3588S board is an SBC made by Firefly, based on the RK3588S SoC.

Add support for it.

Applied to https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip (main), thanks!

[1/1] rockchip: rk3588s: Add support for ROC-PC-RK3588S

      https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip/-/commit/15387d5a90af01eb52f0c18cd83e358ba19c0a7d

Best regards,

Signature · 1 line
Quentin Schulz <[email protected]>