Add FunTV/X96W(s905w) support

CONTRIBUTORS.md

@@ -68,4 +68,5 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | [JordanPlayz158](https://github.com/JordanPlayz158) | 57. [2023-02-02] After his test feedback in [Issues](https://github.com/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. |
 | [7Ji](https://github.com/7Ji) | 58. [2023-02-02] He shared his support for `BesTV R3300L(s905l-b)` device in [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/993), This device can be installed in eMMC, dtb uses `meson-gxl-s905x-p212.dtb` file, MAINLINE_UBOOT uses `r3300l-u-boot.bin.sd.bin` file, UBOOT_OVERLOAD uses `u-boot-r3300l.bin` file. The 100Mb wired works fine. He also shared some source code for [making u-boot](https://github.com/7Ji/u-boot), how to use the [ampart tool](https://github.com/7Ji/ampart), etc. For details, see Pull Merge Information. |
 | [d5stick](https://github.com/d5stick) | 59. [2023-02-04] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1006), `Vontar-X3(S905x3)` box can be installed in eMMC, dtb uses `meson-sm1-hk1box-vontar-x3.dtb` file, and u-boot uses `u-boot-x96maxplus.bin` file. The Gigabit wired network works fine. When using it, you need to flash into the Android system of HK1-Box(s905x3). |
+| [daniyo27](https://github.com/daniyo27) | 60. [2023-02-12] After his test feedback in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1044), `X96W/FunTV(S905w)` box can be installed in eMMC, dtb uses `meson-gxl-s905w-x96w.dtb` file. The 100Mb wired network, Wifi and Bluetooth all works fine. Use `5.4/5.15` kernel. |
 

README.cn.md

@@ -19,7 +19,7 @@
 | s912 | [Tanix-TX8-Max](https://github.com/ophub/amlogic-s9xxx-armbian/issues/500), [Tanix-TX9-Pro(3G)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/315), [Tanix-TX9-Pro(2G)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/740), [Tanix-TX92](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72#issuecomment-1012790770), [Nexbox-A1](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/260), [Nexbox-A95X-A2](https://www.cafago.com/en/p-v2979eu-2g.html),  [A95X](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/260), [H96-Pro-Plus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72#issuecomment-1013071513), [VORKE-Z6-Plus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72), [Mecool-M8S-PRO-L](https://github.com/ophub/amlogic-s9xxx-armbian/issues/158), [Vontar-X92](https://github.com/ophub/amlogic-s9xxx-armbian/issues/525), [T95Z-Plus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/668), [Octopus-Planet](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1020), [Phicomm-T1](https://github.com/ophub/amlogic-s9xxx-armbian/issues/522) | 全部 | aml_s912.img |
 | s905d | [MECOOL-KI-Pro](https://github.com/ophub/amlogic-s9xxx-armbian/issues/59), [Phicomm-N1](https://github.com/ophub/amlogic-s9xxx-armbian/issues/925) | 全部 | aml_s905d.img |
 | s905x | [HG680P](https://github.com/ophub/amlogic-s9xxx-armbian/issues/368), [B860H](https://github.com/ophub/amlogic-s9xxx-armbian/issues/60), [TBee-Box](https://github.com/ophub/amlogic-s9xxx-armbian/issues/98), [T95](https://github.com/ophub/amlogic-s9xxx-armbian/issues/285), [TX9](https://github.com/ophub/amlogic-s9xxx-armbian/issues/645), [Q96-mini(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/734) | 全部 | aml_s905x.img |
-| s905w | [X96-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/621), [TX3-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/871), [W95](https://github.com/ophub/amlogic-s9xxx-armbian/issues/570) | 5.4.y/5.15.y | aml_s905w.img |
+| s905w | [X96-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/621), [TX3-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/871), [W95](https://github.com/ophub/amlogic-s9xxx-armbian/issues/570), [X96W/FunTV](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1044) | 5.4.y/5.15.y | aml_s905w.img |
 | s905 | [Beelink-Mini-MX-2G](https://github.com/ophub/amlogic-s9xxx-armbian/issues/127), [Sunvell-T95M](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/337), [MXQ-Pro+4K](https://github.com/ophub/amlogic-s9xxx-armbian/issues/715) | 全部 | 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://github.com/ophub/amlogic-s9xxx-armbian/issues/517), [UNT403A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [UNT413A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [ZTE-B863AV3.2-M](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | 全部 | aml_s905l3a.img |
 | s905lb/3b | [M302A/M304A](https://github.com/ophub/amlogic-s9xxx-armbian/pull/615), [E900V22E](https://github.com/ophub/amlogic-s9xxx-armbian/issues/939), [BesTV-R3300L(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/pull/993) | 全部 | aml_s905l2.img<br />aml_s905lb-r3300l.img |

README.md

@@ -19,7 +19,7 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https
 | s912 | [Tanix-TX8-Max](https://github.com/ophub/amlogic-s9xxx-armbian/issues/500), [Tanix-TX9-Pro(3G)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/315), [Tanix-TX9-Pro(2G)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/740), [Tanix-TX92](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72#issuecomment-1012790770), [Nexbox-A1](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/260), [Nexbox-A95X-A2](https://www.cafago.com/en/p-v2979eu-2g.html),  [A95X](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/260), [H96-Pro-Plus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72#issuecomment-1013071513), [VORKE-Z6-Plus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/72), [Mecool-M8S-PRO-L](https://github.com/ophub/amlogic-s9xxx-armbian/issues/158), [Vontar-X92](https://github.com/ophub/amlogic-s9xxx-armbian/issues/525), [T95Z-Plus](https://github.com/ophub/amlogic-s9xxx-armbian/issues/668), [Octopus-Planet](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1020), [Phicomm-T1](https://github.com/ophub/amlogic-s9xxx-armbian/issues/522) | All | aml_s912.img |
 | s905d | [MECOOL-KI-Pro](https://github.com/ophub/amlogic-s9xxx-armbian/issues/59), [Phicomm-N1](https://github.com/ophub/amlogic-s9xxx-armbian/issues/925) | All | aml_s905d.img |
 | s905x | [HG680P](https://github.com/ophub/amlogic-s9xxx-armbian/issues/368), [B860H](https://github.com/ophub/amlogic-s9xxx-armbian/issues/60), [TBee-Box](https://github.com/ophub/amlogic-s9xxx-armbian/issues/98), [T95](https://github.com/ophub/amlogic-s9xxx-armbian/issues/285), [TX9](https://github.com/ophub/amlogic-s9xxx-armbian/issues/645), [Q96-mini(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/issues/734) | All | aml_s905x.img |
-| s905w | [X96-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/621), [TX3-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/871), [W95](https://github.com/ophub/amlogic-s9xxx-armbian/issues/570) | 5.4.y/5.15.y | aml_s905w.img |
+| s905w | [X96-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/621), [TX3-Mini](https://github.com/ophub/amlogic-s9xxx-armbian/issues/871), [W95](https://github.com/ophub/amlogic-s9xxx-armbian/issues/570), [X96W/FunTV](https://github.com/ophub/amlogic-s9xxx-armbian/issues/1044) | 5.4.y/5.15.y | aml_s905w.img |
 | s905 | [Beelink-Mini-MX-2G](https://github.com/ophub/amlogic-s9xxx-armbian/issues/127), [Sunvell-T95M](https://github.com/ophub/amlogic-s9xxx-openwrt/issues/337), [MXQ-Pro+4K](https://github.com/ophub/amlogic-s9xxx-armbian/issues/715) | All | 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://github.com/ophub/amlogic-s9xxx-armbian/issues/517), [UNT403A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [UNT413A](https://github.com/ophub/amlogic-s9xxx-armbian/issues/970), [ZTE-B863AV3.2-M](https://github.com/ophub/amlogic-s9xxx-armbian/issues/741) | All | aml_s905l3a.img |
 | s905lb/3b | [M302A/M304A](https://github.com/ophub/amlogic-s9xxx-armbian/pull/615), [E900V22E](https://github.com/ophub/amlogic-s9xxx-armbian/issues/939), [BesTV-R3300L(s905l-b)](https://github.com/ophub/amlogic-s9xxx-armbian/pull/993) | All | aml_s905l2.img<br />aml_s905lb-r3300l.img |

build-armbian/armbian-files/common-files/etc/model_database.conf

@@ -47,6 +47,7 @@
 116     :CM311-1/HG680-LC            :s905l3   :meson-gxl-s905l2-x7-5g.dtb             :u-boot-p212.bin              :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3          :no
 117     :E900V22E                    :s905l3b  :meson-gxl-s905l3b-e900v22e.dtb         :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905l3b         :no
 118     :BesTV-R3300L                :s905l-b  :meson-gxl-s905x-p212.dtb               :u-boot-r3300l.bin            :r3300l-u-boot.bin.sd.bin            :NA                              :stable          :amlogic    :meson-gxl     :extlinux.conf   :s905lb-r3300l   :yes
+119     :X96W/FunTV                  :s905w    :meson-gxl-s905w-x96w.dtb               :u-boot-s905x-s912.bin        :NA                                  :NA                              :stable          :amlogic    :meson-gxl     :uEnv.txt        :s905w           :no
 
 
 # Amlogic GXM Family

build-armbian/documents/amlogic_model_database.md

@@ -34,6 +34,7 @@ For users who perform custom compilation in the `fork` source code repository, i
 <tr><td>116</td><td>CM311-1/HG680-LC</td><td>s905l3</td><td>meson-gxl-s905l2-x7-5g.dtb</td><td>u-boot-p212.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,2+8G,USB2.0x2,LAN 100Mb Nic</td><td>meson-gxl</td><td>s905l3</td><td>no</td></tr>
 <tr><td>117</td><td>E900V22E</td><td>s905l3b</td><td>meson-gxl-s905l3b-e900v22e.dtb</td><td>u-boot-s905x-s912.bin</td><td>NA</td><td>NA</td><td>4C@1908Mhz,S905L3b,2+8G,USB2.0x2,LAN 100Mb Nic(Need to flash to android9 system)</td><td>meson-gxl</td><td>s905l3</td><td>no</td></tr>
 <tr><td>118</td><td>BesTV R3300L</td><td>s905l-b</td><td>meson-gxl-s905x-p212.dtb</td><td>u-boot-r3300l.bin</td><td>r3300l-u-boot.bin.sd.bin</td><td>NA</td><td>1+8G,100Mb Nic(Use: extlinux/extlinux.conf)</td><td>meson-gxl</td><td>s905lb-r3300l</td><td>yes</td></tr>
+<tr><td>119</td><td>X96W/FunTV</td><td>s905w</td><td>meson-gxl-s905w-x96w.dtb</td><td>NA</td><td>NA</td><td>NA</td><td>2GB-RAM,16GB-ROM,100Mb Nic,AP6255 wifi/Bluetooth(wifi:bcm4329-fmac,Bluetooth:bcm4345c5)</td><td>meson-gxl</td><td>s905w</td><td>no</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><td>meson-gxm</td><td>s912</td><td>yes</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><td>meson-gxm</td><td>s912</td><td>no</td></tr>