diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-06-04 19:51:44 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-06-04 19:51:44 +0530 |
| commit | 8084c86a4657ef977d615377568f0de2396f10ee (patch) | |
| tree | 3de27121a7de38153e166caa51996c96f20f7834 | |
| parent | 540936faee2675d5655af2587bcb4248ca243e93 (diff) | |
| download | juno-8084c86a4657ef977d615377568f0de2396f10ee.tar.gz | |
remove juice configuration
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | BoardConfig.mk | 41 | ||||
| -rw-r--r-- | device.mk | 12 |
2 files changed, 14 insertions, 39 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 28c15e4..a37ad0a 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,30 +1,8 @@ -TARGET_JUICE ?= false - -ifeq ($(strip $(TARGET_JUICE)),true) -# Primary Arch -TARGET_ARCH := arm -TARGET_ARCH_VARIANT := armv7-a-neon -TARGET_CPU_VARIANT := cortex-a15 -TARGET_CPU_ABI := armeabi-v7a -TARGET_CPU_ABI2 := armeabi -TARGET_SUPPORTS_32_BIT_APPS := true -ifeq ($(strip $(USE_LINARO_TOOLCHAIN)),true) -KERNEL_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android- -else -KERNEL_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android- -endif # USE_LINARO_TOOLCHAIN = true -else # TARGET_JUICE != true # Primary Arch TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_VARIANT := generic TARGET_CPU_ABI := arm64-v8a -TARGET_SUPPORTS_64_BIT_APPS := true -ifeq ($(strip $(USE_LINARO_TOOLCHAIN)),true) -# 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- -endif # USE_LINARO_TOOLCHAIN = true # Secondary Arch TARGET_2ND_ARCH := arm @@ -32,19 +10,24 @@ TARGET_2ND_ARCH_VARIANT := armv7-a-neon TARGET_2ND_CPU_VARIANT := generic TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -TARGET_SUPPORTS_32_BIT_APPS := true -ifeq ($(strip $(USE_LINARO_TOOLCHAIN)),true) -# 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- -endif # USE_LINARO_TOOLCHAIN = true -endif # TARGET_JUICE TARGET_USES_64_BIT_BINDER := true +TARGET_SUPPORTS_32_BIT_APPS := true +TARGET_SUPPORTS_64_BIT_APPS := true + TARGET_BOARD_PLATFORM := juno ANDROID_64=true WITH_DEXPREOPT ?= true +ifeq ($(strip $(USE_LINARO_TOOLCHAIN)),true) +# 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- +endif + # Kernel Config KERNEL_CONFIG ?= linaro/configs/linaro-base.conf \ linaro/configs/android.conf \ @@ -37,11 +37,7 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ # Set custom settings DEVICE_PACKAGE_OVERLAYS := device/linaro/juno/overlay -PRODUCT_PROPERTY_OVERRIDES += \ - ro.disablesuspend=true \ - ro.sf.lcd_density=120 \ - ro.nohardwaregfx=true \ - ro.hardware=juno +PRODUCT_PROPERTY_OVERRIDES += ro.sf.lcd_density=120 # Juno does s/w rendering PRODUCT_PACKAGES += libGLES_android @@ -52,13 +48,9 @@ PRODUCT_RUNTIMES := runtime_libart_default # Needed to sync the system clock with the RTC clock PRODUCT_PACKAGES += hwclock -ifeq ($(strip $(TARGET_JUICE)),true) -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32 -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc -else +# Set zygote config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc -endif # Copy hardware config file(s) PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ |