From f5bb397c435858ad19b09199b30644272727963f Mon Sep 17 00:00:00 2001 From: ophub Date: Mon, 15 Nov 2021 13:03:13 +0800 Subject: [PATCH] s912 T95Z-Plus: Add support --- .github/workflows/build-armbian.yml | 2 +- .github/workflows/use-releases-file-to-build.yml | 2 +- README.cn.md | 4 ++-- README.md | 4 ++-- make | 12 +++++++++++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml index c4209cc47e..ae1e924e24 100644 --- a/.github/workflows/build-armbian.yml +++ b/.github/workflows/build-armbian.yml @@ -75,7 +75,7 @@ jobs: if: steps.build.outputs.status == 'success' run: | sudo chmod +x make - sudo ./make -d -b s922x_s922x-n2_s905x3_s905x2_s912_s905d -k 5.10.70_5.4.150 + sudo ./make -d -b s922x_s922x-n2_s905x3_s905x2_s905d_s912_s912-t95z -k 5.10.70_5.4.150 sudo ./make -d -b s905x_s905w -k 5.4.150 cd ./build/output/images && sudo gzip *.img && sync echo "FILEPATH=$PWD" >> $GITHUB_ENV diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml index 09d8a33994..379450b6a0 100644 --- a/.github/workflows/use-releases-file-to-build.yml +++ b/.github/workflows/use-releases-file-to-build.yml @@ -47,7 +47,7 @@ jobs: [ -s DOWNLOAD_ARMBIAN ] && wget -q -P build/output/images https://github.com/${GITHUB_REPOSITORY}/releases/download/$(cat DOWNLOAD_ARMBIAN) cd ./build/output/images && gzip -df *.img.gz && sync && cd ../../../ sudo chmod +x make - sudo ./make -d -b s922x_s922x-n2_s905x3_s905x2_s912_s905d -k 5.10.70_5.4.150 + sudo ./make -d -b s922x_s922x-n2_s905x3_s905x2_s905d_s912_s912-t95z -k 5.10.70_5.4.150 sudo ./make -d -b s905x_s905w -k 5.4.150 cd ./build/output/images && sudo gzip *.img && sync echo "FILEPATH=$PWD" >> $GITHUB_ENV diff --git a/README.cn.md b/README.cn.md index b8fb9cbcdc..878db7c5d1 100644 --- a/README.cn.md +++ b/README.cn.md @@ -13,7 +13,7 @@ | s922x | [Belink](https://tokopedia.link/RAgZmOM41db), [Belink-Pro](https://tokopedia.link/sfTHlfS41db), [Ugoos-AM6-Plus](https://tokopedia.link/pHGKXuV41db), [ODROID-N2](https://www.tokopedia.com/search?st=product&q=ODROID-N2) | 全部 | armbian_aml_s922x_buster_*.img | | s905x3 | [X96-Max+](https://tokopedia.link/uMaH09s41db), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https://tokopedia.link/duoIXZpdGgb), [X96-Air](https://tokopedia.link/5WHiETbdGgb), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb) | 全部 | armbian_aml_s905x3_buster_*.img | | s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb) | 全部 | armbian_aml_s905x2_buster_*.img | -| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), Octopus-Planet | 全部 | armbian_aml_s912_buster_*.img | +| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | 全部 | armbian_aml_s912_buster_*.img | | s905d | Phicomm-N1 | 全部 | armbian_aml_s905d_buster_*.img | | s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://tokopedia.link/LC4DiTXtEib) | 5.4.* | armbian_aml_s905x_buster_*.img | | s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.tokopedia.com/beststereo/tanix-tx3-mini-2gb-16gb-android-7-1-kodi-17-3-amlogic-s905w-4k-tv-box) | 5.4.* | armbian_aml_s905w_buster_*.img | @@ -133,7 +133,7 @@ armbian-tf | 参数 | 含义 | 说明 | | ---- | ---- | ---- | | -d | Defaults | 使用默认配置 | -| -b | Build | 指定机顶盒型号，如 `-b s905x3` . 多个型号使用 `_` 进行连接，如 `-b s905x3_s905d` . 可以指定的型号有: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`。说明：`s922x-n2` 是 `s922x-odroid-n2` | +| -b | Build | 指定机顶盒型号，如 `-b s905x3` . 多个型号使用 `_` 进行连接，如 `-b s905x3_s905d` . 可以指定的型号有: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` 。说明：`s922x-n2` 是 `s922x-odroid-n2` ，`s912-t95z` 是 `s912-t95z-plus` | | -v | Version | 指定内核 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 名称，如 `-v stable` 。指定的名称须与分支目录名称相同。默认使用 `stable` 分支版本。 | | -k | Kernel | 指定 [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) 名称，如 `-k 5.4.150` . 多个内核使用 `_` 进行连接，如 `-k 5.10.70_5.4.150` | | -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时，将自动在内核库中查找在 `-k` 中指定的内核如 5.4.150 的 5.4 同系列是否有更新的版本，如有 5.4.150 之后的最新版本时，将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值：`true` | diff --git a/README.md b/README.md index c57dcfa088..072fe7f015 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The latest version of the Armbian firmware can be downloaded in [Releases](https | s922x | [Belink](https://tokopedia.link/RAgZmOM41db), [Belink-Pro](https://tokopedia.link/sfTHlfS41db), [Ugoos-AM6-Plus](https://tokopedia.link/pHGKXuV41db), [ODROID-N2](https://www.tokopedia.com/search?st=product&q=ODROID-N2) | All | armbian_aml_s922x_buster_*.img | | s905x3 | [X96-Max+](https://tokopedia.link/uMaH09s41db), [HK1-Box](https://tokopedia.link/xhWeQgTuwfb), [H96-Max-X3](https://tokopedia.link/KuWvwoYuwfb), [Ugoos-X3](https://tokopedia.link/duoIXZpdGgb), [X96-Air](https://tokopedia.link/5WHiETbdGgb), [A95XF3-Air](https://tokopedia.link/ByBL45jdGgb) | All | armbian_aml_s905x3_buster_*.img | | s905x2 | [X96Max-4G](https://tokopedia.link/HcfLaRzjqeb), [X96Max-2G](https://tokopedia.link/HcfLaRzjqeb) | All | armbian_aml_s905x2_buster_*.img | -| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), Octopus-Planet | All | armbian_aml_s912_buster_*.img | +| s912 | [H96-Pro-Plus](https://tokopedia.link/jb42fsBdGgb), [T95Z-Plus](https://www.tokopedia.com/search?st=product&q=t95z%20plus), Octopus-Planet | All | armbian_aml_s912_buster_*.img | | s905d | Phicomm-N1 | All | armbian_aml_s905d_buster_*.img | | s905x | [HG680P](https://tokopedia.link/HbrIbqQcGgb), [B860H](https://tokopedia.link/LC4DiTXtEib) | 5.4.* | armbian_aml_s905x_buster_*.img | | s905w | [X96-Mini](https://tokopedia.link/ro207Hsjqeb), [TX3-Mini](https://www.tokopedia.com/beststereo/tanix-tx3-mini-2gb-16gb-android-7-1-kodi-17-3-amlogic-s905w-4k-tv-box) | 5.4.* | armbian_aml_s905w_buster_*.img | @@ -133,7 +133,7 @@ Command: Enter [ vi /etc/fstab ] | Parameter | Meaning | Description | | ---- | ---- | ---- | | -d | Defaults | Compile all cores and all firmware types. | -| -b | Build | Specify the Build firmware type. Write the build firmware name individually, such as `-b s905x3` . Multiple firmware use `_` connect such as `-b s905x3_s905d` . You can use these codes: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`. Note: `s922x-n2` is `s922x-odroid-n2`. | +| -b | Build | Specify the Build firmware type. Write the build firmware name individually, such as `-b s905x3` . Multiple firmware use `_` connect such as `-b s905x3_s905d` . You can use these codes: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` . Note: `s922x-n2` is `s922x-odroid-n2`, `s912-t95z` is `s912-t95z-plus`. | | -v | Version | Specify the name of the kernel [version branch](https://github.com/ophub/kernel/tree/main/pub), Such as `-v stable`. The specified name must be the same as the branch directory name. The `stable` branch version is used by default. | | -k | Kernel | Specify the [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) name. Write the kernel name individually such as `-k 5.4.150` . Multiple kernel use `_` connection such as `-k 5.10.70_5.4.150` | | -a | AutoKernel | Set whether to automatically adopt the latest version of the kernel of the same series. When it is `true`, it will automatically find in the kernel library whether there is an updated version of the kernel specified in `-k` such as 5.4.150 version. If there is the latest version of 5.4 same series, it will automatically Replace with the latest version. When set to `false`, the specified version of the kernel will be compiled. Default value: `true` | diff --git a/make b/make index 2ccd50f3b2..60c1182229 100755 --- a/make +++ b/make @@ -255,6 +255,13 @@ copy_files() { ANDROID_UBOOT="" AMLOGIC_SOC="s912" ;; + s912-t95z | s912-t95z-plus) + FDTFILE="meson-gxm-t95z-plus.dtb" + UBOOT_OVERLOAD="u-boot-s905x-s912.bin" + MAINLINE_UBOOT="" + ANDROID_UBOOT="" + AMLOGIC_SOC="s912" + ;; s922x | belink | belinkpro | ugoos) FDTFILE="meson-g12b-gtking-pro.dtb" UBOOT_OVERLOAD="u-boot-gtkingpro.bin" @@ -267,7 +274,7 @@ copy_files() { UBOOT_OVERLOAD="u-boot-odroid-n2.bin" MAINLINE_UBOOT="/lib/u-boot/odroid-n2-u-boot.bin.sd.bin" ANDROID_UBOOT="" - AMLOGIC_SOC="s922x-n2" + AMLOGIC_SOC="s922x" ;; *) die "Have no this soc: [ ${build_soc} ]" @@ -342,6 +349,9 @@ copy_files() { sed -i "s/${old_fdt_dtb}/${FDTFILE}/g" uEnv.txt fi + # For s912-t95z-plus /boot/extlinux/extlinux.conf + [ "${FDTFILE}" == "meson-gxm-t95z-plus.dtb" ] && cp -rf ${configfiles_path}/patches/boot/s912-t95z-plus/* . + sync cd ${tag_rootfs}