Add X88-King(s922x) support

ophub · Feb 2, 2023 · 0f5746b · 0f5746b
1 parent e8ac661
commit 0f5746b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -65,4 +65,5 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | [OPMonday](https:/OPMonday) | 54. [2023-01-24] After his test feedback in [Issues](https:/ophub/amlogic-s9xxx-armbian/issues/970), `UNT403A(S905l3a)` box can be installed in eMMC, dtb uses `meson-g12a-s905l3a-cm311.dtb` file, and u-boot uses `u-boot-e900v22c.bin` file. The 100Mb wired network works fine. |
 | [1904688138](https:/1904688138) | 55. [2023-01-27] After his test feedback in [Issues](https:/ophub/amlogic-s9xxx-armbian/issues/978), `HG680-LC(S905l3)` 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 100Mb wired network works fine. |
 | [13584452567](https:/13584452567) | 56. [2023-02-01] He shared his support for `eaidk-610(rk3399)` device in [Pull](https:/ophub/amlogic-s9xxx-armbian/pull/991), This device can be installed in eMMC, dtb uses `rk3399-eaidk-610.dtb` file. The Gigabit wired, wireless, bluetooth works fine. |
+| [JordanPlayz158](https:/JordanPlayz158) | 57. [2023-02-02] After his test feedback in [Issues](https:/ophub/amlogic-s9xxx-armbian/issues/988), `X88 King(S922x)` can use the same configuration as `GT-King-Pro(S922x)`, Gigabit wired and Bluetooth work fine. But USB (keyboard, mouse, etc.) won't work. |
 
