Some initial clean-up in verifying the CONFIG_BUILD_PROTECTED configuration change
This commit is contained in:
parent
e3ff0689bb
commit
faf16f229c
2
Kconfig
2
Kconfig
@ -153,7 +153,6 @@ config BUILD_FLAT
|
||||
|
||||
config BUILD_PROTECTED
|
||||
bool "NuttX protected build"
|
||||
default n
|
||||
depends on ARCH_USE_MPU
|
||||
select LIB_SYSCALL
|
||||
select BUILD_2PASS
|
||||
@ -166,7 +165,6 @@ config BUILD_PROTECTED
|
||||
|
||||
config BUILD_KERNEL
|
||||
bool "NuttX kernel build"
|
||||
default n
|
||||
depends on ARCH_USE_MMU && ARCH_ADDRENV && EXPERIMENTAL
|
||||
select LIB_SYSCALL
|
||||
---help---
|
||||
|
@ -295,8 +295,7 @@ config ARCH_FPU
|
||||
|
||||
config ARMV7M_MPU
|
||||
bool "MPU support"
|
||||
default n if !ARCH_USE_MPU
|
||||
default y if ARCH_USE_MPU
|
||||
default n
|
||||
depends on ARCH_HAVE_MPU
|
||||
select ARCH_USE_MPU
|
||||
---help---
|
||||
|
@ -21,6 +21,8 @@ CONFIG_WINDOWS_CYGWIN=y
|
||||
# Build Configuration
|
||||
#
|
||||
# CONFIG_APPS_DIR="../apps"
|
||||
CONFIG_BUILD_FLAT=y
|
||||
# CONFIG_BUILD_KERNEL is not set
|
||||
# CONFIG_BUILD_2PASS is not set
|
||||
|
||||
#
|
||||
@ -104,7 +106,6 @@ CONFIG_ARCH_FAMILY="armv7-a"
|
||||
CONFIG_ARCH_CHIP="sama5"
|
||||
CONFIG_ARCH_HAVE_FPU=y
|
||||
CONFIG_ARCH_FPU=y
|
||||
# CONFIG_ARCH_HAVE_MPU is not set
|
||||
CONFIG_ARCH_HAVE_LOWVECTORS=y
|
||||
CONFIG_ARCH_LOWVECTORS=y
|
||||
# CONFIG_ARCH_ROMPGTABLE is not set
|
||||
@ -259,8 +260,10 @@ CONFIG_ARCH_HAVE_ADDRENV=y
|
||||
CONFIG_ARCH_NEED_ADDRENV_MAPPING=y
|
||||
CONFIG_ARCH_HAVE_VFORK=y
|
||||
CONFIG_ARCH_HAVE_MMU=y
|
||||
# CONFIG_ARCH_HAVE_MPU is not set
|
||||
CONFIG_ARCH_NAND_HWECC=y
|
||||
# CONFIG_ARCH_HAVE_EXTCLK is not set
|
||||
CONFIG_ARCH_USE_MMU=y
|
||||
CONFIG_ARCH_ADDRENV=y
|
||||
CONFIG_ARCH_TEXT_VBASE=0x80000000
|
||||
CONFIG_ARCH_DATA_VBASE=0x80100000
|
||||
@ -424,6 +427,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
|
||||
CONFIG_USERMAIN_STACKSIZE=2048
|
||||
CONFIG_PTHREAD_STACK_MIN=256
|
||||
CONFIG_PTHREAD_STACK_DEFAULT=2048
|
||||
# CONFIG_LIB_SYSCALL is not set
|
||||
|
||||
#
|
||||
# Device Drivers
|
||||
@ -697,6 +701,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
|
||||
# CONFIG_EXAMPLES_CXXTEST is not set
|
||||
# CONFIG_EXAMPLES_DHCPD is not set
|
||||
CONFIG_EXAMPLES_ELF=y
|
||||
# CONFIG_EXAMPLES_ELF_LIBC is not set
|
||||
CONFIG_EXAMPLES_ELF_DEVMINOR=0
|
||||
CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
|
||||
# CONFIG_EXAMPLES_FTPC is not set
|
||||
|
@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
|
||||
# Build Configuration
|
||||
#
|
||||
# CONFIG_APPS_DIR="../apps"
|
||||
CONFIG_BUILD_FLAT=y
|
||||
# CONFIG_BUILD_2PASS is not set
|
||||
|
||||
#
|
||||
@ -107,7 +108,6 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
|
||||
# CONFIG_ARMV7M_CMNVECTOR is not set
|
||||
CONFIG_ARCH_HAVE_FPU=y
|
||||
# CONFIG_ARCH_FPU is not set
|
||||
CONFIG_ARCH_HAVE_MPU=y
|
||||
# CONFIG_ARMV7M_MPU is not set
|
||||
|
||||
#
|
||||
@ -356,12 +356,16 @@ CONFIG_STM32_USART=y
|
||||
# CONFIG_ARCH_DMA is not set
|
||||
CONFIG_ARCH_HAVE_IRQPRIO=y
|
||||
# CONFIG_ARCH_L2CACHE is not set
|
||||
# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
|
||||
# CONFIG_CUSTOM_STACK is not set
|
||||
# CONFIG_ARCH_ADDRENV is not set
|
||||
# CONFIG_ARCH_HAVE_ADDRENV is not set
|
||||
# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
|
||||
CONFIG_ARCH_HAVE_VFORK=y
|
||||
# CONFIG_ARCH_HAVE_MMU is not set
|
||||
CONFIG_ARCH_HAVE_MPU=y
|
||||
# CONFIG_ARCH_NAND_HWECC is not set
|
||||
# CONFIG_ARCH_HAVE_EXTCLK is not set
|
||||
# CONFIG_ARCH_USE_MPU is not set
|
||||
# CONFIG_ARCH_IRQPRIO is not set
|
||||
CONFIG_ARCH_STACKDUMP=y
|
||||
# CONFIG_ENDIAN_BIG is not set
|
||||
@ -512,6 +516,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
|
||||
CONFIG_USERMAIN_STACKSIZE=2048
|
||||
CONFIG_PTHREAD_STACK_MIN=256
|
||||
CONFIG_PTHREAD_STACK_DEFAULT=2048
|
||||
# CONFIG_LIB_SYSCALL is not set
|
||||
|
||||
#
|
||||
# Device Drivers
|
||||
|
@ -115,14 +115,12 @@
|
||||
/* The kernel only build is equivalent to the kernel part of the protected
|
||||
* build.
|
||||
*/
|
||||
|
||||
#else
|
||||
/* User-space worker threads are not built in a flat build
|
||||
* (CONFIG_BUILD_PROTECTED=n && CONFIG_BUILD_KERNEL=n)
|
||||
*/
|
||||
|
||||
#else
|
||||
|
||||
/* To preserve legacy behavior, CONFIG_SCHED_HPWORK is assumed to be true
|
||||
*
|
||||
* To preserve legacy behavior, CONFIG_SCHED_HPWORK is assumed to be true
|
||||
* in a flat build (CONFIG_SCHED_KERNEL=n) but must be defined in kernel
|
||||
* mode in order to build the high priority work queue.
|
||||
*
|
||||
|
Loading…
x
Reference in New Issue
Block a user