Add m401a(s905l3) support option

ophub · Mar 3, 2023 · e2d3f7e · e2d3f7e
1 parent 14a4974
commit e2d3f7e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
@@ -41,8 +41,10 @@ on:
           - s905x
           - s905w
           - s905
-          - s905l3a
           - s905l2
+          - s905l3
+          - s905l3a
+          - s905l3b
           - s905lb-r3300l
           - rock5b
           - h88k

diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
@@ -41,8 +41,10 @@ on:
           - s905x
           - s905w
           - s905
-          - s905l3a
           - s905l2
+          - s905l3
+          - s905l3a
+          - s905l3b
           - s905lb-r3300l
           - rock5b
           - h88k

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -73,4 +73,5 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | [irfanjunaid](https://github.com/irfanjunaid) | 62. [2023-02-20] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1077), `TX3-BZ(s905x3)` box can be installed in eMMC, dtb uses `meson-sm1-tx3-bz.dtb` file, Mainline u-boot is required. The 100Mb wired network, Wifi and Bluetooth all works fine. |
 | [13584452567](https://github.com/13584452567) | 63. [2023-02-22] He shared his support for `tn3399(rk3399)` device in [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/1094), This device can be installed in eMMC, dtb uses `rk3399-tn3399.dtb` file. The Gigabit wired, wireless, bluetooth works fine. |
 | [yu13740000](https://github.com/yu13740000) | 64. [2023-02-23] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1100), `Vplus(allwinner-h6)` can start from `USB`, use `armbian-install` to write eMMC, and use `armbian-update` to update the kernel and use it normal. The u-boot and other resources used are from the OpenWrt project repository of [unifreq](https://github.com/unifreq/openwrt_packit). |
+| [yhxxm](https://github.com/yhxxm) | 65. [2023-03-03] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921#issuecomment-1453143251), `M401A(s905l3)` box can be installed in eMMC, dtb uses `mmeson-gxl-s905l2-x7-5g.dtb` file, and u-boot uses `u-boot-p212.bin` file. The 100Mb wired network. |
 
diff --git a/README.cn.md b/README.cn.md
@@ -23,7 +23,7 @@
 | 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) | 全部 | aml_s905.img |
 | s905l3a | [E900V22C/D](https://github.com/Calmact/e900v22c), [CM311-1a-YST](https://github.com/ophub/amlogic-s9xxx-armbian/issues/517), [M401A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/732), [M411A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/517), [UNT403A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [UNT413A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [ZTE-B863AV3.2-M](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | 全部 | aml_s905l3a.img |
 | s905lb/3b | [M302A/M304A](https://github.com/ophub/amlogic-s9xxx-armbian/pull/615), [E900V22E](https://github.com/ophub/amlogic-s9xxx-armbian/issues/939), [BesTV-R3300L(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/pull/993) | 全部 | aml_s905l2.img<br />aml_s905lb-r3300l.img |
-| s905l2/3 | [MGV2000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [MGV3000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921), [Wojia-TV-IPBS9505](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [CM311-1(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763), [HG680-LC(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/978) | 全部 | aml_s905l2.img |
+| s905l2/3 | [MGV2000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [MGV3000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921), [Wojia-TV-IPBS9505](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [CM311-1(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763), [HG680-LC(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/978), [M401A(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921#issuecomment-1453143251) | 全部 | aml_s905l2.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/tree/main/pub/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) | [6.x.y](https://github.com/ophub/kernel/tree/main/pub/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) | [6.x.y](https://github.com/ophub/kernel/tree/main/pub/stable) | rockchip_boxname.img |

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https
 | 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) | All | aml_s905.img |
 | s905l3a | [E900V22C/D](https://github.com/Calmact/e900v22c), [CM311-1a-YST](https://github.com/ophub/amlogic-s9xxx-armbian/issues/517), [M401A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/732), [M411A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/517), [UNT403A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [UNT413A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [ZTE-B863AV3.2-M](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | All | aml_s905l3a.img |
 | s905lb/3b | [M302A/M304A](https://github.com/ophub/amlogic-s9xxx-armbian/pull/615), [E900V22E](https://github.com/ophub/amlogic-s9xxx-armbian/issues/939), [BesTV-R3300L(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/pull/993) | All | aml_s905l2.img<br />aml_s905lb-r3300l.img |
-| s905l2/3 | [MGV2000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [MGV3000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921), [Wojia-TV-IPBS9505](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [CM311-1(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763), [HG680-LC(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/978) | All | aml_s905l2.img |
+| s905l2/3 | [MGV2000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [MGV3000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921), [Wojia-TV-IPBS9505](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [CM311-1(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763), [HG680-LC(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/978), [M401A(s905l3)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/921#issuecomment-1453143251) | All | aml_s905l2.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/tree/main/pub/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) | [6.x.y](https://github.com/ophub/kernel/tree/main/pub/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) | [6.x.y](https://github.com/ophub/kernel/tree/main/pub/stable) | rockchip_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
@@ -43,12 +43,12 @@
 # 1.ID  2.MODEL                      3.SOC     4.FDTFILE                               5.UBOOT_OVERLOAD              6.MAINLINE_UBOOT                     7.BOOTLOADER_IMG                 8.KERNEL_BRANCH  9.PLATFORM  10.FAMILY      11.BOOT_CONF     12.BOARD         13.BUILD
 #-------+----------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+----------------+-----------+--------------+----------------+----------------+-------
 111     :TX9                         :s905x    :meson-gxl-s905x-tx9.dtb                :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905x           :no
-112     :M302A/M304A                 :s905l3b  :meson-gxl-s905l3b-m302a.dtb            :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3b         :no
+112     :M302A/M304A                 :s905l3b  :meson-gxl-s905l3b-m302a.dtb            :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3b         :yes
 113     :MGV2000/MGV3000             :s905l2   :meson-gxl-s905l2-x7-5g.dtb             :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l2          :yes
 114     :Wojia-TV-IPBS9505           :s905l2   :meson-gxl-s905l2-ipbs9505.dtb          :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l2          :no
 115     :Q96-mini                    :s905l-b  :meson-gxl-s905x-p212.dtb               :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l-b         :no
 #-------+----------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+----------------+-----------+--------------+----------------+----------------+-------
-116     :CM311-1/HG680-LC            :s905l3   :meson-gxl-s905l2-x7-5g.dtb             :u-boot-p212.bin              :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3          :no
+116     :CM311-1/HG680-LC/M401A      :s905l3   :meson-gxl-s905l2-x7-5g.dtb             :u-boot-p212.bin              :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3          :yes
 117     :E900V22E                    :s905l3b  :meson-gxl-s905l3b-e900v22e.dtb         :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3b         :no
 118     :BesTV-R3300L                :s905l-b  :meson-gxl-s905x-p212.dtb               :u-boot-r3300l.bin            :r3300l-u-boot.bin.sd.bin            :NA                              :stable          :amlogic    :meson-gxl     :extlinux.conf   :s905lb-r3300l   :yes
 119     :X96W/FunTV                  :s905w    :meson-gxl-s905w-x96w.dtb               :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905w           :no

diff --git a/build-armbian/documents/amlogic_model_database.md b/build-armbian/documents/amlogic_model_database.md
@@ -31,7 +31,7 @@ For users who perform custom compilation in the `fork` source code repository, i
 <tr><td>113</td><td>MGV2000/MGV3000</td><td>s905l2</td><td>meson-gxl-s905l2-x7-5g.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L2,2+8G,USB2.0x2,LAN 100Mb Nic,2.4/5GHz Wi-Fi + Bluetooth(Cdtech 47822BS/Realtek 8822BS,no work)</td><td>meson-gxl</td><td>s905l2</td><td>yes</td></tr>
 <tr><td>114</td><td>Wojia-TV-IPBS9505</td><td>s905l2</td><td>meson-gxl-s905l2-ipbs9505.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L2,2+8G,USB2.0x2,LAN 100Mb Nic</td><td>meson-gxl</td><td>s905l2</td><td>no</td></tr>
 <tr><td>115</td><td>Q96 mini</td><td>s905l-b</td><td>meson-gxl-s905x-p212.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>1+8G,100Mb Nic</td><td>meson-gxl</td><td>s905l-b</td><td>no</td></tr>
-<tr><td>116</td><td>CM311-1/HG680-LC</td><td>s905l3</td><td>meson-gxl-s905l2-x7-5g.dtb</td><td>u-boot-p212.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,2+8G,USB2.0x2,LAN 100Mb Nic</td><td>meson-gxl</td><td>s905l3</td><td>no</td></tr>
+<tr><td>116</td><td>CM311-1/HG680-LC/M401A</td><td>s905l3</td><td>meson-gxl-s905l2-x7-5g.dtb</td><td>u-boot-p212.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,2+8G,USB2.0x2,LAN 100Mb Nic</td><td>meson-gxl</td><td>s905l3</td><td>no</td></tr>
 <tr><td>117</td><td>E900V22E</td><td>s905l3b</td><td>meson-gxl-s905l3b-e900v22e.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L3b,2+8G,USB2.0x2,LAN 100Mb Nic(Need to flash to android9 system)</td><td>meson-gxl</td><td>s905l3</td><td>no</td></tr>
 <tr><td>118</td><td>BesTV R3300L</td><td>s905l-b</td><td>meson-gxl-s905x-p212.dtb</td><td>u-boot-r3300l.bin</td><td>r3300l-u-boot.bin.sd.bin</td><td>NA</td><td>1+8G,100Mb Nic(Use: extlinux/extlinux.conf)</td><td>meson-gxl</td><td>s905lb-r3300l</td><td>yes</td></tr>
 <tr><td>119</td><td>X96W/FunTV</td><td>s905w</td><td>meson-gxl-s905w-x96w.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>2GB-RAM,16GB-ROM,100Mb Nic,AP6255 wifi/Bluetooth(wifi:bcm4329-fmac,Bluetooth:bcm4345c5)</td><td>meson-gxl</td><td>s905w</td><td>no</td></tr>