Juno device config cleanup

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

12 files changed, 39 insertions, 597 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a8af397..cebdfbc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,57 +1,51 @@
-TARGET_BOARD_PLATFORM := juno
-TARGET_NO_BOOTLOADER := true # We use our own methods for building bootloaders
-TARGET_NO_KERNEL := false
-TARGET_NO_RECOVERY := true
-
-TARGET_USE_XLOADER := false
-TARGET_USE_UBOOT := false
-
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
-
-TARGET_HARDWARE_3D := false
-
+# Primary Arch
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_VARIANT := generic
 TARGET_CPU_ABI := arm64-v8a
 
-ifeq ($(strip $(BUILD_2ND_ARCH)),true)
+# Secondary Arch
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
+
+TARGET_USES_64_BIT_BINDER := true
 TARGET_SUPPORTS_32_BIT_APPS := true
-2ND_TARGET_TOOLCHAIN_ROOT ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro
-2ND_TARGET_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro/bin/arm-linux-androideabi-
-else
 TARGET_SUPPORTS_64_BIT_APPS := true
-endif
-
-APP_PROCESS_LINK ?= 1
-
-TARGET_SHELL := ash
-
-BOARD_USES_GENERIC_AUDIO := true
-USE_CAMERA_STUB := true
-
-WITH_DEXPREOPT ?= true
-
-FORCE_BUILD_LLVM_COMPONENTS := true
 
+TARGET_BOARD_PLATFORM := juno
 ANDROID_64=true
+WITH_DEXPREOPT ?= true
 
-TARGET_JUNO := true
+# Toolchain Prefix
+# 64bit toolchain
+KERNEL_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
 TARGET_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
+# 32bit toolchain
+2ND_TARGET_TOOLCHAIN_ROOT ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro
+2ND_TARGET_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro/bin/arm-linux-androideabi-
 
-KERNEL_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
+# Kernel Config
 KERNEL_CONFIG ?= linaro/configs/linaro-base.conf \
                  linaro/configs/android.conf \
                  linaro/configs/big-LITTLE-MP.conf \
                  linaro/configs/vexpress64.conf
-TARGET_KERNEL_SOURCE ?= kernel/linaro/juno
+# Kernel Source and Device Tree
+TARGET_KERNEL_SOURCE ?= kernel/linaro/armv8
 DEVICE_TREES := juno:juno.dtb
 BUILD_KERNEL_MODULES ?= true
 
-TARGET_USES_64_BIT_BINDER := true
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_KERNEL := false
+TARGET_NO_RECOVERY := true
+TARGET_USE_XLOADER := false
+TARGET_USE_UBOOT := false
+TARGET_HARDWARE_3D := false
+TARGET_SHELL := ash
+BOARD_USES_GENERIC_AUDIO := true
+USE_CAMERA_STUB := true
+FORCE_BUILD_LLVM_COMPONENTS := true
+TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
diff --git a/OpenGLwallpapers b/OpenGLwallpapers
deleted file mode 100644
index 7a68b11..0000000
--- a/OpenGLwallpapers
+++ /dev/null
@@ -1 +0,0 @@
-disabled
diff --git a/device.mk b/device.mk
index fbd60dc..def3996 100644
--- a/device.mk
+++ b/device.mk
@@ -19,23 +19,22 @@ $(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk)
 $(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)
 
 # Use our own init.rc
-# #
 TARGET_PROVIDES_INIT_RC := true
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
 			$(LOCAL_PATH)/fstab.juno:root/fstab.juno \
 			$(LOCAL_PATH)/init.rc:root/init.rc \
 			$(LOCAL_PATH)/init.juno.rc:root/init.juno.rc \
-			$(LOCAL_PATH)/juno.kl:system/usr/keylayout/juno.kl \
-                        $(LOCAL_PATH)/OpenGLwallpapers:system/etc/graphics/OpenGLwallpapers)
+			$(LOCAL_PATH)/juno.kl:system/usr/keylayout/juno.kl)
 
 # Copy preboot binaries
