13.12: use FVP models

Tidy up references to RTSM.

FVP models are now available to Linaro, so we have tested the 13.12
release using FVP rather then the older RTSM models.

DS-5 now also includes an FVP model for A9, so we also use that rather
than the older RTSM models.

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

8 files changed, 69 insertions, 68 deletions

diff --git a/android/vexpress-lsk/HOWTO_getsourceandbuild.txt b/android/vexpress-lsk/HOWTO_getsourceandbuild.txt
index 2a3da04..8d75bd5 100644
--- a/android/vexpress-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/vexpress-lsk/HOWTO_getsourceandbuild.txt
@@ -77,7 +77,7 @@ bc. chmod a+x linaro_kernel_build_cmds.sh
 bc. [*] Versatile Express Cortex-A9x4 tile
 [*] Device Tree support for Versatile Express platforms
 
-This will mean that the same kernel will run on A5, A9, TC2 and various RTSM models.
+This will mean that the same kernel will run on A5, A9, TC2 and various fast models.
 
 h1. Installing your kernel
 
diff --git a/android/vexpress-lsk/HOWTO_releasenotes.txt b/android/vexpress-lsk/HOWTO_releasenotes.txt
index 9e3c78b..61b6124 100644
--- a/android/vexpress-lsk/HOWTO_releasenotes.txt
+++ b/android/vexpress-lsk/HOWTO_releasenotes.txt
@@ -2,11 +2,11 @@ h1. Linaro Stable Kernel (LSK) 13.11 Release for Versatile Express (Android)
 
 p. The Linaro Stable Kernel (LSK) is produced, validated and released by Linaro and is based on the linux stable kernel tree. It is produced to satisfy the requirements of Linaro members. The LSK focuses on quality and stability and is therefore a great basis for member products. It also includes backports of commonly desired features, provided they meet the quality requirements, and also any bug fixes.
 
-p. Linaro releases monthly binary images for the ARM "Versatile Express":http://www.arm.com/products/tools/development-boards/versatile-express/index.php including support for Cortex-A9, Cortex-A5, TC2 (big.LITTLE) CoreTiles and RTSM.
+p. Linaro releases monthly binary images for the ARM "Versatile Express":http://www.arm.com/products/tools/development-boards/versatile-express/index.php including support for Cortex-A9, Cortex-A5, TC2 (big.LITTLE) CoreTiles and Fast Models.
 
 p. For support matters related to ARM hardware or firmware images downloaded from ARM sites, please contact "ARM support":mailto:support@arm.com
 
