Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL

1 files changed, 30 insertions, 6 deletions

diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig
index 0cb83efcf..41b28fab5 100644
--- a/nuttx/arch/Kconfig
+++ b/nuttx/arch/Kconfig
@@ -154,6 +154,10 @@ config ARCH_HAVE_MMU
 	bool
 	default n
 
+config ARCH_HAVE_MPU
+	bool
+	default n
+
 config ARCH_NAND_HWECC
 	bool
 	default n
@@ -162,6 +166,26 @@ config ARCH_HAVE_EXTCLK
 	bool
 	default n
 
+config ARCH_USE_MMU
+	bool "Enable MMU"
+	default n
+	depends on ARCH_HAVE_MMU
+	---help---
+		The architecture supports supports an MMU.  Enable this option in
+		order to enable use of the MMU.  For most architectures, this is
+		not really an option:  It is required to use the MMU.  In those
+		cases, this selection will always be forced.
+
+config ARCH_USE_MPU
+	bool "Enable MPU"
+	default n
+	depends on ARCH_HAVE_MPU
+	---help---
+		The architecture supports supports an MPU.  Enable this option in
+		order to enable use of the MPU.  For most architectures, this option
+		is enabled by other, platform-specific logic.  In those cases, this
+		selection will always be forced.
+
 menuconfig ARCH_ADDRENV
 	bool "Address environments"
 	default n
@@ -224,12 +248,12 @@ config ARCH_STACK_NPAGES
 		This, along with knowledge of the page size, determines the size of
 		the stack virtual address space. Default is 1.
 
-endif # ARCH_ADDRENV && ARCH_HAVE_MMU
+endif # ARCH_ADDRENV && ARCH_NEED_ADDRENV_MAPPING
 
 menuconfig PAGING
 	bool "On-demand paging"
 	default n
-	depends on ARCH_HAVE_MMU && !ARCH_ROMPGTABLE
+	depends on ARCH_USE_MMU && !ARCH_ROMPGTABLE
 	---help---
 		If set =y in your configation file, this setting will enable the on-demand
 		paging feature as described in http://www.nuttx.org/NuttXDemandPaging.html.
@@ -537,7 +561,7 @@ config ARCH_HIPRI_INTERRUPT
 
 			   int up_prioritize_irq(int irq, int priority)
 
-		NOTE: ARCH_INTERRUPTSTACK must be set in kernel mode (NUTTX_KERNEL).
+		NOTE: ARCH_INTERRUPTSTACK must be set in kernel mode (BUILD_KERNEL).
 		In kernel mode without an interrupt stack, the interrupt handler
 		will set the MSP to the stack pointer of the interrupted thread.  If
 		the interrupted thread was a privileged thread, that will be the MSP
@@ -641,7 +665,7 @@ config RAM_START
 config RAM_VSTART
 	hex "Primary RAM start address (virtual)"
 	default 0x0
-	depends on ARCH_HAVE_MMU
+	depends on ARCH_USE_MMU
 	help
 		The virtual start address of installed primary RAM. "Primary" RAM
 		refers to the RAM that you link program code into.  If program code
@@ -657,7 +681,7 @@ config RAM_SIZE
 		does not execute out of RAM but from FLASH, then you may designate
 		any block of RAM as "primary."
 
-if BOOT_RUNFROMFLASH && ARCH_HAVE_MMU
+if BOOT_RUNFROMFLASH && ARCH_USE_MMU
 
 config FLASH_START
 	hex "Boot FLASH start address (physical)"
@@ -680,7 +704,7 @@ config FLASH_SIZE
 		The size in bytes of the installed boot FLASH.  "Boot" FLASH
 		refers to the FLASH that you link program code into.
 
-endif # BOOT_RUNFROMFLASH && ARCH_HAVE_MMU
+endif # BOOT_RUNFROMFLASH && ARCH_USE_MMU
 
 config ARCH_HAVE_SDRAM
 	bool