Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-09 02:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rockchip: add NanoPi R4SE

Browse Source 
The FriendlyARM NanoPi R4SE is a minor variant of R4S with a on-board eMMC.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1ef239173c8728e28ee913a333944c5f78276915)
This commit is contained in:
Tianling Shen 2023-04-30 14:55:59 +08:00
parent 002f71defd
commit 6e54cb5d37
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
View File

@ -16,7 +16,8 @@ xunlong,orangepi-r1-plus-lts)
ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1" ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
;; ;;
friendlyarm,nanopi-r4s) friendlyarm,nanopi-r4s|\
friendlyarm,nanopi-r4se)
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0" ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1" ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
;; ;;

5
target/linux/rockchip/armv8/base-files/etc/board.d/02_network
View File

@ -11,6 +11,7 @@ rockchip_setup_interfaces()
friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2c|\
friendlyarm,nanopi-r2s|\ friendlyarm,nanopi-r2s|\
friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4s|\
friendlyarm,nanopi-r4se|\
xunlong,orangepi-r1-plus|\ xunlong,orangepi-r1-plus|\
xunlong,orangepi-r1-plus-lts) xunlong,orangepi-r1-plus-lts)
ucidef_set_interfaces_lan_wan 'eth1' 'eth0' ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
@ -68,6 +69,10 @@ rockchip_setup_macs()
wan_mac=$(nanopi_r4s_get_mac wan) wan_mac=$(nanopi_r4s_get_mac wan)
lan_mac=$(nanopi_r4s_get_mac lan) lan_mac=$(nanopi_r4s_get_mac lan)
;; ;;
friendlyarm,nanopi-r4se)
wan_mac=$(generate_mac_from_mmc_cid mmcblk2)
lan_mac=$(macaddr_add "$wan_mac" 1)
;;
xunlong,orangepi-r1-plus|\ xunlong,orangepi-r1-plus|\
xunlong,orangepi-r1-plus-lts) xunlong,orangepi-r1-plus-lts)
lan_mac=$(cat /sys/class/net/eth1/address) lan_mac=$(cat /sys/class/net/eth1/address)

3
target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
View File

@ -36,7 +36,8 @@ xunlong,orangepi-r1-plus-lts)
set_interface_core 2 "eth0" set_interface_core 2 "eth0"
set_interface_core 4 "eth1" "xhci-hcd:usb3" set_interface_core 4 "eth1" "xhci-hcd:usb3"
;; ;;
friendlyarm,nanopi-r4s) friendlyarm,nanopi-r4s|\
friendlyarm,nanopi-r4se)
set_interface_core 10 "eth0" set_interface_core 10 "eth0"
set_interface_core 20 "eth1" set_interface_core 20 "eth1"
;; ;;

10
target/linux/rockchip/image/armv8.mk
View File

@ -42,6 +42,16 @@ define Device/friendlyarm_nanopi-r4s
endef endef
TARGET_DEVICES += friendlyarm_nanopi-r4s TARGET_DEVICES += friendlyarm_nanopi-r4s
define Device/friendlyarm_nanopi-r4se
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R4SE
SOC := rk3399
UBOOT_DEVICE_NAME := nanopi-r4se-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata
DEVICE_PACKAGES := kmod-r8168 -urngd
endef
TARGET_DEVICES += friendlyarm_nanopi-r4se
define Device/pine64_rockpro64 define Device/pine64_rockpro64
DEVICE_VENDOR := Pine64 DEVICE_VENDOR := Pine64
DEVICE_MODEL := RockPro64 DEVICE_MODEL := RockPro64

30
target/linux/rockchip/patches-5.4/205-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch Normal file
View File

@ -0,0 +1,30 @@
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -29,6 +29,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4se.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/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";
+};