Merge pull request #1217 from buglloc/nanopi-r5s

ophub · web-flow · commit 214e60375d8b · 2023-03-26T18:56:31.000+08:00
Added NanoPi R5S support
diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
@@ -25,7 +25,7 @@ on:
         options:
           - all
           - s922x_s905x3_s905d_s912_s905l3a
-          - r66s_r68s_h66k_h68k_e25
+          - r66s_r68s_h66k_h68k_e25_nanopi-r5s
           - eaidk-610_king3399_tn3399_kylin3399
           - vplus_tqc-a01_tanix-tx6
           - a311d
@@ -54,6 +54,7 @@ on:
           - h66k
           - h68k
           - e25
+          - nanopi-r5s
           - eaidk-610
           - king3399
           - kylin3399
diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml
@@ -21,7 +21,7 @@ on:
         options:
           - all
           - s922x_s905x3_s905d_s912_s905l3a
-          - r66s_r68s_h66k_h68k_e25
+          - r66s_r68s_h66k_h68k_e25_nanopi-r5s
           - eaidk-610_king3399_tn3399_kylin3399
           - vplus_tqc-a01_tanix-tx6
           - a311d
@@ -48,6 +48,7 @@ on:
           - h66k
           - h68k
           - e25
+          - nanopi-r5s
           - eaidk-610
           - king3399
           - kylin3399
diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
@@ -25,7 +25,7 @@ on:
         options:
           - all
           - s922x_s905x3_s905d_s912_s905l3a
-          - r66s_r68s_h66k_h68k_e25
+          - r66s_r68s_h66k_h68k_e25_nanopi-r5s
           - eaidk-610_king3399_tn3399_kylin3399
           - vplus_tqc-a01_tanix-tx6
           - a311d
@@ -54,6 +54,7 @@ on:
           - h66k
           - h68k
           - e25
+          - nanopi-r5s
           - eaidk-610
           - king3399
           - kylin3399
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ The latest version of the Armbian system can be downloaded in [Releases](https:/
 | s905lb | [Q96-mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/734), [BesTV-R3300L](https://github.com/ophub/amlogic-s9xxx-armbian/pull/993), [SumaVision-Q7](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1190) | All | amlogic_s905lb.img |
 | s905 | [Beelink-Mini-MX-2G](https://github.com/ophub/amlogic-s9xxx-armbian/issues/127), [Sunvell-T95M](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/337), [MXQ-Pro+4K](https://github.com/ophub/amlogic-s9xxx-armbian/issues/715), [SumaVision-Q5](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1175) | All | amlogic_s905.img |
 | rk3588 | [Radxa-Rock5B](https://wiki.radxa.com/Rock5/5b), [HinLink-H88K](http://www.hinlink.com/index.php?id=138) | [rk3588](https://github.com/ophub/kernel/releases/tag/kernel_rk3588) | rockchip_boxname.img |
-| rk3568 | [FastRhino-R66S](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1061), [FastRhino-R68S](https://github.com/ophub/amlogic-s9xxx-armbian/issues/774), [HinLink-H66K](http://www.hinlink.com/index.php?id=137), [HinLink-H68K](http://www.hinlink.com/index.php?id=119), [Radxa-E25](https://wiki.radxa.com/Rock3/CM/CM3I/E25) | [6.x.y](https://github.com/ophub/kernel/releases/tag/kernel_stable) | rockchip_boxname.img |
+| rk3568 | [FastRhino-R66S](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1061), [FastRhino-R68S](https://github.com/ophub/amlogic-s9xxx-armbian/issues/774), [HinLink-H66K](http://www.hinlink.com/index.php?id=137), [HinLink-H68K](http://www.hinlink.com/index.php?id=119), [Radxa-E25](https://wiki.radxa.com/Rock3/CM/CM3I/E25), [NanoPi R5S](https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R5S) | [6.x.y](https://github.com/ophub/kernel/releases/tag/kernel_stable) | rockchip_boxname.img |
 | rk3399 | [EAIDK-610](https://github.com/ophub/amlogic-s9xxx-armbian/pull/991), [KING3399](https://github.com/ophub/amlogic-s9xxx-armbian/pull/1080), [TN3399](https://github.com/ophub/amlogic-s9xxx-armbian/pull/1094), [KYLIN3399](https://github.com/ophub/amlogic-s9xxx-armbian/pull/1132) | [6.x.y](https://github.com/ophub/kernel/releases/tag/kernel_stable) | rockchip_boxname.img |
 | rk3328 | [BeikeYun](https://github.com/ophub/amlogic-s9xxx-armbian/issues/852), [L1-Pro](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1007) | All | rockchip_boxname.img |
 | h6 | [Vplus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1100), [TQC-A01](https://github.com/ophub/amlogic-s9xxx-armbian/pull/1111), [Tanix-TX6](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1120) | All | allwinner_boxname.img |
diff --git a/build-armbian/armbian-files/common-files/etc/model_database.conf b/build-armbian/armbian-files/common-files/etc/model_database.conf
@@ -177,6 +177,7 @@ r202    :R68S                        :rk3568   :rk3568-fastrhino-r68s.dtb
 r203    :H66K                        :rk3568   :rk3568-opc-h66k.dtb                    :NA                           :NA                                  :bootloader.bin                  :6.1.y           :rockchip   :rk3568        :armbianEnv.txt  :h66k              :yes
 r204    :H68K                        :rk3568   :rk3568-opc-h68k.dtb                    :NA                           :NA                                  :bootloader.bin                  :6.1.y           :rockchip   :rk3568        :armbianEnv.txt  :h68k              :yes
 r205    :E25                         :rk3568   :rk3568-radxa-e25.dtb                   :NA                           :u-boot.itb                          :idbloader.img                   :6.1.y           :rockchip   :rk3568        :armbianEnv.txt  :e25               :yes
+r206    :NANOPI-R5S                         :rk3568   :rk3568-nanopi-r5.dtb                   :NA                           :u-boot.itb                          :idbloader.img                   :6.1.y           :rockchip   :rk3568        :armbianEnv.txt  :nanopi-r5s             :yes
 
 
 # Rockchip RK3399 Family
diff --git a/build-armbian/armbian-files/common-files/usr/sbin/balethirq.pl b/build-armbian/armbian-files/common-files/usr/sbin/balethirq.pl
@@ -229,6 +229,8 @@ ()
         &optimize_eth_parameters("eth0","eth1");
     } elsif($board eq "Radxa ROCK 5B") {
         &optimize_eth_parameters("eth0","eth1");
+    } elsif($board eq "FriendlyElec NanoPi R5") {
+        &optimize_eth_parameters("eth0","eth1","eth2");
     }
 }
 
diff --git a/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3568-nanopi-r5.dtb b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3568-nanopi-r5.dtb

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,8 @@ ()`
`229`	`229`	`&optimize_eth_parameters("eth0","eth1");`
`230`	`230`	`} elsif($board eq "Radxa ROCK 5B") {`
`231`	`231`	`&optimize_eth_parameters("eth0","eth1");`
	`232`	`+ } elsif($board eq "FriendlyElec NanoPi R5") {`
	`233`	`+ &optimize_eth_parameters("eth0","eth1","eth2");`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`