defconfig.mk: Don't force make defconfig
Forcing the re-make of defconfig causes a ton of stuff to get rebuilt during dirty builds. So don't do it. Change-Id: I945fc8bfe3f2a52c3a8069fa016fc6f948f1b30f Signed-off-by: zhaoxp3 <zhaoxp3@motorola.com> Reviewed-on: https://gerrit.mot.com/1529110 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Wang <wangwang1@mt.com> Submit-Approved: Jira Key
This commit is contained in:
parent
2130576c20
commit
f782f43aab
2 changed files with 9 additions and 12 deletions
|
@ -144,11 +144,11 @@ fi
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifneq ($(KERNEL_LEGACY_DIR),true)
|
ifneq ($(KERNEL_LEGACY_DIR),true)
|
||||||
$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL)
|
$(KERNEL_USR): | $(KERNEL_HEADERS_INSTALL)
|
||||||
rm -rf $(KERNEL_SYMLINK)
|
rm -rf $(KERNEL_SYMLINK)
|
||||||
ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK)
|
ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK)
|
||||||
|
|
||||||
$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_USR)
|
$(TARGET_PREBUILT_INT_KERNEL): | $(KERNEL_USR)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(TARGET_KERNEL_SOURCE)/defconfig.mk
|
include $(TARGET_KERNEL_SOURCE)/defconfig.mk
|
||||||
|
@ -174,7 +174,7 @@ endef
|
||||||
$(KERNEL_OUT):
|
$(KERNEL_OUT):
|
||||||
mkdir -p $(KERNEL_OUT)
|
mkdir -p $(KERNEL_OUT)
|
||||||
|
|
||||||
$(KERNEL_CONFIG): $(KERNEL_OUT) $(TARGET_DEFCONFIG)
|
$(KERNEL_CONFIG): $(TARGET_DEFCONFIG) | $(KERNEL_OUT)
|
||||||
$(call do-kernel-config,$(BUILD_ROOT_LOC)$(KERNEL_OUT),$@,$(TARGET_DEFCONFIG),$(TARGET_KERNEL_SOURCE),$(KERNEL_MAKE_ENV),$(KERNEL_ARCH),$(KERNEL_CROSS_COMPILE),$(MAKE),$(real_cc))
|
$(call do-kernel-config,$(BUILD_ROOT_LOC)$(KERNEL_OUT),$@,$(TARGET_DEFCONFIG),$(TARGET_KERNEL_SOURCE),$(KERNEL_MAKE_ENV),$(KERNEL_ARCH),$(KERNEL_CROSS_COMPILE),$(MAKE),$(real_cc))
|
||||||
$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
|
$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
|
||||||
echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
|
echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
|
||||||
|
@ -183,8 +183,8 @@ $(KERNEL_CONFIG): $(KERNEL_OUT) $(TARGET_DEFCONFIG)
|
||||||
|
|
||||||
ifeq ($(TARGET_KERNEL_APPEND_DTB), true)
|
ifeq ($(TARGET_KERNEL_APPEND_DTB), true)
|
||||||
TARGET_PREBUILT_INT_KERNEL_IMAGE := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image
|
TARGET_PREBUILT_INT_KERNEL_IMAGE := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image
|
||||||
$(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_USR)
|
$(TARGET_PREBUILT_INT_KERNEL_IMAGE):| $(KERNEL_USR)
|
||||||
$(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL)
|
$(TARGET_PREBUILT_INT_KERNEL_IMAGE): | $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL)
|
||||||
$(hide) echo "Building kernel modules..."
|
$(hide) echo "Building kernel modules..."
|
||||||
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) Image
|
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) Image
|
||||||
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules
|
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules
|
||||||
|
@ -192,13 +192,13 @@ $(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEA
|
||||||
$(mv-modules)
|
$(mv-modules)
|
||||||
$(clean-module-folder)
|
$(clean-module-folder)
|
||||||
|
|
||||||
$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_PREBUILT_INT_KERNEL_IMAGE)
|
$(TARGET_PREBUILT_INT_KERNEL): | $(TARGET_PREBUILT_INT_KERNEL_IMAGE)
|
||||||
$(hide) echo "Building kernel..."
|
$(hide) echo "Building kernel..."
|
||||||
$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts
|
$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts
|
||||||
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)
|
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)
|
||||||
else
|
else
|
||||||
TARGET_PREBUILT_INT_KERNEL_IMAGE := $(TARGET_PREBUILT_INT_KERNEL)
|
TARGET_PREBUILT_INT_KERNEL_IMAGE := $(TARGET_PREBUILT_INT_KERNEL)
|
||||||
$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL)
|
$(TARGET_PREBUILT_INT_KERNEL): | $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL)
|
||||||
$(hide) echo "Building kernel..."
|
$(hide) echo "Building kernel..."
|
||||||
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)
|
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)
|
||||||
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules
|
$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules
|
||||||
|
@ -207,7 +207,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_I
|
||||||
$(clean-module-folder)
|
$(clean-module-folder)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG)
|
$(KERNEL_HEADERS_INSTALL): | $(KERNEL_OUT)
|
||||||
$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \
|
$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \
|
||||||
rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
|
rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \
|
||||||
$(call do-kernel-config,$(BUILD_ROOT_LOC)$(KERNEL_OUT),$(KERNEL_CONFIG),$(KERNEL_HEADER_DEFCONFIG),$(TARGET_KERNEL_SOURCE),$(KERNEL_MAKE_ENV),$(KERNEL_ARCH),$(KERNEL_CROSS_COMPILE),$(MAKE),$(real_cc)); \
|
$(call do-kernel-config,$(BUILD_ROOT_LOC)$(KERNEL_OUT),$(KERNEL_CONFIG),$(KERNEL_HEADER_DEFCONFIG),$(TARGET_KERNEL_SOURCE),$(KERNEL_MAKE_ENV),$(KERNEL_ARCH),$(KERNEL_CROSS_COMPILE),$(MAKE),$(real_cc)); \
|
||||||
|
|
|
@ -41,8 +41,5 @@ endif
|
||||||
#
|
#
|
||||||
# make combined defconfig file
|
# make combined defconfig file
|
||||||
#---------------------------------------
|
#---------------------------------------
|
||||||
$(TARGET_DEFCONFIG): FORCE $(PRODUCT_SPECIFIC_DEFCONFIGS)
|
$(TARGET_DEFCONFIG): $(PRODUCT_SPECIFIC_DEFCONFIGS)
|
||||||
$(call do-make-defconfig,$@,$(PRODUCT_SPECIFIC_DEFCONFIGS))
|
$(call do-make-defconfig,$@,$(PRODUCT_SPECIFIC_DEFCONFIGS))
|
||||||
|
|
||||||
.PHONY: FORCE
|
|
||||||
FORCE:
|
|
||||||
|
|
Loading…
Reference in a new issue