From d7bc60f0963b9e5f195bf6927a653c736543fa3c Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 9 Apr 2017 11:50:18 -0400 Subject: [PATCH] kernel: remove remaining microkernel references Change-Id: Ie648dbaaf714316c21395bd43e555618013dbd19 Signed-off-by: Anas Nashif --- arch/nios2/core/cpu_idle.c | 2 +- arch/riscv32/soc/pulpino/pulpino_idle.c | 2 +- .../soc/riscv-privilege/fe310/fe310_idle.c | 2 +- arch/x86/core/cpuhalt.c | 4 +- arch/xtensa/core/offsets/offsets.c | 2 +- arch/xtensa/core/thread.c | 3 -- arch/xtensa/include/start_task_arch.h | 37 ------------------- drivers/timer/xtensa_sys_timer.c | 6 +-- include/arch/nios2/arch.h | 2 +- samples/drivers/crypto/README.txt | 4 +- tests/benchmarks/boot_time/README.txt | 16 ++++---- tests/benchmarks/footprint/README.txt | 15 ++++---- tests/kernel/critical/README.txt | 2 +- tests/kernel/mem_slab/test_mslab/README.txt | 2 +- tests/kernel/obj_tracing/src/philosopher.c | 3 -- tests/kernel/pending/README.txt | 2 +- tests/kernel/sprintf/README.txt | 4 +- tests/kernel/sprintf/src/test_sprintf.c | 2 +- tests/kernel/stackprot/README.txt | 4 +- tests/kernel/xip/README.txt | 4 +- tests/legacy/benchmark/app_kernel/README.txt | 2 +- tests/legacy/kernel/test_tickless/README.txt | 2 +- 22 files changed, 39 insertions(+), 83 deletions(-) delete mode 100644 arch/xtensa/include/start_task_arch.h diff --git a/arch/nios2/core/cpu_idle.c b/arch/nios2/core/cpu_idle.c index 348df8bb81e..9cbe0a00f9e 100644 --- a/arch/nios2/core/cpu_idle.c +++ b/arch/nios2/core/cpu_idle.c @@ -12,7 +12,7 @@ * @brief Power save idle routine * * This function will be called by the kernel idle loop or possibly within - * an implementation of _sys_power_save_idle in the microkernel when the + * an implementation of _sys_power_save_idle in the kernel when the * '_sys_power_save_flag' variable is non-zero. * * @return N/A diff --git a/arch/riscv32/soc/pulpino/pulpino_idle.c b/arch/riscv32/soc/pulpino/pulpino_idle.c index 3afd12e9bd7..346fc6b890c 100644 --- a/arch/riscv32/soc/pulpino/pulpino_idle.c +++ b/arch/riscv32/soc/pulpino/pulpino_idle.c @@ -30,7 +30,7 @@ static ALWAYS_INLINE void pulpino_idle(unsigned int key) * @brief Power save idle routine * * This function will be called by the kernel idle loop or possibly within - * an implementation of _sys_power_save_idle in the microkernel when the + * an implementation of _sys_power_save_idle in the kernel when the * '_sys_power_save_flag' variable is non-zero. * * @return N/A diff --git a/arch/riscv32/soc/riscv-privilege/fe310/fe310_idle.c b/arch/riscv32/soc/riscv-privilege/fe310/fe310_idle.c index 2b6a3d121d7..59c3d6c8c20 100644 --- a/arch/riscv32/soc/riscv-privilege/fe310/fe310_idle.c +++ b/arch/riscv32/soc/riscv-privilege/fe310/fe310_idle.c @@ -27,7 +27,7 @@ static ALWAYS_INLINE void fe310_idle(unsigned int key) * @brief Power save idle routine * * This function will be called by the kernel idle loop or possibly within - * an implementation of _sys_power_save_idle in the microkernel when the + * an implementation of _sys_power_save_idle in the kernel when the * '_sys_power_save_flag' variable is non-zero. * * @return N/A diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c index 669a16bc481..3914cca6463 100644 --- a/arch/x86/core/cpuhalt.c +++ b/arch/x86/core/cpuhalt.c @@ -9,7 +9,7 @@ * This module provides an implementation of the architecture-specific * k_cpu_idle() primitive required by the kernel idle loop component. * It can be called within an implementation of _sys_power_save_idle(), - * which is provided for the microkernel by the platform. + * which is provided for the kernel by the platform. * * The module also provides an implementation of k_cpu_atomic_idle(), which * atomically re-enables interrupts and enters low power mode. @@ -36,7 +36,7 @@ extern uint64_t __idle_tsc; /* timestamp when CPU went idle */ * @brief Power save idle routine for IA-32 * * This function will be called by the kernel idle loop or possibly within - * an implementation of _sys_power_save_idle in the microkernel when the + * an implementation of _sys_power_save_idle in the kernel when the * '_sys_power_save_flag' variable is non-zero. The IA-32 'hlt' instruction * will be issued causing a low-power consumption sleep mode. * diff --git a/arch/xtensa/core/offsets/offsets.c b/arch/xtensa/core/offsets/offsets.c index 6fedcaa6c1d..e2afc7e6aa1 100644 --- a/arch/xtensa/core/offsets/offsets.c +++ b/arch/xtensa/core/offsets/offsets.c @@ -13,7 +13,7 @@ * structures. * * All of the absolute symbols defined by this module will be present in the - * final microkernel or nanokernel ELF image (due to the linker's reference to + * final kernel or nanokernel ELF image (due to the linker's reference to * the _OffsetAbsSyms symbol). * * INTERNAL diff --git a/arch/xtensa/core/thread.c b/arch/xtensa/core/thread.c index cef96b18ed8..eac97bc9f41 100644 --- a/arch/xtensa/core/thread.c +++ b/arch/xtensa/core/thread.c @@ -14,9 +14,6 @@ #include extern void _xt_user_exit(void); -#if CONFIG_MICROKERNEL -extern FUNC_NORETURN void _TaskAbort(void); -#endif #if defined(CONFIG_THREAD_MONITOR) #define THREAD_MONITOR_INIT(thread) _thread_monitor_init(thread) diff --git a/arch/xtensa/include/start_task_arch.h b/arch/xtensa/include/start_task_arch.h deleted file mode 100644 index 177d042ac5e..00000000000 --- a/arch/xtensa/include/start_task_arch.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2016 Cadence Design Systems, Inc. - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief XTENSA nanokernel declarations to start a task - * - * XTENSA-specific parts of start_task(). - * - * Currently empty, only here for abstraction. - */ - -#ifndef _START_TASK_ARCH__H_ -#define _START_TASK_ARCH__H_ - -#include -#include - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define _START_TASK_ARCH(task, opt_ptr) \ - do {/* nothing */ \ - } while ((0)) - -#ifdef __cplusplus -} -#endif - -#endif /* _START_TASK_ARCH__H_ */ diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c index 3be5bcc07ad..ae01f69896c 100644 --- a/drivers/timer/xtensa_sys_timer.c +++ b/drivers/timer/xtensa_sys_timer.c @@ -190,7 +190,7 @@ void _timer_idle_exit(void) C = GET_TIMER_CURRENT_TIME(); r = F - C; /* - * Announce elapsed ticks to the microkernel. Note we are guaranteed + * Announce elapsed ticks to the kernel. Note we are guaranteed * that the timer ISR will execute before the tick event is serviced, * so _sys_idle_elapsed_ticks is adjusted to account for it. */ @@ -264,7 +264,7 @@ void _xt_tick_divisor_init(void) * @brief System clock tick handler * * This routine handles the system clock periodic tick interrupt. It always - * announces one tick by pushing a TICK_EVENT event onto the microkernel stack. + * announces one tick by pushing a TICK_EVENT event onto the kernel stack. * * @return N/A */ @@ -275,7 +275,7 @@ void _timer_int_handler(void *params) extern void _sys_k_event_logger_interrupt(void); _sys_k_event_logger_interrupt(); #endif - /* Announce the tick event to the microkernel. */ + /* Announce the tick event to the kernel. */ _sys_clock_final_tick_announce(); } diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h index eb28c9c3c26..c2e3288e186 100644 --- a/include/arch/nios2/arch.h +++ b/include/arch/nios2/arch.h @@ -40,7 +40,7 @@ extern "C" { #include #include -/* physical/virtual address types required by microkernel */ +/* physical/virtual address types required by the kernel */ typedef unsigned int paddr_t; typedef unsigned int vaddr_t; diff --git a/samples/drivers/crypto/README.txt b/samples/drivers/crypto/README.txt index 1dbb85f8988..95e4fbcfb0f 100644 --- a/samples/drivers/crypto/README.txt +++ b/samples/drivers/crypto/README.txt @@ -8,10 +8,10 @@ An example to illustrate the usage of crypto APIs. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: - make qemu + make run -------------------------------------------------------------------------------- diff --git a/tests/benchmarks/boot_time/README.txt b/tests/benchmarks/boot_time/README.txt index 6068166305d..2ab5af48243 100644 --- a/tests/benchmarks/boot_time/README.txt +++ b/tests/benchmarks/boot_time/README.txt @@ -6,7 +6,7 @@ BootTime measures the time: a) from system reset to kernel start (crt0.s's __start) b) from kernel start to begin of main() c) from kernel start to begin of first task - d) from kernel start to when microkernel's main task goes immediately idle + d) from kernel start to when kernel's main task goes immediately idle The project can be built using one of the following three configurations: @@ -32,7 +32,7 @@ Building and Running Project: This benchmark outputs to the console. It can be built and executed on QEMU as follows: - make qemu + make run -------------------------------------------------------------------------------- @@ -52,13 +52,13 @@ or Sample Output: tc_start() - Boot Time Measurement -MicroKernel Boot Result: Clock Frequency: 20 MHz -__start : 377787 cycles, 18889 us -_start->main(): 3915 cycles, 195 us -_start->task : 5898 cycles, 294 us -_start->idle : 6399 cycles, 319 us +Boot Result: Clock Frequency: 25 MHz +__start : 88410717 cycles, 3536428 us +_start->main(): 2422894 cycles, 96915 us +_start->task : 2450930 cycles, 98037 us +_start->idle : 37503993 cycles, 1500159 us Boot Time Measurement finished =================================================================== -PASS - bootTimeTask. +PASS - main. =================================================================== PROJECT EXECUTION SUCCESSFUL diff --git a/tests/benchmarks/footprint/README.txt b/tests/benchmarks/footprint/README.txt index 1bbc45d95cf..44a2a7935e1 100644 --- a/tests/benchmarks/footprint/README.txt +++ b/tests/benchmarks/footprint/README.txt @@ -1,9 +1,9 @@ -Title: Microkernel Footprint Measurement +Title: Kernel Footprint Measurement Description: This project is designed to characterize the memory requirements of a -standard microkernel image running on an Atom target. +standard kernel image running on an Atom target. The project can be built using several configurations: @@ -11,7 +11,6 @@ The project can be built using several configurations: minimal (a "do nothing" image that has support for few kernel capabilities) ------- - Idle task is only task in system. -- Microkernel server is only fiber in system. - No system timer support. - ISR for the spurious interrupt handling is present. - IDT and stack memory sizes are very limited. @@ -46,7 +45,7 @@ maximal (a "complex" image that has support for many kernel capabilities) Building and Running Project: -This microkernel project does not generate any output in the default case +This project does not generate any output in the default case (TEST=min). In the regular case (TEST=reg) and the maximal case (TEST=max), it outputs to the console. It can be built and executed on QEMU as follows: @@ -80,7 +79,7 @@ minimal ------- This configuration does NOT produce any output. To observe its operation, invoke it using gdb and observe that: -- the kernel's timer ISR & _k_server fiber increment "K_LowTime" on a regular +- the kernel's timer ISR & main thread increment "K_LowTime" on a regular basis - nano_cpu_idle() is invoked by the idle task each time K_LowTime is incremented @@ -88,13 +87,13 @@ regular ------- This configuration prints the following message to the console: - Running regular microkernel configuration + Running regular kernel configuration maximal ------- This configuration prints the following message to the console: - Running maximal microkernel configuration + Running maximal kernel configuration -------------------------------------------------------------------------------- @@ -102,4 +101,4 @@ Additional notes: Various host utilities (such as the Unix "size" utility) can be used to determine the footprint of the resulting -outdir/$BOARD/microkernel.elf image. +outdir/$BOARD/zephyr.elf image. diff --git a/tests/kernel/critical/README.txt b/tests/kernel/critical/README.txt index b1512ccd4ac..28e5474e04d 100644 --- a/tests/kernel/critical/README.txt +++ b/tests/kernel/critical/README.txt @@ -18,7 +18,7 @@ result always matches the number of times the workqueue is called. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make run diff --git a/tests/kernel/mem_slab/test_mslab/README.txt b/tests/kernel/mem_slab/test_mslab/README.txt index c623494efa0..c03a11b5eae 100644 --- a/tests/kernel/mem_slab/test_mslab/README.txt +++ b/tests/kernel/mem_slab/test_mslab/README.txt @@ -8,7 +8,7 @@ This test verifies that the kernel memory slab APIs operate as expected. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make run diff --git a/tests/kernel/obj_tracing/src/philosopher.c b/tests/kernel/obj_tracing/src/philosopher.c index 526c411ee5c..d0731327400 100644 --- a/tests/kernel/obj_tracing/src/philosopher.c +++ b/tests/kernel/obj_tracing/src/philosopher.c @@ -26,9 +26,6 @@ extern struct k_sem forks[N_PHILOSOPHERS]; * * @brief Entry point to a philosopher's thread * - * This routine runs as a task in the microkernel environment - * and as a thread in the nanokernel environment. - * * @return N/A */ diff --git a/tests/kernel/pending/README.txt b/tests/kernel/pending/README.txt index 696ca530d85..3a192f1afad 100644 --- a/tests/kernel/pending/README.txt +++ b/tests/kernel/pending/README.txt @@ -9,7 +9,7 @@ kernel objects: FIFOs, LIFOs, semaphores and timers. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make run diff --git a/tests/kernel/sprintf/README.txt b/tests/kernel/sprintf/README.txt index 29043d36f75..999e6d5a646 100644 --- a/tests/kernel/sprintf/README.txt +++ b/tests/kernel/sprintf/README.txt @@ -8,7 +8,7 @@ This test verifies that sprintf() and its variants operate as expected. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make run @@ -29,7 +29,7 @@ or -------------------------------------------------------------------------------- Sample Output: -tc_start() - Test Microkernel sprintf APIs +tc_start() - Test sprintf APIs =================================================================== Testing sprintf() with integers .... diff --git a/tests/kernel/sprintf/src/test_sprintf.c b/tests/kernel/sprintf/src/test_sprintf.c index fef9a813103..24754f08609 100644 --- a/tests/kernel/sprintf/src/test_sprintf.c +++ b/tests/kernel/sprintf/src/test_sprintf.c @@ -644,7 +644,7 @@ void main(void) { int status = TC_PASS; - TC_START("Test Microkernel sprintf APIs\n"); + TC_START("Test sprintf APIs\n"); PRINT_LINE; diff --git a/tests/kernel/stackprot/README.txt b/tests/kernel/stackprot/README.txt index fda7217315c..c6690034b4c 100644 --- a/tests/kernel/stackprot/README.txt +++ b/tests/kernel/stackprot/README.txt @@ -2,13 +2,13 @@ Title: Stack Protection Support Description: -This test verifies that stack canaries operate as expected in the microkernel. +This test verifies that stack canaries operate as expected. -------------------------------------------------------------------------------- Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make run diff --git a/tests/kernel/xip/README.txt b/tests/kernel/xip/README.txt index c8efff1bb43..f6f6933f5e0 100644 --- a/tests/kernel/xip/README.txt +++ b/tests/kernel/xip/README.txt @@ -2,13 +2,13 @@ Title: Execute in Place (XIP) Support Description: -This test verifies XIP is working in the microkernel +This test verifies XIP is working -------------------------------------------------------------------------------- Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make run diff --git a/tests/legacy/benchmark/app_kernel/README.txt b/tests/legacy/benchmark/app_kernel/README.txt index 07fd0e1fcd3..118924f6276 100644 --- a/tests/legacy/benchmark/app_kernel/README.txt +++ b/tests/legacy/benchmark/app_kernel/README.txt @@ -9,7 +9,7 @@ semaphores, FIFOs, mailboxes, pipes, memory maps, and memory pools. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make qemu diff --git a/tests/legacy/kernel/test_tickless/README.txt b/tests/legacy/kernel/test_tickless/README.txt index 7de293af2d7..b64d058069d 100644 --- a/tests/legacy/kernel/test_tickless/README.txt +++ b/tests/legacy/kernel/test_tickless/README.txt @@ -18,7 +18,7 @@ idle mode. Building and Running Project: -This microkernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: make qemu