diff --git a/arch/arm/src/lpc11xx/Kconfig b/arch/arm/src/lpc11xx/Kconfig index 255273a3a2e..d8b8af54534 100644 --- a/arch/arm/src/lpc11xx/Kconfig +++ b/arch/arm/src/lpc11xx/Kconfig @@ -156,19 +156,19 @@ endmenu menu "CAN driver options" depends on LPC11_CAN1 || LPC11_CAN2 -config CAN1_BAUD +config LPC11_CAN1_BAUD int "CAN1 BAUD" depends on LPC11_CAN1 ---help--- CAN1 BAUD rate. Required if LPC11_CAN1 is defined. -config CAN2_BAUD +config LPC11_CAN2_BAUD int "CAN2 BAUD" depends on LPC11_CAN2 ---help--- CAN2 BAUD rate. Required if LPC11_CAN2 is defined. -config CAN1_DIVISOR +config LPC11_CAN1_DIVISOR int "CAN1 CCLK divisor" depends on LPC11_CAN1 default 4 @@ -176,7 +176,7 @@ config CAN1_DIVISOR CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. -config CAN2_DIVISOR +config LPC11_CAN2_DIVISOR int "CAN2 CCLK divisor" depends on LPC11_CAN2 default 4 diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig index fe97c0394ee..21617004095 100644 --- a/arch/arm/src/lpc17xx/Kconfig +++ b/arch/arm/src/lpc17xx/Kconfig @@ -544,13 +544,13 @@ endmenu menu "CAN driver options" depends on LPC17_CAN1 || LPC17_CAN2 -config CAN1_BAUD +config LPC17_CAN1_BAUD int "CAN1 BAUD" depends on LPC17_CAN1 ---help--- CAN1 BAUD rate. Required if LPC17_CAN1 is defined. -config CAN2_BAUD +config LPC17_CAN2_BAUD int "CAN2 BAUD" depends on LPC17_CAN2 ---help--- diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c index f122ffedef2..244380a63de 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.c +++ b/arch/arm/src/lpc17xx/lpc17_can.c @@ -78,8 +78,8 @@ /* A CAN bit rate must be provided */ -# ifndef CONFIG_CAN1_BAUD -# error "CONFIG_CAN1_BAUD is not defined" +# ifndef CONFIG_LPC17_CAN1_BAUD +# error "CONFIG_LPC17_CAN1_BAUD is not defined" # endif /* If no divsor is provided, use a divisor of 4 */ @@ -107,8 +107,8 @@ /* A CAN bit rate must be provided */ -# ifndef CONFIG_CAN2_BAUD -# error "CONFIG_CAN2_BAUD is not defined" +# ifndef CONFIG_LPC17_CAN2_BAUD +# error "CONFIG_LPC17_CAN2_BAUD is not defined" # endif /* If no divsor is provided, use a divisor of 4 */ @@ -246,7 +246,7 @@ static struct up_dev_s g_can1priv = { .port = 1, .divisor = CONFIG_LPC17_CAN1_DIVISOR, - .baud = CONFIG_CAN1_BAUD, + .baud = CONFIG_LPC17_CAN1_BAUD, .base = LPC17_CAN1_BASE, }; @@ -262,7 +262,7 @@ static struct up_dev_s g_can2priv = { .port = 2, .divisor = CONFIG_LPC17_CAN2_DIVISOR, - .baud = CONFIG_CAN2_BAUD, + .baud = CONFIG_LPC17_CAN2_BAUD, .base = LPC17_CAN2_BASE, }; diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig index 2efd8967fc7..6fd3d8b237f 100644 --- a/arch/arm/src/stm32/Kconfig +++ b/arch/arm/src/stm32/Kconfig @@ -8082,14 +8082,14 @@ config STM32_USB_ITRMP menu "CAN driver configuration" depends on STM32_CAN -config CAN1_BAUD +config STM32_CAN1_BAUD int "CAN1 BAUD" default 250000 depends on STM32_CAN1 ---help--- CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. -config CAN2_BAUD +config STM32_CAN2_BAUD int "CAN2 BAUD" default 250000 depends on STM32_CAN2 diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c index 2625c9123c5..3f797c26722 100644 --- a/arch/arm/src/stm32/stm32_can.c +++ b/arch/arm/src/stm32/stm32_can.c @@ -205,7 +205,7 @@ static struct stm32_can_s g_can1priv = .filter = 0, .base = STM32_CAN1_BASE, .fbase = STM32_CAN1_BASE, - .baud = CONFIG_CAN1_BAUD, + .baud = CONFIG_STM32_CAN1_BAUD, }; static struct can_dev_s g_can1dev = @@ -228,7 +228,7 @@ static struct stm32_can_s g_can2priv = .filter = CAN_NFILTERS / 2, .base = STM32_CAN2_BASE, .fbase = STM32_CAN1_BASE, - .baud = CONFIG_CAN2_BAUD, + .baud = CONFIG_STM32_CAN2_BAUD, }; static struct can_dev_s g_can2dev = diff --git a/arch/arm/src/stm32/stm32_can.h b/arch/arm/src/stm32/stm32_can.h index 078e6b2a124..3b24f48b47c 100644 --- a/arch/arm/src/stm32/stm32_can.h +++ b/arch/arm/src/stm32/stm32_can.h @@ -65,12 +65,12 @@ /* CAN BAUD */ -#if defined(CONFIG_STM32_CAN1) && !defined(CONFIG_CAN1_BAUD) -# error "CONFIG_CAN1_BAUD is not defined" +#if defined(CONFIG_STM32_CAN1) && !defined(CONFIG_STM32_CAN1_BAUD) +# error "CONFIG_STM32_CAN1_BAUD is not defined" #endif -#if defined(CONFIG_STM32_CAN2) && !defined(CONFIG_CAN2_BAUD) -# error "CONFIG_CAN2_BAUD is not defined" +#if defined(CONFIG_STM32_CAN2) && !defined(CONFIG_STM32_CAN2_BAUD) +# error "CONFIG_STM32_CAN2_BAUD is not defined" #endif /* User-defined TSEG1 and TSEG2 settings may be used. diff --git a/arch/arm/src/stm32l4/Kconfig b/arch/arm/src/stm32l4/Kconfig index 7d8bf8e4e6a..1745193d7ba 100644 --- a/arch/arm/src/stm32l4/Kconfig +++ b/arch/arm/src/stm32l4/Kconfig @@ -3917,14 +3917,14 @@ endmenu # SD/MMC Configuration menu "CAN driver configuration" depends on STM32L4_CAN1 || STM32L4_CAN2 -config CAN1_BAUD +config STM32L4_CAN1_BAUD int "CAN1 BAUD" default 250000 depends on STM32L4_CAN1 ---help--- CAN1 BAUD rate. Required if CONFIG_STM32L4_CAN1 is defined. -config CAN2_BAUD +config STM32L4_CAN2_BAUD int "CAN2 BAUD" default 250000 depends on STM32L4_CAN2 diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c index 2bc5dcd2e60..5c3acf0bc7b 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.c +++ b/arch/arm/src/stm32l4/stm32l4_can.c @@ -206,7 +206,7 @@ static struct stm32l4_can_s g_can1priv = .filter = 0, .base = STM32L4_CAN1_BASE, .fbase = STM32L4_CAN1_BASE, - .baud = CONFIG_CAN1_BAUD, + .baud = CONFIG_STM32L4_CAN1_BAUD, }; static struct can_dev_s g_can1dev = diff --git a/arch/arm/src/stm32l4/stm32l4_can.h b/arch/arm/src/stm32l4/stm32l4_can.h index c7ff34733d5..2bd2443f628 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.h +++ b/arch/arm/src/stm32l4/stm32l4_can.h @@ -66,8 +66,8 @@ /* CAN BAUD */ -#if defined(CONFIG_STM32L4_CAN1) && !defined(CONFIG_CAN1_BAUD) -# error "CONFIG_CAN1_BAUD is not defined" +#if defined(CONFIG_STM32L4_CAN1) && !defined(CONFIG_STM32L4_CAN1_BAUD) +# error "CONFIG_STM32L4_CAN1_BAUD is not defined" #endif /* User-defined TSEG1 and TSEG2 settings may be used. diff --git a/configs/cloudctrl/README.txt b/configs/cloudctrl/README.txt index e3f7a85210d..b0fc779ac65 100644 --- a/configs/cloudctrl/README.txt +++ b/configs/cloudctrl/README.txt @@ -397,8 +397,10 @@ Cloudctrl-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/fire-stm32v2/README.txt b/configs/fire-stm32v2/README.txt index 575c07d7fc0..2dc86e04ebb 100644 --- a/configs/fire-stm32v2/README.txt +++ b/configs/fire-stm32v2/README.txt @@ -519,8 +519,10 @@ M3 Wildfire-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt index e0ed4cf7210..3b5795119fd 100644 --- a/configs/hymini-stm32v/README.txt +++ b/configs/hymini-stm32v/README.txt @@ -301,8 +301,10 @@ HY-Mini specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt index 34d12d0cd0f..16a74a6c607 100644 --- a/configs/lincoln60/README.txt +++ b/configs/lincoln60/README.txt @@ -169,8 +169,10 @@ Lincoln 60 Configuration Options CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default Standard 11-bit IDs. - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 is defined. + CONFIG_LPC17_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 + is defined. + CONFIG_LPC17_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 + is defined. CONFIG_LPC17_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt index 089c98a41e5..8e03fd38561 100644 --- a/configs/lpcxpresso-lpc1768/README.txt +++ b/configs/lpcxpresso-lpc1768/README.txt @@ -487,8 +487,10 @@ LPCXpresso Configuration Options CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default Standard 11-bit IDs. - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 is defined. + CONFIG_LPC17_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 + is defined. + CONFIG_LPC17_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 + is defined. CONFIG_LPC17_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. diff --git a/configs/mbed/README.txt b/configs/mbed/README.txt index d8afdaa3a9c..e7fdf2481a9 100644 --- a/configs/mbed/README.txt +++ b/configs/mbed/README.txt @@ -132,12 +132,14 @@ mbed Configuration Options CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default Standard 11-bit IDs. - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 is defined. + CONFIG_LPC17_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 + is defined. + CONFIG_LPC17_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 + is defined. CONFIG_LPC17_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. - CONFIG_LPC17CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this + CONFIG_LPC17_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 diff --git a/configs/mcb1700/README.txt b/configs/mcb1700/README.txt index 93b6f3f8aa2..54674cdf991 100644 --- a/configs/mcb1700/README.txt +++ b/configs/mcb1700/README.txt @@ -133,12 +133,14 @@ mcb1700 Configuration Options CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default Standard 11-bit IDs. - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 is defined. + CONFIG_LPC17_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 + is defined. + CONFIG_LPC17_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 + is defined. CONFIG_LPC17_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. - CONFIG_LPC17CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this + CONFIG_LPC17_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 diff --git a/configs/mikroe-stm32f4/README.txt b/configs/mikroe-stm32f4/README.txt index b586104b100..4f5d1710c4e 100644 --- a/configs/mikroe-stm32f4/README.txt +++ b/configs/mikroe-stm32f4/README.txt @@ -412,8 +412,10 @@ Mikroe-STM32F4-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt index fb613076e32..78cb965d8de 100644 --- a/configs/olimex-lpc1766stk/README.txt +++ b/configs/olimex-lpc1766stk/README.txt @@ -570,12 +570,14 @@ Olimex LPC1766-STK Configuration Options CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default Standard 11-bit IDs. - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 is defined. + CONFIG_LPC17_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 + is defined. + CONFIG_LPC17_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 + is defined. CONFIG_LPC17_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. - CONFIG_LPC17CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this + CONFIG_LPC17_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6 diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt index 0ce6e28d4bf..1ef0f39ca48 100644 --- a/configs/shenzhou/README.txt +++ b/configs/shenzhou/README.txt @@ -414,8 +414,10 @@ Shenzhou-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt index 4d4b72efc06..38931dce8a7 100644 --- a/configs/stm3210e-eval/README.txt +++ b/configs/stm3210e-eval/README.txt @@ -456,8 +456,10 @@ STM3210E-EVAL-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an @@ -592,15 +594,15 @@ Where is one of the following: a. examples/can. The CAN test example can be enabled by changing the following settings in nsh2/defconfig: - CONFIG_CAN=y : Enable CAN "upper-half" driver support - CONFIG_STM32_CAN1=y : Enable STM32 CAN1 "lower-half" driver support + CONFIG_CAN=y : Enable CAN "upper-half" driver support + CONFIG_STM32_CAN1=y : Enable STM32 CAN1 "lower-half" driver support The default CAN settings may need to change in your board board configuration: - CONFIG_CAN_EXTID=y : Support extended IDs - CONFIG_CAN1_BAUD=250000 : Bit rate: 250 KHz - CONFIG_CAN_TSEG1=12 : 80% sample point + CONFIG_CAN_EXTID=y : Support extended IDs + CONFIG_STM32_CAN1_BAUD=250000 : Bit rate: 250 KHz + CONFIG_CAN_TSEG1=12 : 80% sample point CONFIG_CAN_TSEG2=3 nx: --- diff --git a/configs/stm3220g-eval/README.txt b/configs/stm3220g-eval/README.txt index d566b75c94a..cd72df7bcd9 100644 --- a/configs/stm3220g-eval/README.txt +++ b/configs/stm3220g-eval/README.txt @@ -133,9 +133,11 @@ Configuration Options: Default: 4 CONFIG_STM32_CAN1 - Enable support for CAN1 - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. CONFIG_STM32_CAN2 - Enable support for CAN2 - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. + CONFIG_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an @@ -465,8 +467,10 @@ STM3220G-EVAL-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index ae0b266a723..c6ab5ba08ea 100644 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -134,9 +134,11 @@ Configuration Options: Default: 4 CONFIG_STM32_CAN1 - Enable support for CAN1 - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 is defined. + CONFIG_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. CONFIG_STM32_CAN2 - Enable support for CAN2 - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN2 is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an @@ -557,8 +559,10 @@ STM3240G-EVAL-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32_tiny/README.txt b/configs/stm32_tiny/README.txt index 4d570dfd2f8..fd11dc3980e 100644 --- a/configs/stm32_tiny/README.txt +++ b/configs/stm32_tiny/README.txt @@ -251,8 +251,10 @@ STM32 Tiny - specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32f103-minimum/README.txt b/configs/stm32f103-minimum/README.txt index 8bf07fca4ef..4d431c8d4ab 100644 --- a/configs/stm32f103-minimum/README.txt +++ b/configs/stm32f103-minimum/README.txt @@ -681,8 +681,10 @@ STM32F103 Minimum - specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32f3discovery/README.txt b/configs/stm32f3discovery/README.txt index 672dc22e673..fd11de00aa2 100644 --- a/configs/stm32f3discovery/README.txt +++ b/configs/stm32f3discovery/README.txt @@ -389,8 +389,10 @@ STM32F3Discovery-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32f429i-disco/README.txt b/configs/stm32f429i-disco/README.txt index 7af95073ad4..235b6a50598 100644 --- a/configs/stm32f429i-disco/README.txt +++ b/configs/stm32f429i-disco/README.txt @@ -584,8 +584,10 @@ STM32F429I-DISCO-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index eaf0364ee47..10128f7be97 100644 --- a/configs/stm32f4discovery/README.txt +++ b/configs/stm32f4discovery/README.txt @@ -925,8 +925,10 @@ STM32F4Discovery-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32f4discovery/canard/defconfig b/configs/stm32f4discovery/canard/defconfig index 914d4975ad7..662bea313b1 100644 --- a/configs/stm32f4discovery/canard/defconfig +++ b/configs/stm32f4discovery/canard/defconfig @@ -11,7 +11,6 @@ CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y -CONFIG_CAN1_BAUD=500000 CONFIG_CANUTILS_LIBCANARD=y CONFIG_CAN_EXTID=y CONFIG_CLOCK_MONOTONIC=y @@ -45,6 +44,7 @@ CONFIG_START_DAY=6 CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_CAN1=y +CONFIG_STM32_CAN1_BAUD=500000 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt index 377f779b859..6b6d0990d24 100644 --- a/configs/stm32f746g-disco/README.txt +++ b/configs/stm32f746g-disco/README.txt @@ -396,8 +396,10 @@ STM32F746G-DISCO-specific Configuration Options Default: 4 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_STM32F7_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32F7_CAN2 is defined. + CONFIG_STM32F7_CAN1_BAUD - CAN1 BAUD rate. Required if + CONFIG_STM32F7_CAN1 is defined. + CONFIG_STM32F7_CAN2_BAUD - CAN1 BAUD rate. Required if + CONFIG_STM32F7_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/stm32ldiscovery/README.txt b/configs/stm32ldiscovery/README.txt index 966415e5bf3..b0d24742a24 100644 --- a/configs/stm32ldiscovery/README.txt +++ b/configs/stm32ldiscovery/README.txt @@ -465,8 +465,10 @@ STM32L-Discovery-specific Configuration Options Default: 4 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_STM32_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_STM32_CAN1 + is defined. + CONFIG_STM32_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 CONFIG_STM32_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt index 9523c212790..258fcfff26a 100644 --- a/configs/zkit-arm-1769/README.txt +++ b/configs/zkit-arm-1769/README.txt @@ -298,12 +298,14 @@ ZKit-ARM Configuration Options CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default Standard 11-bit IDs. - CONFIG_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 is defined. - CONFIG_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 is defined. + CONFIG_LPC17_CAN1_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN1 + is defined. + CONFIG_LPC17_CAN2_BAUD - CAN1 BAUD rate. Required if CONFIG_LPC17_CAN2 + is defined. CONFIG_LPC17_CAN1_DIVISOR - CAN1 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. - CONFIG_LPC17CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this + CONFIG_LPC17_CAN2_DIVISOR - CAN2 is clocked at CCLK divided by this number. (the CCLK frequency is divided by this number to get the CAN clock). Options = {1,2,4,6}. Default: 4. CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6