From d356dea61ee170366acddc373953dad20f6fc48e Mon Sep 17 00:00:00 2001
From: Vincent Palatin <vpalatin@chromium.org>
Date: Tue, 24 Jan 2012 21:15:26 +0000
Subject: Add modularity to the build

You can now enable/disable tasks more easily.
To conditionally compile a C file depending on the task FOO activation,
just write something like that in the build.mk file :
common-$(CONFIG_TASK_FOO)+=foo_source.o

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BUG=None
TEST=make all BOARD=link && make qemu-tests

Change-Id: I760fb248e1599d13190ccd937a68ef47da17b510
---
 Makefile | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7f98ebc02b..c382b9407a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,19 @@ PROJECT?=ec
 # output directory for build objects
 out?=build/$(BOARD)
 
+include Makefile.toolchain
+
+# Get CHIP name
+include board/$(BOARD)/build.mk
+
+# Transform the configuration into make variables
+_tsk_lst:=$(shell echo "CONFIG_TASK_LIST" | $(CPP) -P -Iboard/$(BOARD) -Itest \
+	  -D"TASK(n, r, d)=n" -imacros $(PROJECT).tasklist)
+_tsk_cfg:=$(foreach t,$(_tsk_lst),CONFIG_TASK_$(t))
+_flag_cfg:=$(shell $(CPP) -P -dN chip/$(CHIP)/config.h | grep -o "CONFIG_.*")
+$(foreach c,$(_tsk_cfg) $(_flag_cfg),$(eval $(c)=y))
+CPPFLAGS+=$(foreach t,$(_tsk_cfg),-D$(t))
+
 # Get build configuration from sub-directories
 include board/$(BOARD)/build.mk
 include chip/$(CHIP)/build.mk
@@ -22,12 +35,11 @@ include util/build.mk
 objs_from_dir=$(foreach obj,$(2), $(out)/$(1)/$(obj))
 
 # Get all sources to build
-all-objs=$(call objs_from_dir,chip/$(CHIP),$(chip-objs))
-all-objs+=$(call objs_from_dir,board/$(BOARD),$(board-objs))
-all-objs+=$(call objs_from_dir,common,$(common-objs))
-all-objs+=$(call objs_from_dir,test,$($(PROJECT)-objs))
+all-y=$(call objs_from_dir,chip/$(CHIP),$(chip-y))
+all-y+=$(call objs_from_dir,board/$(BOARD),$(board-y))
+all-y+=$(call objs_from_dir,common,$(common-y))
+all-y+=$(call objs_from_dir,test,$($(PROJECT)-y))
 dirs=chip/$(CHIP) board/$(BOARD) common test util
 includes=include $(dirs)
 
-include Makefile.toolchain
 include Makefile.rules
-- 
cgit v1.2.1