From 1920aa6a8b57f9cecd4d8e7121c4f722c6ef7df1 Mon Sep 17 00:00:00 2001 From: ophub Date: Wed, 8 Jun 2022 13:08:37 +0800 Subject: [PATCH] Add x96-max-q2 and x96-air-q1000 support --- CONTRIBUTOR.md | 2 ++ .../armbian-docs/amlogic_model_database.md | 30 ++++++++++--------- .../rootfs/etc/amlogic_model_database.conf | 30 ++++++++++--------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/CONTRIBUTOR.md b/CONTRIBUTOR.md index 3e9617a4a3..ca466545fc 100644 --- a/CONTRIBUTOR.md +++ b/CONTRIBUTOR.md @@ -30,3 +30,5 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie | [chris4git](https://github.com/chris4git) | 20. [2022-05-07] According to his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/285), added support for the use of `T95(s905x)` devices, and the corresponding [t95.conf](build-armbian/common-files/rootfs/usr/share/openvfd/conf/t95.conf) LED file. | | [Smim0](https://github.com/Smim0) | 21. [2022-05-18] According to his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/315), added support for the use of `TX9-Pro(s912)` devices. Thanks to [unifreq](https://github.com/unifreq) for adding a dedicated dtb with `wifi` module for the device: `meson-gxm-tx9-pro.dtb` | | [kodokskoprol](https://github.com/kodokskoprol) | 22. [2022-05-29] According to his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/260), `A95X(s912)` and `Nexbox A1(s912)` devices can use gigabit wired (`meson-gxm-nexbox-a1.dtb, u-boot-p212.bin`) normally, support kernels such as `5.10.y` and `5.15.y` etc. but the wireless network cannot be used (`ath10k`, `qca9377` chip, the wireless module is `Fn-Link 8223A-SR C07001 1727`) | +| [danboid](https://github.com/danboid) | 23. [2022-06-08] According to his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/366), `X96 Max Plus Q2(s905x3)` and `X96 Air Q1000(s905x3)` devices can use gigabit wired, Wireless and Bluetooth(qca9377) normally. According to his shared results, now `meson-sm1-x96-max-plus-q2.dtb` has been added to unifreq's 5.4.y, 5.10.y and [5.15.y](https://github.com/unifreq/linux-5.15.y/commit/5ed890ac09aaec7c0f2f2fc43a92212eaace41ac) series of kernels. | + diff --git a/build-armbian/armbian-docs/amlogic_model_database.md b/build-armbian/armbian-docs/amlogic_model_database.md index df0836e3f0..2e21c223e8 100644 --- a/build-armbian/armbian-docs/amlogic_model_database.md +++ b/build-armbian/armbian-docs/amlogic_model_database.md @@ -42,20 +42,22 @@ These duplications are automated in the repository's packaging and install/updat 501X96 Max+s905x3meson-sm1-x96-max-plus.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binhk1box-bootloader.img4C@2100Mhz,4GB Mem,1Gb Nic,AM7256 wifi 502X96 Max+ (OverClock)s905x3meson-sm1-x96-max-plus-oc.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binhk1box-bootloader.img4C@2208Mhz,4GB Mem,1Gb Nic,AM7256 wifi 503X96 Max+ (IP1001M phy)s905x3meson-sm1-x96-max-plus-ip1001m.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binhk1box-bootloader.img4C@2208Mhz,4GB Mem,1Gb Nic (IP1001M phy),brcm4354 wifi -504HK1 Boxs905x3meson-sm1-hk1box-vontar-x3.dtbu-boot-x96maxplus.binhk1box-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,1Gb Nic,Wifi -505HK1 Box (OverClock)s905x3meson-sm1-hk1box-vontar-x3-oc.dtbu-boot-x96maxplus.binhk1box-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,1Gb Nic,Wifi -506H96 Max X3s905x3meson-sm1-h96-max-x3.dtbu-boot-x96maxplus.binh96maxx3-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,1Gb Nic,Wifi -507H96 Max X3 (OverClock)s905x3meson-sm1-h96-max-x3-oc.dtbu-boot-x96maxplus.binh96maxx3-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,1Gb Nic,Wifi -508Ugoos X3s905x3meson-sm1-ugoos-x3.dtbu-boot-ugoos-x3.binNANA4C@2100Mhz,2(Cube)/4(Pro,Plus)GB Mem,1Gb Nic,Wifi -509Ugoos X3 (OverClock)s905x3meson-sm1-ugoos-x3.dtbu-boot-ugoos-x3.binNANA4C@2208Mhz,2(Cube)/4(Pro,Plus)GB Mem,1Gb Nic,Wifi -510TX3 1Gbs905x3meson-sm1-tx3-qz.dtbu-boot-tx3-qz.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,1Gb Nic,bcm4330 wifi -511TX3 1Gb (OverClock)s905x3meson-sm1-tx3-qz-oc.dtbu-boot-tx3-qz.binx96maxplus-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,1Gb Nic,bcm4330 wifi -512TX3 100Mbs905x3meson-sm1-tx3-bz.dtbu-boot-tx3-bz.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,100Mb Nic,bcm4330 wifi -513TX3 100Mb (OverClock)s905x3meson-sm1-tx3-bz-oc.dtbu-boot-tx3-bz.binx96maxplus-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,100Mb Nic,bcm4330 wifi -514X96 Air 1Gbs905x3meson-sm1-x96-air-gbit.dtbu-boot-x96maxplus.binNANA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi -515X96 Air 100Mbs905x3meson-sm1-x96-air.dtbu-boot-x96maxplus.binNANA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi -516A95XF3 Air 1Gbs905x3meson-sm1-a95xf3-air-gbit.dtbu-boot-x96maxplus.binNANA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi -517A95XF3 Air 100Mbs905x3s905x3:meson-sm1-a95xf3-air.dtbu-boot-x96maxplus.binNANA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi +504X96 Max+ Q2s905x3meson-sm1-x96-max-plus-q2.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binhk1box-bootloader.img4C@2208Mhz,4GB Mem,1Gb Nic,qca9377 wifi +505HK1 Boxs905x3meson-sm1-hk1box-vontar-x3.dtbu-boot-x96maxplus.binhk1box-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,1Gb Nic,Wifi +506HK1 Box (OverClock)s905x3meson-sm1-hk1box-vontar-x3-oc.dtbu-boot-x96maxplus.binhk1box-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,1Gb Nic,Wifi +507H96 Max X3s905x3meson-sm1-h96-max-x3.dtbu-boot-x96maxplus.binh96maxx3-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,1Gb Nic,Wifi +508H96 Max X3 (OverClock)s905x3meson-sm1-h96-max-x3-oc.dtbu-boot-x96maxplus.binh96maxx3-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,1Gb Nic,Wifi +509Ugoos X3s905x3meson-sm1-ugoos-x3.dtbu-boot-ugoos-x3.binNANA4C@2100Mhz,2(Cube)/4(Pro,Plus)GB Mem,1Gb Nic,Wifi +510Ugoos X3 (OverClock)s905x3meson-sm1-ugoos-x3.dtbu-boot-ugoos-x3.binNANA4C@2208Mhz,2(Cube)/4(Pro,Plus)GB Mem,1Gb Nic,Wifi +511TX3 1Gbs905x3meson-sm1-tx3-qz.dtbu-boot-tx3-qz.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,1Gb Nic,bcm4330 wifi +512TX3 1Gb (OverClock)s905x3meson-sm1-tx3-qz-oc.dtbu-boot-tx3-qz.binx96maxplus-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,1Gb Nic,bcm4330 wifi +513TX3 100Mbs905x3meson-sm1-tx3-bz.dtbu-boot-tx3-bz.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,4GB Mem,100Mb Nic,bcm4330 wifi +514TX3 100Mb (OverClock)s905x3meson-sm1-tx3-bz-oc.dtbu-boot-tx3-bz.binx96maxplus-u-boot.bin.sd.binNA4C@2208Mhz,4GB Mem,100Mb Nic,bcm4330 wifi +515X96 Air 1Gbs905x3meson-sm1-x96-air-gbit.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi +516X96 Air 100Mbs905x3meson-sm1-x96-air.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi +517X96 Air Q1000s905x3meson-sm1-x96-max-plus-q2.dtbu-boot-x96maxplus.binx96maxplus-u-boot.bin.sd.binNA4C@2100Mhz,2GB Mem,1Gb Nic,qca9377 wifi +518A95XF3 Air 1Gbs905x3meson-sm1-a95xf3-air-gbit.dtbu-boot-x96maxplus.binNANA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi +519A95XF3 Air 100Mbs905x3s905x3:meson-sm1-a95xf3-air.dtbu-boot-x96maxplus.binNANA4C@2100Mhz,2GB Mem,1Gb Nic,Wifi -Beelink Mini MX 2Gs905meson-gxbb-beelink-mini-mx.dtbu-boot-s905.binNANAMali-450 GPU 2.4GHz / 5.8GHz WiFi 2GB RAM 16GB ROM,1Gb Nic -MXQ PRO+ 4Ks905meson-gxbb-mxq-pro-plus.dtbu-boot-p201.binNANA2GB RAM 16GB ROM 2.4G/5.8G,1Gb Nic 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 ac1973bcd8..48a007cc70 100644 --- a/build-armbian/common-files/rootfs/etc/amlogic_model_database.conf +++ b/build-armbian/common-files/rootfs/etc/amlogic_model_database.conf @@ -55,20 +55,22 @@ 501:X96 Max+:s905x3:meson-sm1-x96-max-plus.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:/usr/lib/u-boot/hk1box-bootloader.img 502:X96 Max+ (OverClock):s905x3:meson-sm1-x96-max-plus-oc.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:/usr/lib/u-boot/hk1box-bootloader.img 503:X96 Max+ (IP1001M phy):s905x3:meson-sm1-x96-max-plus-ip1001m.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:/usr/lib/u-boot/hk1box-bootloader.img -504:HK1 Box:s905x3:meson-sm1-hk1box-vontar-x3.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/hk1box-u-boot.bin.sd.bin:NA -505:HK1 Box (OverClock):s905x3:meson-sm1-hk1box-vontar-x3-oc.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/hk1box-u-boot.bin.sd.bin:NA -506:H96 Max X3:s905x3:meson-sm1-h96-max-x3.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/h96maxx3-u-boot.bin.sd.bin:NA -507:H96 Max X3 (OverClock):s905x3:meson-sm1-h96-max-x3-oc.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/h96maxx3-u-boot.bin.sd.bin:NA -508:Ugoos X3:s905x3:meson-sm1-ugoos-x3.dtb:u-boot-ugoos-x3.bin:NA:NA -509:Ugoos X3 (OverClock):s905x3:meson-sm1-ugoos-x3-oc.dtb:u-boot-ugoos-x3.bin:NA:NA -510:TX3 1Gb:s905x3:meson-sm1-tx3-qz.dtb:u-boot-tx3-qz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA -511:TX3 1Gb (OverClock):s905x3:meson-sm1-tx3-qz-oc.dtb:u-boot-tx3-qz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA -512:TX3 100Mb:s905x3:meson-sm1-tx3-bz.dtb:u-boot-tx3-bz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA -513:TX3 100Mb (OverClock):s905x3:meson-sm1-tx3-bz-oc.dtb:u-boot-tx3-bz.bin:/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA -514:X96 Air 1Gb:s905x3:meson-sm1-x96-air-gbit.dtb:u-boot-x96maxplus.bin:NA:NA -515:X96 Air 100Mb:s905x3:meson-sm1-x96-air.dtb:u-boot-x96maxplus.bin:NA:NA -516:A95XF3 Air 1Gb:s905x3:meson-sm1-a95xf3-air-gbit.dtb:u-boot-x96maxplus.bin:NA:NA -517:A95XF3 Air 100Mb:s905x3:meson-sm1-a95xf3-air.dtb:u-boot-x96maxplus.bin:NA:NA +504:X96 Max+ Q2:s905x3:meson-sm1-x96-max-plus-q2.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:/usr/lib/u-boot/hk1box-bootloader.img +505:HK1 Box:s905x3:meson-sm1-hk1box-vontar-x3.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/hk1box-u-boot.bin.sd.bin:NA +506:HK1 Box (OverClock):s905x3:meson-sm1-hk1box-vontar-x3-oc.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/hk1box-u-boot.bin.sd.bin:NA +507:H96 Max X3:s905x3:meson-sm1-h96-max-x3.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/h96maxx3-u-boot.bin.sd.bin:NA +508:H96 Max X3 (OverClock):s905x3:meson-sm1-h96-max-x3-oc.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/h96maxx3-u-boot.bin.sd.bin:NA +509:Ugoos X3:s905x3:meson-sm1-ugoos-x3.dtb:u-boot-ugoos-x3.bin:NA:NA +510:Ugoos X3 (OverClock):s905x3:meson-sm1-ugoos-x3-oc.dtb:u-boot-ugoos-x3.bin:NA:NA +511:TX3 1Gb:s905x3:meson-sm1-tx3-qz.dtb:u-boot-tx3-qz.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +512:TX3 1Gb (OverClock):s905x3:meson-sm1-tx3-qz-oc.dtb:u-boot-tx3-qz.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +513:TX3 100Mb:s905x3:meson-sm1-tx3-bz.dtb:u-boot-tx3-bz.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +514:TX3 100Mb (OverClock):s905x3:meson-sm1-tx3-bz-oc.dtb:u-boot-tx3-bz.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +515:X96 Air 1Gb:s905x3:meson-sm1-x96-air-gbit.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +516:X96 Air 100Mb:s905x3:meson-sm1-x96-air.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +517:X96 Air Q1000:s905x3:meson-sm1-x96-max-plus-q2.dtb:u-boot-x96maxplus.bin:/usr/lib/u-boot/x96maxplus-u-boot.bin.sd.bin:NA +518:A95XF3 Air 1Gb:s905x3:meson-sm1-a95xf3-air-gbit.dtb:u-boot-x96maxplus.bin:NA:NA +519:A95XF3 Air 100Mb:s905x3:meson-sm1-a95xf3-air.dtb:u-boot-x96maxplus.bin:NA:NA # Other 0:Customize:Other:Enter-custom-dtb-name:NA:NA:NA