14.06: apply update from Andy re: bl30.bin

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

3 files changed, 39 insertions, 12 deletions

diff --git a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
index d81352f..26ae1a2 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -224,7 +224,9 @@ $ make fiptool
 
 bc. $ export PATH=$JUNO_ROOT_DIR/arm-trusted-firmware/tools/fip_create:$PATH
 
-3. Gather the binary files (the following example is for release builds only).
+3. Download the "firmware image artefacts":https://wiki.linaro.org/ARM/VersatileExpress?action=AttachFile&do=get&target=juno-firmware-beta-0.7.5.zip and extract to a working directory (hereafter referred to as "<path to prebuilt binary>").
+
+4. Gather the binary files (the following example is for release builds only).
 
 bc. $ cd $JUNO_ROOT_DIR
 $ mkdir fip
@@ -232,11 +234,18 @@ $ cd fip
 $ cp <path to prebuilt binary>/bl30.bin .
 $ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
 $ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl32.bin .
 $ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd  bl33.bin
 
- 
+If you wish to use the pre-built ARM trusted firmware and UEFI EDK2 images instead of building them from source, then the last four lines of the above block can independently be replaced with the following:
+
+bc. $ cp <path to prebuilt binary>/bl2.bin .
+$ cp <path to prebuilt binary>/bl31.bin .
+$ cp <path to prebuilt binary>/bl32.bin .
+$ cp <path to prebuilt binary>/bl33.bin .
+
 
-4. Create the FIP file:
+5. Create the FIP file:
 
 bc. $ fip_create --dump          \
              --bl2 bl2.bin   \
@@ -258,7 +267,7 @@ bc. Firmware Image Package ToC:
 ---------------------------
 Creating "fip.bin";
 
-5. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
+6. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
 
 bc. $ fip_create --dump --bl30 new_bl30.bin fip.bin
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
index e117a82..cfb4b53 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -224,7 +224,9 @@ $ make fiptool
 
 bc. $ export PATH=$JUNO_ROOT_DIR/arm-trusted-firmware/tools/fip_create:$PATH
 
-3. Gather the binary files (the following example is for release builds only).
+3. Download the "firmware image artefacts":https://wiki.linaro.org/ARM/VersatileExpress?action=AttachFile&do=get&target=juno-firmware-beta-0.7.5.zip and extract to a working directory (hereafter referred to as "<path to prebuilt binary>").
+
+4. Gather the binary files (the following example is for release builds only).
 
 bc. $ cd $JUNO_ROOT_DIR
 $ mkdir fip
@@ -232,11 +234,18 @@ $ cd fip
 $ cp <path to prebuilt binary>/bl30.bin .
 $ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
 $ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl32.bin .
 $ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd  bl33.bin
 
- 
+If you wish to use the pre-built ARM trusted firmware and UEFI EDK2 images instead of building them from source, then the last four lines of the above block can independently be replaced with the following:
+
+bc. $ cp <path to prebuilt binary>/bl2.bin .
+$ cp <path to prebuilt binary>/bl31.bin .
+$ cp <path to prebuilt binary>/bl32.bin .
+$ cp <path to prebuilt binary>/bl33.bin .
+
 
-4. Create the FIP file:
+5. Create the FIP file:
 
 bc. $ fip_create --dump          \
              --bl2 bl2.bin   \
@@ -258,7 +267,7 @@ bc. Firmware Image Package ToC:
 ---------------------------
 Creating "fip.bin";
 
-5. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
+6. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
 
 bc. $ fip_create --dump --bl30 new_bl30.bin fip.bin
 
diff --git a/openembedded/juno-lsk/HACKING.textile b/openembedded/juno-lsk/HACKING.textile
index 8fba3c2..5b7012e 100644
--- a/openembedded/juno-lsk/HACKING.textile
+++ b/openembedded/juno-lsk/HACKING.textile
@@ -213,7 +213,9 @@ $ make fiptool
 
 bc. $ export PATH=$JUNO_ROOT_DIR/arm-trusted-firmware/tools/fip_create:$PATH
 
-3. Gather the binary files (the following example is for release builds only).
+3. Download the "firmware image artefacts":https://wiki.linaro.org/ARM/VersatileExpress?action=AttachFile&do=get&target=juno-firmware-beta-0.7.5.zip and extract to a working directory (hereafter referred to as "<path to prebuilt binary>").
+
+4. Gather the binary files (the following example is for release builds only).
 
 bc. $ cd $JUNO_ROOT_DIR
 $ mkdir fip
@@ -221,11 +223,18 @@ $ cd fip
 $ cp <path to prebuilt binary>/bl30.bin .
 $ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
 $ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
+$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl32.bin .
 $ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL32_AP_UEFI.fd  bl33.bin
 
- 
+If you wish to use the pre-built ARM trusted firmware and UEFI EDK2 images instead of building them from source, then the last four lines of the above block can independently be replaced with the following:
+
+bc. $ cp <path to prebuilt binary>/bl2.bin .
+$ cp <path to prebuilt binary>/bl31.bin .
+$ cp <path to prebuilt binary>/bl32.bin .
+$ cp <path to prebuilt binary>/bl33.bin .
+
 
-4. Create the FIP file:
+5. Create the FIP file:
 
 bc. $ fip_create --dump          \
              --bl2 bl2.bin   \
@@ -247,7 +256,7 @@ bc. Firmware Image Package ToC:
 ---------------------------
 Creating "fip.bin";
 
-5. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
+6. Optional: the `fip_create` tool can be used in the exact same way to update individual images inside an existing FIP file. For example, to update the SCP Firmware BL3-0 image:
 
 bc. $ fip_create --dump --bl30 new_bl30.bin fip.bin