+PRE_BOOT_FILES := bl1.bin bl2.bin bl31.bin fip.bin
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
                         $(LOCAL_PATH)/preboot/bl1.bin:boot/bl1.bin \
                         $(LOCAL_PATH)/preboot/bl2.bin:boot/bl2.bin \
                         $(LOCAL_PATH)/preboot/bl31.bin:boot/bl31.bin \
                         $(LOCAL_PATH)/preboot/fip.bin:boot/fip.bin)
-PRE_BOOT_FILES := bl1.bin bl2.bin bl31.bin fip.bin
 
+# Set custom settings
 DEVICE_PACKAGE_OVERLAYS := device/linaro/juno/overlay
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -44,25 +43,29 @@ PRODUCT_PROPERTY_OVERRIDES += \
                             ro.nohardwaregfx=true \
                             ro.hardware=juno
 
+# Juno does s/w rendering
 PRODUCT_PACKAGES += libGLES_android
 
-#include application and binaries necessary for test
-include device/linaro/common/extra-and-tests.mk
-
-PRODUCT_RUNTIMES := runtime_libdvm_default runtime_libart
+# Build and run only ART
+PRODUCT_RUNTIMES := runtime_libart_default
 
 # Needed to sync the system clock with the RTC clock
 PRODUCT_PACKAGES += hwclock
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32
-PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.zygote64_32.rc:root/init.zygote64_32.rc
+PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc
 
+# Copy hardware config file(s)
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
                         device/linaro/common/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \
                         device/linaro/common/disablesuspend.sh:system/bin/disablesuspend.sh \
                         frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
                         frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml)
 
+# Include application and binaries needed for test
+$(call inherit-product-if-exists, device/linaro/common/extra-and-tests.mk)
+
+####### Copy build and install howtos for this build ########
 define copy-howto
 ifneq ($(wildcard $(TOP)/device/linaro/juno/howto/$(LINARO_BUILD_SPEC)/$1),)
 PRODUCT_COPY_FILES += \
