draft version for lcr-member-fvp and lcr-member-juno onlyHEADmaster

Still draft version,
bug list not updated yet.
dir name not updated yet.

Change-Id: I8969bb389a9bb8f7d46682b57d5011afd4073351
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

32 files changed, 1464 insertions, 693 deletions

diff --git a/android/lcr-m/images/lcr-member-fvp/HOWTO_getsourceandbuild.txt b/android/lcr-m/images/lcr-member-fvp/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index d1026e6..0000000
--- a/android/lcr-m/images/lcr-member-fvp/HOWTO_getsourceandbuild.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/
-
-h2. Prerequisites
-
-To clone the sources you must be able to ssh to git.linaro.org and be part of the big-little-switcher-private group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
-Install build dependencies on Ubuntu:
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown libxml2-utils xsltproc uboot-mkimage openjdk-7-jdk openjdk-7-jre vim-common python-parted python-yaml wget uuid-dev iasl
-</pre>
-
-You can also download linaro android build script(linaro_android_build_cmds.sh) from Downloads section at https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk to do a complete ARMv8 Android build for FVP models from scratch.
-
-h2. Get the source
-
-<pre>
-  $ curl "https://android.git.linaro.org/gitweb/tools/repo.git/blob_plain/refs/heads/stable:/repo" >repo
-  $ chmod +x repo
-  $ ./repo init -u git://android.git.linaro.org/platform/manifest.git -b armv8-linaro -m baseline_manifest.xml
-  $ ./repo sync # this may take some time
-</pre>
-
-h2. Build
-
-<pre>
-  $ export CPUS=`grep -c processor /proc/cpuinfo`
-  $ export TARGET_PRODUCT=vexpress
-  $ export TARGET_BUILD_VARIANT=userdebug
-  $ . build/envsetup.sh
-  $ make -j${CPUS} selinuxtarballs
-</pre>
-
-h2. Get linaro image tools
-
-Run these commands to get all the dependencies for linaro-image-tools
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-</pre>
-If you're using a "tip" build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/infrastructure/linaro-image-tools.git
-
-h2. Create binary for ARM FVP Base AEMv8 models
-
-Run linaro image tools
-
-pre. $ linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-h2. Extract the preboot files
-
-pre. tar -jxvf boot.tar.bz2
-
-h2. Setup the runtime environment
-
-<pre>
-  $ export ARMLMD_LICENSE_FILE="8224@localhost"
-  $ ssh -L 8224:localhost:8224 -L 18224:localhost:18224 -N $USER@flexlm.linaro.org
-</pre>
-
-h2. Running the models (verified on FVP Base model build 5502)
-
-<pre>
-  $ cd boot
-  $ /path/to/FVP_Base_AEMv8A-AEMv8A/models/Linux64_GCC-4.1/FVP_Base_AEMv8A-AEMv8A \
-        -C pctl.startup=0.0.0.0 \
-        -C bp.secure_memory=0 \
-        -C cluster0.NUM_CORES=1 \
-        -C cluster1.NUM_CORES=1 \
-        -C cache_state_modelled=0 \
-        -C bp.pl011_uart0.untimed_fifos=1 \
-        -C bp.secureflashloader.fname=bl1.bin \
-        -C bp.flashloader0.fname=fvp_fip.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
-</pre>
-
-h3. Console redirection
-
-To redirect the console open a terminal and run
-
-pre. telnet 127.0.0.1 5000
-
-h3. Set UEFI configuration, update kernel/ramdisk path and bootargs
-
-Stop the UEFI boot process and configure it for FVP models:
-
-<pre>
-$ telnet 127.0.0.1 -debug 5000 -e ^z
-Telnet escape character is 'b'.
-Telnet escape character is '^Z'.
-Trying 127.0.0.1...
-setsockopt (SO_DEBUG): Permission denied
-Connected to 127.0.0.1.
-Escape character is '^Z'.
-  7 seconds
-[1] Linaro disk image on virtio
-[2] Shell
-[3] Boot Manager
-Start: 2
-UEFI Interactive Shell v2.0
-EDK II
-UEFI v2.40 (ARM Fixed Virtual Platform EFI May 23 2014 12:13:52, 0x00000000)
-Mapping table
-      FS2: Alias(s):F8:
-          VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)
-      FS0: Alias(s):F3:
-          MemoryMapped(0xB,0x88000000,0x8827FFFF)
-      FS1: Alias(s):F4:
-          MemoryMapped(0xB,0xFEC16000,0xFEDF987F)
-      FS3: Alias(s):HD12b:;BLK5:
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(1,MBR,0x00000000,0x3F,0x41FC0)
-      FS4: Alias(s):HD12e2:;BLK10:
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(4,MBR,0x00000000,0x242000,0x1BE000)/HD(2,MBR,0x00000000,0x362020,0x9DFE0)
-     BLK3: Alias(s):
-          VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
-     BLK0: Alias(s):
-          VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
-     BLK1: Alias(s):
-          VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
-     BLK2: Alias(s):
-          VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
-     BLK4: Alias(s):
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)
-Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
-Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
-EFI stub: Booting Linux Kernel...
-[    0.000000] Initializing cgroup subsys cpu2E873E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
-[    0.000000] Initializing cgroup subsys cpuacct
-[    0.000000] Linux version 3.10.63-00561-g90aa783 (buildslave@x86-64-07-android) (gcc version 4.9 20140514 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 23 14:41:49 CET 2015
-</pre>
-
-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.
-
-h2. Run the Android SDK
-
-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.
-
-You can also run all of the standard Android SDK tools. Learn more at "http://developer.android.com/sdk/index.html":http://developer.android.com/sdk/index.html
diff --git a/android/lcr-m/images/lcr-member-juno/HOWTO_eula.txt b/android/lcr-m/images/lcr-member-juno/HOWTO_eula.txt
deleted file mode 100644
index e69de29..0000000
--- a/android/lcr-m/images/lcr-member-juno/HOWTO_eula.txt
+++ /dev/null
diff --git a/android/lcr-m/images/lcr-member-juno/HOWTO_getsourceandbuild.txt b/android/lcr-m/images/lcr-member-juno/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index 21e533f..0000000
--- a/android/lcr-m/images/lcr-member-juno/HOWTO_getsourceandbuild.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/
-
-h2. Prerequisites
-
-To clone the sources you must be able to ssh to git.linaro.org and be part of the big-little-switcher-private group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
-Install build dependencies on Ubuntu:
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown libxml2-utils xsltproc uboot-mkimage openjdk-7-jdk openjdk-7-jre vim-common python-parted python-yaml wget uuid-dev iasl
-</pre>
-
-You can also download linaro android build script(linaro_android_build_cmds.sh) from Downloads section at https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk to do a complete ARMv8 Android build from scratch.
-
-h2. Get the source
-
-<pre>
-  $ curl "https://android.git.linaro.org/gitweb/tools/repo.git/blob_plain/refs/heads/stable:/repo" >repo
-  $ chmod +x repo
-  $ ./repo init -u git://android.git.linaro.org/platform/manifest.git -b armv8-linaro -m baseline_manifest.xml
-  $ ./repo sync # this may take some time
-</pre>
-
-h2. Build
-
-<pre>
-  $ export CPUS=`grep -c processor /proc/cpuinfo`
-  $ export TARGET_PRODUCT=juno
-  $ export TARGET_BUILD_VARIANT=eng
-  $ . build/envsetup.sh
-  $ make -j${CPUS} boottarball systemtarball userdatatarball
-</pre>
-
-h2. Flash Linaro tarball images on USB drive
-
-Create MMC image first and dd it to the USB drive:
-
-Get linaro image tools. Run these commands to get all the dependencies for linaro-image-tools
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-</pre>
-If you're using a "tip" build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/infrastructure/linaro-image-tools.git
-
-Create mmc image:
-
-pre. $ linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-Flash the mmc.img to USB drive:
-
-pre. $ dd if=mmc.img of=/dev/sda(?) bs=4096 conv=notrunc,noerror
-
-h2. Configure Juno boot time UEFI configuration
-
-Stop at UEFI prompt and change few parameters shown below
-
-<pre>
-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>
-
-It should get your Juno board up and running.
diff --git a/android/lcr-m/images/lcr-member-juno/HOWTO_install.txt b/android/lcr-m/images/lcr-member-juno/HOWTO_install.txt
deleted file mode 100644
index 4bf0154..0000000
--- a/android/lcr-m/images/lcr-member-juno/HOWTO_install.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/
-
-h2. Prerequisites
-
-h3. Get artifacts
-
-To get the build artifacts you must be part of the linaro-android-restricted launchpad group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
-h3. Run the build
-
-You'll need the latest ARM FVP Base models and a license to use the models. Follow the instructions at https://collaborate.linaro.org/display/ITS/FlexLM+and+Fast+Models for the same.
-
-h2. Get artifacts
-
-Scroll down and click on 'Downloads'
-
-Click on each link to download:
-* boot.tar.bz2
-* system.tar.bz2
-* userdata.tar.bz2
-
-h2. Flash Linaro tarball images on USB drive
-
-Create MMC image first and dd it to the USB drive:
-
-Get linaro image tools. Run these commands to get all the dependencies for linaro-image-tools
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-</pre>
-If you're using a "tip" build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/infrastructure/linaro-image-tools.git
-
-Create mmc image:
-
-pre. $ linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-Flash the mmc.img to USB drive:
-
-pre. $ dd if=mmc.img of=/dev/sda(?) bs=4096 conv=notrunc,noerror
-
-h2. Configure Juno boot time UEFI configuration
-
-Stop at UEFI prompt and select the Shell item, it will boot up directly for you.
diff --git a/android/lcr-m/images/lcr-member-vexpress/HOWTO_getsourceandbuild.txt b/android/lcr-m/images/lcr-member-vexpress/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index e69de29..0000000
--- a/android/lcr-m/images/lcr-member-vexpress/HOWTO_getsourceandbuild.txt
+++ /dev/null
diff --git a/android/lcr-m/images/lcr-member-vexpress/HOWTO_install.txt b/android/lcr-m/images/lcr-member-vexpress/HOWTO_install.txt
deleted file mode 100644
index e69de29..0000000
--- a/android/lcr-m/images/lcr-member-vexpress/HOWTO_install.txt
+++ /dev/null
diff --git a/android/lcr-member/images/lcr-member-fvp/HOWTO_getsourceandbuild.txt b/android/lcr-member/images/lcr-member-fvp/HOWTO_getsourceandbuild.txt
new file mode 100644
index 0000000..7bd5779
--- /dev/null
+++ b/android/lcr-member/images/lcr-member-fvp/HOWTO_getsourceandbuild.txt
@@ -0,0 +1,147 @@
+h1. Accessing Source Code
+
+h2. Linaro Android Source Code
+
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-fvp/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+
+The pinned and source manifests can be found here:
+
+* "Pinned Manifest":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-fvp/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-fvp/source-manifest.xml
+
+h2. Compiling Linaro Android RootFS+Kernel
+
+The following simple steps download, install and compile a complete Linaro Android distribution
+
+* Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-fvp/linaro_android_build_cmds.sh
+
+* Run the script
+
+Build from the tip of the source:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -t 
+
+Or reproduce the exactly the same as this buid:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -m pinned-manifest.xml
+
+h2. Booting the android with fastmodels
+
+h3. create the image file
+
+pre. $ linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+h3. Extract the preboot files
+
+pre. tar -jxvf boot.tar.bz2
+
+h3. Setup the runtime environment
+
+<pre>
+  $ export ARMLMD_LICENSE_FILE="8224@localhost"
+  $ ssh -L 8224:localhost:8224 -L 18224:localhost:18224 -N $USER@flexlm.linaro.org &
+</pre>
+
+h3. Running the models (verified on FVP Base model build 6302)
+
+<pre>
+  $ cd boot/
+  $ /path/to/FVP_Base_AEMv8A-AEMv8A/models/Linux64_GCC-4.1/FVP_Base_AEMv8A-AEMv8A \
+        -C pctl.startup=0.0.0.0 \
+        -C bp.secure_memory=0 \
+        -C cluster0.NUM_CORES=1 \
+        -C cluster1.NUM_CORES=1 \
+        -C cache_state_modelled=0 \
+        -C bp.pl011_uart0.untimed_fifos=1 \
+        -C bp.secureflashloader.fname=bl1.bin \
+        -C bp.flashloader0.fname=fvp_fip.bin \
+        -C bp.virtioblockdevice.image_path=mmc.bin \
+        -C bp.hostbridge.userNetworking=true \
+        -C bp.hostbridge.userNetPorts="5555=5555" \
+        -C bp.smsc_91c111.enabled=1
+</pre>
+
+h3. Console redirection
+
+To redirect the console open a terminal and run
+
+pre. telnet 127.0.0.1 5000
+
+h3. Select UEFI configuration item, boot the build 
+
+Stop the UEFI prompt and select the Shell item, then it will boot up directly for you:
+
+<pre>
+01:45:07 liuyq: m-lcr-fvp$ telnet localhost 5000
+Trying ::1...
+Trying 127.0.0.1...
+Connected to localhost.
+Escape character is '^]'.
+Booting trusted firmware boot loader stage 1
+Built : 12:14:12, May 23 2014
+Booting trusted firmware boot loader stage 2
+BL2 Built : 12:14:15, May 23 2014
+Booting trusted firmware boot loader stage 3
+BL31 Built : 12:14:19, May 23 2014
+UEFI firmware (version  built at 12:13:11 on May 23 2014)
+
+[=3h [=3h [=3h [=3h [=3h [=3h
+The default boot selection will start in   1 seconds
+ERROR: Did not find Linux kernel.
+[1] Linaro disk image on virtio
+[2] Shell
+[3] Boot Manager
+Start: 2
+UEFI Interactive Shell v2.0
+EDK II
+UEFI v2.40 (ARM Fixed Virtual Platform EFI May 23 2014 12:13:52, 0x00000000)
+Mapping table
+      FS2: Alias(s):F8:
+          VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)
+      FS0: Alias(s):F3:
+          MemoryMapped(0xB,0x88000000,0x8827FFFF)
+      FS1: Alias(s):F4:
+          MemoryMapped(0xB,0xFEC16000,0xFEDF987F)
+      FS3: Alias(s):HD12b:;BLK5:
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(1,MBR,0x00000000,0x3F,0x41FC0)
+      FS4: Alias(s):HD12e2:;BLK10:
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(4,MBR,0x00000000,0x242000,0x1BE000)/HD(2,MBR,0x00000000,0x362020,0x9DFE0)
+     BLK3: Alias(s):
+          VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
+     BLK0: Alias(s):
+          VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
+     BLK1: Alias(s):
+          VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
+     BLK2: Alias(s):
+          VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
+     BLK4: Alias(s):
+Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
+Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
+EFI stub: Booting Linux Kernel...4-B346-73DB42E873E5)/HD(2,MBR,0x00000000,0x42000,0x180000)
+[    0.000000] Initializing cgroup subsys cpu
+[    0.000000] Initializing cgroup subsys cpuacct3E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
+[    0.000000] Linux version 3.10.74 (buildslave@x86-64-07-android) (gcc version 4.9.3 20150413 (prerelease) (Linaro GCC Snapshot 4.9-2015.04) ) #1 SMP PREEMPT Mon May 25 11:45:33 CEST 20150000000,0x242000,0x1BE000)
+</pre>
+
+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.
+
+h2. Run the Android SDK
+
+h3. Attach ADB
+
+If you run the models with the configurations mentioned above at the "Running the models" section, by default you can connect to the adb connection like this:
+
+<pre>
+    adb connect 127.0.0.1
+</pre>
+
+ADB on FVP Base models are supported over network as well. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
+
+You can also run all of the standard Android SDK tools. Learn more at "http://developer.android.com/sdk/index.html":http://developer.android.com/sdk/index.html
+
+Please Note: The adb connection will be only available after the Home screen is displayed.
diff --git a/android/lcr-m/images/lcr-member-fvp/HOWTO_install.txt b/android/lcr-member/images/lcr-member-fvp/HOWTO_install.txt
index fb42913..6e02d75 100644
--- a/android/lcr-m/images/lcr-member-fvp/HOWTO_install.txt
+++ b/android/lcr-member/images/lcr-member-fvp/HOWTO_install.txt
@@ -1,19 +1,11 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/
-
 h2. Prerequisites
 
-h3. Get artifacts
-
-To get the build artifacts you must be part of the linaro-android-restricted launchpad group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
 h3. Run the build
 
 You'll need the latest ARM FVP Base models and a license to use the models. Follow the instructions at https://collaborate.linaro.org/display/ITS/FlexLM+and+Fast+Models for the same.
 
 h2. Get artifacts
 
-Scroll down and click on 'Downloads'
-
 Click on each link to download:
 * boot.tar.bz2
 * system.tar.bz2
@@ -29,13 +21,7 @@ Run these commands to get all the dependencies for linaro-image-tools and the ti
   $ sudo apt-get install linaro-image-tools
 </pre>
 
-If you're using a released build (with a -release or from releases.linaro.org), skip this step.
-If you're using a "tip" build do not skip the step and do the following:
-
-<pre>
-  $ sudo apt-get install bzr
-  $ bzr branch lp:linaro-image-tools
-</pre>
+If you’re using a “tip” build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/ci/linaro-image-tools.git
 
 h2. Create binary for the ARM FVP Base AEMv8 models
 
@@ -58,7 +44,7 @@ h2. Setup the runtime environment
   $ ssh -L 8224:localhost:8224 -L 18224:localhost:18224 -N $USER@flexlm.linaro.org &
 </pre>
 
-h2. Running the models (verified on FVP Base model build 5502)
+h2. Running the models (verified on FVP Base model build 6302)
 
 <pre>
   $ cd boot/
@@ -71,7 +57,10 @@ h2. Running the models (verified on FVP Base model build 5502)
         -C bp.pl011_uart0.untimed_fifos=1 \
         -C bp.secureflashloader.fname=bl1.bin \
         -C bp.flashloader0.fname=fvp_fip.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
+        -C bp.virtioblockdevice.image_path=mmc.bin \
+        -C bp.hostbridge.userNetworking=true \
+        -C bp.hostbridge.userNetPorts="5555=5555" \
+        -C bp.smsc_91c111.enabled=1
 </pre>
 
 h3. Console redirection
@@ -80,19 +69,27 @@ To redirect the console open a terminal and run
 
 pre. telnet 127.0.0.1 5000
 
-h3. Set UEFI configuration, update kernel/ramdisk path and bootargs
+h3. Select UEFI configuration item, boot the build 
 
-Stop the UEFI boot process and configure it for FVP models:
+Stop the UEFI prompt and select the Shell item, then it will boot up directly for you:
 
 <pre>
-$ telnet 127.0.0.1 -debug 5000 -e ^z
-Telnet escape character is 'b'.
-Telnet escape character is '^Z'.
+01:45:07 liuyq: m-lcr-fvp$ telnet localhost 5000
+Trying ::1...
 Trying 127.0.0.1...
-setsockopt (SO_DEBUG): Permission denied
-Connected to 127.0.0.1.
-Escape character is '^Z'.
-  7 seconds
+Connected to localhost.
+Escape character is '^]'.
+Booting trusted firmware boot loader stage 1
+Built : 12:14:12, May 23 2014
+Booting trusted firmware boot loader stage 2
+BL2 Built : 12:14:15, May 23 2014
+Booting trusted firmware boot loader stage 3
+BL31 Built : 12:14:19, May 23 2014
+UEFI firmware (version  built at 12:13:11 on May 23 2014)
+
+[=3h [=3h [=3h [=3h [=3h [=3h
+The default boot selection will start in   1 seconds
+ERROR: Did not find Linux kernel.
 [1] Linaro disk image on virtio
 [2] Shell
 [3] Boot Manager
@@ -120,13 +117,12 @@ Mapping table
      BLK2: Alias(s):
           VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
      BLK4: Alias(s):
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)
 Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
 Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
-EFI stub: Booting Linux Kernel...
-[    0.000000] Initializing cgroup subsys cpu2E873E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
-[    0.000000] Initializing cgroup subsys cpuacct
-[    0.000000] Linux version 3.10.63-00561-g90aa783 (buildslave@x86-64-07-android) (gcc version 4.9 20140514 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 23 14:41:49 CET 2015
+EFI stub: Booting Linux Kernel...4-B346-73DB42E873E5)/HD(2,MBR,0x00000000,0x42000,0x180000)
+[    0.000000] Initializing cgroup subsys cpu
+[    0.000000] Initializing cgroup subsys cpuacct3E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
+[    0.000000] Linux version 3.10.74 (buildslave@x86-64-07-android) (gcc version 4.9.3 20150413 (prerelease) (Linaro GCC Snapshot 4.9-2015.04) ) #1 SMP PREEMPT Mon May 25 11:45:33 CEST 20150000000,0x242000,0x1BE000)
 </pre>
 
 h3. Black screen
@@ -137,7 +133,14 @@ h2. Run the Android SDK
 
 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.
+If you run the models with the configurations mentioned above at the "Running the models" section, by default you can connect to the adb connection like this:
+
+<pre>
+    adb connect 127.0.0.1
+</pre>
+
+ADB on FVP Base models are supported over network as well. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
 
 You can also run all of the standard Android SDK tools. Learn more at "http://developer.android.com/sdk/index.html":http://developer.android.com/sdk/index.html
 
+Please Note: The adb connection will be only available after the Home screen is displayed.
diff --git a/android/lcr-m/images/lcr-member-fvp/HOWTO_releasenotes.txt b/android/lcr-member/images/lcr-member-fvp/HOWTO_releasenotes.txt
index 0b35561..ede4c09 100644
--- a/android/lcr-m/images/lcr-member-fvp/HOWTO_releasenotes.txt
+++ b/android/lcr-member/images/lcr-member-fvp/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for FVP (Multi-arch 64-bit)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r1 version. The reference build is the userdebug variant
+Android-5.1.1_r3 version. The reference build is the userdebug variant
 build, it contains multi-arch support allowing full use of the 64-bit
 ARMv8-A architecture and supports both 64-bit and 32-bit applications,
 and has selinux enabled by default.
@@ -17,21 +17,21 @@ To disable SELinux pass "selinux=0" as the boot parameter in the UEFI
 bootargs configuration.
 
 The Android AOSP software provided in this release is functionally
-tested with CTS version 5.0r2 and the CTS results are shared with
+tested with CTS version 5.1r1 and the CTS results are shared with
 members.
 
 Additionally, the BIONIC component is validated with Android BIONIC
-tests. Android Monkey tests were run for stress testing. Multi-arch
-support has been validated using examples provided in Android NDK.
+tests. Multi-arch support has been validated using examples provided in Android NDK.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.04/android/armv8-android-fvp-lsk/#tabs-3). 
+(see the "Building from Source tab":https://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-fvp/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the  Lollipop Android-5.1.1_r1 version
-* Built with Linaro GCC and not AOSP GCC
-* Cortex strings optimizations ported to Bionic
+* Android source changed to based on the Lollipop Android-5.1.1_r3 version
+* Integrated many ART related optimizations and obtain obvious improvement
+* Changed to use libjpeg-turbo as the defaut system libjpeg.so library and obtain obvious improvement
+* Updated some external projects, including: sqlite, giflib, libpng, harfbuzz_ng, fio
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -45,7 +45,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"Building from Source":https://releases.linaro.org/15.04/android/armv8-android-fvp-lsk/#tabs-3).
+"Building from Source":https://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-fvp/#tabs-3).
 
 h2. Support
 
@@ -53,7 +53,7 @@ Subscribe to the important Linaro mailing lists and join our IRC
 channels to stay on top of Linaro development.
 * Linaro Android Development "'Mailing list'":http://lists.linaro.org/mailman/listinfo/linaro-android
 * Linaro Android IRC channel on irc.freenode.net at #linaro-android
-* Landing Team bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under linaro-android product and Linaro Confectionery Release component.
+* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under "Linaro Android" product and "Member Linaro Confectionery Release (M-LCR)" component.
 ** You will need to login to your Linaro account. If you do not have an account or are having problems, email its@linaro.org for help.
 * More general bug reports should be filed in Bugzilla against the individual packages that are affected.
 * Questions? "'ask linaro'":http://ask.linaro.org/
@@ -62,10 +62,10 @@ channels to stay on top of Linaro development.
 
 h2. Android Patch Summary
 
-The following list of patches developed by ARM and Linaro engineering
-teams were applied to get Android booting to UI on the ARMv8-A Juno
-development platform. These patches can be found on Linaro's Android
-Git repositories via file "LOLLIPOP-STABLE-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-STABLE-PATCHSET.
+There are patches developed by ARM and Linaro engineering teams
+were applied to get Android booting to UI on the ARMv8-A fastmodels platform.
+These patches can be found on Linaro's Android
+Git repositories via file "LOLLIPOP-MLCR-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-MLCR-PATCHSET.
 Some of these patches have been submitted to AOSP and are being tracked
 for acceptance.
 
diff --git a/android/lcr-member/images/lcr-member-juno/HOWTO_eula.txt b/android/lcr-member/images/lcr-member-juno/HOWTO_eula.txt
new file mode 100644
index 0000000..d8e300e
--- /dev/null
+++ b/android/lcr-member/images/lcr-member-juno/HOWTO_eula.txt
@@ -0,0 +1,267 @@
+THIS END USER LICENCE AGREEMENT ("LICENCE") IS A LEGAL AGREEMENT BETWEEN YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND ARM LIMITED ("ARM") FOR THE USE OF THE DELIVERABLES ACCOMPANYING THIS LICENCE. ARM IS ONLY WILLING TO LICENSE THE DELIVERABLES TO YOU ON CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS LICENCE. BY CLICKING "I AGREE" OR BY INSTALLING OR OTHERWISE USING OR COPYING THE DELIVERABLES YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL THE TERMS OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, ARM IS UNWILLING TO LICENSE THE DELIVERABLES TO YOU AND YOU MAY NOT INSTALL, USE OR COPY THE DELIVERABLES, BUT YOU SHOULD PROMPTLY RETURN THE DELIVERABLES TO YOUR SUPPLIER AND ASK FOR A REFUND OF ANY LICENCE FEE PAID.
+
+
+
+"Juno ARM Development Platform" means a hardware development board purchased directly from ARM or its authorised distributors.
+
+
+
+"Deliverables"; means any software, firmware, boardfiles, data and documentation accompanying this Licence, any printed, electronic or online documentation supplied with it, and any updates, patches and modifications ARM may make available to you under the terms of this Licence, in all cases relating to the supporting deliverables for the Juno ARM Development Platform.
+
+
+
+"Separate Files" means the separate files identified in Part D of the Schedule.
+
+
+
+1.  LICENCE GRANTS.
+
+(i) DELIVERABLES: ARM hereby grants to you, subject to the terms and conditions of this Licence, a non-exclusive, non-transferable licence solely for use on a Juno ARM Development Platform and only for the purposes of your internal development, testing and debugging of software applications that are designed to run solely on microprocessors manufactured under licence from ARM, to:
+
+
+
+(a)     use and copy the Deliverables identified in Part A of the Schedule;
+
+
+
+(b)     use, copy and modify the Deliverables identified in Part B and Part C of the Schedule;
+
+
+
+&#040;c)     distribute and sub-license to third parties the right to use, copy and modify the Deliverables identified in Part C(i) of the Schedule, or your derivatives thereof, as part of your own products ("Licensed Products") provided you comply with the terms of Clause 1(ii);
+
+
+
+(d)     permit either or both your customers and your authorised distributors to redistribute the Deliverables identified in Part C(i) of the Schedule, or your derivatives thereof, solely as part of Licensed Products developed by you or your permitted users (identified in clause 2 paragraph three below).
+
+
+
+Except as permitted by clause 1(i)(b) above, you shall not modify the Deliverables.  Except as permitted by clauses 1(i)&#040;c) and 1(i)(d) above, you shall not redistribute any of the Deliverables.
+
+
+
+(ii)  FURTHER CONDITIONS APPLICABLE TO REDISTRIBUTION AND SUB-LICENSING: If you choose to redistribute the Deliverables identified in Part C(i) of the Schedule ("Example Code") you agree: (a) to ensure that they are licensed for use only as part of Licensed Products and only on microprocessors manufactured or simulated under licence from ARM; (b) not to use ARM's or any of its licensors names, logos or trademarks to market the Licensed Products; &#040;c) to include valid copyright notices on the Licensed Products, and preserve any copyright notices which are included with, or in, the Example Code; (d) to comply with all the other terms of this Licence; and (e) to ensure that any further redistribution is limited to redistribution by either or both your customers and your authorised distributors only as part of Licensed Products developed by you or your permitted users and only for use on microprocessors manufactured or simulated under licence from ARM and  that your customers  and authorised distributors comply with the terms of this clause 1(ii).
+
+
+
+2.  RESTRICTIONS ON USE OF THE DELIVERABLES.
+
+COPYING: You shall not use or copy the Deliverables except as expressly authorised in this Licence. You may make one additional copy of the delivered Deliverables media or image for backup or archival purposes.
+
+PERMITTED USERS: The Deliverables shall be used only by your employees, or by your bona fide sub-contractors for whose acts and omissions you hereby agree to be responsible to ARM to the same extent as you are for any acts and omissions of your employees, and provided always that such sub-contractors; (i) work only onsite at your premises; (ii) comply with the terms of this Licence; (iii) are contractually obligated to use the Deliverables only for your benefit, and (iv) agree to assign all their work product and any rights they create therein in the supply of such work to you. Only the single individual, company or other legal entity to whom ARM is supplying this Licence may use the Deliverables. Except as provided in this clause, you shall not allow third parties (including but not limited to any subsidiary, parent or affiliated companies, or offsite contractors you may have) to use the Deliverables unless ARM specifically agrees otherwise with you on a case by case basis.
+
+
+
+NO REMOTE USE: The Deliverables shall only be used onsite at your premises and only for your benefit.
+
+MULTIPLE VERSIONS: The media on which the Deliverables resides may contain more than one version of the Deliverables, each of which is compatible with a different operating system (such as Microsoft Windows XP Professional and Red Hat Linux).
+
+
+
+ACADEMIC OR EDUCATIONAL USERS ONLY: If you or your employer or institution paid academic or educational pricing for the Deliverables, or the Deliverables are identified as an academic or educational version (together "Academic Software"), then notwithstanding anything else in this Licence, YOU AGREE TO USE THE ACADEMIC SOFTWARE ONLY FOR ACADEMIC, NON-COMMERCIAL PURPOSES, AND ARM DOES NOT GRANT YOU ANY RIGHTS TO DISTRIBUTE OR SUB-LICENSE ANY APPLICATIONS DEVELOPED USING THE ACADEMIC SOFTWARE UNDER THIS LICENCE.
+
+
+
+REVERSE ENGINEERING: Except to the extent that such activity is permitted by applicable law you shall not reverse engineer, decompile or disassemble any of the Deliverables. If the Deliverables were provided to you in Europe you shall not reverse engineer, decompile or disassemble any of the Deliverables for the purposes of error correction.
+
+
+
+BENCHMARKING: This licence does not prevent you from using the Deliverables for internal benchmarking purposes. However, you shall treat any and all benchmarking data, and any other results of your use or testing of the Deliverables which are indicative of performance, efficacy, reliability or quality, as confidential information and you shall not disclose such information to any third party without the express written permission of ARM.
+
+
+
+RESTRICTIONS ON TRANSFER OF LICENSED RIGHTS: The rights granted to you under this Licence may not be assigned, sublicensed or otherwise transferred by you to any third party without the prior written consent of ARM. An assignment shall be deemed to include, without limitation; (i) any transaction or series of transactions whereby a third party acquires, directly or indirectly, the power to control the management and policies of you, whether through the acquisition of voting securities, by contract or otherwise; or (ii) the sale of more than fifty percent (50%) of the your assets whether in a single transaction or series of transactions.  You shall not rent or lease the Deliverables. You shall not share the Deliverables with contractors (except as identified in the 'PERMITTED USERS' clause above) or other third parties.
+
+
+
+COPYRIGHT AND RESERVATION OF RIGHTS: The Deliverables are owned by ARM or its licensors and are protected by copyright and other intellectual property laws and international treaties. The Deliverables are licensed not sold. You acquire no rights to the Deliverables other than as expressly provided by this Licence. You shall not remove from the Deliverables any copyright notice or other notice and shall ensure that any such notice is reproduced in any copies of the whole or any part of the Deliverables made by you or your permitted users.
+
+
+
+3.  SUPPORT AND MAINTENANCE.
+
+If you purchased the Deliverables directly from ARM, and you are not receiving them as an update or upgrade or as Academic Software (defined in Clause 2), you are entitled to reasonable support and maintenance for the Deliverables for the period of one (1) year from the date of purchase. The support will be provided on any version of the Deliverables which, at the date of your support request, are either; (a) the current version made generally available by ARM; or (b) the previous version made generally available by ARM at some time during the previous ninety (90) days.
+
+
+
+Support will be provided by telephone, email or other written format designated by ARM, prioritised at ARM's discretion, and may not be used as a substitute for training or as additional resource for your programming projects.  Maintenance will be provided in the form of upgrades, updates and patch releases to the Deliverables as and when they are made generally available from ARM.
+
+
+
+ARM's obligation under this Clause 3 is limited to the provision of support and maintenance to you and ARM is under no obligation to provide any support and maintenance to any third parties under this Licence. If you purchase support and maintenance for additional years it will be provided pursuant to this Clause 3 and will be subject to the terms and conditions of this Licence.
+
+
+
+If; (i) you obtained the Deliverables from an ARM authorised reseller or other third party; (ii) Deliverables were provided free of charge or for evaluation; or (iii) it is Academic Software, you are not entitled to any support for the Deliverables from ARM, but ARM may, at its sole discretion provide limited support to you. The vendor of the Deliverables may or may not offer support to you for the Deliverables. Please refer to the Technical Support area of http://www.arm.com for contact details for ARM's support service and (if applicable) other authorised support channels.  ARM shall be under no obligation to provide support in respect of any modifications (where permitted) to the Deliverables.
+
+
+
+4.  CONFIDENTIALITY.
+
+You acknowledge that the Deliverables and any benchmarking data and related information mentioned in Clause 2 contains trade secrets and confidential material, and you agree to maintain all such information in confidence and apply security measures no less stringent than the measures which you apply to protect your own like information, but not less than a reasonable degree of care, to prevent their unauthorised disclosure and use. Subject to any restrictions imposed by applicable law, the period of confidentiality shall be indefinite. You agree that you shall not use any such information other than in normal use of the Deliverables under the licences granted in this Licence.
+
+
+
+Notwithstanding the foregoing you may disclose the Deliverables identified in Part C(i) of the Schedule to third parties solely in exercise of the licence rights contained in Clause 1(i)&#040;c) of this Licence.
+
+
+
+5.  LIMITED WARRANTIES.
+
+For the period of ninety (90) days from the date of receipt by you of the Deliverables, ARM warrants to you that (i) the media on which the Deliverables are provided shall be free from defects in materials and workmanship under normal use; and (ii) the Deliverables will perform substantially in accordance with the accompanying documentation (if any). ARM's total liability and your exclusive remedy for breach of these limited warranties shall be limited to ARM, at ARM's option; (a) replacing the defective Deliverables; or (b) using reasonable efforts to correct material, documented, reproducible defects in the Deliverables and delivering such corrected Deliverables to you. Any replacement Deliverables will be warranted for the remainder of the original warranty period or thirty (30) days, whichever is the longer.
+
+
+
+EXCEPT AS PROVIDED ABOVE, YOU AGREE THAT THE DELIVERABLES ARE LICENSED "AS IS", AND THAT ARM EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR OTHER TERMS, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON- INFRINGEMENT, SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION OF SOFTWARE APPLICATIONS, INCLUDING WITHOUT LIMITATION, APPLICATIONS DESIGNED OR INTENDED FOR MISSION CRITICAL APPLICATIONS, SUCH AS PACEMAKERS, WEAPONARY, AIRCRAFT NAVIGATION, FACTORY CONTROL SYSTEMS, ETC. SHOULD THE DELIVERABLES PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+
+
+6.  LIMITATION OF LIABILITY.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL ARM BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF PROFITS) ARISING OUT OF THE USE OR INABILITY TO USE THE DELIVERABLES WHETHER BASED ON A CLAIM UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, EVEN IF ARM WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ARM does not seek to limit or exclude liability for death or personal injury arising from ARM's negligence or ARM's fraud and because some jurisdictions do not permit the exclusion or limitation of liability for consequential or incidental damages the above limitation relating to liability for consequential damages may not apply to you.
+
+
+
+NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, THE MAXIMUM LIABILITY OF ARM TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST ARM IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE SUBJECT MATTER OF THIS LICENCE SHALL NOT EXCEED THE GREATER OF; (I) THE TOTAL OF SUMS PAID BY YOU TO ARM (IF ANY) FOR THIS LICENCE; AND (II) $10 USD.
+
+THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT.
+
+
+
+7.  THIRD PARTY RIGHTS.
+
+The Separate Files are delivered subject to and your use is governed by their own separate licence agreements. This Licence does not apply to such Separate Files and they are not included in the term "Deliverables" under this Licence. You agree to comply with all terms and conditions imposed on you in respect of such Separate Files including those identified in the Schedule ("Third Party Terms").
+
+
+
+ARM HEREBY DISCLAIMS ANY AND ALL WARRANTIES EXPRESS OR IMPLIED FROM ANY THIRD PARTIES REGARDING ANY SEPARATE FILES, ANY THIRD PARTY MATERIALS INCLUDED IN THE DELIVERABLES, ANY THIRD PARTY MATERIALS FROM WHICH THE DELIVERABLES ARE DERIVED (COLLECTIVELY "OTHER CODE"), AND THE USE OF ANY OR ALL THE OTHER CODE IN CONNECTION WITH THE DELIVERABLES, INCLUDING (WITHOUT LIMITATION) ANY WARRANTIES OF SATISFACTORY QUALITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+NO THIRD PARTY LICENSORS OF OTHER CODE SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND WHETHER MADE UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE OTHER CODE OR THE EXERCISE OF ANY RIGHTS GRANTED UNDER EITHER OR BOTH THIS LICENCE AND THE LEGAL TERMS APPLICABLE TO ANY SEPARATE FILES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+
+8.  GOVERNMENT END USERS.
+
+US Government Restrictions: Use, duplication, reproduction, release, modification, disclosure or transfer of the Deliverables is restricted in accordance with the terms of this Licence.
+
+
+
+9.  TERM AND TERMINATION.
+
+This Licence shall remain in force until terminated by you or by ARM. Without prejudice to any of its other rights if you are in breach of any of the terms and conditions of this Licence then ARM may terminate this Licence immediately upon giving written notice to you. You may terminate this Licence at any time. Upon termination of this Licence by you or by ARM you shall stop using the Deliverables and confidential information and destroy all copies of the Deliverables and confidential information in your possession together with all documentation and related materials. Notwithstanding the foregoing, except where ARM has terminated this Licence for your breach, your rights to distribute the Example Code as part of Licensed Products developed prior to termination shall survive termination of this Licence, subject to the terms of this Licence. The provisions of Clauses 4, 6, 7, 8, 9 and 10 shall survive termination of this Licence.
+
+
+
+10.  GENERAL.
+
+This Licence is governed by English Law. Except where ARM agrees otherwise in; (i) a written contract signed by you and ARM; or (ii) a written contract provided by ARM and accepted by you, this is the only agreement between you and ARM relating to the Deliverables and it may only be modified by written agreement between you and ARM. This Licence may not be modified by purchase orders, advertising or other representation by any person. If any clause or sentence in this Licence is held by a court of law to be illegal or unenforceable the remaining provisions of this Licence shall not be affected thereby. The failure by ARM to enforce any of the provisions of this Licence, unless waived in writing, shall not constitute a waiver of ARM's rights to enforce such provision or any other provision of this Licence in the future.
+
+
+
+The Deliverables provided under this Licence are subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to comply fully with all laws and regulations of the United States and other countries ("Export Laws") to assure that the Deliverables, are not (1) exported, directly or indirectly, in violation of Export Laws, either to any countries that are subject to U.S.A. export restrictions or to any end user who has been prohibited from participating in the U.S.A. export transactions by any federal agency of the U.S.A. government; or (2) intended to be used for any purpose prohibited by Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation.
+
+
+
+To the extent that the provisions contained in this Licence conflict with any provisions of any other licence you have entered with ARM governing the Deliverables the provisions contained in this Licence shall prevail over and shall supersede any such conflicting provisions.
+
+
+
+SCHEDULE
+
+*Part A*
+
+*Hardware Binaries:*
+
+FPGA bitstream file for any or all of the Hardware Source identified below in this Part A
+
+
+
+*Software Binaries:*
+
+Motherboard configuration controller
+
+Daughterboard configuration controller
+
+Daughterboard Application note SelfTest
+
+SCP firmware
+
+Mali GPU Driver
+
+
+
+*Documentation:*
+
+Documentation, provided as PDF
+
+
+
+*Hardware Source:*
+
+Hardware netlists of the ARM CoreLink peripheral technology and components known as TLX-400, NIC-400, and PL330
+
+
+
+*Header Files:*
+
+Provided as part of and with the Mali GPU Driver
+
+
+
+*Part B*
+
+*Wrapper:*
+
+Application Note wrapper file provided as hardware source files and netlists.
+
+
+
+*Part C: Example Code*
+
+(i)            Platform specific libraries and source code.
+
+(ii)           ARM source code of Application note SelfTest.
+
+
+
+*Part D: Separate Files*
+
+
+
+A.     UEFI firmware, including drivers for third party components licensed to you under BSD 3-Clause.
+
+
+
+B.     Linux kernel licensed to you under the GNU General Public License version 2.0
+
+
+
+To the extent that ARM is obliged to do so, ARM hereby offers to supply the files which are subject to the GNU General Public Licence version 2 (identified above), in source code form, subject to the terms of the GNU General Public License version 2, upon request. This offer is valid for three (3) years from the date of your acceptance of this Licence.
+
+
+
+C.    ARM Trusted Firmware licensed to you under BSD 3-Clause.
+
+
+
+D.    ARM Gator Profile driver and daemon licensed to you under the GNU General Public License version 2.0
+
+
+
+To the extent that ARM is obliged to do so, ARM hereby offers to supply the files which are subject to the GNU General Public Licence version 2 (identified above), in source code form, subject to the terms of the GNU General Public License version 2, upon request. This offer is valid for three (3) years from the date of your acceptance of this Licence.
+
+
+
+/end
+
+
+
+ARM contract references: LES-PRE-20435 JUNO ARM DEVELOPMENT PLATFORM DELIVERABLES
diff --git a/android/lcr-member/images/lcr-member-juno/HOWTO_getsourceandbuild.txt b/android/lcr-member/images/lcr-member-juno/HOWTO_getsourceandbuild.txt
new file mode 100644
index 0000000..85497f8
--- /dev/null
+++ b/android/lcr-member/images/lcr-member-juno/HOWTO_getsourceandbuild.txt
@@ -0,0 +1,41 @@
+h2. License
+
+The use of Juno software is subject to the terms of the Juno "End User License Agreement":https://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno/armv8-android-juno-lsk/#tabs-4.
+
+h1. Accessing Source Code
+
+h2. Linaro Android Source Code
+
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+
+The pinned and source manifests can be found here:
+
+* "Pinned Manifest":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno//source-manifest.xml
+
+h2. Compiling Linaro Android RootFS+Kernel
+
+The following simple steps download, install and compile a complete Linaro Android distribution
+
+* Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
+* Accept the EULA and download the Mali graphics (vendor.tar.bz2) libraries from the list of artifacts listed above or "here":https://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno//vendor.tar.bz2
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno/linaro_android_build_cmds.sh
+
+* Run the script
+
+Build from the tip of the source:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -o $PWD/vendor.tar.bz2 -t 
+
+Or reproduce the exactly the same as this buid:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -o $PWD/vendor.tar.bz2 -m pinned-manifest.xml
+
+h3. Installing Android on your board
+
+bc. cd android/out/target/product/juno
+sudo linaro-android-media-create --mmc /dev/sdX --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
+
+Insert the USB drive into your board and reboot it.  You must configure UEFI each time you create a new disk image.
diff --git a/android/lcr-member/images/lcr-member-juno/HOWTO_install.txt b/android/lcr-member/images/lcr-member-juno/HOWTO_install.txt
new file mode 100644
index 0000000..c11eac5
--- /dev/null
+++ b/android/lcr-member/images/lcr-member-juno/HOWTO_install.txt
@@ -0,0 +1,35 @@
+h2. Get artifacts
+
+Click on each link to download:
+* boot.tar.bz2
+* system.tar.bz2
+* userdata.tar.bz2
+
+h2. Get linaro image tools
+
+Run these commands to get all the dependencies for linaro-image-tools and the tip of linaro-image-tools
+
+<pre>
+  $ sudo add-apt-repository ppa:linaro-maintainers/tools
+  $ sudo apt-get update
+  $ sudo apt-get install linaro-image-tools
+</pre>
+
+If you’re using a “tip” build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/ci/linaro-image-tools.git
+
+h2. Flash Linaro tarball images on USB drive
+Create mmc image:
+
+pre. $ linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+If you're using tip of linaro image tools
+
+pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+Flash the mmc.img to USB drive:
+
+pre. $ dd if=mmc.img of=/dev/sda(?) bs=4096 conv=notrunc,noerror
+
+h2. Configure Juno boot time UEFI configuration
+
+Stop at UEFI prompt and select the Shell item, it will boot up directly for you.
diff --git a/android/lcr-m/images/lcr-member-juno/HOWTO_releasenotes.txt b/android/lcr-member/images/lcr-member-juno/HOWTO_releasenotes.txt
index 6ed1ced..a487fae 100644
--- a/android/lcr-m/images/lcr-member-juno/HOWTO_releasenotes.txt
+++ b/android/lcr-member/images/lcr-member-juno/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
-h2. About the Linaro Confectionary Release for Juno (Multi-arch 64-bit)
+h2. About the Member Linaro Confectionary Release for Juno (Multi-arch 64-bit)
 
-The Linaro Confectionary Release is based on the Lollipop
-Android-5.1.1_r1 branch. The reference build is a userdebug variant
+This Member Linaro Confectionary Release is based on the Lollipop
+Android-5.1.1_r3 branch. The reference build is a userdebug variant
 build, which contains multi-arch support allowing full use of the
 64-bit ARMv8-A architecture, supports both 64-bit and 32-bit
 applications and has selinux enabled by default.
@@ -15,28 +15,23 @@ version 4.9-2015.04 for 64bit and 32bit. To disable SELinux pass
 "selinux=0" as the boot parameter in the UEFI bootargs configuration.
 
 The Android AOSP software provided in this release is functionally
-tested with CTS version 5.0 R2 and the CTS results are shared with
+tested with CTS version 5.1 R1 and the CTS results are shared with
 members.
 
 The BIONIC component is additionally validated with Android BIONIC
-tests.
-
-Android Monkey tests were run for stress testing. Multi-arch support
-has been validated using examples provided in Android NDK. We also
-added some benchmark test to observe the performance trend in various
-fields.
+tests. Multi-arch support has been validated using examples provided
+in Android NDK. We also added some benchmark test to observe the
+performance trend in various fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.04/android/armv8-android-juno-lsk/#tabs-3). 
+(see the "Building from Source tab":https://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-juno/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r1 version
-* Updated kernel
-* Benchmarked with multiple bionic and java tests on LAVA.
-* Switched toolchains to Linaro versions
-* Ported several Cortex strings optimizations to Bionic
-
+* Android source changed to based on the Lollipop Android-5.1.1_r3 version
+* Integrated many ART related optimizations and obtain obvious improvement
+* Changed to use libjpeg-turbo as the defaut system libjpeg.so library and obtain obvious improvement
+* Updated some external projects, including: sqlite, giflib, libpng, harfbuzz_ng, fio
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -50,12 +45,12 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":https://releases.linaro.org/15.04/android/armv8-android-juno-lsk/#tabs-3).
+"'Building from Source'":https://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-juno/#tabs-3).
 
 h2. License
 
 The use of Juno software is subject to the terms of the Juno
-"End User License Agreement":https://releases.linaro.org/15.04/android/armv8-android-juno-lsk//#tabs-4.
+"End User License Agreement":https://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-juno/#tabs-4.
 
 h2. Support
 
@@ -63,7 +58,7 @@ Subscribe to the important Linaro mailing lists and join our IRC
 channels to stay on top of Linaro development.
 * Linaro Android Development "'Mailing list'":http://lists.linaro.org/mailman/listinfo/linaro-android
 * Linaro Android IRC channel on irc.freenode.net at #linaro-android
-* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under linaro-android product and Linaro Confectionery Release component.
+* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under "Linaro Android" product and "Member Linaro Confectionery Release (M-LCR)" component.
 ** You will need to login to your Linaro account. If you do not have an account or are having problems, email its@linaro.org for help.
 * More general bug reports should be filed in Bugzilla against the individual packages that are affected.
 * Questions? "'ask linaro'":http://ask.linaro.org/
@@ -72,10 +67,10 @@ channels to stay on top of Linaro development.
 
 h2. Android Patch Summary
 
-The following list of patches developed by ARM and Linaro engineering
-teams were applied to get Android booting to UI on the ARMv8-A Juno
-development platform. These patches can be found on Linaro's Android
-Git repositories via file "LOLLIPOP-STABLE-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-STABLE-PATCHSET.
+There are patches developed by ARM and Linaro engineering teams were applied
+to get Android booting to UI on the ARMv8-A Juno development platform.
+These patches can be found on Linaro's Android Git repositories
+via file "LOLLIPOP-MLCR-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-MLCR-PATCHSET.
 Some of these patches have been submitted to AOSP and are being tracked
 for acceptance.
 
diff --git a/android/lcr-member/images/lcr-member-vexpress/HOWTO_getsourceandbuild.txt b/android/lcr-member/images/lcr-member-vexpress/HOWTO_getsourceandbuild.txt
new file mode 100644
index 0000000..d3e3b62
--- /dev/null
+++ b/android/lcr-member/images/lcr-member-vexpress/HOWTO_getsourceandbuild.txt
@@ -0,0 +1,39 @@
+h1. Accessing Source Code
+
+h2. Linaro Android Source Code
+
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-vexpress/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+
+The pinned and source manifests can be found here:
+
+* "Pinned Manifest":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-vexpress/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-vexpress//source-manifest.xml
+
+h2. Compiling Linaro Android RootFS+Kernel
+
+The following simple steps download, install and compile a complete Linaro Android distribution
+
+* Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-juno/linaro_android_build_cmds.sh
+
+* Run the script
+
+The linaro_android_build_cmds.sh script will download the source and create the build.:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -h  #To print the script usage
+
+
+
+Most commonly used build options:
+
+bc. $ linaro_android_build_cmds.sh -o $PWD/vendor.tar.bz2 -m pinned-manifest.xml
+$ linaro_android_build_cmds.sh -t #To build from the tip of the branch without overlay
+$ linaro_android_build_cmds.sh -t -o <overlay> #To build from the tip of the branch with provided overlay
+$ linaro_android_build_cmds.sh -m <pinned_manifest> -o <overlay> #To reproduce an exact build from pinned manifest
+$ linaro_android_build_cmds.sh -t -l <login-id> #Provide login/access ID to clone and build code from linaro-private repositories
+
+If the linaro_android_build_cmds.sh completely, you will find the boot.tar.bz2, system.tar.bz2 and userdata.tar.bz2 3 files
+under ./android/out/target/product/vexpress directory, please use these 3 file to bood your board.
+
+You can reference to the "Binary Image Installation"::http://releases.linaro.org/latest/android/lcr-member/images/lcr-member-vexpress#tabs-2 tab for detail instructions.
diff --git a/android/lcr-member/images/lcr-member-vexpress/HOWTO_install.txt b/android/lcr-member/images/lcr-member-vexpress/HOWTO_install.txt
new file mode 100644
index 0000000..731d356
--- /dev/null
+++ b/android/lcr-member/images/lcr-member-vexpress/HOWTO_install.txt
@@ -0,0 +1,126 @@
+h2. Get artifacts
+
+Click on each link to download:
+* boot.tar.bz2
+* system.tar.bz2
+* userdata.tar.bz2
+
+h2. Get linaro image tools
+
+Run these commands to get all the dependencies for linaro-image-tools and the tip of linaro-image-tools
+
+<pre>
+  $ sudo add-apt-repository ppa:linaro-maintainers/tools
+  $ sudo apt-get update
+  $ sudo apt-get install linaro-image-tools
+</pre>
+
+If you’re using a “tip” build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/ci/linaro-image-tools.git
+
+h2. Create media (SD card)
+Create mmc image:
+
+pre. $ linaro-android-media-create --mmc /dev/sdX --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+If you're using tip of linaro image tools
+
+pre. $ ./linaro-image-tools/linaro-android-media-create --mmc /dev/sdX --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+Remove the SD card from the device writer and plug it into the board.
+
+h2. Check console output
+
+Plug in an USB-to-serial converter and run minicom
+
+pre. $ minicom -D /dev/ttyUSB0 -w -C minicom.txt
+
+h2. Configure the boot time UEFI configuration
+
+Stop at UEFI prompt and configure the UEFI options like this:
+
+<pre>
+ARM Versatile Express Boot Monitor
+Version: V5.1.9
+Build Date: Dec 3 2012
+Daughterboard Site 1: V2P-CA15_A7 Cortex A7
+Daughterboard Site 2: Not Used
+Running boot script from flash - BOOTSCRIPT
+UEFI firmware (version built at 16:18:48 on May 26 2015)
+[=3h[=3h[=3h[=3h[=3h[=3h[=3h[=3hThe default boot selection will start in 10 seconds
+[1] Linaro image on SD card
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/uImage
+ - Initrd: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/uInitrd
+ - Arguments: console=ttyAMA0,38400n8 rootwait root=/dev/mmcblk0p2
+ - FDT: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca15-tc2.dtb
+ - LoaderType: Linux kernel with Local FDT
+-----------------------
+Global FDT Config
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca15-tc2.dtb
+-----------------------
+[a] Boot Manager
+[b] Shell
+[c] Reboot
+[d] Shutdown
+Start: a
+[1] Add Boot Device Entry
+[2] Update Boot Device Entry
+[3] Remove Boot Device Entry
+[4] Update FDT path
+[5] Return to main menu
+Choice: 3
+[1] Linaro image on SD card
+Delete entry: 1
+[1] Add Boot Device Entry
+[2] Update Boot Device Entry
+[3] Remove Boot Device Entry
+[4] Update FDT path
+[5] Return to main menu
+Choice: 1
+[1] boot (67 MB)
+[2] testboot (99 MB)
+[3] (6984 MB)
+[4] VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
+[5] VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
+[6] VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
+[7] VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
+[8] PXE on MAC Address: 00:02:F7:00:47:35
+[9] TFTP on MAC Address: 00:02:F7:00:47:35
+Select the Boot Device: 2
+File path of the EFI Application or the kernel: kernel
+Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [a/g/l] l
+Add an initrd: [y/n] y
+File path of the initrd: ramdisk.img
+Arguments to pass to the binary: console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0
+File path of the local FDT: v2p-ca15-tc2.dtb
+Description for this new Entry: LAVA Android Test Image
+[1] Add Boot Device Entry
+[2] Update Boot Device Entry
+[3] Remove Boot Device Entry
+[4] Update FDT path
+[5] Return to main menu
+Choice: 5
+[1] LAVA Android Test Image
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(3,MBR,0x00000000,0x200000,0x32000)/kernel
+ - Initrd: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(3,MBR,0x00000000,0x200000,0x32000)/ramdisk.img
+ - Arguments: console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0
+ - FDT: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(3,MBR,0x00000000,0x200000,0x32000)/v2p-ca15-tc2.dtb
+ - LoaderType: Linux kernel with Local FDT
+-----------------------
+Global FDT Config
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca15-tc2.dtb
+-----------------------
+ [a] Boot Manager
+ [b] Shell
+ [c] Reboot
+ [d] Shutdown
+Start: 1
+   PEI 3681 ms
+   DXE 17857 ms
+   BDS 15299 ms
+Total Time = 36837 ms
+
+[ 0.000000] Booting Linux on physical CPU 0x100
+[ 0.000000] Initializing cgroup subsys cpu
+[ 0.000000] Initializing cgroup subsys cpuacct
+[ 0.000000] Linux version 3.10.74-00126-g14cdcbf (buildslave@x86-64-07-android) (gcc version 4.9.3 20150413 (prerelease) (Linaro GCC Snapshot 4.9-2015.04) ) #1 SMP PREEMPT Tue May 26 16:04:17 CEST 2015
+</pre>
diff --git a/android/lcr-m/images/lcr-member-vexpress/HOWTO_releasenotes.txt b/android/lcr-member/images/lcr-member-vexpress/HOWTO_releasenotes.txt
index 7b207ec..61502ea 100644
--- a/android/lcr-m/images/lcr-member-vexpress/HOWTO_releasenotes.txt
+++ b/android/lcr-member/images/lcr-member-vexpress/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for Versatile Express (Aarch32)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r1 version. This reference build is a userdebug variant
+Android-5.1.1_r3 version. This reference build is a userdebug variant
 build, and it contains support allowing full use of the 32-bit ARMv7-A
 architecture and supports the 32-bit applications, with SELinux
 enabled by default.
@@ -11,19 +11,20 @@ built using Linaro GCC 4.9-2015.04. To disable SELinux pass "selinux=0"
 as the boot parameter in the UEFI bootargs configuration.
 
 The Android AOSP software provided in this release is functionally
-tested with CTS version 5.0 R2 and the CTS results are shared with
+tested with CTS version 5.1 R1 and the CTS results are shared with
 members. The BIONIC component is additionally validated with Android
-BIONIC tests. Android Monkey tests were run for stress testing. We also
-added some benchmark tests to observe the performance trend in various
-fields.
+BIONIC tests. We also added some benchmark tests to observe the
+performance trend in various fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":http://releases.linaro.org/15.04/android/vexpress-lcr#tabs-2). 
+(see the "Building from Source tab":http://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-vexpress#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the  Lollipop Android-5.1.1_r1 version
-* Toolchain switched to Linaro GCC 4.9-2015.04, Linaro Binutils 2.25.0-2015.01-2
+* Android source changed to based on the Lollipop Android-5.1.1_r3 version
+* Integrated many ART related optimizations and obtain obvious improvement
+* Changed to use libjpeg-turbo as the defaut system libjpeg.so library and obtain obvious improvement
+* Updated some external projects, including: sqlite, giflib, libpng, harfbuzz_ng, fio
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -37,7 +38,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":http://releases.linaro.org/15.04/android/vexpress-lcr#tabs-2).
+"'Building from Source'":http://releases.linaro.org/15.05/android/lcr-member/images/lcr-member-vexpress#tabs-3).
 
 h2. Support
 
@@ -45,7 +46,7 @@ Subscribe to the important Linaro mailing lists and join our IRC
 channels to stay on top of Linaro development.
 * Linaro Android Development "'Mailing list'":http://lists.linaro.org/mailman/listinfo/linaro-android
 * Linaro Android IRC channel on irc.freenode.net at #linaro-android
-* Landing Team bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under linaro-android product and Linaro Confectionery Release component.
+* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under "Linaro Android" product and "Member Linaro Confectionery Release (M-LCR)" component.
 ** You will need to login to your Linaro account. If you do not have an account or are having problems, email its@linaro.org for help.
 * More general bug reports should be filed in Bugzilla against the individual packages that are affected.
 * Questions? "'ask linaro'":http://ask.linaro.org/
@@ -54,10 +55,10 @@ channels to stay on top of Linaro development.
 
 h2. Android Patch Summary
 
-The following list of patches developed by ARM and Linaro engineering
-teams were applied to get Android booting to UI on the TC2 Aarch32
+There are patches developed by ARM and Linaro engineering
+teams applied to get Android booting to UI on the TC2 Aarch32
 development platform. These patches can be found on Linaro's Android
-Git repositories via file "LOLLIPOP-STABLE-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-STABLE-PATCHSET.
+Git repositories via file "LOLLIPOP-MLCR-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-MLCR-PATCHSET.
 Some of these patches have been submitted to AOSP and are being tracked
 for acceptance.
 
diff --git a/android/lcr-r/images/lcr-reference-fvp/HOWTO_getsourceandbuild.txt b/android/lcr-r/images/lcr-reference-fvp/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index d1026e6..0000000
--- a/android/lcr-r/images/lcr-reference-fvp/HOWTO_getsourceandbuild.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/
-
-h2. Prerequisites
-
-To clone the sources you must be able to ssh to git.linaro.org and be part of the big-little-switcher-private group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
-Install build dependencies on Ubuntu:
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown libxml2-utils xsltproc uboot-mkimage openjdk-7-jdk openjdk-7-jre vim-common python-parted python-yaml wget uuid-dev iasl
-</pre>
-
-You can also download linaro android build script(linaro_android_build_cmds.sh) from Downloads section at https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk to do a complete ARMv8 Android build for FVP models from scratch.
-
-h2. Get the source
-
-<pre>
-  $ curl "https://android.git.linaro.org/gitweb/tools/repo.git/blob_plain/refs/heads/stable:/repo" >repo
-  $ chmod +x repo
-  $ ./repo init -u git://android.git.linaro.org/platform/manifest.git -b armv8-linaro -m baseline_manifest.xml
-  $ ./repo sync # this may take some time
-</pre>
-
-h2. Build
-
-<pre>
-  $ export CPUS=`grep -c processor /proc/cpuinfo`
-  $ export TARGET_PRODUCT=vexpress
-  $ export TARGET_BUILD_VARIANT=userdebug
-  $ . build/envsetup.sh
-  $ make -j${CPUS} selinuxtarballs
-</pre>
-
-h2. Get linaro image tools
-
-Run these commands to get all the dependencies for linaro-image-tools
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-</pre>
-If you're using a "tip" build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/infrastructure/linaro-image-tools.git
-
-h2. Create binary for ARM FVP Base AEMv8 models
-
-Run linaro image tools
-
-pre. $ linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-h2. Extract the preboot files
-
-pre. tar -jxvf boot.tar.bz2
-
-h2. Setup the runtime environment
-
-<pre>
-  $ export ARMLMD_LICENSE_FILE="8224@localhost"
-  $ ssh -L 8224:localhost:8224 -L 18224:localhost:18224 -N $USER@flexlm.linaro.org
-</pre>
-
-h2. Running the models (verified on FVP Base model build 5502)
-
-<pre>
-  $ cd boot
-  $ /path/to/FVP_Base_AEMv8A-AEMv8A/models/Linux64_GCC-4.1/FVP_Base_AEMv8A-AEMv8A \
-        -C pctl.startup=0.0.0.0 \
-        -C bp.secure_memory=0 \
-        -C cluster0.NUM_CORES=1 \
-        -C cluster1.NUM_CORES=1 \
-        -C cache_state_modelled=0 \
-        -C bp.pl011_uart0.untimed_fifos=1 \
-        -C bp.secureflashloader.fname=bl1.bin \
-        -C bp.flashloader0.fname=fvp_fip.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
-</pre>
-
-h3. Console redirection
-
-To redirect the console open a terminal and run
-
-pre. telnet 127.0.0.1 5000
-
-h3. Set UEFI configuration, update kernel/ramdisk path and bootargs
-
-Stop the UEFI boot process and configure it for FVP models:
-
-<pre>
-$ telnet 127.0.0.1 -debug 5000 -e ^z
-Telnet escape character is 'b'.
-Telnet escape character is '^Z'.
-Trying 127.0.0.1...
-setsockopt (SO_DEBUG): Permission denied
-Connected to 127.0.0.1.
-Escape character is '^Z'.
-  7 seconds
-[1] Linaro disk image on virtio
-[2] Shell
-[3] Boot Manager
-Start: 2
-UEFI Interactive Shell v2.0
-EDK II
-UEFI v2.40 (ARM Fixed Virtual Platform EFI May 23 2014 12:13:52, 0x00000000)
-Mapping table
-      FS2: Alias(s):F8:
-          VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)
-      FS0: Alias(s):F3:
-          MemoryMapped(0xB,0x88000000,0x8827FFFF)
-      FS1: Alias(s):F4:
-          MemoryMapped(0xB,0xFEC16000,0xFEDF987F)
-      FS3: Alias(s):HD12b:;BLK5:
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(1,MBR,0x00000000,0x3F,0x41FC0)
-      FS4: Alias(s):HD12e2:;BLK10:
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(4,MBR,0x00000000,0x242000,0x1BE000)/HD(2,MBR,0x00000000,0x362020,0x9DFE0)
-     BLK3: Alias(s):
-          VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
-     BLK0: Alias(s):
-          VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
-     BLK1: Alias(s):
-          VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
-     BLK2: Alias(s):
-          VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
-     BLK4: Alias(s):
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)
-Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
-Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
-EFI stub: Booting Linux Kernel...
-[    0.000000] Initializing cgroup subsys cpu2E873E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
-[    0.000000] Initializing cgroup subsys cpuacct
-[    0.000000] Linux version 3.10.63-00561-g90aa783 (buildslave@x86-64-07-android) (gcc version 4.9 20140514 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 23 14:41:49 CET 2015
-</pre>
-
-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.
-
-h2. Run the Android SDK
-
-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.
-
-You can also run all of the standard Android SDK tools. Learn more at "http://developer.android.com/sdk/index.html":http://developer.android.com/sdk/index.html
diff --git a/android/lcr-r/images/lcr-reference-juno/HOWTO_eula.txt b/android/lcr-r/images/lcr-reference-juno/HOWTO_eula.txt
deleted file mode 100644
index e69de29..0000000
--- a/android/lcr-r/images/lcr-reference-juno/HOWTO_eula.txt
+++ /dev/null
diff --git a/android/lcr-r/images/lcr-reference-juno/HOWTO_getsourceandbuild.txt b/android/lcr-r/images/lcr-reference-juno/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index 21e533f..0000000
--- a/android/lcr-r/images/lcr-reference-juno/HOWTO_getsourceandbuild.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/
-
-h2. Prerequisites
-
-To clone the sources you must be able to ssh to git.linaro.org and be part of the big-little-switcher-private group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
-Install build dependencies on Ubuntu:
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown libxml2-utils xsltproc uboot-mkimage openjdk-7-jdk openjdk-7-jre vim-common python-parted python-yaml wget uuid-dev iasl
-</pre>
-
-You can also download linaro android build script(linaro_android_build_cmds.sh) from Downloads section at https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk to do a complete ARMv8 Android build from scratch.
-
-h2. Get the source
-
-<pre>
-  $ curl "https://android.git.linaro.org/gitweb/tools/repo.git/blob_plain/refs/heads/stable:/repo" >repo
-  $ chmod +x repo
-  $ ./repo init -u git://android.git.linaro.org/platform/manifest.git -b armv8-linaro -m baseline_manifest.xml
-  $ ./repo sync # this may take some time
-</pre>
-
-h2. Build
-
-<pre>
-  $ export CPUS=`grep -c processor /proc/cpuinfo`
-  $ export TARGET_PRODUCT=juno
-  $ export TARGET_BUILD_VARIANT=eng
-  $ . build/envsetup.sh
-  $ make -j${CPUS} boottarball systemtarball userdatatarball
-</pre>
-
-h2. Flash Linaro tarball images on USB drive
-
-Create MMC image first and dd it to the USB drive:
-
-Get linaro image tools. Run these commands to get all the dependencies for linaro-image-tools
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-</pre>
-If you're using a "tip" build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/infrastructure/linaro-image-tools.git
-
-Create mmc image:
-
-pre. $ linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-Flash the mmc.img to USB drive:
-
-pre. $ dd if=mmc.img of=/dev/sda(?) bs=4096 conv=notrunc,noerror
-
-h2. Configure Juno boot time UEFI configuration
-
-Stop at UEFI prompt and change few parameters shown below
-
-<pre>
-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>
-
-It should get your Juno board up and running.
diff --git a/android/lcr-r/images/lcr-reference-juno/HOWTO_install.txt b/android/lcr-r/images/lcr-reference-juno/HOWTO_install.txt
deleted file mode 100644
index 4bf0154..0000000
--- a/android/lcr-r/images/lcr-reference-juno/HOWTO_install.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-juno-lsk/
-
-h2. Prerequisites
-
-h3. Get artifacts
-
-To get the build artifacts you must be part of the linaro-android-restricted launchpad group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
-h3. Run the build
-
-You'll need the latest ARM FVP Base models and a license to use the models. Follow the instructions at https://collaborate.linaro.org/display/ITS/FlexLM+and+Fast+Models for the same.
-
-h2. Get artifacts
-
-Scroll down and click on 'Downloads'
-
-Click on each link to download:
-* boot.tar.bz2
-* system.tar.bz2
-* userdata.tar.bz2
-
-h2. Flash Linaro tarball images on USB drive
-
-Create MMC image first and dd it to the USB drive:
-
-Get linaro image tools. Run these commands to get all the dependencies for linaro-image-tools
-<pre>
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-</pre>
-If you're using a "tip" build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/infrastructure/linaro-image-tools.git
-
-Create mmc image:
-
-pre. $ linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-If you're using tip of linaro image tools
-
-pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
-
-Flash the mmc.img to USB drive:
-
-pre. $ dd if=mmc.img of=/dev/sda(?) bs=4096 conv=notrunc,noerror
-
-h2. Configure Juno boot time UEFI configuration
-
-Stop at UEFI prompt and select the Shell item, it will boot up directly for you.
diff --git a/android/lcr-r/images/lcr-reference-vexpress/HOWTO_getsourceandbuild.txt b/android/lcr-r/images/lcr-reference-vexpress/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index e69de29..0000000
--- a/android/lcr-r/images/lcr-reference-vexpress/HOWTO_getsourceandbuild.txt
+++ /dev/null
diff --git a/android/lcr-r/images/lcr-reference-vexpress/HOWTO_install.txt b/android/lcr-r/images/lcr-reference-vexpress/HOWTO_install.txt
deleted file mode 100644
index e69de29..0000000
--- a/android/lcr-r/images/lcr-reference-vexpress/HOWTO_install.txt
+++ /dev/null
diff --git a/android/lcr/images/lcr-reference-fvp/HOWTO_getsourceandbuild.txt b/android/lcr/images/lcr-reference-fvp/HOWTO_getsourceandbuild.txt
new file mode 100644
index 0000000..5cd1bbe
--- /dev/null
+++ b/android/lcr/images/lcr-reference-fvp/HOWTO_getsourceandbuild.txt
@@ -0,0 +1,147 @@
+h1. Accessing Source Code
+
+h2. Linaro Android Source Code
+
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-fvp/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+
+The pinned and source manifests can be found here:
+
+* "Pinned Manifest":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-fvp/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-fvp/source-manifest.xml
+
+h2. Compiling Linaro Android RootFS+Kernel
+
+The following simple steps download, install and compile a complete Linaro Android distribution
+
+* Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-fvp/linaro_android_build_cmds.sh
+
+* Run the script
+
+Build from the tip of the source:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -t 
+
+Or reproduce the exactly the same as this buid:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -m pinned-manifest.xml
+
+h2. Booting the android with fastmodels
+
+h3. create the image file
+
+pre. $ linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+h3. Extract the preboot files
+
+pre. tar -jxvf boot.tar.bz2
+
+h3. Setup the runtime environment
+
+<pre>
+  $ export ARMLMD_LICENSE_FILE="8224@localhost"
+  $ ssh -L 8224:localhost:8224 -L 18224:localhost:18224 -N $USER@flexlm.linaro.org &
+</pre>
+
+h3. Running the models (verified on FVP Base model build 6302)
+
+<pre>
+  $ cd boot/
+  $ /path/to/FVP_Base_AEMv8A-AEMv8A/models/Linux64_GCC-4.1/FVP_Base_AEMv8A-AEMv8A \
+        -C pctl.startup=0.0.0.0 \
+        -C bp.secure_memory=0 \
+        -C cluster0.NUM_CORES=1 \
+        -C cluster1.NUM_CORES=1 \
+        -C cache_state_modelled=0 \
+        -C bp.pl011_uart0.untimed_fifos=1 \
+        -C bp.secureflashloader.fname=bl1.bin \
+        -C bp.flashloader0.fname=fvp_fip.bin \
+        -C bp.virtioblockdevice.image_path=mmc.bin \
+        -C bp.hostbridge.userNetworking=true \
+        -C bp.hostbridge.userNetPorts="5555=5555" \
+        -C bp.smsc_91c111.enabled=1
+</pre>
+
+h3. Console redirection
+
+To redirect the console open a terminal and run
+
+pre. telnet 127.0.0.1 5000
+
+h3. Select UEFI configuration item, boot the build 
+
+Stop the UEFI prompt and select the Shell item, then it will boot up directly for you:
+
+<pre>
+01:45:07 liuyq: m-lcr-fvp$ telnet localhost 5000
+Trying ::1...
+Trying 127.0.0.1...
+Connected to localhost.
+Escape character is '^]'.
+Booting trusted firmware boot loader stage 1
+Built : 12:14:12, May 23 2014
+Booting trusted firmware boot loader stage 2
+BL2 Built : 12:14:15, May 23 2014
+Booting trusted firmware boot loader stage 3
+BL31 Built : 12:14:19, May 23 2014
+UEFI firmware (version  built at 12:13:11 on May 23 2014)
+
+[=3h [=3h [=3h [=3h [=3h [=3h
+The default boot selection will start in   1 seconds
+ERROR: Did not find Linux kernel.
+[1] Linaro disk image on virtio
+[2] Shell
+[3] Boot Manager
+Start: 2
+UEFI Interactive Shell v2.0
+EDK II
+UEFI v2.40 (ARM Fixed Virtual Platform EFI May 23 2014 12:13:52, 0x00000000)
+Mapping table
+      FS2: Alias(s):F8:
+          VenHw(C5B9C74A-6D72-4719-99AB-C59F199091EB)
+      FS0: Alias(s):F3:
+          MemoryMapped(0xB,0x88000000,0x8827FFFF)
+      FS1: Alias(s):F4:
+          MemoryMapped(0xB,0xFEC16000,0xFEDF987F)
+      FS3: Alias(s):HD12b:;BLK5:
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(1,MBR,0x00000000,0x3F,0x41FC0)
+      FS4: Alias(s):HD12e2:;BLK10:
+          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)/HD(4,MBR,0x00000000,0x242000,0x1BE000)/HD(2,MBR,0x00000000,0x362020,0x9DFE0)
+     BLK3: Alias(s):
+          VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
+     BLK0: Alias(s):
+          VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
+     BLK1: Alias(s):
+          VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
+     BLK2: Alias(s):
+          VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
+     BLK4: Alias(s):
+Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
+Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
+EFI stub: Booting Linux Kernel...4-B346-73DB42E873E5)/HD(2,MBR,0x00000000,0x42000,0x180000)
+[    0.000000] Initializing cgroup subsys cpu
+[    0.000000] Initializing cgroup subsys cpuacct3E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
+[    0.000000] Linux version 3.10.74 (buildslave@x86-64-07-android) (gcc version 4.9.3 20150413 (prerelease) (Linaro GCC Snapshot 4.9-2015.04) ) #1 SMP PREEMPT Mon May 25 11:45:33 CEST 20150000000,0x242000,0x1BE000)
+</pre>
+
+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.
+
+h2. Run the Android SDK
+
+h3. Attach ADB
+
+If you run the models with the configurations mentioned above at the "Running the models" section, by default you can connect to the adb connection like this:
+
+<pre>
+    adb connect 127.0.0.1
+</pre>
+
+ADB on FVP Base models are supported over network as well. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
+
+You can also run all of the standard Android SDK tools. Learn more at "http://developer.android.com/sdk/index.html":http://developer.android.com/sdk/index.html
+
+Please Note: The adb connection will be only available after the Home screen is displayed.
diff --git a/android/lcr-r/images/lcr-reference-fvp/HOWTO_install.txt b/android/lcr/images/lcr-reference-fvp/HOWTO_install.txt
index fb42913..6e02d75 100644
--- a/android/lcr-r/images/lcr-reference-fvp/HOWTO_install.txt
+++ b/android/lcr/images/lcr-reference-fvp/HOWTO_install.txt
@@ -1,19 +1,11 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-android-fvp-lsk/
-
 h2. Prerequisites
 
-h3. Get artifacts
-
-To get the build artifacts you must be part of the linaro-android-restricted launchpad group. Contact "Philip Colmer" <philip.colmer@linaro.org> for access requests.
-
 h3. Run the build
 
 You'll need the latest ARM FVP Base models and a license to use the models. Follow the instructions at https://collaborate.linaro.org/display/ITS/FlexLM+and+Fast+Models for the same.
 
 h2. Get artifacts
 
-Scroll down and click on 'Downloads'
-
 Click on each link to download:
 * boot.tar.bz2
 * system.tar.bz2
@@ -29,13 +21,7 @@ Run these commands to get all the dependencies for linaro-image-tools and the ti
   $ sudo apt-get install linaro-image-tools
 </pre>
 
-If you're using a released build (with a -release or from releases.linaro.org), skip this step.
-If you're using a "tip" build do not skip the step and do the following:
-
-<pre>
-  $ sudo apt-get install bzr
-  $ bzr branch lp:linaro-image-tools
-</pre>
+If you’re using a “tip” build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/ci/linaro-image-tools.git
 
 h2. Create binary for the ARM FVP Base AEMv8 models
 
@@ -58,7 +44,7 @@ h2. Setup the runtime environment
   $ ssh -L 8224:localhost:8224 -L 18224:localhost:18224 -N $USER@flexlm.linaro.org &
 </pre>
 
-h2. Running the models (verified on FVP Base model build 5502)
+h2. Running the models (verified on FVP Base model build 6302)
 
 <pre>
   $ cd boot/
@@ -71,7 +57,10 @@ h2. Running the models (verified on FVP Base model build 5502)
         -C bp.pl011_uart0.untimed_fifos=1 \
         -C bp.secureflashloader.fname=bl1.bin \
         -C bp.flashloader0.fname=fvp_fip.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
+        -C bp.virtioblockdevice.image_path=mmc.bin \
+        -C bp.hostbridge.userNetworking=true \
+        -C bp.hostbridge.userNetPorts="5555=5555" \
+        -C bp.smsc_91c111.enabled=1
 </pre>
 
 h3. Console redirection
@@ -80,19 +69,27 @@ To redirect the console open a terminal and run
 
 pre. telnet 127.0.0.1 5000
 
-h3. Set UEFI configuration, update kernel/ramdisk path and bootargs
+h3. Select UEFI configuration item, boot the build 
 
-Stop the UEFI boot process and configure it for FVP models:
+Stop the UEFI prompt and select the Shell item, then it will boot up directly for you:
 
 <pre>
-$ telnet 127.0.0.1 -debug 5000 -e ^z
-Telnet escape character is 'b'.
-Telnet escape character is '^Z'.
+01:45:07 liuyq: m-lcr-fvp$ telnet localhost 5000
+Trying ::1...
 Trying 127.0.0.1...
-setsockopt (SO_DEBUG): Permission denied
-Connected to 127.0.0.1.
-Escape character is '^Z'.
-  7 seconds
+Connected to localhost.
+Escape character is '^]'.
+Booting trusted firmware boot loader stage 1
+Built : 12:14:12, May 23 2014
+Booting trusted firmware boot loader stage 2
+BL2 Built : 12:14:15, May 23 2014
+Booting trusted firmware boot loader stage 3
+BL31 Built : 12:14:19, May 23 2014
+UEFI firmware (version  built at 12:13:11 on May 23 2014)
+
+[=3h [=3h [=3h [=3h [=3h [=3h
+The default boot selection will start in   1 seconds
+ERROR: Did not find Linux kernel.
 [1] Linaro disk image on virtio
 [2] Shell
 [3] Boot Manager
@@ -120,13 +117,12 @@ Mapping table
      BLK2: Alias(s):
           VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
      BLK4: Alias(s):
-          VenHw(FE61BB5F-1B67-4C24-B346-73DB42E873E5)
 Press ESC in 1 seconds to skip startup.nsh or any other key to continue.
 Shell> kernel dtb=fvp-base-gicv2-psci.dtb initrd=ramdisk.img console=ttyAMA0 amba-clcd.mode=VGA
-EFI stub: Booting Linux Kernel...
-[    0.000000] Initializing cgroup subsys cpu2E873E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
-[    0.000000] Initializing cgroup subsys cpuacct
-[    0.000000] Linux version 3.10.63-00561-g90aa783 (buildslave@x86-64-07-android) (gcc version 4.9 20140514 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jan 23 14:41:49 CET 2015
+EFI stub: Booting Linux Kernel...4-B346-73DB42E873E5)/HD(2,MBR,0x00000000,0x42000,0x180000)
+[    0.000000] Initializing cgroup subsys cpu
+[    0.000000] Initializing cgroup subsys cpuacct3E5)/HD(3,MBR,0x00000000,0x1C2000,0x80000)
+[    0.000000] Linux version 3.10.74 (buildslave@x86-64-07-android) (gcc version 4.9.3 20150413 (prerelease) (Linaro GCC Snapshot 4.9-2015.04) ) #1 SMP PREEMPT Mon May 25 11:45:33 CEST 20150000000,0x242000,0x1BE000)
 </pre>
 
 h3. Black screen
@@ -137,7 +133,14 @@ h2. Run the Android SDK
 
 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.
+If you run the models with the configurations mentioned above at the "Running the models" section, by default you can connect to the adb connection like this:
+
+<pre>
+    adb connect 127.0.0.1
+</pre>
+
+ADB on FVP Base models are supported over network as well. Follow the instructions here https://wiki.linaro.org/Internal/Projects/Juice/SetupNetworkingOnModelsUsingBridges to setup networking and use adb.
 
 You can also run all of the standard Android SDK tools. Learn more at "http://developer.android.com/sdk/index.html":http://developer.android.com/sdk/index.html
 
+Please Note: The adb connection will be only available after the Home screen is displayed.
diff --git a/android/lcr-r/images/lcr-reference-fvp/HOWTO_releasenotes.txt b/android/lcr/images/lcr-reference-fvp/HOWTO_releasenotes.txt
index 0b35561..a6e2fce 100644
--- a/android/lcr-r/images/lcr-reference-fvp/HOWTO_releasenotes.txt
+++ b/android/lcr/images/lcr-reference-fvp/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for FVP (Multi-arch 64-bit)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r1 version. The reference build is the userdebug variant
+Android-5.1.1_r3 version. The reference build is the userdebug variant
 build, it contains multi-arch support allowing full use of the 64-bit
 ARMv8-A architecture and supports both 64-bit and 32-bit applications,
 and has selinux enabled by default.
@@ -17,21 +17,18 @@ To disable SELinux pass "selinux=0" as the boot parameter in the UEFI
 bootargs configuration.
 
 The Android AOSP software provided in this release is functionally
-tested with CTS version 5.0r2 and the CTS results are shared with
+tested with CTS version 5.1r1 and the CTS results are shared with
 members.
 
 Additionally, the BIONIC component is validated with Android BIONIC
-tests. Android Monkey tests were run for stress testing. Multi-arch
-support has been validated using examples provided in Android NDK.
+tests. Multi-arch support has been validated using examples provided in Android NDK.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.04/android/armv8-android-fvp-lsk/#tabs-3). 
+(see the "Building from Source tab":https://releases.linaro.org/15.05/android/lcr/images/lcr-reference-fvp/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the  Lollipop Android-5.1.1_r1 version
-* Built with Linaro GCC and not AOSP GCC
-* Cortex strings optimizations ported to Bionic
+* Android source changed to based on the Lollipop Android-5.1.1_r3 version
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -45,7 +42,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"Building from Source":https://releases.linaro.org/15.04/android/armv8-android-fvp-lsk/#tabs-3).
+"Building from Source":https://releases.linaro.org/15.05/android/lcr/images/lcr-reference-fvp/#tabs-3).
 
 h2. Support
 
@@ -53,7 +50,7 @@ Subscribe to the important Linaro mailing lists and join our IRC
 channels to stay on top of Linaro development.
 * Linaro Android Development "'Mailing list'":http://lists.linaro.org/mailman/listinfo/linaro-android
 * Linaro Android IRC channel on irc.freenode.net at #linaro-android
-* Landing Team bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under linaro-android product and Linaro Confectionery Release component.
+* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under "Linaro Android" product and "Reference Linaro Confectionery Release (R-LCR)" component.
 ** You will need to login to your Linaro account. If you do not have an account or are having problems, email its@linaro.org for help.
 * More general bug reports should be filed in Bugzilla against the individual packages that are affected.
 * Questions? "'ask linaro'":http://ask.linaro.org/
@@ -62,10 +59,10 @@ channels to stay on top of Linaro development.
 
 h2. Android Patch Summary
 
-The following list of patches developed by ARM and Linaro engineering
-teams were applied to get Android booting to UI on the ARMv8-A Juno
-development platform. These patches can be found on Linaro's Android
-Git repositories via file "LOLLIPOP-STABLE-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-STABLE-PATCHSET.
+There are patches developed by ARM and Linaro engineering teams
+were applied to get Android booting to UI on the ARMv8-A fastmodels platform.
+These patches can be found on Linaro's Android
+Git repositories via file "LOLLIPOP-MLCR-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-MLCR-PATCHSET.
 Some of these patches have been submitted to AOSP and are being tracked
 for acceptance.
 
diff --git a/android/lcr/images/lcr-reference-juno/HOWTO_eula.txt b/android/lcr/images/lcr-reference-juno/HOWTO_eula.txt
new file mode 100644
index 0000000..d8e300e
--- /dev/null
+++ b/android/lcr/images/lcr-reference-juno/HOWTO_eula.txt
@@ -0,0 +1,267 @@
+THIS END USER LICENCE AGREEMENT ("LICENCE") IS A LEGAL AGREEMENT BETWEEN YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND ARM LIMITED ("ARM") FOR THE USE OF THE DELIVERABLES ACCOMPANYING THIS LICENCE. ARM IS ONLY WILLING TO LICENSE THE DELIVERABLES TO YOU ON CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS LICENCE. BY CLICKING "I AGREE" OR BY INSTALLING OR OTHERWISE USING OR COPYING THE DELIVERABLES YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL THE TERMS OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, ARM IS UNWILLING TO LICENSE THE DELIVERABLES TO YOU AND YOU MAY NOT INSTALL, USE OR COPY THE DELIVERABLES, BUT YOU SHOULD PROMPTLY RETURN THE DELIVERABLES TO YOUR SUPPLIER AND ASK FOR A REFUND OF ANY LICENCE FEE PAID.
+
+
+
+"Juno ARM Development Platform" means a hardware development board purchased directly from ARM or its authorised distributors.
+
+
+
+"Deliverables"; means any software, firmware, boardfiles, data and documentation accompanying this Licence, any printed, electronic or online documentation supplied with it, and any updates, patches and modifications ARM may make available to you under the terms of this Licence, in all cases relating to the supporting deliverables for the Juno ARM Development Platform.
+
+
+
+"Separate Files" means the separate files identified in Part D of the Schedule.
+
+
+
+1.  LICENCE GRANTS.
+
+(i) DELIVERABLES: ARM hereby grants to you, subject to the terms and conditions of this Licence, a non-exclusive, non-transferable licence solely for use on a Juno ARM Development Platform and only for the purposes of your internal development, testing and debugging of software applications that are designed to run solely on microprocessors manufactured under licence from ARM, to:
+
+
+
+(a)     use and copy the Deliverables identified in Part A of the Schedule;
+
+
+
+(b)     use, copy and modify the Deliverables identified in Part B and Part C of the Schedule;
+
+
+
+&#040;c)     distribute and sub-license to third parties the right to use, copy and modify the Deliverables identified in Part C(i) of the Schedule, or your derivatives thereof, as part of your own products ("Licensed Products") provided you comply with the terms of Clause 1(ii);
+
+
+
+(d)     permit either or both your customers and your authorised distributors to redistribute the Deliverables identified in Part C(i) of the Schedule, or your derivatives thereof, solely as part of Licensed Products developed by you or your permitted users (identified in clause 2 paragraph three below).
+
+
+
+Except as permitted by clause 1(i)(b) above, you shall not modify the Deliverables.  Except as permitted by clauses 1(i)&#040;c) and 1(i)(d) above, you shall not redistribute any of the Deliverables.
+
+
+
+(ii)  FURTHER CONDITIONS APPLICABLE TO REDISTRIBUTION AND SUB-LICENSING: If you choose to redistribute the Deliverables identified in Part C(i) of the Schedule ("Example Code") you agree: (a) to ensure that they are licensed for use only as part of Licensed Products and only on microprocessors manufactured or simulated under licence from ARM; (b) not to use ARM's or any of its licensors names, logos or trademarks to market the Licensed Products; &#040;c) to include valid copyright notices on the Licensed Products, and preserve any copyright notices which are included with, or in, the Example Code; (d) to comply with all the other terms of this Licence; and (e) to ensure that any further redistribution is limited to redistribution by either or both your customers and your authorised distributors only as part of Licensed Products developed by you or your permitted users and only for use on microprocessors manufactured or simulated under licence from ARM and  that your customers  and authorised distributors comply with the terms of this clause 1(ii).
+
+
+
+2.  RESTRICTIONS ON USE OF THE DELIVERABLES.
+
+COPYING: You shall not use or copy the Deliverables except as expressly authorised in this Licence. You may make one additional copy of the delivered Deliverables media or image for backup or archival purposes.
+
+PERMITTED USERS: The Deliverables shall be used only by your employees, or by your bona fide sub-contractors for whose acts and omissions you hereby agree to be responsible to ARM to the same extent as you are for any acts and omissions of your employees, and provided always that such sub-contractors; (i) work only onsite at your premises; (ii) comply with the terms of this Licence; (iii) are contractually obligated to use the Deliverables only for your benefit, and (iv) agree to assign all their work product and any rights they create therein in the supply of such work to you. Only the single individual, company or other legal entity to whom ARM is supplying this Licence may use the Deliverables. Except as provided in this clause, you shall not allow third parties (including but not limited to any subsidiary, parent or affiliated companies, or offsite contractors you may have) to use the Deliverables unless ARM specifically agrees otherwise with you on a case by case basis.
+
+
+
+NO REMOTE USE: The Deliverables shall only be used onsite at your premises and only for your benefit.
+
+MULTIPLE VERSIONS: The media on which the Deliverables resides may contain more than one version of the Deliverables, each of which is compatible with a different operating system (such as Microsoft Windows XP Professional and Red Hat Linux).
+
+
+
+ACADEMIC OR EDUCATIONAL USERS ONLY: If you or your employer or institution paid academic or educational pricing for the Deliverables, or the Deliverables are identified as an academic or educational version (together "Academic Software"), then notwithstanding anything else in this Licence, YOU AGREE TO USE THE ACADEMIC SOFTWARE ONLY FOR ACADEMIC, NON-COMMERCIAL PURPOSES, AND ARM DOES NOT GRANT YOU ANY RIGHTS TO DISTRIBUTE OR SUB-LICENSE ANY APPLICATIONS DEVELOPED USING THE ACADEMIC SOFTWARE UNDER THIS LICENCE.
+
+
+
+REVERSE ENGINEERING: Except to the extent that such activity is permitted by applicable law you shall not reverse engineer, decompile or disassemble any of the Deliverables. If the Deliverables were provided to you in Europe you shall not reverse engineer, decompile or disassemble any of the Deliverables for the purposes of error correction.
+
+
+
+BENCHMARKING: This licence does not prevent you from using the Deliverables for internal benchmarking purposes. However, you shall treat any and all benchmarking data, and any other results of your use or testing of the Deliverables which are indicative of performance, efficacy, reliability or quality, as confidential information and you shall not disclose such information to any third party without the express written permission of ARM.
+
+
+
+RESTRICTIONS ON TRANSFER OF LICENSED RIGHTS: The rights granted to you under this Licence may not be assigned, sublicensed or otherwise transferred by you to any third party without the prior written consent of ARM. An assignment shall be deemed to include, without limitation; (i) any transaction or series of transactions whereby a third party acquires, directly or indirectly, the power to control the management and policies of you, whether through the acquisition of voting securities, by contract or otherwise; or (ii) the sale of more than fifty percent (50%) of the your assets whether in a single transaction or series of transactions.  You shall not rent or lease the Deliverables. You shall not share the Deliverables with contractors (except as identified in the 'PERMITTED USERS' clause above) or other third parties.
+
+
+
+COPYRIGHT AND RESERVATION OF RIGHTS: The Deliverables are owned by ARM or its licensors and are protected by copyright and other intellectual property laws and international treaties. The Deliverables are licensed not sold. You acquire no rights to the Deliverables other than as expressly provided by this Licence. You shall not remove from the Deliverables any copyright notice or other notice and shall ensure that any such notice is reproduced in any copies of the whole or any part of the Deliverables made by you or your permitted users.
+
+
+
+3.  SUPPORT AND MAINTENANCE.
+
+If you purchased the Deliverables directly from ARM, and you are not receiving them as an update or upgrade or as Academic Software (defined in Clause 2), you are entitled to reasonable support and maintenance for the Deliverables for the period of one (1) year from the date of purchase. The support will be provided on any version of the Deliverables which, at the date of your support request, are either; (a) the current version made generally available by ARM; or (b) the previous version made generally available by ARM at some time during the previous ninety (90) days.
+
+
+
+Support will be provided by telephone, email or other written format designated by ARM, prioritised at ARM's discretion, and may not be used as a substitute for training or as additional resource for your programming projects.  Maintenance will be provided in the form of upgrades, updates and patch releases to the Deliverables as and when they are made generally available from ARM.
+
+
+
+ARM's obligation under this Clause 3 is limited to the provision of support and maintenance to you and ARM is under no obligation to provide any support and maintenance to any third parties under this Licence. If you purchase support and maintenance for additional years it will be provided pursuant to this Clause 3 and will be subject to the terms and conditions of this Licence.
+
+
+
+If; (i) you obtained the Deliverables from an ARM authorised reseller or other third party; (ii) Deliverables were provided free of charge or for evaluation; or (iii) it is Academic Software, you are not entitled to any support for the Deliverables from ARM, but ARM may, at its sole discretion provide limited support to you. The vendor of the Deliverables may or may not offer support to you for the Deliverables. Please refer to the Technical Support area of http://www.arm.com for contact details for ARM's support service and (if applicable) other authorised support channels.  ARM shall be under no obligation to provide support in respect of any modifications (where permitted) to the Deliverables.
+
+
+
+4.  CONFIDENTIALITY.
+
+You acknowledge that the Deliverables and any benchmarking data and related information mentioned in Clause 2 contains trade secrets and confidential material, and you agree to maintain all such information in confidence and apply security measures no less stringent than the measures which you apply to protect your own like information, but not less than a reasonable degree of care, to prevent their unauthorised disclosure and use. Subject to any restrictions imposed by applicable law, the period of confidentiality shall be indefinite. You agree that you shall not use any such information other than in normal use of the Deliverables under the licences granted in this Licence.
+
+
+
+Notwithstanding the foregoing you may disclose the Deliverables identified in Part C(i) of the Schedule to third parties solely in exercise of the licence rights contained in Clause 1(i)&#040;c) of this Licence.
+
+
+
+5.  LIMITED WARRANTIES.
+
+For the period of ninety (90) days from the date of receipt by you of the Deliverables, ARM warrants to you that (i) the media on which the Deliverables are provided shall be free from defects in materials and workmanship under normal use; and (ii) the Deliverables will perform substantially in accordance with the accompanying documentation (if any). ARM's total liability and your exclusive remedy for breach of these limited warranties shall be limited to ARM, at ARM's option; (a) replacing the defective Deliverables; or (b) using reasonable efforts to correct material, documented, reproducible defects in the Deliverables and delivering such corrected Deliverables to you. Any replacement Deliverables will be warranted for the remainder of the original warranty period or thirty (30) days, whichever is the longer.
+
+
+
+EXCEPT AS PROVIDED ABOVE, YOU AGREE THAT THE DELIVERABLES ARE LICENSED "AS IS", AND THAT ARM EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR OTHER TERMS, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON- INFRINGEMENT, SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION OF SOFTWARE APPLICATIONS, INCLUDING WITHOUT LIMITATION, APPLICATIONS DESIGNED OR INTENDED FOR MISSION CRITICAL APPLICATIONS, SUCH AS PACEMAKERS, WEAPONARY, AIRCRAFT NAVIGATION, FACTORY CONTROL SYSTEMS, ETC. SHOULD THE DELIVERABLES PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+
+
+6.  LIMITATION OF LIABILITY.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL ARM BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF PROFITS) ARISING OUT OF THE USE OR INABILITY TO USE THE DELIVERABLES WHETHER BASED ON A CLAIM UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, EVEN IF ARM WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ARM does not seek to limit or exclude liability for death or personal injury arising from ARM's negligence or ARM's fraud and because some jurisdictions do not permit the exclusion or limitation of liability for consequential or incidental damages the above limitation relating to liability for consequential damages may not apply to you.
+
+
+
+NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, THE MAXIMUM LIABILITY OF ARM TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST ARM IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE SUBJECT MATTER OF THIS LICENCE SHALL NOT EXCEED THE GREATER OF; (I) THE TOTAL OF SUMS PAID BY YOU TO ARM (IF ANY) FOR THIS LICENCE; AND (II) $10 USD.
+
+THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT.
+
+
+
+7.  THIRD PARTY RIGHTS.
+
+The Separate Files are delivered subject to and your use is governed by their own separate licence agreements. This Licence does not apply to such Separate Files and they are not included in the term "Deliverables" under this Licence. You agree to comply with all terms and conditions imposed on you in respect of such Separate Files including those identified in the Schedule ("Third Party Terms").
+
+
+
+ARM HEREBY DISCLAIMS ANY AND ALL WARRANTIES EXPRESS OR IMPLIED FROM ANY THIRD PARTIES REGARDING ANY SEPARATE FILES, ANY THIRD PARTY MATERIALS INCLUDED IN THE DELIVERABLES, ANY THIRD PARTY MATERIALS FROM WHICH THE DELIVERABLES ARE DERIVED (COLLECTIVELY "OTHER CODE"), AND THE USE OF ANY OR ALL THE OTHER CODE IN CONNECTION WITH THE DELIVERABLES, INCLUDING (WITHOUT LIMITATION) ANY WARRANTIES OF SATISFACTORY QUALITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+NO THIRD PARTY LICENSORS OF OTHER CODE SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND WHETHER MADE UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE OTHER CODE OR THE EXERCISE OF ANY RIGHTS GRANTED UNDER EITHER OR BOTH THIS LICENCE AND THE LEGAL TERMS APPLICABLE TO ANY SEPARATE FILES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+
+8.  GOVERNMENT END USERS.
+
+US Government Restrictions: Use, duplication, reproduction, release, modification, disclosure or transfer of the Deliverables is restricted in accordance with the terms of this Licence.
+
+
+
+9.  TERM AND TERMINATION.
+
+This Licence shall remain in force until terminated by you or by ARM. Without prejudice to any of its other rights if you are in breach of any of the terms and conditions of this Licence then ARM may terminate this Licence immediately upon giving written notice to you. You may terminate this Licence at any time. Upon termination of this Licence by you or by ARM you shall stop using the Deliverables and confidential information and destroy all copies of the Deliverables and confidential information in your possession together with all documentation and related materials. Notwithstanding the foregoing, except where ARM has terminated this Licence for your breach, your rights to distribute the Example Code as part of Licensed Products developed prior to termination shall survive termination of this Licence, subject to the terms of this Licence. The provisions of Clauses 4, 6, 7, 8, 9 and 10 shall survive termination of this Licence.
+
+
+
+10.  GENERAL.
+
+This Licence is governed by English Law. Except where ARM agrees otherwise in; (i) a written contract signed by you and ARM; or (ii) a written contract provided by ARM and accepted by you, this is the only agreement between you and ARM relating to the Deliverables and it may only be modified by written agreement between you and ARM. This Licence may not be modified by purchase orders, advertising or other representation by any person. If any clause or sentence in this Licence is held by a court of law to be illegal or unenforceable the remaining provisions of this Licence shall not be affected thereby. The failure by ARM to enforce any of the provisions of this Licence, unless waived in writing, shall not constitute a waiver of ARM's rights to enforce such provision or any other provision of this Licence in the future.
+
+
+
+The Deliverables provided under this Licence are subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to comply fully with all laws and regulations of the United States and other countries ("Export Laws") to assure that the Deliverables, are not (1) exported, directly or indirectly, in violation of Export Laws, either to any countries that are subject to U.S.A. export restrictions or to any end user who has been prohibited from participating in the U.S.A. export transactions by any federal agency of the U.S.A. government; or (2) intended to be used for any purpose prohibited by Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation.
+
+
+
+To the extent that the provisions contained in this Licence conflict with any provisions of any other licence you have entered with ARM governing the Deliverables the provisions contained in this Licence shall prevail over and shall supersede any such conflicting provisions.
+
+
+
+SCHEDULE
+
+*Part A*
+
+*Hardware Binaries:*
+
+FPGA bitstream file for any or all of the Hardware Source identified below in this Part A
+
+
+
+*Software Binaries:*
+
+Motherboard configuration controller
+
+Daughterboard configuration controller
+
+Daughterboard Application note SelfTest
+
+SCP firmware
+
+Mali GPU Driver
+
+
+
+*Documentation:*
+
+Documentation, provided as PDF
+
+
+
+*Hardware Source:*
+
+Hardware netlists of the ARM CoreLink peripheral technology and components known as TLX-400, NIC-400, and PL330
+
+
+
+*Header Files:*
+
+Provided as part of and with the Mali GPU Driver
+
+
+
+*Part B*
+
+*Wrapper:*
+
+Application Note wrapper file provided as hardware source files and netlists.
+
+
+
+*Part C: Example Code*
+
+(i)            Platform specific libraries and source code.
+
+(ii)           ARM source code of Application note SelfTest.
+
+
+
+*Part D: Separate Files*
+
+
+
+A.     UEFI firmware, including drivers for third party components licensed to you under BSD 3-Clause.
+
+
+
+B.     Linux kernel licensed to you under the GNU General Public License version 2.0
+
+
+
+To the extent that ARM is obliged to do so, ARM hereby offers to supply the files which are subject to the GNU General Public Licence version 2 (identified above), in source code form, subject to the terms of the GNU General Public License version 2, upon request. This offer is valid for three (3) years from the date of your acceptance of this Licence.
+
+
+
+C.    ARM Trusted Firmware licensed to you under BSD 3-Clause.
+
+
+
+D.    ARM Gator Profile driver and daemon licensed to you under the GNU General Public License version 2.0
+
+
+
+To the extent that ARM is obliged to do so, ARM hereby offers to supply the files which are subject to the GNU General Public Licence version 2 (identified above), in source code form, subject to the terms of the GNU General Public License version 2, upon request. This offer is valid for three (3) years from the date of your acceptance of this Licence.
+
+
+
+/end
+
+
+
+ARM contract references: LES-PRE-20435 JUNO ARM DEVELOPMENT PLATFORM DELIVERABLES
diff --git a/android/lcr/images/lcr-reference-juno/HOWTO_getsourceandbuild.txt b/android/lcr/images/lcr-reference-juno/HOWTO_getsourceandbuild.txt
new file mode 100644
index 0000000..a50ea3e
--- /dev/null
+++ b/android/lcr/images/lcr-reference-juno/HOWTO_getsourceandbuild.txt
@@ -0,0 +1,41 @@
+h2. License
+
+The use of Juno software is subject to the terms of the Juno "End User License Agreement":https://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno/armv8-android-juno-lsk/#tabs-4.
+
+h1. Accessing Source Code
+
+h2. Linaro Android Source Code
+
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+
+The pinned and source manifests can be found here:
+
+* "Pinned Manifest":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno//source-manifest.xml
+
+h2. Compiling Linaro Android RootFS+Kernel
+
+The following simple steps download, install and compile a complete Linaro Android distribution
+
+* Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
+* Accept the EULA and download the Mali graphics (vendor.tar.bz2) libraries from the list of artifacts listed above or "here":https://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno//vendor.tar.bz2
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno/linaro_android_build_cmds.sh
+
+* Run the script
+
+Build from the tip of the source:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -o $PWD/vendor.tar.bz2 -t 
+
+Or reproduce the exactly the same as this buid:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -o $PWD/vendor.tar.bz2 -m pinned-manifest.xml
+
+h3. Installing Android on your board
+
+bc. cd android/out/target/product/juno
+sudo linaro-android-media-create --mmc /dev/sdX --dev vexpress --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
+
+Insert the USB drive into your board and reboot it.  You must configure UEFI each time you create a new disk image.
diff --git a/android/lcr/images/lcr-reference-juno/HOWTO_install.txt b/android/lcr/images/lcr-reference-juno/HOWTO_install.txt
new file mode 100644
index 0000000..c11eac5
--- /dev/null
+++ b/android/lcr/images/lcr-reference-juno/HOWTO_install.txt
@@ -0,0 +1,35 @@
+h2. Get artifacts
+
+Click on each link to download:
+* boot.tar.bz2
+* system.tar.bz2
+* userdata.tar.bz2
+
+h2. Get linaro image tools
+
+Run these commands to get all the dependencies for linaro-image-tools and the tip of linaro-image-tools
+
+<pre>
+  $ sudo add-apt-repository ppa:linaro-maintainers/tools
+  $ sudo apt-get update
+  $ sudo apt-get install linaro-image-tools
+</pre>
+
+If you’re using a “tip” build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/ci/linaro-image-tools.git
+
+h2. Flash Linaro tarball images on USB drive
+Create mmc image:
+
+pre. $ linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+If you're using tip of linaro image tools
+
+pre. $ ./linaro-image-tools/linaro-android-media-create --image_file mmc.img --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+Flash the mmc.img to USB drive:
+
+pre. $ dd if=mmc.img of=/dev/sda(?) bs=4096 conv=notrunc,noerror
+
+h2. Configure Juno boot time UEFI configuration
+
+Stop at UEFI prompt and select the Shell item, it will boot up directly for you.
diff --git a/android/lcr-r/images/lcr-reference-juno/HOWTO_releasenotes.txt b/android/lcr/images/lcr-reference-juno/HOWTO_releasenotes.txt
index 6ed1ced..8516805 100644
--- a/android/lcr-r/images/lcr-reference-juno/HOWTO_releasenotes.txt
+++ b/android/lcr/images/lcr-reference-juno/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
-h2. About the Linaro Confectionary Release for Juno (Multi-arch 64-bit)
+h2. About the Member Linaro Confectionary Release for Juno (Multi-arch 64-bit)
 
-The Linaro Confectionary Release is based on the Lollipop
-Android-5.1.1_r1 branch. The reference build is a userdebug variant
+This Member Linaro Confectionary Release is based on the Lollipop
+Android-5.1.1_r3 branch. The reference build is a userdebug variant
 build, which contains multi-arch support allowing full use of the
 64-bit ARMv8-A architecture, supports both 64-bit and 32-bit
 applications and has selinux enabled by default.
@@ -15,28 +15,20 @@ version 4.9-2015.04 for 64bit and 32bit. To disable SELinux pass
 "selinux=0" as the boot parameter in the UEFI bootargs configuration.
 
 The Android AOSP software provided in this release is functionally
-tested with CTS version 5.0 R2 and the CTS results are shared with
+tested with CTS version 5.1 R1 and the CTS results are shared with
 members.
 
 The BIONIC component is additionally validated with Android BIONIC
-tests.
-
-Android Monkey tests were run for stress testing. Multi-arch support
-has been validated using examples provided in Android NDK. We also
-added some benchmark test to observe the performance trend in various
+tests. Multi-arch support has been validated using examples provided
+in Android NDK. We also added some benchmark test to observe the performance trend in various
 fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":https://releases.linaro.org/15.04/android/armv8-android-juno-lsk/#tabs-3). 
+(see the "Building from Source tab":https://releases.linaro.org/15.05/android/lcr/images/lcr-reference-juno/#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the Lollipop Android-5.1.1_r1 version
-* Updated kernel
-* Benchmarked with multiple bionic and java tests on LAVA.
-* Switched toolchains to Linaro versions
-* Ported several Cortex strings optimizations to Bionic
-
+* Android source changed to based on the Lollipop Android-5.1.1_r3 version
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -50,12 +42,12 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":https://releases.linaro.org/15.04/android/armv8-android-juno-lsk/#tabs-3).
+"'Building from Source'":https://releases.linaro.org/15.05/android/lcr/images/lcr-reference-juno/#tabs-3).
 
 h2. License
 
 The use of Juno software is subject to the terms of the Juno
-"End User License Agreement":https://releases.linaro.org/15.04/android/armv8-android-juno-lsk//#tabs-4.
+"End User License Agreement":https://releases.linaro.org/15.05/android/lcr/images/lcr-reference-juno/#tabs-4.
 
 h2. Support
 
@@ -63,7 +55,7 @@ Subscribe to the important Linaro mailing lists and join our IRC
 channels to stay on top of Linaro development.
 * Linaro Android Development "'Mailing list'":http://lists.linaro.org/mailman/listinfo/linaro-android
 * Linaro Android IRC channel on irc.freenode.net at #linaro-android
-* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under linaro-android product and Linaro Confectionery Release component.
+* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under "Linaro Android" product and "Reference Linaro Confectionery Release (R-LCR)" component.
 ** You will need to login to your Linaro account. If you do not have an account or are having problems, email its@linaro.org for help.
 * More general bug reports should be filed in Bugzilla against the individual packages that are affected.
 * Questions? "'ask linaro'":http://ask.linaro.org/
@@ -72,10 +64,10 @@ channels to stay on top of Linaro development.
 
 h2. Android Patch Summary
 
-The following list of patches developed by ARM and Linaro engineering
-teams were applied to get Android booting to UI on the ARMv8-A Juno
-development platform. These patches can be found on Linaro's Android
-Git repositories via file "LOLLIPOP-STABLE-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-STABLE-PATCHSET.
+There are patches developed by ARM and Linaro engineering teams were applied
+to get Android booting to UI on the ARMv8-A Juno development platform.
+These patches can be found on Linaro's Android Git repositories
+via file "LOLLIPOP-MLCR-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-MLCR-PATCHSET.
 Some of these patches have been submitted to AOSP and are being tracked
 for acceptance.
 
diff --git a/android/lcr/images/lcr-reference-vexpress/HOWTO_getsourceandbuild.txt b/android/lcr/images/lcr-reference-vexpress/HOWTO_getsourceandbuild.txt
new file mode 100644
index 0000000..5c3351e
--- /dev/null
+++ b/android/lcr/images/lcr-reference-vexpress/HOWTO_getsourceandbuild.txt
@@ -0,0 +1,39 @@
+h1. Accessing Source Code
+
+h2. Linaro Android Source Code
+
+Run the "linaro_android_build_cmds.sh":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-vexpress/linaro_android_build_cmds.sh script, it will download the entire source code for both Android and the kernel and attempt to build it.
+
+The pinned and source manifests can be found here:
+
+* "Pinned Manifest":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-vexpress/pinned-manifest.xml ("?":https://wiki.linaro.org/Platform/Android/ReproduceABuildExactly)
+* "Source Manifest":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-vexpress//source-manifest.xml
+
+h2. Compiling Linaro Android RootFS+Kernel
+
+The following simple steps download, install and compile a complete Linaro Android distribution
+
+* Download and install Ubuntu 14.04 64 bit or newer ("download":http://www.ubuntu.com)
+* Download the Android building script for this build from the list of artifacts listed above or "here":http://releases.linaro.org/latest/android/lcr/images/lcr-reference-juno/linaro_android_build_cmds.sh
+
+* Run the script
+
+The linaro_android_build_cmds.sh script will download the source and create the build.:
+
+bc. chmod a+x linaro_android_build_cmds.sh
+./linaro_android_build_cmds.sh -h  #To print the script usage
+
+
+
+Most commonly used build options:
+
+bc. $ linaro_android_build_cmds.sh -o $PWD/vendor.tar.bz2 -m pinned-manifest.xml
+$ linaro_android_build_cmds.sh -t #To build from the tip of the branch without overlay
+$ linaro_android_build_cmds.sh -t -o <overlay> #To build from the tip of the branch with provided overlay
+$ linaro_android_build_cmds.sh -m <pinned_manifest> -o <overlay> #To reproduce an exact build from pinned manifest
+$ linaro_android_build_cmds.sh -t -l <login-id> #Provide login/access ID to clone and build code from linaro-private repositories
+
+If the linaro_android_build_cmds.sh completely, you will find the boot.tar.bz2, system.tar.bz2 and userdata.tar.bz2 3 files
+under ./android/out/target/product/vexpress directory, please use these 3 file to bood your board.
+
+You can reference to the "Binary Image Installation"::http://releases.linaro.org/latest/android/lcr/images/lcr-reference-vexpress#tabs-2 tab for detail instructions.
diff --git a/android/lcr/images/lcr-reference-vexpress/HOWTO_install.txt b/android/lcr/images/lcr-reference-vexpress/HOWTO_install.txt
new file mode 100644
index 0000000..731d356
--- /dev/null
+++ b/android/lcr/images/lcr-reference-vexpress/HOWTO_install.txt
@@ -0,0 +1,126 @@
+h2. Get artifacts
+
+Click on each link to download:
+* boot.tar.bz2
+* system.tar.bz2
+* userdata.tar.bz2
+
+h2. Get linaro image tools
+
+Run these commands to get all the dependencies for linaro-image-tools and the tip of linaro-image-tools
+
+<pre>
+  $ sudo add-apt-repository ppa:linaro-maintainers/tools
+  $ sudo apt-get update
+  $ sudo apt-get install linaro-image-tools
+</pre>
+
+If you’re using a “tip” build then we suggest you use the tip of linaro-image-tools from http://git.linaro.org/ci/linaro-image-tools.git
+
+h2. Create media (SD card)
+Create mmc image:
+
+pre. $ linaro-android-media-create --mmc /dev/sdX --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+If you're using tip of linaro image tools
+
+pre. $ ./linaro-image-tools/linaro-android-media-create --mmc /dev/sdX --image_size 2000M --dev vexpress --system system.tar.bz2 --userdata userdata.tar.bz2 --boot boot.tar.bz2
+
+Remove the SD card from the device writer and plug it into the board.
+
+h2. Check console output
+
+Plug in an USB-to-serial converter and run minicom
+
+pre. $ minicom -D /dev/ttyUSB0 -w -C minicom.txt
+
+h2. Configure the boot time UEFI configuration
+
+Stop at UEFI prompt and configure the UEFI options like this:
+
+<pre>
+ARM Versatile Express Boot Monitor
+Version: V5.1.9
+Build Date: Dec 3 2012
+Daughterboard Site 1: V2P-CA15_A7 Cortex A7
+Daughterboard Site 2: Not Used
+Running boot script from flash - BOOTSCRIPT
+UEFI firmware (version built at 16:18:48 on May 26 2015)
+[=3h[=3h[=3h[=3h[=3h[=3h[=3h[=3hThe default boot selection will start in 10 seconds
+[1] Linaro image on SD card
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/uImage
+ - Initrd: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/uInitrd
+ - Arguments: console=ttyAMA0,38400n8 rootwait root=/dev/mmcblk0p2
+ - FDT: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca15-tc2.dtb
+ - LoaderType: Linux kernel with Local FDT
+-----------------------
+Global FDT Config
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca15-tc2.dtb
+-----------------------
+[a] Boot Manager
+[b] Shell
+[c] Reboot
+[d] Shutdown
+Start: a
+[1] Add Boot Device Entry
+[2] Update Boot Device Entry
+[3] Remove Boot Device Entry
+[4] Update FDT path
+[5] Return to main menu
+Choice: 3
+[1] Linaro image on SD card
+Delete entry: 1
+[1] Add Boot Device Entry
+[2] Update Boot Device Entry
+[3] Remove Boot Device Entry
+[4] Update FDT path
+[5] Return to main menu
+Choice: 1
+[1] boot (67 MB)
+[2] testboot (99 MB)
+[3] (6984 MB)
+[4] VenHw(E7223039-5836-41E1-B542-D7EC736C5E59)
+[5] VenHw(02118005-9DA7-443A-92D5-781F022AEDBB)
+[6] VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)
+[7] VenHw(CC2CBF29-1498-4CDD-8171-F8B6B41D0909)
+[8] PXE on MAC Address: 00:02:F7:00:47:35
+[9] TFTP on MAC Address: 00:02:F7:00:47:35
+Select the Boot Device: 2
+File path of the EFI Application or the kernel: kernel
+Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [a/g/l] l
+Add an initrd: [y/n] y
+File path of the initrd: ramdisk.img
+Arguments to pass to the binary: console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0
+File path of the local FDT: v2p-ca15-tc2.dtb
+Description for this new Entry: LAVA Android Test Image
+[1] Add Boot Device Entry
+[2] Update Boot Device Entry
+[3] Remove Boot Device Entry
+[4] Update FDT path
+[5] Return to main menu
+Choice: 5
+[1] LAVA Android Test Image
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(3,MBR,0x00000000,0x200000,0x32000)/kernel
+ - Initrd: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(3,MBR,0x00000000,0x200000,0x32000)/ramdisk.img
+ - Arguments: console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0
+ - FDT: VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(3,MBR,0x00000000,0x200000,0x32000)/v2p-ca15-tc2.dtb
+ - LoaderType: Linux kernel with Local FDT
+-----------------------
+Global FDT Config
+ - VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/v2p-ca15-tc2.dtb
+-----------------------
+ [a] Boot Manager
+ [b] Shell
+ [c] Reboot
+ [d] Shutdown
+Start: 1
+   PEI 3681 ms
+   DXE 17857 ms
+   BDS 15299 ms
+Total Time = 36837 ms
+
+[ 0.000000] Booting Linux on physical CPU 0x100
+[ 0.000000] Initializing cgroup subsys cpu
+[ 0.000000] Initializing cgroup subsys cpuacct
+[ 0.000000] Linux version 3.10.74-00126-g14cdcbf (buildslave@x86-64-07-android) (gcc version 4.9.3 20150413 (prerelease) (Linaro GCC Snapshot 4.9-2015.04) ) #1 SMP PREEMPT Tue May 26 16:04:17 CEST 2015
+</pre>
diff --git a/android/lcr-r/images/lcr-reference-vexpress/HOWTO_releasenotes.txt b/android/lcr/images/lcr-reference-vexpress/HOWTO_releasenotes.txt
index 7b207ec..a51d553 100644
--- a/android/lcr-r/images/lcr-reference-vexpress/HOWTO_releasenotes.txt
+++ b/android/lcr/images/lcr-reference-vexpress/HOWTO_releasenotes.txt
@@ -1,7 +1,7 @@
 h2. About the Linaro Confectionary Release for Versatile Express (Aarch32)
 
 The Linaro Confectionary release is based on the AOSP Lollipop
-Android-5.1.1_r1 version. This reference build is a userdebug variant
+Android-5.1.1_r3 version. This reference build is a userdebug variant
 build, and it contains support allowing full use of the 32-bit ARMv7-A
 architecture and supports the 32-bit applications, with SELinux
 enabled by default.
@@ -11,19 +11,17 @@ built using Linaro GCC 4.9-2015.04. To disable SELinux pass "selinux=0"
 as the boot parameter in the UEFI bootargs configuration.
 
 The Android AOSP software provided in this release is functionally
-tested with CTS version 5.0 R2 and the CTS results are shared with
+tested with CTS version 5.1 R1 and the CTS results are shared with
 members. The BIONIC component is additionally validated with Android
-BIONIC tests. Android Monkey tests were run for stress testing. We also
-added some benchmark tests to observe the performance trend in various
-fields.
+BIONIC tests. We also added some benchmark tests to observe the performance
+trend in various fields.
 
 Sources are also made available so you can build your own images
-(see the "Building from Source tab":http://releases.linaro.org/15.04/android/vexpress-lcr#tabs-2). 
+(see the "Building from Source tab":http://releases.linaro.org/15.05/android/lcr/images/lcr-reference-vexpress#tabs-3).
 
 h3. What is new
 
-* Android source changed to based on the  Lollipop Android-5.1.1_r1 version
-* Toolchain switched to Linaro GCC 4.9-2015.04, Linaro Binutils 2.25.0-2015.01-2
+* Android source changed to based on the Lollipop Android-5.1.1_r3 version
 
 h2. About the Android flavour of Linaro Stable Kernel (LSK)
 
@@ -37,7 +35,7 @@ commonly desired features, provided they meet the quality requirements,
 and also any bug fixes.
 
 Sources are also made available so you can build your own images (see
-"'Building from Source'":http://releases.linaro.org/15.04/android/vexpress-lcr#tabs-2).
+"'Building from Source'":http://releases.linaro.org/15.05/android/lcr/images/lcr-reference-vexpress#tabs-3).
 
 h2. Support
 
@@ -45,7 +43,7 @@ Subscribe to the important Linaro mailing lists and join our IRC
 channels to stay on top of Linaro development.
 * Linaro Android Development "'Mailing list'":http://lists.linaro.org/mailman/listinfo/linaro-android
 * Linaro Android IRC channel on irc.freenode.net at #linaro-android
-* Landing Team bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under linaro-android product and Linaro Confectionery Release component.
+* Bug reports should be filed in "'Bugzilla'":http://bugs.linaro.org under "Linaro Android" product and "Reference Linaro Confectionery Release (R-LCR)" component.
 ** You will need to login to your Linaro account. If you do not have an account or are having problems, email its@linaro.org for help.
 * More general bug reports should be filed in Bugzilla against the individual packages that are affected.
 * Questions? "'ask linaro'":http://ask.linaro.org/
@@ -54,10 +52,10 @@ channels to stay on top of Linaro development.
 
 h2. Android Patch Summary
 
-The following list of patches developed by ARM and Linaro engineering
-teams were applied to get Android booting to UI on the TC2 Aarch32
+There are patches developed by ARM and Linaro engineering
+teams applied to get Android booting to UI on the TC2 Aarch32
 development platform. These patches can be found on Linaro's Android
-Git repositories via file "LOLLIPOP-STABLE-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-STABLE-PATCHSET.
+Git repositories via file "LOLLIPOP-MLCR-PATCHSET":https://android.git.linaro.org/gitweb/android-patchsets.git/blob_plain/HEAD:/LOLLIPOP-MLCR-PATCHSET.
 Some of these patches have been submitted to AOSP and are being tracked
 for acceptance.