diff options
author | Anas Nashif <anas.nashif@intel.com> | 2016-12-23 14:06:46 -0500 |
---|---|---|
committer | Anas Nashif <nashif@linux.intel.com> | 2016-12-25 19:35:11 +0000 |
commit | 7297f5db887c81d4acdca6d3691a6739084c104d (patch) | |
tree | 702c64c84e89b0f24607a082d91bae44bbd55c71 /samples/legacy | |
parent | 46fa5384aae3fa5389b3900559c3979dd54a8328 (diff) |
shell: move shell to its own subsystem
This moves the shell component into its own subsys and groups all
related files and options into a single place.
Additionally, one Kconfig option will now be required to enable the
shell:
CONFIG_CONSOLE_SHELL=y
The header files was also moved to include/shell/shell.h and can be now
referenced with
#include <shell/shell.h>
instead of
#include <misc/shell.h>
Updated documentation as well.
Change-Id: Iffbba4acfa05408055e9fd28dffa213451351f94
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
Diffstat (limited to 'samples/legacy')
7 files changed, 7 insertions, 12 deletions
diff --git a/samples/legacy/task_profiler/README.txt b/samples/legacy/task_profiler/README.txt index cfde20597..12c637ab2 100644 --- a/samples/legacy/task_profiler/README.txt +++ b/samples/legacy/task_profiler/README.txt @@ -230,7 +230,6 @@ For that purpose, following flags must be enabled in project configuration file <-- snippet CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC=y CONFIG_CONSOLE_HANDLER=y -CONFIG_CONSOLE_HANDLER_SHELL=y --> command implementation. diff --git a/samples/legacy/task_profiler/microkernel/prj.conf b/samples/legacy/task_profiler/microkernel/prj.conf index 1bc74d92a..dd163130b 100644 --- a/samples/legacy/task_profiler/microkernel/prj.conf +++ b/samples/legacy/task_profiler/microkernel/prj.conf @@ -1,7 +1,6 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_CONSOLE_HANDLER=y -CONFIG_CONSOLE_HANDLER_SHELL=y -CONFIG_ENABLE_SHELL=y +CONFIG_CONSOLE_SHELL=y CONFIG_TASK_MONITOR=y CONFIG_TASK_MONITOR_MASK=6 CONFIG_RING_BUFFER=y diff --git a/samples/legacy/task_profiler/microkernel/prj_quark_se_c1000_devboard.conf b/samples/legacy/task_profiler/microkernel/prj_quark_se_c1000_devboard.conf index e97a9051e..1ec2d1455 100644 --- a/samples/legacy/task_profiler/microkernel/prj_quark_se_c1000_devboard.conf +++ b/samples/legacy/task_profiler/microkernel/prj_quark_se_c1000_devboard.conf @@ -1,7 +1,6 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_CONSOLE_HANDLER=y -CONFIG_CONSOLE_HANDLER_SHELL=y -CONFIG_ENABLE_SHELL=y +CONFIG_CONSOLE_SHELL=y CONFIG_TASK_MONITOR=y CONFIG_TASK_MONITOR_MASK=6 CONFIG_RING_BUFFER=y diff --git a/samples/legacy/task_profiler/nanokernel/prj.conf b/samples/legacy/task_profiler/nanokernel/prj.conf index c7ca8457f..65ae0aaf0 100644 --- a/samples/legacy/task_profiler/nanokernel/prj.conf +++ b/samples/legacy/task_profiler/nanokernel/prj.conf @@ -1,7 +1,6 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_CONSOLE_HANDLER=y -CONFIG_CONSOLE_HANDLER_SHELL=y -CONFIG_ENABLE_SHELL=y +CONFIG_CONSOLE_SHELL=y CONFIG_RING_BUFFER=y CONFIG_KERNEL_EVENT_LOGGER=y CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC=y diff --git a/samples/legacy/task_profiler/nanokernel/prj_quark_se_c1000_devboard.conf b/samples/legacy/task_profiler/nanokernel/prj_quark_se_c1000_devboard.conf index b255a05ed..4473c47b1 100644 --- a/samples/legacy/task_profiler/nanokernel/prj_quark_se_c1000_devboard.conf +++ b/samples/legacy/task_profiler/nanokernel/prj_quark_se_c1000_devboard.conf @@ -1,7 +1,6 @@ CONFIG_STDOUT_CONSOLE=y CONFIG_CONSOLE_HANDLER=y -CONFIG_CONSOLE_HANDLER_SHELL=y -CONFIG_ENABLE_SHELL=y +CONFIG_CONSOLE_SHELL=y CONFIG_RING_BUFFER=y CONFIG_KERNEL_EVENT_LOGGER=y CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC=y diff --git a/samples/legacy/task_profiler/profiler/src/profiler.c b/samples/legacy/task_profiler/profiler/src/profiler.c index 3494929a7..4e6811be9 100644 --- a/samples/legacy/task_profiler/profiler/src/profiler.c +++ b/samples/legacy/task_profiler/profiler/src/profiler.c @@ -75,7 +75,7 @@ void prof_send_platform_info(void) irq_unlock(key); } -#if defined(CONFIG_CONSOLE_HANDLER_SHELL) && defined(CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC) +#if defined(CONFIG_CONSOLE_SHELL) && defined(CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC) /* Profiler shell is only enabled if kernel event logger dynamic * enable/disable and console handler shell are enabled * Warning: if kernel event logger dynamic is enabled but no shell is available, @@ -91,7 +91,7 @@ void prof_send_platform_info(void) #include "profiler.h" #include <stdlib.h> #include <string.h> -#include <misc/shell.h> +#include <shell/shell.h> /* kernel_event_logger flags. Bit N = enable event ID N, except for task monitor * by default all enabled events at build time are logged when profiler enabled diff --git a/samples/legacy/task_profiler/profiler/src/profiler.h b/samples/legacy/task_profiler/profiler/src/profiler.h index 1b3645c9a..8d21c9873 100644 --- a/samples/legacy/task_profiler/profiler/src/profiler.h +++ b/samples/legacy/task_profiler/profiler/src/profiler.h @@ -21,7 +21,7 @@ extern void prof_flush(void); -#if defined(CONFIG_CONSOLE_HANDLER_SHELL) && defined(CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC) +#if defined(CONFIG_CONSOLE_SHELL) && defined(CONFIG_KERNEL_EVENT_LOGGER_DYNAMIC) extern int shell_cmd_prof(int argc, char *argv[]); #define PROF_CMD { "prof", shell_cmd_prof, "<start|stop|cfg> [cfg1] [cfg2]" } #else |