summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/boards/rockchip.rst17
-rw-r--r--Documentation/user/reboot-mode.rst8
2 files changed, 20 insertions, 5 deletions
diff --git a/Documentation/boards/rockchip.rst b/Documentation/boards/rockchip.rst
index d03c4686df..d52d979cbf 100644
--- a/Documentation/boards/rockchip.rst
+++ b/Documentation/boards/rockchip.rst
@@ -59,7 +59,7 @@ The build process needs three binary files which have to be copied from the
`rkbin https://github.com/rockchip-linux/rkbin` repository to the barebox source tree:
.. code-block:: sh
- cp $RKBIN/rk35/rk3568_bl31_v1.24.elf firmware/rk3568-bl31.bin
+ cp $RKBIN/bin/rk35/rk3568_bl31_v1.24.elf firmware/rk3568-bl31.bin
cp $RKBIN/bin/rk35/rk3568_bl32_v1.05.bin firmware/rk3568-op-tee.bin
cp $RKBIN/bin/rk35/rk3568_ddr_1560MHz_v1.08.bin arch/arm/boards/rockchip-rk3568-evb/sdram-init.bin
@@ -84,3 +84,18 @@ A bootable SD card can be created with:
The barebox image is written to the raw device, so make sure the partitioning
doesn't conflict with the are barebox is written to. Starting the first
partition at offset 8MiB is a safe bet.
+
+USB bootstrapping
+^^^^^^^^^^^^^^^^^
+
+The RK3568 can be bootstrapped via USB for which the rk-usb-loader tool in the barebox
+repository can be used. The tool takes the same images as written on SD cards:
+
+.. code-block:: sh
+
+ ./scripts/rk-usb-loader images/barebox-rk3568-evb.img
+
+Note that the boot order of the RK3568 is not configurable. The SoC will only enter USB
+MaskROM mode when no other bootsource contains a valid bootloader. This means to use USB
+you have to make all other bootsources invalid by removing SD cards and shortcircuiting
+eMMCs. The RK3568 EVB has a pushbutton to disable the eMMC.
diff --git a/Documentation/user/reboot-mode.rst b/Documentation/user/reboot-mode.rst
index 507d6feb01..681438d944 100644
--- a/Documentation/user/reboot-mode.rst
+++ b/Documentation/user/reboot-mode.rst
@@ -10,7 +10,7 @@ that boot should happen from a different boot medium.
Likewise, many bootloaders reuse such registers, or if unavailable,
non-volatile memory to determine whether the OS requested a special
-reboot mode, e.g. rebooting into an USB recovery mode. This is
+reboot mode, e.g. rebooting into a USB recovery mode. This is
common on Android systems.
barebox implements the upstream device tree bindings for
@@ -52,11 +52,11 @@ Reset
=====
Reboot modes can be stored on a syscon wrapping general purpose registers
-that survives warm resets. If the system instead did reset via an external
+that survive warm resets. If the system instead did reset via an external
power management IC, the registers may lose their value.
If such reboot mode storage is used, users must take care to use the correct
-reset provider. In barebox, multiple reset providers may co-exist. They
+reset provider. In barebox, multiple reset providers may co-exist. The
``reset`` command allows listing and choosing a specific reboot mode.
Disambiguation
@@ -86,7 +86,7 @@ as the reboot mode.
For cases, where the communication instead happens between barebox and an OS,
they can be completely different, e.g. ``$bootsource`` may say barebox was
booted from ``spi-nor``, while the reboot mode describes that barebox should
-boot the Kernel off an USB flash drive.
+boot the Kernel off a USB flash drive.
Comparison to barebox state
---------------------------