diff options
| author | Alexander Sack <asac@linaro.org> | 2011-05-26 23:07:25 +0200 |
|---|---|---|
| committer | Alexander Sack <asac@linaro.org> | 2011-05-26 23:07:25 +0200 |
| commit | 64f8af3312ed6a618d70bad55ef8ccc2eb7197f6 (patch) | |
| tree | e52928187ffbc16453a1fcc200f7aef8f79f9db6 | |
| parent | 9da6b59725e52f5fcf8de320e253958df249f28e (diff) | |
| parent | d37f18e5b5b7ebe9c913028e4151ba7ebcfb8960 (diff) | |
| download | build-64f8af3312ed6a618d70bad55ef8ccc2eb7197f6.tar.gz | |
Merge remote-tracking branch 'remotes/origin/linaro_android_2.3.3' into dev_toolchain_preview
| -rw-r--r-- | core/Makefile | 9 | ||||
| -rw-r--r-- | target/board/Android.mk | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index 8b7d6dea0a..79d59a5147 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) @@ -794,7 +795,7 @@ stnod: systemtarball-nodeps ####### ## boot tarball define build-boottarball-target - $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET) + $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET)" $(hide) mkdir -p $(PRODUCT_OUT)/boot $(hide) cp -f $(INTERNAL_BOOTIMAGE_FILES) $(PRODUCT_OUT)/boot/. $(hide) echo $(BOARD_KERNEL_CMDLINE) > $(PRODUCT_OUT)/boot/cmdline @@ -809,7 +810,7 @@ endif boot_tar := $(PRODUCT_OUT)/boot.tar INSTALLED_BOOTTARBALL_TARGET := $(boot_tar).$(BOOT_TARBALL_FORMAT) -$(INSTALLED_BOOTTARBALL_TARGET): PRIVATE_BOOT_TAR := $(boot_tar) +PRIVATE_BOOT_TAR := $(boot_tar) $(INSTALLED_BOOTTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_BOOTIMAGE_FILES) $(build-boottarball-target) diff --git a/target/board/Android.mk b/target/board/Android.mk index 82dee3ca1e..f3e4729539 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 |