14.06: minor fixups from Basil

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

8 files changed, 8 insertions, 59 deletions

diff --git a/android/images/armv8-android-fvp-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-android-fvp-lsk/HOWTO_getsourceandbuild.txt
index e28238f..8a424e6 100644
--- a/android/images/armv8-android-fvp-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-android-fvp-lsk/HOWTO_getsourceandbuild.txt
@@ -136,7 +136,3 @@ Total Time = 1390 ms
 h3. Black screen
 
 The boot screen has been disabled to speed up booting. This means you may not see anything on the CLCD terminal for a while depending on the performance of the machine the model is running on. For example a first boot on a 2 GHz machine with 32 GB of RAM took 20 minutes. Subsequent boots should take approximately half the time to boot.
-
-h3. Attach ADB
-
-ADB on FVP Base models are supported over network. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
diff --git a/android/images/armv8-android-fvp-lsk/HOWTO_install.txt b/android/images/armv8-android-fvp-lsk/HOWTO_install.txt
index 8865ba1..0c485be 100644
--- a/android/images/armv8-android-fvp-lsk/HOWTO_install.txt
+++ b/android/images/armv8-android-fvp-lsk/HOWTO_install.txt
@@ -127,6 +127,6 @@ h3. Black screen
 
 The boot screen has been disabled to speed up booting. This means you may not see anything on the CLCD terminal for a while depending on the performance of the machine the model is running on. For example a first boot on a 2 GHz machine with 32 GB of RAM took 20 minutes. Subsequent boots should take approximately half the time to boot.
 
-h3. Attach ADB
+h3. Attaching ADB
 
-ADB on FVP Base models are supported over network. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
+ADB on FVP Base models is supported over the network. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_install.txt b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
index c5126c3..230bdaa 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
@@ -371,4 +371,4 @@ The board will load the default configuration and boot up.
 
 h2. Attaching ADB
 
-ADB on Juno is supported over ethernet. Follow the instructions on "https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect":https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect adb over the network.
+ADB on Juno is supported over ethernet. Follow the instructions on "https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp":https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect adb over the network.
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt b/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
index a3ab595..ddc5e1a 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
@@ -146,4 +146,4 @@ The following known issues are present in this release.  Please contact "support
 |ARM JSW-742 | No HDMI  | HDMI video out does not work on both the ports |
 |ARM JSW-741 |UEFI - missing boot options | UEFI bootmanager fails to list TFTP and PXE boot options if a live network cable not connected  |
 |ARM JSW-727 |'Trace' does not work in UEFI | While configuring DS-5 to trace UEFI execution, an error was returned when connecting DS-5 to the debugger |
-|JSW-711 |Reset failure | Reset fails if button is pressed during NOR flash write|
+|ARM JSW-711 |Reset failure | Reset fails if button is pressed during NOR flash write|
diff --git a/android/images/armv8-juice-fvp-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-juice-fvp-lsk/HOWTO_getsourceandbuild.txt
index c256e4b..c0ef4d6 100644
--- a/android/images/armv8-juice-fvp-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-juice-fvp-lsk/HOWTO_getsourceandbuild.txt
@@ -180,7 +180,3 @@ Change  bootargs to "console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000"
 Note: There is a bug in UEFI where you won't see USB disk partitions while selecting the boot device. You have to press ESCAPE at "Select the boot device" menu item and then continue.
 
 It should get your Juno board up and running.
-
-h3. Attach ADB
-
-ADB on Juno is supported over network. Follow the instructions here https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect adb over network.
diff --git a/android/images/armv8-juice-fvp-lsk/HOWTO_install.txt b/android/images/armv8-juice-fvp-lsk/HOWTO_install.txt
index 0aeb8dc..d964838 100644
--- a/android/images/armv8-juice-fvp-lsk/HOWTO_install.txt
+++ b/android/images/armv8-juice-fvp-lsk/HOWTO_install.txt
@@ -130,49 +130,6 @@ h3. Black screen
 
 The boot screen has been disabled to speed up booting. This means you may not see anything on the CLCD terminal for a while depending on the performance of the machine the model is running on. For example a first boot on a 2 GHz machine with 32 GB of RAM took 20 minutes. Subsequent boots should take approximately half the time to boot.
 
