mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-22 12:54:37 +00:00
board: rockchip: Add FriendlyElec NanoPi R6C
The NanoPi R6C is a SBC by FriendlyElec based on the Rockchip RK3588s. It comes with 4GB or 8GB of RAM, a microSD card slot, optional 32GB eMMC storage, one M.2 M-Key connector, one RTL8211F 1GbE and one RTL8125 2.5GbE Ethernet port, one USB 2.0 Type-A and one USB 3.0 Type-A port, a HDMI port, a 30-pin GPIO header as well as multiple buttons and LEDs. Add initial support for this board using the upstream devicetree sources. Tested in U-Boot proper: - Booting from eMMC works - 1GbE Ethernet works using the eth_eqos driver (tested by ping) - 2.5GbE Ethernet works using the eth_rtl8169 driver (tested by ping), but the status LEDs on this specific port currently aren't working - NVMe SSD in M.2 socket does get recognized (tested with `nvme scan` followed by `nvme details`) Kernel commit: d5f1d7437451 ("arm64: dts: rockchip: Add support for NanoPi R6C") Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: Sebastian Kropatsch <seb-dev@mail.de>
This commit is contained in:
parent
5670a90a0c
commit
f59d40aa55
7 changed files with 131 additions and 0 deletions
3
arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
Normal file
3
arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||||
|
|
||||||
|
#include "rk3588s-u-boot.dtsi"
|
|
@ -78,6 +78,18 @@ config TARGET_NANOPCT6_RK3588
|
||||||
Power: 5.5*2.1mm DC Jack, 12VDC input
|
Power: 5.5*2.1mm DC Jack, 12VDC input
|
||||||
Dimensions: 110x80x1.6mm (without case) / 86x114.5x30mm (with case)
|
Dimensions: 110x80x1.6mm (without case) / 86x114.5x30mm (with case)
|
||||||
|
|
||||||
|
config TARGET_NANOPI_R6C_RK3588S
|
||||||
|
bool "FriendlyElec NanoPi R6C"
|
||||||
|
select BOARD_LATE_INIT
|
||||||
|
help
|
||||||
|
The NanoPi R6C is a SBC by FriendlyElec based on the Rockchip
|
||||||
|
RK3588s.
|
||||||
|
It comes with 4GB or 8GB of RAM, a microSD card slot, optional 32GB
|
||||||
|
eMMC storage, one M.2 M-Key connector, one RTL8211F 1GbE and one
|
||||||
|
RTL8125 2.5GbE Ethernet port, one USB 2.0 Type-A and one USB 3.0
|
||||||
|
Type-A port, a HDMI port, a 30-pin GPIO header as well as some
|
||||||
|
buttons and LEDs.
|
||||||
|
|
||||||
config TARGET_NOVA_RK3588
|
config TARGET_NOVA_RK3588
|
||||||
bool "Indiedroid Nova RK3588"
|
bool "Indiedroid Nova RK3588"
|
||||||
select BOARD_LATE_INIT
|
select BOARD_LATE_INIT
|
||||||
|
@ -288,6 +300,7 @@ config TEXT_BASE
|
||||||
source "board/armsom/sige7-rk3588/Kconfig"
|
source "board/armsom/sige7-rk3588/Kconfig"
|
||||||
source "board/edgeble/neural-compute-module-6/Kconfig"
|
source "board/edgeble/neural-compute-module-6/Kconfig"
|
||||||
source "board/friendlyelec/nanopc-t6-rk3588/Kconfig"
|
source "board/friendlyelec/nanopc-t6-rk3588/Kconfig"
|
||||||
|
source "board/friendlyelec/nanopi-r6c-rk3588s/Kconfig"
|
||||||
source "board/indiedroid/nova/Kconfig"
|
source "board/indiedroid/nova/Kconfig"
|
||||||
source "board/pine64/quartzpro64-rk3588/Kconfig"
|
source "board/pine64/quartzpro64-rk3588/Kconfig"
|
||||||
source "board/turing/turing-rk1-rk3588/Kconfig"
|
source "board/turing/turing-rk1-rk3588/Kconfig"
|
||||||
|
|
12
board/friendlyelec/nanopi-r6c-rk3588s/Kconfig
Normal file
12
board/friendlyelec/nanopi-r6c-rk3588s/Kconfig
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
if TARGET_NANOPI_R6C_RK3588S
|
||||||
|
|
||||||
|
config SYS_BOARD
|
||||||
|
default "nanopi-r6c-rk3588s"
|
||||||
|
|
||||||
|
config SYS_VENDOR
|
||||||
|
default "friendlyelec"
|
||||||
|
|
||||||
|
config SYS_CONFIG_NAME
|
||||||
|
default "nanopi-r6c-rk3588s"
|
||||||
|
|
||||||
|
endif
|
7
board/friendlyelec/nanopi-r6c-rk3588s/MAINTAINERS
Normal file
7
board/friendlyelec/nanopi-r6c-rk3588s/MAINTAINERS
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
NANOPI-R6C
|
||||||
|
M: Sebastian Kropatsch <seb-dev@mail.de>
|
||||||
|
S: Maintained
|
||||||
|
F: arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
|
||||||
|
F: board/friendlyelec/nanopi-r6c-rk3588s
|
||||||
|
F: configs/nanopi-r6c-rk3588s_defconfig
|
||||||
|
F: include/configs/nanopi-r6c-rk3588s.h
|
83
configs/nanopi-r6c-rk3588s_defconfig
Normal file
83
configs/nanopi-r6c-rk3588s_defconfig
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
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/rk3588s-nanopi-r6c"
|
||||||
|
CONFIG_ROCKCHIP_RK3588=y
|
||||||
|
CONFIG_SPL_SERIAL=y
|
||||||
|
CONFIG_TARGET_NANOPI_R6C_RK3588S=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/rk3588s-nanopi-r6c.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_PWM=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_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_SPL_DM_SEQ_ALIAS=y
|
||||||
|
CONFIG_SPL_REGMAP=y
|
||||||
|
CONFIG_SPL_SYSCON=y
|
||||||
|
CONFIG_SPL_CLK=y
|
||||||
|
# CONFIG_USB_FUNCTION_FASTBOOT is not set
|
||||||
|
CONFIG_ROCKCHIP_GPIO=y
|
||||||
|
CONFIG_SYS_I2C_ROCKCHIP=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_SPI_FLASH is not set
|
||||||
|
CONFIG_PHY_REALTEK=y
|
||||||
|
CONFIG_DWC_ETH_QOS=y
|
||||||
|
CONFIG_DWC_ETH_QOS_ROCKCHIP=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_PWM_ROCKCHIP=y
|
||||||
|
CONFIG_SPL_RAM=y
|
||||||
|
CONFIG_BAUDRATE=1500000
|
||||||
|
CONFIG_DEBUG_UART_SHIFT=2
|
||||||
|
CONFIG_SYS_NS16550_MEM32=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
|
|
@ -123,6 +123,7 @@ List of mainline supported Rockchip boards:
|
||||||
- Edgeble Neural Compute Module 6A SoM - Neu6a (neu6a-io-rk3588)
|
- Edgeble Neural Compute Module 6A SoM - Neu6a (neu6a-io-rk3588)
|
||||||
- Edgeble Neural Compute Module 6B SoM - Neu6b (neu6b-io-rk3588)
|
- Edgeble Neural Compute Module 6B SoM - Neu6b (neu6b-io-rk3588)
|
||||||
- FriendlyElec NanoPC-T6 (nanopc-t6-rk3588)
|
- FriendlyElec NanoPC-T6 (nanopc-t6-rk3588)
|
||||||
|
- FriendlyElec NanoPi R6C (nanopi-r6c-rk3588s)
|
||||||
- Generic RK3588S/RK3588 (generic-rk3588)
|
- Generic RK3588S/RK3588 (generic-rk3588)
|
||||||
- Indiedroid Nova (nova-rk3588s)
|
- Indiedroid Nova (nova-rk3588s)
|
||||||
- Pine64 QuartzPro64 (quartzpro64-rk3588)
|
- Pine64 QuartzPro64 (quartzpro64-rk3588)
|
||||||
|
|
12
include/configs/nanopi-r6c-rk3588s.h
Normal file
12
include/configs/nanopi-r6c-rk3588s.h
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||||
|
|
||||||
|
#ifndef __NANOPI_R6C_RK3588S_H
|
||||||
|
#define __NANOPI_R6C_RK3588S_H
|
||||||
|
|
||||||
|
#define ROCKCHIP_DEVICE_SETTINGS \
|
||||||
|
"stdout=serial,vidconsole\0" \
|
||||||
|
"stderr=serial,vidconsole\0"
|
||||||
|
|
||||||
|
#include <configs/rk3588_common.h>
|
||||||
|
|
||||||
|
#endif /* __NANOPI_R6C_RK3588S_H */
|
Loading…
Add table
Reference in a new issue