Fixes for NuTiny-NUC120 configuration and build

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

2 files changed, 67 insertions, 9 deletions

diff --git a/nuttx/configs/nutiny-nuc120/README.txt b/nuttx/configs/nutiny-nuc120/README.txt
index 3f1e84df9..ac43cbb6b 100644
--- a/nuttx/configs/nutiny-nuc120/README.txt
+++ b/nuttx/configs/nutiny-nuc120/README.txt
@@ -193,13 +193,17 @@ NuTiny-specific Configuration Options
 
     CONFIG_NUC_WDT     Watchdog timer
     CONFIG_NUC_RTC     Real time clock (RTC)
-    CONFIG_NUC_TMR01   Timer0/Timer1
+    CONFIG_NUC_TMR0    Timer0
+    CONFIG_NUC_TMR1    Timer1
     CONFIG_NUC_I2C0    I2C interface
     CONFIG_NUC_SPI0    SPI0 master/slave
     CONFIG_NUC_SPI1    SPI1 master/slave
-    CONFIG_NUC_PWMA    PWM0/1/2/3
+    CONFIG_NUC_PWM0    PWM0
+    CONFIG_NUC_PWM1    PWM1
+    CONFIG_NUC_PWM2    PWM2
+    CONFIG_NUC_PWM3    PWM3
     CONFIG_NUC_UART0   UART0
-    CONFIG_NUC_USBD    USB 2.0 FS device controller registers */
+    CONFIG_NUC_USBD    USB 2.0 FS device controller
     CONFIG_NUC_ACMP    Analog comparator
     CONFIG_NUC_ADC     Analog-digital-converter (ADC)
 
@@ -207,11 +211,15 @@ NuTiny-specific Configuration Options
   ---
 
     CONFIG_NUC_PS2     PS/2 interface
-    CONFIG_NUC_TIMR23  Timer2/Timer3
+    CONFIG_NUC_TIMR2   Timer2
+    CONFIG_NUC_TIMR3   Timer3
     CONFIG_NUC_I2C1    I2C1 interface
     CONFIG_NUC_SPI2    SPI2 master/slave
     CONFIG_NUC_SPI3    SPI3 master/slave
-    CONFIG_NUC_PWMB    PWM4/5/6/7
+    CONFIG_NUC_PWM4    PWM4
+    CONFIG_NUC_PWM5    PWM5
+    CONFIG_NUC_PWM6    PWM6
+    CONFIG_NUC_PWM7    PWM7
     CONFIG_NUC_UART1   UART1
     CONFIG_NUC_UART2   UART2
     CONFIG_NUC_I2S     I2S interface
diff --git a/nuttx/configs/nutiny-nuc120/ostest/defconfig b/nuttx/configs/nutiny-nuc120/ostest/defconfig
index 9141ea1f2..1c068001d 100644
--- a/nuttx/configs/nutiny-nuc120/ostest/defconfig
+++ b/nuttx/configs/nutiny-nuc120/ostest/defconfig
@@ -127,6 +127,42 @@ CONFIG_ARCH_CHIP_NUC120LE3AN=y
 # CONFIG_ARCH_CHIP_NUC120VD2AN is not set
 # CONFIG_ARCH_CHIP_NUC120VD3AN is not set
 # CONFIG_ARCH_CHIP_NUC120VE3AN is not set
+CONFIG_ARCH_FAMILY_NUC120=y
+CONFIG_ARCH_NUC_MEDIUMDENSITY=y
+
+#
+# NUC1XX Peripheral Support
+#
+# CONFIG_NUC_PDMA is not set
+# CONFIG_NUC_FMC is not set
+# CONFIG_NUC_EBI is not set
+# CONFIG_NUC_WDT is not set
+# CONFIG_NUC_RTC is not set
+# CONFIG_NUC_TMR0 is not set
+# CONFIG_NUC_TMR1 is not set
+# CONFIG_NUC_TIMR2 is not set
+# CONFIG_NUC_TIMR3 is not set
+# CONFIG_NUC_I2C0 is not set
+# CONFIG_NUC_I2C1 is not set
+# CONFIG_NUC_SPI0 is not set
+# CONFIG_NUC_SPI1 is not set
+# CONFIG_NUC_SPI2 is not set
+# CONFIG_NUC_SPI3 is not set
+# CONFIG_NUC_PWM0 is not set
+# CONFIG_NUC_PWM1 is not set
+# CONFIG_NUC_PWM2 is not set
+# CONFIG_NUC_PWM3 is not set
+# CONFIG_NUC_PWM4 is not set
+# CONFIG_NUC_PWM5 is not set
+# CONFIG_NUC_PWM6 is not set
+# CONFIG_NUC_PWM7 is not set
+CONFIG_NUC_UART0=y
+# CONFIG_NUC_UART1 is not set
+# CONFIG_NUC_USBD is not set
+# CONFIG_NUC_ACMP is not set
+# CONFIG_NUC_ADC is not set
+# CONFIG_NUC_PS2 is not set
+# CONFIG_NUC_I2S is not set
 
 #
 # External Memory Configuration
@@ -192,9 +228,9 @@ CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_PREALLOC_CHILDSTATUS=0
 # CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2009
-CONFIG_START_MONTH=9
-CONFIG_START_DAY=21
+CONFIG_START_YEAR=2013
+CONFIG_START_MONTH=2
+CONFIG_START_DAY=22
 CONFIG_DEV_CONSOLE=y
 # CONFIG_MUTEX_TYPES is not set
 # CONFIG_PRIORITY_INHERITANCE is not set
@@ -275,6 +311,20 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
 # CONFIG_16550_UART is not set
+CONFIG_ARCH_HAVE_UART0=y
+CONFIG_MCU_SERIAL=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# UART0 Configuration
+#
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@@ -317,7 +367,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 #
 # Memory Management
 #
-# CONFIG_MM_SMALL is not set
+CONFIG_MM_SMALL=y
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set