From 9e7a232e4b54f5630fc50a5d39b29890e6b018cf Mon Sep 17 00:00:00 2001 From: ophub Date: Mon, 17 Jan 2022 20:19:01 +0800 Subject: [PATCH] Update installation instructions --- README.cn.md | 4 +++- README.md | 4 +++- rebuild | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.cn.md b/README.cn.md index 146b97311a..43fc47b8b5 100644 --- a/README.cn.md +++ b/README.cn.md @@ -33,6 +33,8 @@ armbian-install ``` +默认不安装主线 u-boot，个别盒子在使用 5.10 以上内核时需要安装。如果选择安装，请在第 `1` 个输入参数中指定，如 `armbian-install yes` + - ### 更新 Armbian 内核 查询 [可选内核](https://github.com/ophub/kernel/tree/main/pub/stable) 版本，登录 Armbian 系统 → 输入命令： @@ -44,7 +46,7 @@ armbian-update 5.4.170 如果当前目录下有成套的内核文件，可以运行 `armbian-update` 命令安装此内核。内核更新脚本会在开发中不断更新，可使用此命令同步更新本地的脚本：`wget -O /usr/sbin/armbian-update git.io/armbian-update` 。或者直接使用服务器端最新脚本进行内核更新：`bash <(curl -fsSL git.io/armbian-update) 5.4.170` -内核更新时，默认从 [stable](https://github.com/ophub/kernel/tree/main/pub/stable) 内核版本分支下载，如果下载其他 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 的内核，请在第 `2` 个参数中根据分支文件夹名称指定，如 `armbian-update 5.7.19 dev` 。默认自动安装主线 u-boot，可以更好的支持 5.10 及以上内核系列的使用。如果选择不安装，请在第 `3` 个输入参数中指定，如 `armbian-update 5.4.170 stable no` +内核更新时，默认从 [stable](https://github.com/ophub/kernel/tree/main/pub/stable) 内核版本分支下载，如果下载其他 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 的内核，请在第 `2` 个参数中根据分支文件夹名称指定，如 `armbian-update 5.7.19 dev` 。默认不安装主线 u-boot，如果选择安装，请在第 `3` 个输入参数中指定，如 `armbian-update 5.4.170 stable yes` 内核中的 `headers` 文件默认安装在 `/use/local/include` 目录下。在编译应用程序的时候，在 `GCC` 的 `CFLAG` 参数中添加 `-I /usr/local/include` 即可找到头文件。 diff --git a/README.md b/README.md index a377d2ff3b..97ca795185 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ Login in to armbian (default user: root, default password: 1234) → input comma armbian-install ``` +The mainline u-boot is not installed by default, and individual boxes need to be installed when using kernels above 5.10. If you choose to install, specify it in the `1` input parameter, e.g. `armbian-install yes` + - ### Update Armbian Kernel Query the available [kernel_version](https://github.com/ophub/kernel/tree/main/pub/stable). Login in to armbian → input command: @@ -44,7 +46,7 @@ armbian-update 5.4.170 If there is a complete set of kernel files in the current directory, you can run the `armbian-update` command to install this kernel. The kernel update script will be continuously updated during development. You can use this command to update the local script synchronously: `wget -O /usr/sbin/armbian-update git.io/armbian-update` . Or directly use the latest script on the server side to update the kernel: `bash <(curl -fsSL git.io/armbian-update) 5.4.170` -When the kernel is updated, By default, download from [stable](https://github.com/ophub/kernel/tree/main/pub/stable) kernel version branch, if you download other [version branch](https://github.com/ophub/kernel/tree/main/pub), please specify according to the branch folder name in the `second` parameter, such as `armbian-update 5.7.19 dev` . The mainline u-boot is automatically installed by default, which can better support the use of kernel series 5.10 and above. If you choose not to install, please specify in the `third` input parameter, such as `armbian-update 5.4.170 stable no` +When the kernel is updated, By default, download from [stable](https://github.com/ophub/kernel/tree/main/pub/stable) kernel version branch, if you download other [version branch](https://github.com/ophub/kernel/tree/main/pub), please specify according to the branch folder name in the `2` parameter, such as `armbian-update 5.7.19 dev` . The mainline u-boot is not installed by default, and individual boxes need to be installed when using kernels above 5.10. If you choose to install, specify it in the `3` input parameter, e.g. `armbian-update 5.4.170 stable yes` The `headers` files in the kernel is installed in the `/use/local/include` directory. When compiling the application, add `-I /usr/local/include` to the `CFLAG` parameter of `GCC` to find the headers files. diff --git a/rebuild b/rebuild index 10c9fa47e2..92185aef9e 100755 --- a/rebuild +++ b/rebuild @@ -313,7 +313,7 @@ copy_files() { s922x-reva) FDTFILE="meson-g12b-gtking-pro.dtb" UBOOT_OVERLOAD="u-boot-gtkingpro-rev-a.bin" - MAINLINE_UBOOT="/lib/u-boot/gtkingpro-u-boot.bin.sd.bin" + MAINLINE_UBOOT="" ANDROID_UBOOT="" AMLOGIC_SOC="s922x" ;;