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 /nuttx/arch/arm/src/samd | |
| parent | c48af0eb9c61462f59a7ba63ca7a73e8df146f49 (diff) | |
| download | nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.gz nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.bz2 nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.zip | |
Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL
Diffstat (limited to 'nuttx/arch/arm/src/samd')
| -rw-r--r-- | nuttx/arch/arm/src/samd/Make.defs | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/samd/sam_start.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/samd/sam_userspace.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/samd/sam_userspace.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/samd/Make.defs b/nuttx/arch/arm/src/samd/Make.defs index 308757881..1cc4b2f4d 100644 --- a/nuttx/arch/arm/src/samd/Make.defs +++ b/nuttx/arch/arm/src/samd/Make.defs @@ -47,7 +47,7 @@ CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c up_systemreset.c CMN_CSRCS += up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c CMN_CSRCS += up_svcall.c up_vectors.c up_vfork.c -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) CMN_CSRCS += up_task_start.c up_pthread_start.c up_stackframe.c ifneq ($(CONFIG_DISABLE_SIGNALS),y) CMN_CSRCS += up_signal_dispatch.c @@ -76,7 +76,7 @@ ifneq ($(CONFIG_SCHED_TICKLESS),y) CHIP_CSRCS += sam_timerisr.c endif -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) CHIP_CSRCS += sam_userspace.c endif diff --git a/nuttx/arch/arm/src/samd/sam_start.c b/nuttx/arch/arm/src/samd/sam_start.c index 81aacbe47..58062bfc1 100644 --- a/nuttx/arch/arm/src/samd/sam_start.c +++ b/nuttx/arch/arm/src/samd/sam_start.c @@ -157,7 +157,7 @@ void __start(void) * segments. */ -#ifdef CONFIG_NUTTX_KERNEL +#ifdef CONFIG_BUILD_PROTECTED sam_userspace(); showprogress('E'); #endif diff --git a/nuttx/arch/arm/src/samd/sam_userspace.c b/nuttx/arch/arm/src/samd/sam_userspace.c index 0f40d617e..60275e56d 100644 --- a/nuttx/arch/arm/src/samd/sam_userspace.c +++ b/nuttx/arch/arm/src/samd/sam_userspace.c @@ -46,7 +46,7 @@ #include "sam_userspace.h" -#ifdef CONFIG_NUTTX_KERNEL +#ifdef CONFIG_BUILD_PROTECTED /**************************************************************************** * Pre-processor Definitions @@ -110,4 +110,4 @@ void sam_userspace(void) } } -#endif /* CONFIG_NUTTX_KERNEL */ +#endif /* CONFIG_BUILD_PROTECTED */ diff --git a/nuttx/arch/arm/src/samd/sam_userspace.h b/nuttx/arch/arm/src/samd/sam_userspace.h index 922aed1db..e460afad3 100644 --- a/nuttx/arch/arm/src/samd/sam_userspace.h +++ b/nuttx/arch/arm/src/samd/sam_userspace.h @@ -69,7 +69,7 @@ * ****************************************************************************/ -#ifdef CONFIG_NUTTX_KERNEL +#ifdef CONFIG_BUILD_PROTECTED void sam_userspace(void); #endif |