From 491f5b42b52c83089a623e19d7cedc8577a88638 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 20 Feb 2008 12:55:07 +0000 Subject: [PATCH] Incorporate patch 1897630 git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@714 42af7a65-404d-4744-a932-0658087f49c3 --- Documentation/NuttxPortingGuide.html | 2 +- arch/z80/src/Makefile.sdcc | 5 +++++ arch/z80/src/z80/z80_head.asm | 4 ++++ configs/README.txt | 2 +- configs/c5471evm/defconfig | 2 +- configs/c5471evm/dhcpconfig | 2 +- configs/c5471evm/netconfig | 2 +- configs/c5471evm/nshconfig | 2 +- configs/m68332evb/defconfig | 2 +- configs/mcu123-lpc214x/defconfig | 2 +- configs/ntosd-dm320/defconfig | 2 +- configs/ntosd-dm320/netconfig | 2 +- configs/ntosd-dm320/udpconfig | 2 +- configs/ntosd-dm320/uipconfig | 2 +- configs/pjrc-8051/defconfig | 2 +- configs/sim/nettest/defconfig | 2 +- configs/sim/ostest/defconfig | 2 +- configs/sim/pashello/defconfig | 2 +- configs/xtrs/nsh/defconfig | 6 ++++-- configs/xtrs/ostest/defconfig | 6 ++++-- configs/xtrs/pashello/defconfig | 6 ++++-- configs/xtrs/src/xtr_serial.c | 8 ++++---- configs/z16f2800100zcog/ostest/defconfig | 2 +- configs/z16f2800100zcog/pashello/defconfig | 2 +- configs/z80sim/nsh/defconfig | 2 +- configs/z80sim/ostest/defconfig | 2 +- configs/z80sim/pashello/defconfig | 2 +- configs/z80sim/src/z80_serial.c | 8 ++++---- configs/z8encore000zco/ostest/defconfig | 2 +- 29 files changed, 51 insertions(+), 36 deletions(-) diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index c84fa4fe10..ba4de942ab 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -1349,7 +1349,7 @@ The system can be re-made subsequently by just typing make. 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
  • diff --git a/arch/z80/src/Makefile.sdcc b/arch/z80/src/Makefile.sdcc index 895ecc4bae..ac38c24601 100644 --- a/arch/z80/src/Makefile.sdcc +++ b/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/arch/z80/src/z80/z80_head.asm b/arch/z80/src/z80/z80_head.asm index eb246b588e..62f2496a49 100644 --- a/arch/z80/src/z80/z80_head.asm +++ b/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/configs/README.txt b/configs/README.txt index c5ce860f0f..3f5f563fb9 100644 --- a/configs/README.txt +++ b/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/configs/c5471evm/defconfig b/configs/c5471evm/defconfig index 85a2b5b8bc..a71ef7575c 100644 --- a/configs/c5471evm/defconfig +++ b/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/configs/c5471evm/dhcpconfig b/configs/c5471evm/dhcpconfig index 555a051abb..4fbbb2e1fc 100644 --- a/configs/c5471evm/dhcpconfig +++ b/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/configs/c5471evm/netconfig b/configs/c5471evm/netconfig index 1d73d1bbee..1c0377e40b 100644 --- a/configs/c5471evm/netconfig +++ b/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/configs/c5471evm/nshconfig b/configs/c5471evm/nshconfig index 9e185994fd..b98d3c6a51 100644 --- a/configs/c5471evm/nshconfig +++ b/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/configs/m68332evb/defconfig b/configs/m68332evb/defconfig index 99dc97c530..1710293a13 100644 --- a/configs/m68332evb/defconfig +++ b/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/configs/mcu123-lpc214x/defconfig b/configs/mcu123-lpc214x/defconfig index 93883dfd13..79759b4c4c 100644 --- a/configs/mcu123-lpc214x/defconfig +++ b/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/configs/ntosd-dm320/defconfig b/configs/ntosd-dm320/defconfig index d6c138167e..f0d79e4e39 100644 --- a/configs/ntosd-dm320/defconfig +++ b/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/configs/ntosd-dm320/netconfig b/configs/ntosd-dm320/netconfig index 99c790c570..134c1b0ea8 100644 --- a/configs/ntosd-dm320/netconfig +++ b/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/configs/ntosd-dm320/udpconfig b/configs/ntosd-dm320/udpconfig index e5e52153d8..d753940cf2 100644 --- a/configs/ntosd-dm320/udpconfig +++ b/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/configs/ntosd-dm320/uipconfig b/configs/ntosd-dm320/uipconfig index 37516219d8..60cf173c63 100644 --- a/configs/ntosd-dm320/uipconfig +++ b/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/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig index e10a6d5402..25fb881afb 100644 --- a/configs/pjrc-8051/defconfig +++ b/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/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig index 77f4ae8292..dd89ba88c4 100644 --- a/configs/sim/nettest/defconfig +++ b/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/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig index 93d9d04599..a7d93ec760 100644 --- a/configs/sim/ostest/defconfig +++ b/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/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig index f2e035594b..f6491aaa1f 100644 --- a/configs/sim/pashello/defconfig +++ b/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/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig index d5467c8698..cdcb6e9d30 100644 --- a/configs/xtrs/nsh/defconfig +++ b/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/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig index e7cda9a360..c616b578df 100644 --- a/configs/xtrs/ostest/defconfig +++ b/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/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig index 7246a8b164..0fcf274c38 100644 --- a/configs/xtrs/pashello/defconfig +++ b/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/configs/xtrs/src/xtr_serial.c b/configs/xtrs/src/xtr_serial.c index b6a90baf12..decadccec2 100644 --- a/configs/xtrs/src/xtr_serial.c +++ b/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/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig index 60cb0cc7bc..43033efa27 100644 --- a/configs/z16f2800100zcog/ostest/defconfig +++ b/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/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig index 0569a311d6..b0e8756edc 100644 --- a/configs/z16f2800100zcog/pashello/defconfig +++ b/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/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig index 190f7af9c7..83637924a7 100644 --- a/configs/z80sim/nsh/defconfig +++ b/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/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig index 3907e75b7b..2f06409b19 100644 --- a/configs/z80sim/ostest/defconfig +++ b/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/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig index 6f2649084a..b5431c1dcd 100644 --- a/configs/z80sim/pashello/defconfig +++ b/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/configs/z80sim/src/z80_serial.c b/configs/z80sim/src/z80_serial.c index 974b51b8fd..239e530fdf 100644 --- a/configs/z80sim/src/z80_serial.c +++ b/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/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig index 78b5326226..2b55002953 100644 --- a/configs/z8encore000zco/ostest/defconfig +++ b/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