-h3. Attach ADB
+h3. Attaching ADB
 
-ADB on FVP Base models is supported over network. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb on FAST models.
-
-h2. How to run Juice images on Juno
-
-h3. Plug in the USB stick and flash Juice images on that USB device
-
-Run 'dmesg' and find out correct USB /dev node.
-
-pre.  $ dmesg
-
-Look for a line that looks like the following at the end of the log
-
-pre. [288582.790722]  sdc: sdc1 sdc2 sdc3 sdc4 < sdc5 sdc6 >
-
-WARNING: In the next step, make sure you use /dev/"whatever you see above".
-         You can erase your hard drive with the wrong parameter.
-
-Run linaro image tools
-
-pre.  $ linaro-android-media-create --mmc /dev/sdX --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre.  $ ./linaro-image-tools/linaro-android-media-create --mmc /dev/sdX --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-
-Now unplug the USB stick and connect it to Juno and boot from it.
-
-h3. Configure Juno boot time UEFI configuration
-
-Copy Preboot firmwares (bl1.bin and fip.bin) from boot.tar.bz2 to <firmware_partition>/SOFTWARE/. Stop at UEFI prompt and change few parameters shown below
-
-<pre>
-Select USB device's boot partition to boot from while "Selecting the boot device".
-Change kernel in UEFI to "kernel" in the boot partition
-Change ramdisk in UEFI to "ramdisk.img" in the boot partition
-Change  bootargs to "console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000"
-</pre>
-Note: There is a bug in UEFI where you won't see USB disk partitions while selecting the boot device. You have to press ESCAPE at "Select the boot device" menu item and then continue.
-
-It should get your Juno board up and running.
-
-h3. Attach ADB
-
-ADB on Juno is supported over network. Follow the instructions here https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect adb over network.
+ADB on FVP Base models is supported over the network. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
index 8834800..28c82ef 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
@@ -371,4 +371,4 @@ The board will load the default configuration and boot up.
 
 h2. Attaching ADB
 
-ADB on Juno is supported over ethernet. Follow the instructions on "https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect":https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect adb over the network.
+ADB on Juno is supported over ethernet. Follow the instructions on "https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp":https://wiki.linaro.org/Platform/Android/SetupAdbOverTcp to connect adb over the network.
diff --git a/openembedded/juno-lsk/README.textile b/openembedded/juno-lsk/README.textile
index c6e7b03..2f6055a 100644
--- a/openembedded/juno-lsk/README.textile
+++ b/openembedded/juno-lsk/README.textile
@@ -94,7 +94,7 @@ The following known issues are present in this release.  Please contact "support
 |ARM JSW-749 Linux [Juno-Beta-rc3] | Performance is degraded with idle enabled | With cpuidle enabled  android 64 bit fs shows performance degradation |
 |ARM JSW-746 | USB Drive failure at maximum OPP | With the overdrive operating point enabled, some USB hard drives don't work (causes kernel panic) |
 |ARM JSW-727 |'Trace' does not work in UEFI | While configuring DS-5 to trace UEFI execution, an error was returned when connecting DS-5 to the debugger |
-|JSW-711 |Reset failure | Reset fails if button is pressed during NOR flash write|
+|ARM JSW-711 |Reset failure | Reset fails if button is pressed during NOR flash write|
 |"LP:1212126":https://bugs.launchpad.net/linaro-oe/+bug/1212126 |perf self test does not execute on Linaro openembedded lamp image |<i>please see public bug for details</i> |
 |"LP:1212115":https://bugs.launchpad.net/linaro-oe/+bug/1212115i |phpmysql test fail on Linaro openembedded Lamp image on Lava |<i>please see public bug for details</i> |
 |"LP:1235239":https://bugs.launchpad.net/linaro-oe/+bug/1235239 |level 1 translation fault when extracting bzipped tarball |<i>please see public bug for details</i> |