Merge pull request #567 from skljfi/android_ROCK5B_SPI-NMVE

docs: rock5b/5b+ SPI-NVME startup docs
radxa-docs · Nov 25, 2024 · 2a435f0 · 2a435f0
2 parents d96d6e7 + 1038b0c
commit 2a435f0
Show file tree

Hide file tree

Showing 52 changed files with 538 additions and 371 deletions.
diff --git a/docs/accessories/penta-sata-hat/README.md b/docs/accessories/penta-sata-hat/README.md
@@ -56,32 +56,30 @@ sidebar_position: 1
 
   ![Radxa M.2 Extension Board](/img/accessories/penta-sata-hat-04.webp)
 
-
 ## 40 针 Pinout
 
 | Description   | Function | Pin# | Pin# | Function | Description |
-|---------------|----------|------|------|----------|-------------|
-|               |          | 1    | 2    |   VCC    |             |
-|   OLED I2C    | I2C_SDA  | 3    | 4    |   VCC    |             |
-|   OLED I2C    | I2C_SCL  | 5    | 6    |   GND    |             |
+| ------------- | -------- | ---- | ---- | -------- | ----------- |
+|               |          | 1    | 2    | VCC      |             |
+| OLED I2C      | I2C_SDA  | 3    | 4    | VCC      |             |
+| OLED I2C      | I2C_SCL  | 5    | 6    | GND      |             |
 |               |          | 7    | 8    |          |             |
-|               |   GND    | 9    | 10   |          |             |
-| top board key |   GPIO   | 11   | 12   |          |             |
-|               |          | 13   | 14   |   GND    |             |
-|               |          | 15   | 16   |   GPIO   | reset OLED  |
+|               | GND      | 9    | 10   |          |             |
+| top board key | GPIO     | 11   | 12   |          |             |
+|               |          | 13   | 14   | GND      |             |
+|               |          | 15   | 16   | GPIO     | reset OLED  |
 |               |          | 17   | 18   |          |             |
-|               |          | 19   | 20   |   GND    |             |
+|               |          | 19   | 20   | GND      |             |
 |               |          | 21   | 22   |          |             |
 |               |          | 23   | 24   |          |             |
-|               |   GND    | 25   | 26   |          |             |
+|               | GND      | 25   | 26   |          |             |
 |               |          | 27   | 28   |          |             |
-|               |          | 29   | 30   |   GND    |             |
+|               |          | 29   | 30   | GND      |             |
 |               |          | 31   | 32   |          |             |
-| tb-fan speed  |   PWM    | 33   | 34   |   GND    |             |
+| tb-fan speed  | PWM      | 33   | 34   | GND      |             |
 |               |          | 35   | 36   |          |             |
 |               |          | 37   | 38   |          |             |
-|               |   GND    | 39   | 40   |          |             |
-
+|               | GND      | 39   | 40   |          |             |
 
 ## 使用指南
 

diff --git a/docs/accessories/penta-sata-hat/penta-for-rpi5.md b/docs/accessories/penta-sata-hat/penta-for-rpi5.md
@@ -143,10 +143,10 @@ sudo lspci -vvv -s 0000:01:00.1 | grep LnkSta
 
 目前我们尚未生产用于销售的相应外壳。但我们以及社区的用户提供了一些非常好看的 3D 打印外壳，你可以尝试打印这些外壳：
 
