diff options
author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2022-11-16 18:13:48 +0100 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-11-16 18:13:48 +0100 |
commit | b688120c985a713a4f91e8d4b97172b80d7f2556 (patch) | |
tree | 68e5bba7b6c60fe1406a59e69b269723161a50c4 | |
parent | 71061819aaf1b69c8600e1b7d9c9388b8f51b680 (diff) | |
parent | de89b2828e4f8ad1467ca3e981b81d2b47e1e288 (diff) | |
download | trusted-firmware-a-b688120c985a713a4f91e8d4b97172b80d7f2556.tar.gz |
Merge "docs(marvell): fix typo 8K => A8K" into integration
-rw-r--r-- | docs/plat/marvell/armada/build.rst | 8 | ||||
-rw-r--r-- | docs/plat/marvell/armada/uart-booting.rst | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/plat/marvell/armada/build.rst b/docs/plat/marvell/armada/build.rst index ff7b5734f9..8cb3fdf2fe 100644 --- a/docs/plat/marvell/armada/build.rst +++ b/docs/plat/marvell/armada/build.rst @@ -26,7 +26,7 @@ BL33 should be ``~/project/u-boot/u-boot.bin`` *u-boot.bin* should be used and not *u-boot-spl.bin* -Set MSS/SCP image path (mandatory only for A7K/8K/CN913x when MSS_SUPPORT=1) +Set MSS/SCP image path (mandatory only for A7K/A8K/CN913x when MSS_SUPPORT=1) .. code:: shell @@ -109,7 +109,7 @@ There are several build options: - MV_DDR_PATH This parameter is required for ``mrvl_flash`` and ``mrvl_uart`` targets. - For A7K/8K/CN913x it is used for BLE build and for Armada37x0 it used + For A7K/A8K/CN913x it is used for BLE build and for Armada37x0 it used for ddr_tool build. Specify path to the full checkout of Marvell mv-ddr-marvell git @@ -131,7 +131,7 @@ CN913x specific build options: values with CP_NUM are in a range of 1 to 3. -A7K/8K/CN913x specific build options: +A7K/A8K/CN913x specific build options: - BLE_PATH @@ -387,7 +387,7 @@ Special Build Flags - PLAT_RECOVERY_IMAGE_ENABLE When set this option to enable secondary recovery function when build atf. In order to build UART recovery image this operation should be disabled for - A7K/8K/CN913x because of hardware limitation (boot from secondary image + A7K/A8K/CN913x because of hardware limitation (boot from secondary image can interrupt UART recovery process). This MACRO definition is set in ``plat/marvell/armada/a8k/common/include/platform_def.h`` file. diff --git a/docs/plat/marvell/armada/uart-booting.rst b/docs/plat/marvell/armada/uart-booting.rst index 06601d1361..04ce464855 100644 --- a/docs/plat/marvell/armada/uart-booting.rst +++ b/docs/plat/marvell/armada/uart-booting.rst @@ -79,10 +79,10 @@ not loose any boot output. It also prints boot output which is sent either by im bootrom during transferring of image files. This mini terminal can be quit by CTRL-\\ + C keypress. -A7K/8K/CN913x UART image downloading ------------------------------------- +A7K/A8K/CN913x UART image downloading +------------------------------------- -A7K/8K/CN913x uses same image ``flash-image.bin`` for both flashing and booting over UART. +A7K/A8K/CN913x uses same image ``flash-image.bin`` for both flashing and booting over UART. For downloading image over UART it is possible to use mvebu64boot tool. Compilation: |