Configre configs/ubw32/ostest to use kconfig-frontends

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

configs/README.txt

@@ -1590,7 +1590,7 @@ defconfig -- This is a configuration file similar to the Linux
       operation from FLASH but must copy initialized .data sections to RAM.
     CONFIG_BOOT_COPYTORAM -  Some configurations boot in FLASH
       but copy themselves entirely into RAM for better performance.
-    CONFIG_BOOT_RAMFUNCS - Other configurations may copy just some functions
+    CONFIG_ARCH_RAMFUNCS - Other configurations may copy just some functions
       into RAM, either for better performance or for errata workarounds.
     CONFIG_STACK_ALIGNMENT - Set if the your application has specific
       stack alignment requirements (may not be supported

configs/kwikstik-k40/ostest/defconfig

@@ -460,7 +460,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 CONFIG_BOOT_RUNFROMFLASH=n
 CONFIG_BOOT_COPYTORAM=n
-CONFIG_BOOT_RAMFUNCS=y
+CONFIG_ARCH_RAMFUNCS=y
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048

configs/mirtoo/nsh/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in linker scripts as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -105,7 +105,6 @@ CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
 CONFIG_PIC32MX_CM3=n
 CONFIG_PIC32MX_RTCC=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -113,9 +112,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
 
 #
 # Mirtoo Board Settings

configs/mirtoo/nxffs/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in linker scripts as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -105,7 +105,6 @@ CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
 CONFIG_PIC32MX_CM3=n
 CONFIG_PIC32MX_RTCC=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -113,9 +112,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
 
 #
 # Mirtoo Board Settings

configs/mirtoo/ostest/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in linker scripts as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -105,7 +105,6 @@ CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
 CONFIG_PIC32MX_CM3=n
 CONFIG_PIC32MX_RTCC=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -113,9 +112,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
 
 #
 # PIC32MX Configuration Settings

configs/pcblogic-pic32mx/nsh/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -102,7 +102,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -110,13 +109,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/pcblogic-pic32mx/ostest/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -102,7 +102,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -110,13 +109,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/pic32-starterkit/nsh/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -108,7 +108,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -119,13 +118,6 @@ CONFIG_PIC32MX_USBHOST=n
 CONFIG_PIC32MX_CAN1=n
 CONFIG_PIC32MX_CAN2=n
 CONFIG_PIC32MX_ETHERNET=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/pic32-starterkit/nsh2/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -108,7 +108,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -119,13 +118,6 @@ CONFIG_PIC32MX_USBHOST=n
 CONFIG_PIC32MX_CAN1=n
 CONFIG_PIC32MX_CAN2=n
 CONFIG_PIC32MX_ETHERNET=y
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/pic32-starterkit/ostest/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -108,7 +108,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -119,13 +118,6 @@ CONFIG_PIC32MX_USBHOST=n
 CONFIG_PIC32MX_CAN1=n
 CONFIG_PIC32MX_CAN2=n
 CONFIG_PIC32MX_ETHERNET=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/pic32mx7mmb/nsh/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -108,7 +108,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -119,13 +118,6 @@ CONFIG_PIC32MX_USBHOST=n
 CONFIG_PIC32MX_CAN1=n
 CONFIG_PIC32MX_CAN2=n
 CONFIG_PIC32MX_ETHERNET=y
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/pic32mx7mmb/ostest/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -108,7 +108,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -119,13 +118,6 @@ CONFIG_PIC32MX_USBHOST=n
 CONFIG_PIC32MX_CAN1=n
 CONFIG_PIC32MX_CAN2=n
 CONFIG_PIC32MX_ETHERNET=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/sure-pic32mx/nsh/defconfig

@@ -62,7 +62,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -103,7 +103,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -111,13 +110,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/sure-pic32mx/ostest/defconfig

@@ -62,7 +62,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -103,7 +103,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -111,13 +110,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/sure-pic32mx/usbnsh/defconfig

@@ -62,7 +62,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -103,7 +103,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -111,13 +110,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=y
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/twr-k60n512/nsh/defconfig

@@ -462,7 +462,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 CONFIG_BOOT_RUNFROMFLASH=n
 CONFIG_BOOT_COPYTORAM=n
-CONFIG_BOOT_RAMFUNCS=y
+CONFIG_ARCH_RAMFUNCS=y
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048

configs/twr-k60n512/ostest/defconfig

@@ -459,7 +459,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 #
 CONFIG_BOOT_RUNFROMFLASH=n
 CONFIG_BOOT_COPYTORAM=n
-CONFIG_BOOT_RAMFUNCS=y
+CONFIG_ARCH_RAMFUNCS=y
 CONFIG_CUSTOM_STACK=n
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048

configs/ubw32/README.txt

@@ -586,15 +586,26 @@ Where <subdir> is one of the following:
     This configuration directory, performs a simple OS test using
     apps/examples/ostest.
 
-    Serial Output.
+    NOTES:
-    --------------
+    ------ 
-    The OS test produces all of its test output on the serial console.
+    1. This configuration uses the mconf-based configuration tool.  To
-    This configuration has UART1 enabled as a serial console. 
+       change this configuration using that tool, you should:
 
-    TX  -- J4 pin 31: U1TX/RF8
+       a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
-    RX  -- J4 pin 30: U1RX/RF2
+          and misc/tools/
-    GND -- J4 pin 40: GND
+
-    Vcc -- J4 pin 39: 5V
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. Serial Output.
+
+       The OS test produces all of its test output on the serial console.
+       This configuration has UART1 enabled as a serial console. 
+
+       TX  -- J4 pin 31: U1TX/RF8
+       RX  -- J4 pin 30: U1RX/RF2
+       GND -- J4 pin 40: GND
+       Vcc -- J4 pin 39: 5V
  
   nsh:
   ====

configs/ubw32/nsh/Make.defs

@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mknulldeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
 else
   # Linux/Cygwin-native toolchain 
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
 endif
 
 CC = $(CROSSDEV)gcc

configs/ubw32/nsh/defconfig

@@ -60,7 +60,7 @@ CONFIG_ARCH_DMA=n
 # Enable support for RAM-based functions
 # (If selected, then modifications are needed in ld.script as well)
 #
-CONFIG_PIC32MX_RAMFUNCS=n
+CONFIG_ARCH_RAMFUNCS=n
 
 #
 # Identify toolchain and linker options
@@ -102,7 +102,6 @@ CONFIG_PIC32MX_ADC=n
 CONFIG_PIC32MX_CVR=n
 CONFIG_PIC32MX_CM1=n
 CONFIG_PIC32MX_CM2=n
-CONFIG_PIC32MX_OSC=y
 CONFIG_PIC32MX_DDP=n
 CONFIG_PIC32MX_FLASH=n
 CONFIG_PIC32MX_BMX=n
@@ -110,13 +109,6 @@ CONFIG_PIC32MX_DMA=n
 CONFIG_PIC32MX_CHE=n
 CONFIG_PIC32MX_USBDEV=n
 CONFIG_PIC32MX_USBHOST=n
-CONFIG_PIC32MX_IOPORTA=y
-CONFIG_PIC32MX_IOPORTB=y
-CONFIG_PIC32MX_IOPORTC=y
-CONFIG_PIC32MX_IOPORTD=y
-CONFIG_PIC32MX_IOPORTE=y
-CONFIG_PIC32MX_IOPORTF=y
-CONFIG_PIC32MX_IOPORTG=y
 
 #
 # PIC32MX Configuration Settings

configs/ubw32/ostest/Make.defs

@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mknulldeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
 else
   # Linux/Cygwin-native toolchain 
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
 endif
 
 CC = $(CROSSDEV)gcc

configs/ubw32/ostest/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/ubw32/ostest/appconfig
-#
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/ostest
-

configs/ubw32/ostest/ld.script

@@ -1,317 +0,0 @@
-/****************************************************************************
- * configs/ubw32/ostest/ld.script
- *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *	notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	notice, this list of conditions and the following disclaimer in
- *	the documentation and/or other materials provided with the
- *	distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *	used to endorse or promote products derived from this software
- *	without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-/* Memory Regions ***********************************************************/
-
-MEMORY
-{
-	/* The PIC32MX460F512L has 512Kb of program FLASH at physical address
-	 * 0x1d000000 but is always accessed at KSEG0 address 0x9d00:0000
-	 */
-
-	kseg0_progmem  (rx) : ORIGIN = 0x9d000000, LENGTH = 512K
-
-	/* The PIC32MX460F512L has 12Kb of boot FLASH at physical address
-	 * 0x1fc00000.  The initial reset vector is in KSEG1, but all other
-	 * accesses are in KSEG0.
-	 *
-	 *   REGION        PHYSICAL   KSEG   SIZE
-	 *   DESCRIPTION   START ADDR        (BYTES)
-	 *   ------------- ---------- ------ ----------------------
-	 *   Exceptions:*
-	 *     Reset       0x1fc00000 KSEG1  512         512
-	 *     TLB Refill  0x1fc00200 KSEG1  256         768
-	 *     Cache Error 0x1fc00300 KSEG1  128         896
-	 *     Others      0x1fc00380 KSEG1  128        1024 (1Kb)
-	 *     Interrupt   0x1fc00400 KSEG1  128        1152
-	 *     JTAG        0x1fc00480 KSEG1  16         1168
-	 *   Exceptions    0x1fc00490 KSEG0  8192-1168  8192 (4Kb)
-	 *   Debug code    0x1fc02000 KSEG1  4096-16   12272
-	 *   DEVCFG3-0     0x1fc02ff0 KSEG1  16        12288 (12Kb)
-	 *
-	 * Exceptions assume:
-	 *
-	 *   STATUS: BEV=0/1 and EXL=0
-	 *   CAUSE:  IV=1
-	 *   JTAG:   ProbEn=0
-	 *   And multi-vector support disabled
-	 */
-
-	kseg1_reset    (rx) : ORIGIN = 0xbfc00000, LENGTH = 384
-	kseg1_genexcpt (rx) : ORIGIN = 0xbfc00180, LENGTH = 128
-	kseg1_ebexcpt  (rx) : ORIGIN = 0xbfc00200, LENGTH = 128
-	kseg1_bevexcpt (rx) : ORIGIN = 0xbfc00380, LENGTH = 128
-	kseg1_intexcpt (rx) : ORIGIN = 0xbfc00400, LENGTH = 128
-	kseg1_dbgexcpt (rx) : ORIGIN = 0xbfc00480, LENGTH = 16
-	kseg0_bootmem  (rx) : ORIGIN = 0x9fc00490, LENGTH = 8192-1168
-	kseg1_dbgcode  (rx) : ORIGIN = 0xbfc02000, LENGTH = 4096-16
-	kseg1_devcfg    (r) : ORIGIN = 0xbfc02ff0, LENGTH = 16
-
-	/* The PIC32MX460F512L has 32Kb of data memory at physical address
-	 * 0x00000000.  Since the PIC32MX has no data cache, this memory is
-	 * always accessed through KSEG1.
-	 *
-	 * When used with MPLAB, we need to set aside 512 bytes of memory
-	 * for use by MPLAB.
-	 */
-
-	kseg1_datamem (w!x) : ORIGIN = 0xa0000200, LENGTH = 32K - 512
-}
-
-OUTPUT_FORMAT("elf32-tradlittlemips")
-OUTPUT_ARCH(pic32mx)
-ENTRY(__start)
-
-SECTIONS
-{
-	/* Boot FLASH sections */
-
-	.reset :
-	{
-		KEEP (*(.reset))
-	} > kseg1_reset
-
-	/* Exception handlers.  The following is assumed:
-	 *
-	 *   STATUS: BEV=1 and EXL=0
-	 *   CAUSE:  IV=1
-	 *   JTAG:   ProbEn=0
-	 *   And multi-vector support disabled
-	 *
-	 * In that configuration, the vector locations become:
-	 *
-	 *   Reset, Soft Reset  bfc0:0000
-	 *   TLB Refill         bfc0:0200
-	 *   Cache Error        bfc0:0300
-	 *   All others         bfc0:0380
-	 *   Interrupt          bfc0:0400
-	 *   EJTAG Debug        bfc0:0480
-	 */
-
-	 /* KSEG1 exception handler "trampolines" */
-
-	.gen_excpt :
-	{
-		KEEP (*(.gen_excpt))
-	} > kseg1_genexcpt
-
-	.ebase_excpt :
-	{
-		KEEP (*(.ebase_excpt))
-	} > kseg1_ebexcpt
-
-	.bev_excpt :
-	{
-		KEEP (*(.bev_excpt))
-	} > kseg1_bevexcpt
-
-	.int_excpt :
-	{
-		KEEP (*(.int_excpt))
-	} > kseg1_intexcpt
-
-	.dbg_excpt = ORIGIN(kseg1_dbgexcpt);
-
-	.start :
-	{
-		/* KSEG0 Reset startup logic */
-
-		*(.start)
-
-		/* KSEG0 exception handlers */
-
-		*(.nmi_handler)
-		*(.bev_handler)
-		*(.int_handler)
-	} > kseg0_bootmem
-
-	.dbg_code = ORIGIN(kseg1_dbgcode);
-
-	.devcfg :
-	{
-		KEEP (*(.devcfg))
-	} > kseg1_devcfg
-
-	/* Program FLASH sections */
-
-	.text :
-	{
-		_stext = ABSOLUTE(.);
-		*(.text .text.*)
-		*(.stub)
-		KEEP (*(.text.*personality*))
-		*(.gnu.linkonce.t.*)
-		*(.gnu.warning)
-		*(.mips16.fn.*)
-		*(.mips16.call.*)
-
-		/* Read-only data is included in the text section */
-
-		*(.rodata .rodata.*)
-		*(.rodata1)
-		*(.gnu.linkonce.r.*)
-
-		/* Small initialized constant global and static data */
-
-		*(.sdata2 .sdata2.*)
-		*(.gnu.linkonce.s2.*)
-
-		/* Uninitialized constant global and static data */
-
-		*(.sbss2 .sbss2.*)
-		*(.gnu.linkonce.sb2.*)
-		_etext = ABSOLUTE(.);
-	} > kseg0_progmem
-
-	/* Initialization data begins here in progmem */
-
-	_data_loaddr = LOADADDR(.data);
-
-	.eh_frame_hdr : { *(.eh_frame_hdr) }
-	.eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-
-	/* RAM functions are positioned at the beginning of RAM so that
-	 * they can be guaranteed to satisfy the 2Kb alignment requirement.
-	 */
-
-/* This causes failures if there are no RAM functions
-	.ramfunc ALIGN(2K) :
-	{
-		_sramfunc =  ABSOLUTE(.);
-		*(.ramfunc	.ramfunc.*)
-		_eramfunc =  ABSOLUTE(.);
-	} > kseg1_datamem AT > kseg0_progmem
-
-	_ramfunc_loadaddr = LOADADDR(.ramfunc);
-	_ramfunc_sizeof   = SIZEOF(.ramfunc);
-	_bmxdkpba_address = _sramfunc - ORIGIN(kseg1_datamem) ;
-	_bmxdudba_address = LENGTH(kseg1_datamem) ;
-	_bmxdupba_address = LENGTH(kseg1_datamem) ;
-*/
-
-	.data :
-	{
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		KEEP (*(.gnu.linkonce.d.*personality*))
-		*(.data1)
-	} > kseg1_datamem AT > kseg0_progmem
-
-	.eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-	_gp = ALIGN(16) + 0x7FF0 ;
-
-	.got :
-	{
-		*(.got.plt) *(.got)
-	} > kseg1_datamem AT > kseg0_progmem
-
-	.sdata :
-	{
-		*(.sdata .sdata.* .gnu.linkonce.s.*)
-	} > kseg1_datamem AT > kseg0_progmem
-
-	.lit8 :
-	{
-		*(.lit8)
-	} > kseg1_datamem AT > kseg0_progmem
-
-	.lit4 :
-	{
-		*(.lit4)
-		_edata = ABSOLUTE(.);
-	} >kseg1_datamem AT>kseg0_progmem
-
-	.sbss :
-	{
-		_sbss = ABSOLUTE(.);
-		*(.dynsbss)
-		*(.sbss .sbss.* .gnu.linkonce.sb.*)
-		*(.scommon)
-	} >kseg1_datamem
-
-	.bss :
-	{
-		*(.dynbss)
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		_ebss = ABSOLUTE(.);
-	} > kseg1_datamem
-
-	/* Stabs debugging sections */
-
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-
-	/* DWARF debug sections */
-	/* DWARF 1 */
-
-	.debug 0 : { *(.debug) }
-	.line 0 : { *(.line) }
-
-	/* GNU DWARF 1 extensions */
-
-	.debug_srcinfo 0 : { *(.debug_srcinfo) }
-	.debug_sfnames 0 : { *(.debug_sfnames) }
-
-	/* DWARF 1.1 and DWARF 2 */
-
-	.debug_aranges 0 : { *(.debug_aranges) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-
-	/* DWARF 2 */
-
-	.debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_frame 0 : { *(.debug_frame) }
-	.debug_str 0 : { *(.debug_str) }
-	.debug_loc 0 : { *(.debug_loc) }
-	.debug_macinfo 0 : { *(.debug_macinfo) }
-
-	/* SGI/MIPS DWARF 2 extensions */
-
-	.debug_weaknames 0 : { *(.debug_weaknames) }
-	.debug_funcnames 0 : { *(.debug_funcnames) }
-	.debug_typenames 0 : { *(.debug_typenames) }
-	.debug_varnames 0 : { *(.debug_varnames) }
-
-	/DISCARD/ : { *(.note.GNU-stack) }
-}

configs/ubw32/scripts/ld.script

@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/ubw32/nsh/ld.script
+ * configs/ubw32/scripts/ld.script
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without