target/rockchip : Add preliminary support for TPE-R1500

diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index f9ccfe5e8c9f065b148edccfc4fd4b9e41ede320..d3b3577b39867c639e11a0beb336c2c6023c8b7a 100644 (file)
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -102,6 +102,13 @@ define U-Boot/rockpro64-rk3399
     pine64_rockpro64
 endef
 
+define U-Boot/tpe-r1500-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=TPE-R1500
+  BUILD_DEVICES:= \
+    thinkpenguin_tpe-r1500
+endef
+
 UBOOT_TARGETS := \
   nanopi-r4s-rk3399 \
   rock-pi-4-rk3399 \
@@ -111,7 +118,8 @@ UBOOT_TARGETS := \
   orangepi-r1-plus-rk3328 \
   orangepi-r1-plus-lts-rk3328 \
   roc-cc-rk3328 \
-  tpe-r1400-rk3328
+  tpe-r1400-rk3328 \
+  tpe-r1500-rk3399
 
 UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
 

diff --git a/package/boot/uboot-rockchip/patches/105-rockchip-rk3328-Add-support-for-ThinkPenguin-TPE-R1400.patch b/package/boot/uboot-rockchip/patches/105-rockchip-rk3328-Add-support-for-ThinkPenguin-TPE-R1400.patch
index cfe6e56933b2a303a03de2702d9d3fbeb1c6d58f..3cdbd47fc6cfe8dcac8084af252ae0bb3d8ce364 100644 (file)
--- a/package/boot/uboot-rockchip/patches/105-rockchip-rk3328-Add-support-for-ThinkPenguin-TPE-R1400.patch
+++ b/package/boot/uboot-rockchip/patches/105-rockchip-rk3328-Add-support-for-ThinkPenguin-TPE-R1400.patch
@@ -44,7 +44,7 @@
 +CONFIG_SPL_GPIO_SUPPORT=y
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_OFFSET=0x3F8000
-+CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2s"
++CONFIG_DEFAULT_DEVICE_TREE="rk3328-tpe-r1400"
 +CONFIG_ROCKCHIP_RK3328=y
 +CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
 +CONFIG_TPL_LIBCOMMON_SUPPORT=y
@@ -59,7 +59,7 @@
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
-+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.dtb"
++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-tpe-r1400.dtb"
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_MISC_INIT_R=y

diff --git a/package/boot/uboot-rockchip/patches/106-rockchip-rk3399-Add-support-for-ThinkPenguin-TPE-R1500.patch b/package/boot/uboot-rockchip/patches/106-rockchip-rk3399-Add-support-for-ThinkPenguin-TPE-R1500.patch
new file mode 100644 (file)
index 0000000..7e88760
--- /dev/null
+++ b/package/boot/uboot-rockchip/patches/106-rockchip-rk3399-Add-support-for-ThinkPenguin-TPE-R1500.patch
@@ -0,0 +1,115 @@
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -148,7 +148,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
+       rk3399-rock-pi-4c.dtb \
+       rk3399-rock960.dtb \
+       rk3399-rockpro64.dtb \
+-      rk3399pro-rock-pi-n10.dtb
++      rk3399pro-rock-pi-n10.dtb \
++      rk3399-tpe-r1500.dtb
+ 
+ dtb-$(CONFIG_ROCKCHIP_RV1108) += \
+       rv1108-elgin-r1.dtb \
+--- /dev/null
++++ b/arch/arm/dts/rk3399-tpe-r1500-u-boot.dtsi
+@@ -0,0 +1,16 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * RK3399-based FriendlyElec boards device tree source
++ *
++ * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
++ *
++ * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.
++ * (http://www.friendlyarm.com)
++ *
++ * Copyright (c) 2018 Collabora Ltd.
++ * Copyright (c) 2019 Arm Ltd.
++ * Copyright (C) 2020 Xiaobo <peterwillcn@gmail.com>
++ */
++
++#include "rk3399-nanopi4-u-boot.dtsi"
++#include "rk3399-sdram-lpddr4-100.dtsi"
+--- /dev/null
++++ b/arch/arm/dts/rk3399-tpe-r1500.dts
+@@ -0,0 +1,16 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
++ * (http://www.friendlyarm.com)
++ *
++ * Copyright (c) 2021-2023 Tianling Shen <cnsztl@gmail.com>
++ */
++
++
++/dts-v1/;
++#include "rk3399-nanopi-r4s.dts"
++
++/ {
++        model = "ThinkPenguin TPE-R1500";
++        compatible = "thinkpenguin,tpe-r1500", "rockchip,rk3399";
++};
+--- /dev/null
++++ b/configs/tpe-r1500-rk3399_defconfig
+@@ -0,0 +1,62 @@
++CONFIG_ARM=y
++CONFIG_ARCH_ROCKCHIP=y
++CONFIG_SYS_TEXT_BASE=0x00200000
++CONFIG_NR_DRAM_BANKS=1
++CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_DEFAULT_DEVICE_TREE="rk3399-tpe-r1500"
++CONFIG_ROCKCHIP_RK3399=y
++CONFIG_TARGET_EVB_RK3399=y
++CONFIG_DEBUG_UART_BASE=0xFF1A0000
++CONFIG_DEBUG_UART_CLOCK=24000000
++CONFIG_DEBUG_UART=y
++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-tpe-r1500.dtb"
++CONFIG_DISPLAY_BOARDINFO_LATE=y
++# CONFIG_SPL_RAW_IMAGE_SUPPORT 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_DM_ETH=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_RK3399_LPDDR4=y
++CONFIG_BAUDRATE=1500000
++CONFIG_DEBUG_UART_SHIFT=2
++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_DM_VIDEO=y
++CONFIG_DISPLAY=y
++CONFIG_VIDEO_ROCKCHIP=y
++CONFIG_DISPLAY_ROCKCHIP_HDMI=y
++CONFIG_SPL_TINY_MEMSET=y
++CONFIG_ERRNO_STR=y

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
index 34e2d250cdfb7bf9cd17b3edd7da34a2eddc0a28..03e7b826d94c932592ea9677fb9e47125d78500e 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
@@ -12,6 +12,7 @@ friendlyarm,nanopi-r2c|\
 friendlyarm,nanopi-r2s|\
 friendlyarm,nanopi-r4s|\
 thinkpenguin,tpe-r1400|\
+thinkpenguin,tpe-r1500|\
 xunlong,orangepi-r1-plus|\
 xunlong,orangepi-r1-plus-lts)
        ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
index 3c47fc80b6c3474bbcddc32027d1895e6d2d5781..e5ac350a49f18854976509027139befb729e2788 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -11,6 +11,7 @@ rockchip_setup_interfaces()
        friendlyarm,nanopi-r2s|\
        friendlyarm,nanopi-r4s|\
        thinkpenguin,tpe-r1400|\
+       thinkpenguin,tpe-r1500|\
        xunlong,orangepi-r1-plus|\
        xunlong,orangepi-r1-plus-lts)
                ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
