From a628b1ab2aa8fa7ca9ffe4e05d714c50e8d83792 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Thu, 25 Jan 2018 16:10:14 +0800 Subject: hikey: migrate to bl2_el3 Since non-TF ROM is used in HiKey platform (Hisilicon Hi6220 SoC), replace BL1 by BL2_EL3 in normal boot mode. When we recovery images in recovery mode, keep to use BL1. Signed-off-by: Haojian Zhuang --- docs/plat/hikey.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/plat/hikey.rst b/docs/plat/hikey.rst index 99259f3a7..33e6514f4 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 `__. .. 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 -- cgit v1.2.3 From d2128731a93e0bd1c3580d045232cf9a984db606 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Thu, 25 Jan 2018 16:13:05 +0800 Subject: hikey960: migrate to bl2_el3 Since non-TF ROM is used in HiKey960 platform (Hisilicon Hi3660 SoC), replace BL1 by BL2_EL3 in normal boot mode. When flush images in recovery mode, keep to use BL1. Signed-off-by: Haojian Zhuang --- docs/plat/hikey960.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/plat/hikey960.rst b/docs/plat/hikey960.rst index 8524b48af..63cfc9265 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 `__ -- 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 -- cgit v1.2.3