diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2011-10-17 14:55:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2011-10-17 14:55:56 +0000 |
| commit | bf153c373f8860c93ab26c6b6f8bfd1bc5f701e0 (patch) | |
| tree | 12c7637c07a786ee8f0e615c87ff3894d4620067 | |
| parent | f3f4195e0269b8650beceaf3b3c25fa819f13693 (diff) | |
| parent | d76ad2f3b98fc85a30ac655ae2bc147fe74e9bfa (diff) | |
Merge "Revamp kernel/u-boot build parallelization by using $(MAKE)." into linaro_android_2.3.5
| -rw-r--r-- | tasks/kernel.mk | 10 | ||||
| -rw-r--r-- | tasks/uboot.mk | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index a8bb5ca..31595eb 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -1,14 +1,14 @@ android_kernel: cd $(TOP)/kernel &&\ - make ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) defconfig $(KERNEL_CONFIG) &&\ - make ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) uImage + $(MAKE) -j1 ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) defconfig $(KERNEL_CONFIG) &&\ + $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) uImage android_kernel_modules: $(PRODUCT_OUT)/uImage $(ACP) cd $(TOP)/kernel &&\ - make ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) modules + $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) modules mkdir -p $(TOP)/kernel/modules_for_android cd $(TOP)/kernel &&\ - make ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) modules_install INSTALL_MOD_PATH=modules_for_android + $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) modules_install INSTALL_MOD_PATH=modules_for_android mkdir -p $(TARGET_OUT)/modules find kernel/modules_for_android -name "*.ko" -exec $(ACP) -fpt {} $(TARGET_OUT)/modules/ \; @@ -17,7 +17,7 @@ ifeq ($(TARGET_USE_GATOR),true) KERNEL_PATH:=$(shell pwd)/kernel gator_driver: $(ACP) cd $(TOP)/external/gator/driver &&\ - make ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) -C $(KERNEL_PATH) M=`pwd` modules + $(MAKE) ARCH=arm CROSS_COMPILE=$(shell sh -c "cd $(TOP); cd `dirname $(TARGET_TOOLS_PREFIX)`; pwd")/$(shell basename $(TARGET_TOOLS_PREFIX)) -C $(KERNEL_PATH) M=`pwd` modules mkdir -p $(TARGET_OUT)/modules find . -name "*.ko" -exec $(ACP) -fpt {} $(TARGET_OUT)/modules/ \; else diff --git a/tasks/uboot.mk b/tasks/uboot.mk index 138f1ae..4416b0b 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -11,13 +11,13 @@ android_uboot: mkdir -p $(PRODUCT_OUT)/obj/u-boot cd $(TOP)/u-boot &&\ export PATH=$(UBOOT_TCDIR):$(PATH) && \ - make O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) &&\ - make O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) + $(MAKE) O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) &&\ + $(MAKE) O=../$(PRODUCT_OUT)/obj/u-boot CROSS_COMPILE=$(UBOOT_TCPREFIX) ifeq ($(TARGET_PRODUCT), iMX53) cd $(TOP)/u-boot &&\ export PATH=$(UBOOT_TCDIR):$(PATH) && \ - make CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) && \ - make CROSS_COMPILE=$(UBOOT_TCPREFIX) u-boot.imx + $(MAKE) CROSS_COMPILE=$(UBOOT_TCPREFIX) $(UBOOT_CONFIG) && \ + $(MAKE) CROSS_COMPILE=$(UBOOT_TCPREFIX) u-boot.imx endif $(PRODUCT_OUT)/u-boot.bin: android_uboot |