diff --git a/README.cn.md b/README.cn.md index 057d824d02..7ea64156b5 100644 --- a/README.cn.md +++ b/README.cn.md @@ -144,7 +144,7 @@ ddbr | 参数 | 含义 | 说明 | | ---- | ---- | ---- | | -d | Defaults | 使用默认配置 | -| -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` | +| -b | Build | 指定电视盒子型号,如 `-b s905x3` . 多个型号使用 `_` 进行连接,如 `-b s905x3_s905d` . 可以指定的型号有: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905`, `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.160` . 多个内核使用 `_` 进行连接,如 `-k 5.10.80_5.4.160` | | -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `-k` 中指定的内核如 5.4.160 的 5.4 同系列是否有更新的版本,如有 5.4.160 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` | @@ -204,7 +204,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) | 参数 | 默认值 | 说明 | |------------------------|------------------------|------------------------------------------------| | armbian_path | no | 设置原版 Armbian 文件的路径,支持使用当前工作流中的文件路径如 `build/output/images/*.img` ,也支持使用网络下载地址如: `https://dl.armbian.com/*/Armbian_*.img.xz` | -| armbian_soc | s905d_s905x3 | 设置打包盒子的 `SOC` ,可指定单个盒子如 `s905x3` ,可选择多个盒子用_连接如 `s905x3_s905d` 。各盒子的SoC代码为:`s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`。说明:`s922x-n2` 是 `s922x-odroid-n2` | +| armbian_soc | s905d_s905x3 | 设置打包盒子的 `SOC` ,可指定单个盒子如 `s905x3` ,可选择多个盒子用_连接如 `s905x3_s905d` 。各盒子的SoC代码为:`s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905`, `s922x`, `s922x-n2`, `s912`。说明:`s922x-n2` 是 `s922x-odroid-n2` | | version_branch | stable | 指定内核 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 名称,如 `stable` 。指定的名称须与分支目录名称相同。默认使用 `stable` 分支版本。 | | armbian_kernel | 5.10.80_5.4.160 | 设置内核版本,[kernel](https://github.com/ophub/kernel/tree/main/pub/stable) 库里收藏了众多 Flippy 的原版内核,可以查看并选择指定。 | | auto_kernel | true | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `amlogic_kernel` 中指定的内核如 5.4.160 的 5.4 同系列是否有更新的版本,如有 5.4.160 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` | diff --git a/README.md b/README.md index f566a7f3c2..12e0f7b7ce 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,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 | 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`. | +| -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`, `s905`, `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.160` . Multiple kernel use `_` connection such as `-k 5.10.80_5.4.160` | | -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.160 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` | @@ -204,7 +204,7 @@ You can use other methods to build the Armbian system. Or use [Armbian](https:// | parameter | Defaults | Description | |------------------------|------------------------|---------------------------------------------------------------| | armbian_path | no | Set the path of the original Armbian file, support the file path in the current workflow such as `build/output/images/*.img`, and also support the use of the network download address such as: `https://dl.armbian.com/*/Armbian_*.img.xz` | -| armbian_soc | s905d_s905x3 | Set the `SoC` of the packaging box, you can specify a single box such as `s905x3`, you can choose multiple boxes to use `_` connection such as `s905x3_s905d` . SOC code of each box is: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s922x`, `s922x-n2`, `s912`. Note: `s922x-n2` is `s922x-odroid-n2` | +| armbian_soc | s905d_s905x3 | Set the `SoC` of the packaging box, you can specify a single box such as `s905x3`, you can choose multiple boxes to use `_` connection such as `s905x3_s905d` . SOC code of each box is: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905`, `s922x`, `s922x-n2`, `s912`. Note: `s922x-n2` is `s922x-odroid-n2` | | version_branch | stable | Specify the name of the kernel [version branch](https://github.com/ophub/kernel/tree/main/pub), Such as `stable`. The specified name must be the same as the branch directory name. The `stable` branch version is used by default. | | armbian_kernel | 5.10.80_5.4.160 | Set the kernel version,The [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) library contains many original kernels of `Flippy`, you can view and choose to specify. | | auto_kernel | true | 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 `amlogic_kernel`. such as 5.4.160 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/rebuild b/rebuild index 936aa4f68d..60c7c955ad 100755 --- a/rebuild +++ b/rebuild @@ -24,7 +24,7 @@ kernel_library="https://github.com/ophub/kernel/tree/main/pub" #kernel_library="https://github.com/ophub/kernel/trunk/pub" version_branch="stable" -build_armbian=("s922x" "s922x-n2" "s905x3" "s905x2" "s912" "s905d" "s905x" "s905w") +build_armbian=("s922x" "s922x-n2" "s905x3" "s905x2" "s912" "s905d" "s905x" "s905w" "s905") build_kernel=("default") auto_kernel="true" @@ -254,7 +254,9 @@ copy_files() { ;; s905 | beelinkminimx | mxqpro+) FDTFILE="meson-gxbb-vega-s95-telos.dtb" + #FDTFILE="meson-gxbb-mxq-pro-plus.dtb" UBOOT_OVERLOAD="u-boot-s905.bin" + #UBOOT_OVERLOAD="u-boot-p201.bin" MAINLINE_UBOOT="" ANDROID_UBOOT="" AMLOGIC_SOC="s905"