aboutsummaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/include/stm32
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch/arm/include/stm32')
-rw-r--r--nuttx/arch/arm/include/stm32/chip.h706
-rw-r--r--nuttx/arch/arm/include/stm32/irq.h117
-rw-r--r--nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h299
-rw-r--r--nuttx/arch/arm/include/stm32/stm32f20xxx_irq.h182
-rw-r--r--nuttx/arch/arm/include/stm32/stm32f40xxx_irq.h185
5 files changed, 0 insertions, 1489 deletions
diff --git a/nuttx/arch/arm/include/stm32/chip.h b/nuttx/arch/arm/include/stm32/chip.h
deleted file mode 100644
index 14d92ea3d..000000000
--- a/nuttx/arch/arm/include/stm32/chip.h
+++ /dev/null
@@ -1,706 +0,0 @@
-/************************************************************************************
- * arch/arm/include/stm32/chip.h
- *
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ************************************************************************************/
-
-#ifndef __ARCH_ARM_INCLUDE_STM32_CHIP_H
-#define __ARCH_ARM_INCLUDE_STM32_CHIP_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/* Get customizations for each supported chip and provide alternate function pin-mapping
- *
- * NOTE: Each GPIO pin may serve either for general purpose I/O or for a special
- * alternate function (such as USART, CAN, USB, SDIO, etc.). That particular
- * pin-mapping will depend on the package and STM32 family. If you are incorporating
- * a new STM32 chip into NuttX, you will need to add the pin-mapping to a header file
- * and to include that header file below. The chip-specific pin-mapping is defined in
- * the chip datasheet.
- */
-
-/* STM32 F100 Value Line ************************************************************/
-
-#if defined(CONFIG_ARCH_CHIP_STM32F100C8) || defined(CONFIG_ARCH_CHIP_STM32F100CB) \
- || defined(CONFIG_ARCH_CHIP_STM32F100R8) || defined(CONFIG_ARCH_CHIP_STM32F100RB)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# define CONFIG_STM32_MEDIUMDENSITY 1 /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# define CONFIG_STM32_VALUELINE 1 /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 0 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timer TIM1 */
-# define STM32_NGTIM 3 /* 16-bit general timers TIM2,3,4 with DMA */
-# define STM32_NBTIM 2 /* 2 basic timers: TIM6, TIM7 */
-// TODO: there are also 3 additional timers (15-17) that don't fit any existing category
-# define STM32_NDMA 1 /* DMA1 */
-# define STM32_NSPI 2 /* SPI1-2 */
-# define STM32_NI2S 0 /* No I2S */
-# define STM32_NUSART 3 /* USART1-3 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 0 /* No CAN */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 64 /* GPIOA-D */
-# define STM32_NADC 1 /* ADC1 */
-# define STM32_NDAC 2 /* DAC 1-2 */
-# define STM32_NCRC 1 /* CRC1 */
-# define STM32_NETHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F100V8) || defined(CONFIG_ARCH_CHIP_STM32F100VB)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# define CONFIG_STM32_MEDIUMDENSITY 1 /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# define CONFIG_STM32_VALUELINE 1 /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 0 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timer TIM1 */
-# define STM32_NGTIM 3 /* 16-bit general timers TIM2,3,4 with DMA */
-# define STM32_NBTIM 2 /* 2 basic timers: TIM6, TIM7 */
-// TODO: there are also 3 additional timers (15-17) that don't fit any existing category
-# define STM32_NDMA 1 /* DMA1 */
-# define STM32_NSPI 2 /* SPI1-2 */
-# define STM32_NI2S 0 /* No I2S */
-# define STM32_NUSART 3 /* USART1-3 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 0 /* No CAN */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 80 /* GPIOA-E */
-# define STM32_NADC 1 /* ADC1 */
-# define STM32_NDAC 2 /* DAC 1-2 */
-# define STM32_NCRC 1 /* CRC1 */
-# define STM32_NETHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32 F100 High-density value Line ************************************************************/
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F100RC) || defined(CONFIG_ARCH_CHIP_STM32F100RD) \
- || defined(CONFIG_ARCH_CHIP_STM32F100RE)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# define CONFIG_STM32_HIGHDENSITY 1 /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# define CONFIG_STM32_VALUELINE 1 /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 0 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timer TIM1 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM2,3,4,5 with DMA */
-# define STM32_NBTIM 2 /* 2 basic timers: TIM6, TIM7 */
-// TODO: there are also 6 additional timers (12-17) that don't fit any existing category
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 0 /* No I2S */
-# define STM32_NUSART 5 /* USART1-5 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 0 /* No CAN */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 64 /* GPIOA-D */
-# define STM32_NADC 1 /* ADC1 */
-# define STM32_NDAC 2 /* DAC 1-2 */
-# define STM32_NCRC 1 /* CRC1 */
-# define STM32_NETHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F100VC) || defined(CONFIG_ARCH_CHIP_STM32F100VD) \
- || defined(CONFIG_ARCH_CHIP_STM32F100VE)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# define CONFIG_STM32_HIGHDENSITY 1 /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# define CONFIG_STM32_VALUELINE 1 /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timer TIM1 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM2,3,4,5 with DMA */
-# define STM32_NBTIM 2 /* 2 basic timers: TIM6, TIM7 */
-// TODO: there are also 6 additional timers (12-17) that don't fit any existing category
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 0 /* No I2S */
-# define STM32_NUSART 5 /* USART1-5 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 0 /* No CAN */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 80 /* GPIOA-E */
-# define STM32_NADC 1 /* ADC1 */
-# define STM32_NDAC 2 /* DAC 1-2 */
-# define STM32_NCRC 1 /* CRC1 */
-# define STM32_NETHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32 F103 Medium Density Family *************************************************/
-/* STM32F103RB is in the Medium-density performance line and is provided in 64 pin
- * packages with 128K Flash, USB, CAN, 7 timers, 2 ADCs, 9 com. interfaces
- */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F103RBT6)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# define CONFIG_STM32_MEDIUMDENSITY 1 /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 0 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timer TIM1 */
-# define STM32_NGTIM 3 /* General timers TIM2,3,4 */
-# define STM32_NBTIM 0 /* Two basic timers TIM6 and TIM7 */
-# define STM32_NDMA 1 /* DMA1 */
-# define STM32_NSPI 2 /* SPI1-2 */
-# define STM32_NI2S 0 /* No I2S (?) */
-# define STM32_NUSART 3 /* USART1-3 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 1 /* bxCAN1 */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 51 /* GPIOA-E */
-# define STM32_NADC 2 /* ADC1-2 */
-# define STM32_NDAC 0 /* No DAC */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NTHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32 F103 High Density Family ***************************************************/
-/* STM32F103RC, STM32F103RD, and STM32F103RE are all provided in 64 pin packages and
- * differ only in the available FLASH and SRAM.
- */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F103RET6)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# define CONFIG_STM32_HIGHDENSITY 1 /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and TIM8 */
-# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
-# define STM32_NBTIM 2 /* Two basic timers TIM6 and TIM7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 0 /* No I2S (?) */
-# define STM32_NUSART 5 /* USART1-5 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 1 /* CAN1 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 51 /* GPIOA-D */
-# define STM32_NADC 2 /* ADC1-2 */
-# define STM32_NDAC 2 /* DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32F103VC, STM32F103VD, and STM32F103VE are all provided in 100 pin packages and differ
- * only in the available FLASH and SRAM.
- */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F103VCT6) || defined(CONFIG_ARCH_CHIP_STM32F103VET6)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# define CONFIG_STM32_HIGHDENSITY 1 /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and TIM8 */
-# define STM32_NGTIM 4 /* General timers TIM2,3,4,5 */
-# define STM32_NBTIM 2 /* Two basic timers TIM6 and TIM7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 0 /* No I2S (?) */
-# define STM32_NUSART 5 /* USART1-5 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 1 /* bxCAN1 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 80 /* GPIOA-E */
-# define STM32_NADC 3 /* ADC1-3 */
-# define STM32_NDAC 2 /* DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NTHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32F103ZC, STM32F103ZD, and STM32F103ZE are all provided in 144 pin packages and differ
- * only in the available FLASH and SRAM.
- */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F103ZET6)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# define CONFIG_STM32_HIGHDENSITY 1 /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx families */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timer TIM1 */
-# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
-# define STM32_NBTIM 0 /* No basic timers */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 2 /* SPI1-2 */
-# define STM32_NI2S 0 /* No I2S (?) */
-# define STM32_NUSART 3 /* USART1-3 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 1 /* CAN1 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 112 /* GPIOA-G */
-# define STM32_NADC 1 /* ADC1 */
-# define STM32_NDAC 0 /* No DAC */
-# define STM32_NCRC 0 /* No CRC */
-# define STM32_NETHERNET 0 /* No ethernet */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32 F105/F107 Connectivity Line *******************************************************/
-#elif defined(CONFIG_ARCH_CHIP_STM32F105VBT7)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# define CONFIG_STM32_CONNECTIVITYLINE 1 /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timers TIM1 */
-# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 5 /* USART1-3, UART 4-5 */
-# define STM32_NI2C 2 /* I2C1-2 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 80 /* GPIOA-E */
-# define STM32_NADC 2 /* ADC1-2*/
-# define STM32_NDAC 2 /* DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 0 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F107VC)
-# define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# define CONFIG_STM32_CONNECTIVITYLINE 1 /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 1 /* One advanced timers TIM1 */
-# define STM32_NGTIM 4 /* 16-bit generall timers TIM2,3,4,5 with DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 5 /* USART1-3, UART 4-5 */
-# define STM32_NI2C 1 /* I2C1 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 0 /* No SDIO */
-# define STM32_NUSBOTG 0 /* No USB OTG FS/HS */
-# define STM32_NGPIO 80 /* GPIOA-E */
-# define STM32_NADC 2 /* ADC1-2*/
-# define STM32_NDAC 2 /* DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 0 /* No random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-/* STM32 F2 Family ******************************************************************/
-#elif defined(CONFIG_ARCH_CHIP_STM32F207IG) /* UFBGA-176 1024Kb FLASH 128Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# define CONFIG_STM32_STM32F20XX 1 /* STM32F205x and STM32F207x */
-# undef CONFIG_STM32_STM32F40XX /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 140 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 24 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-/* STM23 F4 Family ******************************************************************/
-#elif defined(CONFIG_ARCH_CHIP_STM32F405RG) /* LQFP 64 10x10x1.4 1024Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 0 /* No FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 16 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 0 /* No Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F405VG) /* LQFP 100 14x14x1.4 1024Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 16 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 0 /* No Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F405ZG) /* LQFP 144 20x20x1.4 1024Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 24 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 0 /* No Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 0 /* No digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F407VE) /* LQFP-100 512Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 16 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F407VG) /* LQFP-100 14x14x1.4 1024Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 16 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F407ZE) /* LQFP-144 512Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 24 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F407ZG) /* LQFP 144 20x20x1.4 1024Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 24 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F407IE) /* LQFP 176 24x24x1.4 512Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 (?) */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 24 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-#elif defined(CONFIG_ARCH_CHIP_STM32F407IG) /* BGA 176; LQFP 176 24x24x1.4 1024Kb FLASH 192Kb SRAM */
-# undef CONFIG_STM32_STM32F10XX /* STM32F10xxx family */
-# undef CONFIG_STM32_LOWDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 16/32 Kbytes */
-# undef CONFIG_STM32_MEDIUMDENSITY /* STM32F100x, STM32F101x, STM32F102x and STM32F103x w/ 64/128 Kbytes */
-# undef CONFIG_STM32_HIGHDENSITY /* STM32F100x, STM32F101x, and STM32F103x w/ 256/512 Kbytes */
-# undef CONFIG_STM32_VALUELINE /* STM32F100x */
-# undef CONFIG_STM32_CONNECTIVITYLINE /* STM32F105x and STM32F107x */
-# undef CONFIG_STM32_STM32F20XX /* STM32F205x and STM32F207x */
-# define CONFIG_STM32_STM32F40XX 1 /* STM32F405xx and STM32407xx */
-# define STM32_NFSMC 1 /* FSMC */
-# define STM32_NATIM 2 /* Two advanced timers TIM1 and 8 */
-# define STM32_NGTIM 4 /* 16-bit general timers TIM3 and 4 with DMA
- * 32-bit general timers TIM2 and 5 with DMA */
-# define STM32_NGTIMNDMA 6 /* 16-bit general timers TIM9-14 without DMA */
-# define STM32_NBTIM 2 /* Two basic timers, TIM6-7 */
-# define STM32_NDMA 2 /* DMA1-2 */
-# define STM32_NSPI 3 /* SPI1-3 */
-# define STM32_NI2S 2 /* I2S1-2 (multiplexed with SPI2-3) */
-# define STM32_NUSART 6 /* USART1-3 and 6, UART 4-5 */
-# define STM32_NI2C 3 /* I2C1-3 */
-# define STM32_NCAN 2 /* CAN1-2 */
-# define STM32_NSDIO 1 /* SDIO */
-# define STM32_NUSBOTG 1 /* USB OTG FS/HS */
-# define STM32_NGPIO 139 /* GPIOA-I */
-# define STM32_NADC 3 /* 12-bit ADC1-3, 24 channels */
-# define STM32_NDAC 2 /* 12-bit DAC1-2 */
-# define STM32_NCRC 1 /* CRC */
-# define STM32_NETHERNET 1 /* 100/100 Ethernet MAC */
-# define STM32_NRNG 1 /* Random number generator (RNG) */
-# define STM32_NDCMI 1 /* Digital camera interface (DCMI) */
-
-#else
-# error "Unsupported STM32 chip"
-#endif
-
-/* NVIC priority levels *************************************************************/
-
-#define NVIC_SYSH_PRIORITY_MIN 0xf0 /* All bits set in minimum priority */
-#define NVIC_SYSH_PRIORITY_DEFAULT 0x80 /* Midpoint is the default */
-#define NVIC_SYSH_PRIORITY_MAX 0x00 /* Zero is maximum priority */
-#define NVIC_SYSH_PRIORITY_STEP 0x10 /* Four bits of interrupt priority used */
-
-#define NVIC_SYSH_DISABLE_PRIORITY (NVIC_SYSH_PRIORITY_MAX + NVIC_SYSH_PRIORITY_STEP)
-#define NVIC_SYSH_SVCALL_PRIORITY NVIC_SYSH_PRIORITY_MAX
-
-#endif /* __ARCH_ARM_INCLUDE_STM32_CHIP_H */
-
diff --git a/nuttx/arch/arm/include/stm32/irq.h b/nuttx/arch/arm/include/stm32/irq.h
deleted file mode 100644
index 842183420..000000000
--- a/nuttx/arch/arm/include/stm32/irq.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/************************************************************************************
- * arch/arm/include/stm32s/irq.h
- *
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ************************************************************************************/
-
-/* This file should never be included directed but, rather,
- * only indirectly through nuttx/irq.h
- */
-
-#ifndef __ARCH_ARM_INCLUDE_STM32_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32_IRQ_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/irq.h>
-#include <arch/stm32/chip.h>
-
-/************************************************************************************
- * Definitions
- ************************************************************************************/
-
-/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC. This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- */
-
-/* Processor Exceptions (vectors 0-15) */
-
-#define STM32_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
- /* Vector 0: Reset stack pointer value */
- /* Vector 1: Reset (not handler as an IRQ) */
-#define STM32_IRQ_NMI (2) /* Vector 2: Non-Maskable Interrupt (NMI) */
-#define STM32_IRQ_HARDFAULT (3) /* Vector 3: Hard fault */
-#define STM32_IRQ_MEMFAULT (4) /* Vector 4: Memory management (MPU) */
-#define STM32_IRQ_BUSFAULT (5) /* Vector 5: Bus fault */
-#define STM32_IRQ_USAGEFAULT (6) /* Vector 6: Usage fault */
-#define STM32_IRQ_SVCALL (11) /* Vector 11: SVC call */
-#define STM32_IRQ_DBGMONITOR (12) /* Vector 12: Debug Monitor */
- /* Vector 13: Reserved */
-#define STM32_IRQ_PENDSV (14) /* Vector 14: Pendable system service request */
-#define STM32_IRQ_SYSTICK (15) /* Vector 15: System tick */
-
-/* External interrupts (vectors >= 16). These definitions are chip-specific */
-
-#define STM32_IRQ_INTERRUPTS (16) /* Vector number of the first external interrupt */
-
-#if defined(CONFIG_STM32_STM32F10XX)
-# include <arch/stm32/stm32f10xxx_irq.h>
-#elif defined(CONFIG_STM32_STM32F20XX)
-# include <arch/stm32/stm32f20xxx_irq.h>
-#elif defined(CONFIG_STM32_STM32F40XX)
-# include <arch/stm32/stm32f40xxx_irq.h>
-#else
-# error "Unsupported STM32 chip"
-#endif
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#endif /* __ARCH_ARM_INCLUDE_STM32_IRQ_H */
-
diff --git a/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h b/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h
deleted file mode 100644
index 7c3f7cf95..000000000
--- a/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/************************************************************************************
- * arch/arm/include/stm32s/stm32f10xxx_irq.h
- *
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ************************************************************************************/
-
-/* This file should never be included directed but, rather,
- * only indirectly through nuttx/irq.h
- */
-
-#ifndef __ARCH_ARM_INCLUDE_STM32F10XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F10XXX_IRQ_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/irq.h>
-
-/************************************************************************************
- * Definitions
- ************************************************************************************/
-
-/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC. This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- *
- * Processor Exceptions (vectors 0-15). These common definitions can be found
- * in nuttx/arch/arm/include/stm32/irq.h
- *
- * External interrupts (vectors >= 16)
- */
-
- /* Value line devices */
-
-#if defined(CONFIG_STM32_VALUELINE)
-# define STM32_IRQ_WWDG (16) /* 0: Window Watchdog interrupt */
-# define STM32_IRQ_PVD (17) /* 1: PVD through EXTI Line detection interrupt */
-# define STM32_IRQ_TAMPER (18) /* 2: Tamper interrupt */
-# define STM32_IRQ_RTC (19) /* 3: RTC Wakeup through EXTI line interrupt */
-# define STM32_IRQ_FLASH (20) /* 4: Flash global interrupt */
-# define STM32_IRQ_RCC (21) /* 5: RCC global interrupt */
-# define STM32_IRQ_EXTI0 (22) /* 6: EXTI Line 0 interrupt */
-# define STM32_IRQ_EXTI1 (23) /* 7: EXTI Line 1 interrupt */
-# define STM32_IRQ_EXTI2 (24) /* 8: EXTI Line 2 interrupt */
-# define STM32_IRQ_EXTI3 (25) /* 9: EXTI Line 3 interrupt */
-# define STM32_IRQ_EXTI4 (26) /* 10: EXTI Line 4 interrupt */
-# define STM32_IRQ_DMA1CH1 (27) /* 11: DMA1 Channel 1 global interrupt */
-# define STM32_IRQ_DMA1CH2 (28) /* 12: DMA1 Channel 2 global interrupt */
-# define STM32_IRQ_DMA1CH3 (29) /* 13: DMA1 Channel 3 global interrupt */
-# define STM32_IRQ_DMA1CH4 (30) /* 14: DMA1 Channel 4 global interrupt */
-# define STM32_IRQ_DMA1CH5 (31) /* 15: DMA1 Channel 5 global interrupt */
-# define STM32_IRQ_DMA1CH6 (32) /* 16: DMA1 Channel 6 global interrupt */
-# define STM32_IRQ_DMA1CH7 (33) /* 17: DMA1 Channel 7 global interrupt */
-# define STM32_IRQ_ADC1 (34) /* 18: ADC1 global interrupt */
-# define STM32_IRQ_RESERVED0 (35) /* 19: Reserved 0 */
-# define STM32_IRQ_RESERVED1 (36) /* 20: Reserved 1 */
-# define STM32_IRQ_RESERVED2 (37) /* 21: Reserved 2 */
-# define STM32_IRQ_RESERVED3 (38) /* 22: Reserved 3 */
-# define STM32_IRQ_EXTI95 (39) /* 23: EXTI Line[9:5] interrupts */
-# define STM32_IRQ_TIM1BRK (40) /* 24: TIM1 Break interrupt */
-# define STM32_IRQ_TIM15 (40) /* TIM15 global interrupt */
-# define STM32_IRQ_TIM1UP (41) /* 25: TIM1 Update interrupt */
-# define STM32_IRQ_TIM16 (41) /* TIM16 global interrupt */
-# define STM32_IRQ_TIM1TRGCOM (42) /* 26: TIM1 Trigger and Commutation interrupts */
-# define STM32_IRQ_TIM17 (42) /* TIM17 global interrupt */
-# define STM32_IRQ_TIM1CC (43) /* 27: TIM1 Capture Compare interrupt */
-# define STM32_IRQ_TIM2 (44) /* 28: TIM2 global interrupt */
-# define STM32_IRQ_TIM3 (45) /* 29: TIM3 global interrupt */
-# define STM32_IRQ_TIM4 (46) /* 30: TIM4 global interrupt */
-# define STM32_IRQ_I2C1EV (47) /* 31: I2C1 event interrupt */
-# define STM32_IRQ_I2C1ER (48) /* 32: I2C1 error interrupt */
-# define STM32_IRQ_I2C2EV (49) /* 33: I2C2 event interrupt */
-# define STM32_IRQ_I2C2ER (50) /* 34: I2C2 error interrupt */
-# define STM32_IRQ_SPI1 (51) /* 35: SPI1 global interrupt */
-# define STM32_IRQ_SPI2 (52) /* 36: SPI2 global interrupt */
-# define STM32_IRQ_USART1 (53) /* 37: USART1 global interrupt */
-# define STM32_IRQ_USART2 (54) /* 38: USART2 global interrupt */
-# define STM32_IRQ_USART3 (55) /* 39: USART3 global interrupt */
-# define STM32_IRQ_EXTI1510 (56) /* 40: EXTI Line[15:10] interrupts */
-# define STM32_IRQ_RTCALR (57) /* 41: RTC alarms (A and B) through EXTI line interrupt */
-# define STM32_IRQ_CEC (58) /* 42: CEC global interrupt */
-# define STM32_IRQ_TIM12 (59) /* 43: TIM12 global interrupt */
-# define STM32_IRQ_TIM13 (60) /* 44: TIM13 global interrupt */
-# define STM32_IRQ_TIM14 (61) /* 45: TIM14 global interrupt */
-# define STM32_IRQ_RESERVED4 (62) /* 46: Reserved 4 */
-# define STM32_IRQ_RESERVED5 (63) /* 47: Reserved 5 */
-# define STM32_IRQ_FSMC (64) /* 48: FSMC global interrupt */
-# define STM32_IRQ_RESERVED6 (65) /* 49: Reserved 6 */
-# define STM32_IRQ_TIM5 (66) /* 50: TIM5 global interrupt */
-# define STM32_IRQ_SPI3 (67) /* 51: SPI3 global interrupt */
-# define STM32_IRQ_UART4 (68) /* 52: USART2 global interrupt */
-# define STM32_IRQ_UART5 (69) /* 53: USART5 global interrupt */
-# define STM32_IRQ_TIM6 (70) /* 54: TIM6 global interrupt */
-# define STM32_IRQ_TIM7 (71) /* 55: TIM7 global interrupt */
-# define STM32_IRQ_DMA2CH1 (72) /* 56: DMA2 Channel 1 global interrupt */
-# define STM32_IRQ_DMA2CH2 (73) /* 57: DMA2 Channel 2 global interrupt */
-# define STM32_IRQ_DMA2CH3 (74) /* 58: DMA2 Channel 3 global interrupt */
-# define STM32_IRQ_DMA2CH45 (75) /* 59: DMA2 Channel 4 and 5 global interrupt */
-# define STM32_IRQ_DMA2CH5 (76) /* 60: DMA2 Channel 5 global interrupt */
-# define NR_IRQS (77)
-
-/* Connectivity Line Devices */
-
-#elif defined(CONFIG_STM32_CONNECTIVITYLINE)
-# define STM32_IRQ_WWDG (16) /* 0: Window Watchdog interrupt */
-# define STM32_IRQ_PVD (17) /* 1: PVD through EXTI Line detection interrupt */
-# define STM32_IRQ_TAMPER (18) /* 2: Tamper interrupt */
-# define STM32_IRQ_RTC (19) /* 3: RTC global interrupt */
-# define STM32_IRQ_FLASH (20) /* 4: Flash global interrupt */
-# define STM32_IRQ_RCC (21) /* 5: RCC global interrupt */
-# define STM32_IRQ_EXTI0 (22) /* 6: EXTI Line 0 interrupt */
-# define STM32_IRQ_EXTI1 (23) /* 7: EXTI Line 1 interrupt */
-# define STM32_IRQ_EXTI2 (24) /* 8: EXTI Line 2 interrupt */
-# define STM32_IRQ_EXTI3 (25) /* 9: EXTI Line 3 interrupt */
-# define STM32_IRQ_EXTI4 (26) /* 10: EXTI Line 4 interrupt */
-# define STM32_IRQ_DMA1CH1 (27) /* 11: DMA1 Channel 1 global interrupt */
-# define STM32_IRQ_DMA1CH2 (28) /* 12: DMA1 Channel 2 global interrupt */
-# define STM32_IRQ_DMA1CH3 (29) /* 13: DMA1 Channel 3 global interrupt */
-# define STM32_IRQ_DMA1CH4 (30) /* 14: DMA1 Channel 4 global interrupt */
-# define STM32_IRQ_DMA1CH5 (31) /* 15: DMA1 Channel 5 global interrupt */
-# define STM32_IRQ_DMA1CH6 (32) /* 16: DMA1 Channel 6 global interrupt */
-# define STM32_IRQ_DMA1CH7 (33) /* 17: DMA1 Channel 7 global interrupt */
-# define STM32_IRQ_ADC12 (34) /* 18: ADC1 and ADC2 global interrupt */
-# define STM32_IRQ_CAN1TX (35) /* 19: CAN1 TX interrupts */
-# define STM32_IRQ_CAN1RX0 (36) /* 20: CAN1 RX0 interrupts */
-# define STM32_IRQ_CAN1RX1 (37) /* 21: CAN1 RX1 interrupt */
-# define STM32_IRQ_CAN1SCE (38) /* 22: CAN1 SCE interrupt */
-# define STM32_IRQ_EXTI95 (39) /* 23: EXTI Line[9:5] interrupts */
-# define STM32_IRQ_TIM1BRK (40) /* 24: TIM1 Break interrupt */
-# define STM32_IRQ_TIM1UP (41) /* 25: TIM1 Update interrupt */
-# define STM32_IRQ_TIM1TRGCOM (42) /* 26: TIM1 Trigger and Commutation interrupts */
-# define STM32_IRQ_TIM1CC (43) /* 27: TIM1 Capture Compare interrupt */
-# define STM32_IRQ_TIM2 (44) /* 28: TIM2 global interrupt */
-# define STM32_IRQ_TIM3 (45) /* 29: TIM3 global interrupt */
-# define STM32_IRQ_TIM4 (46) /* 30: TIM4 global interrupt */
-# define STM32_IRQ_I2C1EV (47) /* 31: I2C1 event interrupt */
-# define STM32_IRQ_I2C1ER (48) /* 32: I2C1 error interrupt */
-# define STM32_IRQ_I2C2EV (49) /* 33: I2C2 event interrupt */
-# define STM32_IRQ_I2C2ER (50) /* 34: I2C2 error interrupt */
-# define STM32_IRQ_SPI1 (51) /* 35: SPI1 global interrupt */
-# define STM32_IRQ_SPI2 (52) /* 36: SPI2 global interrupt */
-# define STM32_IRQ_USART1 (53) /* 37: USART1 global interrupt */
-# define STM32_IRQ_USART2 (54) /* 38: USART2 global interrupt */
-# define STM32_IRQ_USART3 (55) /* 39: USART3 global interrupt */
-# define STM32_IRQ_EXTI1510 (56) /* 40: EXTI Line[15:10] interrupts */
-# define STM32_IRQ_RTCALRM (57) /* 41: RTC alarm through EXTI line interrupt */
-# define STM32_IRQ_OTGFSWKUP (58) /* 42: USB On-The-Go FS Wakeup through EXTI line interrupt */
-# define STM32_IRQ_RESERVED0 (59) /* 43: Reserved 0 */
-# define STM32_IRQ_RESERVED1 (60) /* 44: Reserved 1 */
-# define STM32_IRQ_RESERVED2 (61) /* 45: Reserved 2 */
-# define STM32_IRQ_RESERVED3 (62) /* 46: Reserved 3 */
-# define STM32_IRQ_RESERVED4 (63) /* 47: Reserved 4 */
-# define STM32_IRQ_RESERVED5 (64) /* 48: Reserved 5 */
-# define STM32_IRQ_RESERVED6 (65) /* 49: Reserved 6 */
-# define STM32_IRQ_TIM5 (66) /* 50: TIM5 global interrupt */
-# define STM32_IRQ_SPI3 (67) /* 51: SPI3 global interrupt */
-# define STM32_IRQ_UART4 (68) /* 52: UART4 global interrupt */
-# define STM32_IRQ_UART5 (69) /* 53: UART5 global interrupt */
-# define STM32_IRQ_TIM6 (70) /* 54: TIM6 global interrupt */
-# define STM32_IRQ_TIM7 (71) /* 55: TIM7 global interrupt */
-# define STM32_IRQ_DMA2CH1 (72) /* 56: DMA2 Channel 1 global interrupt */
-# define STM32_IRQ_DMA2CH2 (73) /* 57: DMA2 Channel 2 global interrupt */
-# define STM32_IRQ_DMA2CH3 (74) /* 58: DMA2 Channel 3 global interrupt */
-# define STM32_IRQ_DMA2CH4 (75) /* 59: DMA2 Channel 4 global interrupt */
-# define STM32_IRQ_DMA2CH5 (76) /* 60: DMA2 Channel 5 global interrupt */
-# define STM32_IRQ_ETH (77) /* 61: Ethernet global interrupt */
-# define STM32_IRQ_ETHWKUP (78) /* 62: Ethernet Wakeup through EXTI line interrupt */
-# define STM32_IRQ_CAN2TX (79) /* 63: CAN2 TX interrupts */
-# define STM32_IRQ_CAN2RX0 (70) /* 64: CAN2 RX0 interrupts */
-# define STM32_IRQ_CAN2RX1 (81) /* 65: CAN2 RX1 interrupt */
-# define STM32_IRQ_CAN2SCE (82) /* 66: CAN2 SCE interrupt */
-# define STM32_IRQ_OTGFS (83) /* 67: USB On The Go FS global interrupt */
-# define NR_IRQS (84)
-
-/* Medium and High Density Devices */
-
-#else
-# define STM32_IRQ_WWDG (16) /* 0: Window Watchdog interrupt */
-# define STM32_IRQ_PVD (17) /* 1: PVD through EXTI Line detection interrupt */
-# define STM32_IRQ_TAMPER (18) /* 2: Tamper interrupt */
-# define STM32_IRQ_RTC (19) /* 3: RTC global interrupt */
-# define STM32_IRQ_FLASH (20) /* 4: Flash global interrupt */
-# define STM32_IRQ_RCC (21) /* 5: RCC global interrupt */
-# define STM32_IRQ_EXTI0 (22) /* 6: EXTI Line 0 interrupt */
-# define STM32_IRQ_EXTI1 (23) /* 7: EXTI Line 1 interrupt */
-# define STM32_IRQ_EXTI2 (24) /* 8: EXTI Line 2 interrupt */
-# define STM32_IRQ_EXTI3 (25) /* 9: EXTI Line 3 interrupt */
-# define STM32_IRQ_EXTI4 (26) /* 10: EXTI Line 4 interrupt */
-# define STM32_IRQ_DMA1CH1 (27) /* 11: DMA1 Channel 1 global interrupt */
-# define STM32_IRQ_DMA1CH2 (28) /* 12: DMA1 Channel 2 global interrupt */
-# define STM32_IRQ_DMA1CH3 (29) /* 13: DMA1 Channel 3 global interrupt */
-# define STM32_IRQ_DMA1CH4 (30) /* 14: DMA1 Channel 4 global interrupt */
-# define STM32_IRQ_DMA1CH5 (31) /* 15: DMA1 Channel 5 global interrupt */
-# define STM32_IRQ_DMA1CH6 (32) /* 16: DMA1 Channel 6 global interrupt */
-# define STM32_IRQ_DMA1CH7 (33) /* 17: DMA1 Channel 7 global interrupt */
-# define STM32_IRQ_ADC12 (34) /* 18: ADC1 and ADC2 global interrupt */
-# define STM32_IRQ_USBHPCANTX (35) /* 19: USB High Priority or CAN TX interrupts*/
-# define STM32_IRQ_USBLPCANRX0 (36) /* 20: USB Low Priority or CAN RX0 interrupts*/
-# define STM32_IRQ_CAN1RX1 (37) /* 21: CAN1 RX1 interrupt */
-# define STM32_IRQ_CAN1SCE (38) /* 22: CAN1 SCE interrupt */
-# define STM32_IRQ_EXTI95 (39) /* 23: EXTI Line[9:5] interrupts */
-# define STM32_IRQ_TIM1BRK (40) /* 24: TIM1 Break interrupt */
-# define STM32_IRQ_TIM1UP (41) /* 25: TIM1 Update interrupt */
-# define STM32_IRQ_TIM1TRGCOM (42) /* 26: TIM1 Trigger and Commutation interrupts */
-# define STM32_IRQ_TIM1CC (43) /* 27: TIM1 Capture Compare interrupt */
-# define STM32_IRQ_TIM2 (44) /* 28: TIM2 global interrupt */
-# define STM32_IRQ_TIM3 (45) /* 29: TIM3 global interrupt */
-# define STM32_IRQ_TIM4 (46) /* 30: TIM4 global interrupt */
-# define STM32_IRQ_I2C1EV (47) /* 31: I2C1 event interrupt */
-# define STM32_IRQ_I2C1ER (48) /* 32: I2C1 error interrupt */
-# define STM32_IRQ_I2C2EV (49) /* 33: I2C2 event interrupt */
-# define STM32_IRQ_I2C2ER (50) /* 34: I2C2 error interrupt */
-# define STM32_IRQ_SPI1 (51) /* 35: SPI1 global interrupt */
-# define STM32_IRQ_SPI2 (52) /* 36: SPI2 global interrupt */
-# define STM32_IRQ_USART1 (53) /* 37: USART1 global interrupt */
-# define STM32_IRQ_USART2 (54) /* 38: USART2 global interrupt */
-# define STM32_IRQ_USART3 (55) /* 39: USART3 global interrupt */
-# define STM32_IRQ_EXTI1510 (56) /* 40: EXTI Line[15:10] interrupts */
-# define STM32_IRQ_RTCALRM (57) /* 41: RTC alarm through EXTI line interrupt */
-# define STM32_IRQ_USBWKUP (58) /* 42: USB wakeup from suspend through EXTI line interrupt*/
-# define STM32_IRQ_TIM8BRK (59) /* 43: TIM8 Break interrupt */
-# define STM32_IRQ_TIM8UP (60) /* 44: TIM8 Update interrupt */
-# define STM32_IRQ_TIM8TRGCOM (61) /* 45: TIM8 Trigger and Commutation interrupts */
-# define STM32_IRQ_TIM8CC (62) /* 46: TIM8 Capture Compare interrupt */
-# define STM32_IRQ_ADC3 (63) /* 47: ADC3 global interrupt */
-# define STM32_IRQ_FSMC (64) /* 48: FSMC global interrupt */
-# define STM32_IRQ_SDIO (65) /* 49: SDIO global interrupt */
-# define STM32_IRQ_TIM5 (66) /* 50: TIM5 global interrupt */
-# define STM32_IRQ_SPI3 (67) /* 51: SPI3 global interrupt */
-# define STM32_IRQ_UART4 (68) /* 52: UART4 global interrupt */
-# define STM32_IRQ_UART5 (69) /* 53: UART5 global interrupt */
-# define STM32_IRQ_TIM6 (70) /* 54: TIM6 global interrupt */
-# define STM32_IRQ_TIM7 (71) /* 55: TIM7 global interrupt */
-# define STM32_IRQ_DMA2CH1 (72) /* 56: DMA2 Channel 1 global interrupt */
-# define STM32_IRQ_DMA2CH2 (73) /* 57: DMA2 Channel 2 global interrupt */
-# define STM32_IRQ_DMA2CH3 (74) /* 58: DMA2 Channel 3 global interrupt */
-# define STM32_IRQ_DMA2CH45 (75) /* 59: DMA2 Channel 4&5 global interrupt */
-# define NR_IRQS (76)
-#endif
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#endif /* __ARCH_ARM_INCLUDE_STM32F10XXX_IRQ_H */
-
diff --git a/nuttx/arch/arm/include/stm32/stm32f20xxx_irq.h b/nuttx/arch/arm/include/stm32/stm32f20xxx_irq.h
deleted file mode 100644
index d88c5d070..000000000
--- a/nuttx/arch/arm/include/stm32/stm32f20xxx_irq.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/****************************************************************************************************
- * arch/arm/include/stm32s/stm32f20xxx_irq.h
- *
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************************************/
-
-/* This file should never be included directed but, rather, only indirectly through nuttx/irq.h */
-
-#ifndef __ARCH_ARM_INCLUDE_STM32F20XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F20XXX_IRQ_H
-
-/****************************************************************************************************
- * Included Files
- ****************************************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/irq.h>
-
-/****************************************************************************************************
- * Definitions
- ****************************************************************************************************/
-
-/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC. This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- *
- * Processor Exceptions (vectors 0-15). These common definitions can be found
- * in nuttx/arch/arm/include/stm32/irq.h
- *
- * External interrupts (vectors >= 16)
- */
-
-#define STM32_IRQ_WWDG (STM32_IRQ_INTERRUPTS+0) /* 0: Window Watchdog interrupt */
-#define STM32_IRQ_PVD (STM32_IRQ_INTERRUPTS+1) /* 1: PVD through EXTI Line detection interrupt */
-#define STM32_IRQ_TAMPER (STM32_IRQ_INTERRUPTS+2) /* 2: Tamper and time stamp interrupts */
-#define STM32_IRQ_TIMESTAMP (STM32_IRQ_INTERRUPTS+2) /* 2: Tamper and time stamp interrupts */
-#define STM32_IRQ_RTC_WKUP (STM32_IRQ_INTERRUPTS+3) /* 3: RTC global interrupt */
-#define STM32_IRQ_FLASH (STM32_IRQ_INTERRUPTS+4) /* 4: Flash global interrupt */
-#define STM32_IRQ_RCC (STM32_IRQ_INTERRUPTS+5) /* 5: RCC global interrupt */
-#define STM32_IRQ_EXTI0 (STM32_IRQ_INTERRUPTS+6) /* 6: EXTI Line 0 interrupt */
-#define STM32_IRQ_EXTI1 (STM32_IRQ_INTERRUPTS+7) /* 7: EXTI Line 1 interrupt */
-#define STM32_IRQ_EXTI2 (STM32_IRQ_INTERRUPTS+8) /* 8: EXTI Line 2 interrupt */
-#define STM32_IRQ_EXTI3 (STM32_IRQ_INTERRUPTS+9) /* 9: EXTI Line 3 interrupt */
-#define STM32_IRQ_EXTI4 (STM32_IRQ_INTERRUPTS+10) /* 10: EXTI Line 4 interrupt */
-#define STM32_IRQ_DMA1S0 (STM32_IRQ_INTERRUPTS+11) /* 11: DMA1 Stream 0 global interrupt */
-#define STM32_IRQ_DMA1S1 (STM32_IRQ_INTERRUPTS+12) /* 12: DMA1 Stream 1 global interrupt */
-#define STM32_IRQ_DMA1S2 (STM32_IRQ_INTERRUPTS+13) /* 13: DMA1 Stream 2 global interrupt */
-#define STM32_IRQ_DMA1S3 (STM32_IRQ_INTERRUPTS+14) /* 14: DMA1 Stream 3 global interrupt */
-#define STM32_IRQ_DMA1S4 (STM32_IRQ_INTERRUPTS+15) /* 15: DMA1 Stream 4 global interrupt */
-#define STM32_IRQ_DMA1S5 (STM32_IRQ_INTERRUPTS+16) /* 16: DMA1 Stream 5 global interrupt */
-#define STM32_IRQ_DMA1S6 (STM32_IRQ_INTERRUPTS+17) /* 17: DMA1 Stream 6 global interrupt */
-#define STM32_IRQ_ADC (STM32_IRQ_INTERRUPTS+18) /* 18: ADC1, ADC2, and ADC3 global interrupt */
-#define STM32_IRQ_CAN1TX (STM32_IRQ_INTERRUPTS+19) /* 19: CAN1 TX interrupts */
-#define STM32_IRQ_CAN1RX0 (STM32_IRQ_INTERRUPTS+20) /* 20: CAN1 RX0 interrupts */
-#define STM32_IRQ_CAN1RX1 (STM32_IRQ_INTERRUPTS+21) /* 21: CAN1 RX1 interrupt */
-#define STM32_IRQ_CAN1SCE (STM32_IRQ_INTERRUPTS+22) /* 22: CAN1 SCE interrupt */
-#define STM32_IRQ_EXTI95 (STM32_IRQ_INTERRUPTS+23) /* 23: EXTI Line[9:5] interrupts */
-#define STM32_IRQ_TIM1BRK (STM32_IRQ_INTERRUPTS+24) /* 24: TIM1 Break interrupt */
-#define STM32_IRQ_TIM9 (STM32_IRQ_INTERRUPTS+24) /* 24: TIM9 global interrupt */
-#define STM32_IRQ_TIM1UP (STM32_IRQ_INTERRUPTS+25) /* 25: TIM1 Update interrupt */
-#define STM32_IRQ_TIM10 (STM32_IRQ_INTERRUPTS+25) /* 25: TIM10 global interrupt */
-#define STM32_IRQ_TIM1TRGCOM (STM32_IRQ_INTERRUPTS+26) /* 26: TIM1 Trigger and Commutation interrupts */
-#define STM32_IRQ_TIM11 (STM32_IRQ_INTERRUPTS+26) /* 26: TIM11 global interrupt */
-#define STM32_IRQ_TIM1CC (STM32_IRQ_INTERRUPTS+27) /* 27: TIM1 Capture Compare interrupt */
-#define STM32_IRQ_TIM2 (STM32_IRQ_INTERRUPTS+28) /* 28: TIM2 global interrupt */
-#define STM32_IRQ_TIM3 (STM32_IRQ_INTERRUPTS+29) /* 29: TIM3 global interrupt */
-#define STM32_IRQ_TIM4 (STM32_IRQ_INTERRUPTS+30) /* 30: TIM4 global interrupt */
-#define STM32_IRQ_I2C1EV (STM32_IRQ_INTERRUPTS+31) /* 31: I2C1 event interrupt */
-#define STM32_IRQ_I2C1ER (STM32_IRQ_INTERRUPTS+32) /* 32: I2C1 error interrupt */
-#define STM32_IRQ_I2C2EV (STM32_IRQ_INTERRUPTS+33) /* 33: I2C2 event interrupt */
-#define STM32_IRQ_I2C2ER (STM32_IRQ_INTERRUPTS+34) /* 34: I2C2 error interrupt */
-#define STM32_IRQ_SPI1 (STM32_IRQ_INTERRUPTS+35) /* 35: SPI1 global interrupt */
-#define STM32_IRQ_SPI2 (STM32_IRQ_INTERRUPTS+36) /* 36: SPI2 global interrupt */
-#define STM32_IRQ_USART1 (STM32_IRQ_INTERRUPTS+37) /* 37: USART1 global interrupt */
-#define STM32_IRQ_USART2 (STM32_IRQ_INTERRUPTS+38) /* 38: USART2 global interrupt */
-#define STM32_IRQ_USART3 (STM32_IRQ_INTERRUPTS+39) /* 39: USART3 global interrupt */
-#define STM32_IRQ_EXTI1510 (STM32_IRQ_INTERRUPTS+40) /* 40: EXTI Line[15:10] interrupts */
-#define STM32_IRQ_RTCALRM (STM32_IRQ_INTERRUPTS+41) /* 41: RTC alarm through EXTI line interrupt */
-#define STM32_IRQ_OTGFSWKUP (STM32_IRQ_INTERRUPTS+42) /* 42: USB On-The-Go FS Wakeup through EXTI line interrupt */
-#define STM32_IRQ_TIM8BRK (STM32_IRQ_INTERRUPTS+43) /* 43: TIM8 Break interrupt */
-#define STM32_IRQ_TIM12 (STM32_IRQ_INTERRUPTS+43) /* 43: TIM12 global interrupt */
-#define STM32_IRQ_TIM8UP (STM32_IRQ_INTERRUPTS+44) /* 44: TIM8 Update interrupt */
-#define STM32_IRQ_TIM13 (STM32_IRQ_INTERRUPTS+44) /* 44: TIM13 global interrupt */
-#define STM32_IRQ_TIM8TRGCOM (STM32_IRQ_INTERRUPTS+45) /* 45: TIM8 Trigger and Commutation interrupts */
-#define STM32_IRQ_TIM14 (STM32_IRQ_INTERRUPTS+45) /* 45: TIM14 global interrupt */
-#define STM32_IRQ_TIM8CC (STM32_IRQ_INTERRUPTS+46) /* 46: TIM8 Capture Compare interrupt */
-#define STM32_IRQ_DMA1S7 (STM32_IRQ_INTERRUPTS+47) /* 47: DMA1 Stream 7 global interrupt */
-#define STM32_IRQ_FSMC (STM32_IRQ_INTERRUPTS+48) /* 48: FSMC global interrupt */
-#define STM32_IRQ_SDIO (STM32_IRQ_INTERRUPTS+49) /* 49: SDIO global interrupt */
-#define STM32_IRQ_TIM5 (STM32_IRQ_INTERRUPTS+50) /* 50: TIM5 global interrupt */
-#define STM32_IRQ_SPI3 (STM32_IRQ_INTERRUPTS+51) /* 51: SPI3 global interrupt */
-#define STM32_IRQ_UART4 (STM32_IRQ_INTERRUPTS+52) /* 52: UART4 global interrupt */
-#define STM32_IRQ_UART5 (STM32_IRQ_INTERRUPTS+53) /* 53: UART5 global interrupt */
-#define STM32_IRQ_TIM6 (STM32_IRQ_INTERRUPTS+54) /* 54: TIM6 global interrupt */
-#define STM32_IRQ_DAC (STM32_IRQ_INTERRUPTS+54) /* 54: DAC1 and DAC2 underrun error interrupts */
-#define STM32_IRQ_TIM7 (STM32_IRQ_INTERRUPTS+55) /* 55: TIM7 global interrupt */
-#define STM32_IRQ_DMA2S0 (STM32_IRQ_INTERRUPTS+56) /* 56: DMA2 Stream 0 global interrupt */
-#define STM32_IRQ_DMA2S1 (STM32_IRQ_INTERRUPTS+57) /* 57: DMA2 Stream 1 global interrupt */
-#define STM32_IRQ_DMA2S2 (STM32_IRQ_INTERRUPTS+58) /* 58: DMA2 Stream 2 global interrupt */
-#define STM32_IRQ_DMA2S3 (STM32_IRQ_INTERRUPTS+59) /* 59: DMA2 Stream 3 global interrupt */
-#define STM32_IRQ_DMA2S4 (STM32_IRQ_INTERRUPTS+60) /* 60: DMA2 Stream 4 global interrupt */
-#define STM32_IRQ_ETH (STM32_IRQ_INTERRUPTS+61) /* 61: Ethernet global interrupt */
-#define STM32_IRQ_ETHWKUP (STM32_IRQ_INTERRUPTS+62) /* 62: Ethernet Wakeup through EXTI line interrupt */
-#define STM32_IRQ_CAN2TX (STM32_IRQ_INTERRUPTS+63) /* 63: CAN2 TX interrupts */
-#define STM32_IRQ_CAN2RX0 (STM32_IRQ_INTERRUPTS+64) /* 64: CAN2 RX0 interrupts */
-#define STM32_IRQ_CAN2RX1 (STM32_IRQ_INTERRUPTS+65) /* 65: CAN2 RX1 interrupt */
-#define STM32_IRQ_CAN2SCE (STM32_IRQ_INTERRUPTS+66) /* 66: CAN2 SCE interrupt */
-#define STM32_IRQ_OTGFS (STM32_IRQ_INTERRUPTS+67) /* 67: USB On The Go FS global interrupt */
-#define STM32_IRQ_DMA2S5 (STM32_IRQ_INTERRUPTS+68) /* 68: DMA2 Stream 5 global interrupt */
-#define STM32_IRQ_DMA2S6 (STM32_IRQ_INTERRUPTS+69) /* 69: DMA2 Stream 6 global interrupt */
-#define STM32_IRQ_DMA2S7 (STM32_IRQ_INTERRUPTS+70) /* 70: DMA2 Stream 7 global interrupt */
-#define STM32_IRQ_USART6 (STM32_IRQ_INTERRUPTS+71) /* 71: USART6 global interrupt */
-#define STM32_IRQ_I2C3EV (STM32_IRQ_INTERRUPTS+72) /* 72: I2C3 event interrupt */
-#define STM32_IRQ_I2C3ER (STM32_IRQ_INTERRUPTS+73) /* 73: I2C3 error interrupt */
-#define STM32_IRQ_OTGHSEP1OUT (STM32_IRQ_INTERRUPTS+74) /* 74: USB On The Go HS End Point 1 Out global interrupt */
-#define STM32_IRQ_OTGHSEP1IN (STM32_IRQ_INTERRUPTS+75) /* 75: USB On The Go HS End Point 1 In global interrupt */
-#define STM32_IRQ_OTGHSWKUP (STM32_IRQ_INTERRUPTS+76) /* 76: USB On The Go HS Wakeup through EXTI interrupt */
-#define STM32_IRQ_OTGHS (STM32_IRQ_INTERRUPTS+77) /* 77: USB On The Go HS global interrupt */
-#define STM32_IRQ_DCMI (STM32_IRQ_INTERRUPTS+78) /* 78: DCMI global interrupt */
-#define STM32_IRQ_CRYP (STM32_IRQ_INTERRUPTS+79) /* 79: CRYP crypto global interrupt */
-#define STM32_IRQ_HASH (STM32_IRQ_INTERRUPTS+80) /* 80: Hash and Rng global interrupt */
-#define STM32_IRQ_RNG (STM32_IRQ_INTERRUPTS+80) /* 80: Hash and Rng global interrupt */
-
-#define NR_IRQS (STM32_IRQ_INTERRUPTS+81)
-
-/****************************************************************************************************
- * Public Types
- ****************************************************************************************************/
-
-/****************************************************************************************************
- * Public Data
-****************************************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************************************
- * Public Functions
- ****************************************************************************************************/
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#endif /* __ARCH_ARM_INCLUDE_STM32F40XXX_IRQ_H */
-
diff --git a/nuttx/arch/arm/include/stm32/stm32f40xxx_irq.h b/nuttx/arch/arm/include/stm32/stm32f40xxx_irq.h
deleted file mode 100644
index cd97b9c9d..000000000
--- a/nuttx/arch/arm/include/stm32/stm32f40xxx_irq.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/****************************************************************************************************
- * arch/arm/include/stm32s/stm32f40xxx_irq.h
- *
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************************************/
-
-/* This file should never be included directed but, rather,
- * only indirectly through nuttx/irq.h
- */
-
-#ifndef __ARCH_ARM_INCLUDE_STM32F40XXX_IRQ_H
-#define __ARCH_ARM_INCLUDE_STM32F40XXX_IRQ_H
-
-/****************************************************************************************************
- * Included Files
- ****************************************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/irq.h>
-
-/****************************************************************************************************
- * Definitions
- ****************************************************************************************************/
-
-/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC. This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- *
- * Processor Exceptions (vectors 0-15). These common definitions can be found
- * in nuttx/arch/arm/include/stm32/irq.h
- *
- * External interrupts (vectors >= 16)
- */
-
-#define STM32_IRQ_WWDG (STM32_IRQ_INTERRUPTS+0) /* 0: Window Watchdog interrupt */
-#define STM32_IRQ_PVD (STM32_IRQ_INTERRUPTS+1) /* 1: PVD through EXTI Line detection interrupt */
-#define STM32_IRQ_TAMPER (STM32_IRQ_INTERRUPTS+2) /* 2: Tamper and time stamp interrupts */
-#define STM32_IRQ_TIMESTAMP (STM32_IRQ_INTERRUPTS+2) /* 2: Tamper and time stamp interrupts */
-#define STM32_IRQ_RTC_WKUP (STM32_IRQ_INTERRUPTS+3) /* 3: RTC global interrupt */
-#define STM32_IRQ_FLASH (STM32_IRQ_INTERRUPTS+4) /* 4: Flash global interrupt */
-#define STM32_IRQ_RCC (STM32_IRQ_INTERRUPTS+5) /* 5: RCC global interrupt */
-#define STM32_IRQ_EXTI0 (STM32_IRQ_INTERRUPTS+6) /* 6: EXTI Line 0 interrupt */
-#define STM32_IRQ_EXTI1 (STM32_IRQ_INTERRUPTS+7) /* 7: EXTI Line 1 interrupt */
-#define STM32_IRQ_EXTI2 (STM32_IRQ_INTERRUPTS+8) /* 8: EXTI Line 2 interrupt */
-#define STM32_IRQ_EXTI3 (STM32_IRQ_INTERRUPTS+9) /* 9: EXTI Line 3 interrupt */
-#define STM32_IRQ_EXTI4 (STM32_IRQ_INTERRUPTS+10) /* 10: EXTI Line 4 interrupt */
-#define STM32_IRQ_DMA1S0 (STM32_IRQ_INTERRUPTS+11) /* 11: DMA1 Stream 0 global interrupt */
-#define STM32_IRQ_DMA1S1 (STM32_IRQ_INTERRUPTS+12) /* 12: DMA1 Stream 1 global interrupt */
-#define STM32_IRQ_DMA1S2 (STM32_IRQ_INTERRUPTS+13) /* 13: DMA1 Stream 2 global interrupt */
-#define STM32_IRQ_DMA1S3 (STM32_IRQ_INTERRUPTS+14) /* 14: DMA1 Stream 3 global interrupt */
-#define STM32_IRQ_DMA1S4 (STM32_IRQ_INTERRUPTS+15) /* 15: DMA1 Stream 4 global interrupt */
-#define STM32_IRQ_DMA1S5 (STM32_IRQ_INTERRUPTS+16) /* 16: DMA1 Stream 5 global interrupt */
-#define STM32_IRQ_DMA1S6 (STM32_IRQ_INTERRUPTS+17) /* 17: DMA1 Stream 6 global interrupt */
-#define STM32_IRQ_ADC (STM32_IRQ_INTERRUPTS+18) /* 18: ADC1, ADC2, and ADC3 global interrupt */
-#define STM32_IRQ_CAN1TX (STM32_IRQ_INTERRUPTS+19) /* 19: CAN1 TX interrupts */
-#define STM32_IRQ_CAN1RX0 (STM32_IRQ_INTERRUPTS+20) /* 20: CAN1 RX0 interrupts */
-#define STM32_IRQ_CAN1RX1 (STM32_IRQ_INTERRUPTS+21) /* 21: CAN1 RX1 interrupt */
-#define STM32_IRQ_CAN1SCE (STM32_IRQ_INTERRUPTS+22) /* 22: CAN1 SCE interrupt */
-#define STM32_IRQ_EXTI95 (STM32_IRQ_INTERRUPTS+23) /* 23: EXTI Line[9:5] interrupts */
-#define STM32_IRQ_TIM1BRK (STM32_IRQ_INTERRUPTS+24) /* 24: TIM1 Break interrupt */
-#define STM32_IRQ_TIM9 (STM32_IRQ_INTERRUPTS+24) /* 24: TIM9 global interrupt */
-#define STM32_IRQ_TIM1UP (STM32_IRQ_INTERRUPTS+25) /* 25: TIM1 Update interrupt */
-#define STM32_IRQ_TIM10 (STM32_IRQ_INTERRUPTS+25) /* 25: TIM10 global interrupt */
-#define STM32_IRQ_TIM1TRGCOM (STM32_IRQ_INTERRUPTS+26) /* 26: TIM1 Trigger and Commutation interrupts */
-#define STM32_IRQ_TIM11 (STM32_IRQ_INTERRUPTS+26) /* 26: TIM11 global interrupt */
-#define STM32_IRQ_TIM1CC (STM32_IRQ_INTERRUPTS+27) /* 27: TIM1 Capture Compare interrupt */
-#define STM32_IRQ_TIM2 (STM32_IRQ_INTERRUPTS+28) /* 28: TIM2 global interrupt */
-#define STM32_IRQ_TIM3 (STM32_IRQ_INTERRUPTS+29) /* 29: TIM3 global interrupt */
-#define STM32_IRQ_TIM4 (STM32_IRQ_INTERRUPTS+30) /* 30: TIM4 global interrupt */
-#define STM32_IRQ_I2C1EV (STM32_IRQ_INTERRUPTS+31) /* 31: I2C1 event interrupt */
-#define STM32_IRQ_I2C1ER (STM32_IRQ_INTERRUPTS+32) /* 32: I2C1 error interrupt */
-#define STM32_IRQ_I2C2EV (STM32_IRQ_INTERRUPTS+33) /* 33: I2C2 event interrupt */
-#define STM32_IRQ_I2C2ER (STM32_IRQ_INTERRUPTS+34) /* 34: I2C2 error interrupt */
-#define STM32_IRQ_SPI1 (STM32_IRQ_INTERRUPTS+35) /* 35: SPI1 global interrupt */
-#define STM32_IRQ_SPI2 (STM32_IRQ_INTERRUPTS+36) /* 36: SPI2 global interrupt */
-#define STM32_IRQ_USART1 (STM32_IRQ_INTERRUPTS+37) /* 37: USART1 global interrupt */
-#define STM32_IRQ_USART2 (STM32_IRQ_INTERRUPTS+38) /* 38: USART2 global interrupt */
-#define STM32_IRQ_USART3 (STM32_IRQ_INTERRUPTS+39) /* 39: USART3 global interrupt */
-#define STM32_IRQ_EXTI1510 (STM32_IRQ_INTERRUPTS+40) /* 40: EXTI Line[15:10] interrupts */
-#define STM32_IRQ_RTCALRM (STM32_IRQ_INTERRUPTS+41) /* 41: RTC alarm through EXTI line interrupt */
-#define STM32_IRQ_OTGFSWKUP (STM32_IRQ_INTERRUPTS+42) /* 42: USB On-The-Go FS Wakeup through EXTI line interrupt */
-#define STM32_IRQ_TIM8BRK (STM32_IRQ_INTERRUPTS+43) /* 43: TIM8 Break interrupt */
-#define STM32_IRQ_TIM12 (STM32_IRQ_INTERRUPTS+43) /* 43: TIM12 global interrupt */
-#define STM32_IRQ_TIM8UP (STM32_IRQ_INTERRUPTS+44) /* 44: TIM8 Update interrupt */
-#define STM32_IRQ_TIM13 (STM32_IRQ_INTERRUPTS+44) /* 44: TIM13 global interrupt */
-#define STM32_IRQ_TIM8TRGCOM (STM32_IRQ_INTERRUPTS+45) /* 45: TIM8 Trigger and Commutation interrupts */
-#define STM32_IRQ_TIM14 (STM32_IRQ_INTERRUPTS+45) /* 45: TIM14 global interrupt */
-#define STM32_IRQ_TIM8CC (STM32_IRQ_INTERRUPTS+46) /* 46: TIM8 Capture Compare interrupt */
-#define STM32_IRQ_DMA1S7 (STM32_IRQ_INTERRUPTS+47) /* 47: DMA1 Stream 7 global interrupt */
-#define STM32_IRQ_FSMC (STM32_IRQ_INTERRUPTS+48) /* 48: FSMC global interrupt */
-#define STM32_IRQ_SDIO (STM32_IRQ_INTERRUPTS+49) /* 49: SDIO global interrupt */
-#define STM32_IRQ_TIM5 (STM32_IRQ_INTERRUPTS+50) /* 50: TIM5 global interrupt */
-#define STM32_IRQ_SPI3 (STM32_IRQ_INTERRUPTS+51) /* 51: SPI3 global interrupt */
-#define STM32_IRQ_UART4 (STM32_IRQ_INTERRUPTS+52) /* 52: UART4 global interrupt */
-#define STM32_IRQ_UART5 (STM32_IRQ_INTERRUPTS+53) /* 53: UART5 global interrupt */
-#define STM32_IRQ_TIM6 (STM32_IRQ_INTERRUPTS+54) /* 54: TIM6 global interrupt */
-#define STM32_IRQ_DAC (STM32_IRQ_INTERRUPTS+54) /* 54: DAC1 and DAC2 underrun error interrupts */
-#define STM32_IRQ_TIM7 (STM32_IRQ_INTERRUPTS+55) /* 55: TIM7 global interrupt */
-#define STM32_IRQ_DMA2S0 (STM32_IRQ_INTERRUPTS+56) /* 56: DMA2 Stream 0 global interrupt */
-#define STM32_IRQ_DMA2S1 (STM32_IRQ_INTERRUPTS+57) /* 57: DMA2 Stream 1 global interrupt */
-#define STM32_IRQ_DMA2S2 (STM32_IRQ_INTERRUPTS+58) /* 58: DMA2 Stream 2 global interrupt */
-#define STM32_IRQ_DMA2S3 (STM32_IRQ_INTERRUPTS+59) /* 59: DMA2 Stream 3 global interrupt */
-#define STM32_IRQ_DMA2S4 (STM32_IRQ_INTERRUPTS+60) /* 60: DMA2 Stream 4 global interrupt */
-#define STM32_IRQ_ETH (STM32_IRQ_INTERRUPTS+61) /* 61: Ethernet global interrupt */
-#define STM32_IRQ_ETHWKUP (STM32_IRQ_INTERRUPTS+62) /* 62: Ethernet Wakeup through EXTI line interrupt */
-#define STM32_IRQ_CAN2TX (STM32_IRQ_INTERRUPTS+63) /* 63: CAN2 TX interrupts */
-#define STM32_IRQ_CAN2RX0 (STM32_IRQ_INTERRUPTS+64) /* 64: CAN2 RX0 interrupts */
-#define STM32_IRQ_CAN2RX1 (STM32_IRQ_INTERRUPTS+65) /* 65: CAN2 RX1 interrupt */
-#define STM32_IRQ_CAN2SCE (STM32_IRQ_INTERRUPTS+66) /* 66: CAN2 SCE interrupt */
-#define STM32_IRQ_OTGFS (STM32_IRQ_INTERRUPTS+67) /* 67: USB On The Go FS global interrupt */
-#define STM32_IRQ_DMA2S5 (STM32_IRQ_INTERRUPTS+68) /* 68: DMA2 Stream 5 global interrupt */
-#define STM32_IRQ_DMA2S6 (STM32_IRQ_INTERRUPTS+69) /* 69: DMA2 Stream 6 global interrupt */
-#define STM32_IRQ_DMA2S7 (STM32_IRQ_INTERRUPTS+70) /* 70: DMA2 Stream 7 global interrupt */
-#define STM32_IRQ_USART6 (STM32_IRQ_INTERRUPTS+71) /* 71: USART6 global interrupt */
-#define STM32_IRQ_I2C3EV (STM32_IRQ_INTERRUPTS+72) /* 72: I2C3 event interrupt */
-#define STM32_IRQ_I2C3ER (STM32_IRQ_INTERRUPTS+73) /* 73: I2C3 error interrupt */
-#define STM32_IRQ_OTGHSEP1OUT (STM32_IRQ_INTERRUPTS+74) /* 74: USB On The Go HS End Point 1 Out global interrupt */
-#define STM32_IRQ_OTGHSEP1IN (STM32_IRQ_INTERRUPTS+75) /* 75: USB On The Go HS End Point 1 In global interrupt */
-#define STM32_IRQ_OTGHSWKUP (STM32_IRQ_INTERRUPTS+76) /* 76: USB On The Go HS Wakeup through EXTI interrupt */
-#define STM32_IRQ_OTGHS (STM32_IRQ_INTERRUPTS+77) /* 77: USB On The Go HS global interrupt */
-#define STM32_IRQ_DCMI (STM32_IRQ_INTERRUPTS+78) /* 78: DCMI global interrupt */
-#define STM32_IRQ_CRYP (STM32_IRQ_INTERRUPTS+79) /* 79: CRYP crypto global interrupt */
-#define STM32_IRQ_HASH (STM32_IRQ_INTERRUPTS+80) /* 80: Hash and Rng global interrupt */
-#define STM32_IRQ_RNG (STM32_IRQ_INTERRUPTS+80) /* 80: Hash and Rng global interrupt */
-#define STM32_IRQ_FPU (STM32_IRQ_INTERRUPTS+81) /* 81: FPU global interrupt */
-
-#define NR_IRQS (STM32_IRQ_INTERRUPTS+82)
-
-/****************************************************************************************************
- * Public Types
- ****************************************************************************************************/
-
-/****************************************************************************************************
- * Public Data
- ****************************************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************************************
- * Public Functions
- ****************************************************************************************************/
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#endif /* __ARCH_ARM_INCLUDE_STM32F40XXX_IRQ_H */
-