Incorporate patch 1897630

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

29 files changed, 51 insertions, 36 deletions

diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index c84fa4fe1..ba4de942a 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -1349,7 +1349,7 @@ The system can be re-made subsequently by just typing <code>make</code>.
     <code>CONFIG_DEBUG_LIB</code>: enable C library debug output (disabled by default)
   </li>
   <li>
-    <code>CONFIG_HAVE_LOWPUTC</code>: architecture supports low-level, boot
+    <code>CONFIG_ARCH_LOWPUTC</code>: architecture supports low-level, boot
     time console output
   </li>
   <li>
diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc
index 895ecc4ba..ac38c2460 100644
--- a/nuttx/arch/z80/src/Makefile.sdcc
+++ b/nuttx/arch/z80/src/Makefile.sdcc
@@ -128,6 +128,11 @@ endif
 	@echo "	CONFIG_STACK_BASE	== (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE))" >> asm_mem.h
 	@echo "	CONFIG_HEAP1_END	== (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE) - 1)" >> asm_mem.h
 	@echo "	CONFIG_HEAP1_BASE	== $(HEAP_BASE)" >> asm_mem.h
+ifeq ($(CONFIG_LINKER_ROM_AT_0000),y)
+	@echo "	CONFIG_LINKER_ROM_AT_0000	== 1" >> asm_mem.h
+else
+	@echo "	CONFIG_LINKER_ROM_AT_0000	== 0" >> asm_mem.h
+endif
 
 # Combine all objects in this directory into a library
 
diff --git a/nuttx/arch/z80/src/z80/z80_head.asm b/nuttx/arch/z80/src/z80/z80_head.asm
index eb246b588..62f2496a4 100644
--- a/nuttx/arch/z80/src/z80/z80_head.asm
+++ b/nuttx/arch/z80/src/z80/z80_head.asm
@@ -63,6 +63,9 @@
 	.globl	_os_start		; OS entry point

 	.globl	_up_doirq		; Interrupt decoding logic

 

+
+.if CONFIG_LINKER_ROM_AT_0000
+.else ;CONFIG_LINKER_ROM_AT_0000
 ;**************************************************************************

 ; Reset entry point

 ;**************************************************************************

@@ -158,6 +161,7 @@
 	.org   0x0066

 	retn

 

+.endif ;CONFIG_LINKER_ROM_AT_0000
 ;**************************************************************************

 ; System start logic

 ;**************************************************************************

diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index c5ce860f0..3f5f563fb 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -156,7 +156,7 @@ defconfig -- This is a configuration file similar to the Linux
 		  by default)
 		CONFIG_DEBUG_LIB - enable C library debug output (disabled
 		  by default)
-		CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+		CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 		  time console output
 		CONFIG_MM_REGIONS - If the architecture includes multiple
 		  regions of memory to allocate from, this specifies the
diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig
index 85a2b5b8b..a71ef7575 100644
--- a/nuttx/configs/c5471evm/defconfig
+++ b/nuttx/configs/c5471evm/defconfig
@@ -117,7 +117,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig
index 555a051ab..4fbbb2e1f 100644
--- a/nuttx/configs/c5471evm/dhcpconfig
+++ b/nuttx/configs/c5471evm/dhcpconfig
@@ -117,7 +117,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig
index 1d73d1bbe..1c0377e40 100644
--- a/nuttx/configs/c5471evm/netconfig
+++ b/nuttx/configs/c5471evm/netconfig
@@ -117,7 +117,7 @@ CONFIG_UART_MODEM_2STOP=0
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig
index 9e185994f..b98d3c6a5 100644
--- a/nuttx/configs/c5471evm/nshconfig
+++ b/nuttx/configs/c5471evm/nshconfig
@@ -117,7 +117,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig
index 99dc97c53..1710293a1 100644
--- a/nuttx/configs/m68332evb/defconfig
+++ b/nuttx/configs/m68332evb/defconfig
@@ -106,7 +106,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/mcu123-lpc214x/defconfig b/nuttx/configs/mcu123-lpc214x/defconfig
index 93883dfd1..79759b4c4 100644
--- a/nuttx/configs/mcu123-lpc214x/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/defconfig
@@ -130,7 +130,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/ntosd-dm320/defconfig b/nuttx/configs/ntosd-dm320/defconfig
index d6c138167..f0d79e4e3 100644
--- a/nuttx/configs/ntosd-dm320/defconfig
+++ b/nuttx/configs/ntosd-dm320/defconfig
@@ -115,7 +115,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/ntosd-dm320/netconfig b/nuttx/configs/ntosd-dm320/netconfig
index 99c790c57..134c1b0ea 100644
--- a/nuttx/configs/ntosd-dm320/netconfig
+++ b/nuttx/configs/ntosd-dm320/netconfig
@@ -115,7 +115,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/ntosd-dm320/udpconfig b/nuttx/configs/ntosd-dm320/udpconfig
index e5e52153d..d753940cf 100644
--- a/nuttx/configs/ntosd-dm320/udpconfig
+++ b/nuttx/configs/ntosd-dm320/udpconfig
@@ -115,7 +115,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/ntosd-dm320/uipconfig b/nuttx/configs/ntosd-dm320/uipconfig
index 37516219d..60cf173c6 100644
--- a/nuttx/configs/ntosd-dm320/uipconfig
+++ b/nuttx/configs/ntosd-dm320/uipconfig
@@ -115,7 +115,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig
index e10a6d540..25fb881af 100644
--- a/nuttx/configs/pjrc-8051/defconfig
+++ b/nuttx/configs/pjrc-8051/defconfig
@@ -103,7 +103,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig
index 77f4ae829..dd89ba88c 100644
--- a/nuttx/configs/sim/nettest/defconfig
+++ b/nuttx/configs/sim/nettest/defconfig
@@ -71,7 +71,7 @@ CONFIG_HAVE_LIBM=y
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig
index 93d9d0459..a7d93ec76 100644
--- a/nuttx/configs/sim/ostest/defconfig
+++ b/nuttx/configs/sim/ostest/defconfig
@@ -60,7 +60,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig
index f2e035594..f6491aaa1 100644
--- a/nuttx/configs/sim/pashello/defconfig
+++ b/nuttx/configs/sim/pashello/defconfig
@@ -60,7 +60,7 @@ CONFIG_ARCH_BOARD_SIM=y
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig
index d5467c869..cdcb6e9d3 100644
--- a/nuttx/configs/xtrs/nsh/defconfig
+++ b/nuttx/configs/xtrs/nsh/defconfig
@@ -73,13 +73,15 @@ CONFIG_UART_TXBUFSIZE=256
 #
 # CONFIG_LINKER_START_AREA		- Start of START area
 # CONFIG_LINKER_CODE_AREA 		- Start of _CODE area
-#
+# CONFIG_LINKER_ROM_AT_0000		- Disable the initialization code
+#   starting at 0000
 
 CONFIG_RRLOAD_BINARY=n
 CONFIG_HAVE_LIBM=n
 
 CONFIG_LINKER_START_AREA=0x5200
 CONFIG_LINKER_CODE_AREA=0x5300
+CONFIG_LINKER_ROM_AT_0000=y
 
 #
 # General OS setup
@@ -92,7 +94,7 @@ CONFIG_LINKER_CODE_AREA=0x5300
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig
index e7cda9a36..c616b578d 100644
--- a/nuttx/configs/xtrs/ostest/defconfig
+++ b/nuttx/configs/xtrs/ostest/defconfig
@@ -73,13 +73,15 @@ CONFIG_UART_TXBUFSIZE=256
 #
 # CONFIG_LINKER_START_AREA		- Start of START area
 # CONFIG_LINKER_CODE_AREA 		- Start of _CODE area
-#
+# CONFIG_LINKER_ROM_AT_0000		- Disable the initialization code
+#   starting at 0000
 
 CONFIG_RRLOAD_BINARY=n
 CONFIG_HAVE_LIBM=n
 
 CONFIG_LINKER_START_AREA=0x5200
 CONFIG_LINKER_CODE_AREA=0x5300
+CONFIG_LINKER_ROM_AT_0000=y
 
 #
 # General OS setup
@@ -92,7 +94,7 @@ CONFIG_LINKER_CODE_AREA=0x5300
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig
index 7246a8b16..0fcf274c3 100644
--- a/nuttx/configs/xtrs/pashello/defconfig
+++ b/nuttx/configs/xtrs/pashello/defconfig
@@ -73,13 +73,15 @@ CONFIG_UART_TXBUFSIZE=256
 #
 # CONFIG_LINKER_START_AREA		- Start of START area
 # CONFIG_LINKER_CODE_AREA 		- Start of _CODE area
-#
+# CONFIG_LINKER_ROM_AT_0000		- Disable the initialization code
+#   starting at 0000
 
 CONFIG_RRLOAD_BINARY=n
 CONFIG_HAVE_LIBM=n
 
 CONFIG_LINKER_START_AREA=0x5200
 CONFIG_LINKER_CODE_AREA=0x5300
