diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
commit | 64892e44f2ce2612c77b1b20497fb007adafafb8 (patch) | |
tree | 2c917f29727a017b85193ac85959663d504b26e5 /apps/examples | |
parent | c48af0eb9c61462f59a7ba63ca7a73e8df146f49 (diff) | |
download | px4-nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.gz px4-nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.bz2 px4-nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.zip |
Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL
Diffstat (limited to 'apps/examples')
-rw-r--r-- | apps/examples/README.txt | 14 | ||||
-rw-r--r-- | apps/examples/buttons/buttons_main.c | 3 | ||||
-rw-r--r-- | apps/examples/elf/tests/errno/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/hello/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/helloxx/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/longjmp/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/mutex/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/pthread/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/signal/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/struct/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/elf/tests/task/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/flash_test/Kconfig | 2 | ||||
-rw-r--r-- | apps/examples/i2schar/Kconfig | 2 | ||||
-rw-r--r-- | apps/examples/mtdpart/Kconfig | 2 |
14 files changed, 23 insertions, 18 deletions
diff --git a/apps/examples/README.txt b/apps/examples/README.txt index e6bf986c2..29219daaf 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -75,7 +75,8 @@ examples/buttons NOTE: This test exercises internal button driver interfaces. As such, 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 - 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 ^^^^^^^^^^^^ @@ -291,8 +292,9 @@ examples/flash_test * CONFIG_MTD_SMART=y - SMART block driver support * CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH command - * CONFIG_NUTTX_KERNEL=n - This test uses internal OS interfaces and so - is not available in the NUTTX kernel build + * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=n- This test uses + internal OS interfaces and so is not available in the NUTTX kernel + builds examples/ftpc ^^^^^^^^^^^^^ @@ -582,7 +584,8 @@ examples/lcdrw NOTE: This test exercises internal lcd driver interfaces. As such, 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 - 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 ^^^^^^^^^^^ @@ -1387,7 +1390,8 @@ examples/relays NOTE: This test exercises internal relay driver interfaces. As such, 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 - 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 ^^^^^^^^^^^^^ diff --git a/apps/examples/buttons/buttons_main.c b/apps/examples/buttons/buttons_main.c index 34b6c8055..987ab8559 100644 --- a/apps/examples/buttons/buttons_main.c +++ b/apps/examples/buttons/buttons_main.c @@ -37,7 +37,8 @@ * NOTE: This test exercises internal button driver interfaces. As such, it * 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 - * 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). ****************************************************************************/ /**************************************************************************** diff --git a/apps/examples/elf/tests/errno/Makefile b/apps/examples/elf/tests/errno/Makefile index 44e50744b..d0f6f8256 100644 --- a/apps/examples/elf/tests/errno/Makefile +++ b/apps/examples/elf/tests/errno/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/hello/Makefile b/apps/examples/elf/tests/hello/Makefile index a5fc71e31..bcb227979 100644 --- a/apps/examples/elf/tests/hello/Makefile +++ b/apps/examples/elf/tests/hello/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/helloxx/Makefile b/apps/examples/elf/tests/helloxx/Makefile index f0b204ca5..8882e21a5 100644 --- a/apps/examples/elf/tests/helloxx/Makefile +++ b/apps/examples/elf/tests/helloxx/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/longjmp/Makefile b/apps/examples/elf/tests/longjmp/Makefile index f85f95434..802d84df1 100644 --- a/apps/examples/elf/tests/longjmp/Makefile +++ b/apps/examples/elf/tests/longjmp/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/mutex/Makefile b/apps/examples/elf/tests/mutex/Makefile index 70848c0f8..197bb41a9 100644 --- a/apps/examples/elf/tests/mutex/Makefile +++ b/apps/examples/elf/tests/mutex/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile index 1b02b017c..0aa524506 100644 --- a/apps/examples/elf/tests/pthread/Makefile +++ b/apps/examples/elf/tests/pthread/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/signal/Makefile b/apps/examples/elf/tests/signal/Makefile index abb596f6c..80b843e32 100644 --- a/apps/examples/elf/tests/signal/Makefile +++ b/apps/examples/elf/tests/signal/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/struct/Makefile b/apps/examples/elf/tests/struct/Makefile index b0fa3e474..27595dfaa 100644 --- a/apps/examples/elf/tests/struct/Makefile +++ b/apps/examples/elf/tests/struct/Makefile @@ -56,7 +56,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/elf/tests/task/Makefile b/apps/examples/elf/tests/task/Makefile index dcf758dfd..6a93da9e3 100644 --- a/apps/examples/elf/tests/task/Makefile +++ b/apps/examples/elf/tests/task/Makefile @@ -54,7 +54,7 @@ endif LIBS = ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) LIBS += -luc else LIBS += -lc diff --git a/apps/examples/flash_test/Kconfig b/apps/examples/flash_test/Kconfig index 49b56dccc..e681226a9 100644 --- a/apps/examples/flash_test/Kconfig +++ b/apps/examples/flash_test/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_FLASH_TEST bool "SMART FLASH block device test" default n - depends on !NUTTX_KERNEL && MTD_SMART && NSH_BUILTIN_APPS + depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART && NSH_BUILTIN_APPS ---help--- This logic performs a SMART flash block device test. This test performs a sector allocate, read, write, free and garbage collection diff --git a/apps/examples/i2schar/Kconfig b/apps/examples/i2schar/Kconfig index 953318cfe..0deb0ebce 100644 --- a/apps/examples/i2schar/Kconfig +++ b/apps/examples/i2schar/Kconfig @@ -78,7 +78,7 @@ config EXAMPLES_I2SCHAR_BUFSIZE config EXAMPLES_I2SCHAR_DEVINIT bool "Architecture-specific device initialization" default 256 - depends on !NUTTX_KERNEL + depends on !BUILD_PROTECTED && !BUILD_KERNEL ---help--- Define if architecture-specific I2S device initialize is available. If defined, the the platform specific code must provide a function diff --git a/apps/examples/mtdpart/Kconfig b/apps/examples/mtdpart/Kconfig index 6f8e6e490..cd8533e68 100644 --- a/apps/examples/mtdpart/Kconfig +++ b/apps/examples/mtdpart/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_MTDPART bool "MTD partition test" default n - depends on MTD_PARTITION && !NUTTX_KERNEL + depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_KERNEL ---help--- Enable the MTD partition test example. |