added many tweaks and cleanups

7 files changed, 32 insertions, 166 deletions

diff --git a/#RTSM# b/#RTSM#
deleted file mode 100644
index cc0e9f1..0000000
--- a/#RTSM#
+++ /dev/null
@@ -1,118 +0,0 @@
-h1. Real-Time System Model (RTSM)
-
-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 "linaro-image-tools":https://wiki.linaro.org/Linaro-Image-Tools
-* Install kpartx which you can get by issuing the following command in your terminal
-
-bc. sudo apt-get install kpartx
-
-
-Linaro Ubuntu images are made up of two components. The "Hardware Pack":https://wiki.linaro.org/HardwarePacks, which contains the kernel, boot loader and/or Device Tree blob and a Root file system (RootFS) of your choice to generate an image.
-
-The RootFS can be:
-
-* "Nano":http:// - a very small file system that support command prompt (no X)
-* "Developer":http://linktodveloper - a very small file system like the nano but with basic X support
-* "ALIP":http:linktoALIP (ARM Linux Internet Platform) - A medium sized file system with full "LXDE":http://lxde.org/ light graphical desktop environment
-* "Ubuntu":http://linktoubunturootfs - A full fledged file system based on the Ubuntu 12.04 Desktop environment
-
-?? Need to see if 12.10 is based off the 12.10 or the 12.05 FS ?? 
-
-h3. Install Linaro Image Tools
-
-There are multiple ways you can get the latest Linaro Image Tools:
-
-** Method 1: Install them from the Linaro Image Tools "PPA":https://launchpad.net/~linaro-maintainers/+archive/tools
-
-bc.
-	sudo add-apt-repository ppa:linaro-maintainers/tools@
-	sudo apt-get update@
-	sudo apt-get install linaro-image-tools@
-
-** Method 2: Building from source. 
-
-bc.     wget http://releases.linaro.org/12.10/components/platform/linaro-image-tools/linaro-image-tools-2012.10.1.tar.gz
-
-h2. Create a 2GB image file
-
-RTSM will only deal with file systems up to 2GB in size, however the pre-built image for Ubuntu requires a 4GB filesystem.  Therefore we will build our own image using the pre-built artifacts, as obtained in the Binary Image Installation tab on this page.
-
-?? I am afraid I don't follow. Can we make this clearer. Instead of "However" shouldn't we say that we can't use the Ubuntu file system? ??
-
-We use a "nano":https://wiki.linaro.org/Platform/DevPlatform/Nano RootFS for this example, however, you could use other RootFS types, as mentioned above, so long as you can install it to a 2GB file. Note, you will also need the @boot.tar.bz2@ file from the Android release.
-
-Using the following command, you will download the nano RootFS, the hardware back and the boot.tar.gz you need from the Android build. 
-
-bc. 
-    wget \
-    http://releases.linaro.org/12.09/ubuntu/precise-images/nano/linaro-precise-nano-20120923-417.tar.gz \
-    http://releases.linaro.org/12.09/ubuntu/vexpress/hwpack_linaro-vexpress_20120925-322_armhf_supported.tar.gz \
-    http://releases.linaro.org/12.09/android/images/vexpress-jb-gcc47-armlt-tracking-open/boot.tar.bz2
-
-Now you need to create the image using the following commands.
-
-bc.    
-      sudo linaro-media-create \
-      --dev vexpress \
-      --rootfs ext4 \
-      --image-file linaro.img \
-      --image-size 2000M \
-      --hwpack-force-yes \
-      --binary linaro-precise-nano-20120923-417.tar.gz \
-      --hwpack hwpack_linaro-vexpress_20120925-322_armhf_supported.tar.gz
-
-bc.
-      sudo kpartx -a linaro.img
-      mkdir boot
-      sudo mount /dev/mapper/loop0p1 boot
-      cp boot/uImage .
-      cp boot/uInitrd .
-      sudo umount boot
-      tar jxvf boot.tar.bz2 
-
-h2. Run A15x4 model
-
-This example shows how to run the Linaro kernel on a quad core A15 RTSM model:
-
-bc. 
-    RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x4/RTSM_VE_Cortex-A15x4
-    RTSM_BOOTWRAPPER=boot/rtsm/linux-system-semi.axf
-    RTSM_MMC=linaro.img
-    RTSM_KERNEL=uImage
-    RTSM_DTB=boot/rtsm/rtsm_ve-ca15x4.dtb
-    RTSM_INITRD=uInitrd
-    RTSM_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M ip=dhcp"
-
-bc. 
-    $RTSM_MODEL \
-    $RTSM_BOOTWRAPPER \
-    -C motherboard.smsc_91c111.enabled=1 \
-    -C motherboard.hostbridge.userNetworking=1 \
-    -C motherboard.mmc.p_mmc_file="$RTSM_MMC" \
-    -C cluster.cpu0.semihosting-cmd_line="--kernel $RTSM_KERNEL --dtb $RTSM_DTB --initrd $RTSM_INITRD -- $RTSM_CMDLINE"
-
-h2. Run A15x4-A7x4 model
-
-This example shows how to run the Linaro kernel on a big.LITTLE RTSM model:
-
-bc.     
-    RTSM_MODEL=$HOME/ARM/RTSM/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4
-    RTSM_BOOTWRAPPER=boot/rtsm/linux-system-semi.axf
-    RTSM_MMC=linaro.img
-    RTSM_KERNEL=uImage
-    RTSM_DTB=boot/rtsm/rtsm_ve-ca15x4-ca7x4.dtb
-    RTSM_INITRD=uInitrd
-    RTSM_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M ip=dhcp"
-
-bc.    
-    $RTSM_MODEL \
-    -a coretile.cluster0.*=$RTSM_BOOTWRAPPER \
-    -a coretile.cluster1.*=$RTSM_BOOTWRAPPER \
-    -C motherboard.smsc_91c111.enabled=1 \
-    -C motherboard.hostbridge.userNetworking=1 \
-    -C motherboard.mmc.p_mmc_file=$RTSM_MMC \
-    -C coretile.dualclustersystemconfigurationblock.CFG_ACTIVECLUSTER=0x3 \
-    -C coretile.cluster0.cpu0.semihosting-enable=1 \
-    -C coretile.cluster0.cpu0.semihosting-cmd_line="--kernel $RTSM_KERNEL --dtb $RTSM_DTB --initrd $RTSM_INITRD -- $RTSM_CMDLINE"
diff --git a/FIRMWARE b/FIRMWARE
index 5c566b3..568a95f 100644
--- a/FIRMWARE
+++ b/FIRMWARE
@@ -2,11 +2,11 @@ h1. Versatile Express Firmware Update
 
 It is advised that you update your Versatile Express board firmware to the latest version. To update your VE board firmware, please follow the instructions below:
 
