From 46e4e2aadb6903f287368af39301c585fdb20aa8 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 10 May 2023 21:13:03 +0800 Subject: [PATCH] rockchip: setup network config for nanopi r2c plus Signed-off-by: Tianling Shen --- .../src/arch/arm/dts/rk3328-nanopi-r2c-plus.dts | 4 ++++ target/linux/rockchip/armv8/base-files/etc/board.d/01_leds | 1 + target/linux/rockchip/armv8/base-files/etc/board.d/02_network | 2 ++ .../armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity | 1 + .../arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts | 4 ++++ 5 files changed, 12 insertions(+) diff --git a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3328-nanopi-r2c-plus.dts b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3328-nanopi-r2c-plus.dts index edccc5563c..d7304c6f53 100644 --- a/package/boot/uboot-rockchip/src/arch/arm/dts/rk3328-nanopi-r2c-plus.dts +++ b/package/boot/uboot-rockchip/src/arch/arm/dts/rk3328-nanopi-r2c-plus.dts @@ -10,6 +10,10 @@ / { model = "FriendlyElec NanoPi R2C Plus"; compatible = "friendlyarm,nanopi-r2c-plus", "rockchip,rk3328"; + + aliases { + mmc1 = &emmc; + }; }; &emmc { 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 c1427e75ef..f131af5742 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds @@ -9,6 +9,7 @@ board_config_update case $board in friendlyarm,nanopi-r2c|\ +friendlyarm,nanopi-r2c-plus|\ friendlyarm,nanopi-r2s|\ friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4se|\ 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 b7e5c6a0d0..d990f791d5 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network @@ -9,6 +9,7 @@ rockchip_setup_interfaces() case "$board" in ezpro,mrkaio-m68s|\ friendlyarm,nanopi-r2c|\ + friendlyarm,nanopi-r2c-plus|\ friendlyarm,nanopi-r2s|\ friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r4se|\ @@ -49,6 +50,7 @@ rockchip_setup_macs() wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0) lan_mac=$(macaddr_add "$wan_mac" 1) ;; + friendlyarm,nanopi-r2c-plus|\ friendlyarm,nanopi-r4s|\ friendlyarm,nanopi-r5c|\ friendlyarm,nanopi-r5s) 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 1161a84260..52ecb9ea8d 100644 --- 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,6 +36,7 @@ lunzn,fastrhino-r66s) set_interface_core 4 "eth1" ;; friendlyarm,nanopi-r2c|\ +friendlyarm,nanopi-r2c-plus|\ friendlyarm,nanopi-r2s|\ xunlong,orangepi-r1-plus|\ xunlong,orangepi-r1-plus-lts) diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts index edccc5563c..d7304c6f53 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus.dts @@ -10,6 +10,10 @@ / { model = "FriendlyElec NanoPi R2C Plus"; compatible = "friendlyarm,nanopi-r2c-plus", "rockchip,rk3328"; + + aliases { + mmc1 = &emmc; + }; }; &emmc {