michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kbuild: Only execute initconfig target once

Browse source 
There is no need to rerun the initconfig target if the current project
directory has already been configured.

Change-Id: Ifaf01d8afa88f058bd4e20ed7c3fe136dbb1a640
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
This commit is contained in:
Dirk Brandewie 2015-06-01 09:48:10 -07:00 • committed by Anas Nashif
commit 6fa99f87ec
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile.inc
View file

@ -1,6 +1,8 @@
PROJECT_BASE ?= $(shell pwd)
ARCH?=x86
O ?= $(PROJECT_BASE)/outdir
export ARCH VPFILE QEMU_EXTRA_FLAGS PROJECT_BASE
ifdef BSP_VARIANT
@ -15,7 +17,7 @@ endif
endif
ifdef KBUILD_DEFCONFIG
CONFIG_DEPS=initconfig
CONFIG_DEPS=$(O)/.initconfig
else
CONFIG_DEPS=FORCE
endif
@ -25,7 +27,6 @@ SOURCE_DIR=$(PROJECT_BASE)/src/
export SOURCE_DIR
endif
O ?= $(PROJECT_BASE)/outdir
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
@ -68,7 +69,7 @@ qemu: $(CONFIG_DEPS) $(O)/include/config/.dir
$(Q)$(MAKE) -C $(TIMO_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS) qemu
initconfig: $(O)/include/config/.dir $(O)/include/generated/.dir
$(O)/.initconfig: $(O)/include/config/.dir $(O)/include/generated/.dir
set -e;
$(Q)test -s $(O)/.config || $(Q) $(MAKE) -C $(TIMO_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) defconfig
@ -78,6 +79,8 @@ ifneq (($strip $(CONF_FILE)),)
endif
$(Q)yes "" | $(MAKE) -C $(TIMO_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) oldconfig
@touch $@
%/.dir:
set -e;