-* Install the Recovery firmware from the v4.0b VE CD/DVD that came with your Versatile Express
+* Install the Recovery firmware from CD that came with your Versatile Express. However, if this is older than Version 3, please download these latest from "silver.arm.com":https://silver.arm.com/download/download.tm?pv=1307626"
 * Connect and mount your Versatile Express motherboard USB mass storage device to your PC
 * Download the latest ARM firmware from "silver.arm.com":https://silver.arm.com/download/download.tm?pv=1307626
 ** Unzip the firmware zip to the root of the motherboard mounted drive
-*** Please contact support@arm.com for any issues related this firmware update
+** Please contact support@arm.com for any issues related this firmware update
 
 * Download additional Linaro firmware from "here":https://wiki.linaro.org/ARM/VersatileExpress?action=AttachFile&do=get&target=vemsd-armlt-20120920-001.zip
 ** Unzip the firmware zip to the root of the motherboard mounted drive
diff --git a/HACKING b/HACKING
index fab4b31..bfe3b47 100644
--- a/HACKING
+++ b/HACKING
@@ -1,18 +1,10 @@
 h1. Building Ubuntu from Source
 
-Ubuntu images are comprised of a Hardware Pack
-("HWPack":https://wiki.linaro.org/HardwarePacks) and a root file
-system (RootFS).  The hardware pack contains the kernel, boot loader
-and Device Tree blobs (if applicable). There is no need to rebuild the
-RootFS since it is comprised of a large number of debian
-packages. Instead, the best approach is to use an image, which you can
-create as outlined in the "Binary Image Installation" tab then replace
-the kernel with your compiled one.  This is common practice that many
-engineers deploy when wanting a standard Linux image to use for
-testing and development purposes.
-
-The following instructions will walk you through how to obtain the kernel
-source, build it, and add it to a pre-existing Ubuntu image.
+Ubuntu images are comprised of a Hardware Pack ("HWPack":https://wiki.linaro.org/HardwarePacks) and a root file system (RootFS).  The hardware pack contains the kernel, boot loader and Device Tree blobs (if applicable). There is no need to rebuild the RootFS since it is comprised of a large number of debian packages. Instead, the best approach is to use an image, which you can create as outlined in the "Binary Image Installation" tab then replace the kernel with your compiled one.  This is common practice that many engineers deploy when wanting a standard Linux image to use for testing and development purposes.
+
+The root file systems are described "here":http://releases.linaro.org/12.09/ubuntu/precise-images where you can also download them.
+
+The following instructions will walk you through how to obtain the kernel source, build it, and add it to a pre-existing Ubuntu image.
 
 h1. Building Ubuntu Kernel from Source
 
@@ -38,7 +30,6 @@ bc.
 
 ?? how do we know what the release tag or commit ID was ??
 
-
 h3. Create a kernel config
 
 Do not use the defconfig for Versatile Express, instead, build a config from the config fragments that Linaro provides:
@@ -66,8 +57,8 @@ This section is common for both Android and Ubuntu
   is no need for a device tree blob):
 
 bc. 
-    scripts/dtc/dtc -I dts -O dtb -S 8192 arch/arm/boot/dts/vexpress-v2p-ca5s.dts -o v2p-ca5s.dtb
-    scripts/dtc/dtc -I dts -O dtb -S 8192 arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts -o v2p-ca15-tc1.dtb
+    scripts/dtc/dtc -I dts -O dtb arch/arm/boot/dts/vexpress-v2p-ca5s.dts -o v2p-ca5s.dtb
+    scripts/dtc/dtc -I dts -O dtb arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts -o v2p-ca15-tc1.dtb
 
 
 * Insert the SD card containing the Linaro disk image into your PC SD card reader
@@ -77,10 +68,10 @@ bc.
 bc.  cp arch/arm/boot/uImage /media/boot/
 
 * Copy the device tree blob
-** For **A9** CoreTile:  no device tree blob is needed
-** For **A5** CoreTile:  @cp v2p-ca5s.dtb /media/boot/@
-** For **A15(TC1)** CoreTile:  @cp v2p-ca15-tc1.dtb /media/boot/@
-** For **A15(TC2)** CoreTile:  @cp v2p-ca15-tc2.dtb /media/boot/@
+** For A9 CoreTile: no device tree blob is needed
+** For A5 CoreTile: @cp arch/arm/boot/vexpress-v2p-ca5s.dtb /media/boot/v2p-ca5s.dtb@
+** For A15 CoreTile (TC1): @cp arch/arm/boot/vexpress-v2p-ca15-tc1.dtb /media/boot/v2p-ca15-tc1.dtb@
+** For A15_A7 CoreTile: (TC2): @cp arch/arm/boot/vexpress-v2p-ca15-tc2.dtb /media/boot/v2p-ca15-tc2.dtb@
  
 * Eject the memory card from your PC by using the following command
 
diff --git a/HOWTO_flashfirmware.txt b/HOWTO_flashfirmware.txt
index de50429..f9eaf42 100644
--- a/HOWTO_flashfirmware.txt
+++ b/HOWTO_flashfirmware.txt
@@ -1,7 +1,8 @@
 h1. Versatile Express Firmware Update
 
 It is advised that you update your Versatile Express board firmware to the latest version. To update your VE board firmware, please follow the instructions below.
-* Install the Recovery firmware from the v4.0b VE CD/DVD that came with your Versatile Express
+
+* Install the Recovery firmware from CD that came with your Versatile Express. However, if this is older than Version 3, please download these latest from "silver.arm.com":https://silver.arm.com/download/download.tm?pv=1307626"
 * Connect and mount your Versatile Express motherboard USB mass storage device to you PC
 * Download the latest ARM firmware from "silver.arm.com":https://silver.arm.com/download/download.tm?pv=1307626
 ** Unzip the firmware zip to the root of the motherboard mounted drive
diff --git a/HOWTO_getsourceandbuild.txt b/HOWTO_getsourceandbuild.txt
index 32662fe..7676857 100644
--- a/HOWTO_getsourceandbuild.txt
+++ b/HOWTO_getsourceandbuild.txt
@@ -92,19 +92,19 @@ This section is common for both Android and Ubuntu
 * Create the Device Tree blob if you don’t have one in your Linaro image (note, the A9 Core Tile boots using an ATAGS kernel):
 
 bc. 
-    scripts/dtc/dtc -I dts -O dtb -S 8192 arch/arm/boot/dts/vexpress-v2p-ca5s.dts -o v2p-ca5s.dtb
-    scripts/dtc/dtc -I dts -O dtb -S 8192 arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts -o v2p-ca15-tc1.dtb
+    scripts/dtc/dtc -I dts -O dtb arch/arm/boot/dts/vexpress-v2p-ca5s.dts -o v2p-ca5s.dtb
+    scripts/dtc/dtc -I dts -O dtb arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts -o v2p-ca15-tc1.dtb
       
 
 * Insert the SD card containing the Linaro disk image
 * Copy the kernel onto the memory card
 @cp arch/arm/boot/uImage /media/boot/@
 * Copy the device tree blob
-** For **A9** CoreTile:  no device tree blob is needed
-** For **A5** CoreTile:  @cp v2p-ca5s.dtb /media/boot/@
-** For **A15-TC1** CoreTile:  @cp v2p-ca15-tc1.dtb /media/boot/@
-** For **A15-TC2** CoreTile:  @cp v2p-ca15-tc2.dtb /media/boot/@
- 
+** For A9 CoreTile: no device tree blob is needed
+** For A5 CoreTile: @cp arch/arm/boot/vexpress-v2p-ca5s.dtb /media/boot/v2p-ca5s.dtb@
+** For A15 CoreTile (TC1): @cp arch/arm/boot/vexpress-v2p-ca15-tc1.dtb /media/boot/v2p-ca15-tc1.dtb@
+** For A15_A7 CoreTile: (TC2): @cp arch/arm/boot/vexpress-v2p-ca15-tc2.dtb /media/boot/v2p-ca15-tc2.dtb@
+
 * Eject the memory card  @eject /media/boot@
       
 * Insert the memory card into the Versatile Express board and power it on
diff --git a/INSTALL b/INSTALL
index 7cac819..ff65a6d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,9 @@
 h1. Binary Image Installation
 
+Linaro Ubuntu images are made up of two components. The "Hardware Pack":https://wiki.linaro.org/HardwarePacks, which contains the kernel, boot loader and/or Device Tree blob and a Root file system (RootFS) of your choice to generate an image.
+
+The root file systems are described "here":http://releases.linaro.org/12.09/ubuntu/precise-images where you can also download them.
+
 Linaro provides two methods for installing Linaro binary builds:
 
 # Using a pre-built image, which you can download
@@ -52,16 +56,14 @@ h3. Prerequisites
 bc. 
 	wget http://releases.linaro.org/12.10/android/images/vexpress-jb-gcc47-armlt-tracking-open/boot.tar.bz2 http://releases.linaro.org/12.09/android/images/vexpress-jb-gcc47-armlt-tracking-open/system.tar.bz2 http://releases.linaro.org/12.09/android/images/vexpress-jb-gcc47-armlt-tracking-open/userdata.tar.bz2@
 
-* Get "linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools
-
-There are multiple ways you can get the latest Linaro Image Tools:
+* Get "linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools.  There are multiple ways you can get the latest Linaro Image Tools:
 
 ** Method 1: Install them from the Linaro Image Tools "PPA":https://launchpad.net/~linaro-maintainers/+archive/tools
 
 bc. 
-	sudo add-apt-repository ppa:linaro-maintainers/tools@
-	sudo apt-get update@
-	sudo apt-get install linaro-image-tools@
+	sudo add-apt-repository ppa:linaro-maintainers/tools
+	sudo apt-get update
+	sudo apt-get install linaro-image-tools
 
 ** Method 2: Building from source. 
 
diff --git a/RTSM b/RTSM
index faf7291..4ccf37f 100644
--- a/RTSM
+++ b/RTSM
@@ -8,17 +8,9 @@ h2. Prerequisites
 
 bc. sudo apt-get install kpartx
 
-
 Linaro Ubuntu images are made up of two components. The "Hardware Pack":https://wiki.linaro.org/HardwarePacks, which contains the kernel, boot loader and/or Device Tree blob and a Root file system (RootFS) of your choice to generate an image.
 
-The RootFS can be:
-
-* "Nano":http://linktonanorootfs - a very small file system that support command prompt (no X)
-* "Developer":http://linktodveloper - a very small file system like the nano but with basic X support
-* "ALIP":http:linktoALIP (ARM Linux Internet Platform) - A medium sized file system with full "LXDE":http://lxde.org/ light graphical desktop environment
-* "Ubuntu":http://linktoubunturootfs - A full fledged file system based on the Ubuntu 12.04 Desktop environment
-
-?? Need to see if 12.10 is based off the 12.10 or the 12.05 FS ?? 
+The root file systems are described "here":http://releases.linaro.org/12.09/ubuntu/precise-images where you can also download them.
 
 h3. Install Linaro Image Tools
 
@@ -39,9 +31,7 @@ h2. Create a 2GB image file
 
 RTSM will only deal with file systems up to 2GB in size, however the pre-built image for Ubuntu requires a 4GB filesystem.  Therefore we will build our own image using the pre-built artifacts, as obtained in the Binary Image Installation tab on this page.
 
-?? I am afraid I don't follow. Can we make this clearer. Instead of "However" shouldn't we say that we can't use the Ubuntu file system? ??
-
-We use a "nano":https://wiki.linaro.org/Platform/DevPlatform/Nano RootFS for this example, however, you could use other RootFS types, as mentioned above, so long as you can install it to a 2GB file. Note, you will also need the @boot.tar.bz2@ file from the Android release.
+We use a "Nano":http://releases.linaro.org/12.09/ubuntu/precise-images RootFS for this example, however, you could use other RootFS types so long as you can install it to a 2GB file. Note, you will also need the @boot.tar.bz2@ file from the Android release.
 
 Using the following command, you will download the nano RootFS, the hardware back and the boot.tar.gz you need from the Android build.