Add option to copy to RAM

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1689 42af7a65-404d-4744-a932-0658087f49c3

Documentation/NuttxPortingGuide.html

@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: March 13, 2009</p>
+      <p>Last Updated: April 8, 2009</p>
     </td>
   </tr>
 </table>
@@ -2061,8 +2061,12 @@ The system can be re-made subsequently by just typing <code>make</code>.
 
 <ul>
   <li>
-    <code>CONFIG_BOOT_FROM_FLASH</code>: Some configurations support XIP
+    <code>CONFIG_BOOT_RUNFROMFLASH</code>: Some configurations support XIP
-    operation from FLASH.
+    operation from FLASH but must copy initialized .data sections to RAM.
+  </li>
+  <li>
+    <code>CONFIG_BOOT_COPYTORAM</code>: Some configurations boot in FLASH
+    but copy themselves entirely into RAM for better performance.
   </li>
   <li>
     <code>CONFIG_STACK_POINTER</code>: The initial stack pointer

arch/arm/src/Makefile

@@ -83,7 +83,7 @@ nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT)
 	@echo "LD: nuttx"
 	@$(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \
 		--start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC)
-ifeq ($(CONFIG_BOOT_FROM_FLASH),y)
+ifeq ($(CONFIG_BOOT_RUNFROMFLASH),y)
 	@export flashloc=`$(OBJDUMP) --all-headers $(TOPDIR)/$@ | grep _eronly | cut -d' ' -f1`;  \
 	$(OBJCOPY) --adjust-section-vma=.data=0x$$flashloc $(TOPDIR)/$@ $(TOPDIR)/$@.flashimage
 	@mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@

arch/arm/src/common/up_nommuhead.S

@@ -93,7 +93,7 @@ __start:
 
 	/* Copy system .data sections to new home in RAM. */
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 
 	adr	r3, LC2
 	ldmia	r3, {r0, r1, r2}
@@ -141,7 +141,7 @@ LC0:	.long	_sbss
 	.long	_ebss
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.long	_sdata	/* Where .data needs to reside in SDRAM */
 	.long	_edata

arch/arm/src/lpc214x/lpc214x_head.S

@@ -557,7 +557,7 @@ __start:
 
 	/* Copy system .data sections to new home in RAM. */
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 
 	adr	r3, LC2
 	ldmia	r3, {r0, r1, r2}
@@ -601,7 +601,7 @@ LC0:	.long	_sbss
 	.long	_ebss
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.long	_sdata	/* Where .data needs to reside in SDRAM */
 	.long	_edata

arch/arm/src/str71x/str71x_head.S

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * arch/arm/src/str71x/str71x_head.S
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -510,7 +510,7 @@ __flashstart:
 
 	/* Copy system .data sections to new home in RAM. */
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 
 	adr	r3, LC2
 	ldmia	r3, {r0, r1, r2}
@@ -601,7 +601,7 @@ LC0:	.long	_sbss
 	.long	_ebss
 	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.long	_sdata	/* Where .data needs to reside in SDRAM */
 	.long	_edata

arch/sh/src/Makefile

@@ -83,7 +83,7 @@ nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT)
 	@echo "LD: nuttx"
 	@$(LD) --entry=__start $(LDFLAGS) $(LDPATHES) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_AOBJ) \
 		--start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC)
-ifeq ($(CONFIG_BOOT_FROM_FLASH),y)
+ifeq ($(CONFIG_BOOT_RUNFROMFLASH),y)
 	@export flashloc=`$(OBJDUMP) --all-headers $(TOPDIR)/$@ | grep _eronly | cut -d' ' -f1`;  \
 	$(OBJCOPY) --adjust-section-vma=.data=0x$$flashloc $(TOPDIR)/$@ $(TOPDIR)/$@.flashimage
 	@mv $(TOPDIR)/$@.flashimage $(TOPDIR)/$@

