After committing support for the NanoPi R6S, somebody asked me about
the R6C. That model only has two Ethernet interfaces (2.5G rge(4) and
1G dwqe(4)), but does have an M.2 slot for an SSD. So the config gets
a CONFIG_NVME_PCI=y on top of what we had for the R6S.
ok?
Index: sysutils/u-boot/rk3588/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/rk3588/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- sysutils/u-boot/rk3588/Makefile 26 Feb 2024 21:43:29 -0000 1.2
+++ sysutils/u-boot/rk3588/Makefile 5 Mar 2024 14:28:20 -0000
@@ -1,9 +1,10 @@
VERSION= 2024.01-rc3
-REVISION= 0
+REVISION= 1
SOC= rk3588
BOARDS=\
+ nanopi-r6c-rk3588s \
nanopi-r6s-rk3588s \
nanopc-t6-rk3588 \
orangepi-5-plus-rk3588 \
Index:
sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c-u-boot_dtsi
===================================================================
RCS file:
sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c-u-boot_dtsi
diff -N
sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c-u-boot_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c-u-boot_dtsi
5 Mar 2024 14:28:20 -0000
@@ -0,0 +1,21 @@
+Index: arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
+--- arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi.orig
++++ arch/arm/dts/rk3588s-nanopi-r6c-u-boot.dtsi
+@@ -0,0 +1,17 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2023 Collabora Ltd.
++ */
++
++#include "rk3588s-u-boot.dtsi"
++
++/ {
++ chosen {
++ u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
++ };
++};
++
++&sdhci {
++ cap-mmc-highspeed;
++ mmc-ddr-1_8v;
++};
Index: sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c_dts
===================================================================
RCS file:
sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c_dts
diff -N sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/u-boot/rk3588/patches/patch-arch_arm_dts_rk3588s-nanopi-r6c_dts
5 Mar 2024 14:28:20 -0000
@@ -0,0 +1,18 @@
+Index: arch/arm/dts/rk3588s-nanopi-r6c.dts
+--- arch/arm/dts/rk3588s-nanopi-r6c.dts.orig
++++ arch/arm/dts/rk3588s-nanopi-r6c.dts
+@@ -0,0 +1,14 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++
++/dts-v1/;
++
++#include "rk3588s-nanopi-r6s.dts"
++
++/ {
++ model = "FriendlyElec NanoPi R6C";
++ compatible = "friendlyarm,nanopi-r6c", "rockchip,rk3588s";
++};
++
++&lan2_led {
++ label = "user_led";
++};
Index: sysutils/u-boot/rk3588/patches/patch-configs_nanopi-r6c-rk3588s_defconfig
===================================================================
RCS file:
sysutils/u-boot/rk3588/patches/patch-configs_nanopi-r6c-rk3588s_defconfig
diff -N
sysutils/u-boot/rk3588/patches/patch-configs_nanopi-r6c-rk3588s_defconfig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/u-boot/rk3588/patches/patch-configs_nanopi-r6c-rk3588s_defconfig
5 Mar 2024 14:28:20 -0000
@@ -0,0 +1,94 @@
+Index: configs/nanopi-r6c-rk3588s_defconfig
+--- configs/nanopi-r6c-rk3588s_defconfig.orig
++++ configs/nanopi-r6c-rk3588s_defconfig
+@@ -0,0 +1,90 @@
++CONFIG_ARM=y
++CONFIG_SKIP_LOWLEVEL_INIT=y
++CONFIG_COUNTER_FREQUENCY=24000000
++CONFIG_ARCH_ROCKCHIP=y
++CONFIG_TEXT_BASE=0x00a00000
++CONFIG_SPL_LIBCOMMON_SUPPORT=y
++CONFIG_SPL_LIBGENERIC_SUPPORT=y
++CONFIG_NR_DRAM_BANKS=2
++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
++CONFIG_DEFAULT_DEVICE_TREE="rk3588s-nanopi-r6c"
++CONFIG_ROCKCHIP_RK3588=y
++CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
++CONFIG_SPL_SERIAL=y
++CONFIG_SPL_STACK_R_ADDR=0x600000
++CONFIG_TARGET_EVB_RK3588=y
++CONFIG_SPL_STACK=0x400000
++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_OF_BOARD_SETUP=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_HAS_BSS_LINKER_SECTION=y
++CONFIG_SPL_BSS_START_ADDR=0x4000000
++CONFIG_SPL_BSS_MAX_SIZE=0x4000
++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
++# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
++CONFIG_SPL_STACK_R=y
++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_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_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_PHY_REALTEK=y
++CONFIG_DWC_ETH_QOS=y
++CONFIG_DWC_ETH_QOS_ROCKCHIP=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_DM_USB_GADGET=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_ERRNO_STR=y
Index: sysutils/u-boot/rk3588/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/rk3588/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- sysutils/u-boot/rk3588/pkg/PLIST 26 Feb 2024 21:43:29 -0000 1.2
+++ sysutils/u-boot/rk3588/pkg/PLIST 5 Mar 2024 14:28:20 -0000
@@ -7,6 +7,14 @@ share/u-boot/nanopc-t6-rk3588/u-boot-roc
@comment share/u-boot/nanopc-t6-rk3588/u-boot.bin
@comment share/u-boot/nanopc-t6-rk3588/u-boot.img
@comment share/u-boot/nanopc-t6-rk3588/u-boot.itb
+share/u-boot/nanopi-r6c-rk3588s/
+@comment share/u-boot/nanopi-r6c-rk3588s/idbloader.img
+@comment share/u-boot/nanopi-r6c-rk3588s/u-boot
+share/u-boot/nanopi-r6c-rk3588s/u-boot-rockchip.bin
+@comment share/u-boot/nanopi-r6c-rk3588s/u-boot-spl.bin
+@comment share/u-boot/nanopi-r6c-rk3588s/u-boot.bin
+@comment share/u-boot/nanopi-r6c-rk3588s/u-boot.img
+@comment share/u-boot/nanopi-r6c-rk3588s/u-boot.itb
share/u-boot/nanopi-r6s-rk3588s/
@comment share/u-boot/nanopi-r6s-rk3588s/idbloader.img
@comment share/u-boot/nanopi-r6s-rk3588s/u-boot
