sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

Browse Source
This commit is contained in:
Gregory Nutt 2014-08-29 14:47:22 -06:00
parent 1945c3d123
commit 7c7a81aa69
23 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NxWidgets/Kconfig
View File

@ -52,7 +52,7 @@ if NX_MULTIUSER
config NXWIDGET_SERVERINIT config NXWIDGET_SERVERINIT
bool "Start server" bool "Start server"
default y default y
depends on !NUTTX_KERNEL depends on !BUILD_PROTECTED && !BUILD_KERNEL
---help--- ---help---
If this option is selected, then the NxWidgets::CNxServer class will If this option is selected, then the NxWidgets::CNxServer class will
bring up the NX server when it is initialized. If this option is bring up the NX server when it is initialized. If this option is
@ -779,7 +779,7 @@ comment "Touchscreen Device Settings"
config NXWM_TOUCHSCREEN_DEVINIT config NXWM_TOUCHSCREEN_DEVINIT
bool "Touchscreen Device Initialization" bool "Touchscreen Device Initialization"
default y default y
depends on !NUTTX_KERNEL depends on !BUILD_PROTECTED && !BUILD_KERNEL
---help--- ---help---
It this option is selected, then the NxWM:CTouchscreen listener It this option is selected, then the NxWM:CTouchscreen listener
thread will call a function arch_tcinitialize(NXWM_TOUCHSCREEN_DEVNO) thread will call a function arch_tcinitialize(NXWM_TOUCHSCREEN_DEVNO)

14
examples/README.txt
View File

@ -75,7 +75,8 @@ examples/buttons
NOTE: This test exercises internal button driver interfaces. As such, it NOTE: This test exercises internal button driver interfaces. As such, it
relies on internal OS interfaces that are not normally available to a relies on internal OS interfaces that are not normally available to a
user-space program. As a result, this example cannot be used if a user-space program. As a result, this example cannot be used if a
NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL). NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
or CONFIG_BUILD_KERNEL).
examples/can examples/can
^^^^^^^^^^^^ ^^^^^^^^^^^^
@ -291,8 +292,9 @@ examples/flash_test
* CONFIG_MTD_SMART=y - SMART block driver support * CONFIG_MTD_SMART=y - SMART block driver support
* CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH * CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH
command command
* CONFIG_NUTTX_KERNEL=n - This test uses internal OS interfaces and so * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=n- This test uses
is not available in the NUTTX kernel build internal OS interfaces and so is not available in the NUTTX kernel
builds
examples/ftpc examples/ftpc
^^^^^^^^^^^^^ ^^^^^^^^^^^^^
@ -582,7 +584,8 @@ examples/lcdrw
NOTE: This test exercises internal lcd driver interfaces. As such, it NOTE: This test exercises internal lcd driver interfaces. As such, it
relies on internal OS interfaces that are not normally available to a relies on internal OS interfaces that are not normally available to a
user-space program. As a result, this example cannot be used if a user-space program. As a result, this example cannot be used if a
NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL). NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
or CONFIG_BUILD_KERNEL).
examples/mm examples/mm
^^^^^^^^^^^ ^^^^^^^^^^^
@ -1387,7 +1390,8 @@ examples/relays
NOTE: This test exercises internal relay driver interfaces. As such, it NOTE: This test exercises internal relay driver interfaces. As such, it
relies on internal OS interfaces that are not normally available to a relies on internal OS interfaces that are not normally available to a
user-space program. As a result, this example cannot be used if a user-space program. As a result, this example cannot be used if a
NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL). NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
or CONFIG_BUILD_KERNEL).
examples/rgmp examples/rgmp
^^^^^^^^^^^^^ ^^^^^^^^^^^^^

3
examples/buttons/buttons_main.c
View File

@ -37,7 +37,8 @@
* NOTE: This test exercises internal button driver interfaces. As such, it * NOTE: This test exercises internal button driver interfaces. As such, it
* it relies on internal OS interfaces that are not normally available to a * it relies on internal OS interfaces that are not normally available to a
* user-space program. As a result, this example cannot be used if a * user-space program. As a result, this example cannot be used if a
* NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL). * NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED or
* CONFIG_BUILD_KERNEL).
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************

2
examples/elf/tests/errno/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/hello/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/helloxx/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/longjmp/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/mutex/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/pthread/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/signal/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/struct/Makefile
View File

@ -56,7 +56,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/elf/tests/task/Makefile
View File

@ -54,7 +54,7 @@ endif
LIBS = LIBS =
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
LIBS += -luc LIBS += -luc
else else
LIBS += -lc LIBS += -lc

