15.05: Readme fixes for Juno and a bit of prep to be able to add FVP later

Change-Id: I0c7a5c3f1116f16a28b7be2ad2094b61e836b53c
Signed-off-by: James King <james.king@arm.com>

1 files changed, 34 insertions, 19 deletions

diff --git a/members/arm/platforms/README.textile b/members/arm/platforms/README.textile
index 8b690e4..6720f6a 100644
--- a/members/arm/platforms/README.textile
+++ b/members/arm/platforms/README.textile
@@ -1,6 +1,6 @@
-h1. ARM Juno Development Platform Software
+h1. ARM Development Platform Software
 
-This page describes the monthly ARM landing team software release for Juno
+This page describes the monthly ARM landing team software release for the ARM Juno Platform
 
 TABLE OF CONTENTS
 
@@ -12,18 +12,20 @@ TABLE OF CONTENTS
 
 "2.2 Downloading the software and binaries":#down
 
-"2.3 Building the software":#build
+"2.3 Downloading the Juno filesystem binaries":#down-bins
 
-"2.4 Installing on your Juno":#install
+"2.4 Building the Juno software":#build
 
-"2.4 Installing prebuilt binaries your Juno":#prebuilt
+"2.5 Installing on your Juno":#install
+
+"2.6 Installing prebuilt binaries your Juno":#prebuilt
 
 
 h2(#preface). 1. Preface
 
 The ARM software images contained in this released are distributed according to the "EULA":#https://releases.linaro.org/15.04/members/arm/android/images/armv8-android-juno-lsk#tabs-5
 
-This release page describes how to download the source code and binaries, build the source code and install all the binaries on your Juno platform. There are also links below to download Linaro prebuilt binaries.
+This release page describes how to download the source code and binaries, build the source code and install all the binaries on your platform. There are also links below to download Linaro prebuilt binaries.
 
 For a description of the Juno hardware and how to get started with the platform see the "Juno getting started guide":#http://community.arm.com/docs/DOC-8393
 
@@ -31,13 +33,13 @@ For any problems with your Juno system or this software please contact juno-supp
 
 h2(#sw). 2. Software
 
-This release supports 3 different software stacks which have been validated on the Juno platform. All include board firmware, System Power Controller firmware, ARM Trusted firmware and a choice of UEFI or u-boot loader. The options are:
+This release supports 3 different software stacks which have been validated on the platform. All include board firmware, System Power Controller firmware, ARM Trusted firmware and a choice of UEFI or u-boot loader. The options are:
 
 * LSK - Linaro Stable Kernel (v3.10) + Android LCR
 * LSK - Linaro Stable Kernel (v3.10) + OpenEmbedded Filesystem
 * Linaro Tracking Kernel (latest) + OpenEmbedded Filesystem
 
-For each option the instructions here use prebuilt binaries for the filesystem.
+For each option the instructions here use 15.04 release prebuilt binaries for the filesystem. Standard Linaro instructions can be used to rebuild the filesystem yourself.
 
 h3(#pre). 2.1 Prerequisites
 
@@ -77,32 +79,37 @@ h3(#pre). 2.1 Prerequisites
 
 * Configure Git's user.email and user.name attributes before using repo.
 
-h3(#down). 2.2 Downloading the software and binaries
+h3(#down). 2.2 Downloading the software sources
 
 * Create a workspace directory and cd into it
 * Use the repo tool to sync all the software GITs
 For a LSK kernel:
 
-bc. repo init -u https://git.linaro.org/landing-teams/working/arm/manifest -b juno -m lsk.xml
+bc. repo init -u https://git.linaro.org/landing-teams/working/arm/manifest -b 15.05 -m lsk.xml
 
 For the latest tracking kernel:
 
-bc. repo init -u https://git.linaro.org/landing-teams/working/arm/manifest -b juno -m latest.xml
+bc. repo init -u https://git.linaro.org/landing-teams/working/arm/manifest -b 15.05 -m latest.xml
 
 Then in both cases:
 
 bc. repo sync -j8
 
-* Download the filesystem binary image you want to use:
+h3(#down-bins). 2.3 Downloading the Juno filesystem binaries
+
 For Android, download juno.img.bz2 from "here":#https://releases.linaro.org/15.04/android/lcr/armv8-android-juno-lsk (accept the EULA to download)
+
 For OE, download your preferred filesystem image from "here":#https://releases.linaro.org/15.04/openembedded/juno-lsk - (called lt-vexpress64-openembedded-<type>-armv8-gcc-<version>.img.gz where <type> is minimal or lamp)
+
 For either case unpack the .img file. Insert a USB stick (minimum 4GB) into your system and run:
 
 bc. sudo dd if=<downloaded file>.img of=/dev/sd<x>
 
 (where <x> is the letter corresponding to the USB stick)
 
-h3(#build). 2.3 Building the software
+For Android, download ramdisk.img from "here":#https://releases.linaro.org/15.04/android/lcr/armv8-android-juno-lsk and copy to the root directory of your workspace.
+
+h3(#build). 2.4 Building the Juno software
 
 * First edit your <workspace>/build-scripts/variants/juno-oe to make LINUX_COMPILER point at the relative path and prefix to where you installed Linaro GCC
 
@@ -122,22 +129,30 @@ bc. ./build-scripts/build-all.sh juno-oe
 The build will create binaries for ARM Trusted Firmware, UEFI, u-boot, Linux and a DTB. The Firmware components will then be packaged into a FIP and all the binaries copied under the "output" folder.
 Running a different build will overwrite derived objects in the source tree, but will not overwrite the output folder created by the package step.
 
-h3(#install). 2.4 Installing on your Juno
+h3(#install). 2.5 Installing on your Juno
 
-* Copy the NOR flash binaries to your Juno
+* Mount the Juno flash device
 
 Connect up the USB configuration port to your build system whereby the NOR flash will be mounted as a new drive.
+
+* Ensure your Juno system binaries are up to date
+
+From your workspace recovery folder copy all of:
+SOFTWARE, SITE1, MB and config.txt overwriting the files that were already there on the mounted drive.
+
+* Copy the binaries you have built to your Juno
+
 For UEFI copy the contents of output/<variant>/uefi to the SOFTWARE folder
 For u-boot copy the contents of output/<variant>/uboot to the SOFTWARE folder
 Where <variant> is one of juno-android or juno-oe
 
-Insert the USB stick created above into your Juno
+* Insert the USB stick created above into your Juno
 
-Power cycle your Juno and it will run the new software
+Power cycle your Juno and it will copy and run the new software images.
 
-h3(#prebuilt). 2.4 Installing prebuilt binaries your Juno
+h3(#prebuilt). 2.6 Installing prebuilt binaries your Juno
 
-If you want to use prebuilt binaries rather than download and build the software as described above, they can be downloaded from:
+If you want to use prebuilt firmware and kernel binaries rather than download and build the software as described above, they can be downloaded from:
 
 * "Linaro Stable Kernel (v3.10) + Android LCR":#https://releases.linaro.org/15.04/android/lcr/armv8-android-juno-lsk
 * "Linaro Stable Kernel (v3.10) + OpenEmbedded Filesystem":#https://releases.linaro.org/15.04/openembedded/juno-lsk