Update 0009-rockchip-add-support-for-OrangePi-R1-Plus.patch

quintus-lab · Apr 30, 2021 · 4e027ed · 4e027ed
1 parent f8a9575
commit 4e027ed
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/patches/0009-rockchip-add-support-for-OrangePi-R1-Plus.patch b/patches/0009-rockchip-add-support-for-OrangePi-R1-Plus.patch
@@ -87,7 +87,7 @@ index 9d240e464c..d197ff0fd3 100644
 
 diff --git a/package/boot/uboot-rockchip/patches/103-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch b/package/boot/uboot-rockchip/patches/103-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch
 new file mode 100644
-index 0000000000..788509b032
+index 0000000000..46a3b11594
 --- /dev/null
 +++ b/package/boot/uboot-rockchip/patches/103-rockchip-rk3328-Add-support-for-Orangepi-R1-Plus.patch
 @@ -0,0 +1,172 @@
@@ -464,34 +464,34 @@ index b10c43ba60..53ae6d023a 100644
 -friendlyarm,nanopi-r2s)
 +friendlyarm,nanopi-r2s|\
 +xunlong,orangepi-r1-plus)
-  ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
-  ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
-  ;;
+ 	ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
+ 	ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
+ 	;;
 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 b4e623532b..9c1696db02 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
 @@ -8,7 +8,8 @@ rockchip_setup_interfaces()
 
-  case "$board" in
-  friendlyarm,nanopi-r2s|\
-- friendlyarm,nanopi-r4s)
-+ friendlyarm,nanopi-r4s|\
-+ xunlong,orangepi-r1-plus)
-    ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
-    ;;
-  *)
+ 	case "$board" in
+ 	friendlyarm,nanopi-r2s|\
+-	friendlyarm,nanopi-r4s)
++	friendlyarm,nanopi-r4s|\
++	xunlong,orangepi-r1-plus)
+ 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
+ 		;;
+ 	*)
 @@ -40,6 +41,10 @@ rockchip_setup_macs()
-    wan_mac=$(cat /sys/class/net/eth0/address)
-    lan_mac=$(macaddr_add "$wan_mac" +1)
-    ;;
-+ xunlong,orangepi-r1-plus)
-+   lan_mac=$(cat /sys/class/net/eth1/address)
-+   wan_mac=$(macaddr_add "$lan_mac" -1)
-+   ;;
-  esac
+ 		wan_mac=$(cat /sys/class/net/eth0/address)
+ 		lan_mac=$(macaddr_add "$wan_mac" +1)
+ 		;;
++	xunlong,orangepi-r1-plus)
++		lan_mac=$(cat /sys/class/net/eth1/address)
++		wan_mac=$(macaddr_add "$lan_mac" -1)
++		;;
+ 	esac
 
-  [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
+ 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
 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 9e4a4cf4fc..d8e513f560 100644
 --- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
@@ -503,9 +503,9 @@ index 9e4a4cf4fc..d8e513f560 100644
 -friendlyarm,nanopi-r2s)
 +friendlyarm,nanopi-r2s|\
 +xunlong,orangepi-r1-plus)
-  set_interface_core 2 "eth0"
-  set_interface_core 4 "eth1" "xhci-hcd:usb3"
-  ;;
+ 	set_interface_core 2 "eth0"
+ 	set_interface_core 4 "eth1" "xhci-hcd:usb3"
+ 	;;
 diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
 index b3ef5a28d4..8d00cc46db 100644
 --- a/target/linux/rockchip/image/armv8.mk