Clear up some configuration naming that was inconsistent accross STM32 chips

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4401 7fd9a85b-ad96-42d3-883c-3090e2eb8679
13 years ago · f60d578a46
22 changed files with 42 additions and 43 deletions
--- a/nuttx/arch/arm/src/stm32/stm32f10xxx_rcc.c
+++ b/nuttx/arch/arm/src/stm32/stm32f10xxx_rcc.c
@ -280,7 +280,7 @@ static inline void rcc_enableapb1(void)
				@@ -280,7 +280,7 @@ static inline void rcc_enableapb1(void)
  regval |= RCC_APB1ENR_USBEN;
 #endif

-#if defined(CONFIG_STM32_CAN) || defined (CONFIG_STM32_CAN1)
+#ifdef CONFIG_STM32_CAN1
  /* CAN1 clock enable */

  regval |= RCC_APB1ENR_CAN1EN;
--- a/nuttx/configs/hymini-stm32v/README.txt
+++ b/nuttx/configs/hymini-stm32v/README.txt
@ -374,7 +374,7 @@ HY-Mini specific Configuration Options
				@@ -374,7 +374,7 @@ HY-Mini specific Configuration Options
 	CONFIG_STM32_I2C1
 	CONFIG_STM32_I2C2
 	CONFIG_STM32_USB
-	CONFIG_STM32_CAN
+	CONFIG_STM32_CAN1
 	CONFIG_STM32_BKP
 	CONFIG_STM32_PWR
 	CONFIG_STM32_DAC
--- a/nuttx/configs/hymini-stm32v/buttons/defconfig
+++ b/nuttx/configs/hymini-stm32v/buttons/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/buttons/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -128,7 +128,7 @@ CONFIG_STM32_UART5=n
				@@ -128,7 +128,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/hymini-stm32v/nsh/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/nsh/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -124,7 +124,7 @@ CONFIG_STM32_UART5=n
				@@ -124,7 +124,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/hymini-stm32v/nsh2/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/nsh2/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -125,7 +125,7 @@ CONFIG_STM32_UART5=n
				@@ -125,7 +125,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n

 # Backup domain
 CONFIG_STM32_BKP=y
--- a/nuttx/configs/hymini-stm32v/nx/defconfig
+++ b/nuttx/configs/hymini-stm32v/nx/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/nx/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -124,7 +124,7 @@ CONFIG_STM32_UART5=n
				@@ -124,7 +124,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/hymini-stm32v/nxlines/defconfig
+++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/nxlines/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -125,7 +125,7 @@ CONFIG_STM32_UART5=n
				@@ -125,7 +125,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/hymini-stm32v/usbserial/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/usbserial/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -127,7 +127,7 @@ CONFIG_STM32_UART5=n
				@@ -127,7 +127,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/hymini-stm32v/usbstorage/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -125,7 +125,7 @@ CONFIG_STM32_UART5=n
				@@ -125,7 +125,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@ -504,7 +504,10 @@ STM3210E-EVAL-specific Configuration Options
				@@ -504,7 +504,10 @@ STM3210E-EVAL-specific Configuration Options
  each of the four channels with different duty cycles.  That capability is
  not supported by this driver:  Only one output channel per timer.

-  Alternate pin mappings (should not be used with the STM3210E-EVAL board):
+  Alternate pin mappings.  The STM3210E-EVAL board requires only CAN1 remapping
+  On the STM3210E-EVAL board pin PB9 is wired as TX and pin PB8 is wired as RX.
+  Which then makes the proper connection through the CAN transiver SN65HVD230 
+  out to the CAN D-type 9-pn male connector where pin 2 is CANL and pin 7 is CANH.

    CONFIG_STM32_TIM1_FULL_REMAP
    CONFIG_STM32_TIM1_PARTIAL_REMAP
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/RIDE/defconfig
 #
-#   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -132,7 +132,7 @@ CONFIG_STM32_UART5=n
				@@ -132,7 +132,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/configs/stm3210e-eval/buttons/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/buttons/defconfig
 #
-#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -144,7 +144,7 @@ CONFIG_STM32_UART5=n
				@@ -144,7 +144,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/configs/stm3210e-eval/composite/defconfig
@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
				@@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/nsh/defconfig
 #
-#   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
				@@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@ -162,7 +162,6 @@ CONFIG_STM32_I2C1=y
				@@ -162,7 +162,6 @@ CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
 CONFIG_STM32_CAN1=n
-CONFIG_STM32_CAN2=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
@ -264,8 +263,7 @@ CONFIG_STM32_R61580_DISABLE=y
				@@ -264,8 +263,7 @@ CONFIG_STM32_R61580_DISABLE=y
 #
 # STM32F10xxx specific CAN device driver settings
 #
-# CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
-#   CONFIG_STM32_CAN2 must also be defined)
+# CONFIG_CAN - Enables CAN support (CONFIG_STM32_CAN1 must also be defined)
 # CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID.  Default
 #   Standard 11-bit IDs.
 # CONFIG_CAN_FIFOSIZE - The size of the circular buffer of CAN messages.
@ -275,7 +273,6 @@ CONFIG_STM32_R61580_DISABLE=y
				@@ -275,7 +273,6 @@ CONFIG_STM32_R61580_DISABLE=y
 # CONFIG_CAN_LOOPBACK - A CAN driver may or may not support a loopback
 #   mode for testing. The STM32 CAN driver does support loopback mode.
 # CONFIG_CAN1_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN1 is defined.
-# CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
 # CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
 # CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
 #
@ -286,7 +283,6 @@ CONFIG_CAN_EXTID=y
				@@ -286,7 +283,6 @@ CONFIG_CAN_EXTID=y
 CONFIG_CAN_LOOPBACK=n
 # ISO-11783 requires the baud to be set to 250K
 CONFIG_CAN1_BAUD=250000
-CONFIG_CAN2_BAUD=250000
 # ISO-11783 requires the sample point to be within 75 to 80%
 CONFIG_CAN_TSEG1=12
 CONFIG_CAN_TSEG2=3
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/nx/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
				@@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/nxlines/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
				@@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/nxtext/defconfig
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
				@@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/configs/stm3210e-eval/ostest/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/ostest/defconfig
 #
-#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -142,7 +142,7 @@ CONFIG_STM32_UART5=n
				@@ -142,7 +142,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/usbserial/defconfig
 #
-#   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -142,7 +142,7 @@ CONFIG_STM32_UART5=n
				@@ -142,7 +142,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm3210e-eval/usbstorage/defconfig
 #
-#   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
				@@ -140,7 +140,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=n
 CONFIG_STM32_I2C2=n
 CONFIG_STM32_USB=y
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 CONFIG_STM32_BKP=n
 CONFIG_STM32_PWR=n
 CONFIG_STM32_DAC=n
--- a/nuttx/configs/vsn/nsh/defconfig
+++ b/nuttx/configs/vsn/nsh/defconfig
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 ############################################################################
 # configs/vsn/nsh/defconfig
 #
-#   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
 #   Copyright (c) 2011 Uros Platise. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #           Uros Platise <uros.platise@isotel.eu>
@ -160,7 +160,7 @@ CONFIG_STM32_UART5=n
				@@ -160,7 +160,7 @@ CONFIG_STM32_UART5=n
 CONFIG_STM32_I2C1=y
 CONFIG_STM32_I2C2=y
 CONFIG_STM32_USB=n
-CONFIG_STM32_CAN=n
+CONFIG_STM32_CAN1=n
 # Note that in order to enable RTC, BKP and PWR must be enabled
 CONFIG_STM32_BKP=y
 CONFIG_STM32_PWR=y