From 191a9c5ac61e0e65a01cdac84378b888b8d17448 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 6 Oct 2018 11:10:15 +0000 Subject: Increaded device coverage of some mcuconf.h. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12340 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h | 1 + demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h | 1 + demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h | 1 + os/hal/ports/STM32/STM32L4xx/hal_lld.h | 14 ++++++++++---- os/hal/ports/STM32/STM32L4xx/stm32_registry.h | 8 ++++---- testex/STM32/STM32L4xx/SPI-L3GD20/mcuconf.h | 1 + testhal/STM32/STM32L4xx/ADC/mcuconf.h | 1 + testhal/STM32/STM32L4xx/CAN/mcuconf.h | 1 + testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h | 1 + testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h | 1 + testhal/STM32/STM32L4xx/WSPI-N25Q128/mcuconf.h | 1 + testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h | 1 + testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h | 1 + .../STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h | 1 + .../STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h | 1 + .../ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl | 1 + .../ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl | 1 + 17 files changed, 29 insertions(+), 8 deletions(-) diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h index 2884ece85..c61614ea7 100644 --- a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h index e76437f90..9d1884888 100644 --- a/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h +++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h index 1173792f1..bd5806c02 100644 --- a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L496_MCUCONF +#define STM32L4A6_MCUCONF /* * HAL driver system settings. diff --git a/os/hal/ports/STM32/STM32L4xx/hal_lld.h b/os/hal/ports/STM32/STM32L4xx/hal_lld.h index d3b5578f4..40da4cc73 100644 --- a/os/hal/ports/STM32/STM32L4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L4xx/hal_lld.h @@ -762,16 +762,22 @@ added gradually.*/ #if defined(STM32L432xx) && !defined(STM32L432_MCUCONF) #error "Using a wrong mcuconf.h file, STM32L432_MCUCONF not defined" +#endif -#elif defined(STM32L476xx) && !defined(STM32L476_MCUCONF) +#if defined(STM32L476xx) && !defined(STM32L476_MCUCONF) #error "Using a wrong mcuconf.h file, STM32L476_MCUCONF not defined" +#endif + +#if defined(STM32L486xx) && !defined(STM32L486_MCUCONF) +#error "Using a wrong mcuconf.h file, STM32L486_MCUCONF not defined" +#endif -#elif defined(STM32L496xx) && !defined(STM32L496_MCUCONF) +#if defined(STM32L496xx) && !defined(STM32L496_MCUCONF) #error "Using a wrong mcuconf.h file, STM32L496_MCUCONF not defined" +#endif -#elif defined(STM32L4A6xx) && !defined(STM32L4A6_MCUCONF) +#if defined(STM32L4A6xx) && !defined(STM32L4A6_MCUCONF) #error "Using a wrong mcuconf.h file, STM32L4A6_MCUCONF not defined" - #endif /* diff --git a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h index c45061ea7..2e5b48724 100644 --- a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h @@ -718,10 +718,10 @@ #endif /* defined(STM32L443xx) */ /*===========================================================================*/ -/* STM32L476xx. */ +/* STM32L476xx, STM32L486xx. */ /*===========================================================================*/ -#if defined(STM32L476xx) +#if defined(STM32L476xx) || defined(STM32L486xx) /* Clock attributes.*/ #define STM32_CLOCK_HAS_HSI48 FALSE @@ -1125,10 +1125,10 @@ #endif /* defined(STM32L476xx) */ /*===========================================================================*/ -/* STM32L496xx. */ +/* STM32L496xx, STM32L4A6xx. */ /*===========================================================================*/ -#if defined(STM32L496xx) +#if defined(STM32L496xx) || defined(STM32L4A6xx) /* Clock attributes.*/ #define STM32_CLOCK_HAS_HSI48 FALSE diff --git a/testex/STM32/STM32L4xx/SPI-L3GD20/mcuconf.h b/testex/STM32/STM32L4xx/SPI-L3GD20/mcuconf.h index c1b342380..302bbdb1d 100644 --- a/testex/STM32/STM32L4xx/SPI-L3GD20/mcuconf.h +++ b/testex/STM32/STM32L4xx/SPI-L3GD20/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/STM32L4xx/ADC/mcuconf.h b/testhal/STM32/STM32L4xx/ADC/mcuconf.h index be349321b..794d15778 100644 --- a/testhal/STM32/STM32L4xx/ADC/mcuconf.h +++ b/testhal/STM32/STM32L4xx/ADC/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/STM32L4xx/CAN/mcuconf.h b/testhal/STM32/STM32L4xx/CAN/mcuconf.h index f0dd22874..f1f97e475 100644 --- a/testhal/STM32/STM32L4xx/CAN/mcuconf.h +++ b/testhal/STM32/STM32L4xx/CAN/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h b/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h index 61858426d..5775b917e 100644 --- a/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h +++ b/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h index b4f1c7d7c..5359f99d3 100644 --- a/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h +++ b/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/STM32L4xx/WSPI-N25Q128/mcuconf.h b/testhal/STM32/STM32L4xx/WSPI-N25Q128/mcuconf.h index 54f2fabec..d5acc2985 100644 --- a/testhal/STM32/STM32L4xx/WSPI-N25Q128/mcuconf.h +++ b/testhal/STM32/STM32L4xx/WSPI-N25Q128/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h index 190a14daf..ca04e21c0 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h index d18ac82cf..80c9adf1b 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h index 46c778850..669ff94cb 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h index adbc25508..46e69ff34 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/mcuconf.h @@ -33,6 +33,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl index 550c1088c..7b1973f07 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l476xx/mcuconf.h.ftl @@ -44,6 +44,7 @@ #define STM32L4xx_MCUCONF #define STM32L476_MCUCONF +#define STM32L486_MCUCONF /* * HAL driver system settings. diff --git a/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl index 5948b926a..fafbfcfd7 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l496xx/mcuconf.h.ftl @@ -44,6 +44,7 @@ #define STM32L4xx_MCUCONF #define STM32L496_MCUCONF +#define STM32L4A6_MCUCONF /* * HAL driver system settings. -- cgit v1.2.3