@@ -56,7 +57,8 @@ rockchip_setup_macs()
                wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0)
                lan_mac=$(macaddr_add "$wan_mac" 1)
                ;;
-       friendlyarm,nanopi-r4s)
+       friendlyarm,nanopi-r4s|\
+       thinkpenguin,tpe-r1500)
                wan_mac=$(nanopi_r4s_get_mac wan)
                lan_mac=$(nanopi_r4s_get_mac lan)
                ;;

diff --git a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
index bb119b9185ebabe3dfb92f720e5a6ab98eb6b7e2..33cb5e6ce73e0ffd4f2083c900154c137fd96a25 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
+++ b/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
@@ -36,7 +36,8 @@ xunlong,orangepi-r1-plus-lts)
        set_interface_core 2 "eth0"
        set_interface_core 4 "eth1" "xhci-hcd:usb3"
        ;;
-friendlyarm,nanopi-r4s)
+friendlyarm,nanopi-r4s|\
+thinkpenguin,tpe-r1500)
        set_interface_core 10 "eth0"
        set_interface_core 20 "eth1"
        ;;

diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 7dd5b74bb0d2e10ff9d12b92b523cccb1a21e923..04bae757c0a977ae31935218bffe166abe219946 100644 (file)
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -70,6 +70,16 @@ define Device/thinkpenguin_tpe-r1400
 endef
 TARGET_DEVICES += thinkpenguin_tpe-r1400
 
+define Device/thinkpenguin_tpe-r1500
+  DEVICE_VENDOR := ThinkPenguin
+  DEVICE_MODEL := TPE-R1500
+  DEVICE_VARIANT := 4GB LPDDR4
+  SOC := rk3399
+  IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
+  DEVICE_PACKAGES := kmod-r8169
+endef
+TARGET_DEVICES += thinkpenguin_tpe-r1500
+
 define Device/xunlong_orangepi-r1-plus
   DEVICE_VENDOR := Xunlong
   DEVICE_MODEL := Orange Pi R1 Plus

diff --git a/target/linux/rockchip/patches-5.15/109-arm64-dts-rockchip-Add-ThinkPenguin-TPE-R1500.patch b/target/linux/rockchip/patches-5.15/109-arm64-dts-rockchip-Add-ThinkPenguin-TPE-R1500.patch
new file mode 100644 (file)
index 0000000..1601b8f
--- /dev/null
+++ b/target/linux/rockchip/patches-5.15/109-arm64-dts-rockchip-Add-ThinkPenguin-TPE-R1500.patch
@@ -0,0 +1,27 @@
+--- a/arch/arm64/boot/dts/rockchip/Makefile
++++ b/arch/arm64/boot/dts/rockchip/Makefile
+@@ -55,4 +55,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ro
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-tpe-r1500.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3399-tpe-r1500.dts
+@@ -0,0 +1,16 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
++ * (http://www.friendlyarm.com)
++ *
++ * Copyright (c) 2021-2023 Tianling Shen <cnsztl@gmail.com>
++ */
++
++
++/dts-v1/;
++#include "rk3399-nanopi-r4s.dts"
++
++/ {
++        model = "ThinkPenguin TPE-R1500";
++        compatible = "thinkpenguin,tpe-r1500", "rockchip,rk3399";
++};