merge from author

CONTRIBUTOR.md

@@ -8,7 +8,7 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | ---- | ---- |
 | [150balbes](https://github.com/150balbes) | He has made outstanding contributions and laid a good foundation for using Armbian in the Amlogic box. |
 | [unifreq](https://github.com/unifreq) | Developed many Armbian and OpenWrt systems, provided s905d~s922x and many other SOC system boot and firmware production solutions, shared abundant resources and tutorials. The [u-boot](build-armbian/amlogic-u-boot), [dtb](build-armbian/amlogic-dtb), [kernel](https://github.com/ophub/kernel/tree/main/pub/stable), [script](build-armbian/common-files/files/usr/sbin) etc. used on this site all fully adopted his results, and he opened the door to the world of Armbian and OpenWrt from the TV box. |
-| [NewbieOrange](https://github.com/NewbieOrange) | 01. [2021-11-14] He provided the [meson-gxm-t95z-plus.dtb](https://github.com/ophub/amlogic-s9xxx-armbian/blob/main/build-armbian/amlogic-dtb/meson-gxm-t95z-plus.dtb) file and [usage method](build-armbian/common-files/patches/boot/s912-t95z-plus) of the new device [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus) in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/22#issuecomment-968260448); Shared the [meson-gxl-s905l2-p281.dtb](build-armbian/amlogic-dtb/meson-gxl-s905l2-p281.dtb) file of s905l2 (p281 board) in [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/29). |
+| [NewbieOrange](https://github.com/NewbieOrange) | 01. [2021-11-14] He provided the [meson-gxm-t95z-plus.dtb](https://github.com/ophub/amlogic-s9xxx-armbian/blob/main/build-armbian/amlogic-dtb/meson-gxm-t95z-plus.dtb) file and [usage method](build-armbian/common-files/patches/boot/s912-t95z-plus) of the new device [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus) in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/22#issuecomment-968260448); Shared the `meson-gxl-s905l2-p281.dtb` file of s905l2 (p281 board) in [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/29). Now called [meson-gxl-s905l2-x7-5g.dtb](build-armbian/amlogic-dtb/meson-gxl-s905l2-x7-5g.dtb) |
 | [pulpoff](https://github.com/pulpoff) | 02. [2021-11-24] He shared how to adjust [dtb freq](https://github.com/armbian/build/commit/d0831a7ce191759011d8a0f23019acebc2348149) and add new [display resolution](https://github.com/tobetter/linux/commit/248da29964751908c36e2c5558385ec09aed87ad) in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/31#issuecomment-974982500), and provided test firmware [download](https://vp5.net/king/); In [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/36), the test method for `supporting sound` is shared; In [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/34), the test method for `enabling Bluetooth` is shared. |
 | [flymike](https://github.com/flymike) | 03. [2021-12-28] He shared the available `meson-gxbb-vega-s95-telos.dtb` and `u-boot-s905.bin` of the `Beelink-Mini-MX 2G` `s905` box in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/57) |
 | [martinlanger90](https://github.com/martinlanger90) | 04. [2022-01-01] He tested and shared the `MECOOL-KI-Pro 2G/16G` `s905d` box using armbian system in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/59). The available dtb is `meson-gxl-s905d-mecool-ki-pro.dtb`, u-boot is `u-boot-p201.bin`, and it can be used in `5.4`, `5.10`, and `5.15` kernels. |
@@ -22,3 +22,4 @@ The `kernel` / `u-boot` and other resources used by this system are mainly copie
 | [Calmact](https://github.com/Calmact/e900v22c) | 12. [2022-03-02] He shared the solution of using Armbian system in `Skyworth E900V22C/D` device in [Pull](https://github.com/ophub/amlogic-s9xxx-armbian/pull/129). After testing, the kernel 5.15 support `booting from USB` for use, support `100M wired network`, no wireless and Bluetooth. He plans to provide more support for this device, you can check the latest progress in his warehouse. |
 | [danboid](https://github.com/danboid) | 13. [2022-03-09] He shared the `openvfd LED display driver and related resources` in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/143). After debugging and sharing by [unifreq](https://github.com/unifreq), it is now [supported](https://github.com/ophub/amlogic-s9xxx-armbian/tree/main/build-armbian/common-files/files/usr/share/openvfd) to be used in six devices through the [armbian-led](https://github.com/ophub/amlogic-s9xxx-armbian/blob/main/build-armbian/common-files/files/usr/sbin/armbian-led) command. |
 | [parkjw0117](https://github.com/parkjw0117) | 14. [2022-03-12] After his test in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/158), in the `Mecool-M8S-PRO-L` `s912` box, the combination of `meson-gxm-q201.dtb` and `u-boot-s905x-s912.bin` can be used normally, supporting the `5.4/5.10 kernel`. The wired network is normal. Wireless and Bluetooth are not available. |
+| [lx7741](https://github.com/lx7741) | 15. [2022-03-23] After his test in [Issues](https://github.com/ophub/amlogic-s9xxx-armbian/issues/192), in the `X96 Air` `s905x3` box, the `x96air.conf` can be used normally. Same configuration as x96max.conf |

build-armbian/armbian-docs/how_to_restore_the_original_android_tv_system.md

@@ -2,19 +2,11 @@
 
 - Under normal circumstances, re-insert the USB hard disk and install it again.
 
-- If you cannot start the Armbian system from the USB hard disk again, connect the Amlogic s9xxx tv box to the computer monitor. If the screen is completely black and there is nothing, you need to restore the Amlogic s9xxx tv box to factory settings first, and then reinstall it. First download the [amlogic_usb_burning_tool](https://github.com/ophub/script/releases/download/dev/amlogic_usb_burning_tool_v3.2.0_and_driver.tar.gz) system recovery tool and install it.
+- If you cannot start the Armbian system from the USB hard disk again, connect the Amlogic s9xxx tv box to the computer monitor. If the screen is completely black and there is nothing, you need to restore the Amlogic s9xxx tv box to factory settings first, and then reinstall it. First download the [amlogic_usb_burning_tool](https://github.com/ophub/script/releases/download/dev/amlogic_usb_burning_tool_v3.2.0_and_driver.tar.gz) system recovery tool and install it. Prepare a [USB dual male data cable](https://user-images.githubusercontent.com/68696949/159267576-74ad69a5-b6fc-489d-b1a6-0f8f8ff28634.png), Prepare a [paper clip](https://www.ebay.com/itm/133577738858).
 
-```
-Take x96max+ as an example.
-
-Prepare materials:
-
-1. [ A USB male-to-male data cable ]: https://www.ebay.com/itm/152516378334
-2. [ A paper clip ]: https://www.ebay.com/itm/133577738858
-3. [ Download the Android TV firmware ]: https://xdafirmware.com/x96-max-plus-2
-4. [ Find the two short-circuit points on the motherboard ]:
-   https://user-images.githubusercontent.com/68696949/110590933-67785300-81b3-11eb-9860-986ef35dca7d.jpg
+- Take x96max+ as an example. Find the two [short-circuit points](https://user-images.githubusercontent.com/68696949/110590933-67785300-81b3-11eb-9860-986ef35dca7d.jpg) on the motherboard, Download the [Android TV firmware](https://user-images.githubusercontent.com/68696949/159267790-38cf4681-6827-4cb6-86b2-19c7f1943342.png).
 
+```
 Operation method:
 
 1. Open the USB Burning Tool:
@@ -39,19 +31,11 @@ When the factory reset is completed, the box has been restored to the Android TV
 
 - 一般情况下，重新插入电源，如果可以从 USB 中启动，只要重新安装即可，多试几次。
 
-- 如果接入显示器后，屏幕是黑屏状态，无法从 USB 启动，就需要进行盒子的短接初始化了。先将盒子恢复到原来的安卓系统，再重新刷入 Armbian 系统。首先下载 [amlogic_usb_burning_tool](https://github.com/ophub/script/releases/download/dev/amlogic_usb_burning_tool_v3.2.0_and_driver.tar.gz) 系统恢复工具并安装好。
+- 如果接入显示器后，屏幕是黑屏状态，无法从 USB 启动，就需要进行盒子的短接初始化了。先将盒子恢复到原来的安卓系统，再重新刷入 Armbian 系统。首先下载 [amlogic_usb_burning_tool](https://github.com/ophub/script/releases/download/dev/amlogic_usb_burning_tool_v3.2.0_and_driver.tar.gz) 系统恢复工具并安装好。准备一条 [USB 双公头数据线](https://user-images.githubusercontent.com/68696949/159267576-74ad69a5-b6fc-489d-b1a6-0f8f8ff28634.png)，准备一个 [曲别针](https://user-images.githubusercontent.com/68696949/159267790-38cf4681-6827-4cb6-86b2-19c7f1943342.png)。
 
-```
-以 x96max+ 为例
-
-刷机准备：
-
-1. [ 准备一条 USB 双公头数据线 ]: https://www.ebay.com/itm/152516378334
-2. [ 准备一个曲别针 ]: https://www.ebay.com/itm/133577738858
-3. [ 下载盒子的 Android TV 固件包 ]: https://xdafirmware.com/x96-max-plus-2
-4. [ 在盒子的主板上确认短接点的位置 ]:
-   https://user-images.githubusercontent.com/68696949/110590933-67785300-81b3-11eb-9860-986ef35dca7d.jpg
+- 以 x96max+ 为例，在盒子的主板上确认 [短接点](https://user-images.githubusercontent.com/68696949/110590933-67785300-81b3-11eb-9860-986ef35dca7d.jpg) 的位置，下载盒子的 [Android TV 固件包](https://xdafirmware.com/x96-max-plus-2)。
 
+```
 操作方法：
 
 1. 打开刷机软件 USB Burning Tool:

build-armbian/armbian-docs/led_screen_display_control.md

@@ -2,9 +2,9 @@
 
 - The configuration file is placed in the [/usr/share/openvfd](https://github.com/ophub/amlogic-s9xxx-armbian/tree/main/build-armbian/common-files/files/usr/share/openvfd) directory of the `Armbian/OpenWrt` system, and the command file for `Armbian` systems is located at [/usr/sbin/armbian-led](https://github.com/ophub/amlogic-s9xxx-armbian/blob/main/build-armbian/common-files/files/usr/sbin/armbian-led), and the command file for `OpenWrt` systems is located at [/usr/sbin/openwrt-led](https://github.com/ophub/amlogic-s9xxx-openwrt/blob/main/amlogic-s9xxx/common-files/files/usr/sbin/openwrt-led). If it is not in the current firmware, it can be uploaded manually, And give the file execute permission: `chmod +x /usr/share/openvfd/vfdservice /usr/sbin/*-led`
 
-- Upgrade your system's kernel to version 5.4.185, 5.10.106, 5.15.29, 5.16.15 or later. `Armbian` systems are updated using the `armbian-update` command. For `OpenWrt` system, use `System menu` → `Amlogic Service` → `Online Download Update` to upgrade the function.
+- Upgrade your system's kernel to version 5.4.187, 5.10.108, 5.15.31, 5.16.17 or later. `Armbian` systems are updated using the `armbian-update` command. For `OpenWrt` system, use `System menu` → `Amlogic Service` → `Online Download Update` to upgrade the function.
 
-- Currently, six devices have been tested, including `x96max.conf`, `x96maxplus.conf`, `h96max-x3.conf`, `hk1-x3.conf`, `hk1box.conf`, and `tx3.conf`. The configuration of other devices can be viewed: [arthur-liberman/vfd-configurations](https://github.com/arthur-liberman/vfd-configurations) and [LibreELEC/linux_openvfd](https://github.com/LibreELEC/linux_openvfd/tree/master/conf) to modify, It is necessary to adjust the corresponding content in the configuration files of these two websites, and use it after subtracting `1` from the value of the second field, such as:
+- At present, there are several boxes such as `x96max.conf`, `x96maxplus.conf`, `h96max-x3.conf`, `hk1-x3.conf`, `hk1box.conf`, `tx3.conf`, `x96air.conf` etc. that have passed the test. The configuration of other devices can be viewed: [arthur-liberman/vfd-configurations](https://github.com/arthur-liberman/vfd-configurations) and [LibreELEC/linux_openvfd](https://github.com/LibreELEC/linux_openvfd/tree/master/conf) to modify, It is necessary to adjust the corresponding content in the configuration files of these two websites, and use it after subtracting `1` from the value of the second field, such as:
 
 ```yaml
 vfd_gpio_clk='0,69,0'
@@ -46,15 +46,16 @@ sed -i '/exit 0/i\openwrt-led 15' /etc/rc.local
 | hk1-x3     |  14    |  armbian-led 14   |   openwrt-led 14    | Enable LED  |
 | hk1box     |  15    |  armbian-led 15   |   openwrt-led 15    | Enable LED  |
 | tx3        |  16    |  armbian-led 16   |   openwrt-led 16    | Enable LED  |
+| x96air     |  17    |  armbian-led 17   |   openwrt-led 17    | Enable LED  |
 | diy        |  99    |  armbian-led 99   |   openwrt-led 99    | Enable LED  |
 
 # LED 屏显示控制说明
 
 - 配置文件放在 `Armbian/OpenWrt` 系统的 [/usr/share/openvfd](https://github.com/ophub/amlogic-s9xxx-armbian/tree/main/build-armbian/common-files/files/usr/share/openvfd) 目录下，`Armbian` 系统的命令文件位于 [/usr/sbin/armbian-led](https://github.com/ophub/amlogic-s9xxx-armbian/blob/main/build-armbian/common-files/files/usr/sbin/armbian-led)，`OpenWrt` 系统的命令文件位于 [/usr/sbin/openwrt-led](https://github.com/ophub/amlogic-s9xxx-openwrt/blob/main/amlogic-s9xxx/common-files/files/usr/sbin/openwrt-led)。如果当前固件中没有的可以手动上传，并赋予文件执行权限：`chmod +x /usr/share/openvfd/vfdservice /usr/sbin/*-led`
 
-- 将系统的内核升级到 5.4.185、5.10.106、5.15.29、5.16.15 或更高版本。`Armbian` 系统使用 `armbian-update` 命令升级。`OpenWrt` 系统使用 `系统菜单` → `晶晨宝盒` → `在线下载更新` 功能升级。
+- 将系统的内核升级到 5.4.187、5.10.108、5.15.31、5.16.17 或更高版本。`Armbian` 系统使用 `armbian-update` 命令升级。`OpenWrt` 系统使用 `系统菜单` → `晶晨宝盒` → `在线下载更新` 功能升级。
 
-- 目前有 `x96max.conf`、`x96maxplus.conf`、`h96max-x3.conf`、`hk1-x3.conf`、`hk1box.conf`、`tx3.conf` 共六个设备经过测试，其他设备的配置可以查看：[arthur-liberman/vfd-configurations](https://github.com/arthur-liberman/vfd-configurations) 和 [LibreELEC/linux_openvfd](https://github.com/LibreELEC/linux_openvfd/tree/master/conf) 进行修改，需要把这两个网站中配置文件里对应内容中进行调整，把第二个字段的值减 `1` 后使用，如：
+- 目前有 `x96max.conf`、`x96maxplus.conf`、`h96max-x3.conf`、`hk1-x3.conf`、`hk1box.conf`、`tx3.conf`、`x96air.conf` 等设备经过测试，其他设备的配置可以查看：[arthur-liberman/vfd-configurations](https://github.com/arthur-liberman/vfd-configurations) 和 [LibreELEC/linux_openvfd](https://github.com/LibreELEC/linux_openvfd/tree/master/conf) 进行修改，需要把这两个网站中配置文件里对应内容中进行调整，把第二个字段的值减 `1` 后使用，如：
 
 ```yaml
 vfd_gpio_clk='0,69,0'
@@ -96,4 +97,5 @@ sed -i '/exit 0/i\openwrt-led 15' /etc/rc.local
 | hk1-x3     |  14    |  armbian-led 14   |   openwrt-led 14    | 启用 LED |
 | hk1box     |  15    |  armbian-led 15   |   openwrt-led 15    | 启用 LED |
 | tx3        |  16    |  armbian-led 16   |   openwrt-led 16    | 启用 LED |
+| x96air     |  17    |  armbian-led 17   |   openwrt-led 17    | 启用 LED |
 | diy        |  99    |  armbian-led 99   |   openwrt-led 99    | 启用 LED |

build-armbian/common-files/files/etc/network/interfaces

@@ -1,5 +1,9 @@
 source /etc/network/interfaces.d/*
 # Network is managed by Network manager
+auto lo
+iface lo inet loopback
+auto wlan0
+iface wlan0 inet dhcp
 auto eth0
 iface eth0 inet dhcp
         hwaddress ether 12:34:56:78:9A:BC

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

@@ -34,7 +34,7 @@ fi
 
 install_emmc="$(lsblk -l -o NAME | grep -oE '(mmcblk[0-9]?boot0)' | sed "s/boot0//g")"
 if [[ "${install_emmc}" == "" ]]; then
-    echo "No emmc can be found to install the openwrt system!"
+    echo "No emmc can be found to install the armbian system!"
     exit 1
 fi
 
@@ -216,8 +216,8 @@ elif [[ "${AMLOGIC_SOC}" == "s905x" ]]; then
     BLANK2="0"
 else
     BLANK1="68"
-    BOOT="160"    # A total of [ 1120MB ] can be used in this block, and the remaining [ 960MB ] can be used.
-    BLANK2="1122" # Can set the rootfs partition after [ 1350MB ] of the total disk.
+    BOOT="256"    # A total of [ 1120MB ] can be used in this block, and the remaining [ 864MB ] can be used.
+    BLANK2="1026" # Can set the rootfs partition after [ 1350MB ] of the total disk.
 fi
 
 # Format emmc disk

build-armbian/common-files/files/usr/sbin/armbian-led

@@ -69,6 +69,7 @@ do_select_box() {
         14 | hk1-x3)      do_start hk1-x3.conf ;;
         15 | hk1box)      do_start hk1box.conf ;;
         16 | tx3)         do_start tx3.conf ;;
+        17 | x96air)      do_start x96air.conf ;;
         99 | diy)         do_start diy.conf ;;
          0 | o | stop)    do_stop ;;
          1 | * | quit)    echo "quit!" && exit 0 ;;
@@ -87,6 +88,7 @@ if [ -z "${1}" ]; then
         │        14. hk1-x3             │
         │        15. hk1box             │
         │        16. tx3                │
+        │        17. x96air             │
         │        99. diy                │
         │                               │
         ├────[ Disable LED or Quit ]────┤

build-armbian/common-files/files/usr/share/openvfd/conf/x96air.conf

@@ -0,0 +1,38 @@
+# This file must be renamed to vfd.conf and placed in the /storage/.config/ folder.
+#
+# X96 Air (S905X3) configuration
+#--------------------
+#gpio_xxx:
+# [0] 0 = &gpio, 1 = &gpio_ao.
+# [1] pin number - https://github.com/openSUSE/kernel/blob/master/include/dt-bindings/gpio/meson-g12a-gpio.h
+# [0] Reserved - must be 0.
+
+vfd_gpio_clk='0,64,0'
+vfd_gpio_dat='0,63,0'
+vfd_gpio_stb='1,10,0'
+
+#chars:
+# < DHHMM > Order of display chars (D=dots, represented by a single char)
+
+vfd_chars='4,0,1,2,3'
+
+#dot_bits:
+# Order of dot bits. Typical configurations:
+# Display Type 0, 1 usually has Alarm, USB, Play, Pause, Col, Ethernet, Wifi dots
+# Alarm = 0, USB = 1, Play = 2, Pause = 3, Col = 4, Eth = 5, Wifi = 6
+# Display Type 2 usually has APPS, USB, SETUP, CARD, Col, HDMI, CVBS dots
+# APPS = 0, USB = 1, SETUP = 2, CARD = 3, Col = 4, HDMI = 5, CVBS = 6
+# Display Type 3 Power, LAN, Col, Low Wifi, High Wifi
+# N/A = 0, N/A = 1, Power = 2, LAN = 3, Col = 4, Low Wifi = 5, High Wifi = 6
+
+vfd_dot_bits='0,1,2,3,4,5,6'
+
+#display_type:
+# [0] - Display type.
+# [1] - Reserved - must be 0..
+# [2] - Flags. (bit 0 = '1' - Common Anode display)
+# [3] - Controller.
+
+vfd_display_type='0x02,0x00,0x01,0x00'  # ok
+
+functions='usb apps setup sd hdmi cvbs'

compile-kernel/tools/config/config-5.10.106

@@ -1,6 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
+<<<<<<< HEAD:compile-kernel/tools/config/config-5.10.106
 # Linux/arm64 5.10.106 Kernel Configuration
+=======
+# Linux/arm64 5.10.108 Kernel Configuration
+>>>>>>> upstream/main:compile-kernel/tools/config/config-5.10.108
 #
 CONFIG_CC_VERSION_TEXT="clang version 13.0.0 (https://github.com/llvm/llvm-project/ 24c8eaec9467b2aaf70b0db33a4e4dd415139a50)"
 CONFIG_GCC_VERSION=0