arch/sh/src/sh1/sh1_head.S

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * arch/sh/src/sh1/sh1_head.S
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -78,7 +78,7 @@
 	.globl	_ebss			/* End of BSS */
 	.globl	_svect			/* Start of the new vector location */
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 	.globl	_eronly			/* Where .data defaults are stored in FLASH */
 	.global	_sdata			/* Start of .data in RAM */
 	.globl	_edata			/* End of .data in RAM */
@@ -388,7 +388,7 @@ __start0:
 
 	/* Initialize data segement */
 
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 	mov.l	.Lsdata, r0		/* R0: Start of .data segment */
 	mov.l	.Ledata, r1		/* R1: End+1 of .data segment */
 	mov.l	.Leronly, r2		/* R2: Start of FLASH .data segment copy */
@@ -469,7 +469,7 @@ __start0:
 	nop
 
 	.align 2
-#ifdef CONFIG_BOOT_FROM_FLASH
+#ifdef CONFIG_BOOT_RUNFROMFLASH
 .Leronly:
 	.long   _eronly
 .Lsdata:

configs/README.txt

@@ -440,8 +440,10 @@ defconfig -- This is a configuration file similar to the Linux
 
 	Stack and heap information
 
-		CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+		CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-		  operation from FLASH.
+		  operation from FLASH but must copy initialized .data sections to RAM.
+		CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+		  but copy themselves entirely into RAM for better performance.
 		CONFIG_STACK_POINTER - The initial stack pointer
 		CONFIG_IDLETHREAD_STACKSIZE - The size of the initial stack.
 		  This is the thread that (1) performs the inital boot of the system up

configs/c5471evm/defconfig

@@ -387,8 +387,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -404,7 +406,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/c5471evm/dhcpconfig

@@ -387,8 +387,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -404,7 +406,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/c5471evm/netconfig

@@ -387,8 +387,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -404,7 +406,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/c5471evm/nshconfig

@@ -387,8 +387,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -404,7 +406,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/ez80f910200kitg/ostest/defconfig

@@ -727,8 +727,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -744,7 +746,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/ez80f910200zco/dhcpd/defconfig

@@ -775,8 +775,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -792,7 +794,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/ez80f910200zco/httpd/defconfig

@@ -783,8 +783,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -800,7 +802,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/ez80f910200zco/nettest/defconfig

@@ -768,8 +768,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -785,7 +787,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/ez80f910200zco/nsh/defconfig

@@ -768,8 +768,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -785,7 +787,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/ez80f910200zco/ostest/defconfig

@@ -751,8 +751,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -768,7 +770,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/ez80f910200zco/poll/defconfig

@@ -768,8 +768,10 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -785,7 +787,8 @@ CONFIG_EXAMPLE_WGET_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/m68332evb/defconfig

@@ -328,8 +328,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_IDLETHREAD_STACKSIZE - The size of the initial stack.
@@ -344,7 +346,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/mcu123-lpc214x/nsh/defconfig

@@ -558,8 +558,10 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -575,7 +577,8 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=y
+CONFIG_BOOT_RUNFROMFLASH=y
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=2048

configs/mcu123-lpc214x/ostest/defconfig

@@ -549,8 +549,10 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -566,7 +568,8 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=y
+CONFIG_BOOT_RUNFROMFLASH=y
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=2048

configs/mcu123-lpc214x/usbserial/defconfig

@@ -570,8 +570,10 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -587,7 +589,8 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=y
+CONFIG_BOOT_RUNFROMFLASH=y
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=2048

configs/mcu123-lpc214x/usbstorage/defconfig

@@ -613,8 +613,10 @@ CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -630,7 +632,8 @@ CONFIG_EXAMPLES_USBSTRG_TRACEINTERRUPTS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=y
+CONFIG_BOOT_RUNFROMFLASH=y
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=2048

configs/ntosd-dm320/nettest/defconfig

