configs/Board.mk: Cannot call directly. That works only with GCC. It must, instead use the ARCHIVE command from Config.mk as do other Makefiles. configs/makerlisp: Various tool-related updates.

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)

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

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

configs/makerlisp/nsh/nsh.zdsproj

@@ -1,4 +1,4 @@
-<project type="Executable" project-type="Standard" configuration="Debug" created-by="c:4.11:07071801" modified-by="c:4.11:08011102">
+<project type="Executable" project-type="Standard" configuration="Debug" created-by="c:4.11:07071801" modified-by="d:5.3.0:17021001" ZDSII="ZDSII - eZ80Acclaim! 5.3.0 (Build 17041303)">
 <cpu>eZ80F91</cpu>
 
 <!-- file information -->
@@ -25,6 +25,7 @@
 </tool>
 <tool name="Compiler">
 <options>
+<option name="padbranch" type="string" change-action="compile">Off</option>
 <option name="define" type="string" change-action="compile">_DEBUG,_EZ80F91,_EZ80ACCLAIM!</option>
 <option name="genprintf" type="boolean" change-action="compile">false</option>
 <option name="keepasm" type="boolean" change-action="none">false</option>
@@ -38,6 +39,7 @@
 <option name="stdinc" type="string" change-action="compile"></option>
 <option name="usrinc" type="string" change-action="compile"></option>
 <option name="watch" type="boolean" change-action="none">false</option>
+<option name="multithread" type="boolean" change-action="compile">false</option>
 </options>
 </tool>
 <tool name="Debugger">
@@ -65,6 +67,7 @@
 <option name="singleval" type="string" change-action="none">0</option>
 <option name="singlevalformat" type="integer" change-action="none">0</option>
 <option name="usepageerase" type="boolean" change-action="none">false</option>
+<option name="useinfopage" type="boolean" change-action="none">false</option>
 </options>
 </tool>
 <tool name="General">
@@ -117,6 +120,10 @@
 <option name="usezsl" type="boolean" change-action="rebuild">false</option>
 <option name="zslports" type="string" change-action="rebuild"></option>
 <option name="zsluarts" type="string" change-action="rebuild"></option>
+<option name="userzk" type="boolean" change-action="rebuild">false</option>
+<option name="rzkconfigpi" type="boolean" change-action="rebuild">true</option>
+<option name="rzkconfigmini" type="boolean" change-action="rebuild">false</option>
+<option name="rzkcomps" type="string" change-action="rebuild"></option>
 </options>
 </tool>
 </tools>
@@ -138,6 +145,7 @@
 </tool>
 <tool name="Compiler">
 <options>
+<option name="padbranch" type="string" change-action="compile">Off</option>
 <option name="define" type="string" change-action="compile">NDEBUG,_EZ80F91,_EZ80ACCLAIM!,_SIMULATE</option>
 <option name="genprintf" type="boolean" change-action="compile">true</option>
 <option name="keepasm" type="boolean" change-action="none">false</option>
@@ -151,6 +159,7 @@
 <option name="stdinc" type="string" change-action="compile"></option>
 <option name="usrinc" type="string" change-action="compile"></option>
 <option name="watch" type="boolean" change-action="none">false</option>
+<option name="multithread" type="boolean" change-action="compile">false</option>
 </options>
 </tool>
 <tool name="Debugger">
@@ -178,6 +187,7 @@
 <option name="singleval" type="string" change-action="none">0</option>
 <option name="singlevalformat" type="integer" change-action="none">0</option>
 <option name="usepageerase" type="boolean" change-action="none">false</option>
+<option name="useinfopage" type="boolean" change-action="none">false</option>
 </options>
 </tool>
 <tool name="General">
@@ -230,6 +240,10 @@
 <option name="usezsl" type="boolean" change-action="rebuild">false</option>
 <option name="zslports" type="string" change-action="rebuild"></option>
 <option name="zsluarts" type="string" change-action="rebuild"></option>
+<option name="userzk" type="boolean" change-action="rebuild">false</option>
+<option name="rzkconfigpi" type="boolean" change-action="rebuild">true</option>
+<option name="rzkconfigmini" type="boolean" change-action="rebuild">false</option>
+<option name="rzkcomps" type="string" change-action="rebuild"></option>
 </options>
 </tool>
 </tools>