diff --git a/howto/armv8-linaro/HOWTO_getsourceandbuild.txt b/howto/armv8-linaro/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index e04cfb8..0000000
--- a/howto/armv8-linaro/HOWTO_getsourceandbuild.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-linaro/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-linaro/
-
-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-linaro to do a complete ARMv8 Android build from scratch.
-
-h2. Get the source
-
-<pre>
-  $ curl "http://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" > repo
-  $ chmod +x repo
-  $ ./repo init -u ssh://$USER@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/android/manifest.git -b armv8-linaro -m baseline_manifest.xml
-  $ sed -i "s/linaro-big-little-switcher-bot/$USER/" .repo/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_SIMULATOR=false
-  $ export TARGET_BUILD_VARIANT=eng
-  $ export ANDROID_ENABLE_RENDERSCRIPT=false
-  $ export WITH_DEXPREOPT=true
-  $ export GCC49_AAC_HACK=1
-  $ export KERNEL_TOOLS_PREFIX=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
-  $ export TARGET_TOOLS_PREFIX=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
-  $ export BUILD_FS_IMAGE=1
-  $ export ANDROID_64=true
-  $ export BIONIC_TESTS=1
-  $ . build/envsetup.sh
-  $ make -j${CPUS} boottarball systemtarball userdatatarball
-</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 juno --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 juno --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
-
-<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=uefi_fvp-base.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
-</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 10 minutes. Subsequent boots should take approximately half the time to boot.
-
-h2. Console redirection
-
-To redirect the console open a terminal and run
-
-pre. telnet 127.0.0.1 5000
-
-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/howto/armv8-linaro/HOWTO_install.txt b/howto/armv8-linaro/HOWTO_install.txt
deleted file mode 100644
index d6ff6eb..0000000
--- a/howto/armv8-linaro/HOWTO_install.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-linaro/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-linaro/
-
-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. 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 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>
-
-h2. Create binary for the ARM FVP Base AEMv8 models
-
-Run linaro image tools
-
-pre. $ linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev juno --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 juno --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
-
-<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=uefi_fvp-base.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
-</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 10 minutes. Subsequent boots should take approximately half the time to boot.
-
-h2. Console redirection
-
-To redirect the console open a terminal and run
-
-pre. telnet 127.0.0.1 5000
-
-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/howto/armv8-linaro/HOWTO_prebuilt.txt b/howto/armv8-linaro/HOWTO_prebuilt.txt
deleted file mode 100644
index f699a3e..0000000
--- a/howto/armv8-linaro/HOWTO_prebuilt.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Instructions for https://android-build.linaro.org/builds/~linaro-android/<BUILD_NAME>/
-
-= Get artifacts =
-
-  Scroll down to the 'Downloads' section
-
-  Click on each link to download:
-    boot.tar.bz2
-    system.tar.bz2
-    userdata.tar.bz2
-
-= Get linaro image tools =
-
-  Run these commands to get all the dependencies for linaro-image-tools and the tip of linaro-image-tools
-
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-
-  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:
-
-  $ sudo apt-get install bzr
-  $ bzr branch lp:linaro-image-tools
-
-= Create media (SD card) =
-
-  Disable automount (instructions provided for Gnome)
-
-  $ TMP1=$(dconf read /org/gnome/desktop/media-handling/automount)
-  $ TMP2=$(dconf read /org/gnome/desktop/media-handling/automount-open)
-  $ dconf write /org/gnome/desktop/media-handling/automount false
-  $ dconf write /org/gnome/desktop/media-handling/automount-open false
-
-  Insert an SD card
-
-  Run 'dmesg'
-
-  $ dmesg
-
-  Look for a line that looks like the following at the end of the log
-
-  [288582.790722]  sdc: sdc1 sdc2 sdc3 sdc4 < sdc5 sdc6 >
-
-  WARNING: In the next step, make sure you use /dev/"whatever you see above".
-           You can erase your hard drive with the wrong parameter.
-
-  Run linaro image tools
-
-  $ linaro-android-media-create --mmc /dev/sdc --dev <BOARD> --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-
-  If you're using tip of linaro image tools
-
-  $ ./linaro-image-tools/linaro-android-media-create --mmc /dev/sdc --dev <BOARD> --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-
-  To find <BOARD> run linaro-android-media-create with a -h and read the help.
-
-  Restore automount
-
-  $ dconf write /org/gnome/desktop/media-handling/automount $TMP1
-  $ dconf write /org/gnome/desktop/media-handling/automount-open $TMP2
-
-  Remove the SD card from the device writer and plug it into the board.
-
-= Check console output =
-
-  Plug in an USB-to-serial converter and run minicom
-
-  $ minicom -D /dev/ttyUSB0 -w -C minicom.txt
diff --git a/howto/armv8-linaro/OPEN-EULA.txt b/howto/armv8-linaro/OPEN-EULA.txt
deleted file mode 100644
index e69de29..0000000
--- a/howto/armv8-linaro/OPEN-EULA.txt
+++ /dev/null
diff --git a/howto/armv8-lsk/HOWTO_getsourceandbuild.txt b/howto/armv8-lsk/HOWTO_getsourceandbuild.txt
deleted file mode 100644
index e2954df..0000000
--- a/howto/armv8-lsk/HOWTO_getsourceandbuild.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-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-lsk to do a complete ARMv8 Android build from scratch.
-
-h2. Get the source
-
-<pre>
-  $ curl "http://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" > repo
-  $ chmod +x repo
-  $ ./repo init -u ssh://$USER@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/android/manifest.git -b armv8-linaro -m baseline_manifest-lsk.xml
-  $ sed -i "s/linaro-big-little-switcher-bot/$USER/" .repo/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_SIMULATOR=false
-  $ export TARGET_BUILD_VARIANT=eng
-  $ export ANDROID_ENABLE_RENDERSCRIPT=false
-  $ export WITH_DEXPREOPT=true
-  $ export GCC49_AAC_HACK=1
-  $ export KERNEL_TOOLS_PREFIX=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
-  $ export TARGET_TOOLS_PREFIX=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
-  $ export BUILD_FS_IMAGE=1
-  $ export ANDROID_64=true
-  $ export BIONIC_TESTS=1
-  $ . build/envsetup.sh
-  $ make -j${CPUS} boottarball systemtarball userdatatarball
-</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 juno --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 juno --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
-
-<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=uefi_fvp-base.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
-</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 10 minutes. Subsequent boots should take approximately half the time to boot.
-
-h2. Console redirection
-
-To redirect the console open a terminal and run
-
-pre. telnet 127.0.0.1 5000
-
-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/howto/armv8-lsk/HOWTO_install.txt b/howto/armv8-lsk/HOWTO_install.txt
deleted file mode 100644
index d7ddf43..0000000
--- a/howto/armv8-lsk/HOWTO_install.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-Instructions for "https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-lsk/":https://android-build.linaro.org/builds/~linaro-android-restricted/armv8-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. 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 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>
-
-h2. Create binary for the ARM FVP Base AEMv8 models
-
-Run linaro image tools
-
-pre. $ linaro-android-media-create --image_file mmc.bin --image_size 2000M --dev juno --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 juno --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
-
-<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=uefi_fvp-base.bin \
-        -C bp.virtioblockdevice.image_path=mmc.bin
-</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 10 minutes. Subsequent boots should take approximately half the time to boot.
-
-h2. Console redirection
-
-To redirect the console open a terminal and run
-
-pre. telnet 127.0.0.1 5000
-
-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/howto/armv8-lsk/HOWTO_prebuilt.txt b/howto/armv8-lsk/HOWTO_prebuilt.txt
deleted file mode 100644
index f699a3e..0000000
--- a/howto/armv8-lsk/HOWTO_prebuilt.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Instructions for https://android-build.linaro.org/builds/~linaro-android/<BUILD_NAME>/
-
-= Get artifacts =
-
-  Scroll down to the 'Downloads' section
-
-  Click on each link to download:
-    boot.tar.bz2
-    system.tar.bz2
-    userdata.tar.bz2
-
-= Get linaro image tools =
-
-  Run these commands to get all the dependencies for linaro-image-tools and the tip of linaro-image-tools
-
-  $ sudo add-apt-repository ppa:linaro-maintainers/tools
-  $ sudo apt-get update
-  $ sudo apt-get install linaro-image-tools
-
-  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:
-
-  $ sudo apt-get install bzr
-  $ bzr branch lp:linaro-image-tools
-
-= Create media (SD card) =
-
-  Disable automount (instructions provided for Gnome)
-
-  $ TMP1=$(dconf read /org/gnome/desktop/media-handling/automount)
-  $ TMP2=$(dconf read /org/gnome/desktop/media-handling/automount-open)
-  $ dconf write /org/gnome/desktop/media-handling/automount false
-  $ dconf write /org/gnome/desktop/media-handling/automount-open false
-
-  Insert an SD card
-
-  Run 'dmesg'
-
-  $ dmesg
-
-  Look for a line that looks like the following at the end of the log
-
-  [288582.790722]  sdc: sdc1 sdc2 sdc3 sdc4 < sdc5 sdc6 >
-
-  WARNING: In the next step, make sure you use /dev/"whatever you see above".
-           You can erase your hard drive with the wrong parameter.
-
-  Run linaro image tools
-
-  $ linaro-android-media-create --mmc /dev/sdc --dev <BOARD> --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-
-  If you're using tip of linaro image tools
-
-  $ ./linaro-image-tools/linaro-android-media-create --mmc /dev/sdc --dev <BOARD> --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-
-  To find <BOARD> run linaro-android-media-create with a -h and read the help.
-
-  Restore automount
-
-  $ dconf write /org/gnome/desktop/media-handling/automount $TMP1
-  $ dconf write /org/gnome/desktop/media-handling/automount-open $TMP2
-
-  Remove the SD card from the device writer and plug it into the board.
-
-= Check console output =
-
-  Plug in an USB-to-serial converter and run minicom
-
-  $ minicom -D /dev/ttyUSB0 -w -C minicom.txt
diff --git a/howto/armv8-lsk/OPEN-EULA.txt b/howto/armv8-lsk/OPEN-EULA.txt
deleted file mode 100644
index e69de29..0000000
--- a/howto/armv8-lsk/OPEN-EULA.txt
+++ /dev/null
diff --git a/init.zygote64_32.rc b/init.zygote64_32.rc
deleted file mode 100755
index d3d3683..0000000
--- a/init.zygote64_32.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-system-server
-    class main
-    socket zygote stream 660 root system
-    onrestart write /sys/android_power/request_state wake
-    onrestart write /sys/power/state on
-    onrestart restart media
-    onrestart restart netd
-
-#service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary
-#    class main
-#    socket zygote_secondary stream 660 root system
-#    onrestart restart zygote