diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-10-02 15:03:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 15:03:00 +0100 |
| commit | 6eb4d72d56e77433fee26a313a32e5d679fd52ed (patch) | |
| tree | d7dfb5773460e9835d99672fdc0e3b8cf5546c82 | |
| parent | 3b6ceeff25e84505568ad0355eb03dede2f5ee6a (diff) | |
| parent | 37c21657ed290a694d3fcb4de2809c33f2b9cf5d (diff) | |
| download | platform_external_arm-trusted-firmware-6eb4d72d56e77433fee26a313a32e5d679fd52ed.tar.gz platform_external_arm-trusted-firmware-6eb4d72d56e77433fee26a313a32e5d679fd52ed.tar.bz2 platform_external_arm-trusted-firmware-6eb4d72d56e77433fee26a313a32e5d679fd52ed.zip | |
Merge pull request #1114 from vchong/updt_docs
hikey*: Update docs
| -rw-r--r-- | docs/plat/hikey.rst | 25 | ||||
| -rw-r--r-- | docs/plat/hikey960.rst | 24 |
2 files changed, 31 insertions, 18 deletions
diff --git a/docs/plat/hikey.rst b/docs/plat/hikey.rst index e194edee5..1c4810443 100644 --- a/docs/plat/hikey.rst +++ b/docs/plat/hikey.rst @@ -38,6 +38,16 @@ Build Procedure - Fetch all the above repositories into local host. Make all the repositories in the same ${BUILD\_PATH}. + .. code:: shell + + git clone https://github.com/ARM-software/arm-trusted-firmware -b integration + git clone https://github.com/OP-TEE/optee_os + git clone https://github.com/96boards-hikey/edk2 -b testing/hikey960_v2.5 + git clone https://github.com/96boards-hikey/OpenPlatformPkg -b testing/hikey960_v1.3.4 + git clone https://github.com/96boards-hikey/l-loader -b testing/hikey960_v1.2 + git clone https://git.linaro.org/uefi/uefi-tools + git clone https://github.com/96boards-hikey/atf-fastboot + - Create the symbol link to OpenPlatformPkg in edk2. .. code:: shell @@ -74,20 +84,15 @@ Build Procedure cd ${EDK2_DIR} # Build UEFI & ARM Trust Firmware ${UEFI_TOOLS_DIR}/uefi-build.sh -b ${BUILD_OPTION} -a ../arm-trusted-firmware -s ../optee_os hikey - # Generate l-loader.bin - cd ${BUILD_PATH}/l-loader - ln -sf ${EDK2_OUTPUT_DIR}/FV/bl1.bin - ln -sf ${BUILD_PATH}/atf-fastboot/build/hikey/${FASTBOOT_BUILD_OPTION}/bl1.bin fastboot.bin - arm-linux-gnueabihf-gcc -c -o start.o start.S - arm-linux-gnueabihf-ld -Bstatic -Tl-loader.lds -Ttext 0xf9800800 start.o -o loader - arm-linux-gnueabihf-objcopy -O binary loader temp - python gen_loader_hikey.py -o l-loader.bin --img_loader=temp --img_bl1=bl1.bin --img_ns_bl1u=fastboot.bin -- Generate partition table for aosp. The eMMC capacity is either 4GB or 8GB. Just change "aosp-4g" to "linux-4g" for debian. +- Generate l-loader.bin and partition table for aosp. The eMMC capacity is either 8GB or 4GB. Just change "aosp-8g" to "linux-8g" for debian. .. code:: shell - PTABLE=aosp-4g SECTOR_SIZE=512 bash -x generate_ptable.sh + cd ${BUILD_PATH}/l-loader + ln -sf ${EDK2_OUTPUT_DIR}/FV/bl1.bin + ln -sf ${BUILD_PATH}/atf-fastboot/build/hikey/${FASTBOOT_BUILD_OPTION}/bl1.bin fastboot.bin + make hikey PTABLE_LST=aosp-8g Setup Console ------------- diff --git a/docs/plat/hikey960.rst b/docs/plat/hikey960.rst index cd1880e1a..8524b48af 100644 --- a/docs/plat/hikey960.rst +++ b/docs/plat/hikey960.rst @@ -35,6 +35,15 @@ Build Procedure - Fetch all the above 5 repositories into local host. Make all the repositories in the same ${BUILD\_PATH}. + .. code:: shell + + git clone https://github.com/ARM-software/arm-trusted-firmware -b integration + git clone https://github.com/OP-TEE/optee_os + git clone https://github.com/96boards-hikey/edk2 -b testing/hikey960_v2.5 + git clone https://github.com/96boards-hikey/OpenPlatformPkg -b testing/hikey960_v1.3.4 + git clone https://github.com/96boards-hikey/l-loader -b testing/hikey960_v1.2 + git clone https://git.linaro.org/uefi/uefi-tools + - Create the symbol link to OpenPlatformPkg in edk2. .. code:: shell @@ -66,19 +75,17 @@ Build Procedure cd ${EDK2_DIR} # Build UEFI & ARM Trust Firmware ${UEFI_TOOLS_DIR}/uefi-build.sh -b ${BUILD_OPTION} -a ../arm-trusted-firmware -s ../optee_os hikey960 - # Generate l-loader.bin - cd ${BUILD_PATH}/l-loader - ln -sf ${EDK2_OUTPUT_DIR}/FV/bl1.bin - ln -sf ${EDK2_OUTPUT_DIR}/FV/fip.bin - ln -sf ${EDK2_OUTPUT_DIR}/FV/BL33_AP_UEFI.fd - python gen_loader_hikey960.py -o l-loader.bin --img_bl1=bl1.bin --img_ns_bl1u=BL33_AP_UEFI.fd -- Generate partition table. +- Generate l-loader.bin and partition table. *Make sure that you're using the sgdisk in the l-loader directory.* .. code:: shell - PTABLE=aosp-32g SECTOR_SIZE=4096 SGDISK=./sgdisk bash -x generate_ptable.sh + cd ${BUILD_PATH}/l-loader + ln -sf ${EDK2_OUTPUT_DIR}/FV/bl1.bin + ln -sf ${EDK2_OUTPUT_DIR}/FV/fip.bin + ln -sf ${EDK2_OUTPUT_DIR}/FV/BL33_AP_UEFI.fd + make hikey960 Setup Console ------------- @@ -129,6 +136,7 @@ Boot UEFI in recovery mode $cd tools-images-hikey960 $ln -sf ${BUILD_PATH}/l-loader/l-loader.bin + $ln -sf ${BUILD_PATH}/l-loader/fip.bin - Prepare config file. |