sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

Browse Source
This commit is contained in:
Gregory Nutt 2014-08-29 14:47:22 -06:00
parent 833e172b83
commit 62231a28e9
14 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/ea3131/pgnsh/defconfig
View File

@ -25,7 +25,7 @@ CONFIG_BUILD_2PASS=y
CONFIG_PASS1_TARGET="all"
CONFIG_PASS1_BUILDIR="configs/ea3131/locked"
CONFIG_PASS1_OBJECT="locked.r"
# CONFIG_NUTTX_KERNEL is not set
# CONFIG_BUILD_PROTECTED is not set
#
# Binary Output Formats

4
configs/mikroe-stm32f4/kernel/up_userspace.c
View File

@ -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__ */

3
configs/mikroe-stm32f4/kostest/defconfig
View File

@ -21,7 +21,7 @@ CONFIG_BUILD_2PASS=y
CONFIG_PASS1_TARGET="all"
CONFIG_PASS1_BUILDIR="configs/mikroe-stm32f4/kernel"
CONFIG_PASS1_OBJECT=""
CONFIG_NUTTX_KERNEL=y
CONFIG_BUILD_PROTECTED=y
CONFIG_NUTTX_USERSPACE=0x08020000
#
@ -107,6 +107,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

4
configs/open1788/kernel/up_userspace.c
View File

@ -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__ */

3
configs/open1788/knsh/defconfig
View File

@ -20,7 +20,7 @@ CONFIG_BUILD_2PASS=y
CONFIG_PASS1_TARGET="all"
CONFIG_PASS1_BUILDIR="configs/open1788/kernel"
CONFIG_PASS1_OBJECT=""
CONFIG_NUTTX_KERNEL=y
CONFIG_BUILD_PROTECTED=y
CONFIG_NUTTX_USERSPACE=0x00010000
#
@ -86,6 +86,7 @@ CONFIG_ARCH_CHIP="lpc17xx"
CONFIG_ARCH_HAVE_CMNVECTOR=y
# CONFIG_ARMV7M_CMNVECTOR is not set
CONFIG_ARCH_HAVE_MPU=y
CONFIG_ARCH_USE_MPU=y
CONFIG_ARMV7M_MPU=y
CONFIG_ARMV7M_MPU_NREGIONS=8

2
configs/pcduino-a10/nsh/pcduino-140107.patch
View File

@ -48,7 +48,7 @@ index 3cc6323..ad42790 100644
@@ -353,6 +359,7 @@ void up_boot(void)
*/
#ifdef CONFIG_NUTTX_KERNEL
#ifdef CONFIG_BUILD_PROTECTED
+lowsyslog("Calling a1x_userspace\n"); // REMOVE ME
a1x_userspace();
#endif

4
configs/sam3u-ek/kernel/up_userspace.c
View File

@ -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__ */

3
configs/sam3u-ek/knsh/defconfig
View File

@ -21,7 +21,7 @@ CONFIG_BUILD_2PASS=y
CONFIG_PASS1_TARGET="all"
CONFIG_PASS1_BUILDIR="configs/sam3u-ek/kernel"
CONFIG_PASS1_OBJECT=""
CONFIG_NUTTX_KERNEL=y
CONFIG_BUILD_PROTECTED=y
CONFIG_NUTTX_USERSPACE=0x00090000
#
@ -104,6 +104,7 @@ CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set
# CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y
CONFIG_ARCH_USE_MPU=y
CONFIG_ARMV7M_MPU=y
CONFIG_ARMV7M_MPU_NREGIONS=8

1
configs/sam4s-xplained-pro/nsh/defconfig
View File

@ -101,6 +101,7 @@ CONFIG_ARCH_CHIP="sam34"
CONFIG_ARMV7M_USEBASEPRI=y
# CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y
CONFIG_ARCH_USE_MPU=y
CONFIG_ARMV7M_MPU=y
CONFIG_ARMV7M_MPU_NREGIONS=8

4
configs/stm3240g-eval/kernel/up_userspace.c
View File

@ -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__ */

3
configs/stm3240g-eval/knxwm/defconfig
View File

@ -25,7 +25,7 @@ CONFIG_BUILD_2PASS=y
CONFIG_PASS1_TARGET="all"
CONFIG_PASS1_BUILDIR="configs/stm3240g-eval/kernel"
CONFIG_PASS1_OBJECT=""
CONFIG_NUTTX_KERNEL=y
CONFIG_BUILD_PROTECTED=y
CONFIG_NUTTX_USERSPACE=0x08040000
#
@ -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

8
configs/stm3240g-eval/src/up_boot.c
View File

@ -51,7 +51,7 @@
* if nx_start() is available (CONFIG_NX_NXSTART=y) and if the NxWidget::CNxServer
* class expects the RTOS to do the NX initialization (CONFIG_NXWIDGET_SERVERINIT=n).
* This combination of settings is normally only used in the kernel build mode
* (CONFIG_NUTTX_KERNEL) when NxWidgets is unable to initialize NX from user-space.
* (CONFIG_BUILD_PROTECTED) when NxWidgets is unable to initialize NX from user-space.
*/
#undef HAVE_NXSTART
@ -67,7 +67,7 @@
# include <nuttx/nx/nx.h>
# endif
# else
# if !defined(CONFIG_NXWIDGET_SERVERINIT) && defined(CONFIG_NUTTX_KERNEL)
# if !defined(CONFIG_NXWIDGET_SERVERINIT) && defined(CONFIG_BUILD_PROTECTED)
# error CONFIG_NX_NXSTART=y is needed
# endif
# endif
@ -78,7 +78,7 @@
* touchscreen (CONFIG_NXWM_TOUCHSCREEN=y), and if we were asked to
* initialize the touchscreen for NxWM (NXWM_TOUCHSCREEN_DEVINIT=n). This
* combination of settings is normally only used in the kernel build mode
* (CONFIG_NUTTX_KERNEL) when NxWidgets is unable to initialize NX from
* (CONFIG_BUILD_PROTECTED) when NxWidgets is unable to initialize NX from
* user-space.
*/
@ -93,7 +93,7 @@
# include <nuttx/input/touchscreen.h>
# endif
# else
# if !defined(CONFIG_NXWM_TOUCHSCREEN_DEVINIT) && defined(CONFIG_NUTTX_KERNEL)
# if !defined(CONFIG_NXWM_TOUCHSCREEN_DEVINIT) && defined(CONFIG_BUILD_PROTECTED)
# error CONFIG_INPUT_STMPE811=y is needed
# endif
# endif

4
configs/stm32f4discovery/kernel/up_userspace.c
View File

@ -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__ */

3
configs/stm32f4discovery/kostest/defconfig
View File

@ -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