In the Linaro set up u-boot will look for uImage (and not for kernel). This patch is Linaro specific and should not be contibuted to AOSP. --- target/board/Android.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/board/Android.mk b/target/board/Android.mk index 82dee3c..f3e4729 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -15,7 +15,7 @@ else endif # TARGET_NO_BOOTLOADER
ifneq ($(strip $(TARGET_NO_KERNEL)),true) - INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel + INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/uImage else INSTALLED_KERNEL_TARGET := endif
In the Linaro set up u-boot will look for uImage and uInitrd. This patch is Linaro specific and should not be contibuted to AOSP. --- core/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/Makefile b/core/Makefile index 857dd20..79d59a5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -309,13 +309,14 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES))
-BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img +BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/uInitrd
# We just build this directly to the install location. INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET) $(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) | $(MINIGZIP) $(call pretty,"Target ram disk: $@") - $(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $@ + $(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $(PRODUCT_OUT)/obj/ramdisk.img + mkimage -A arm -O linux -T ramdisk -n "Android Ramdisk Image" -d $(PRODUCT_OUT)/obj/ramdisk.img $@
ifneq ($(strip $(TARGET_NO_KERNEL)),true)
-
Patrik Ryd