[PATCH v3] rockchip: rk3588s: Add support for ROC-PC-RK3588S

[PATCH v3] rockchip: rk3588s: Add support for ROC-PC-RK3588S

[Fabio Estevam via U-Boot]

From: Fabio Estevam <festevam@nabladev.com>

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

Add support for it.

Signed-off-by: Fabio Estevam <festevam@nabladev.com>
---
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

diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
index 675f13ab66d7..841ae490e85a 100644
--- a/arch/arm/mach-rockchip/rk3588/Kconfig
+++ b/arch/arm/mach-rockchip/rk3588/Kconfig
@@ -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"
diff --git a/board/firefly/roc-pc-rk3588s/Kconfig b/board/firefly/roc-pc-rk3588s/Kconfig
new file mode 100644
index 000000000000..bded7a2fcba1
--- /dev/null
+++ b/board/firefly/roc-pc-rk3588s/Kconfig
@@ -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
diff --git a/board/firefly/roc-pc-rk3588s/MAINTAINERS b/board/firefly/roc-pc-rk3588s/MAINTAINERS
new file mode 100644
index 000000000000..a0316cab1b92
--- /dev/null
+++ b/board/firefly/roc-pc-rk3588s/MAINTAINERS
@@ -0,0 +1,6 @@
+ROC-PC-RK3588S
+M:	Fabio Estevam <festevam@nabladev.com>
+S:	Maintained
+F:	board/firefly/roc-pc-rk3588s/
+F:	configs/roc-pc-rk3588s_defconfig
+F:	include/configs/roc-pc-rk3588s.h
diff --git a/configs/roc-pc-rk3588s_defconfig b/configs/roc-pc-rk3588s_defconfig
new file mode 100644
index 000000000000..226243d79772
--- /dev/null
+++ b/configs/roc-pc-rk3588s_defconfig
@@ -0,0 +1,81 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-roc-pc"
+CONFIG_ROCKCHIP_RK3588=y
+CONFIG_SPL_SERIAL=y
+CONFIG_TARGET_ROC_PC_RK3588S=y
+CONFIG_SYS_LOAD_ADDR=0xc00800
+CONFIG_DEBUG_UART_BASE=0xFEB50000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_ENV_OFFSET_REDUND=0x400000
+CONFIG_PCI=y
+CONFIG_DEBUG_UART=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-roc-pc.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_SPL_MAX_SIZE=0x40000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_SPL_ATF=y
+CONFIG_CMD_ADC=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_REGULATOR=y
+# CONFIG_SPL_DOS_PARTITION is not set
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_REDUNDANT=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SPL_SYSCON=y
+CONFIG_AHCI=y
+CONFIG_SCSI_AHCI=y
+CONFIG_AHCI_PCI=y
+CONFIG_SPL_CLK=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_DWC_ETH_QOS_ROCKCHIP=y
+CONFIG_PHY_REALTEK=y
+CONFIG_NVME_PCI=y
+CONFIG_PCIE_DW_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_SPL_RAM=y
+CONFIG_SCSI=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_PSCI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_ERRNO_STR=y
diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
index b565aea311e9..d56d245dc114 100644
--- a/doc/board/rockchip/rockchip.rst
+++ b/doc/board/rockchip/rockchip.rst
@@ -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)
diff --git a/include/configs/roc-pc-rk3588s.h b/include/configs/roc-pc-rk3588s.h
new file mode 100644
index 000000000000..c9316687c38f
--- /dev/null
+++ b/include/configs/roc-pc-rk3588s.h
@@ -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 */
-- 
2.43.0

Re: [PATCH v3] rockchip: rk3588s: Add support for ROC-PC-RK3588S

[Quentin Schulz]

Hi Fabio,

On 7/22/26 8:40 PM, Fabio Estevam via U-Boot wrote:
> From: Fabio Estevam <festevam@nabladev.com>
> 
> The ROC-PC-RK3588S board is an SBC made by Firefly, based on the RK3588S
> SoC.
> 
> Add support for it.
> 
> Signed-off-by: Fabio Estevam <festevam@nabladev.com>
> ---
> 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?

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

[...]

> diff --git a/board/firefly/roc-pc-rk3588s/MAINTAINERS b/board/firefly/roc-pc-rk3588s/MAINTAINERS
> new file mode 100644
> index 000000000000..a0316cab1b92
> --- /dev/null
> +++ b/board/firefly/roc-pc-rk3588s/MAINTAINERS
> @@ -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

[...]

> diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
> index b565aea311e9..d56d245dc114 100644
> --- a/doc/board/rockchip/rockchip.rst
> +++ b/doc/board/rockchip/rockchip.rst
> @@ -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

Re: [PATCH v3] rockchip: rk3588s: Add support for ROC-PC-RK3588S

[Fabio Estevam]

Hi Quentin,

On Thu, Jul 23, 2026 at 7:01 AM Quentin Schulz <quentin.schulz@cherry.de> wrote:

> 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.

> 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.

Re: [PATCH v3] rockchip: rk3588s: Add support for ROC-PC-RK3588S

[Quentin Schulz]

Hi Fabio,

On 7/23/26 1:31 PM, Fabio Estevam wrote:
> Hi Quentin,
> 
> On Thu, Jul 23, 2026 at 7:01 AM Quentin Schulz <quentin.schulz@cherry.de> wrote:
> 
>> 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.
> 

Fair enough.

>> 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

Re: [PATCH v3] rockchip: rk3588s: Add support for ROC-PC-RK3588S

[Quentin Schulz via U-Boot]

On Wed, 22 Jul 2026 15:40:24 -0300, Fabio Estevam wrote:
> 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,
-- 
Quentin Schulz <u-boot@0leil.net>