-| 外壳名称          | 预览                                                                                        | 下载地址                                                                                               | 作者                                                         | 备注                                                                                                                                                                                  |
-| ----------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Radxa Penta NAS   | <img src="/img/accessories/penta/case/case-1.webp" width="480" height="360" alt="case-1" /> | [GrabCAD](https://grabcad.com/library/radxa-penta-sata-hat-nas-case-1)                                 | [Radxa Computer](https://radxa.com/)                         | 支持安装 [Top board](sata-hat-top-board)<br/>问题讨论：[Raspberry Pi 3D print penta hat case quirks ](https://forum.radxa.com/t/raspberry-pi-3d-print-penta-hat-case-quirks/21063/15) |
-| Pi 5 Four Bay NAS | <img src="/img/accessories/penta/case/case-2.webp" width="480" height="360" alt="case-2" /> | [MakerWorld](https://makerworld.com/en/models/464746#profileId-373433)                                 | [Michael Klements](https://www.youtube.com/@MichaelKlements) | 视频： [I Built A 4-Bay NAS Using A Raspberry Pi 5](https://www.youtube.com/watch?v=vIEjdjS7uVg)                                                                                      |
-| Pi 5 NAS TOWER    | <img src="/img/accessories/penta/case/case-3.webp" width="480" height="360" alt="case-3" /> | [Cults 3D](https://cults3d.com/en/3d-model/gadget/pi-5-nas-tower-for-radxa-hat-with-option-noctua-fan) | [CeIIy](https://cults3d.com/en/users/CeIIy)                  | 8CM 猫扇，散热优秀                                                                                                                                                                    |
-| Pi 5 NAS BOX      | <img src="/img/accessories/penta/case/case-4.webp" width="480" height="360" alt="case-4" /> | [MakerWorld](https://makerworld.com/en/models/507716#profileId-423445)                                 | [WikiZell](https://makerworld.com/en/@WikiZell)              | 硬盘方便拔插                                                                                                                                                                          |
-| Radxa Penta Case  | <img src="/img/accessories/penta/case/case-5.webp" width="360" height="480" alt="case-5" /> | [Printables](https://www.printables.com/model/980955-radxa-sata-hat-case-w-80mm-fan) | [Patrick Friedel](https://www.printables.com/@PatrickFriede_243003)                  | 8CM 风扇，散热优秀                                                                                                                                                                    |
+| 外壳名称          | 预览                                                                                        | 下载地址                                                                                               | 作者                                                                | 备注                                                                                                                                                                                  |
+| ----------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Radxa Penta NAS   | <img src="/img/accessories/penta/case/case-1.webp" width="480" height="360" alt="case-1" /> | [GrabCAD](https://grabcad.com/library/radxa-penta-sata-hat-nas-case-1)                                 | [Radxa Computer](https://radxa.com/)                                | 支持安装 [Top board](sata-hat-top-board)<br/>问题讨论：[Raspberry Pi 3D print penta hat case quirks ](https://forum.radxa.com/t/raspberry-pi-3d-print-penta-hat-case-quirks/21063/15) |
+| Pi 5 Four Bay NAS | <img src="/img/accessories/penta/case/case-2.webp" width="480" height="360" alt="case-2" /> | [MakerWorld](https://makerworld.com/en/models/464746#profileId-373433)                                 | [Michael Klements](https://www.youtube.com/@MichaelKlements)        | 视频： [I Built A 4-Bay NAS Using A Raspberry Pi 5](https://www.youtube.com/watch?v=vIEjdjS7uVg)                                                                                      |
+| Pi 5 NAS TOWER    | <img src="/img/accessories/penta/case/case-3.webp" width="480" height="360" alt="case-3" /> | [Cults 3D](https://cults3d.com/en/3d-model/gadget/pi-5-nas-tower-for-radxa-hat-with-option-noctua-fan) | [CeIIy](https://cults3d.com/en/users/CeIIy)                         | 8CM 猫扇，散热优秀                                                                                                                                                                    |
+| Pi 5 NAS BOX      | <img src="/img/accessories/penta/case/case-4.webp" width="480" height="360" alt="case-4" /> | [MakerWorld](https://makerworld.com/en/models/507716#profileId-423445)                                 | [WikiZell](https://makerworld.com/en/@WikiZell)                     | 硬盘方便拔插                                                                                                                                                                          |
+| Radxa Penta Case  | <img src="/img/accessories/penta/case/case-5.webp" width="360" height="480" alt="case-5" /> | [Printables](https://www.printables.com/model/980955-radxa-sata-hat-case-w-80mm-fan)                   | [Patrick Friedel](https://www.printables.com/@PatrickFriede_243003) | 8CM 风扇，散热优秀                                                                                                                                                                    |
diff --git a/docs/common/dev/_android-name.mdx b/docs/common/dev/_android-name.mdx
diff --git a/docs/common/general/_power_board_from_40pin.mdx b/docs/common/general/_power_board_from_40pin.mdx
@@ -1,6 +1,6 @@
 # 如何通过 GPIO 给板子供电
 
-大部分 radxa sbc 都可以从 40 PIN 上的 GPIO 接口来供电启动，少部分启动电压超过 5V 的除外.  5B/5B+ 5V可以启动，这里以 5B+ 为例来进行讲解。
+大部分 radxa sbc 都可以从 40 PIN 上的 GPIO 接口来供电启动，少部分启动电压超过 5V 的除外. 5B/5B+ 5V可以启动，这里以 5B+ 为例来进行讲解。
 
 ## 准备工作
 
@@ -15,17 +15,29 @@
 :::
 
 - 先确定 40 PIN 上 5V 和 GND 的 GPIO 位置 (一般在该产品文档的**硬件信息**部分能找到)
-
-  <img src="/img//rock5b/rock5bp_40pin_power_3.webp" alt="rock 40 pin" width="300" />
+
+  <img
+    src="/img//rock5b/rock5bp_40pin_power_3.webp"
+    alt="rock 40 pin"
+    width="300"
+  />
 
 - 用杜邦线分别接电源的正负极, 2 根接正极, 2 根接负极.
 
 - 调整电源电压为 5V，然后电源上电
 
 - 用一端接电源正极的杜邦线接 40 PIN 的 5V 输入的 PIN 上，负极的杜邦线接到 40 PIN 的GND上
 
-  <img src="/img//rock5b/rock5bp_40pin_power_1.webp" alt="rock 40 pin power" width="700" />
-  <img src="/img//rock5b/rock5bp_40pin_power_2.webp" alt="rock 40 pin power" width="700" />
+  <img
+    src="/img//rock5b/rock5bp_40pin_power_1.webp"
+    alt="rock 40 pin power"
+    width="700"
+  />
+  <img
+    src="/img//rock5b/rock5bp_40pin_power_2.webp"
+    alt="rock 40 pin power"
+    width="700"
+  />
 
 ## 常见问题
 
@@ -34,5 +46,5 @@
   这个看实际情况，如果板子的负载较小，功耗较低， 接一个 5V GPIO 供电也可以满足要求。
 
 - GPIO 供电 最大支持的功率是多少?
-  
+
   在接两个 5V 输入和 所有GND的情况下 支持功率可以到 25W. 另外如果达不到25W，建议使用好一点的线材.
diff --git a/...nio/nio12l/android/how-to-build-andoid.md → ...io/nio12l/android/how-to-build-android.md b/...nio/nio12l/android/how-to-build-andoid.md → ...io/nio12l/android/how-to-build-android.md
@@ -22,6 +22,7 @@ sidebar_position: 4
  libgl1-mesa-dev libncurses5 lib32ncurses5-dev libssl-dev libx11-dev libxml2-utils m4 unzip x11proto-core-dev xsltproc zip \
  zlib1g-dev bsdmainutils cgpt libswitch-perl bc rsync xxd git-core parallel
 ```
+
 ### 编译命令
 
 ```

diff --git a/docs/rock3/rock3b/hardware-design/revision.md b/docs/rock3/rock3b/hardware-design/revision.md
@@ -15,4 +15,3 @@ sidebar_position: 2
 - 删除 R140，优化设计以避免为普通电池充电。
 - PCB 板厚更改为 1.6mm。
 - 优化 SIM 卡槽选型。
-
diff --git a/docs/rock5/rock5b/_enter_maskrom_mode.mdx b/docs/rock5/rock5b/_enter_maskrom_mode.mdx
@@ -0,0 +1,42 @@
+<Tabs queryString="versions">
+  <TabItem value="ROCK 5B">
+    <ol>
+      <li>拔出 microSD 卡和电源线</li>
+      <li>
+        如果需要烧录系统到 EMMC 或者 NVME，请此时将它们到安装到板子对应的接口上
+      </li>
+      <li>按住 Maskrom button</li>
+      <li>
+        将 USB A-C 电缆插入 ROCK 5B 的 Type-C
+        端口，另一端插入电脑，此时正常情况下会进入 Maskrom 状态
+      </li>
+    </ol>
+    <img
+      src="/img/rock5b/rock-5b-typec-maskrom-400px.webp"
+      alt="rock 5b maskrom wire"
+      width="500"
+    />
+  </TabItem>
+  <TabItem value="ROCK 5B+">
+    <ol>
+      <li>拔出 microSD 卡和电源线</li>
+      <li>
+        如果需要烧录系统到 EMMC 或者 NVME，请此时将它们到安装到板子对应的接口上
+      </li>
+      <li>按住 Maskrom button</li>
+      <li>
+        将 USB A-C 电缆插入 ROCK 5B+ 的 Type-C 端口，另一端插入电脑，给 ROCK 5B+
+        上电，此时正常情况下会进入 Maskrom 状态
+      </li>
+    </ol>
+    <img
+      src="/img/rock5b/rock-5bp-typec-maskrom.webp"
+      alt="rock 5b maskrom wire"
+      width="500"
+    />
+  </TabItem>
+</Tabs>
+
+- PC 端查看是否有 USB 设备
+  - Linux/macOS: 检查执行 lsusb 后是否有显示 "Bus 001 Device 112: ID 2207:350a Fuzhou Rockchip Electronics Company"
+  - Windows: 打开 RKDevTool 您会看到设备处于 "maskrom mode".
diff --git a/docs/rock5/rock5b/download.md b/docs/rock5/rock5b/download.md
@@ -2,15 +2,39 @@
 sidebar_position: 2
 ---
 
-import Images from "./\_image.mdx"
-
 # 资源下载汇总
 
 ## 操作系统镜像
 
-### 官方镜像
+### 官方镜像及Loader
+
+SPI Image:
+
+[spi_image.img](https://dl.radxa.com/rock5/sw/images/loader/rock-5b/release/rock-5b-spi-image-gd1cf491-20240523.img)
+
+Linux：
+
+<pre>
+    Loader： [RK3588_SPL_Loader_v1.15.113.bin](https://dl.radxa.com/rock5/sw/images/loader/rock-5b/release/rk3588_spl_loader_v1.15.113.bin)
+
+    ROCK 5B 系统镜像 (5.10 内核): [rock-5b_debian_bullseye_kde_b39](https://github.com/radxa-build/rock-5b/releases/download/b39/rock-5b_debian_bullseye_kde_b39.img.xz)
+
+    ROCK 5B 系统镜像 (6.1 内核): [rock-5b_bookworm_kde_b5](https://github.com/radxa-build/rock-5b/releases/download/rsdk-b5/rock-5b_bookworm_kde_b5.output.img.xz)
+
+    ROCK 5B+ 系统镜像: [rock-5b-plus_bookworm_kde_b2](https://github.com/radxa-build/rock-5b-plus/releases/download/rsdk-b2/rock-5b-plus_bookworm_kde_b2.output.img.xz)
+</pre>
+
+Android：
+
+<pre>
+    Loader: [MiniLoader.bin](https://dl.radxa.com/rock5/5itx/images/MiniLoaderAll.bin)
+
+    [ROCK 5B Android 12](https://github.com/radxa/manifests/releases/download/Android12_rkr14_20240419/Rock5B_Android12_rkr14_20240419-gpt.zip)(用于 sdcard/emmc/nvme 启动)
+
+    [ROCK_5B+_Android12_gpt](https://github.com/radxa/manifests/releases/download/android12-radxa-20240708/Rock5BPlus-Android12-rkr14-SD-or-eMMC-20240705-1-gpt.zip)(用于 sdcard/emmc 启动)
 
-<Images loader={false} rock5b_system_img={true} rock5b_system_img_61={true} rock5bp_system_img={true} lite_rock5b_system_img={true} spi_img={false} android12_update={true} android12_gpt={true}  />
+    [ROCK_5B+_Android12_update](https://github.com/radxa/manifests/releases/download/android12-radxa-20240708/Rock5BPlus-Android12-rkr14-SPI_NVME-20240705-update.zip)(用于 SPI-NVME 启动)
+</pre>
 
 ### 第三方镜像
 

diff --git a/docs/rock5/rock5b/getting-started/install-os/boot_from_emmc.md b/docs/rock5/rock5b/getting-started/install-os/boot_from_emmc.md
@@ -2,14 +2,13 @@
 sidebar_position: 2
 ---
 
-import Images from "../../\_image.mdx"
 import Etcher from '../../../../common/general/\_etcherV2.mdx';
 
 # 安装系统到 eMMC Module
 
 ## 文件下载
 
-<Images loader={false} rock5b_system_img={true} rock5b_system_img_61={true} rock5bp_system_img={true} spi_img={false} />
+请到 [资源下载汇总](../../download) 下载对应的镜像文件
 
 ## eMMC Module 准备
 

diff --git a/docs/rock5/rock5b/getting-started/install-os/boot_from_sd_card.md b/docs/rock5/rock5b/getting-started/install-os/boot_from_sd_card.md
@@ -2,14 +2,13 @@
 sidebar_position: 1
 ---
 
-import Images from "../../\_image.mdx"
 import Etcher from '../../../../common/general/\_etcherV2.mdx';
 
 # 安装系统到 MicroSD 卡
 
 ## 文件下载
 
-<Images loader={false} rock5b_system_img={true} rock5b_system_img_61={true} rock5bp_system_img={true} spi_img={false} />
+请到 [资源下载汇总](../../download) 下载对应的镜像文件
 
 ## MicroSD 卡准备
 

diff --git a/docs/rock5/rock5b/hardware-design/power_board_from_40pin.md b/docs/rock5/rock5b/hardware-design/power_board_from_40pin.md
@@ -2,8 +2,8 @@
 sidebar_position: 10
 ---
 
-import PowerViaGPIO from "../../../common/general/_power_board_from_40pin.mdx"
+import PowerViaGPIO from "../../../common/general/\_power_board_from_40pin.mdx"
 
 # 从 40PIN GPIO 给板子供电
 
-<PowerViaGPIO />
+<PowerViaGPIO />
diff --git a/docs/rock5/rock5b/low-level-dev/maskrom/linux.md b/docs/rock5/rock5b/low-level-dev/maskrom/linux.md
@@ -4,13 +4,12 @@ description: "Linux 下通过 USB 刷机"
 ---
 
 import Rkdeveloptool from "../../../../common/dev/\_rkdeveloptoolV2.mdx";
-import Images from "../../\_image.mdx"
 
 # Linux 主机
 
 ## 文件下载
 
-<Images loader={true} rock5b_system_img={true} rock5b_system_img_61={true} rock5bp_system_img={true} spi_img={false} />
+请到[下载页面](../../download.md) 下载对应的镜像及Loader文件
 
 <Rkdeveloptool model="rock-5b" release_num="39" desktop="kde" platform="linux" loader="rk3588_spl_loader_v1.08.111.bin">
 

diff --git a/docs/rock5/rock5b/low-level-dev/maskrom/mac-os.md b/docs/rock5/rock5b/low-level-dev/maskrom/mac-os.md
@@ -4,13 +4,12 @@ description: "MacOS 下通过 USB 刷机"
 ---
 
 import Rkdeveloptool from "../../../../common/dev/\_rkdeveloptoolV2.mdx";
-import Images from "../../\_image.mdx"
 
 # Mac OS 主机
 
 ## 文件下载
 
-<Images loader={true} rock5b_system_img={true} rock5b_system_img_61={true} rock5bp_system_img={true} spi_img={false} />
+请到[下载页面](../../download.md) 下载对应的镜像及Loader文件
 
 <Rkdeveloptool model="rock-5b" release_num="b39" desktop="kde" platform="macos" loader="rk3588_spl_loader_v1.08.111.bin">
 

diff --git a/docs/rock5/rock5b/low-level-dev/maskrom/windows.md b/docs/rock5/rock5b/low-level-dev/maskrom/windows.md
@@ -4,13 +4,12 @@ description: "Windows 下通过 USB 刷机"
 ---
 
 import Rkdevtool from "../../../../common/dev/\_rkdevtoolV2.mdx";
-import Images from "../../\_image.mdx"
 
 # Windows 主机
 
 ## 文件下载
 
-<Images loader={true} rock5b_system_img={true} rock5b_system_img_61={true} rock5bp_system_img={true} spi_img={true} />
+请到[下载页面](../../download.md) 下载对应的镜像及Loader文件
 
 <Rkdevtool rkdevtool_emmc_img="/img/rock5b/rock-5bp-rkdevtool-maskrom-flash-system.webp" loader_name="rk3588_spl_loader_v1.08.111.bin" emmc={false} pcie={false} sata={false} >
 

diff --git a/docs/rock5/rock5b/other-os/android/download.md b/docs/rock5/rock5b/other-os/android/download.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ sidebar_position: 4 @@
      libgl1-mesa-dev libncurses5 lib32ncurses5-dev libssl-dev libx11-dev libxml2-utils m4 unzip x11proto-core-dev xsltproc zip \
      zlib1g-dev bsdmainutils cgpt libswitch-perl bc rsync xxd git-core parallel
     ```
     ### 编译命令
     ```
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ sidebar_position: 2
		- 删除 R140，优化设计以避免为普通电池充电。
		- PCB 板厚更改为 1.6mm。
		- 优化 SIM 卡槽选型。