Change Mirtoo default UART to UART1; updates so that Mirtoo can be built on Linux

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

4 files changed, 31 insertions, 15 deletions

diff --git a/nuttx/configs/mirtoo/README.txt b/nuttx/configs/mirtoo/README.txt
index efe6a7aa5..f482c4e93 100644
--- a/nuttx/configs/mirtoo/README.txt
+++ b/nuttx/configs/mirtoo/README.txt
@@ -456,6 +456,10 @@ UART Usage
     FT230X RXD  FUNC0 RPB11  U2RX  UART2 RX (Also PGEC2)
     FT230X TXD  FUNC1 RPB10  U2TX  UART2 TX (Also PGED2)
 
+  However, since the FUNC0/1 pins are shared with the PGEC/D2, they cannot be used
+  for UART2 if you are also debugging with the ICD3.  In that case, you may need
+  to switch to UART1.
+
   If CONFIG_PIC32MX_UART1 is enabled, the src/up_boot will configure the UART
   pins as follows.  This will support communictions (via an external RS-232
   driver) through X3 pins 4 and 5:
@@ -683,4 +687,10 @@ Where <subdir> is one of the following:
 
   ostest:
     This configuration directory, performs a simple OS test using
-    apps/examples/ostest.
+    apps/examples/ostest.  This configuration use:
+
+    CONFIG_PIC32MX_UART1=y           : UART1 for serial console
+    CONFIG_UART1_SERIAL_CONSOLE=n
+    CONFIG_PIC32MX_MICROCHIPW_LITE=y : Lite version of widows tool-chain
+
+    
diff --git a/nuttx/configs/mirtoo/ostest/Make.defs b/nuttx/configs/mirtoo/ostest/Make.defs
index d38134194..0c9df2138 100644
--- a/nuttx/configs/mirtoo/ostest/Make.defs
+++ b/nuttx/configs/mirtoo/ostest/Make.defs
@@ -38,7 +38,7 @@ include ${TOPDIR}/.config
 # Setup for the selected toolchain
 
 ifeq ($(CONFIG_PIC32MX_MICROCHIPW),y)
-  # Microchip toolchain under Windows
+  # Microchip C32 toolchain under Windows
   CROSSDEV = pic32-
   WINTOOL = y
   MAXOPTIMIZATION = -O2
@@ -47,7 +47,7 @@ ifeq ($(CONFIG_PIC32MX_MICROCHIPW),y)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_PIC32MX_MICROCHIPW_LITE),y)
-  # Microchip toolchain under Windows
+  # Microchip C32 toolchain under Windows
   CROSSDEV = pic32-
   WINTOOL = y
 #  MAXOPTIMIZATION = -O2
@@ -56,16 +56,16 @@ ifeq ($(CONFIG_PIC32MX_MICROCHIPW_LITE),y)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_PIC32MX_MICROCHIPL),y)
-  # Microchip toolchain under Linux
-  CROSSDEV = pic32-
+  # Microchip XC32 toolchain under Linux
+  CROSSDEV = xc32-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mprocessor=elf32pic32mx -mno-float -mlong32 -membedded-data
   ARCHPICFLAGS = -fpic -membedded-pic
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_PIC32MX_MICROCHIPL_LITE),y)
-  # Microchip toolchain under Linux
-  CROSSDEV = pic32-
+  # Microchip XC32 toolchain under Linux
+  CROSSDEV = xc32-
 #  MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mprocessor=elf32pic32mx -mno-float -mlong32 -membedded-data
   ARCHPICFLAGS = -fpic -membedded-pic
diff --git a/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig
index 8ee8f0256..c15d7b7e1 100644
--- a/nuttx/configs/mirtoo/ostest/defconfig
+++ b/nuttx/configs/mirtoo/ostest/defconfig
@@ -99,7 +99,7 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=n
+CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=n
@@ -141,8 +141,8 @@ CONFIG_PIC32MX_I2C1=n
 CONFIG_PIC32MX_I2C2=n
 CONFIG_PIC32MX_SPI1=n
 CONFIG_PIC32MX_SPI2=n
-CONFIG_PIC32MX_UART1=n
-CONFIG_PIC32MX_UART2=y
+CONFIG_PIC32MX_UART1=y
+CONFIG_PIC32MX_UART2=n
 CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_PMP=n
 CONFIG_PIC32MX_CVR=n
@@ -202,8 +202,8 @@ CONFIG_PIC32MX_OSCOUT=1
 # CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 # CONFIG_UARTn_2STOP - Two stop bits
 #
-CONFIG_UART1_SERIAL_CONSOLE=n
-CONFIG_UART2_SERIAL_CONSOLE=y
+CONFIG_UART1_SERIAL_CONSOLE=y
+CONFIG_UART2_SERIAL_CONSOLE=n
 
 CONFIG_UART1_TXBUFSIZE=256
 CONFIG_UART2_TXBUFSIZE=256
diff --git a/nuttx/configs/mirtoo/ostest/setenv.sh b/nuttx/configs/mirtoo/ostest/setenv.sh
index 5d336813b..1175bd482 100755
--- a/nuttx/configs/mirtoo/ostest/setenv.sh
+++ b/nuttx/configs/mirtoo/ostest/setenv.sh
@@ -46,12 +46,18 @@ if [ ! -x "setenv.sh" ]; then
 fi
 
 # This the Cygwin path to the location where I installed the MicroChip
-# PIC32MX toolchain under windows.  This is *not* the default install
+# PIC32MX C32 toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
-# to edit this if you install a different version of if you install
-# the Linux PIC32MX toolchain as well
+# to edit this if you install a different version of if you install the
+# toolchain at a different location
 export TOOLCHAIN_BIN="/cygdrive/c/MicroChip/mplabc32/v1.12/bin"
 
+# This the Linux path to the location where I installed the MicroChip
+# PIC32MX XC32 toolchain under Linus.  This is the default install
+# location.  You will also have to edit this if you install a different
+# version of if you install the toolchain at a different location
+#export TOOLCHAIN_BIN="/opt/microchip/xc32/v1.00/bin"
+
 # This is the path to the toosl subdirectory
 export PIC32TOOL_DIR="${WD}/tools/pic32mx"