diff --git a/configs/Board.mk b/configs/Board.mk
index db423ccec99..cdb805923da 100644
--- a/configs/Board.mk
+++ b/configs/Board.mk
@@ -116,9 +116,11 @@ $(CXXOBJS) $(LINKOBJS): %$(OBJEXT): %.cxx
$(call COMPILEXX, $<, $@)
libboard$(LIBEXT): $(OBJS) $(CXXOBJS)
- $(Q) $(AR) $@
ifneq ($(OBJS),)
- $(call ARCHIVE, $@, $(OBJS) $(CXXOBJS))
+ $(call ARCHIVE, $@, $(OBJS))
+endif
+ifneq ($(CXXOBJS),)
+ $(call ARCHIVE, $@, $(CXXOBJS))
endif
.depend: Makefile $(SRCS) $(CXXSRCS)
diff --git a/configs/makerlisp/README.txt b/configs/makerlisp/README.txt
index b1dbaba216a..16f9007e29a 100644
--- a/configs/makerlisp/README.txt
+++ b/configs/makerlisp/README.txt
@@ -75,7 +75,16 @@ UARTs
PD6/DCD0 CN1_DCD0 Pin 71
PD7/RIO0 CN1_RI0 Pin 73
- UART 0: All of Port C pins can support UART1 functions when configured
+ UART0 (as well as I2C) is also available via a USB using the on-board
+ MCP2221A USB adapter. CN1_USBUART_TX_EN and CN1_USBUART_RX_EN are pulled
+ low poll on the CPU board in order to connect CN1_RX0 and CN1_TX0 to
+ MCP_RX and MCP_TX.
+
+ When the I/O expander board is connected, jumpers J1 and J2 control this
+ functionality. These can pull the CN1_USBUART_TX_EN and CN1_USBUART_RX_EN
+ pins high and so that UART0 can be used for other purposes.
+
+ UART 1: All of Port C pins can support UART1 functions when configured
for the alternate function 7. For typical configurations only RXD and TXD
need be configured.
@@ -90,9 +99,10 @@ UARTs
PC6/DCD1 CN1_DCD1 Pin 72
PC7/RIO1 CN1_RI1 Pin 74
- For use with a host terminal emulation, it will be necessary to connect
- either a TTL-to-RS232 or a TTL-to-USB Serial adapter to CN1 pins 59 and
- 61, and 60 and 62, depending on the selected UART.
+ With the I/O exanpander board (and J1 and J2 open), these UARTs can be
+ used with a host terminal emulation, by connecting either a TTL-to-RS232
+ or a TTL-to-USB Serial adapter to CN1 pins 59 and 61, and 60 and 62,
+ depending on the selected UART.
Serial Keyboard and VGA Display
-------------------------------
@@ -245,13 +255,16 @@ Configuration Subdirectories
NOTES:
- 1. A serial console is provided on UART0. This configuration may work
- with or without the the VGA and Keyboard adapter boards. For use
- with a host terminal emulation without the accessory boards, it will
- be necessary to connect either a TTL-to-RS232 or a TTL-to-USB Serial
- adapter to CN1 pins 59 and 61.
+ 1. A serial console is provided on UART0. This configuration should work
+ with or without the the VGA and Keyboard adapter boards. Normal
+ connectivity is via host serical console connected through the USB
+ serial console.
- The default baud setting is 57600N1.
+ Withe the I/O expansion board, the serial console can also be sued with
+ either a TTL-to-RS232 or a TTL-to-USB Serial adapter connected by CN1
+ pins 59 and 61.
+
+ The default baud setting is 115200N1.
To use the VGA display controller with stdout and stderr, you also
need to selection CONFIG_MAKERLISP_VGA=y in your configuration. This
diff --git a/configs/makerlisp/nsh/defconfig b/configs/makerlisp/nsh/defconfig
index cd83ba49612..1a0064e784e 100644
--- a/configs/makerlisp/nsh/defconfig
+++ b/configs/makerlisp/nsh/defconfig
@@ -12,7 +12,6 @@ CONFIG_ARCH_BOARD="makerlisp"
CONFIG_ARCH_BOARD_MAKERLISP=y
CONFIG_ARCH_CHIP_EZ80=y
CONFIG_ARCH_CHIP_EZ80F91=y
-CONFIG_ARCH_LEDS=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_DISABLE_MQUEUE=y
@@ -37,7 +36,6 @@ CONFIG_START_MONTH=3
CONFIG_START_YEAR=2009
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0
-CONFIG_UART0_BAUD=57600
CONFIG_UART0_BITS=0
CONFIG_UART0_RXBUFSIZE=192
CONFIG_UART0_SERIAL_CONSOLE=y
diff --git a/configs/makerlisp/nsh/nsh.zdsproj b/configs/makerlisp/nsh/nsh.zdsproj
index 605c8a0fce3..66853c982ee 100644
--- a/configs/makerlisp/nsh/nsh.zdsproj
+++ b/configs/makerlisp/nsh/nsh.zdsproj
@@ -1,4 +1,4 @@
-
+eZ80F91
@@ -25,6 +25,7 @@
+
@@ -38,6 +39,7 @@
+
@@ -65,6 +67,7 @@
+
@@ -117,6 +120,10 @@
+
+
+
+
@@ -138,6 +145,7 @@
+
@@ -151,6 +159,7 @@
+
@@ -178,6 +187,7 @@
+
@@ -230,6 +240,10 @@
+
+
+
+
@@ -244,4 +258,4 @@
-
+
\ No newline at end of file
diff --git a/configs/makerlisp/nsh/nsh.zfpproj b/configs/makerlisp/nsh/nsh.zfpproj
index f28b7da62df..0c09b496356 100644
--- a/configs/makerlisp/nsh/nsh.zfpproj
+++ b/configs/makerlisp/nsh/nsh.zfpproj
@@ -3,6 +3,7 @@
+..\..\..\nuttx.hex
@@ -73,7 +74,7 @@
-
+
@@ -82,7 +83,7 @@
-
+
diff --git a/configs/makerlisp/nsh/nsh.ztgt b/configs/makerlisp/nsh/nsh.ztgt
new file mode 100644
index 00000000000..5b833afd95e
--- /dev/null
+++ b/configs/makerlisp/nsh/nsh.ztgt
@@ -0,0 +1,72 @@
+
+
+
+
+ 1
+ 16E360
+ 8
+ 5000000
+
+ Oscillator
+ 50000000
+
+
+ 000000
+ FFFFFF
+ FFFF
+ true
+
+
+
+ 0
+ true
+ C00000
+ C7ffff
+
+ 1
+ false
+ true
+
+
+
+
+ 02
+ a8
+ 10
+ 1f
+
+
+ 02
+ 28
+ C0
+ C7
+
+
+ 81
+ 28
+ 80
+ BF
+
+
+ 02
+ 00
+ 00
+ 00
+
+
+
+ 0
+ 0
+ true
+ true
+ false
+
+ 4
+
+
+ 0
+
+ eZ80F91
+ 1.0.1
+ 1.00
+