@@ -244,4 +258,4 @@
 <breakpoints>
 </breakpoints>
 
-</project>
+</project>

configs/makerlisp/nsh/nsh.zfpproj

@@ -3,6 +3,7 @@
 
 <!-- file information -->
 <files>
+<file filter-key="flash">..\..\..\nuttx.hex</file>
 </files>
 
 <!-- configuration information -->
@@ -73,7 +74,7 @@
 </tool>
 <tool name="Debugger">
 <options>
-<option name="target" type="string" change-action="rebuild">MakerLisp</option>
+<option name="target" type="string" change-action="rebuild">nsh</option>
 <option name="debugtool" type="string" change-action="none">USBSmartCable</option>
 <option name="debugtoolnames" type="string" change-action="none">ZPAKII</option>
 <option name="SmartEthernetNumbers" type="string" change-action="none">ZPAKII</option>
@@ -82,7 +83,7 @@
 </tool>
 <tool name="FlashProgrammer">
 <options>
-<option name="erasebeforeburn" type="boolean" change-action="none">false</option>
+<option name="erasebeforeburn" type="boolean" change-action="none">true</option>
 <option name="pageerasebeforeburn" type="boolean" change-action="none">false</option>
 <option name="eraseinfopage" type="boolean" change-action="none">false</option>
 <option name="enableinfopage" type="boolean" change-action="none">false</option>

configs/makerlisp/nsh/nsh.ztgt

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Target name="nsh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="target.tsd" xsi:type="Target">
+   <Clock>
+      <PLL>
+         <changeFrequencyOnReset>1</changeFrequencyOnReset>
+         <chargePumpFreq>16E360</chargePumpFreq>
+         <clockLockCriteria>8</clockLockCriteria>
+         <oscFrequency>5000000</oscFrequency>
+      </PLL>
+      <clockType>Oscillator</clockType>
+      <frequency>50000000</frequency>
+   </Clock>
+   <ControlReg>
+      <pc>000000</pc>
+      <splStackPtr>FFFFFF</splStackPtr>
+      <spsStackPtr>FFFF</spsStackPtr>
+      <useAdlMode>true</useAdlMode>
+   </ControlReg>
+   <ExtFlash>
+      <device />
+      <externalAddress>0</externalAddress>
+      <externalAutoSelect>true</externalAutoSelect>
+      <externalRamLower>C00000</externalRamLower>
+      <externalRamUpper>C7ffff</externalRamUpper>
+      <manufacturer />
+      <units>1</units>
+      <usingExternal>false</usingExternal>
+      <usingInternal>true</usingInternal>
+   </ExtFlash>
+   <Memory>
+      <ChipSelects>
+         <CS0>
+            <busMode>02</busMode>
+            <controlRegister>a8</controlRegister>
+            <lower>10</lower>
+            <upper>1f</upper>
+         </CS0>
+         <CS1>
+            <busMode>02</busMode>
+            <controlRegister>28</controlRegister>
+            <lower>C0</lower>
+            <upper>C7</upper>
+         </CS1>
+         <CS2>
+            <busMode>81</busMode>
+            <controlRegister>28</controlRegister>
+            <lower>80</lower>
+            <upper>BF</upper>
+         </CS2>
+         <CS3>
+            <busMode>02</busMode>
+            <controlRegister>00</controlRegister>
+            <lower>00</lower>
+            <upper>00</upper>
+         </CS3>
+      </ChipSelects>
+      <Internal>
+         <mapFlashToPage>0</mapFlashToPage>
+         <mapRamToPage>0</mapRamToPage>
+         <useFlashRam>true</useFlashRam>
+         <useInternalDataRam>true</useInternalDataRam>
+         <useMaccRam>false</useMaccRam>
+      </Internal>
+      <waitStates>4</waitStates>
+   </Memory>
+   <UserOptions>
+      <optionBitsMask>0</optionBitsMask>
+   </UserOptions>
+   <cpu>eZ80F91</cpu>
+   <schemaVersion>1.0.1</schemaVersion>
+   <version>1.00</version>
+</Target>