14.06: applied updated from Amit

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

4 files changed, 16 insertions, 90 deletions

diff --git a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
index 6689cff..bd1f0bf 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -26,7 +26,7 @@ The following simple steps download, install and compile a complete Linaro Andro
 
 bc. sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
 gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev gcc-4.5 g++-4.5 cpp-4.5 gcc-4.5-multilib g++-4.5-multilib \
-uuid-dev openjdk-6-jdk ant lib32ncurses5-dev xsltproc
+uuid-dev openjdk-7-jdk ant lib32ncurses5-dev xsltproc
 
 * Download the Android building script for this release from "here":http://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/linaro_android_build_cmds.sh or from the list of artifacts listed above.
 
@@ -60,50 +60,6 @@ sudo linaro-android-media-create --mmc /dev/sdX --dev vexpress --boot boot.tar.b
 
 p. You must configure UEFI exach time you create a new disk image.
 
-h2. Compiling and installing your Kernel
-
-h3. Prerequisites
-
-* Download and install Ubuntu 12.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Install the following packages by typing:
-
-bc. sudo apt-get install build-essential git curl
-
-* toolchain
-
-bc. mkdir -p ~/bin
-cd ~/bin
-wget http://releases.linaro.org/13.11/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz
-tar xf gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz
-PATH=$PATH:~/bin/gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux/bin
-
-* Create a working subdirectory
-* Download the auto build script for this release from the list of artifacts above (the kernel configuration will be automatically downloaded).
-* Run the build script
-
-bc. chmod a+x linaro_kernel_build_cmds.sh
-./linaro_kernel_build_cmds.sh
-
-h1. Installing your kernel
-
-This section is common for both Android and OpenEmbedded
-
-* 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. make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- dtbs
-
-* Insert the USB drive containing the Linaro disk image
-* Copy the kernel onto the memory card
-
-bc. cp arch/arm64/boot/Image /media/boot/
-cp arch/arm64/boot/dts/juno.dtb /media/boot
-
-* Eject the USB drive @eject /media/boot@
-
-* Insert the USB drive into the board and power it on
-
-
-
 
 h1. Building Firmware From Source
 
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_install.txt b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
index 57bb67a..a8251f8 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
@@ -101,6 +101,13 @@ After the media create tool has finished executing, remove the USB drive from yo
 
 Before you can boot the image you will need to install the latest firmware on the board. The instructions below provide information on how to do this.  See the "UEFI wiki":https://wiki.linaro.org/ARM/UEFI#Configure_UEFI for more information on how to configure UEFI to boot disk images.
 
+In general terms, you use the UEFI Boot Manager to configure the "Boot Device":
+* select USB device's boot partition after selecting "Add Boot Device Entry".
+* use "kernel" when prompted for the file path of the EFI application or then kernel
+* use "ramdisk.img" when prompted for the file path of the initrd
+* change the arguments to pass to the binary to "console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug"
+
+
 h2. DS-5 Configuration Files for Juno
 
 As an optional step, you may wish to install DS-5 configuration files that will allow you to debug Juno. The procedure is as follows:
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
index 968f437..63b55e8 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -26,7 +26,7 @@ The following simple steps download, install and compile a complete Linaro Andro
 
 bc. sudo apt-get install zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev \
 gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev gcc-4.5 g++-4.5 cpp-4.5 gcc-4.5-multilib g++-4.5-multilib \
-uuid-dev openjdk-6-jdk ant lib32ncurses5-dev xsltproc
+uuid-dev openjdk-7-jdk ant lib32ncurses5-dev xsltproc
 
 * Download the Android building script for this release from "here":http://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/linaro_android_build_cmds.sh or from the list of artifacts listed above.
 
@@ -60,50 +60,6 @@ sudo linaro-android-media-create --mmc /dev/sdX --dev vexpress --boot boot.tar.b
 
 p. You must configure UEFI exach time you create a new disk image.
 
-h2. Compiling and installing your Kernel
-
-h3. Prerequisites
-
-* Download and install Ubuntu 12.04 64 bit or newer ("download":http://www.ubuntu.com)
-* Install the following packages by typing:
-
-bc. sudo apt-get install build-essential git curl
-
-* toolchain
-
-bc. mkdir -p ~/bin
-cd ~/bin
-wget http://releases.linaro.org/13.11/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz
-tar xf gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz
-PATH=$PATH:~/bin/gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux/bin
-
-* Create a working subdirectory
-* Download the auto build script for this release from the list of artifacts above (the kernel configuration will be automatically downloaded).
-* Run the build script
-
-bc. chmod a+x linaro_kernel_build_cmds.sh
-./linaro_kernel_build_cmds.sh
-
-h1. Installing your kernel
-
-This section is common for both Android and OpenEmbedded
-
-* 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. make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- dtbs
-
-* Insert the USB drive containing the Linaro disk image
-* Copy the kernel onto the memory card
-
-bc. cp arch/arm64/boot/Image /media/boot/
-cp arch/arm64/boot/dts/juno.dtb /media/boot
-
-* Eject the USB drive @eject /media/boot@
-
-* Insert the USB drive into the board and power it on
-
-
-
 
 h1. Building Firmware From Source
 
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
index 7d97a57..8e88446 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
@@ -101,6 +101,13 @@ After the media create tool has finished executing, remove the USB drive from yo
 
 Before you can boot the image you will need to install the latest firmware on the board. The instructions below provide information on how to do this.  See the "UEFI wiki":https://wiki.linaro.org/ARM/UEFI#Configure_UEFI for more information on how to configure UEFI to boot disk images.
 
+In general terms, you use the UEFI Boot Manager to configure the "Boot Device":
+* select USB device's boot partition after selecting "Add Boot Device Entry".
+* use "kernel" when prompted for the file path of the EFI application or then kernel
+* use "ramdisk.img" when prompted for the file path of the initrd
+* change the arguments to pass to the binary to "console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug"
+
+
 h2. DS-5 Configuration Files for Juno
 
 As an optional step, you may wish to install DS-5 configuration files that will allow you to debug Juno. The procedure is as follows: