From dda6be7c2683e1dd11eb46a4d13a3838c2213a3d Mon Sep 17 00:00:00 2001 From: Vishal Bhoj Date: Sat, 21 Apr 2012 06:28:22 +0000 Subject: bootwrapper.mk: clean up Build image only for integrated switcher. Building image with integrated switcher with dmart's bootwrapper is not needed. Change-Id: I68a276f2c52d284fa8848c04ce40b0f42c8266fb Signed-off-by: Vishal Bhoj --- bootwrapper.mk | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/bootwrapper.mk b/bootwrapper.mk index ec1c13f..cb187bc 100644 --- a/bootwrapper.mk +++ b/bootwrapper.mk @@ -1,13 +1,5 @@ # Buildfile to invoke bootwrapper makefile which inturn builds the switcher. -big.LITTLE-bootwrapper: bootwrapper android_kernel $(INSTALLED_RAMDISK_TARGET) - cat $(PRODUCT_OUT)/obj/kernel/arch/arm/boot/zImage $(DEVICE_TREE_TARGETS) > arm-virt-bl/bootwrapper/payload/kernel && \ - cp $(PRODUCT_OUT)/obj/ramdisk.img arm-virt-bl/bootwrapper/payload/fsimg && \ - cd arm-virt-bl/bootwrapper/ && \ - $(MAKE) CROSS_COMPILE=arm-linux-gnueabi- ASYNC=FALSE && \ - cp payload/kernel ../../$(PRODUCT_OUT)/boot/zImagewithDT && \ - cp img.axf ../../$(PRODUCT_OUT)/boot/ - ifeq ($(BUILD_FOR_INTEGRATED_SWITCHER),1) bootwrapper: android_kernel $(INSTALLED_RAMDISK_TARGET) cat $(PRODUCT_OUT)/obj/kernel/arch/arm/boot/zImage $(DEVICE_TREE_TARGETS) > boot-wrapper/zImage && \ @@ -17,8 +9,19 @@ bootwrapper: android_kernel $(INSTALLED_RAMDISK_TARGET) $(MAKE) CROSS_COMPILE=arm-linux-gnueabi- USE_INITRD=yes USE_PREBUILT_KERNEL=yes && \ cp linux-system.axf ../$(PRODUCT_OUT)/boot/linux-system-ISW.axf && \ cp filesystem.cpio.gz ../$(PRODUCT_OUT)/boot/Initrd && \ - cp uImage ../$(PRODUCT_OUT)/boot/uImagewithDT + cp zImage ../$(PRODUCT_OUT)/boot/zImagewithDT + +$(INSTALLED_BOOTTARBALL_TARGET): bootwrapper + else +big.LITTLE-bootwrapper: bootwrapper android_kernel $(INSTALLED_RAMDISK_TARGET) + cat $(PRODUCT_OUT)/obj/kernel/arch/arm/boot/zImage $(DEVICE_TREE_TARGETS) > arm-virt-bl/bootwrapper/payload/kernel && \ + cp $(PRODUCT_OUT)/obj/ramdisk.img arm-virt-bl/bootwrapper/payload/fsimg && \ + cd arm-virt-bl/bootwrapper/ && \ + $(MAKE) CROSS_COMPILE=arm-linux-gnueabi- ASYNC=FALSE && \ + cp payload/kernel ../../$(PRODUCT_OUT)/boot/zImagewithDT && \ + cp img.axf ../../$(PRODUCT_OUT)/boot/ + bootwrapper: android_kernel $(INSTALLED_RAMDISK_TARGET) cat $(PRODUCT_OUT)/obj/kernel/arch/arm/boot/uImage $(DEVICE_TREE_TARGETS) > boot-wrapper/uImage && \ cp $(PRODUCT_OUT)/obj/ramdisk.img boot-wrapper/filesystem.cpio.gz && \ @@ -29,6 +32,6 @@ bootwrapper: android_kernel $(INSTALLED_RAMDISK_TARGET) cp linux-system-semi.axf ../$(PRODUCT_OUT)/boot/linux-system-semi-A15.axf && \ cp filesystem.cpio.gz ../$(PRODUCT_OUT)/boot/Initrd && \ cp uImage ../$(PRODUCT_OUT)/boot/uImagewithDT -endif $(INSTALLED_BOOTTARBALL_TARGET): bootwrapper big.LITTLE-bootwrapper +endif -- cgit v1.2.3