diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-14 13:16:12 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-14 13:18:47 +0159 |
| commit | d08bfd21e061c9f60315282faf1c161a9a22e9fc (patch) | |
| tree | 0fee9ac95a9db6f3d5d282aef4b9767a87509a5a | |
| parent | 34c3b8a985c6838d201f43f5fcc41fd1a400e22c (diff) | |
| download | build-d08bfd21e061c9f60315282faf1c161a9a22e9fc.tar.gz | |
build/core: uboot support
if TARGET_BOOTLOADER_TYPE is set to uboot, build uImage and uInitrd
rather than kernel and ramdisk.img
Based on older 2.3.x patches from Patrik Ryd <Patrik.Ryd@linaro.org>
Change-Id: I05d34b5cf7ad68d1342f110b5b6cf8c4cae02e6a
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | core/Makefile | 9 | ||||
| -rw-r--r-- | core/legacy_prebuilts.mk | 7 | ||||
| -rw-r--r-- | target/board/Android.mk | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 0692937188..89f24352a6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -350,7 +350,11 @@ INTERNAL_RAMDISK_FILES := $(filter $(TARGET_ROOT_OUT)/%, \ $(ALL_GENERATED_SOURCES) \ $(ALL_DEFAULT_INSTALLED_MODULES)) +ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) +BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/uInitrd +else BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img +endif ifeq ($(HAVE_SELINUX),true) SELINUX_DEPENDS := sepolicy file_contexts seapp_contexts @@ -360,7 +364,12 @@ endif INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET) $(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(SELINUX_DEPENDS) | $(MINIGZIP) $(call pretty,"Target ram disk: $@") +ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) + $(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 $@ +else $(hide) $(MKBOOTFS) $(TARGET_ROOT_OUT) | $(MINIGZIP) > $@ +endif ifneq ($(strip $(TARGET_NO_KERNEL)),true) diff --git a/core/legacy_prebuilts.mk b/core/legacy_prebuilts.mk index 0e33a6452c..43b26909b0 100644 --- a/core/legacy_prebuilts.mk +++ b/core/legacy_prebuilts.mk @@ -106,4 +106,9 @@ GRANDFATHERED_ALL_PREBUILT := \ wl1271.bin \ zoneinfo.dat \ zoneinfo.idx \ - zoneinfo.version + zoneinfo.version \ +ifeq($(TARGET_BOOTLOADER_TYPE),uboot) + build-uboot \ + build-mkenvimg +endif + diff --git a/target/board/Android.mk b/target/board/Android.mk index 7d94ee0364..0ea276ad09 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -15,7 +15,11 @@ else endif # TARGET_NO_BOOTLOADER ifneq ($(strip $(TARGET_NO_KERNEL)),true) - INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel + ifeq ($(TARGET_BOOTLOADER_TYPE),uboot) + INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/uImage + else + INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel + endif else INSTALLED_KERNEL_TARGET := endif |