michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Fix benchmark projects makefiles to use proper configuration for i8253

Browse source 
Fix benchmark projects makefiles to use i8253 specific configuration
for only two variants of generic_pc BSP - pentium4 and minuteia, but
not for the whole BSP.

Change-Id: Iac89e29d2e26ee411d9c2d2fbcd3335c0e71fb06
Signed-off-by: Dmitriy Korovkin <dmitriy.korovkin@windriver.com>
This commit is contained in:
Dmitriy Korovkin 2015-04-21 16:51:28 -04:00 • committed by Anas Nashif
commit dd084a21a4
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
samples/microkernel/benchmark/app_kernel/Makefile
View file

@ -35,7 +35,7 @@ BSP ?= generic_pc
include $(subst \,/,${VXMICRO_BASE})/make/env/defs.base include $(subst \,/,${VXMICRO_BASE})/make/env/defs.base
PC8253_BSP=generic_pc PC8253_BSP_VARIANTS=generic_pc_pentium4 generic_pc_minuteia
PRJ_CONF_CONSOLE_FLOAT_8253 = prj_console_float_pc8253.conf PRJ_CONF_CONSOLE_FLOAT_8253 = prj_console_float_pc8253.conf
PRJ_CONF_CONSOLE_NOFLOAT_8253 = prj_console_nofloat_pc8253.conf PRJ_CONF_CONSOLE_NOFLOAT_8253 = prj_console_nofloat_pc8253.conf
@ -45,6 +45,6 @@ PRJ_CONF_CONSOLE_NOFLOAT_GEN = prj_console_nofloat_generic.conf
PRJ_INCPATH = ${vHERE} $(subst \,/,${VXMICRO_BASE})/samples/microkernel/benchmark/latency_measure/src PRJ_INCPATH = ${vHERE} $(subst \,/,${VXMICRO_BASE})/samples/microkernel/benchmark/latency_measure/src
PRJ_INCPATH += ${vBASE}/samples/include/ PRJ_INCPATH += ${vBASE}/samples/include/
PRJ_CONF = $(PRJ_CONF_CONSOLE_$(if ${CONFIG_CPU_FLOAT_UNSUPPORTED},NOFLOAT,FLOAT)_$(if $(filter ${vBSP},${PC8253_BSP}),8253,GEN)) PRJ_CONF = $(PRJ_CONF_CONSOLE_$(if ${CONFIG_CPU_FLOAT_UNSUPPORTED},NOFLOAT,FLOAT)_$(if $(filter ${vBSP}_${vBSP_VARIANT},${PC8253_BSP_VARIANTS}),8253,GEN))
include ${vMAKE}/target/make.ukernel include ${vMAKE}/target/make.ukernel

4
samples/microkernel/benchmark/latency_measure/Makefile
View file

@ -33,9 +33,9 @@
BSP ?= generic_pc BSP ?= generic_pc
PC8253_BSP=generic_pc PC8253_BSP_VARIANTS=generic_pc_pentium4 generic_pc_minuteia
PRJ_CONF = $(if $(filter ${vBSP},${PC8253_BSP}),prj_pc8253.conf,prj_generic.conf) PRJ_CONF = $(if $(filter ${vBSP}_${vBSP_VARIANT},${PC8253_BSP_VARIANTS}),prj_pc8253.conf,prj_generic.conf)
include $(subst \,/,${VXMICRO_BASE})/make/env/defs.base include $(subst \,/,${VXMICRO_BASE})/make/env/defs.base

4
samples/microkernel/benchmark/sys_kernel/Makefile
View file

@ -33,7 +33,7 @@
BSP ?= generic_pc BSP ?= generic_pc
PC8253_BSP=generic_pc PC8253_BSP_VARIANTS=generic_pc_pentium4 generic_pc_minuteia
PRJ_CONF_8253 = prj_console_pc8253.conf PRJ_CONF_8253 = prj_console_pc8253.conf
PRJ_CONF_GEN = prj_console_generic.conf PRJ_CONF_GEN = prj_console_generic.conf
@ -42,7 +42,7 @@ PRJ_SRCPATH = ${vBASE}/samples/nanokernel/benchmark/sys_kernel/src
PRJ_INCPATH = ${vHERE} $(subst \,/,${VXMICRO_BASE})/samples/microkernel/benchmark/latency_measure/src PRJ_INCPATH = ${vHERE} $(subst \,/,${VXMICRO_BASE})/samples/microkernel/benchmark/latency_measure/src
PRJ_INCPATH += ${vBASE}/samples/include/ PRJ_INCPATH += ${vBASE}/samples/include/
PRJ_CONF = $(PRJ_CONF_$(if $(filter ${vBSP},${PC8253_BSP}),8253,GEN)) PRJ_CONF = $(PRJ_CONF_$(if $(filter ${vBSP}_${vBSP_VARIANT},${PC8253_BSP_VARIANTS}),8253,GEN))
include $(subst \,/,${VXMICRO_BASE})/make/env/defs.base include $(subst \,/,${VXMICRO_BASE})/make/env/defs.base
include ${vMAKE}/target/make.ukernel include ${vMAKE}/target/make.ukernel