14.07: simplify and sync instructions

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

3 files changed, 23 insertions, 78 deletions

diff --git a/openembedded/juno-lsk/INSTALL.textile b/openembedded/juno-lsk/INSTALL.textile
index a780dfc..a3a4526 100644
--- a/openembedded/juno-lsk/INSTALL.textile
+++ b/openembedded/juno-lsk/INSTALL.textile
@@ -4,14 +4,15 @@ The use of Juno software is subject to the terms of the Juno "End User License A
 
 h2. Installation
 
+Before any installation begins, it is important that you ensure your board has the latest firmware installed.  See the Juno Firmware wiki for more details:
+
+* "https://wiki.linaro.org/ARM/Juno/Firmware":https://wiki.linaro.org/ARM/Juno/Firmware
+
 h3. Pre-Installation Steps
 
 * Ubuntu 12.04 64 bit or newer on your desktop PC ("www.ubuntu.com":http://www.ubuntu.com)
-* Before any installation begins, it is important that you ensure your board has the latest firmware installed
-** See the Juno Firmware wiki for more details:
-** "https://wiki.linaro.org/ARM/Juno/Firmware":https://wiki.linaro.org/ARM/Juno/Firmware
 * 4GB USB drive or larger
-* Choose either to use a pre-built image or to build a custom image by following the steps below
+* Download the artifacts from the above list
 
 h3. Using pre-built image
 
@@ -20,8 +21,8 @@ h3. Using pre-built image
 
 h3. Building a custom image using pre-built components
 
-* Download Artifacts from above
-* Get "Linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools
+* Ubuntu 12.04 64 bit or newer on your desktop PC ("www.ubuntu.com":http://www.ubuntu.com)
+* Install "Linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools
 * Create media
 
 bc. sudo linaro-media-create --mmc /dev/sdX --dev juno --hwpack <hwpack filename> --binary <rootfs filename>
@@ -30,6 +31,3 @@ h3. Post-installation steps
 
 * Safely remove the USB drive and insert it into the board
 * "Configure UEFI":https://wiki.linaro.org/ARM/UEFI for your new USB drive
- 
-
-
diff --git a/openembedded/vexpress-lsk/FASTMODELS.textile b/openembedded/vexpress-lsk/FASTMODELS.textile
index 42d39b2..b1f4035 100644
--- a/openembedded/vexpress-lsk/FASTMODELS.textile
+++ b/openembedded/vexpress-lsk/FASTMODELS.textile
@@ -31,7 +31,7 @@ Fast Models will only deal with file systems up to 2GB in size, however the pre-
 
 You need to create the image using the following commands.
 
-bc. linaro-media-create --image-file linaro.img --image-size 2000M --dev vexpress --hwpack hwpack_linaro-lsk-vexpress_20140621-667_armhf_supported.tar.gz --binary linaro-image-alip-genericarmv7a-20140612-267.rootfs.tar.gz
+bc. linaro-media-create --image-file linaro.img --image-size 2000M --dev vexpress --hwpack <hwpack filename> --binary <rootfsi filename>
 
 bc. sudo kpartx -a linaro.img
 mkdir boot
diff --git a/openembedded/vexpress-lsk/INSTALL.textile b/openembedded/vexpress-lsk/INSTALL.textile
index 4885c64..36bd0e1 100644
--- a/openembedded/vexpress-lsk/INSTALL.textile
+++ b/openembedded/vexpress-lsk/INSTALL.textile
@@ -1,86 +1,33 @@
-Linaro OpenEmbedded 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.
 
-Linaro provides two methods for installing Linaro binary builds:
 
-# Using a pre-built image, which you can download
-# Assembling your own image using provided components
 
-h2. Pre-Installation Steps
 
-Before any installation begins, it is important that you ensure your Versatile Express board has the latest firmware and boot loader installed. Please check the "Firmware Update" tab on this page for the latest updates and installation instructions.
+h2. Installation
 
-h2. Using pre-built image
+Before any installation begins, it is important that you ensure your board has the latest firmware installed.  See the "Firmware tab" for more details
 
-h3. Prerequisites
 
-* Ubuntu 12.04 64 bit or newer on your desktop PC ("www.ubuntu.com":http://www.ubuntu.com)
-* 4GB SD card or larger
-* Latest firmware installed onto the Versatile Express. Please see "Firmware Update" tab
-* Download the pre-built image for this build
-bc. wget http://releases.linaro.org/latest/openembedded/vexpress-lsk/lsk-vexpress-openembedded_alip-armv7a-gcc-4.8_20140621-667.img.gz
-
-h3. Installation Steps
-
-* Unzip the downloaded pre-built image
-* Insert SD card into your PC and note the assigned @'/dev/sdX'@
-
-bc. dmesg
-SDCARD=/dev/sdX # sdcard found from dmesg above
-zcat http://releases.linaro.org/latest/openembedded/vexpress-lsk/lsk-vexpress-openembedded_alip-armv7a-gcc-4.8_20140621-667.img.gz | sudo dd bs=64k of=$SDCARD
-
-When the image is created, skip down to the section "Booting the image".
-
-*Note:* Windows users may use the "Image Writer for Windows.":https://launchpad.net/win32-image-writer/+download
 
-<hr>
-
-h2. Building a custom image using pre-built components
-
-Sometimes, you may wish to build your own custom image for a Versatile Express. Perhaps you wish to use a more recent snapshot of the "hardware pack":https://wiki.linaro.org/HardwarePacks or take the latest Android build. Whatever the reason, you will want to use the "Linaro Image Tools":https://wiki.linaro.org/Linaro-Image-Tools to create a custom image.
-
-Using components to generate the image will yield the same functionality found in the pre-built image of the same build.
-
-h3. Prerequisites
+h3. Pre-installation steps
 
 * Ubuntu 12.04 64 bit or newer on your desktop PC ("www.ubuntu.com":http://www.ubuntu.com)
-* Download Artifacts from above or use the following command in your terminal
-
-bc. wget http://releases.linaro.org/latest/openembedded/vexpress-lsk/hwpack_linaro-lsk-vexpress_20140621-667_armhf_supported.tar.gz
-wget http://releases.linaro.org/latest/openembedded/vexpress-lsk/linaro-image-alip-genericarmv7a-20140612-267.rootfs.tar.gz
-
-* 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
-
-** Method 2: Building from source
-
-bc. wget http://releases.linaro.org/14.03/components/platform/linaro-image-tools/linaro-image-tools-2014.03.tar.gz
-
-* Insert SD card and note the assigned @'/dev/sdX'@ or @'/dev/mmcblk0'@
-
-bc. dmesg | less
-
-Look for a line that looks like the following at the end of the log
-
-@[288582.790722] sdc: sdc1 sdc2 sdc3 sdc4 <sdc5 sdc6 >@
+* 4GB SD card or larger
+* Download the artifacts from the above list
 
-Or, if your machine uses '/dev/mmcblkX', you may see a line line this:
+h3. Using pre-built image
 
-@[10770.938042]  mmcblk0: p1 p2 p3 p4 < p5 p6 >@
+* Unzip the downloaded pre-built image and write it to an SD card
+* Safely remove the SD card and insert it into the board
 
-*WARNING:* In the next step, make sure you use /dev/"whatever you see above". *You can erase your hard drive* with the wrong parameter.
+h3. Building a custom image using pre-built components
 
+* Ubuntu 12.04 64 bit or newer on your desktop PC ("www.ubuntu.com":http://www.ubuntu.com)
+* Install "Linaro image tools":https://wiki.linaro.org/Linaro-Image-Tools.
 * Create media
 
-bc. sudo linaro-media-create --mmc /dev/sdX --dev vexpress --hwpack hwpack_linaro-lsk-vexpress_20140621-667_armhf_supported.tar.gz --binary linaro-image-alip-genericarmv7a-20140612-267.rootfs.tar.gz
-
-h2. Booting the image
-
-After the media create tool has finished executing, remove the SD card from your PC and insert it into the Versatile Express board.
+bc. sudo linaro-media-create --mmc /dev/sdX --dev vexpress --hwpack <hwpack filename> --binary <rootfs filename>
 
-Before you can boot the image you will need to install the UEFI boot loader into NOR flash and update the Versatile Express motherboard's configuration files. The instructions on the Firmware Update tab provide information on how to do this and how to configure UEFI to specify the SD card as a boot device.
+h3. Post-installation steps
 
+* Safely remove the USB drive and insert it into the board
+* "Configure UEFI":https://wiki.linaro.org/ARM/UEFI for your new USB drive