@@ -487,8 +487,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -504,7 +506,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/ntosd-dm320/nsh/defconfig

@@ -549,8 +549,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -566,7 +568,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/ntosd-dm320/ostest/defconfig

@@ -479,8 +479,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -496,7 +498,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/ntosd-dm320/poll/defconfig

@@ -494,8 +494,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -511,7 +513,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/ntosd-dm320/udp/defconfig

@@ -495,8 +495,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -512,7 +514,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/ntosd-dm320/uip/defconfig

@@ -495,8 +495,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -512,7 +514,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=4096

configs/olimex-strp711/ostest/defconfig

@@ -620,8 +620,10 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -637,7 +639,8 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=y
+CONFIG_BOOT_RUNFROMFLASH=y
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=2048

configs/pjrc-8051/defconfig

@@ -325,8 +325,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -342,7 +344,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=y
 CONFIG_IDLETHREAD_STACKSIZE=
 CONFIG_USERMAIN_STACKSIZE=

configs/sim/mount/defconfig

@@ -329,8 +329,10 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -346,7 +348,8 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/sim/nettest/defconfig

@@ -328,8 +328,10 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -345,7 +347,8 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/sim/nsh/defconfig

@@ -372,8 +372,10 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -389,7 +391,8 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/sim/nx/defconfig

@@ -504,8 +504,10 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -521,7 +523,8 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/sim/nx/defconfig-x11

@@ -498,8 +498,10 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -515,7 +517,8 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/sim/ostest/defconfig

@@ -336,8 +336,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -353,7 +355,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/sim/pashello/defconfig

@@ -317,8 +317,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -334,7 +336,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/skp16c26/ostest/defconfig

@@ -509,8 +509,10 @@ CONFIG_DM9X_ETRANS=n
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -526,7 +528,8 @@ CONFIG_DM9X_ETRANS=n
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=256

configs/us7032evb1/nsh/defconfig

@@ -549,8 +549,10 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -566,7 +568,8 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/us7032evb1/ostest/defconfig

@@ -549,8 +549,10 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer (arm7tdmi only)
@@ -566,7 +568,8 @@ CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_STACK_POINTER=
 CONFIG_IDLETHREAD_STACKSIZE=1024

configs/xtrs/nsh/defconfig

@@ -364,8 +364,10 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -381,7 +383,8 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024

configs/xtrs/ostest/defconfig

@@ -321,8 +321,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -338,7 +340,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024

configs/xtrs/pashello/defconfig

@@ -321,8 +321,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -338,7 +340,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024

configs/z16f2800100zcog/ostest/defconfig

@@ -349,8 +349,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -366,7 +368,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/z16f2800100zcog/pashello/defconfig

@@ -349,8 +349,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -366,7 +368,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096

configs/z80sim/nsh/defconfig

@@ -354,8 +354,10 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -371,7 +373,8 @@ CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024

configs/z80sim/ostest/defconfig

@@ -311,8 +311,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -328,7 +330,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024

configs/z80sim/pashello/defconfig

@@ -311,8 +311,10 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 # Stack and heap information
 #
-# CONFIG_BOOT_FROM_FLASH - Some configurations support XIP
+# CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP
-#   operation from FLASH.
+#   operation from FLASH but must copy initialized .data sections to RAM.
+# CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
+#   but copy themselves entirely into RAM for better performance.
 # CONFIG_CUSTOM_STACK - The up_ implementation will handle
 #   all stack operations outside of the nuttx model.
 # CONFIG_STACK_POINTER - The initial stack pointer
@@ -328,7 +330,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 # CONFIG_HEAP_BASE - The beginning of the heap
 # CONFIG_HEAP_SIZE - The size of the heap
 #
-CONFIG_BOOT_FROM_FLASH=n
+CONFIG_BOOT_RUNFROMFLASH=n
+CONFIG_BOOT_COPYTORAM=n
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024