patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

kernel: remove NANOKERNEL and MICROKERNEL configs

Browse source 
Those are legacy and not needed anymore.

Change-Id: I8113114fd60880b3f538612db7702f6129af0a06
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-12-11 05:59:18 -05:00 committed by Anas Nashif
parent b42587e9cd
commit 418058a123
16 changed files with 6 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.inc
View file

@ -132,7 +132,7 @@ help:
%:
$(Q)$(call zephyrmake,$(O),$@)
KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/unified.config
KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/kernel.config
$(DOTCONFIG): $(BOARDCONFIG) $(KBUILD_DEFCONFIG_PATH) $(CONF_FILE)
$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \

19
kernel/Kconfig
View file

@ -16,17 +16,6 @@
# limitations under the License.
#
choice
prompt "Kernel Type"
default MICROKERNEL
config NANOKERNEL
bool "Nano Kernel"
config MICROKERNEL
bool "Micro Kernel"
endchoice
menu "General Kernel Options"
@ -188,7 +177,7 @@ config KERNEL_EVENT_LOGGER_SLEEP
bool
prompt "Sleep event logging point"
default n
depends on KERNEL_EVENT_LOGGER && ((MICROKERNEL && SYS_POWER_MANAGEMENT) || NANOKERNEL)
depends on KERNEL_EVENT_LOGGER && SYS_POWER_MANAGEMENT
help
Enable low power condition event messages. These messages provide the
following information:
@ -241,7 +230,7 @@ config SYS_POWER_LOW_POWER_STATE
bool
prompt "Low power state"
default n
depends on MICROKERNEL && SYS_POWER_MANAGEMENT && SYS_POWER_LOW_POWER_STATE_SUPPORTED
depends on SYS_POWER_MANAGEMENT && SYS_POWER_LOW_POWER_STATE_SUPPORTED
help
This option enables the kernel to interface with a power manager
application. This permits the system to enter a custom CPU low power
@ -253,7 +242,7 @@ config SYS_POWER_DEEP_SLEEP
bool
prompt "Deep sleep state"
default n
depends on MICROKERNEL && SYS_POWER_MANAGEMENT && SYS_POWER_DEEP_SLEEP_SUPPORTED
depends on SYS_POWER_MANAGEMENT && SYS_POWER_DEEP_SLEEP_SUPPORTED
help
This option enables the kernel to interface with a power manager
application. This permits the system to enter a Deep sleep state
@ -267,7 +256,7 @@ config DEVICE_POWER_MANAGEMENT
bool
prompt "Device power management"
default n
depends on MICROKERNEL && SYS_POWER_MANAGEMENT
depends on SYS_POWER_MANAGEMENT
help
This option enables the device power management interface. The
interface consists of hook functions implemented by device drivers

1
kernel/configs/kernel.config Normal file
View file

@ -0,0 +1 @@
# empty for now, use this file for global kernel configurations and overrides.

1
kernel/configs/unified.config
View file

@ -1 +0,0 @@
CONFIG_MICROKERNEL=y

4
samples/legacy/task_profiler/microkernel/src/hello.c
View file

@ -19,8 +19,6 @@
#include <zephyr.h>
#include <stdio.h>
#ifdef CONFIG_MICROKERNEL
/*
* Microkernel version of hello world demo has two tasks that utilize
* semaphores and sleeps to take turns printing a greeting message at
@ -90,5 +88,3 @@ void taskB(void)
helloLoop(__func__, TASKBSEM, TASKASEM);
}
#endif /* CONFIG_MICROKERNEL */

4
samples/legacy/task_profiler/nanokernel/src/hello.c
View file

@ -20,8 +20,6 @@
#include <stdio.h>
#include "profiler.h"
#ifdef CONFIG_NANOKERNEL
/*
* Nanokernel version of hello world demo has a task and a fiber that utilize
* semaphores and timers to take turns printing a greeting message at
@ -76,5 +74,3 @@ void main(void)
nano_task_sem_take(&nanoSemTask, TICKS_UNLIMITED);
}
}
#endif /* CONFIG_NANOKERNEL */

2
samples/legacy/task_profiler/profiler/src/profiler.c
View file

@ -345,7 +345,6 @@ void prof_flush(void)
#endif /* ! PROF_UART_TESTMODE */
}
#ifdef CONFIG_MICROKERNEL
void prof(void)
{
@ -359,4 +358,3 @@ void prof(void)
}
}
#endif /* CONFIG_MICROKERNEL */

