kernel: remove NANOKERNEL and MICROKERNEL configs (418058a1) · Commits · Wenxi XU / zephyr

Makefile.inc

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 \

kernel/Kconfig

+4 −15

Original line number	Diff line number	Diff line
		@@ -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

kernel/configs/kernel.config

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		# empty for now, use this file for global kernel configurations and overrides.

kernel/configs/unified.config

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		CONFIG_MICROKERNEL=y

samples/legacy/task_profiler/microkernel/src/hello.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message