diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-06-09 09:56:31 +0100 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-06-09 12:10:32 +0100 |
| commit | b5ba0f528661483de81669bc0d01bb65b2df60f3 (patch) | |
| tree | 0d19b503b8940c7d92af63c51ced8d7eebf3c709 | |
| parent | 38d3adee21d9408b5973e5e8fe0d41281a657f04 (diff) | |
| download | vexpress-b5ba0f528661483de81669bc0d01bb65b2df60f3.tar.gz | |
Cleanup Boardconfig.mk: Remove IKS and Juice configuration
Change-Id: I94403b3f530b490a01f35c5f07a8af032a805b0e
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | BoardConfig.mk | 61 |
1 files changed, 6 insertions, 55 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8569eaa..60e091a 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,5 +1,5 @@ # config.mk -# +# # Product-specific compile-time definitions. # @@ -7,7 +7,6 @@ TARGET_BOARD_PLATFORM := vexpress TARGET_NO_BOOTLOADER := true # We use our own methods for building bootloaders TARGET_NO_KERNEL := false TARGET_HWPACK_CONFIG := device/linaro/vexpress/config -UEFI_TOOLS_PREFIX=arm-eabi- TARGET_USE_XLOADER := false TARGET_USE_UBOOT := false @@ -59,56 +58,6 @@ BOARD_SEPOLICY_UNION += \ shell.te \ surfaceflinger.te - -ifeq ($(strip $(ANDROID_64)),true) -# -# Juice -# -KERNEL_TOOLS_PREFIX := $(realpath $(TOP))/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-android- -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 -ifneq ($(wildcard $(TOP)/kernel/linaro/juice),) -DEVICE_TREES := fvp-base-gicv2-psci:fvp-base-gicv2-psci.dtb fvp-base-gicv2-psci:fdt.dtb -else -DEVICE_TREES := fvp-base-gicv2-psci:fvp-base-gicv2-psci.dtb fvp-base-gicv2-psci:fdt.dtb -endif - -TARGET_CPU_VARIANT := cortex-a15 - -else ifeq ($(strip $(BUILD_IKS)),true) -# -# IKS -# -ifeq ($(KERNEL_CONFIG),) -KERNEL_CONFIG ?= linaro/configs/linaro-base.conf \ - linaro/configs/android.conf \ - linaro/configs/big-LITTLE-MP.conf \ - linaro/configs/vexpress.conf \ - linaro/configs/vexpress-tuning.conf \ - linaro/configs/big-LITTLE-IKS.conf -endif -DEVICE_TREES := vexpress-v2p-ca15_a7:v2p-ca15-tc2.dtb -CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/bootloader-uboot-files.mk -INSTALLED_KERNEL_TARGET_NAME := zImage -INSTALLED_RAMDISK_TARGET_NAME := initrd -# -# Exporting the kernel and uboot source path explicitly since the path -# are not based on TARGET_PRODUCT. -# -TARGET_KERNEL_SOURCE := kernel/linaro/vexpress-iks - -TARGET_CPU_VARIANT := cortex-a9 - -else -# -# MP -# KERNEL_CONFIG ?= linaro/configs/linaro-base.conf \ linaro/configs/android.conf \ linaro/configs/big-LITTLE-MP.conf \ @@ -135,12 +84,14 @@ INSTALLED_KERNEL_TARGET_NAME := zImage INSTALLED_RAMDISK_TARGET_NAME := initrd INCLUDE_PERF := 0 +# Check the available kernel source and set the same +ifneq ($(wildcard $(TOP)/kernel/linaro/vexpress),) TARGET_KERNEL_SOURCE := kernel/linaro/vexpress - -TARGET_CPU_VARIANT := cortex-a9 - +else +TARGET_KERNEL_SOURCE := kernel/linaro/armlt endif +TARGET_CPU_VARIANT := cortex-a9 # Use the gator source from whatever kernel tree we're building GATOR_DAEMON_PATH := $(TARGET_KERNEL_SOURCE) |