FVP base device config cleanup

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

8 files changed, 159 insertions, 63 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index d452761..ae85008 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,59 +1,56 @@
-TARGET_BOARD_PLATFORM := vexpress
-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 := vexpress
 ANDROID_64=true
+WITH_DEXPREOPT ?= true
 
-UEFI_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8-linaro/bin/aarch64-linux-android-
+# 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-
+
+# UEFI Toolchain and Makefile
+UEFI_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8-linaro/bin/aarch64-linux-android-
+CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/bootloader.mk
 
+# Kernel Config
 KERNEL_CONFIG ?= linaro/configs/linaro-base.conf \
                  linaro/configs/android.conf \
                  linaro/configs/vexpress64.conf \
                  linaro/configs/big-LITTLE-MP.conf \
                  linaro/configs/vexpress-tuning.conf \
                  linaro/configs/juice.conf
-CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/bootloader.mk
-TARGET_KERNEL_SOURCE ?= kernel/linaro/juice
+# Kernel Source and Device Tree
+TARGET_KERNEL_SOURCE ?= kernel/linaro/armv8
 DEVICE_TREES := fvp-base-gicv2-psci:fvp-base-gicv2-psci.dtb fvp-base-gicv2-psci:fdt.dtb
 
-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/device.mk b/device.mk
index 591c674..12bf01d 100644
--- a/device.mk
+++ b/device.mk
@@ -19,28 +19,23 @@ $(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.fvpbase:root/fstab.fvpbase \
 			$(LOCAL_PATH)/init.rc:root/init.rc \
 			$(LOCAL_PATH)/init.fvpbase.rc:root/init.fvpbase.rc \
-			$(LOCAL_PATH)/fstab.fvpbase:root/fstab.fvpbase)
-
-# Use our keyboard layout, whereby F1 and F10 are menu buttons.
-#
-PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-                        $(LOCAL_PATH)/vexpress.kl:system/usr/keylayout/vexpress.kl \
                         $(LOCAL_PATH)/OpenGLwallpapers:system/etc/graphics/OpenGLwallpapers \
-                        )
+                        $(LOCAL_PATH)/fvpbase.kl:system/usr/keylayout/fvpbase.kl)
 
 # Copy preboot binaries
+PRE_BOOT_FILES := bl1.bin bl2.bin bl31.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)
-
-PRE_BOOT_FILES := bl1.bin bl2.bin bl31.bin
+                        $(LOCAL_PATH)/preboot/bl31.bin:boot/bl31.bin
+                        $(LOCAL_PATH)/preboot/fip.bin:boot/fip.bin)
 
+# Set custom settings
 DEVICE_PACKAGE_OVERLAYS := device/linaro/vexpress/overlay
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -49,21 +44,24 @@ PRODUCT_PROPERTY_OVERRIDES += \
                             ro.nohardwaregfx=true \
                             ro.hardware=fvpbase
 
+# FVP base models do 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
 
 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
 
 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 \
 			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/vexpress/howto/$(LINARO_BUILD_SPEC)/$1),)
 PRODUCT_COPY_FILES += \
diff --git a/fvpbase.kl b/fvpbase.kl
new file mode 100644
index 0000000..a1302da
--- /dev/null
+++ b/fvpbase.kl
@@ -0,0 +1,113 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Generic key layout file for full alphabetic US English PC style external keyboards.
+#
+# This file is intentionally very generic and is intended to support a broad rang of keyboards.
+# Do not edit the generic key layout to support a specific keyboard; instead, create
+# a new key layout file with the required keyboard configuration.
+#
+
+key 399   GRAVE
+key 1     BACK
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+key 158   BACK              WAKE_DROPPED
+key 230   SOFT_RIGHT        WAKE
+key 60    SOFT_RIGHT        WAKE
+key 107   ENDCALL           WAKE_DROPPED
+key 62    ENDCALL           WAKE_DROPPED
+key 229   MENU              WAKE_DROPPED
+key 139   MENU              WAKE_DROPPED
+key 59    MENU              WAKE_DROPPED
+key 127   SEARCH            WAKE_DROPPED
+key 217   SEARCH            WAKE_DROPPED
+key 228   POUND
+key 227   STAR
+key 231   CALL              WAKE_DROPPED
+key 61    CALL              WAKE_DROPPED
+key 232   DPAD_CENTER       WAKE_DROPPED
+key 108   DPAD_DOWN         WAKE_DROPPED
+key 103   DPAD_UP           WAKE_DROPPED
+key 102   HOME              WAKE
+key 105   DPAD_LEFT         WAKE_DROPPED
+key 106   DPAD_RIGHT        WAKE_DROPPED
+key 115   VOLUME_UP
+key 114   VOLUME_DOWN
+key 116   POWER             WAKE
+key 212   CAMERA
+
+key 16    Q
+key 17    W
+key 18    E
+key 19    R
+key 20    T
+key 21    Y
+key 22    U
+key 23    I
+key 24    O
+key 25    P
+key 26    LEFT_BRACKET
+key 27    RIGHT_BRACKET
+key 43    BACKSLASH
+
+key 30    A
+key 31    S
+key 32    D
+key 33    F
+key 34    G
+key 35    H
+key 36    J
+key 37    K
+key 38    L
+key 39    SEMICOLON
+key 40    APOSTROPHE
+key 14    DEL
+
+key 44    Z
+key 45    X
+key 46    C
+key 47    V
+key 48    B
+key 49    N
+key 50    M
+key 51    COMMA
+key 52    PERIOD
+key 53    SLASH
+key 28    ENTER
+
+key 56    ALT_LEFT
+key 100   ALT_RIGHT
+key 42    SHIFT_LEFT
+key 54    SHIFT_RIGHT
+key 15    TAB
+key 57    SPACE
+key 150   EXPLORER
+key 155   ENVELOPE
+
+key 12    MINUS
+key 13    EQUALS
+key 215   AT
+
+
+key 82    MENU              WAKE
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
diff --git a/preboot/bl1.bin b/preboot/bl1.bin
index 921d2d4..412a012 100644
--- a/preboot/bl1.bin
+++ b/preboot/bl1.bin
diff --git a/preboot/bl2.bin b/preboot/bl2.bin
index 4f4cf70..dd77993 100644
--- a/preboot/bl2.bin
+++ b/preboot/bl2.bin
diff --git a/preboot/bl31.bin b/preboot/bl31.bin
index 77be3ad..9d4aad8 100644
--- a/preboot/bl31.bin
+++ b/preboot/bl31.bin
diff --git a/preboot/readme.txt b/preboot/readme.txt
index aef3ee9..8a70ade 100644
--- a/preboot/readme.txt
+++ b/preboot/readme.txt
@@ -1,3 +1,3 @@
-binaries from: http://snapshots.linaro.org/components/kernel/arm-trusted-firmware/7/
+Binaries downloaded from: http://snapshots.linaro.org/components/kernel/fvp-pre-boot/43
 
-The source is from http://git.linaro.org/gitweb?p=arm/models/arm-trusted-firmware.git;a=summary
+The source is here: http://git.linaro.org/gitweb?p=arm/models/arm-trusted-firmware.git;a=summary