summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-03-08 10:39:52 +0000
committerGitHub <noreply@github.com>2018-03-08 10:39:52 +0000
commitbf35944bf64480f72b3832dbeddf215e67941660 (patch)
treea5beb8aa702b4795d237a5591ba7f0a47ab82572 /docs
parentf5c1eed22c885482eda40153d8ce894afb5131ad (diff)
parent4e858ba0edaf69d3adf6fd1382299905fcb7c7fe (diff)
Merge pull request #1277 from hzhuang1/testing/bl2_el3_v0.6
hikey: migrate to BL2_EL3
Diffstat (limited to 'docs')
-rw-r--r--docs/plat/hikey.rst6
-rw-r--r--docs/plat/hikey960.rst8
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/plat/hikey.rst b/docs/plat/hikey.rst
index 99259f3a..33e6514f 100644
--- a/docs/plat/hikey.rst
+++ b/docs/plat/hikey.rst
@@ -91,6 +91,7 @@ Build Procedure
cd ${BUILD_PATH}/l-loader
ln -sf ${EDK2_OUTPUT_DIR}/FV/bl1.bin
+ ln -sf ${EDK2_OUTPUT_DIR}/FV/bl2.bin
ln -sf ${BUILD_PATH}/atf-fastboot/build/hikey/${FASTBOOT_BUILD_OPTION}/bl1.bin fastboot.bin
make hikey PTABLE_LST=aosp-8g
@@ -142,17 +143,18 @@ Flash images in recovery mode
$sudo apt-get purge modemmanager
-- Run the command to download l-loader.bin into HiKey.
+- Run the command to download recovery.bin into HiKey.
.. code:: shell
- $sudo python hisi-idt.py -d /dev/ttyUSB1 --img1 l-loader.bin
+ $sudo python hisi-idt.py -d /dev/ttyUSB1 --img1 recovery.bin
- Update images. All aosp or debian images could be fetched from `link <https://builds.96boards.org/>`__.
.. code:: shell
$sudo fastboot flash ptable prm_ptable.img
+ $sudo fastboot flash loader l-loader.bin
$sudo fastboot flash fastboot fip.bin
$sudo fastboot flash boot boot.img
$sudo fastboot flash cache cache.img
diff --git a/docs/plat/hikey960.rst b/docs/plat/hikey960.rst
index 8524b48a..63cfc926 100644
--- a/docs/plat/hikey960.rst
+++ b/docs/plat/hikey960.rst
@@ -83,6 +83,7 @@ Build Procedure
cd ${BUILD_PATH}/l-loader
ln -sf ${EDK2_OUTPUT_DIR}/FV/bl1.bin
+ ln -sf ${EDK2_OUTPUT_DIR}/FV/bl2.bin
ln -sf ${EDK2_OUTPUT_DIR}/FV/fip.bin
ln -sf ${EDK2_OUTPUT_DIR}/FV/BL33_AP_UEFI.fd
make hikey960
@@ -130,13 +131,14 @@ Boot UEFI in recovery mode
- Fetch that are used in recovery mode. The code location is in below.
`link <https://github.com/96boards-hikey/tools-images-hikey960>`__
-- Generate l-loader.bin.
+- Prepare recovery binary.
.. code:: shell
$cd tools-images-hikey960
$ln -sf ${BUILD_PATH}/l-loader/l-loader.bin
$ln -sf ${BUILD_PATH}/l-loader/fip.bin
+ $ln -sf ${BUILD_PATH}/l-loader/recovery.bin
- Prepare config file.
@@ -146,7 +148,7 @@ Boot UEFI in recovery mode
# The content of config file
./sec_usb_xloader.img 0x00020000
./sec_uce_boot.img 0x6A908000
- ./l-loader.bin 0x1AC00000
+ ./recovery.bin 0x1AC00000
- Remove the modemmanager package. This package may causes hikey\_idt tool failure.
@@ -154,7 +156,7 @@ Boot UEFI in recovery mode
$sudo apt-get purge modemmanager
-- Run the command to download l-loader.bin into HiKey960.
+- Run the command to download recovery.bin into HiKey960.
.. code:: shell