9
samples/net/dhcpv4_client/src/main.c
View file

@ -57,10 +57,6 @@ void main_fiber(void)
k_sem_take(&quit_lock, K_FOREVER);
}
#if defined(CONFIG_NANOKERNEL)
#define STACKSIZE 2000
char __noinit __stack fiberStack[STACKSIZE];
#endif
void main(void)
{
@ -68,10 +64,5 @@ void main(void)
init_app();
#if defined(CONFIG_MICROKERNEL)
main_fiber();
#else
task_fiber_start(&fiberStack[0], STACKSIZE,
(nano_fiber_entry_t)main_fiber, 0, 0, 7, 0);
#endif
}

1
tests/legacy/benchmark/footprint/microkernel/float/arm.conf
View file

@ -6,7 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
CONFIG_NUM_TASK_PRIORITIES=64
CONFIG_NUM_COMMAND_PACKETS=64
CONFIG_NUM_TIMER_PACKETS=16
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_SYS_POWER_MANAGEMENT=y
CONFIG_THREAD_CUSTOM_DATA=y

1
tests/legacy/benchmark/footprint/microkernel/float/x86.conf
View file

@ -7,7 +7,6 @@ CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_TASK_PRIORITIES=64
CONFIG_NUM_COMMAND_PACKETS=64
CONFIG_NUM_TIMER_PACKETS=16
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
CONFIG_HEAP_MEM_POOL_SIZE=256
CONFIG_SYS_POWER_MANAGEMENT=y
CONFIG_FLOAT=y

1
tests/legacy/benchmark/footprint/microkernel/max/arm.conf
View file

@ -6,7 +6,6 @@ CONFIG_STDOUT_CONSOLE=y
CONFIG_NUM_TASK_PRIORITIES=64
CONFIG_NUM_COMMAND_PACKETS=64
CONFIG_NUM_TIMER_PACKETS=16
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
CONFIG_SYS_POWER_MANAGEMENT=y
CONFIG_NUM_IRQS=43
CONFIG_THREAD_CUSTOM_DATA=y

1
tests/legacy/benchmark/footprint/microkernel/max/x86.conf
View file

@ -7,7 +7,6 @@ CONFIG_IDT_NUM_VECTORS=256
CONFIG_NUM_TASK_PRIORITIES=64
CONFIG_NUM_COMMAND_PACKETS=64
CONFIG_NUM_TIMER_PACKETS=16
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=4096
CONFIG_SYS_POWER_MANAGEMENT=y
CONFIG_THREAD_CUSTOM_DATA=y
CONFIG_HEAP_MEM_POOL_SIZE=256

1
tests/legacy/benchmark/footprint/microkernel/min/arm.conf
View file

@ -6,7 +6,6 @@ CONFIG_PRINTK=n
CONFIG_NUM_TASK_PRIORITIES=2
CONFIG_NUM_COMMAND_PACKETS=8
CONFIG_NUM_TIMER_PACKETS=4
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=128
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_ERRNO=n

1
tests/legacy/benchmark/footprint/microkernel/min/galileo.conf
View file

@ -8,7 +8,6 @@ CONFIG_IDT_NUM_VECTORS=36
CONFIG_NUM_TASK_PRIORITIES=2
CONFIG_NUM_COMMAND_PACKETS=8
CONFIG_NUM_TIMER_PACKETS=4
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=128
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_PINMUX=n

1
tests/legacy/benchmark/footprint/microkernel/min/x86.conf
View file

@ -8,7 +8,6 @@ CONFIG_IDT_NUM_VECTORS=33
CONFIG_NUM_TASK_PRIORITIES=2
CONFIG_NUM_COMMAND_PACKETS=8
CONFIG_NUM_TIMER_PACKETS=4
CONFIG_MICROKERNEL_SERVER_STACK_SIZE=128
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_IPM=n

1
tests/ztest/include/ztest.h
View file

@ -31,7 +31,6 @@
#define CONFIG_STDOUT_CONSOLE 1
#define CONFIG_ZTEST_ASSERT_VERBOSE 1
#define CONFIG_ZTEST_MOCKING
#define CONFIG_MICROKERNEL 1
#define CONFIG_NUM_COOP_PRIORITIES 16
/* FIXME: Properly integrate with Zephyr's arch specific code */
#define CONFIG_X86 1