-p. This release includes Linaro Android Jelly Bean for both Versatile Express and Real-Time System Model ("RTSM":http://www.arm.com/products/tools/software-tools/ds-5/rtsm-simulator.php). The images are able to boot A5, A9 and TC2 using UEFI. Sources are also made available so you can build your own images (see the "'Building from Source'":https://releases.linaro.org/13.11/android/vexpress-lsk/#tabs-3 tab).
+p. This release includes Linaro Android Jelly Bean for both Versatile Express and Fast Models. The images are able to boot A5, A9 and TC2 using UEFI. Sources are also made available so you can build your own images (see the "'Building from Source'":https://releases.linaro.org/13.11/android/vexpress-lsk/#tabs-3 tab).
 
 h2. About the TC2 Engineering Build
 
diff --git a/android/vexpress-lsk/HOWTO_rtsm.txt b/android/vexpress-lsk/HOWTO_rtsm.txt
index 1316212..551bdfb 100644
--- a/android/vexpress-lsk/HOWTO_rtsm.txt
+++ b/android/vexpress-lsk/HOWTO_rtsm.txt
@@ -1,8 +1,8 @@
-This release was boot tested on RTSM A15x4 and A15x4-A7x4 models. No rigorous testing was carried out. This build is expected to run on other RTSM models.  No UEFI binary exists for A15-A7 models; in this case, the A15 binary can be used, but the A7 CPUs will not be available
+This release was boot tested on FVP A15x4 and A15x4-A7x4 models. No rigorous testing was carried out. This build is expected to run on other models.  No UEFI binary exists for A15-A7 models; in this case, the A15 binary can be used, but the A7 CPUs will not be available
 
 h2. Prerequisites
 
-* Install the RTSM model(s) you wish to run. You must have a valid license and the environment set up to run models
+* Install the model(s) you wish to run. You must have a valid license and the environment set up to run models
 * Install "Linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools
 
 h3. Install Linaro Image Tools
@@ -27,7 +27,7 @@ bc. wget http://releases.linaro.org/13.11/components/platform/linaro-image-tools
 
 h2. Create a 2GB image file
 
-RTSM will only deal with file systems up to 2GB in size, however the Linaro pre-built image for Android requires a 4GB filesystem. Therefore, we will build our own image using the pre-built artifacts (displayed above)
+Fast Models will only deal with file systems up to 2GB in size, however the Linaro pre-built image for Android requires a 4GB filesystem. Therefore, we will build our own image using the pre-built artifacts (displayed above)
 
 The following command downloads all the Android OS components necessary to make up a complete Android image.
 
@@ -40,41 +40,41 @@ Using the @linaro-android-media-create@, which is part of the @linaro-image-tool
 bc. linaro-android-media-create --image-file linaro.img --image-size 2000M --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
 tar jxvf boot.tar.bz2
 
-h2. Run RTSM with UEFI
+h2. Run Fast Models with UEFI
 
 The instructions for running UEFI on the various models are very similar.  The two differences are the UEFI binary and the model used.  Follow the model specific instruction below, then proceed to the generic instructions in the section "Run the model with UEFI".
 
 h3. Run A9x4 model with UEFI
 
-bc. RTSM_MODEL=/usr/local/DS-5/bin/RTSM_VE_Cortex-A9_MPx4
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca9x4.bin
+bc. MODEL=/usr/local/DS-5/bin/FVP_VE_Cortex-A9_MPx4
+UEFI=boot/rtsm/uefi_rtsm_ve-ca9x4.bin
 
 h3. Run A15x1 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x1/RTSM_VE_Cortex-A15x1
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x1
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run A15x2 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x2/RTSM_VE_Cortex-A15x2
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x2
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run A15x4 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x4/RTSM_VE_Cortex-A15x4
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x4
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run the model with UEFI
 
-bc. RTSM_MMC=linaro.img
-RTSM_UEFI_VARS=$HOME/uefi-vars.fd
-touch $RTSM_UEFI_VARS # create the file if it doesn't already exist
+bc. MMC=linaro.img
+UEFI_VARS=$HOME/uefi-vars.fd
+touch $UEFI_VARS # create the file if it doesn't already exist
 
-bc. $RTSM_MODEL \
--C motherboard.flashloader0.fname=$RTSM_UEFI \
--C motherboard.flashloader1.fname=$RTSM_UEFI_VARS \
--C motherboard.flashloader1.fnameWrite=$RTSM_UEFI_VARS \
--C motherboard.mmc.p_mmc_file=$RTSM_MMC \
+bc. $MODEL \
+-C motherboard.flashloader0.fname=$UEFI \
+-C motherboard.flashloader1.fname=$UEFI_VARS \
+-C motherboard.flashloader1.fnameWrite=$UEFI_VARS \
+-C motherboard.mmc.p_mmc_file=$MMC \
 -C motherboard.pl011_uart0.unbuffered_output=true \
 -C motherboard.smsc_91c111.enabled=1 \
 -C motherboard.hostbridge.userNetworking=1
diff --git a/android/vexpress/HOWTO_getsourceandbuild.txt b/android/vexpress/HOWTO_getsourceandbuild.txt
index e255e44..c70dbfb 100644
--- a/android/vexpress/HOWTO_getsourceandbuild.txt
+++ b/android/vexpress/HOWTO_getsourceandbuild.txt
@@ -77,7 +77,7 @@ bc. chmod a+x linaro_kernel_build_cmds.sh
 bc. [*] Versatile Express Cortex-A9x4 tile
 [*] Device Tree support for Versatile Express platforms
 
-This will mean that the same kernel will run on A5, A9, TC2 and various RTSM models.
+This will mean that the same kernel will run on A5, A9, TC2 and various fast models.
 
 h1. Installing your kernel
 
diff --git a/android/vexpress/HOWTO_releasenotes.txt b/android/vexpress/HOWTO_releasenotes.txt
index 0c1d6a3..c8af219 100644
--- a/android/vexpress/HOWTO_releasenotes.txt
+++ b/android/vexpress/HOWTO_releasenotes.txt
@@ -2,11 +2,11 @@ h1. Linux-Linaro Release for Versatile Express (Android)
 
 p. This release is produced, validated and released by Linaro and is based on the linux-linaro-tracking kernel tree.
 
-p. Linaro releases monthly binary images for the ARM "Versatile Express":http://www.arm.com/products/tools/development-boards/versatile-express/index.php including support for Cortex-A9, Cortex-A5, TC2 (big.LITTLE) CoreTiles and RTSM.
+p. Linaro releases monthly binary images for the ARM "Versatile Express":http://www.arm.com/products/tools/development-boards/versatile-express/index.php including support for Cortex-A9, Cortex-A5, TC2 (big.LITTLE) CoreTiles and Fast Models.
 
 p. For support matters related to ARM hardware or firmware images downloaded from ARM sites, please contact "ARM support":mailto:support@arm.com
 
-p. This release includes Linaro Android Jelly Bean for both Versatile Express and Real-Time System Model ("RTSM":http://www.arm.com/products/tools/software-tools/ds-5/rtsm-simulator.php). The images are able to boot A5, A9 and TC2 using UEFI. Sources are also made available so you can build your own images (see the "'Building from Source'":https://releases.linaro.org/latest/android/vexpress-lsk/#tabs-3 tab).
+p. This release includes Linaro Android Jelly Bean for both Versatile Express and Fast Models. The images are able to boot A5, A9 and TC2 using UEFI. Sources are also made available so you can build your own images (see the "'Building from Source'":https://releases.linaro.org/latest/android/vexpress-lsk/#tabs-3 tab).
 
 More information on Linaro can be found on our "website.":http://www.linaro.org/
 
diff --git a/android/vexpress/HOWTO_rtsm.txt b/android/vexpress/HOWTO_rtsm.txt
index d2661ee..52272ad 100644
--- a/android/vexpress/HOWTO_rtsm.txt
+++ b/android/vexpress/HOWTO_rtsm.txt
@@ -1,8 +1,8 @@
-This release was boot tested on RTSM A15x4 and A15x4-A7x4 models. No rigorous testing was carried out. This build is expected to run on other RTSM models.
+This release was boot tested on FVP A15x4 and A15x4-A7x4 models. No rigorous testing was carried out. This build is expected to run on other models.  No UEFI binary exists for A15-A7 models; in this case, the A15 binary can be used, but the A7 CPUs will not be available
 
 h2. Prerequisites
 
-* Install the RTSM model(s) you wish to run. You must have a valid license and the environment set up to run models
+* Install the model(s) you wish to run. You must have a valid license and the environment set up to run models
 * Install "Linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools
 
 h3. Install Linaro Image Tools
@@ -27,7 +27,7 @@ bc. wget http://releases.linaro.org/latest/components/platform/linaro-image-tool
 
 h2. Create a 2GB image file
 
-RTSM will only deal with file systems up to 2GB in size, however the Linaro pre-built image for Android requires a 4GB filesystem. Therefore, we will build our own image using the pre-built artifacts (displayed above)
+Fast Models will only deal with file systems up to 2GB in size, however the Linaro pre-built image for Android requires a 4GB filesystem. Therefore, we will build our own image using the pre-built artifacts (displayed above)
 
 The following command downloads all the Android OS components necessary to make up a complete Android image.
 
@@ -40,41 +40,41 @@ Using the @linaro-android-media-create@, which is part of the @linaro-image-tool
 bc. linaro-android-media-create --image-file linaro.img --image-size 2000M --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
 tar jxvf boot.tar.bz2
 
-h2. Run RTSM with UEFI
+h2. Run Fast Models with UEFI
 
 The instructions for running UEFI on the various models are very similar.  The two differences are the UEFI binary and the model used.  Follow the model specific instruction below, then proceed to the generic instructions in the section "Run the model with UEFI".
 
 h3. Run A9x4 model with UEFI
 
-bc. RTSM_MODEL=/usr/local/DS-5/bin/RTSM_VE_Cortex-A9_MPx4
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca9x4.bin
+bc. MODEL=/usr/local/DS-5/bin/FVP_VE_Cortex-A9_MPx4
+UEFI=boot/rtsm/uefi_rtsm_ve-ca9x4.bin
 
 h3. Run A15x1 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x1/RTSM_VE_Cortex-A15x1
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x1
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run A15x2 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x2/RTSM_VE_Cortex-A15x2
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x2
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run A15x4 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x4/RTSM_VE_Cortex-A15x4
-RTSM_UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x4
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run the model with UEFI
 
-bc. RTSM_MMC=linaro.img
-RTSM_UEFI_VARS=$HOME/uefi-vars.fd
-touch $RTSM_UEFI_VARS # create the file if it doesn't already exist
+bc. MMC=linaro.img
+UEFI_VARS=$HOME/uefi-vars.fd
+touch $UEFI_VARS # create the file if it doesn't already exist
 
-bc. $RTSM_MODEL \
--C motherboard.flashloader0.fname=$RTSM_UEFI \
--C motherboard.flashloader1.fname=$RTSM_UEFI_VARS \
--C motherboard.flashloader1.fnameWrite=$RTSM_UEFI_VARS \
--C motherboard.mmc.p_mmc_file=$RTSM_MMC \
+bc. $MODEL \
+-C motherboard.flashloader0.fname=$UEFI \
+-C motherboard.flashloader1.fname=$UEFI_VARS \
+-C motherboard.flashloader1.fnameWrite=$UEFI_VARS \
+-C motherboard.mmc.p_mmc_file=$MMC \
 -C motherboard.pl011_uart0.unbuffered_output=true \
 -C motherboard.smsc_91c111.enabled=1 \
 -C motherboard.hostbridge.userNetworking=1
diff --git a/openembedded/vexpress-lsk/README.textile b/openembedded/vexpress-lsk/README.textile
index 0c22fe0..5b78921 100644
--- a/openembedded/vexpress-lsk/README.textile
+++ b/openembedded/vexpress-lsk/README.textile
@@ -2,11 +2,11 @@ h1. Linaro Stable Kernel (LSK) 13.11 Release for Versatile Express (OpenEmbedded
 
 p. The Linaro Stable Kernel (LSK) is produced, validated and released by Linaro and is based on the linux stable kernel tree. It is produced to satisfy the requirements of Linaro members. The LSK focuses on quality and stability and is therefore a great basis for member products. It also includes backports of commonly desired features, provided they meet the quality requirements, and also any bug fixes.
 
-p. Linaro releases monthly binary images for the ARM "Versatile Express":http://www.arm.com/products/tools/development-boards/versatile-express/index.php including support for Cortex-A9, Cortex-A5, TC2 (big.LITTLE) CoreTiles and RTSM.
+p. Linaro releases monthly binary images for the ARM "Versatile Express":http://www.arm.com/products/tools/development-boards/versatile-express/index.php including support for Cortex-A9, Cortex-A5, TC2 (big.LITTLE) CoreTiles and Fast Models.
 
 p. For support matters related to ARM hardware or firmware images downloaded from ARM sites, please contact "ARM support":mailto:support@arm.com
 
-p. This release includes Linaro OpenEmbedded for both Versatile Express and Real-Time System Model ("RTSM":http://www.arm.com/products/tools/software-tools/ds-5/rtsm-simulator.php). The images are able to boot A5, A9 and TC2 using UEFI. Sources are also made available so you can build your own images (see the "'Building from Source'":https://releases.linaro.org/13.11/openembedded/vexpress-lsk/#tabs-3 tab).
+p. This release includes Linaro OpenEmbedded for both Versatile Express and Fast Models. The images are able to boot A5, A9 and TC2 using UEFI. Sources are also made available so you can build your own images (see the "'Building from Source'":https://releases.linaro.org/13.11/openembedded/vexpress-lsk/#tabs-3 tab).
 
 h2. About the TC2 Engineering Build
 
diff --git a/openembedded/vexpress-lsk/RTSM.textile b/openembedded/vexpress-lsk/RTSM.textile
index 13c6e45..f50c8ce 100644
--- a/openembedded/vexpress-lsk/RTSM.textile
+++ b/openembedded/vexpress-lsk/RTSM.textile
@@ -1,8 +1,8 @@
-This release was boot tested on RTSM A15x4 and A15x4-A7x4 models. No rigorous testing was carried out. This build is expected to run on other RTSM models.  No UEFI binary exists for A15-A7 models; in this case, the A15 binary can be used, but the A7 CPUs will not be available.
+This release was boot tested on FVP A15x4 and A15x4-A7x4 models. No rigorous testing was carried out. This build is expected to run on other models.  No UEFI binary exists for A15-A7 models; in this case, the A15 binary can be used, but the A7 CPUs will not be available
 
 h2. Prerequisites
 
-* Install the RTSM model(s) you wish to run. You must have a valid license and the environment set up to run models
+* Install the model(s) you wish to run. You must have a valid license and the environment set up to run models
 * Install "Linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools
 * Install kpartx which you can get by issuing the following command in your terminal
 
@@ -26,7 +26,7 @@ bc. wget http://releases.linaro.org/13.11/components/platform/linaro-image-tools
 
 h2. Create a 2GB image file
 
-RTSM will only deal with file systems up to 2GB in size, however the if the pre-built image may be larger.  In this case, you can build your own image using the pre-built artifacts as listed below.
+Fast Models will only deal with file systems up to 2GB in size, however the if the pre-built image may be larger.  In this case, you can build your own image using the pre-built artifacts as listed below.
 
 Using the following command, you will download the RootFS, the hardware pack.
 
@@ -48,41 +48,42 @@ sudo kpartx -d linaro.img
 
 note: unless you use kpartx to delete the loop mappings as above, even if you update linaro.img and re-mount it, it will not refresh and you will end up using the old image.
 
-h2. Run RTSM with UEFI
+h2. Run Fast Models with UEFI
 
 The instructions for running UEFI on the various models are very similar.  The two differences are the UEFI binary and the model used.  Follow the model specific instruction below, then proceed to the generic instructions in the section "Run the model with UEFI".
 
 h3. Run A9x4 model with UEFI
 
-bc. RTSM_MODEL=/usr/local/DS-5/bin/RTSM_VE_Cortex-A9_MPx4
-RTSM_UEFI=rtsm/uefi_rtsm_ve-ca9x4.bin
+bc. MODEL=/usr/local/DS-5/bin/FVP_VE_Cortex-A9_MPx4
+UEFI=boot/rtsm/uefi_rtsm_ve-ca9x4.bin
 
 h3. Run A15x1 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x1/RTSM_VE_Cortex-A15x1
-RTSM_UEFI=rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x1
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run A15x2 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x2/RTSM_VE_Cortex-A15x2
-RTSM_UEFI=rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x2
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run A15x4 model with UEFI
 
-bc. RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x4/RTSM_VE_Cortex-A15x4
-RTSM_UEFI=rtsm/uefi_rtsm_ve-ca15.bin
+bc. MODEL=$HOME/ARM/models/Linux64_GCC-4.1/FVP_VE_Cortex-A15x4
+UEFI=boot/rtsm/uefi_rtsm_ve-ca15.bin
 
 h3. Run the model with UEFI
 
-bc. RTSM_MMC=linaro.img
-RTSM_UEFI_VARS=$HOME/uefi-vars.fd
-touch $RTSM_UEFI_VARS # create the file if it doesn't already exist
+bc. MMC=linaro.img
+UEFI_VARS=$HOME/uefi-vars.fd
+touch $UEFI_VARS # create the file if it doesn't already exist
 
-bc. $RTSM_MODEL \
--C motherboard.flashloader0.fname=$RTSM_UEFI \
--C motherboard.flashloader1.fname=$RTSM_UEFI_VARS \
--C motherboard.flashloader1.fnameWrite=$RTSM_UEFI_VARS \
--C motherboard.mmc.p_mmc_file=$RTSM_MMC \
+bc. $MODEL \
+-C motherboard.flashloader0.fname=$UEFI \
+-C motherboard.flashloader1.fname=$UEFI_VARS \
+-C motherboard.flashloader1.fnameWrite=$UEFI_VARS \
+-C motherboard.mmc.p_mmc_file=$MMC \
 -C motherboard.pl011_uart0.unbuffered_output=true \
 -C motherboard.smsc_91c111.enabled=1 \
 -C motherboard.hostbridge.userNetworking=1
+