From a538caa615c12e7e2ab3f6bccfc1d81af749b64b Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 15 Sep 2018 10:02:36 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12261 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h | 21 +-------------------- .../conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl | 19 ------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h index 4f8df2d65..0e56a339c 100644 --- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h @@ -14,9 +14,6 @@ limitations under the License. */ -#ifndef MCUCONF_H -#define MCUCONF_H - /* * STM32L4xx drivers configuration. * The following settings override the default settings present in @@ -31,22 +28,6 @@ * 0...3 Lowest...Highest. */ -/* - ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - #ifndef MCUCONF_H #define MCUCONF_H @@ -138,7 +119,7 @@ #define STM32_IRQ_EXTI18_PRIORITY 6 #define STM32_IRQ_EXTI19_PRIORITY 6 #define STM32_IRQ_EXTI20_PRIORITY 6 -#define STM32_IRQ_EXTI21_22_PRIORITY 15 +#define STM32_IRQ_EXTI21_22_PRIORITY 6 /* * ADC driver system settings. diff --git a/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl index bf5a57d62..b64e68846 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl @@ -25,9 +25,6 @@ [@license.EmitLicenseAsText /] */ -#ifndef MCUCONF_H -#define MCUCONF_H - /* * STM32L4xx drivers configuration. * The following settings override the default settings present in @@ -42,22 +39,6 @@ * 0...3 Lowest...Highest. */ -/* - ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - #ifndef MCUCONF_H #define MCUCONF_H -- cgit v1.2.3