From 64892e44f2ce2612c77b1b20497fb007adafafb8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 29 Aug 2014 14:47:22 -0600 Subject: Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL --- nuttx/arch/z80/src/common/up_allocateheap.c | 2 +- nuttx/arch/z80/src/common/up_createstack.c | 4 ++-- nuttx/arch/z80/src/common/up_releasestack.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nuttx/arch/z80') diff --git a/nuttx/arch/z80/src/common/up_allocateheap.c b/nuttx/arch/z80/src/common/up_allocateheap.c index 8a6095d51..c3c5a0349 100644 --- a/nuttx/arch/z80/src/common/up_allocateheap.c +++ b/nuttx/arch/z80/src/common/up_allocateheap.c @@ -87,7 +87,7 @@ * Description: * This function will be called to dynamically set aside the heap region. * - * For the kernel build (CONFIG_NUTTX_KERNEL=y) with both kernel- and + * For the kernel build (CONFIG_BUILD_KERNEL=y) with both kernel- and * user-space heaps (CONFIG_MM_KERNEL_HEAP=y), this function provides the * size of the unprotected, user-space heap. * diff --git a/nuttx/arch/z80/src/common/up_createstack.c b/nuttx/arch/z80/src/common/up_createstack.c index 1a058ec50..1b7506673 100644 --- a/nuttx/arch/z80/src/common/up_createstack.c +++ b/nuttx/arch/z80/src/common/up_createstack.c @@ -92,7 +92,7 @@ * however, there are certain contexts where the TCB may not be fully * initialized when up_create_stack is called. * - * If CONFIG_NUTTX_KERNEL is defined, then this thread type may affect + * If CONFIG_BUILD_KERNEL is defined, then this thread type may affect * how the stack is allocated. For example, kernel thread stacks should * be allocated from protected kernel memory. Stacks for user tasks and * threads must come from memory that is accessible to user code. @@ -121,7 +121,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) * then create a zeroed stack to make stack dumps easier to trace. */ -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) /* Use the kernel allocator if this is a kernel thread */ if (ttype == TCB_FLAG_TTYPE_KERNEL) diff --git a/nuttx/arch/z80/src/common/up_releasestack.c b/nuttx/arch/z80/src/common/up_releasestack.c index 9ea249a63..be978aadd 100644 --- a/nuttx/arch/z80/src/common/up_releasestack.c +++ b/nuttx/arch/z80/src/common/up_releasestack.c @@ -79,7 +79,7 @@ * however, there are certain error recovery contexts where the TCB may * not be fully initialized when up_release_stack is called. * - * If CONFIG_NUTTX_KERNEL is defined, then this thread type may affect + * If CONFIG_BUILD_KERNEL is defined, then this thread type may affect * how the stack is freed. For example, kernel thread stacks may have * been allocated from protected kernel memory. Stacks for user tasks * and threads must have come from memory that is accessible to user @@ -96,7 +96,7 @@ void up_release_stack(FAR struct tcb_s *dtcb, uint8_t ttype) if (dtcb->stack_alloc_ptr) { -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) /* Use the kernel allocator if this is a kernel thread */ if (ttype == TCB_FLAG_TTYPE_KERNEL) -- cgit v1.2.3