From ac6ac003377d2eb11a5c274eb0b4957f3b44a9e5 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Wed, 29 Jun 2016 16:43:39 -0700 Subject: [PATCH] sample/kernel_event_logger: fix nano config There was no need for arch-specific configs for this test case. We now use the x86 config with CONFIG_TICKLESS_IDLE removed. The test case has been re-enabled on Nios II. Change-Id: Idd206cb3ca55f2336685a416df18f5848dee09c3 Signed-off-by: Andrew Boie --- samples/kernel_event_logger/nanokernel/Makefile | 2 +- .../nanokernel/{prj_arc.conf => prj.conf} | 1 - samples/kernel_event_logger/nanokernel/prj_arm.conf | 10 ---------- samples/kernel_event_logger/nanokernel/prj_x86.conf | 10 ---------- samples/kernel_event_logger/nanokernel/testcase.ini | 1 - 5 files changed, 1 insertion(+), 23 deletions(-) rename samples/kernel_event_logger/nanokernel/{prj_arc.conf => prj.conf} (93%) delete mode 100644 samples/kernel_event_logger/nanokernel/prj_arm.conf delete mode 100644 samples/kernel_event_logger/nanokernel/prj_x86.conf diff --git a/samples/kernel_event_logger/nanokernel/Makefile b/samples/kernel_event_logger/nanokernel/Makefile index aa4b4b19dcf..7321ddd41d3 100644 --- a/samples/kernel_event_logger/nanokernel/Makefile +++ b/samples/kernel_event_logger/nanokernel/Makefile @@ -1,6 +1,6 @@ KERNEL_TYPE = nano BOARD ?= qemu_x86 SOURCE_DIR = $(ZEPHYR_BASE)/samples/kernel_event_logger/microkernel/src/ -CONF_FILE = prj_$(ARCH).conf +CONF_FILE = prj.conf include ${ZEPHYR_BASE}/Makefile.inc diff --git a/samples/kernel_event_logger/nanokernel/prj_arc.conf b/samples/kernel_event_logger/nanokernel/prj.conf similarity index 93% rename from samples/kernel_event_logger/nanokernel/prj_arc.conf rename to samples/kernel_event_logger/nanokernel/prj.conf index 4f0245e94dd..1b3f464fbfd 100644 --- a/samples/kernel_event_logger/nanokernel/prj_arc.conf +++ b/samples/kernel_event_logger/nanokernel/prj.conf @@ -6,5 +6,4 @@ CONFIG_NANO_TIMEOUTS=y CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE=16 CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH=y CONFIG_KERNEL_EVENT_LOGGER_INTERRUPT=y -CONFIG_TICKLESS_IDLE=y CONFIG_KERNEL_EVENT_LOGGER_SLEEP=y diff --git a/samples/kernel_event_logger/nanokernel/prj_arm.conf b/samples/kernel_event_logger/nanokernel/prj_arm.conf deleted file mode 100644 index 513df74489a..00000000000 --- a/samples/kernel_event_logger/nanokernel/prj_arm.conf +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_COMPILER_OPT="-O0" -CONFIG_NUM_IRQS=43 -CONFIG_NANO_TIMEOUTS=y -CONFIG_RING_BUFFER=y -CONFIG_KERNEL_EVENT_LOGGER=y -CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE=16 -CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH=y -CONFIG_KERNEL_EVENT_LOGGER_INTERRUPT=y -CONFIG_TICKLESS_IDLE=n -CONFIG_KERNEL_EVENT_LOGGER_SLEEP=y diff --git a/samples/kernel_event_logger/nanokernel/prj_x86.conf b/samples/kernel_event_logger/nanokernel/prj_x86.conf deleted file mode 100644 index 4f0245e94dd..00000000000 --- a/samples/kernel_event_logger/nanokernel/prj_x86.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Let stack canaries use non-random number generator. -# This option is NOT to be used in production code. -CONFIG_RING_BUFFER=y -CONFIG_KERNEL_EVENT_LOGGER=y -CONFIG_NANO_TIMEOUTS=y -CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE=16 -CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH=y -CONFIG_KERNEL_EVENT_LOGGER_INTERRUPT=y -CONFIG_TICKLESS_IDLE=y -CONFIG_KERNEL_EVENT_LOGGER_SLEEP=y diff --git a/samples/kernel_event_logger/nanokernel/testcase.ini b/samples/kernel_event_logger/nanokernel/testcase.ini index c30a81f4e0a..fd94e66007b 100644 --- a/samples/kernel_event_logger/nanokernel/testcase.ini +++ b/samples/kernel_event_logger/nanokernel/testcase.ini @@ -1,5 +1,4 @@ [test] build_only = true tags = apps -arch_exclude = nios2 filter = not CONFIG_SOC_QUARK_D2000