[PATCH 2/2] board: rockchip: Add FriendlyElec CM3588 NAS
Kever Yang
kever.yang at rock-chips.com
Fri Aug 2 08:56:44 CEST 2024
On 2024/8/1 05:12, Jonas Karlman wrote:
> The CM3588 NAS by FriendlyElec pairs the CM3588 compute module, based
> on the Rockchip RK3588 SoC, with the CM3588 NAS Kit carrier board.
>
> Features tested on a CM3588 NAS Kit with 8GB RAM 64GB eMMC module:
> - SD-card boot
> - eMMC boot
> - Ethernet
> - PCIe/NVMe
> - USB gadget
> - USB host
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> ...rk3588-friendlyelec-cm3588-nas-u-boot.dtsi | 8 ++
> arch/arm/mach-rockchip/rk3588/Kconfig | 24 +++++
> board/friendlyelec/cm3588-nas-rk3588/Kconfig | 12 +++
> .../cm3588-nas-rk3588/MAINTAINERS | 6 ++
> configs/cm3588-nas-rk3588_defconfig | 90 +++++++++++++++++++
> doc/board/rockchip/rockchip.rst | 1 +
> 6 files changed, 141 insertions(+)
> create mode 100644 arch/arm/dts/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi
> create mode 100644 board/friendlyelec/cm3588-nas-rk3588/Kconfig
> create mode 100644 board/friendlyelec/cm3588-nas-rk3588/MAINTAINERS
> create mode 100644 configs/cm3588-nas-rk3588_defconfig
>
> diff --git a/arch/arm/dts/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi b/arch/arm/dts/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi
> new file mode 100644
> index 000000000000..2e60f2dce8f1
> --- /dev/null
> +++ b/arch/arm/dts/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi
> @@ -0,0 +1,8 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +#include "rk3588-u-boot.dtsi"
> +
> +&sdhci {
> + cap-mmc-highspeed;
> + mmc-hs200-1_8v;
> +};
> diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig
> index 0dcf2249fb48..a76a470cc981 100644
> --- a/arch/arm/mach-rockchip/rk3588/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3588/Kconfig
> @@ -6,6 +6,29 @@ config TARGET_EVB_RK3588
> help
> RK3588 EVB is a evaluation board for Rockchp RK3588.
>
> +config TARGET_CM3588_NAS_RK3588
> + bool "FriendlyElec CM3588 NAS"
> + select BOARD_LATE_INIT
> + help
> + The CM3588 NAS by FriendlyElec pairs the CM3588 compute module, based
> + on the Rockchip RK3588 SoC, with the CM3588 NAS Kit carrier board.
> +
> + Hardware features:
> + - Rockchip RK3588 SoC
> + - 4GB/8GB/16GB LPDDR4x RAM
> + - 0GB/64GB HS400 eMMC
> + - MicroSD card slot
> + - 1x RTL8125B 2.5G Ethernet
> + - 4x M.2 M-Key with PCIe 3.0 x1 (via bifurcation) for NVMe SSDs
> + - 2x USB 3.0 (USB 3.1 Gen1) Type-A, 1x USB 2.0 Type-A
> + - 1x USB 3.0 Type-C with DP AltMode support
> + - 2x HDMI 2.1 out, 1x HDMI in
> + - MIPI-CSI Connector, MIPI-DSI Connector
> + - 40-pin GPIO header
> + - 4 buttons: power, reset, recovery, MASK, user button
> + - 3.5mm Headphone out, 2.0mm PH-2A Mic in
> + - 5V Fan connector, PWM beeper, IR receiver, RTC battery connector
> +
> config TARGET_JAGUAR_RK3588
> bool "Theobroma Systems SBC-RK3588-AMR (Jaguar)"
> select BOARD_LATE_INIT
> @@ -339,6 +362,7 @@ config TEXT_BASE
>
> source "board/armsom/sige7-rk3588/Kconfig"
> source "board/edgeble/neural-compute-module-6/Kconfig"
> +source "board/friendlyelec/cm3588-nas-rk3588/Kconfig"
> source "board/friendlyelec/nanopc-t6-rk3588/Kconfig"
> source "board/friendlyelec/nanopi-r6c-rk3588s/Kconfig"
> source "board/friendlyelec/nanopi-r6s-rk3588s/Kconfig"
> diff --git a/board/friendlyelec/cm3588-nas-rk3588/Kconfig b/board/friendlyelec/cm3588-nas-rk3588/Kconfig
> new file mode 100644
> index 000000000000..fdc458a42643
> --- /dev/null
> +++ b/board/friendlyelec/cm3588-nas-rk3588/Kconfig
> @@ -0,0 +1,12 @@
> +if TARGET_CM3588_NAS_RK3588
> +
> +config SYS_BOARD
> + default "cm3588-nas-rk3588"
> +
> +config SYS_VENDOR
> + default "friendlyelec"
> +
> +config SYS_CONFIG_NAME
> + default "nanopc-t6-rk3588"
> +
> +endif
> diff --git a/board/friendlyelec/cm3588-nas-rk3588/MAINTAINERS b/board/friendlyelec/cm3588-nas-rk3588/MAINTAINERS
> new file mode 100644
> index 000000000000..92b958ada6fa
> --- /dev/null
> +++ b/board/friendlyelec/cm3588-nas-rk3588/MAINTAINERS
> @@ -0,0 +1,6 @@
> +CM3588-NAS-RK3588
> +M: Jonas Karlman <jonas at kwiboo.se>
> +S: Maintained
> +F: board/friendlyelec/cm3588-nas-rk3588
> +F: configs/cm3588-nas-rk3588_defconfig
> +F: arch/arm/dts/rk3588-friendlyelec-cm3588-nas*
> diff --git a/configs/cm3588-nas-rk3588_defconfig b/configs/cm3588-nas-rk3588_defconfig
> new file mode 100644
> index 000000000000..d6d82757a2de
> --- /dev/null
> +++ b/configs/cm3588-nas-rk3588_defconfig
> @@ -0,0 +1,90 @@
> +CONFIG_ARM=y
> +CONFIG_SKIP_LOWLEVEL_INIT=y
> +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
> +CONFIG_COUNTER_FREQUENCY=24000000
> +CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-friendlyelec-cm3588-nas"
> +CONFIG_ROCKCHIP_RK3588=y
> +CONFIG_SPL_SERIAL=y
> +CONFIG_TARGET_CM3588_NAS_RK3588=y
> +CONFIG_DEBUG_UART_BASE=0xFEB50000
> +CONFIG_DEBUG_UART_CLOCK=24000000
> +CONFIG_SYS_LOAD_ADDR=0xc00800
> +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_DEFAULT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"
> +# CONFIG_DISPLAY_CPUINFO is not set
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_SPL_MAX_SIZE=0x40000
> +CONFIG_SPL_PAD_TO=0x7f8000
> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> +CONFIG_SPL_ATF=y
> +CONFIG_CMD_GPIO=y
> +CONFIG_CMD_GPT=y
> +CONFIG_CMD_I2C=y
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_PCI=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_ROCKUSB=y
> +CONFIG_CMD_USB_MASS_STORAGE=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="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_SPL_DM_SEQ_ALIAS=y
> +CONFIG_SPL_REGMAP=y
> +CONFIG_SPL_SYSCON=y
> +CONFIG_BUTTON=y
> +CONFIG_BUTTON_ADC=y
> +CONFIG_BUTTON_GPIO=y
> +CONFIG_SPL_CLK=y
> +# CONFIG_USB_FUNCTION_FASTBOOT is not set
> +CONFIG_ROCKCHIP_GPIO=y
> +CONFIG_SYS_I2C_ROCKCHIP=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_PHYLIB=y
> +CONFIG_RTL8169=y
> +CONFIG_NVME_PCI=y
> +CONFIG_PCIE_DW_ROCKCHIP=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
> +CONFIG_PHY_ROCKCHIP_USBDP=y
> +CONFIG_SPL_PINCTRL=y
> +CONFIG_DM_PMIC=y
> +CONFIG_PMIC_RK8XX=y
> +CONFIG_REGULATOR_RK8XX=y
> +CONFIG_PWM_ROCKCHIP=y
> +CONFIG_SPL_RAM=y
> +CONFIG_BAUDRATE=1500000
> +CONFIG_DEBUG_UART_SHIFT=2
> +CONFIG_SYS_NS16550_MEM32=y
> +CONFIG_ROCKCHIP_SPI=y
> +CONFIG_SYSRESET=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_USB_DWC3=y
> +CONFIG_USB_DWC3_GENERIC=y
> +CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_DOWNLOAD=y
> +CONFIG_USB_FUNCTION_ROCKUSB=y
> +CONFIG_ERRNO_STR=y
> diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
> index 637d489f8428..0f9cb404d934 100644
> --- a/doc/board/rockchip/rockchip.rst
> +++ b/doc/board/rockchip/rockchip.rst
> @@ -127,6 +127,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)
> + - FriendlyElec CM3588 NAS (cm3588-nas-rk3588)
> - FriendlyElec NanoPC-T6 (nanopc-t6-rk3588)
> - FriendlyElec NanoPi R6C (nanopi-r6c-rk3588s)
> - FriendlyElec NanoPi R6S (nanopi-r6s-rk3588s)
More information about the U-Boot
mailing list