2
examples/flash_test/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_FLASH_TEST config EXAMPLES_FLASH_TEST
bool "SMART FLASH block device test" bool "SMART FLASH block device test"
default n default n
depends on !NUTTX_KERNEL && MTD_SMART && NSH_BUILTIN_APPS depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART && NSH_BUILTIN_APPS
---help--- ---help---
This logic performs a SMART flash block device test. This test This logic performs a SMART flash block device test. This test
performs a sector allocate, read, write, free and garbage collection performs a sector allocate, read, write, free and garbage collection

2
examples/i2schar/Kconfig
View File

@ -78,7 +78,7 @@ config EXAMPLES_I2SCHAR_BUFSIZE
config EXAMPLES_I2SCHAR_DEVINIT config EXAMPLES_I2SCHAR_DEVINIT
bool "Architecture-specific device initialization" bool "Architecture-specific device initialization"
default 256 default 256
depends on !NUTTX_KERNEL depends on !BUILD_PROTECTED && !BUILD_KERNEL
---help--- ---help---
Define if architecture-specific I2S device initialize is available. Define if architecture-specific I2S device initialize is available.
If defined, the the platform specific code must provide a function If defined, the the platform specific code must provide a function

2
examples/mtdpart/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_MTDPART config EXAMPLES_MTDPART
bool "MTD partition test" bool "MTD partition test"
default n default n
depends on MTD_PARTITION && !NUTTX_KERNEL depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_KERNEL
---help--- ---help---
Enable the MTD partition test example. Enable the MTD partition test example.

2
nshlib/Kconfig
View File

@ -301,7 +301,7 @@ config NSH_DISABLE_NSFMOUNT
config NSH_DISABLE_PS config NSH_DISABLE_PS
bool "Disable ps" bool "Disable ps"
default n default n
depends on !NUTTX_KERNEL depends on !BUILD_PROTECTED && !BUILD_KERNEL
config NSH_DISABLE_PING config NSH_DISABLE_PING
bool "Disable ping" bool "Disable ping"

4
nshlib/nsh.h
View File

@ -546,11 +546,11 @@
# define IOBUFFERSIZE (PATH_MAX + 1) # define IOBUFFERSIZE (PATH_MAX + 1)
#endif #endif
/* Certain commands are not availalbe in a kernel build because they depend /* Certain commands are not available in a kernel builds because they depend
* on interfaces that are not exported by the kernel. * on interfaces that are not exported by the kernel.
*/ */
#ifdef CONFIG_NUTTX_KERNEL #if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
# undef CONFIG_NSH_DISABLE_DF # undef CONFIG_NSH_DISABLE_DF
# define CONFIG_NSH_DISABLE_DF 1 # define CONFIG_NSH_DISABLE_DF 1
#endif #endif

2
nshlib/nsh_command.c
View File

@ -292,7 +292,7 @@ static const struct cmdmap_s g_cmdmap[] =
#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE) #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE)
# ifndef CONFIG_NSH_DISABLE_MOUNT # ifndef CONFIG_NSH_DISABLE_MOUNT
# ifdef CONFIG_NUTTX_KERNEL #if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
{ "mount", cmd_mount, 5, 5, "-t <fstype> [<block-device>] <mount-point>" }, { "mount", cmd_mount, 5, 5, "-t <fstype> [<block-device>] <mount-point>" },
# else # else
{ "mount", cmd_mount, 1, 5, "[-t <fstype> [<block-device>] <mount-point>]" }, { "mount", cmd_mount, 1, 5, "[-t <fstype> [<block-device>] <mount-point>]" },

12
nshlib/nsh_mntcmds.c
View File

