Added M302A/M304A (s905l3-b) description

Author: ophub

CONTRIBUTORS.md

@@ -40,3 +40,4 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | [livelier](https://github.com/livelier) | 30. [2022-09-01] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/506), Added `Tencent Aurora 3Pro(s905x3-b)` box support, Gigabit wired, wireless, bluetooth works fine. Added corresponding `meson-sm1-skyworth-lb2004-a4091.dtb` support. |
 | [xcray](https://github.com/xcray) | 31. [2022-09-16] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/557), Added `Bluetooth` support for `CM311-1a-YST (s905l3a)`, `enhanced` wired network stability, and added dedicated `meson-g12a-s905l3a-cm311.dtb` file. |
 | [skysurf](https://github.com/skysurf) | 32. [2022-09-23] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/570), `W95(s905w)` box can be installed in eMMC, dtb uses `meson-gxl-s905w-p281.dtb` file. |
+| [janko888](https://github.com/janko888/MBH-M30xA) | 33. [2022-10-10] After his test feedback in [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/615), add `M302A/M304A(s905l3-b)` box, can be installed in eMMC, dtb uses `meson-gxl-s905l3b-m302a.dtb` file. |

README.cn.md

@@ -21,7 +21,7 @@
 | 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) | 全部 | 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), [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://www.znds.com/tv-1216697-1-1.html), [M401A](https://blog.csdn.net/fatiaozhang9527/article/details/124157038), [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) | 全部 | armbian_aml_s905l3a_*.img |
+| s905l3a/b | [E900V22C/D](https://github.com/Calmact/e900v22c), [CM311-1a-YST](https://www.znds.com/tv-1216697-1-1.html), [M401A](https://blog.csdn.net/fatiaozhang9527/article/details/124157038), [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), [M302A/M304A(s905l3-b)](https://blog.csdn.net/fatiaozhang9527/article/details/122006745) | 全部 | armbian_aml_s905l3a_*.img |
 
 💡提示：当前 ***`s905w`*** 系列的盒子只支持使用 `5.4.y/5.15.y` 内核，其他型号的盒子可任选内核版本使用。当前 ***`s905`*** 的盒子只能在 `TF/SD/USB` 中使用，其他型号的盒子同时支持写入 `EMMC` 中使用。每个盒子的 dtb 和 u-boot 请查阅[说明](build-armbian/armbian-docs/amlogic_model_database.md)。
 

README.md

@@ -21,7 +21,7 @@ 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) | 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), [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://www.znds.com/tv-1216697-1-1.html), [M401A](https://blog.csdn.net/fatiaozhang9527/article/details/124157038), [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) | All | armbian_aml_s905l3a_*.img |
+| s905l3a/b | [E900V22C/D](https://github.com/Calmact/e900v22c), [CM311-1a-YST](https://www.znds.com/tv-1216697-1-1.html), [M401A](https://blog.csdn.net/fatiaozhang9527/article/details/124157038), [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), [M302A/M304A(s905l3-b)](https://blog.csdn.net/fatiaozhang9527/article/details/122006745) | All | armbian_aml_s905l3a_*.img |
 
 💡Tip: The current ***`s905w`*** series of TV Boxes only support the use of the `5.4.y/5.15.y` kernel, Other types of TV Boxes can use optional kernel versions. Currently ***`s905`*** TV Boxes can only be used in `TF/SD/USB`, other types of TV Boxes also support writing to `EMMC`. Please refer to the [instructions](build-armbian/armbian-docs/amlogic_model_database.md) for dtb and u-boot of each device.
 

build-armbian/armbian-docs/amlogic_model_database.md

@@ -36,6 +36,7 @@ The list of devices supported by Amlogic TV Boxes, the configuration file in the
 <tr><td>303</td><td>MECOOL KM3 4G</td><td>s905x2</td><td>meson-g12a-sei510.dtb</td><td>u-boot-x96max.bin</td><td>x96max-u-boot.bin.sd.bin</td><td>NA</td><td>4C@1908Mhz,4+64G/128G,2.4G/5G WiFi,Bluetooth 4.1,100Mb Nic</td></tr>
 <tr><td>304</td><td>E900V22C/D</td><td>s905l3a</td><td>meson-g12a-s905l3a-e900v22c.dtb</td><td>u-boot-e900v22c.bin</td><td>e900v22c-u-boot.bin.sd.bin</td><td>NA</td><td>4C@1908Mhz,S905L3A+B,2+8G,USB2.0x2,LAN 100Mb Nic,uwe5621ds wifi(no work)</td></tr>
 <tr><td>305</td><td>CM311-1a-YST</td><td>s905l3a</td><td>meson-g12a-s905l3a-cm311.dtb</td><td>u-boot-e900v22c.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L3A,2+16G,USB2.0x2,LAN 100Mb Nic,Bluetooth rtl8761b</td></tr>
+<tr><td>306</td><td>M302A/M304A</td><td>s905l3b</td><td>meson-gxl-s905l3b-m302a.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L3-b,2+8G,USB2.0x2,LAN 100Mb Nic</td></tr>
 
 <tr><td>401</td><td>Beelink GT-King</td><td>s922x</td><td>meson-g12b-gtking.dtb</td><td>u-boot-gtking.bin</td><td>gtking-u-boot.bin.sd.bin</td><td>NA</td><td>2C@1800Mhz(A53)+4C@1908Mhz(A73),4GB Mem,1Gb Nic,Wifi</td></tr>
 <tr><td>402</td><td>Beelink GT-King Pro</td><td>s922x</td><td>meson-g12b-gtking-pro.dtb</td><td>u-boot-gtkingpro.bin</td><td>gtkingpro-u-boot.bin.sd.bin</td><td>NA</td><td>2C@1800Mhz(A53)+4C@1908Mhz(A73),4GB Mem,1Gb Nic,Wifi</td></tr>

build-armbian/common-files/rootfs/etc/amlogic_model_database.conf

@@ -26,7 +26,6 @@
 107:B860H:s905x:meson-gxl-s905x-b860h.dtb:u-boot-p212.bin:NA:NA
 108:TBee:s905x:meson-gxl-s905x-tbee.dtb:u-boot-p212.bin:NA:NA
 109:W95:s905w:meson-gxl-s905w-p281.dtb:u-boot-s905x-s912.bin:NA:NA
-110:M302A:s905x:meson-gxl-s905l3b-m302a.dtb:u-boot-s905x-s912.bin:NA:NA
 
 # Amlogic GXM Family
 201:Octopus Planet:s912:meson-gxm-octopus-planet.dtb:u-boot-zyxq.bin:NA:NA
@@ -48,6 +47,7 @@
 303:MECOOL KM3 4G:s905x2:meson-g12a-sei510.dtb:u-boot-x96max.bin:/usr/lib/u-boot/x96max-u-boot.bin.sd.bin:NA
 304:E900V22C-D:s905l3a:meson-g12a-s905l3a-e900v22c.dtb:u-boot-e900v22c.bin:NA:NA
 305:CM311-1a-YST:s905l3a:meson-g12a-s905l3a-cm311.dtb:u-boot-e900v22c.bin:NA:NA
+306:M302A/M304A:s905l3b:meson-gxl-s905l3b-m302a.dtb:u-boot-s905x-s912.bin:NA:NA
 
 # Amlogic G12B Family
 401:Beelink GT-King:s922x:meson-g12b-gtking.dtb:u-boot-gtking.bin:/usr/lib/u-boot/gtking-u-boot.bin.sd.bin:NA

build-armbian/common-files/rootfs/usr/sbin/armbian-install

@@ -223,16 +223,9 @@ create_partition() {
         BOOT="512"
         BLANK2="220"
     elif [[ "${AMLOGIC_SOC}" == "s905x" ]]; then
-        if [[ "${boxid}" -eq "110" ]];then
-        	# Compatible with Android 4 and Android 9 firmware
-            BLANK1="128"
-            BOOT="513"
-            BLANK2="720"
-        else
-            BLANK1="700"
-            BOOT="160"
-            BLANK2="0"
-        fi
+        BLANK1="700"
+        BOOT="160"
+        BLANK2="0"
     elif [[ "${AMLOGIC_SOC}" == "s905l3a" && "${boxid}" -eq "304" ]]; then
         BLANK1="570" # e900v22c/d: The first [ 570 MiB ] is not writable.
         BOOT="256"
@@ -241,6 +234,10 @@ create_partition() {
         BLANK1="108" # CM311-1a-YST: Must skip [ 108 MiB ]
         BOOT="512"   # A total of [ 1024 MiB ] can be used in this block, gave up [ 1024-512=512 MiB ]
         BLANK2="778" # Can set the rootfs partition after [ 1398 MiB ] of the total disk, Multi-backward offset 100 MiB, [ 1398-108-512=778 MiB ]
+    elif [[ "${AMLOGIC_SOC}" == "s905l3b" ]]; then
+        BLANK1="128" # https://github.com/janko888/MBH-M30xA
+        BOOT="513"   # M302A/M304A, Compatible with Android 4 and Android 9 firmware
+        BLANK2="720"
     else
         BLANK1="68"
         BOOT="256"    # S905x3: A total of [ 1120 MiB ] can be used in this block, and the remaining [ 864 MiB ] can be used.