summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2011-12-21 03:56:57 -0800
committerVishal Bhoj <vishal.bhoj@linaro.org>2011-12-21 04:07:51 -0800
commit40fca4352b21a20dcebb56e2377d9fc5529fba72 (patch)
treee66fb742917917a268507653240cd639b931b83b
parent716a640a246194f6dd6e661ca59dba811cece9d9 (diff)
uboot.mk: Use prebuilt MLO and uboot for landing-panda
uboot compiled from source fails to boot the aosp kernel as a workaround we use prebuilt MLO uboot from leb-panda 11.08 release Change-Id: I505f7db790ecc96b5139c12d977cd305f45437b3 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--tasks/uboot.mk13
1 files changed, 8 insertions, 5 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk
index afa5a42..994e3c7 100644
--- a/tasks/uboot.mk
+++ b/tasks/uboot.mk
@@ -15,6 +15,7 @@ UBOOT_TCPREFIX = $(shell if [ -e $(UBOOT_TCDIR)/arm-eabi-gcc ]; then echo arm-ea
endif
endif
+ifneq ($(TARGET_PRODUCT), pandaboard)
# u-boot can't be built with gold - so we force BFD LD into the
# PATH ahead of everything else
android_uboot: $(ACP)
@@ -41,14 +42,16 @@ ifeq ($(TARGET_PRODUCT), origen)
mkdir -p $(PRODUCT_OUT)/boot
cp $(PRODUCT_OUT)/obj/u-boot/spl/origen-spl.bin $(PRODUCT_OUT)/boot/u-boot-mmc-spl.bin
endif
-
+endif
ifeq ($(TARGET_PRODUCT), pandaboard)
-$(PRODUCT_OUT)/u-boot.img: android_uboot
- ln -sf obj/u-boot/u-boot.img $(PRODUCT_OUT)/u-boot.img
+$(PRODUCT_OUT)/u-boot.bin:
+ ln -sf ../../../../device/linaro/pandaboard/u-boot.bin $(PRODUCT_OUT)/u-boot.bin
+$(PRODUCT_OUT)/u-boot.img:
+ ln -sf ../../../../device/linaro/pandaboard/u-boot.bin $(PRODUCT_OUT)/u-boot.img
-$(PRODUCT_OUT)/MLO: android_uboot
- ln -sf obj/u-boot/MLO $(PRODUCT_OUT)/MLO
+$(PRODUCT_OUT)/MLO:
+ ln -sf ../../../../device/linaro/pandaboard/MLO $(PRODUCT_OUT)/MLO
endif
ifeq ($(TARGET_PRODUCT), full_panda)
$(PRODUCT_OUT)/u-boot.img: android_uboot