@ -88,7 +88,7 @@
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT) defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT)
#ifndef CONFIG_NUTTX_KERNEL #if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
static const char* get_fstype(FAR struct statfs *statbuf) static const char* get_fstype(FAR struct statfs *statbuf)
{ {
FAR const char *fstype; FAR const char *fstype;
@ -227,7 +227,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
usedlabel = labels[which]; usedlabel = labels[which];
#ifndef CONFIG_NUTTX_KERNEL #if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
nsh_output(vtbl, "%-10s %6ld%c %8ld%c %8ld%c %s\n", get_fstype(statbuf), nsh_output(vtbl, "%-10s %6ld%c %8ld%c %8ld%c %s\n", get_fstype(statbuf),
size, sizelabel, used, usedlabel, free, freelabel, size, sizelabel, used, usedlabel, free, freelabel,
mountpoint); mountpoint);
@ -249,7 +249,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT) defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT)
#ifndef CONFIG_NUTTX_KERNEL #if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
static int mount_handler(FAR const char *mountpoint, static int mount_handler(FAR const char *mountpoint,
FAR struct statfs *statbuf, FAR void *arg) FAR struct statfs *statbuf, FAR void *arg)
{ {
@ -274,7 +274,7 @@ static int mount_handler(FAR const char *mountpoint,
#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT) defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT)
#ifndef CONFIG_NUTTX_KERNEL #if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
static inline int mount_show(FAR struct nsh_vtbl_s *vtbl, FAR const char *progname) static inline int mount_show(FAR struct nsh_vtbl_s *vtbl, FAR const char *progname)
{ {
return foreach_mountpoint(mount_handler, (FAR void *)vtbl); return foreach_mountpoint(mount_handler, (FAR void *)vtbl);
@ -297,7 +297,7 @@ int cmd_df(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
#ifdef CONFIG_NSH_CMDOPT_DF_H #ifdef CONFIG_NSH_CMDOPT_DF_H
if (argc > 1 && strcmp(argv[1], "-h") == 0) if (argc > 1 && strcmp(argv[1], "-h") == 0)
{ {
#ifndef CONFIG_NUTTX_KERNEL #if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
nsh_output(vtbl, "Filesystem Size Used Available Mounted on\n"); nsh_output(vtbl, "Filesystem Size Used Available Mounted on\n");
#else #else
nsh_output(vtbl, "Size Used Available Mounted on\n"); nsh_output(vtbl, "Size Used Available Mounted on\n");
@ -333,7 +333,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
/* The mount command behaves differently if no parameters are provided */ /* The mount command behaves differently if no parameters are provided */
#ifndef CONFIG_NUTTX_KERNEL #if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
if (argc < 2) if (argc < 2)
{ {
return mount_show(vtbl, argv[0]); return mount_show(vtbl, argv[0]);

9
nshlib/nsh_routecmds.c
View File

@ -321,11 +321,14 @@ errout:
* *
****************************************************************************/ ****************************************************************************/
#if !defined(CONFIG_NSH_DISABLE_DELROUTE) && !defined(CONFIG_NUTTX_KERNEL) #if !defined(CONFIG_NSH_DISABLE_DELROUTE) && \
!defined(CONFIG_BUILD_PROTECTED) && \
!defined(CONFIG_BUILD_KERNEL)
/* Perhaps... someday. This would current depend on using the internal /* Perhaps... someday. This would current depend on using the internal
* OS interface net_foreachroute and internal OS data structrues defined * OS interface net_foreachroute and internal OS data structures defined
* in nuttx/net/net_route.h * in nuttx/net/net_route.h
*/ */
#endif /* !CONFIG_NSH_DISABLE_DELROUTE && !CONFIG_NUTTX_KERNEL */ #endif /* !CONFIG_NSH_DISABLE_DELROUTE && !CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL */
#endif /* CONFIG_NET && CONFIG_NET_ROUTE */ #endif /* CONFIG_NET && CONFIG_NET_ROUTE */

2
system/flash_eraseall/Kconfig
View File

@ -6,7 +6,7 @@
config SYSTEM_FLASH_ERASEALL config SYSTEM_FLASH_ERASEALL
bool "FLASH eraseall tool" bool "FLASH eraseall tool"
default n default n
depends on MTD && NSH_BUILTIN_APPS && !NUTTX_KERNEL depends on MTD && NSH_BUILTIN_APPS && !BUILD_PROTECTED && !BUILD_KERNEL
---help--- ---help---
Enable support for the FLASH eraseall tool. Enable support for the FLASH eraseall tool.

3
system/i2c/README.txt
View File

@ -361,7 +361,8 @@ The I2C tools requires the following in your NuttX configuration:
NOTE 2: This I2C tool uses direct I2C device interfaces. As such, it NOTE 2: This I2C tool uses direct I2C device interfaces. As such, it
relies on internal OS interfaces that are not normally available to a relies on internal OS interfaces that are not normally available to a
user-space program. As a result, the I2C tool cannot be used if a user-space program. As a result, the I2C tool cannot be used if a
NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL). NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
or CONFIG_BUILD_KERNEL).
3. I2C driver configuration 3. I2C driver configuration

3
system/usbmsc/README.txt
View File

@ -73,4 +73,5 @@ system/usbmsc
NOTE 2: This add-on used internal USB device driver interfaces. As such, NOTE 2: This add-on used internal USB device driver interfaces. As such,
it relies on internal OS interfaces that are not normally available to a it relies on internal OS interfaces that are not normally available to a
user-space program. As a result, this add-on cannot be used if a user-space program. As a result, this add-on cannot be used if a
NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL). NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
or CONFIG_BUILD_KERNEL).