Updates the STM3220G-EVAL configurations

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

10 files changed, 33 insertions, 11 deletions

diff --git a/nuttx/configs/stm3220g-eval/src/Makefile b/nuttx/configs/stm3220g-eval/src/Makefile
index 3cc204063..b79189cb1 100644
--- a/nuttx/configs/stm3220g-eval/src/Makefile
+++ b/nuttx/configs/stm3220g-eval/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3220g-eval/src/Makefile
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   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
@@ -42,6 +42,10 @@ AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
 CSRCS		= up_boot.c up_spi.c
 
+ifeq ($(CONFIG_HAVE_CXX),y)
+CSRCS		+= up_cxxinitialize.c
+endif
+
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS		+= up_autoleds.c
 else
@@ -52,6 +56,14 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS		+=  up_buttons.c
 endif
 
+ifeq ($(CONFIG_USBDEV),y)
+CSRCS		+= up_usbdev.c
+endif
+
+ifeq ($(CONFIG_STM32_FSMC),y)
+CSRCS		+= up_extmem.c up_selectsram.c up_deselectsram.c
+endif
+
 ifeq ($(CONFIG_ADC),y)
 CSRCS		+= up_adc.c
 endif
@@ -68,6 +80,10 @@ ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 
+ifeq ($(CONFIG_ARCH_FPU),y)
+CSRCS		+= up_ostest.c
+endif
+
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h
index fbda3807b..a317d92aa 100644
--- a/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h
+++ b/nuttx/configs/stm3220g-eval/src/stm3220g-internal.h
@@ -2,7 +2,7 @@
  * configs/stm3220g_eval/src/stm3220g_internal.h
  * arch/arm/src/board/stm3220g_internal.n
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
diff --git a/nuttx/configs/stm3220g-eval/src/up_adc.c b/nuttx/configs/stm3220g-eval/src/up_adc.c
index c1563c4bc..0b4d1e48c 100644
--- a/nuttx/configs/stm3220g-eval/src/up_adc.c
+++ b/nuttx/configs/stm3220g-eval/src/up_adc.c
@@ -2,7 +2,7 @@
  * configs/stm3220g-eval/src/up_adc.c
  * arch/arm/src/board/up_adc.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   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
diff --git a/nuttx/configs/stm3220g-eval/src/up_autoleds.c b/nuttx/configs/stm3220g-eval/src/up_autoleds.c
index dc27b864b..f77f1d08a 100644
--- a/nuttx/configs/stm3220g-eval/src/up_autoleds.c
+++ b/nuttx/configs/stm3220g-eval/src/up_autoleds.c
@@ -2,7 +2,7 @@
  * configs/stm3220g_eval/src/up_autoleds.c
  * arch/arm/src/board/up_autoleds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
diff --git a/nuttx/configs/stm3220g-eval/src/up_boot.c b/nuttx/configs/stm3220g-eval/src/up_boot.c
index 4062baa56..20303ceaf 100644
--- a/nuttx/configs/stm3220g-eval/src/up_boot.c
+++ b/nuttx/configs/stm3220g-eval/src/up_boot.c
@@ -2,7 +2,7 @@
  * configs/stm3220g-eval/src/up_boot.c
  * arch/arm/src/board/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
@@ -82,6 +82,12 @@ void stm32_boardinitialize(void)
     }
 #endif
 
+  /* If the FSMC is enabled, then enable SRAM access */
+
+#ifdef CONFIG_STM32_FSMC
+  stm32_selectsram();
+#endif
+
   /* Configure on-board LEDs if LED support has been selected. */
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/nuttx/configs/stm3220g-eval/src/up_buttons.c b/nuttx/configs/stm3220g-eval/src/up_buttons.c
index 03cb57dbd..4847aaa7c 100644
--- a/nuttx/configs/stm3220g-eval/src/up_buttons.c
+++ b/nuttx/configs/stm3220g-eval/src/up_buttons.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/stm3220g-eval/src/up_buttons.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
diff --git a/nuttx/configs/stm3220g-eval/src/up_can.c b/nuttx/configs/stm3220g-eval/src/up_can.c
index f27e16bdf..72c8f67a1 100644
--- a/nuttx/configs/stm3220g-eval/src/up_can.c
+++ b/nuttx/configs/stm3220g-eval/src/up_can.c
@@ -2,7 +2,7 @@
  * configs/stm3220g-eval/src/up_can.c
  * arch/arm/src/board/up_can.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
@@ -139,4 +139,4 @@ int can_devinit(void)
   return OK;
 }
 
-#endif /* CONFIG_CAN && (CONFIG_STM32_CAN2 || CONFIG_STM32_CAN3) */
+#endif /* CONFIG_CAN && (CONFIG_STM32_CAN1 || CONFIG_STM32_CAN2) */
diff --git a/nuttx/configs/stm3220g-eval/src/up_pwm.c b/nuttx/configs/stm3220g-eval/src/up_pwm.c
index c4891f71e..dff732037 100644
--- a/nuttx/configs/stm3220g-eval/src/up_pwm.c
+++ b/nuttx/configs/stm3220g-eval/src/up_pwm.c
@@ -2,7 +2,7 @@
  * configs/stm3220g-eval/src/up_pwm.c
  * arch/arm/src/board/up_pwm.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
diff --git a/nuttx/configs/stm3220g-eval/src/up_spi.c b/nuttx/configs/stm3220g-eval/src/up_spi.c
index 7f7940115..47ed8d230 100644
--- a/nuttx/configs/stm3220g-eval/src/up_spi.c
+++ b/nuttx/configs/stm3220g-eval/src/up_spi.c
@@ -2,7 +2,7 @@
  * configs/stm3220g_eval/src/up_spi.c
  * arch/arm/src/board/up_spi.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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
diff --git a/nuttx/configs/stm3220g-eval/src/up_userleds.c b/nuttx/configs/stm3220g-eval/src/up_userleds.c
index f5690af3e..6dc3db135 100644
--- a/nuttx/configs/stm3220g-eval/src/up_userleds.c
+++ b/nuttx/configs/stm3220g-eval/src/up_userleds.c
@@ -2,7 +2,7 @@
  * configs/stm3220g_eval/src/up_leds.c
  * arch/arm/src/board/up_leds.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   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