diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml index 3fa2eeaead..c1aff21db0 100644 --- a/.github/workflows/build-armbian.yml +++ b/.github/workflows/build-armbian.yml @@ -20,7 +20,7 @@ on: more_settings: description: "Rebuild: More parameter settings" required: false - default: "-b s905l3a -k 5.4.170_5.15.13" + default: "" #schedule: #- cron: "0 17 * * 0" diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml index 8ad1060cd5..492cdbb510 100644 --- a/.github/workflows/use-releases-file-to-build.yml +++ b/.github/workflows/use-releases-file-to-build.yml @@ -16,7 +16,7 @@ on: more_settings: description: "Rebuild: More parameter settings" required: false - default: "-b s905l3a -k 5.4.170_5.15.13" + default: "" env: TZ: Asia/Shanghai diff --git a/README.cn.md b/README.cn.md index ac90eb3fe0..9bdf3de167 100644 --- a/README.cn.md +++ b/README.cn.md @@ -4,7 +4,7 @@ [Armbian](https://www.armbian.com/) 系统是基于 Debian/Ubuntu 而构建的专门用于 ARM 芯片的轻量级 Linux 系统。Armbian 系统精益、干净,并且 100% 兼容并继承了 Debian/Ubuntu 系统的功能和丰富的软件生态,可以安全稳定地运行在 TF/SD/USB 及设备的 eMMC 里。 -现在你可以将使用 Amlogic 芯片的电视盒子的安卓 TV 系统更换为 Armbian 系统,让他成为一台功能强大的服务器。本项目为 Amlogic s9xxx 电视盒子构建 Armbian 系统。支持写入 EMMC 中使用,支持更新内核等功能。支持的 Amlogic S9xxx 系列型号有 ***`a311d, s922x, s905x3, s905x2, s912, s905d, s905x, s905w, s905`*** 等,例如 ***`Belink GT-King, Belink GT-King Pro, UGOOS AM6 Plus, X96-Max+, HK1-Box, H96-Max-X3, Phicomm-N1, Octopus-Planet, Fiberhome HG680P, ZTE B860H`*** 等盒子。 +现在你可以将使用 Amlogic 芯片的电视盒子的安卓 TV 系统更换为 Armbian 系统,让他成为一台功能强大的服务器。本项目为 Amlogic s9xxx 电视盒子构建 Armbian 系统。支持写入 EMMC 中使用,支持更新内核等功能。支持的 Amlogic S9xxx 系列型号有 ***`a311d, s922x, s905x3, s905x2, s905l3a, s912, s905d, s905x, s905w, s905`*** 等,例如 ***`Belink GT-King, Belink GT-King Pro, UGOOS AM6 Plus, X96-Max+, HK1-Box, H96-Max-X3, Phicomm-N1, Octopus-Planet, Fiberhome HG680P, ZTE B860H`*** 等盒子。 最新的 Armbian 固件可以在 [Releases](https://github.com/ophub/amlogic-s9xxx-armbian/releases) 中下载。欢迎 `Fork` 并进行个性化定制。如果对你有用,可以点仓库右上角的 `Star` 表示支持。 @@ -150,7 +150,7 @@ armbian-ddbr | 参数 | 含义 | 说明 | | ---- | ---------- | ---------- | | -d | Defaults | 使用默认配置 | -| -b | BuildSoC | 指定电视盒子型号,如 `-b s905x3` . 多个型号使用 `_` 进行连接,如 `-b s905x3_s905d` . 可以指定的型号有: `a311d`, `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` 。说明:`s922x-reva` 是 `s922x-gtking-pro-rev_a`,`s922x-n2` 是 `s922x-odroid-n2` ,`s912-t95z` 是 `s912-t95z-plus` ,`s905d-ki` 是 `s912-mecool-ki-pro`,`s905x2-km3` 是 `s905x2-mecool-km3` | +| -b | BuildSoC | 指定电视盒子型号,如 `-b s905x3` . 多个型号使用 `_` 进行连接,如 `-b s905x3_s905d` . 可以指定的型号有: `a311d`, `s905x3`, `s905x2`, `s905l3a`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` 。说明:`s922x-reva` 是 `s922x-gtking-pro-rev_a`,`s922x-n2` 是 `s922x-odroid-n2` ,`s912-t95z` 是 `s912-t95z-plus` ,`s905d-ki` 是 `s912-mecool-ki-pro`,`s905x2-km3` 是 `s905x2-mecool-km3` | | -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.180` . 多个内核使用 `_` 进行连接,如 `-k 5.15.25_5.4.180` | | -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `-k` 中指定的内核如 5.4.180 的 5.4 同系列是否有更新的版本,如有 5.4.180 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` | @@ -206,9 +206,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) - GitHub Actions 输入参数说明 -GitHUB RELEASES_TOKEN 相关设置参考 https://github.com/ophub/amlogic-s9xxx-openwrt/blob/main/router-config/README.cn.md - -相关参数与`本地打包命令`相对应,请参考上面的说明。 +关于 GitHUB RELEASES_TOKEN 的相关设置可参考:[RELEASES_TOKEN](https://github.com/ophub/amlogic-s9xxx-openwrt/blob/main/router-config/README.cn.md#3-fork-仓库并设置-releases_token)。相关参数与`本地打包命令`相对应,请参考上面的说明。 | 参数 | 默认值 | 说明 | |------------------|-------------------|------------------------------------------------| diff --git a/README.md b/README.md index f23af6771c..23907c9333 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ View Chinese description | [查看中文说明](README.cn.md) The [Armbian](https://www.armbian.com/) system is a lightweight Linux system based on Debian/Ubuntu built specifically for ARM chips. The Armbian system is lean, clean, and 100% compatible and inherits the functions and rich software ecosystem of the Debian/Ubuntu system. It can run safely and stably in TF/SD/USB and the eMMC of the device. -Now you can replace the Android TV system of the TV box with the Amlogic chip with the Armbian system, making it a powerful server. This project builds Armbian system for Amlogic s9xxx TV box. including install to EMMC and update related functions. Support Amlogic s9xxx tv box are ***`a311d, s922x, s905x3, s905x2, s912, s905d, s905x, s905w, s905`***, etc. such as ***`Belink GT-King, Belink GT-King Pro, UGOOS AM6 Plus, X96-Max+, HK1-Box, H96-Max-X3, Phicomm-N1, Octopus-Planet, Fiberhome HG680P, ZTE B860H`***, etc. +Now you can replace the Android TV system of the TV box with the Amlogic chip with the Armbian system, making it a powerful server. This project builds Armbian system for Amlogic s9xxx TV box. including install to EMMC and update related functions. Support Amlogic s9xxx tv box are ***`a311d, s922x, s905x3, s905x2, s905l3a, s912, s905d, s905x, s905w, s905`***, etc. such as ***`Belink GT-King, Belink GT-King Pro, UGOOS AM6 Plus, X96-Max+, HK1-Box, H96-Max-X3, Phicomm-N1, Octopus-Planet, Fiberhome HG680P, ZTE B860H`***, etc. The latest version of the Armbian firmware can be downloaded in [Releases](https://github.com/ophub/amlogic-s9xxx-armbian/releases). Welcome to `Fork` and personalize it. If it is useful to you, you can click on the `Star` in the upper right corner of the warehouse to show your support. @@ -150,7 +150,7 @@ According to the prompt, enter `b` to perform system backup, and enter `r` to pe | Parameter | Meaning | Description | | ------ | ---------- | ----------------------------------------- | | -d | Defaults | Compile all cores and all firmware types. | -| -b | BuildSoC | 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: `a311d`, `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` . Note: `s922x-reva` is `s922x-gtking-pro-rev_a`, `s922x-n2` is `s922x-odroid-n2`, `s912-t95z` is `s912-t95z-plus`, `s905d-ki` is `s912-mecool-ki-pro`, `s905x2-km3` is `s905x2-mecool-km3`. | +| -b | BuildSoC | 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: `a311d`, `s905x3`, `s905x2`, `s905l3a`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` . Note: `s922x-reva` is `s922x-gtking-pro-rev_a`, `s922x-n2` is `s922x-odroid-n2`, `s912-t95z` is `s912-t95z-plus`, `s905d-ki` is `s912-mecool-ki-pro`, `s905x2-km3` is `s905x2-mecool-km3`. | | -v | Version | Specify the [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 version](https://github.com/ophub/kernel/tree/main/pub/stable), Such as `-k 5.4.180` . Multiple kernel use `_` connection such as `-k 5.15.25_5.4.180` | | -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.180 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` | @@ -206,7 +206,7 @@ You can use other methods to build the Armbian system. Or use [Armbian](https:// - GitHub Actions Input parameter description -The relevant parameters correspond to the `local packaging command`, please refer to the above description. +For the related settings of GitHUB RELEASES_TOKEN, please refer to: [RELEASES_TOKEN](https://github.com/ophub/amlogic-s9xxx-openwrt/blob/main/router-config/README.md#3-fork-repository-and-set-releases_token). The relevant parameters correspond to the `local packaging command`, please refer to the above description. | Parameter | Defaults | Description | |--------------------|-------------------|---------------------------------------------------------------| diff --git a/build-armbian/amlogic-u-boot/bootloader/u-boot-u200.bin.sd.bin b/build-armbian/amlogic-u-boot/bootloader/u-boot-u200.bin.sd.bin old mode 100644 new mode 100755 diff --git a/rebuild b/rebuild index b00bb09f87..68bb3e5b21 100755 --- a/rebuild +++ b/rebuild @@ -59,7 +59,7 @@ tmp_aml_image="${tmp_dir}/tmp_aml_image" os_release_file="etc/os-release" # Get armbian ${VERSION_CODENAME}: such as [ focal ] armbian_release_file="etc/armbian-release" # Set banner's ${BOARD_NAME}: such as [ s905x3 ] ophub_release_file="etc/ophub-release" # Add custom armbian firmware information -build_armbian=("a311d" "s922x" "s922x-n2" "s922x-reva" "s905x3" "s905x2" "s905l3a" "s905x2-km3" "s912" "s912-t95z" "s905d" "s905d-ki" "s905x" "s905w" "s905") +build_armbian=("a311d" "s922x" "s922x-n2" "s922x-reva" "s905x3" "s905x2" "s905l3a" "s905x2-km3" "s912" "s912-t95z" "s905d" "s905d-ki" "s905x" "s905w" "s905") # # Latest kernel download repository kernel_repo="https://github.com/ophub/kernel/tree/main/pub" @@ -257,13 +257,13 @@ confirm_version() { MAINLINE_UBOOT="x96max-u-boot.bin.sd.bin" ANDROID_UBOOT="" ;; - s905l3a) + s905l3a) FDTFILE="meson-g12a-u200.dtb" UBOOT_OVERLOAD="u-boot-u200.bin" MAINLINE_UBOOT="u-boot-u200.bin.sd.bin" ANDROID_UBOOT="" - AMLOGIC_SOC="s905l3a" - ;; + AMLOGIC_SOC="s905l3a" + ;; s905x2-km3) FDTFILE="meson-g12a-sei510.dtb" UBOOT_OVERLOAD="u-boot-x96max.bin" @@ -296,6 +296,7 @@ confirm_version() { ;; s905 | beelinkminimx | mxqpro+) FDTFILE="meson-gxbb-vega-s95-telos.dtb" + #FDTFILE="meson-gxbb-beelink-mini-mx.dtb" #FDTFILE="meson-gxbb-mxq-pro-plus.dtb" UBOOT_OVERLOAD="u-boot-s905.bin" #UBOOT_OVERLOAD="u-boot-p201.bin"