From 30dcad269af45558ce51992d9fa2807fe7567916 Mon Sep 17 00:00:00 2001 From: ophub Date: Mon, 10 Oct 2022 22:02:22 +0800 Subject: [PATCH] Added M302A/M304A (s905l3-b) description --- CONTRIBUTORS.md | 1 + README.cn.md | 2 +- README.md | 2 +- .../armbian-docs/amlogic_model_database.md | 1 + .../rootfs/etc/amlogic_model_database.conf | 2 +- .../rootfs/usr/sbin/armbian-install | 17 +++++++---------- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 749a43732b..67751b4f2d 100644 --- a/CONTRIBUTORS.md +++ b/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. | diff --git a/README.cn.md b/README.cn.md index 7805922ab2..ec2f083734 100644 --- a/README.cn.md +++ b/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)。 diff --git a/README.md b/README.md index 0258b85c63..d1880289b1 100644 --- a/README.md +++ b/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. diff --git a/build-armbian/armbian-docs/amlogic_model_database.md b/build-armbian/armbian-docs/amlogic_model_database.md index 291bf0b764..d0d75adaf7 100644 --- a/build-armbian/armbian-docs/amlogic_model_database.md +++ b/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 303MECOOL KM3 4Gs905x2meson-g12a-sei510.dtbu-boot-x96max.binx96max-u-boot.bin.sd.binNA4C@1908Mhz,4+64G/128G,2.4G/5G WiFi,Bluetooth 4.1,100Mb Nic 304E900V22C/Ds905l3ameson-g12a-s905l3a-e900v22c.dtbu-boot-e900v22c.bine900v22c-u-boot.bin.sd.binNA4C@1908Mhz,S905L3A+B,2+8G,USB2.0x2,LAN 100Mb Nic,uwe5621ds wifi(no work) 305CM311-1a-YSTs905l3ameson-g12a-s905l3a-cm311.dtbu-boot-e900v22c.binNANA4C@1908Mhz,S905L3A,2+16G,USB2.0x2,LAN 100Mb Nic,Bluetooth rtl8761b +306M302A/M304As905l3bmeson-gxl-s905l3b-m302a.dtbu-boot-s905x-s912.binNANA4C@1908Mhz,S905L3-b,2+8G,USB2.0x2,LAN 100Mb Nic 401Beelink GT-Kings922xmeson-g12b-gtking.dtbu-boot-gtking.bingtking-u-boot.bin.sd.binNA2C@1800Mhz(A53)+4C@1908Mhz(A73),4GB Mem,1Gb Nic,Wifi 402Beelink GT-King Pros922xmeson-g12b-gtking-pro.dtbu-boot-gtkingpro.bingtkingpro-u-boot.bin.sd.binNA2C@1800Mhz(A53)+4C@1908Mhz(A73),4GB Mem,1Gb Nic,Wifi diff --git a/build-armbian/common-files/rootfs/etc/amlogic_model_database.conf b/build-armbian/common-files/rootfs/etc/amlogic_model_database.conf index 52f43db057..6bef1d694f 100644 --- a/build-armbian/common-files/rootfs/etc/amlogic_model_database.conf +++ b/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 diff --git a/build-armbian/common-files/rootfs/usr/sbin/armbian-install b/build-armbian/common-files/rootfs/usr/sbin/armbian-install index bee0e014ee..60738a2295 100755 --- a/build-armbian/common-files/rootfs/usr/sbin/armbian-install +++ b/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.