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/sched/init | |
| 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 'nuttx/sched/init')
| -rw-r--r-- | nuttx/sched/init/os_bringup.c | 4 | ||||
| -rw-r--r-- | nuttx/sched/init/os_start.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/nuttx/sched/init/os_bringup.c b/nuttx/sched/init/os_bringup.c index bb9889956..175330ad5 100644 --- a/nuttx/sched/init/os_bringup.c +++ b/nuttx/sched/init/os_bringup.c @@ -197,7 +197,7 @@ int os_bringup(void) #endif /* CONFIG_SCHED_LPWORK */ #endif /* CONFIG_SCHED_HPWORK */ -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_SCHED_USRWORK) +#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_SCHED_USRWORK) /* Start the user-space work queue */ DEBUGASSERT(USERSPACE->work_usrstart != NULL); @@ -228,7 +228,7 @@ int os_bringup(void) * header at the beginning of the user-space blob. */ -#ifdef CONFIG_NUTTX_KERNEL +#ifdef CONFIG_BUILD_PROTECTED DEBUGASSERT(USERSPACE->us_entrypoint != NULL); taskid = TASK_CREATE("init", SCHED_PRIORITY_DEFAULT, CONFIG_USERMAIN_STACKSIZE, USERSPACE->us_entrypoint, diff --git a/nuttx/sched/init/os_start.c b/nuttx/sched/init/os_start.c index fdd308dfb..7130b8ae8 100644 --- a/nuttx/sched/init/os_start.c +++ b/nuttx/sched/init/os_start.c @@ -151,7 +151,8 @@ volatile dq_queue_t g_inactivetasks; volatile sq_queue_t g_delayed_kufree; -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ + defined(CONFIG_MM_KERNEL_HEAP) volatile sq_queue_t g_delayed_kfree; #endif @@ -264,7 +265,8 @@ void os_start(void) #endif dq_init(&g_inactivetasks); sq_init(&g_delayed_kufree); -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ + defined(CONFIG_MM_KERNEL_HEAP) sq_init(&g_delayed_kfree); #endif @@ -308,13 +310,14 @@ void os_start(void) * and there is no support that yet. */ -#if defined(CONFIG_CUSTOM_STACK) || !defined(CONFIG_NUTTX_KERNEL) +#if defined(CONFIG_CUSTOM_STACK) || (!defined(CONFIG_BUILD_PROTECTED) && \ + !defined(CONFIG_BUILD_KERNEL)) #if CONFIG_TASK_NAME_SIZE > 0 g_idletcb.argv[0] = g_idletcb.cmn.name; #else g_idletcb.argv[0] = (char*)g_idlename; #endif /* CONFIG_TASK_NAME_SIZE */ -#endif /* CONFIG_CUSTOM_STACK || !CONFIG_NUTTX_KERNEL */ +#endif /* CONFIG_CUSTOM_STACK || (!CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL) */ /* Then add the idle task's TCB to the head of the ready to run list */ @@ -350,7 +353,8 @@ void os_start(void) up_allocate_heap(&heap_start, &heap_size); kumm_initialize(heap_start, heap_size); -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if (defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)) && \ + defined(CONFIG_MM_KERNEL_HEAP) /* Get the kernel-mode heap from the platform specific code and configure * the kernel-mode memory allocator. */ |