commit baf6a27a4d392ce8031680d2f14e55f65e345574
author Amit Pundir <amit.pundir@linaro.org> Fri Sep 21 23:23:33 2012 +0530
committer Amit Pundir <amit.pundir@linaro.org> Mon Sep 24 13:58:08 2012 +0530
tree 21dbc8c31bf184a38fc90433fba23bcf77c694db
parent 9b84944e7e88c85fca0356918c5790f9897c8949

add temporary bL MP support

Change-Id: I89a8f4cca7be08f45a6da96827845f1e551b4f02

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index be3fcbc..4ef3b7a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -9,6 +9,7 @@
 KERNEL_CONFIG := linaro/configs/linaro-base.conf \
                  linaro/configs/android.conf \
                  linaro/configs/vexpress.conf
+ifeq ($(wildcard $(TOP)/boot-wrapper/bootwrapper.mk),)
 TARGET_USE_UBOOT := true
 UBOOT_CONFIG := vexpress_ca9x4_config
 UBOOT_FLAVOURS := vexpress_ca9x4:u-boot_v2p-ca9.bin vexpress_ca5x2:u-boot_v2p-ca5s.bin vexpress_ca15x2:u-boot_v2p-ca15-tc1.bin
@@ -21,6 +22,12 @@
 		rtsm_ve-v2p-ca15x1-ca7x1:rtsm/rtsm_ve-ca15x1-ca7x1.dtb \
 		rtsm_ve-v2p-ca15x4-ca7x4:rtsm/rtsm_ve-ca15x4-ca7x4.dtb
 CUSTOM_BOOTLOADER_MAKEFILE := device/linaro/vexpress/bootloader.mk
+else
+TARGET_USE_UBOOT := false
+DEVICE_TREES := rtsm_ve-v2p-ca15x1-ca7x1:rtsm/rtsm_ve-ca15x1-ca7x1.dtb \
+		rtsm_ve-v2p-ca15x4-ca7x4:rtsm/rtsm_ve-ca15x4-ca7x4.dtb
+CUSTOM_BOOTLOADER_MAKEFILE := boot-wrapper/bootwrapper.mk
+endif
 TARGET_USE_XLOADER := false
 TARGET_NO_RECOVERY := true
 TARGET_NO_RADIOIMAGE := true
@@ -53,5 +60,7 @@
 # ARMs gator (DS-5)
 TARGET_USE_GATOR:= true
 
+ifeq ($(wildcard $(TOP)/boot-wrapper/bootwrapper.mk),)
 # Build uImage and uInitrd instead of kernel and ramdisk.img
 TARGET_BOOTLOADER_TYPE := uboot
+endif