Add CM311-1 device support

ophub · Dec 5, 2022 · ac60869 · ac60869
1 parent 8bbae91
commit ac60869
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -53,3 +53,4 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | [CarlKuhligk](https://github.com/CarlKuhligk) | 43. [2022-11-27] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/734), `Q96 mini(s905l-b)` box can be installed in eMMC, dtb uses `meson-gxl-s905x-p212.dtb` file. The 100M wired network works fine. |
 | [rainups](https://github.com/rainups) | 44. [2022-11-29] According to his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/740), added support for the use of `TX9-Pro(s912)(2G+16G+100Mb)` devices, dtb uses `meson-gxm-q201.dtb` file, and u-boot uses `u-boot-p212.bin` file.  |
 | [yangzhuang2333](https://github.com/yangzhuang2333) | 45. [2022-12-03] According to his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741), added support for the use of `ZTE-B863AV3.2-M(s905l3a)` devices, First flash the Android system of `M401A(s905l3a)`, and use the same configuration, select `btrfs` format to write to eMMC. dtb uses `meson-g12a-s905l3a-m401a.dtb` file, and u-boot uses `u-boot-e900v22c.bin` file.  |
+| [ours1505](https://github.com/ours1505) | 46. [2022-12-05] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763), `CM311-1(s905l2)` box can be installed in eMMC, dtb uses `meson-gxl-s905l2-x7-5g.dtb` file, and u-boot uses `u-boot-p212.bin` file. The 100M wired network works fine. |
diff --git a/README.cn.md b/README.cn.md
@@ -21,8 +21,9 @@
 | s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://www.zte.com.cn/global/products/cocloud/201707261551/IP-STB/ZXV10-B860H), [TBee-Box](https://www.tbee.com/product/tbee-box/), [T95](https://www.gearbest.com/tv-box-mini-pc/pp_268277.html), [TX9](https://github.com/ophub/amlogic-s9xxx-armbian/issues/645), [Q96-mini(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/734) | 全部 | armbian_aml_s905x_*.img |
 | s905w | [X96-Mini](https://www.gearbest.com/tv-box/pp_3008306149708795.html), [TX3-Mini](https://www.gearbest.com/tv-box/pp_009748238474.html), [W95](https://www.gearbest.com/tv-box/pp_736121.html) | 5.4.y/5.15.y | armbian_aml_s905w_*.img |
 | s905 | [Beelink-Mini-MX-2G](https://www.gearbest.com/tv-box-mini-pc/pp_321409.html), [Sunvell-T95M](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/337), [MXQ-Pro+4K](https://www.gearbest.com/tv-box-mini-pc/pp_354313.html) | 全部 | armbian_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://blog.csdn.net/fatiaozhang9527/article/details/126388479), [UNT403A](https://blog.csdn.net/wjf149575296/article/details/123947681), [UNT413A](https://blog.csdn.net/fatiaozhang9527/article/details/122232733), [ZTE-B863AV3.2-M(s905l3a)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | 全部 | armbian_aml_s905l3a_*.img |
-| s905l3b/l2 | [M302A/M304A(s905l3-b)](https://blog.csdn.net/fatiaozhang9527/article/details/122006745), [MGV2000(s905l2)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [Wojia-TV-IPBS9505(s905l2)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648) | 全部 | armbian_aml_s905l2_*.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://blog.csdn.net/fatiaozhang9527/article/details/126388479), [UNT403A](https://blog.csdn.net/wjf149575296/article/details/123947681), [UNT413A](https://blog.csdn.net/fatiaozhang9527/article/details/122232733), [ZTE-B863AV3.2-M](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | 全部 | armbian_aml_s905l3a_*.img |
+| s905l3-b | [M302A/M304A](https://blog.csdn.net/fatiaozhang9527/article/details/122006745) | 全部 | armbian_aml_s905l2_*.img |
+| s905l2 | [MGV2000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [Wojia-TV-IPBS9505](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [CM311-1](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763) | 全部 | armbian_aml_s905l2_*.img |
 | rk3588 | [Radxa-Rock5B](https://wiki.radxa.com/Rock5/5b) | [rk3588](https://github.com/ophub/kernel/tree/main/pub/rk3588) | armbian_rockchip_rock5b.img |
 | rk3568 | [FastRhino-R66S](https://r68s.cn/), [FastRhino-R68S](https://r68s.cn/) | [6.0.y](https://github.com/ophub/kernel/tree/main/pub/stable) | armbian_rockchip_r66s.img <br />armbian_rockchip_r68s.img |
 | rk3328 | [beikeyun](https://www.cnblogs.com/milton/p/15391525.html), [l1pro](https://post.smzdm.com/p/a4wkdo7l/) | 全部 | armbian_rockchip_beikeyun.img <br />armbian_rockchip_l1pro.img |

diff --git a/README.md b/README.md
@@ -21,8 +21,9 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https
 | s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://www.zte.com.cn/global/products/cocloud/201707261551/IP-STB/ZXV10-B860H), [TBee-Box](https://www.tbee.com/product/tbee-box/), [T95](https://www.gearbest.com/tv-box-mini-pc/pp_268277.html), [TX9](https://github.com/ophub/amlogic-s9xxx-armbian/issues/645), [Q96-mini(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/734) | All | armbian_aml_s905x_*.img |
 | s905w | [X96-Mini](https://www.gearbest.com/tv-box/pp_3008306149708795.html), [TX3-Mini](https://www.gearbest.com/tv-box/pp_009748238474.html), [W95](https://www.gearbest.com/tv-box/pp_736121.html) | 5.4.y/5.15.y | armbian_aml_s905w_*.img |
 | s905 | [Beelink-Mini-MX-2G](https://www.gearbest.com/tv-box-mini-pc/pp_321409.html), [Sunvell-T95M](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/337), [MXQ-Pro+4K](https://www.gearbest.com/tv-box-mini-pc/pp_354313.html) | All | armbian_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://blog.csdn.net/fatiaozhang9527/article/details/126388479), [UNT403A](https://blog.csdn.net/wjf149575296/article/details/123947681), [UNT413A](https://blog.csdn.net/fatiaozhang9527/article/details/122232733), [ZTE-B863AV3.2-M(s905l3a)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | All | armbian_aml_s905l3a_*.img |
-| s905l3b/l2 | [M302A/M304A(s905l3-b)](https://blog.csdn.net/fatiaozhang9527/article/details/122006745), [MGV2000(s905l2)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [Wojia-TV-IPBS9505(s905l2)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648) | All | armbian_aml_s905l2_*.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://blog.csdn.net/fatiaozhang9527/article/details/126388479), [UNT403A](https://blog.csdn.net/wjf149575296/article/details/123947681), [UNT413A](https://blog.csdn.net/fatiaozhang9527/article/details/122232733), [ZTE-B863AV3.2-M](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | All | armbian_aml_s905l3a_*.img |
+| s905l3-b | [M302A/M304A](https://blog.csdn.net/fatiaozhang9527/article/details/122006745) | All | armbian_aml_s905l2_*.img |
+| s905l2 | [MGV2000](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [Wojia-TV-IPBS9505](https://github.com/ophub/amlogic-s9xxx-armbian/issues/648), [CM311-1](https://github.com/ophub/amlogic-s9xxx-armbian/issues/763) | All | armbian_aml_s905l2_*.img |
 | rk3588 | [Radxa-Rock5B](https://wiki.radxa.com/Rock5/5b) | [rk3588](https://github.com/ophub/kernel/tree/main/pub/rk3588) | armbian_rockchip_rock5b.img |
 | rk3568 | [FastRhino-R66S](https://r68s.cn/), [FastRhino-R68S](https://r68s.cn/) | [6.0.y](https://github.com/ophub/kernel/tree/main/pub/stable) | armbian_rockchip_r66s.img <br />armbian_rockchip_r68s.img |
 | rk3328 | [beikeyun](https://www.cnblogs.com/milton/p/15391525.html), [l1pro](https://post.smzdm.com/p/a4wkdo7l/) | All | armbian_rockchip_beikeyun.img <br />armbian_rockchip_l1pro.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
@@ -40,6 +40,7 @@
 114     :Wojia-TV-IPBS9505           :s905l2   :meson-gxl-s905l2-ipbs9505.dtb          :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :s905l2      :no
 115     :Q96-mini                    :s905l-b  :meson-gxl-s905x-p212.dtb               :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :s905l-b     :no
 #-------+----------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+----------------+-----------+--------------+------------+-------
+116     :CM311-1                     :s905l2   :meson-gxl-s905l2-x7-5g.dtb             :u-boot-p212.bin              :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :s905l2      :no
 
 
 # Amlogic GXM Family

diff --git a/build-armbian/documents/amlogic_model_database.md b/build-armbian/documents/amlogic_model_database.md
@@ -23,6 +23,7 @@ The list of devices supported by Amlogic TV Boxes, the configuration file in the
 <tr><td>113</td><td>MGV2000</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></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></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></tr>
+<tr><td>116</td><td>CM311-1</td><td>s905l2</td><td>meson-gxl-s905l2-x7-5g.dtb</td><td>u-boot-p212.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L2,2+8G,USB2.0x2,LAN 100Mb Nic</td></tr>
 
 <tr><td>201</td><td>Octopus Planet</td><td>s912</td><td>meson-gxm-octopus-planet.dtb</td><td>u-boot-zyxq.bin</td><td>NA</td><td>NA</td><td>4C@1512Mhz+4C@1000Mhz,2GB Mem,1Gb Nic</td></tr>
 <tr><td>202</td><td>Octopus Planet (FAKE)</td><td>s912</td><td>meson-gxm-octopus-planet.dtb</td><td>u-boot-zyxq.bin</td><td>NA</td><td>bl-fake-octopus-planet.bin</td><td>4C@1512Mhz+4C@1000Mhz,2GB Mem,1Gb Nic</td></tr>