diff --git a/benchmarks/coremark/Kconfig b/benchmarks/coremark/Kconfig index 0d621444e..e733083c6 100644 --- a/benchmarks/coremark/Kconfig +++ b/benchmarks/coremark/Kconfig @@ -26,6 +26,10 @@ config COREMARK_STACKSIZE int "Coremark task stack size" default 4096 +config COREMARK_MEM_LOCATION + string "Coremark memory location string" + default "Defined by the NuttX configuration" + config COREMARK_MULTITHREAD_OVERRIDE bool "Override number of threads" default n diff --git a/benchmarks/coremark/Makefile b/benchmarks/coremark/Makefile index f27fe43f4..50012e9f5 100644 --- a/benchmarks/coremark/Makefile +++ b/benchmarks/coremark/Makefile @@ -36,6 +36,8 @@ UNPACK ?= unzip -q -o VPATH += $(COREMARK_UNPACKNAME) VPATH += $(COREMARK_UNPACKNAME)$(DELIM)posix +DEPPATH += --dep-path $(COREMARK_UNPACKNAME) +DEPPATH += --dep-path $(COREMARK_UNPACKNAME)$(DELIM)posix CFLAGS += -Wno-undef @@ -52,13 +54,13 @@ endif CFLAGS += ${DEFINE_PREFIX}USE_PTHREAD ${DEFINE_PREFIX}PERFORMANCE_RUN=1 CFLAGS += ${DEFINE_PREFIX}MULTITHREAD=$(COREMARK_NTHREADS) CFLAGS += ${DEFINE_PREFIX}FLAGS_STR="\"Using NuttX compilation options\"" -CFLAGS += ${DEFINE_PREFIX}MEM_LOCATION="\"Defined by the NuttX configuration\"" +CFLAGS += ${DEFINE_PREFIX}MEM_LOCATION=\"$(CONFIG_COREMARK_MEM_LOCATION)\" ifeq ($(CONFIG_COREMARK_ITERATIONS_OVERRIDE),y) CFLAGS += ${DEFINE_PREFIX}ITERATIONS=$(CONFIG_COREMARK_ITERATIONS_COUNT) endif -CSRCS = core_list_join.c +CSRCS += core_list_join.c CSRCS += core_matrix.c CSRCS += core_state.c CSRCS += core_util.c @@ -101,6 +103,6 @@ PROGNAME += $(CONFIG_COREMARK_PROGNAME) PRIORITY += $(CONFIG_COREMARK_PRIORITY) STACKSIZE += $(CONFIG_COREMARK_STACKSIZE) -MAINSRC += $(COREMARK_UNPACKNAME)/core_main.c +MAINSRC += core_main.c include $(APPDIR)/Application.mk