Incorporate patch 1897630

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

4 files changed, 16 insertions, 10 deletions

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'.
  *
  ****************************************************************************/