diff --git a/README.cn.md b/README.cn.md
@@ -13,7 +13,7 @@
 | 芯片 | 设备 | [可选内核](https:/ophub/kernel/tree/main/pub/stable) | Armbian 固件 |
 | ---- | ---- | ---- | ---- |
 | a311d | [Khadas-VIM3](https://www.gearbest.com/boards---shields/pp_3008145189226460.html) | 全部 | armbian_aml_a311d_*.img |
-| s922x | [Beelink-GT-King](https://tokopedia.link/RAgZmOM41db), [Beelink-GT-King-Pro](https://www.gearbest.com/tv-box/pp_3008857542462482.html), [Ugoos-AM6-Plus](https://www.gearbest.com/tv-box/pp_3002820788090799.html), [ODROID-N2](https://www.hardkernel.com/shop/odroid-n2-with-4gbyte-ram-2/) | 全部 | armbian_aml_s922x_*.img |
+| s922x | [Beelink-GT-King](https://tokopedia.link/RAgZmOM41db), [Beelink-GT-King-Pro](https://www.bee-link.net/products/beelink-gt-king), [Ugoos-AM6-Plus](https://www.gearbest.com/tv-box/pp_3002820788090799.html), [ODROID-N2](https://www.hardkernel.com/shop/odroid-n2-with-4gbyte-ram-2/), [X88-King](https:/ophub/amlogic-s9xxx-armbian/issues/988) | 全部 | armbian_aml_s922x_*.img |
 | s905x3 | [X96-Max+](https://www.gearbest.com/tv-box/pp_3001768790621051.html), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https:/ophub/amlogic-s9xxx-armbian/issues/782), [TX3](https://www.aliexpress.com/item/1005003772717802.html), [X96-Air](https://www.gearbest.com/tv-box/pp_3002885621272175.html), [X96-Max+_A100](https:/ophub/amlogic-s9xxx-armbian/issues/779), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb), [Tencent-Aurora-3Pro(s905x3-b)](https://item.jd.com/100009131339.html), [X96-Max+Q1](https:/ophub/amlogic-s9xxx-armbian/issues/788), [X96-Max+100W](https:/ophub/amlogic-s9xxx-armbian/issues/909) | 全部 | armbian_aml_s905x3_*.img |
 | s905x2 | [X96Max-4G](https://www.ebay.com/itm/164895650425), [X96Max-2G](https://www.alibaba.com/product-detail/Amlogic-S905X2-Android-TV-Box-X96_62210191636.html), [MECOOL-KM3-4G](https://www.gearbest.com/tv-box/pp_3008133484979616.html), [Tanix-Tx5-Max](https:/ophub/amlogic-s9xxx-openwrt/issues/351), [A95X-F2](https:/ophub/amlogic-s9xxx-armbian/issues/851) | 全部 | armbian_aml_s905x2_*.img |
 | s912 | [Tanix-TX8-Max](https://www.tanix-box.com/project-view/tanix-tx8-max-android-tv-box/), [Tanix-TX9-Pro(3G)](https:/ophub/amlogic-s9xxx-armbian/issues/315), [Tanix-TX9-Pro(2G)](https:/ophub/amlogic-s9xxx-armbian/issues/740), [Tanix-TX92](http://www.tanix-box.com/project-view/tanix-tx92-android-tv-box-powered-amlogic-s912/), [Nexbox-A1](https://www.gearbest.com/tv-box-mini-pc/pp_424843.html), [Nexbox-A95X-A2](https://www.cafago.com/en/p-v2979eu-2g.html), [A95X](https://tokopedia.link/zQVlmUfgqqb), [H96-Pro-Plus](https://www.gearbest.com/tv-box-mini-pc/pp_503486.html), [VORKE-Z6-Plus](http://www.vorke.com/project/vorke-z6-2/), [Mecool-M8S-PRO-L](https://www.gearbest.com/tv-box/pp_3005746210753315.html), [Vontar-X92](https://nl.aliexpress.com/i/32734559342.html), [T95Z-Plus](https://www.ebay.com/itm/253466003975), [Octopus-Planet](https://post.smzdm.com/p/a07oer59/), [Phicomm-T1](https:/ophub/amlogic-s9xxx-armbian/issues/522) | 全部 | armbian_aml_s912_*.img |

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https
 | SoC | Device | [Optional kernel](https:/ophub/kernel/tree/main/pub/stable) | Armbian Firmware |
 | ---- | ---- | ---- | ---- |
 | a311d | [Khadas-VIM3](https://www.gearbest.com/boards---shields/pp_3008145189226460.html) | All | armbian_aml_a311d_*.img |
-| s922x | [Beelink-GT-King](https://tokopedia.link/RAgZmOM41db), [Beelink-GT-King-Pro](https://www.gearbest.com/tv-box/pp_3008857542462482.html), [Ugoos-AM6-Plus](https://www.gearbest.com/tv-box/pp_3002820788090799.html), [ODROID-N2](https://www.hardkernel.com/shop/odroid-n2-with-4gbyte-ram-2/) | All | armbian_aml_s922x_*.img |
+| s922x | [Beelink-GT-King](https://tokopedia.link/RAgZmOM41db), [Beelink-GT-King-Pro](https://www.bee-link.net/products/beelink-gt-king), [Ugoos-AM6-Plus](https://www.gearbest.com/tv-box/pp_3002820788090799.html), [ODROID-N2](https://www.hardkernel.com/shop/odroid-n2-with-4gbyte-ram-2/), [X88-King](https:/ophub/amlogic-s9xxx-armbian/issues/988) | All | armbian_aml_s922x_*.img |
 | s905x3 | [X96-Max+](https://www.gearbest.com/tv-box/pp_3001768790621051.html), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https:/ophub/amlogic-s9xxx-armbian/issues/782), [TX3](https://www.aliexpress.com/item/1005003772717802.html), [X96-Air](https://www.gearbest.com/tv-box/pp_3002885621272175.html), [X96-Max+_A100](https:/ophub/amlogic-s9xxx-armbian/issues/779), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb), [Tencent-Aurora-3Pro(s905x3-b)](https://item.jd.com/100009131339.html), [X96-Max+Q1](https:/ophub/amlogic-s9xxx-armbian/issues/788), [X96-Max+100W](https:/ophub/amlogic-s9xxx-armbian/issues/909) | All | armbian_aml_s905x3_*.img |
 | s905x2 | [X96Max-4G](https://www.ebay.com/itm/164895650425), [X96Max-2G](https://www.alibaba.com/product-detail/Amlogic-S905X2-Android-TV-Box-X96_62210191636.html), [MECOOL-KM3-4G](https://www.gearbest.com/tv-box/pp_3008133484979616.html), [Tanix-Tx5-Max](https:/ophub/amlogic-s9xxx-openwrt/issues/351), [A95X-F2](https:/ophub/amlogic-s9xxx-armbian/issues/851) | All | armbian_aml_s905x2_*.img |
 | s912 | [Tanix-TX8-Max](https://www.tanix-box.com/project-view/tanix-tx8-max-android-tv-box/), [Tanix-TX9-Pro(3G)](https:/ophub/amlogic-s9xxx-armbian/issues/315), [Tanix-TX9-Pro(2G)](https:/ophub/amlogic-s9xxx-armbian/issues/740), [Tanix-TX92](http://www.tanix-box.com/project-view/tanix-tx92-android-tv-box-powered-amlogic-s912/), [Nexbox-A1](https://www.gearbest.com/tv-box-mini-pc/pp_424843.html), [Nexbox-A95X-A2](https://www.cafago.com/en/p-v2979eu-2g.html), [A95X](https://tokopedia.link/zQVlmUfgqqb), [H96-Pro-Plus](https://www.gearbest.com/tv-box-mini-pc/pp_503486.html), [VORKE-Z6-Plus](http://www.vorke.com/project/vorke-z6-2/), [Mecool-M8S-PRO-L](https://www.gearbest.com/tv-box/pp_3005746210753315.html), [Vontar-X92](https://nl.aliexpress.com/i/32734559342.html), [T95Z-Plus](https://www.ebay.com/itm/253466003975), [Octopus-Planet](https://post.smzdm.com/p/a07oer59/), [Phicomm-T1](https:/ophub/amlogic-s9xxx-armbian/issues/522) | All | armbian_aml_s912_*.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
@@ -83,10 +83,10 @@
 #-------+----------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+----------------+-----------+--------------+------------+-------
 # 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.BOARD 12.BUILD
 #-------+----------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+----------------+-----------+--------------+------------+-------
-401 :Beelink-GT-King :s922x :meson-g12b-gtking.dtb :u-boot-gtking.bin :gtking-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :no
-402 :Beelink-GT-King-Pro  :s922x :meson-g12b-gtking-pro.dtb :u-boot-gtkingpro.bin :gtkingpro-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :yes
-403 :Beelink-GT-King-Pro-H :s922x :meson-g12b-gtking-pro-h.dtb :u-boot-gtkingpro.bin :gtkingpro-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :no
-404 :Beelink-GT-King-Pro-Rev_A :s922x :meson-g12b-gtking-pro-rev_a.dtb :u-boot-gtkingpro-rev-a.bin :NA :NA :stable :amlogic :meson-g12b :s922x-reva :yes
+401 :GT-King  :s922x :meson-g12b-gtking.dtb :u-boot-gtking.bin :gtking-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :no
+402 :GT-King-Pro/X88-King :s922x :meson-g12b-gtking-pro.dtb :u-boot-gtkingpro.bin :gtkingpro-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :yes
+403 :GT-King-Pro-H  :s922x :meson-g12b-gtking-pro-h.dtb :u-boot-gtkingpro.bin :gtkingpro-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :no
+404 :GT-King-Pro-Rev_A  :s922x :meson-g12b-gtking-pro-rev_a.dtb :u-boot-gtkingpro-rev-a.bin :NA :NA :stable :amlogic :meson-g12b :s922x-reva :yes
 405 :Hardkernel-ODroid-N2 :s922x :meson-g12b-odroid-n2.dtb :u-boot-gtkingpro.bin :odroid-n2-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x-n2 :yes
 #-------+----------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+----------------+-----------+--------------+------------+-------
 406 :UGOOS-AM6-Plus :s922x :meson-g12b-ugoos-am6.dtb :u-boot-gtkingpro.bin :gtkingpro-u-boot.bin.sd.bin :NA :stable :amlogic :meson-g12b :s922x :no