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/configs/stm32f4discovery | |
| 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/configs/stm32f4discovery')
| -rw-r--r-- | nuttx/configs/stm32f4discovery/kernel/up_userspace.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/stm32f4discovery/kostest/defconfig | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/configs/stm32f4discovery/kernel/up_userspace.c b/nuttx/configs/stm32f4discovery/kernel/up_userspace.c index 6dd84cbe3..047fd7647 100644 --- a/nuttx/configs/stm32f4discovery/kernel/up_userspace.c +++ b/nuttx/configs/stm32f4discovery/kernel/up_userspace.c @@ -45,7 +45,7 @@ #include <nuttx/wqueue.h> #include <nuttx/mm.h> -#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__) +#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -139,4 +139,4 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) = * Public Functions ****************************************************************************/ -#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ */ +#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */ diff --git a/nuttx/configs/stm32f4discovery/kostest/defconfig b/nuttx/configs/stm32f4discovery/kostest/defconfig index 3e210d62f..743585918 100644 --- a/nuttx/configs/stm32f4discovery/kostest/defconfig +++ b/nuttx/configs/stm32f4discovery/kostest/defconfig @@ -25,7 +25,7 @@ CONFIG_BUILD_2PASS=y CONFIG_PASS1_TARGET="all" CONFIG_PASS1_BUILDIR="configs/stm32f4discovery/kernel" CONFIG_PASS1_OBJECT="" -CONFIG_NUTTX_KERNEL=y +CONFIG_BUILD_PROTECTED=y CONFIG_NUTTX_USERSPACE=0x08020000 # @@ -111,6 +111,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y CONFIG_ARCH_HAVE_FPU=y # CONFIG_ARCH_FPU is not set CONFIG_ARCH_HAVE_MPU=y +CONFIG_ARCH_USE_MPU=y CONFIG_ARMV7M_MPU=y CONFIG_ARMV7M_MPU_NREGIONS=8 |