From 376af5201c555ee163045a8103d8e592f9a1b1bc Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 18 Feb 2012 14:22:00 +0000 Subject: Clear up some configuration naming that was inconsistent accross STM32 chips git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4401 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/arm/src/stm32/stm32f10xxx_rcc.c | 2 +- nuttx/configs/hymini-stm32v/README.txt | 2 +- nuttx/configs/hymini-stm32v/buttons/defconfig | 4 ++-- nuttx/configs/hymini-stm32v/nsh/defconfig | 4 ++-- nuttx/configs/hymini-stm32v/nsh2/defconfig | 4 ++-- nuttx/configs/hymini-stm32v/nx/defconfig | 4 ++-- nuttx/configs/hymini-stm32v/nxlines/defconfig | 4 ++-- nuttx/configs/hymini-stm32v/usbserial/defconfig | 4 ++-- nuttx/configs/hymini-stm32v/usbstorage/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/README.txt | 5 ++++- nuttx/configs/stm3210e-eval/RIDE/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/buttons/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/composite/defconfig | 2 +- nuttx/configs/stm3210e-eval/nsh/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/nsh2/defconfig | 6 +----- nuttx/configs/stm3210e-eval/nx/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/nxlines/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/nxtext/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/ostest/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/usbserial/defconfig | 4 ++-- nuttx/configs/stm3210e-eval/usbstorage/defconfig | 4 ++-- nuttx/configs/vsn/nsh/defconfig | 4 ++-- 22 files changed, 42 insertions(+), 43 deletions(-) diff --git a/nuttx/arch/arm/src/stm32/stm32f10xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32f10xxx_rcc.c index 9b87def75..cacc8f889 100644 --- 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) 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; diff --git a/nuttx/configs/hymini-stm32v/README.txt b/nuttx/configs/hymini-stm32v/README.txt index 3f87f4ef5..6e44dc9bc 100755 --- a/nuttx/configs/hymini-stm32v/README.txt +++ b/nuttx/configs/hymini-stm32v/README.txt @@ -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 diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig index 8a2bf3b07..f11ffd09d 100644 --- a/nuttx/configs/hymini-stm32v/buttons/defconfig +++ b/nuttx/configs/hymini-stm32v/buttons/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig index 9bc30fb12..d065b42e4 100755 --- a/nuttx/configs/hymini-stm32v/nsh/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index 8519a27fb..0bc9346a3 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig index 272661e14..2dba34dc7 100644 --- a/nuttx/configs/hymini-stm32v/nx/defconfig +++ b/nuttx/configs/hymini-stm32v/nx/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig index 9467ca1d2..61a2bddd4 100644 --- a/nuttx/configs/hymini-stm32v/nxlines/defconfig +++ b/nuttx/configs/hymini-stm32v/nxlines/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig index a56197c5b..c3070e925 100755 --- a/nuttx/configs/hymini-stm32v/usbserial/defconfig +++ b/nuttx/configs/hymini-stm32v/usbserial/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig index 6ff131166..71cd95caf 100755 --- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig +++ b/nuttx/configs/hymini-stm32v/usbstorage/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt index e08d0bfa5..7e23d7dc9 100755 --- a/nuttx/configs/stm3210e-eval/README.txt +++ b/nuttx/configs/stm3210e-eval/README.txt @@ -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 diff --git a/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index e0e09ed9f..6ef6fcb8f 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig index 53627e491..3c2c561a5 100644 --- a/nuttx/configs/stm3210e-eval/buttons/defconfig +++ b/nuttx/configs/stm3210e-eval/buttons/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig index e9fad97dc..f7c80bbfd 100755 --- a/nuttx/configs/stm3210e-eval/composite/defconfig +++ b/nuttx/configs/stm3210e-eval/composite/defconfig @@ -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 diff --git a/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 189cb005f..de514eab4 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index e7ffc8bc6..51f8fdc70 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -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 # # 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 # 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 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 diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index de6f046df..25ccc5738 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig index 167e0cb54..e93f1d6a3 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/defconfig +++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig index fb77f7082..3f65134c2 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/defconfig +++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index 508f9a9f0..ba92bb9f7 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index 7cfe31015..14842092d 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index 326efcb4c..f470dfcf9 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -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 # # Redistribution and use in source and binary forms, with or without @@ -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 diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index 9b3266855..02a41c87e 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -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 # Uros Platise @@ -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 -- cgit v1.2.3