diff options
| author | Zach Pfeffer <zach.pfeffer@linaro.org> | 2011-09-02 20:48:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2011-09-02 20:48:03 +0000 |
| commit | 150649088b3decb559315137fda138b4c203bba2 (patch) | |
| tree | 9b438a60ee9b713697caa0afa37edab5a092846e | |
| parent | 4bc8c0d9aeb41d9286f0ef741140021b7e8236af (diff) | |
| parent | 41255ded74e283c281123348087071ac1ea07492 (diff) | |
Merge "pandaboard: use MLO and u-boot.img from built from u-boot" into linaro_android_2.3.5
| -rw-r--r-- | tasks/bootfiles.mk | 15 | ||||
| -rw-r--r-- | tasks/uboot.mk | 9 |
2 files changed, 23 insertions, 1 deletions
diff --git a/tasks/bootfiles.mk b/tasks/bootfiles.mk index b52c0bf..b7728da 100644 --- a/tasks/bootfiles.mk +++ b/tasks/bootfiles.mk @@ -1,3 +1,12 @@ +.PHONY: u-boot-img mlo +ifeq ($(TARGET_PRODUCT), pandaboard) +u-boot-img: $(PRODUCT_OUT)/u-boot.img +mlo: $(PRODUCT_OUT)/MLO +else +u-boot-img: +mlo: +endif + .PHONY: u-boot ifeq ($(TARGET_USE_UBOOT),true) u-boot: $(PRODUCT_OUT)/u-boot.bin @@ -26,8 +35,12 @@ x-loader: endif .PHONY: copybootfiles -copybootfiles: x-loader u-boot +copybootfiles: x-loader u-boot u-boot-img mlo $(hide) mkdir -p $(PRODUCT_OUT)/boot +ifeq ($(TARGET_PRODUCT), pandaboard) + cp $(PRODUCT_OUT)/u-boot.img $(PRODUCT_OUT)/boot + cp $(PRODUCT_OUT)/MLO $(PRODUCT_OUT)/boot +endif ifeq ($(TARGET_USE_UBOOT),true) cp $(PRODUCT_OUT)/u-boot.bin $(PRODUCT_OUT)/boot ifeq ($(TARGET_PRODUCT), iMX53) diff --git a/tasks/uboot.mk b/tasks/uboot.mk index 6138689..824e8de 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -29,3 +29,12 @@ ifeq ($(TARGET_PRODUCT), origen) mkdir -p $(PRODUCT_OUT)/boot cp $(PRODUCT_OUT)/obj/u-boot/mmc_spl/u-boot-mmc-spl.bin $(PRODUCT_OUT)/boot/u-boot-mmc-spl.bin 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)/MLO: android_uboot + ln -sf obj/u-boot/MLO $(PRODUCT_OUT)/MLO +endif
\ No newline at end of file |