From 133ee76af2a82456c882578056664766cd14b6ef Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 30 Apr 2023 14:52:53 +0800 Subject: [PATCH] uboot-rockchip: add NanoPi R4SE support Add support for the FriendlyARM NanoPi R4SE. Signed-off-by: Tianling Shen --- package/boot/uboot-rockchip/Makefile | 8 ++ .../patches/900-arm-add-dts-files.patch | 5 +- .../rk3399-nanopi-r4s-enterprise-u-boot.dtsi | 18 ++++- .../arm/dts/rk3399-nanopi-r4se-u-boot.dtsi | 19 +++++ .../src/arch/arm/dts/rk3399-nanopi-r4se.dts | 17 ++++ .../arch/arm/dts/rk3568-fastrhino-r68s.dts | 4 +- .../src/arch/arm/dts/rk3568-mrkaio-m68s.dts | 4 +- .../src/configs/nanopi-r4se-rk3399_defconfig | 80 +++++++++++++++++++ 8 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi create mode 100644 package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se.dts create mode 100644 package/boot/uboot-rockchip/src/configs/nanopi-r4se-rk3399_defconfig diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index 3c04eb24e7..1a3e8a2a95 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -81,6 +81,13 @@ define U-Boot/nanopi-r4s-rk3399 friendlyarm_nanopi-r4s endef +define U-Boot/nanopi-r4se-rk3399 + $(U-Boot/Default/rk3399) + NAME:=NanoPi R4SE + BUILD_DEVICES:= \ + friendlyarm_nanopi-r4se +endef + define U-Boot/nanopi-r4s-enterprise-rk3399 $(U-Boot/Default/rk3399) NAME:=NanoPi R4S Enterprise Edition @@ -149,6 +156,7 @@ endef UBOOT_TARGETS := \ nanopi-r4s-rk3399 \ + nanopi-r4se-rk3399 \ nanopi-r4s-enterprise-rk3399 \ rock-pi-4-rk3399 \ rockpro64-rk3399 \ diff --git a/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch b/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch index 0226166f0e..4fda320391 100644 --- a/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch +++ b/package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch @@ -11,15 +11,16 @@ rk3328-roc-cc.dtb \ rk3328-rock64.dtb \ rk3328-rock-pi-e.dtb -@@ -151,6 +154,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ +@@ -151,6 +154,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopi-m4b.dtb \ rk3399-nanopi-neo4.dtb \ rk3399-nanopi-r4s.dtb \ ++ rk3399-nanopi-r4se.dtb \ + rk3399-nanopi-r4s-enterprise.dtb \ rk3399-orangepi.dtb \ rk3399-pinebook-pro.dtb \ rk3399-pinephone-pro.dtb \ -@@ -166,6 +170,11 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ +@@ -166,6 +171,11 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ rk3568-evb.dtb \ diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4s-enterprise-u-boot.dtsi b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4s-enterprise-u-boot.dtsi index 7d1cecc89c..607dba7bd2 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4s-enterprise-u-boot.dtsi +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4s-enterprise-u-boot.dtsi @@ -1,3 +1,19 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "rk3399-nanopi-r4s-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + product = "NanoPi R4S Enterprise Edition"; + }; + + baseboard { + product = "NanoPi R4S Enterprise Edition"; + }; + }; + }; +}; diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi new file mode 100644 index 0000000000..03ac36e849 --- /dev/null +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se-u-boot.dtsi @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "rk3399-nanopi-r4s-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + product = "NanoPi R4SE"; + }; + + baseboard { + product = "NanoPi R4SE"; + }; + }; + }; +}; diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se.dts new file mode 100644 index 0000000000..9ff0edff06 --- /dev/null +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4se.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT) + +/dts-v1/; +#include "rk3399-nanopi-r4s.dts" + +/ { + model = "FriendlyElec NanoPi R4SE"; + compatible = "friendlyarm,nanopi-r4se", "rockchip,rk3399"; +}; + +&emmc_phy { + status = "okay"; +}; + +&sdhci { + status = "okay"; +}; diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-fastrhino-r68s.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-fastrhino-r68s.dts index 6e972796f6..e1fe5e4426 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-fastrhino-r68s.dts +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-fastrhino-r68s.dts @@ -91,13 +91,13 @@ &pinctrl { gmac0 { eth_phy0_reset_pin: eth-phy0-reset-pin { - rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; }; }; gmac1 { eth_phy1_reset_pin: eth-phy1-reset-pin { - rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_up>; }; }; }; diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-mrkaio-m68s.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-mrkaio-m68s.dts index aec419c885..7bc172e0c7 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-mrkaio-m68s.dts +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3568-mrkaio-m68s.dts @@ -125,13 +125,13 @@ &pinctrl { gmac0 { eth_phy0_reset_pin: eth-phy0-reset-pin { - rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; }; }; gmac1 { eth_phy1_reset_pin: eth-phy1-reset-pin { - rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <3 RK_PA7 RK_FUNC_GPIO &pcfg_pull_up>; }; }; diff --git a/package/boot/uboot-rockchip/src/configs/nanopi-r4se-rk3399_defconfig b/package/boot/uboot-rockchip/src/configs/nanopi-r4se-rk3399_defconfig new file mode 100644 index 0000000000..2e895d68ba --- /dev/null +++ b/package/boot/uboot-rockchip/src/configs/nanopi-r4se-rk3399_defconfig @@ -0,0 +1,80 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_TEXT_BASE=0x00200000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 +CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4se" +CONFIG_ROCKCHIP_RK3399=y +CONFIG_TARGET_EVB_RK3399=y +CONFIG_SPL_STACK=0x400000 +CONFIG_DEBUG_UART_BASE=0xFF1A0000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SYS_LOAD_ADDR=0x800800 +CONFIG_DEBUG_UART=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4se.dtb" +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x2e000 +CONFIG_SPL_PAD_TO=0x7f8000 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y +CONFIG_SPL_BSS_START_ADDR=0x400000 +CONFIG_SPL_BSS_MAX_SIZE=0x2000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_TPL=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM_ROCKCHIP_LPDDR4=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_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +CONFIG_MISC=y +CONFIG_MISC_INIT_R=y +CONFIG_ROCKCHIP_EFUSE=y +CONFIG_ROCKCHIP_OTP=y +CONFIG_SYSINFO=y +CONFIG_SYSINFO_SMBIOS=y