diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.toolchain | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -48,7 +48,7 @@ endif _tsk_cfg:=$(foreach t,$(_tsk_lst) ,HAS_TASK_$(t)) CPPFLAGS+=$(foreach t,$(_tsk_cfg),-D$(t)) _flag_cfg:=$(shell $(CPP) $(CPPFLAGS) -P -dM -Ichip/$(CHIP) -Iboard/$(BOARD) \ - include/config.h | grep -o "\#define CONFIG_[A-Za-z0-9_]*" | \ + include/config.h | grep -o "\#define CONFIG_[A-Z0-9_]*" | \ cut -c9- | sort) $(foreach c,$(_tsk_cfg) $(_flag_cfg),$(eval $(c)=y)) diff --git a/Makefile.toolchain b/Makefile.toolchain index d730c411c7..4897469a4c 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -33,10 +33,8 @@ CFLAGS_TEST=$(if $(TEST_BUILD),-DTEST_BUILD \ CFLAGS_COVERAGE=$(if $(TEST_COVERAGE),-fprofile-arcs -ftest-coverage \ -DTEST_COVERAGE,) CFLAGS_DEFINE=-DOUTDIR=$(out) -DCHIP=$(CHIP) -DBOARD_TASKFILE=ec.tasklist \ - -DBOARD=$(BOARD) -DBOARD_$(BOARD) -DCORE=$(CORE) \ - -DPROJECT=$(PROJECT) -DCHIP_$(CHIP) \ - -DCHIP_VARIANT=$(CHIP_VARIANT) -DCHIP_VARIANT_$(CHIP_VARIANT) \ - -DCHIP_FAMILY=$(CHIP_FAMILY) -DCHIP_FAMILY_$(CHIP_FAMILY) \ + -DBOARD=$(BOARD) -DCORE=$(CORE) -DPROJECT=$(PROJECT) \ + -DCHIP_VARIANT=$(CHIP_VARIANT) -DCHIP_FAMILY=$(CHIP_FAMILY) \ -DBOARD_$(UC_BOARD) -DCHIP_$(UC_CHIP) -DCORE_$(UC_CORE) \ -DCHIP_VARIANT_$(UC_CHIP_VARIANT) -DCHIP_FAMILY_$(UC_CHIP_FAMILY) CPPFLAGS=$(CFLAGS_DEFINE) $(CFLAGS_INCLUDE) $(CFLAGS_TEST) \ |