+CONFIG_LINKER_ROM_AT_0000=y
 
 #
 # General OS setup
@@ -92,7 +94,7 @@ CONFIG_LINKER_CODE_AREA=0x5300
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/xtrs/src/xtr_serial.c b/nuttx/configs/xtrs/src/xtr_serial.c
index b6a90baf1..decadccec 100644
--- a/nuttx/configs/xtrs/src/xtr_serial.c
+++ b/nuttx/configs/xtrs/src/xtr_serial.c
@@ -211,10 +211,10 @@ static void up_shutdown(struct uart_dev_s *dev)
  * Description:
  *   Configure the UART to operation in interrupt driven mode.  This method is
  *   called when the serial port is opened.  Normally, this is just after the
- *   the setup() method is called, however, the serial console may operate in
- *   a non-interrupt driven mode during the boot phase.
+ *   setup() method is called, however, the serial console may operate in a
+ *   non-interrupt driven mode during the boot phase.
  *
- *   RX and TX interrupts are not enabled when by the attach method (unless the
+ *   RX and TX interrupts are not enabled by the attach method (unless the
  *   hardware supports multiple levels of interrupt enabling).  The RX and TX
  *   interrupts are not enabled until the txint() and rxint() methods are called.
  *
@@ -271,7 +271,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
  * Description:
  *   Called (usually) from the interrupt level to receive one
  *   character from the UART.  Error bits associated with the
- *   receipt are provided in the the return 'status'.
+ *   receipt are provided in the return 'status'.
  *
  ****************************************************************************/
 
diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig
index 60cb0cc7b..43033efa2 100644
--- a/nuttx/configs/z16f2800100zcog/ostest/defconfig
+++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig
@@ -117,7 +117,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig
index 0569a311d..b0e8756ed 100644
--- a/nuttx/configs/z16f2800100zcog/pashello/defconfig
+++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig
@@ -117,7 +117,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig
index 190f7af9c..83637924a 100644
--- a/nuttx/configs/z80sim/nsh/defconfig
+++ b/nuttx/configs/z80sim/nsh/defconfig
@@ -85,7 +85,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig
index 3907e75b7..2f06409b1 100644
--- a/nuttx/configs/z80sim/ostest/defconfig
+++ b/nuttx/configs/z80sim/ostest/defconfig
@@ -85,7 +85,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig
index 6f2649084..b5431c1dc 100644
--- a/nuttx/configs/z80sim/pashello/defconfig
+++ b/nuttx/configs/z80sim/pashello/defconfig
@@ -85,7 +85,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
 #   or TICKS_PER_MSEC=10.  This setting may be defined to
diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c
index 974b51b8f..239e530fd 100644
--- a/nuttx/configs/z80sim/src/z80_serial.c
+++ b/nuttx/configs/z80sim/src/z80_serial.c
@@ -173,10 +173,10 @@ static void up_shutdown(struct uart_dev_s *dev)
  * Description:
  *   Configure the UART to operation in interrupt driven mode.  This method is
  *   called when the serial port is opened.  Normally, this is just after the
- *   the setup() method is called, however, the serial console may operate in
- *   a non-interrupt driven mode during the boot phase.
+ *   setup() method is called, however, the serial console may operate in a
+ *   non-interrupt driven mode during the boot phase.
  *
- *   RX and TX interrupts are not enabled when by the attach method (unless the
+ *   RX and TX interrupts are not enabled by the attach method (unless the
  *   hardware supports multiple levels of interrupt enabling).  The RX and TX
  *   interrupts are not enabled until the txint() and rxint() methods are called.
  *
@@ -221,7 +221,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
  * Description:
  *   Called (usually) from the interrupt level to receive one
  *   character from the UART.  Error bits associated with the
- *   receipt are provided in the the return 'status'.
+ *   receipt are provided in the return 'status'.
  *
  ****************************************************************************/
 
diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig
index 78b532622..2b5500295 100644
--- a/nuttx/configs/z8encore000zco/ostest/defconfig
+++ b/nuttx/configs/z8encore000zco/ostest/defconfig
@@ -117,7 +117,7 @@ CONFIG_HAVE_LIBM=n
 #   regions of memory to allocate from, this specifies the
 #   number of memory regions that the memory manager must
 #   handle and enables the API mm_addregion(start, end);
-# CONFIG_HAVE_LOWPUTC - architecture supports low-level, boot
+# CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input