fish

20 files changed, 0 insertions, 2668 deletions

diff --git a/libopencm3/include/libopencm3/efm32/efm32g/nvic.h b/libopencm3/include/libopencm3/efm32/efm32g/nvic.h
deleted file mode 100644
index cfba4a5..0000000
--- a/libopencm3/include/libopencm3/efm32/efm32g/nvic.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_EFM32G_NVIC_H
-#define LIBOPENCM3_EFM32G_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_EFM32G User interrupts for EFM32 Gecko series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_DMA_IRQ 0
-#define NVIC_GPIO_EVEN_IRQ 1
-#define NVIC_TIMER0_IRQ 2
-#define NVIC_USART0_RX_IRQ 3
-#define NVIC_USART0_TX_IRQ 4
-#define NVIC_ACMP01_IRQ 5
-#define NVIC_ADC0_IRQ 6
-#define NVIC_DAC0_IRQ 7
-#define NVIC_I2C0_IRQ 8
-#define NVIC_GPIO_ODD_IRQ 9
-#define NVIC_TIMER1_IRQ 10
-#define NVIC_TIMER2_IRQ 11
-#define NVIC_USART1_RX_IRQ 12
-#define NVIC_USART1_TX_IRQ 13
-#define NVIC_USART2_RX_IRQ 14
-#define NVIC_USART2_TX_IRQ 15
-#define NVIC_UART0_RX_IRQ 16
-#define NVIC_UART0_TX_IRQ 17
-#define NVIC_LEUART0_IRQ 18
-#define NVIC_LEUART1_IRQ 19
-#define NVIC_LETIMER0_IRQ 20
-#define NVIC_PCNT0_IRQ 21
-#define NVIC_PCNT1_IRQ 22
-#define NVIC_PCNT2_IRQ 23
-#define NVIC_RTC_IRQ 24
-#define NVIC_CMU_IRQ 25
-#define NVIC_VCMP_IRQ 26
-#define NVIC_LCD_IRQ 27
-#define NVIC_MSC_IRQ 28
-#define NVIC_AES_IRQ 29
-
-#define NVIC_IRQ_COUNT 30
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_EFM32G User interrupt service routines (ISR) prototypes for EFM32 Gecko series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK dma_isr(void);
-void WEAK gpio_even_isr(void);
-void WEAK timer0_isr(void);
-void WEAK usart0_rx_isr(void);
-void WEAK usart0_tx_isr(void);
-void WEAK acmp01_isr(void);
-void WEAK adc0_isr(void);
-void WEAK dac0_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK gpio_odd_isr(void);
-void WEAK timer1_isr(void);
-void WEAK timer2_isr(void);
-void WEAK usart1_rx_isr(void);
-void WEAK usart1_tx_isr(void);
-void WEAK usart2_rx_isr(void);
-void WEAK usart2_tx_isr(void);
-void WEAK uart0_rx_isr(void);
-void WEAK uart0_tx_isr(void);
-void WEAK leuart0_isr(void);
-void WEAK leuart1_isr(void);
-void WEAK letimer0_isr(void);
-void WEAK pcnt0_isr(void);
-void WEAK pcnt1_isr(void);
-void WEAK pcnt2_isr(void);
-void WEAK rtc_isr(void);
-void WEAK cmu_isr(void);
-void WEAK vcmp_isr(void);
-void WEAK lcd_isr(void);
-void WEAK msc_isr(void);
-void WEAK aes_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_EFM32G_NVIC_H */
diff --git a/libopencm3/include/libopencm3/efm32/efm32gg/nvic.h b/libopencm3/include/libopencm3/efm32/efm32gg/nvic.h
deleted file mode 100644
index 10c1033..0000000
--- a/libopencm3/include/libopencm3/efm32/efm32gg/nvic.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_EFM32GG_NVIC_H
-#define LIBOPENCM3_EFM32GG_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_EFM32GG User interrupts for EFM32 Giant Gecko series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_DMA_IRQ 0
-#define NVIC_GPIO_EVEN_IRQ 1
-#define NVIC_TIMER0_IRQ 2
-#define NVIC_USART0_RX_IRQ 3
-#define NVIC_USART0_TX_IRQ 4
-#define NVIC_USB_IRQ 5
-#define NVIC_ACMP01_IRQ 6
-#define NVIC_ADC0_IRQ 7
-#define NVIC_DAC0_IRQ 8
-#define NVIC_I2C0_IRQ 9
-#define NVIC_I2C1_IRQ 10
-#define NVIC_GPIO_ODD_IRQ 11
-#define NVIC_TIMER1_IRQ 12
-#define NVIC_TIMER2_IRQ 13
-#define NVIC_TIMER3_IRQ 14
-#define NVIC_USART1_RX_IRQ 15
-#define NVIC_USART1_TX_IRQ 16
-#define NVIC_LESENSE_IRQ 17
-#define NVIC_USART2_RX_IRQ 18
-#define NVIC_USART2_TX_IRQ 19
-#define NVIC_UART0_RX_IRQ 20
-#define NVIC_UART0_TX_IRQ 21
-#define NVIC_UART1_RX_IRQ 22
-#define NVIC_UART1_TX_IRQ 23
-#define NVIC_LEUART0_IRQ 24
-#define NVIC_LEUART1_IRQ 25
-#define NVIC_LETIMER0_IRQ 26
-#define NVIC_PCNT0_IRQ 27
-#define NVIC_PCNT1_IRQ 28
-#define NVIC_PCNT2_IRQ 29
-#define NVIC_RTC_IRQ 30
-#define NVIC_BURTC_IRQ 31
-#define NVIC_CMU_IRQ 32
-#define NVIC_VCMP_IRQ 33
-#define NVIC_LCD_IRQ 34
-#define NVIC_MSC_IRQ 35
-#define NVIC_AES_IRQ 36
-#define NVIC_EBI_IRQ 37
-
-#define NVIC_IRQ_COUNT 38
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_EFM32GG User interrupt service routines (ISR) prototypes for EFM32 Giant Gecko series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK dma_isr(void);
-void WEAK gpio_even_isr(void);
-void WEAK timer0_isr(void);
-void WEAK usart0_rx_isr(void);
-void WEAK usart0_tx_isr(void);
-void WEAK usb_isr(void);
-void WEAK acmp01_isr(void);
-void WEAK adc0_isr(void);
-void WEAK dac0_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK i2c1_isr(void);
-void WEAK gpio_odd_isr(void);
-void WEAK timer1_isr(void);
-void WEAK timer2_isr(void);
-void WEAK timer3_isr(void);
-void WEAK usart1_rx_isr(void);
-void WEAK usart1_tx_isr(void);
-void WEAK lesense_isr(void);
-void WEAK usart2_rx_isr(void);
-void WEAK usart2_tx_isr(void);
-void WEAK uart0_rx_isr(void);
-void WEAK uart0_tx_isr(void);
-void WEAK uart1_rx_isr(void);
-void WEAK uart1_tx_isr(void);
-void WEAK leuart0_isr(void);
-void WEAK leuart1_isr(void);
-void WEAK letimer0_isr(void);
-void WEAK pcnt0_isr(void);
-void WEAK pcnt1_isr(void);
-void WEAK pcnt2_isr(void);
-void WEAK rtc_isr(void);
-void WEAK burtc_isr(void);
-void WEAK cmu_isr(void);
-void WEAK vcmp_isr(void);
-void WEAK lcd_isr(void);
-void WEAK msc_isr(void);
-void WEAK aes_isr(void);
-void WEAK ebi_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_EFM32GG_NVIC_H */
diff --git a/libopencm3/include/libopencm3/efm32/efm32lg/nvic.h b/libopencm3/include/libopencm3/efm32/efm32lg/nvic.h
deleted file mode 100644
index a07778a..0000000
--- a/libopencm3/include/libopencm3/efm32/efm32lg/nvic.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_EFM32LG_NVIC_H
-#define LIBOPENCM3_EFM32LG_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_EFM32LG User interrupts for EFM32 Leopard Gecko series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_DMA_IRQ 0
-#define NVIC_GPIO_EVEN_IRQ 1
-#define NVIC_TIMER0_IRQ 2
-#define NVIC_USART0_RX_IRQ 3
-#define NVIC_USART0_TX_IRQ 4
-#define NVIC_USB_IRQ 5
-#define NVIC_ACMP01_IRQ 6
-#define NVIC_ADC0_IRQ 7
-#define NVIC_DAC0_IRQ 8
-#define NVIC_I2C0_IRQ 9
-#define NVIC_I2C1_IRQ 10
-#define NVIC_GPIO_ODD_IRQ 11
-#define NVIC_TIMER1_IRQ 12
-#define NVIC_TIMER2_IRQ 13
-#define NVIC_TIMER3_IRQ 14
-#define NVIC_USART1_RX_IRQ 15
-#define NVIC_USART1_TX_IRQ 16
-#define NVIC_LESENSE_IRQ 17
-#define NVIC_USART2_RX_IRQ 18
-#define NVIC_USART2_TX_IRQ 19
-#define NVIC_UART0_RX_IRQ 20
-#define NVIC_UART0_TX_IRQ 21
-#define NVIC_UART1_RX_IRQ 22
-#define NVIC_UART1_TX_IRQ 23
-#define NVIC_LEUART0_IRQ 24
-#define NVIC_LEUART1_IRQ 25
-#define NVIC_LETIMER0_IRQ 26
-#define NVIC_PCNT0_IRQ 27
-#define NVIC_PCNT1_IRQ 28
-#define NVIC_PCNT2_IRQ 29
-#define NVIC_RTC_IRQ 30
-#define NVIC_BURTC_IRQ 31
-#define NVIC_CMU_IRQ 32
-#define NVIC_VCMP_IRQ 33
-#define NVIC_LCD_IRQ 34
-#define NVIC_MSC_IRQ 35
-#define NVIC_AES_IRQ 36
-#define NVIC_EBI_IRQ 37
-
-#define NVIC_IRQ_COUNT 38
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_EFM32LG User interrupt service routines (ISR) prototypes for EFM32 Leopard Gecko series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK dma_isr(void);
-void WEAK gpio_even_isr(void);
-void WEAK timer0_isr(void);
-void WEAK usart0_rx_isr(void);
-void WEAK usart0_tx_isr(void);
-void WEAK usb_isr(void);
-void WEAK acmp01_isr(void);
-void WEAK adc0_isr(void);
-void WEAK dac0_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK i2c1_isr(void);
-void WEAK gpio_odd_isr(void);
-void WEAK timer1_isr(void);
-void WEAK timer2_isr(void);
-void WEAK timer3_isr(void);
-void WEAK usart1_rx_isr(void);
-void WEAK usart1_tx_isr(void);
-void WEAK lesense_isr(void);
-void WEAK usart2_rx_isr(void);
-void WEAK usart2_tx_isr(void);
-void WEAK uart0_rx_isr(void);
-void WEAK uart0_tx_isr(void);
-void WEAK uart1_rx_isr(void);
-void WEAK uart1_tx_isr(void);
-void WEAK leuart0_isr(void);
-void WEAK leuart1_isr(void);
-void WEAK letimer0_isr(void);
-void WEAK pcnt0_isr(void);
-void WEAK pcnt1_isr(void);
-void WEAK pcnt2_isr(void);
-void WEAK rtc_isr(void);
-void WEAK burtc_isr(void);
-void WEAK cmu_isr(void);
-void WEAK vcmp_isr(void);
-void WEAK lcd_isr(void);
-void WEAK msc_isr(void);
-void WEAK aes_isr(void);
-void WEAK ebi_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_EFM32LG_NVIC_H */
diff --git a/libopencm3/include/libopencm3/efm32/efm32tg/nvic.h b/libopencm3/include/libopencm3/efm32/efm32tg/nvic.h
deleted file mode 100644
index da7bc5f..0000000
--- a/libopencm3/include/libopencm3/efm32/efm32tg/nvic.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_EFM32TG_NVIC_H
-#define LIBOPENCM3_EFM32TG_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_EFM32TG User interrupts for EFM32 Tiny Gecko series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_DMA_IRQ 0
-#define NVIC_GPIO_EVEN_IRQ 1
-#define NVIC_TIMER0_IRQ 2
-#define NVIC_USART0_RX_IRQ 3
-#define NVIC_USART0_TX_IRQ 4
-#define NVIC_ACMP01_IRQ 5
-#define NVIC_ADC0_IRQ 6
-#define NVIC_DAC0_IRQ 7
-#define NVIC_I2C0_IRQ 8
-#define NVIC_GPIO_ODD_IRQ 9
-#define NVIC_TIMER1_IRQ 10
-#define NVIC_USART1_RX_IRQ 11
-#define NVIC_USART1_TX_IRQ 12
-#define NVIC_LESENSE_IRQ 13
-#define NVIC_LEUART0_IRQ 14
-#define NVIC_LETIMER0_IRQ 15
-#define NVIC_PCNT0_IRQ 16
-#define NVIC_RTC_IRQ 17
-#define NVIC_CMU_IRQ 18
-#define NVIC_VCMP_IRQ 19
-#define NVIC_LCD_IRQ 20
-#define NVIC_MSC_IRQ 21
-#define NVIC_AES_IRQ 22
-
-#define NVIC_IRQ_COUNT 23
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_EFM32TG User interrupt service routines (ISR) prototypes for EFM32 Tiny Gecko series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK dma_isr(void);
-void WEAK gpio_even_isr(void);
-void WEAK timer0_isr(void);
-void WEAK usart0_rx_isr(void);
-void WEAK usart0_tx_isr(void);
-void WEAK acmp01_isr(void);
-void WEAK adc0_isr(void);
-void WEAK dac0_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK gpio_odd_isr(void);
-void WEAK timer1_isr(void);
-void WEAK usart1_rx_isr(void);
-void WEAK usart1_tx_isr(void);
-void WEAK lesense_isr(void);
-void WEAK leuart0_isr(void);
-void WEAK letimer0_isr(void);
-void WEAK pcnt0_isr(void);
-void WEAK rtc_isr(void);
-void WEAK cmu_isr(void);
-void WEAK vcmp_isr(void);
-void WEAK lcd_isr(void);
-void WEAK msc_isr(void);
-void WEAK aes_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_EFM32TG_NVIC_H */
diff --git a/libopencm3/include/libopencm3/lm3s/nvic.h b/libopencm3/include/libopencm3/lm3s/nvic.h
deleted file mode 100644
index 0b5a265..0000000
--- a/libopencm3/include/libopencm3/lm3s/nvic.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_LM3S_NVIC_H
-#define LIBOPENCM3_LM3S_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_LM3S User interrupts for LM3S series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_GPIOQ7_IRQ 131
-#define NVIC_GPIOQ6_IRQ 130
-#define NVIC_PWM1_3_IRQ 137
-#define NVIC_PWM1_2_IRQ 136
-#define NVIC_PWM1_1_IRQ 135
-#define NVIC_PWM1_0_IRQ 134
-#define NVIC_PWM1_FAULT_IRQ 138
-#define NVIC_TIMER2B_IRQ 24
-#define NVIC_COMP0_IRQ 25
-#define NVIC_COMP1_IRQ 26
-#define NVIC_COMP2_IRQ 27
-#define NVIC_TIMER0B_IRQ 20
-#define NVIC_TIMER1A_IRQ 21
-#define NVIC_TIMER1B_IRQ 22
-#define NVIC_TIMER2A_IRQ 23
-#define NVIC_SYSCTL_IRQ 28
-#define NVIC_FLASH_IRQ 29
-#define NVIC_GPIOA_IRQ 0
-#define NVIC_GPIOE_IRQ 4
-#define NVIC_I2C0_IRQ 8
-#define NVIC_GPIOP4_IRQ 120
-#define NVIC_GPIOP5_IRQ 121
-#define NVIC_GPIOP6_IRQ 122
-#define NVIC_GPIOP7_IRQ 123
-#define NVIC_GPIOQ0_IRQ 124
-#define NVIC_GPIOQ1_IRQ 125
-#define NVIC_GPIOQ2_IRQ 126
-#define NVIC_GPIOQ3_IRQ 127
-#define NVIC_GPIOQ4_IRQ 128
-#define NVIC_GPIOQ5_IRQ 129
-#define NVIC_UART3_IRQ 59
-#define NVIC_SSI3_IRQ 58
-#define NVIC_GPIOK_IRQ 55
-#define NVIC_GPIOJ_IRQ 54
-#define NVIC_SSI2_IRQ 57
-#define NVIC_GPIOL_IRQ 56
-#define NVIC_ADC1SS3_IRQ 51
-#define NVIC_ADC1SS2_IRQ 50
-#define NVIC_EPI0_IRQ 53
-#define NVIC_I2S0_IRQ 52
-#define NVIC_FAN0_IRQ 114
-#define NVIC_GPIOP1_IRQ 117
-#define NVIC_GPIOP0_IRQ 116
-#define NVIC_GPIOM_IRQ 111
-#define NVIC_I2C5_IRQ 110
-#define NVIC_GPION_IRQ 112
-#define NVIC_GPIOP3_IRQ 119
-#define NVIC_GPIOP2_IRQ 118
-#define NVIC_GPIOD_IRQ 3
-#define NVIC_SSI0_IRQ 7
-#define NVIC_LPC0_IRQ 108
-#define NVIC_I2C4_IRQ 109
-#define NVIC_WTIMER4A_IRQ 102
-#define NVIC_WTIMER4B_IRQ 103
-#define NVIC_WTIMER3A_IRQ 100
-#define NVIC_WTIMER3B_IRQ 101
-#define NVIC_SYSEXC_IRQ 106
-#define NVIC_PECI0_IRQ 107
-#define NVIC_WTIMER5A_IRQ 104
-#define NVIC_WTIMER5B_IRQ 105
-#define NVIC_CAN0_IRQ 39
-#define NVIC_QEI1_IRQ 38
-#define NVIC_UART2_IRQ 33
-#define NVIC_GPIOH_IRQ 32
-#define NVIC_GPIOG_IRQ 31
-#define NVIC_GPIOF_IRQ 30
-#define NVIC_I2C1_IRQ 37
-#define NVIC_TIMER3B_IRQ 36
-#define NVIC_TIMER3A_IRQ 35
-#define NVIC_SSI1_IRQ 34
-#define NVIC_UART4_IRQ 60
-#define NVIC_UART5_IRQ 61
-#define NVIC_UART6_IRQ 62
-#define NVIC_UART7_IRQ 63
-#define NVIC_I2C2_IRQ 68
-#define NVIC_I2C3_IRQ 69
-#define NVIC_GPIOC_IRQ 2
-#define NVIC_UART1_IRQ 6
-#define NVIC_WTIMER2B_IRQ 99
-#define NVIC_WTIMER2A_IRQ 98
-#define NVIC_TIMER5B_IRQ 93
-#define NVIC_TIMER5A_IRQ 92
-#define NVIC_WTIMER0B_IRQ 95
-#define NVIC_WTIMER0A_IRQ 94
-#define NVIC_WTIMER1B_IRQ 97
-#define NVIC_WTIMER1A_IRQ 96
-#define NVIC_PWM0_1_IRQ 11
-#define NVIC_PWM0_0_IRQ 10
-#define NVIC_QEI0_IRQ 13
-#define NVIC_PWM0_2_IRQ 12
-#define NVIC_ADC0SS1_IRQ 15
-#define NVIC_ADC0SS0_IRQ 14
-#define NVIC_ADC0SS3_IRQ 17
-#define NVIC_ADC0SS2_IRQ 16
-#define NVIC_TIMER0A_IRQ 19
-#define NVIC_WATCHDOG_IRQ 18
-#define NVIC_ADC1SS0_IRQ 48
-#define NVIC_ADC1SS1_IRQ 49
-#define NVIC_UDMA_IRQ 46
-#define NVIC_UDMAERR_IRQ 47
-#define NVIC_USB0_IRQ 44
-#define NVIC_PWM0_3_IRQ 45
-#define NVIC_ETH_IRQ 42
-#define NVIC_HIBERNATE_IRQ 43
-#define NVIC_CAN1_IRQ 40
-#define NVIC_CAN2_IRQ 41
-#define NVIC_GPIOB_IRQ 1
-#define NVIC_UART0_IRQ 5
-#define NVIC_PWM0_FAULT_IRQ 9
-#define NVIC_TIMER4B_IRQ 71
-#define NVIC_TIMER4A_IRQ 70
-
-#define NVIC_IRQ_COUNT 139
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_LM3S User interrupt service routines (ISR) prototypes for LM3S series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK gpioq7_isr(void);
-void WEAK gpioq6_isr(void);
-void WEAK pwm1_3_isr(void);
-void WEAK pwm1_2_isr(void);
-void WEAK pwm1_1_isr(void);
-void WEAK pwm1_0_isr(void);
-void WEAK pwm1_fault_isr(void);
-void WEAK timer2b_isr(void);
-void WEAK comp0_isr(void);
-void WEAK comp1_isr(void);
-void WEAK comp2_isr(void);
-void WEAK timer0b_isr(void);
-void WEAK timer1a_isr(void);
-void WEAK timer1b_isr(void);
-void WEAK timer2a_isr(void);
-void WEAK sysctl_isr(void);
-void WEAK flash_isr(void);
-void WEAK gpioa_isr(void);
-void WEAK gpioe_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK gpiop4_isr(void);
-void WEAK gpiop5_isr(void);
-void WEAK gpiop6_isr(void);
-void WEAK gpiop7_isr(void);
-void WEAK gpioq0_isr(void);
-void WEAK gpioq1_isr(void);
-void WEAK gpioq2_isr(void);
-void WEAK gpioq3_isr(void);
-void WEAK gpioq4_isr(void);
-void WEAK gpioq5_isr(void);
-void WEAK uart3_isr(void);
-void WEAK ssi3_isr(void);
-void WEAK gpiok_isr(void);
-void WEAK gpioj_isr(void);
-void WEAK ssi2_isr(void);
-void WEAK gpiol_isr(void);
-void WEAK adc1ss3_isr(void);
-void WEAK adc1ss2_isr(void);
-void WEAK epi0_isr(void);
-void WEAK i2s0_isr(void);
-void WEAK fan0_isr(void);
-void WEAK gpiop1_isr(void);
-void WEAK gpiop0_isr(void);
-void WEAK gpiom_isr(void);
-void WEAK i2c5_isr(void);
-void WEAK gpion_isr(void);
-void WEAK gpiop3_isr(void);
-void WEAK gpiop2_isr(void);
-void WEAK gpiod_isr(void);
-void WEAK ssi0_isr(void);
-void WEAK lpc0_isr(void);
-void WEAK i2c4_isr(void);
-void WEAK wtimer4a_isr(void);
-void WEAK wtimer4b_isr(void);
-void WEAK wtimer3a_isr(void);
-void WEAK wtimer3b_isr(void);
-void WEAK sysexc_isr(void);
-void WEAK peci0_isr(void);
-void WEAK wtimer5a_isr(void);
-void WEAK wtimer5b_isr(void);
-void WEAK can0_isr(void);
-void WEAK qei1_isr(void);
-void WEAK uart2_isr(void);
-void WEAK gpioh_isr(void);
-void WEAK gpiog_isr(void);
-void WEAK gpiof_isr(void);
-void WEAK i2c1_isr(void);
-void WEAK timer3b_isr(void);
-void WEAK timer3a_isr(void);
-void WEAK ssi1_isr(void);
-void WEAK uart4_isr(void);
-void WEAK uart5_isr(void);
-void WEAK uart6_isr(void);
-void WEAK uart7_isr(void);
-void WEAK i2c2_isr(void);
-void WEAK i2c3_isr(void);
-void WEAK gpioc_isr(void);
-void WEAK uart1_isr(void);
-void WEAK wtimer2b_isr(void);
-void WEAK wtimer2a_isr(void);
-void WEAK timer5b_isr(void);
-void WEAK timer5a_isr(void);
-void WEAK wtimer0b_isr(void);
-void WEAK wtimer0a_isr(void);
-void WEAK wtimer1b_isr(void);
-void WEAK wtimer1a_isr(void);
-void WEAK pwm0_1_isr(void);
-void WEAK pwm0_0_isr(void);
-void WEAK qei0_isr(void);
-void WEAK pwm0_2_isr(void);
-void WEAK adc0ss1_isr(void);
-void WEAK adc0ss0_isr(void);
-void WEAK adc0ss3_isr(void);
-void WEAK adc0ss2_isr(void);
-void WEAK timer0a_isr(void);
-void WEAK watchdog_isr(void);
-void WEAK adc1ss0_isr(void);
-void WEAK adc1ss1_isr(void);
-void WEAK udma_isr(void);
-void WEAK udmaerr_isr(void);
-void WEAK usb0_isr(void);
-void WEAK pwm0_3_isr(void);
-void WEAK eth_isr(void);
-void WEAK hibernate_isr(void);
-void WEAK can1_isr(void);
-void WEAK can2_isr(void);
-void WEAK gpiob_isr(void);
-void WEAK uart0_isr(void);
-void WEAK pwm0_fault_isr(void);
-void WEAK timer4b_isr(void);
-void WEAK timer4a_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_LM3S_NVIC_H */
diff --git a/libopencm3/include/libopencm3/lpc13xx/nvic.h b/libopencm3/include/libopencm3/lpc13xx/nvic.h
deleted file mode 100644
index c26167c..0000000
--- a/libopencm3/include/libopencm3/lpc13xx/nvic.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_LPC13xx_NVIC_H
-#define LIBOPENCM3_LPC13xx_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_LPC13xx User interrupts for LPC 13xx series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_SSP1_IRQ 56
-#define NVIC_PIO2_IRQ 54
-#define NVIC_CT16B1_IRQ 42
-#define NVIC_USB_FIQ_IRQ 48
-#define NVIC_CT32B0_IRQ 43
-#define NVIC_ADC_IRQ 49
-#define NVIC_PIO3_IRQ 53
-#define NVIC_PIO2_0_IRQ 24
-#define NVIC_PIO2_1_IRQ 25
-#define NVIC_PIO2_2_IRQ 26
-#define NVIC_PIO2_3_IRQ 27
-#define NVIC_PIO1_8_IRQ 20
-#define NVIC_PIO1_9_IRQ 21
-#define NVIC_PIO1_10_IRQ 22
-#define NVIC_PIO1_11_IRQ 23
-#define NVIC_UART_IRQ 46
-#define NVIC_USB_IRQ 47
-#define NVIC_CT32B1_IRQ 44
-#define NVIC_SSP0_IRQ 45
-#define NVIC_PIO2_4_IRQ 28
-#define NVIC_PIO2_5_IRQ 29
-#define NVIC_I2C0_IRQ 40
-#define NVIC_CT16B0_IRQ 41
-#define NVIC_PIO0_1_IRQ 1
-#define NVIC_PIO0_0_IRQ 0
-#define NVIC_PIO0_3_IRQ 3
-#define NVIC_PIO0_2_IRQ 2
-#define NVIC_PIO0_5_IRQ 5
-#define NVIC_PIO0_4_IRQ 4
-#define NVIC_PIO0_7_IRQ 7
-#define NVIC_PIO0_6_IRQ 6
-#define NVIC_PIO0_9_IRQ 9
-#define NVIC_PIO0_8_IRQ 8
-#define NVIC_BOD_IRQ 51
-#define NVIC_PIO3_3_IRQ 39
-#define NVIC_PIO3_2_IRQ 38
-#define NVIC_PIO0_11_IRQ 11
-#define NVIC_PIO0_10_IRQ 10
-#define NVIC_PIO1_1_IRQ 13
-#define NVIC_PIO1_0_IRQ 12
-#define NVIC_PIO1_3_IRQ 15
-#define NVIC_PIO1_2_IRQ 14
-#define NVIC_PIO1_5_IRQ 17
-#define NVIC_PIO1_4_IRQ 16
-#define NVIC_PIO1_7_IRQ 19
-#define NVIC_PIO1_6_IRQ 18
-#define NVIC_PIO2_7_IRQ 31
-#define NVIC_PIO2_6_IRQ 30
-#define NVIC_PIO3_1_IRQ 37
-#define NVIC_PIO3_0_IRQ 36
-#define NVIC_PIO2_11_IRQ 35
-#define NVIC_PIO2_10_IRQ 34
-#define NVIC_PIO2_9_IRQ 33
-#define NVIC_PIO1_IRQ 55
-#define NVIC_PIO2_8_IRQ 32
-#define NVIC_WDT_IRQ 50
-
-#define NVIC_IRQ_COUNT 57
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_LPC13xx User interrupt service routines (ISR) prototypes for LPC 13xx series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK ssp1_isr(void);
-void WEAK pio2_isr(void);
-void WEAK ct16b1_isr(void);
-void WEAK usb_fiq_isr(void);
-void WEAK ct32b0_isr(void);
-void WEAK adc_isr(void);
-void WEAK pio3_isr(void);
-void WEAK pio2_0_isr(void);
-void WEAK pio2_1_isr(void);
-void WEAK pio2_2_isr(void);
-void WEAK pio2_3_isr(void);
-void WEAK pio1_8_isr(void);
-void WEAK pio1_9_isr(void);
-void WEAK pio1_10_isr(void);
-void WEAK pio1_11_isr(void);
-void WEAK uart_isr(void);
-void WEAK usb_isr(void);
-void WEAK ct32b1_isr(void);
-void WEAK ssp0_isr(void);
-void WEAK pio2_4_isr(void);
-void WEAK pio2_5_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK ct16b0_isr(void);
-void WEAK pio0_1_isr(void);
-void WEAK pio0_0_isr(void);
-void WEAK pio0_3_isr(void);
-void WEAK pio0_2_isr(void);
-void WEAK pio0_5_isr(void);
-void WEAK pio0_4_isr(void);
-void WEAK pio0_7_isr(void);
-void WEAK pio0_6_isr(void);
-void WEAK pio0_9_isr(void);
-void WEAK pio0_8_isr(void);
-void WEAK bod_isr(void);
-void WEAK pio3_3_isr(void);
-void WEAK pio3_2_isr(void);
-void WEAK pio0_11_isr(void);
-void WEAK pio0_10_isr(void);
-void WEAK pio1_1_isr(void);
-void WEAK pio1_0_isr(void);
-void WEAK pio1_3_isr(void);
-void WEAK pio1_2_isr(void);
-void WEAK pio1_5_isr(void);
-void WEAK pio1_4_isr(void);
-void WEAK pio1_7_isr(void);
-void WEAK pio1_6_isr(void);
-void WEAK pio2_7_isr(void);
-void WEAK pio2_6_isr(void);
-void WEAK pio3_1_isr(void);
-void WEAK pio3_0_isr(void);
-void WEAK pio2_11_isr(void);
-void WEAK pio2_10_isr(void);
-void WEAK pio2_9_isr(void);
-void WEAK pio1_isr(void);
-void WEAK pio2_8_isr(void);
-void WEAK wdt_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_LPC13xx_NVIC_H */
diff --git a/libopencm3/include/libopencm3/lpc17xx/nvic.h b/libopencm3/include/libopencm3/lpc17xx/nvic.h
deleted file mode 100644
index ab14b65..0000000
--- a/libopencm3/include/libopencm3/lpc17xx/nvic.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_LPC17xx_NVIC_H
-#define LIBOPENCM3_LPC17xx_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_LPC17xx User interrupts for LPC 17xx series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_USB_IRQ 24
-#define NVIC_CAN_IRQ 25
-#define NVIC_GPDMA_IRQ 26
-#define NVIC_I2S_IRQ 27
-#define NVIC_EINT2_IRQ 20
-#define NVIC_EINT3_IRQ 21
-#define NVIC_ADC_IRQ 22
-#define NVIC_BOD_IRQ 23
-#define NVIC_ETHERNET_IRQ 28
-#define NVIC_RIT_IRQ 29
-#define NVIC_TIMER0_IRQ 1
-#define NVIC_WDT_IRQ 0
-#define NVIC_TIMER2_IRQ 3
-#define NVIC_TIMER1_IRQ 2
-#define NVIC_UART0_IRQ 5
-#define NVIC_TIMER3_IRQ 4
-#define NVIC_UART2_IRQ 7
-#define NVIC_UART1_IRQ 6
-#define NVIC_PWM_IRQ 9
-#define NVIC_UART3_IRQ 8
-#define NVIC_I2C1_IRQ 11
-#define NVIC_I2C0_IRQ 10
-#define NVIC_SPI_IRQ 13
-#define NVIC_I2C2_IRQ 12
-#define NVIC_SSP1_IRQ 15
-#define NVIC_SSP0_IRQ 14
-#define NVIC_RTC_IRQ 17
-#define NVIC_PLL0_IRQ 16
-#define NVIC_EINT1_IRQ 19
-#define NVIC_EINT0_IRQ 18
-#define NVIC_QEI_IRQ 31
-#define NVIC_MOTOR_PWM_IRQ 30
-#define NVIC_CAN_ACT_IRQ 34
-#define NVIC_USB_ACT_IRQ 33
-#define NVIC_PLL1_IRQ 32
-
-#define NVIC_IRQ_COUNT 35
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_LPC17xx User interrupt service routines (ISR) prototypes for LPC 17xx series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK usb_isr(void);
-void WEAK can_isr(void);
-void WEAK gpdma_isr(void);
-void WEAK i2s_isr(void);
-void WEAK eint2_isr(void);
-void WEAK eint3_isr(void);
-void WEAK adc_isr(void);
-void WEAK bod_isr(void);
-void WEAK ethernet_isr(void);
-void WEAK rit_isr(void);
-void WEAK timer0_isr(void);
-void WEAK wdt_isr(void);
-void WEAK timer2_isr(void);
-void WEAK timer1_isr(void);
-void WEAK uart0_isr(void);
-void WEAK timer3_isr(void);
-void WEAK uart2_isr(void);
-void WEAK uart1_isr(void);
-void WEAK pwm_isr(void);
-void WEAK uart3_isr(void);
-void WEAK i2c1_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK spi_isr(void);
-void WEAK i2c2_isr(void);
-void WEAK ssp1_isr(void);
-void WEAK ssp0_isr(void);
-void WEAK rtc_isr(void);
-void WEAK pll0_isr(void);
-void WEAK eint1_isr(void);
-void WEAK eint0_isr(void);
-void WEAK qei_isr(void);
-void WEAK motor_pwm_isr(void);
-void WEAK can_act_isr(void);
-void WEAK usb_act_isr(void);
-void WEAK pll1_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_LPC17xx_NVIC_H */
diff --git a/libopencm3/include/libopencm3/lpc43xx/m0/nvic.h b/libopencm3/include/libopencm3/lpc43xx/m0/nvic.h
deleted file mode 100644
index 5bf4961..0000000
--- a/libopencm3/include/libopencm3/lpc43xx/m0/nvic.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_LPC43xx_M0_NVIC_H
-#define LIBOPENCM3_LPC43xx_M0_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_LPC43xx (M0) User interrupts for LPC 43xx series M0 core
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_USART0_IRQ 24
-#define NVIC_UART1_IRQ 25
-#define NVIC_USART2_OR_C_CAN1_IRQ 26
-#define NVIC_USART3_IRQ 27
-#define NVIC_SPI_OR_DAC_IRQ 20
-#define NVIC_ADC1_IRQ 21
-#define NVIC_SSP0_OR_SSP1_IRQ 22
-#define NVIC_EVENTROUTER_IRQ 23
-#define NVIC_I2S0_OR_I2S1_IRQ 28
-#define NVIC_C_CAN0_IRQ 29
-#define NVIC_M4CORE_IRQ 1
-#define NVIC_RTC_IRQ 0
-#define NVIC_DMA_IRQ 2
-#define NVIC_ETHERNET_IRQ 5
-#define NVIC_FLASHEEPROMAT_IRQ 4
-#define NVIC_LCD_IRQ 7
-#define NVIC_SDIO_IRQ 6
-#define NVIC_USB1_IRQ 9
-#define NVIC_USB0_IRQ 8
-#define NVIC_RITIMER_OR_WWDT_IRQ 11
-#define NVIC_SCT_IRQ 10
-#define NVIC_GINT1_IRQ 13
-#define NVIC_TIMER0_IRQ 12
-#define NVIC_TIMER3_IRQ 15
-#define NVIC_PIN_INT4_IRQ 14
-#define NVIC_ADC0_IRQ 17
-#define NVIC_MCPWM_IRQ 16
-#define NVIC_SGPIO_IRQ 19
-#define NVIC_I2C0_OR_IRC1_IRQ 18
-
-#define NVIC_IRQ_COUNT 30
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_LPC43xx (M0) User interrupt service routines (ISR) prototypes for LPC 43xx series M0 core
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK usart0_isr(void);
-void WEAK uart1_isr(void);
-void WEAK usart2_or_c_can1_isr(void);
-void WEAK usart3_isr(void);
-void WEAK spi_or_dac_isr(void);
-void WEAK adc1_isr(void);
-void WEAK ssp0_or_ssp1_isr(void);
-void WEAK eventrouter_isr(void);
-void WEAK i2s0_or_i2s1_isr(void);
-void WEAK c_can0_isr(void);
-void WEAK m4core_isr(void);
-void WEAK rtc_isr(void);
-void WEAK dma_isr(void);
-void WEAK ethernet_isr(void);
-void WEAK flasheepromat_isr(void);
-void WEAK lcd_isr(void);
-void WEAK sdio_isr(void);
-void WEAK usb1_isr(void);
-void WEAK usb0_isr(void);
-void WEAK ritimer_or_wwdt_isr(void);
-void WEAK sct_isr(void);
-void WEAK gint1_isr(void);
-void WEAK timer0_isr(void);
-void WEAK timer3_isr(void);
-void WEAK pin_int4_isr(void);
-void WEAK adc0_isr(void);
-void WEAK mcpwm_isr(void);
-void WEAK sgpio_isr(void);
-void WEAK i2c0_or_irc1_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_LPC43xx_M0_NVIC_H */
diff --git a/libopencm3/include/libopencm3/lpc43xx/m4/nvic.h b/libopencm3/include/libopencm3/lpc43xx/m4/nvic.h
deleted file mode 100644
index af26013..0000000
--- a/libopencm3/include/libopencm3/lpc43xx/m4/nvic.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_LPC43xx_M4_NVIC_H
-#define LIBOPENCM3_LPC43xx_M4_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_LPC43xx (M4) User interrupts for LPC 43xx series M4 core
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_EVENTROUTER_IRQ 42
-#define NVIC_C_CAN1_IRQ 43
-#define NVIC_WWDT_IRQ 49
-#define NVIC_QEI_IRQ 52
-#define NVIC_USART0_IRQ 24
-#define NVIC_UART1_IRQ 25
-#define NVIC_USART2_IRQ 26
-#define NVIC_USART3_IRQ 27
-#define NVIC_SPI_IRQ 20
-#define NVIC_ADC1_IRQ 21
-#define NVIC_SSP0_IRQ 22
-#define NVIC_SSP1_IRQ 23
-#define NVIC_ATIMER_IRQ 46
-#define NVIC_RTC_IRQ 47
-#define NVIC_I2S0_IRQ 28
-#define NVIC_I2S1_IRQ 29
-#define NVIC_GINT0_IRQ 40
-#define NVIC_GINT1_IRQ 41
-#define NVIC_M0CORE_IRQ 1
-#define NVIC_DAC_IRQ 0
-#define NVIC_DMA_IRQ 2
-#define NVIC_ETHERNET_IRQ 5
-#define NVIC_LCD_IRQ 7
-#define NVIC_SDIO_IRQ 6
-#define NVIC_USB1_IRQ 9
-#define NVIC_USB0_IRQ 8
-#define NVIC_C_CAN0_IRQ 51
-#define NVIC_PIN_INT7_IRQ 39
-#define NVIC_PIN_INT6_IRQ 38
-#define NVIC_RITIMER_IRQ 11
-#define NVIC_SCT_IRQ 10
-#define NVIC_TIMER1_IRQ 13
-#define NVIC_TIMER0_IRQ 12
-#define NVIC_TIMER3_IRQ 15
-#define NVIC_TIMER2_IRQ 14
-#define NVIC_ADC0_IRQ 17
-#define NVIC_MCPWM_IRQ 16
-#define NVIC_I2C1_IRQ 19
-#define NVIC_I2C0_IRQ 18
-#define NVIC_SGPIO_IRQ 31
-#define NVIC_SPIFI_IRQ 30
-#define NVIC_PIN_INT5_IRQ 37
-#define NVIC_PIN_INT4_IRQ 36
-#define NVIC_PIN_INT3_IRQ 35
-#define NVIC_PIN_INT2_IRQ 34
-#define NVIC_PIN_INT1_IRQ 33
-#define NVIC_PIN_INT0_IRQ 32
-
-#define NVIC_IRQ_COUNT 53
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_LPC43xx (M4) User interrupt service routines (ISR) prototypes for LPC 43xx series M4 core
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK eventrouter_isr(void);
-void WEAK c_can1_isr(void);
-void WEAK wwdt_isr(void);
-void WEAK qei_isr(void);
-void WEAK usart0_isr(void);
-void WEAK uart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK spi_isr(void);
-void WEAK adc1_isr(void);
-void WEAK ssp0_isr(void);
-void WEAK ssp1_isr(void);
-void WEAK atimer_isr(void);
-void WEAK rtc_isr(void);
-void WEAK i2s0_isr(void);
-void WEAK i2s1_isr(void);
-void WEAK gint0_isr(void);
-void WEAK gint1_isr(void);
-void WEAK m0core_isr(void);
-void WEAK dac_isr(void);
-void WEAK dma_isr(void);
-void WEAK ethernet_isr(void);
-void WEAK lcd_isr(void);
-void WEAK sdio_isr(void);
-void WEAK usb1_isr(void);
-void WEAK usb0_isr(void);
-void WEAK c_can0_isr(void);
-void WEAK pin_int7_isr(void);
-void WEAK pin_int6_isr(void);
-void WEAK ritimer_isr(void);
-void WEAK sct_isr(void);
-void WEAK timer1_isr(void);
-void WEAK timer0_isr(void);
-void WEAK timer3_isr(void);
-void WEAK timer2_isr(void);
-void WEAK adc0_isr(void);
-void WEAK mcpwm_isr(void);
-void WEAK i2c1_isr(void);
-void WEAK i2c0_isr(void);
-void WEAK sgpio_isr(void);
-void WEAK spifi_isr(void);
-void WEAK pin_int5_isr(void);
-void WEAK pin_int4_isr(void);
-void WEAK pin_int3_isr(void);
-void WEAK pin_int2_isr(void);
-void WEAK pin_int1_isr(void);
-void WEAK pin_int0_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_LPC43xx_M4_NVIC_H */
diff --git a/libopencm3/include/libopencm3/sam/3a/nvic.h b/libopencm3/include/libopencm3/sam/3a/nvic.h
deleted file mode 100644
index 99edda9..0000000
--- a/libopencm3/include/libopencm3/sam/3a/nvic.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_SAM3A_NVIC_H
-#define LIBOPENCM3_SAM3A_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_SAM3A User interrupts for Atmel SAM3A series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_SUPC_IRQ 0
-#define NVIC_RSTC_IRQ 1
-#define NVIC_RTC_IRQ 2
-#define NVIC_RTT_IRQ 3
-#define NVIC_WDT_IRQ 4
-#define NVIC_PMC_IRQ 5
-#define NVIC_EEFC0_IRQ 6
-#define NVIC_EEFC1_IRQ 7
-#define NVIC_UART_IRQ 8
-#define NVIC_SMC_SDRAMC_IRQ 9
-#define NVIC_SDRAMC_IRQ 10
-#define NVIC_PIOA_IRQ 11
-#define NVIC_PIOB_IRQ 12
-#define NVIC_PIOC_IRQ 13
-#define NVIC_PIOD_IRQ 14
-#define NVIC_PIOE_IRQ 15
-#define NVIC_PIOF_IRQ 16
-#define NVIC_USART0_IRQ 17
-#define NVIC_USART1_IRQ 18
-#define NVIC_USART2_IRQ 19
-#define NVIC_USART3_IRQ 20
-#define NVIC_HSMCI_IRQ 21
-#define NVIC_TWI0_IRQ 22
-#define NVIC_TWI1_IRQ 23
-#define NVIC_SPI0_IRQ 24
-#define NVIC_SPI1_IRQ 25
-#define NVIC_SSC_IRQ 26
-#define NVIC_TC0_IRQ 27
-#define NVIC_TC1_IRQ 28
-#define NVIC_TC2_IRQ 29
-#define NVIC_TC3_IRQ 30
-#define NVIC_TC4_IRQ 31
-#define NVIC_TC5_IRQ 32
-#define NVIC_TC6_IRQ 33
-#define NVIC_TC7_IRQ 34
-#define NVIC_TC8_IRQ 35
-#define NVIC_PWM_IRQ 36
-#define NVIC_ADC_IRQ 37
-#define NVIC_DACC_IRQ 38
-#define NVIC_DMAC_IRQ 39
-#define NVIC_UOTGHS_IRQ 40
-#define NVIC_TRNG_IRQ 41
-#define NVIC_RESERVED0_IRQ 42
-#define NVIC_CAN0_IRQ 43
-#define NVIC_CAN1_IRQ 44
-
-#define NVIC_IRQ_COUNT 45
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_SAM3A User interrupt service routines (ISR) prototypes for Atmel SAM3A series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK supc_isr(void);
-void WEAK rstc_isr(void);
-void WEAK rtc_isr(void);
-void WEAK rtt_isr(void);
-void WEAK wdt_isr(void);
-void WEAK pmc_isr(void);
-void WEAK eefc0_isr(void);
-void WEAK eefc1_isr(void);
-void WEAK uart_isr(void);
-void WEAK smc_sdramc_isr(void);
-void WEAK sdramc_isr(void);
-void WEAK pioa_isr(void);
-void WEAK piob_isr(void);
-void WEAK pioc_isr(void);
-void WEAK piod_isr(void);
-void WEAK pioe_isr(void);
-void WEAK piof_isr(void);
-void WEAK usart0_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK hsmci_isr(void);
-void WEAK twi0_isr(void);
-void WEAK twi1_isr(void);
-void WEAK spi0_isr(void);
-void WEAK spi1_isr(void);
-void WEAK ssc_isr(void);
-void WEAK tc0_isr(void);
-void WEAK tc1_isr(void);
-void WEAK tc2_isr(void);
-void WEAK tc3_isr(void);
-void WEAK tc4_isr(void);
-void WEAK tc5_isr(void);
-void WEAK tc6_isr(void);
-void WEAK tc7_isr(void);
-void WEAK tc8_isr(void);
-void WEAK pwm_isr(void);
-void WEAK adc_isr(void);
-void WEAK dacc_isr(void);
-void WEAK dmac_isr(void);
-void WEAK uotghs_isr(void);
-void WEAK trng_isr(void);
-void WEAK reserved0_isr(void);
-void WEAK can0_isr(void);
-void WEAK can1_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_SAM3A_NVIC_H */
diff --git a/libopencm3/include/libopencm3/sam/3n/nvic.h b/libopencm3/include/libopencm3/sam/3n/nvic.h
deleted file mode 100644
index 7ca3042..0000000
--- a/libopencm3/include/libopencm3/sam/3n/nvic.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_SAM3N_NVIC_H
-#define LIBOPENCM3_SAM3N_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_SAM3N User interrupts for Atmel SAM3N series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_SUPC_IRQ 0
-#define NVIC_RSTC_IRQ 1
-#define NVIC_RTC_IRQ 2
-#define NVIC_RTT_IRQ 3
-#define NVIC_WDT_IRQ 4
-#define NVIC_PMC_IRQ 5
-#define NVIC_EEFC_IRQ 6
-#define NVIC_RESERVED0_IRQ 7
-#define NVIC_UART0_IRQ 8
-#define NVIC_UART1_IRQ 9
-#define NVIC_RESERVED1_IRQ 10
-#define NVIC_PIOA_IRQ 11
-#define NVIC_PIOB_IRQ 12
-#define NVIC_PIOC_IRQ 13
-#define NVIC_USART0_IRQ 14
-#define NVIC_USART1_IRQ 15
-#define NVIC_RESERVED2_IRQ 16
-#define NVIC_RESERVED3_IRQ 17
-#define NVIC_RESERVED4_IRQ 18
-#define NVIC_TWI0_IRQ 19
-#define NVIC_TWI1_IRQ 20
-#define NVIC_SPI_IRQ 21
-#define NVIC_RESERVED5_IRQ 22
-#define NVIC_TC0_IRQ 23
-#define NVIC_TC1_IRQ 24
-#define NVIC_TC2_IRQ 25
-#define NVIC_TC3_IRQ 26
-#define NVIC_TC4_IRQ 27
-#define NVIC_TC5_IRQ 28
-#define NVIC_ADC_IRQ 29
-#define NVIC_DACC_IRQ 30
-#define NVIC_PWM_IRQ 31
-
-#define NVIC_IRQ_COUNT 32
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_SAM3N User interrupt service routines (ISR) prototypes for Atmel SAM3N series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK supc_isr(void);
-void WEAK rstc_isr(void);
-void WEAK rtc_isr(void);
-void WEAK rtt_isr(void);
-void WEAK wdt_isr(void);
-void WEAK pmc_isr(void);
-void WEAK eefc_isr(void);
-void WEAK reserved0_isr(void);
-void WEAK uart0_isr(void);
-void WEAK uart1_isr(void);
-void WEAK reserved1_isr(void);
-void WEAK pioa_isr(void);
-void WEAK piob_isr(void);
-void WEAK pioc_isr(void);
-void WEAK usart0_isr(void);
-void WEAK usart1_isr(void);
-void WEAK reserved2_isr(void);
-void WEAK reserved3_isr(void);
-void WEAK reserved4_isr(void);
-void WEAK twi0_isr(void);
-void WEAK twi1_isr(void);
-void WEAK spi_isr(void);
-void WEAK reserved5_isr(void);
-void WEAK tc0_isr(void);
-void WEAK tc1_isr(void);
-void WEAK tc2_isr(void);
-void WEAK tc3_isr(void);
-void WEAK tc4_isr(void);
-void WEAK tc5_isr(void);
-void WEAK adc_isr(void);
-void WEAK dacc_isr(void);
-void WEAK pwm_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_SAM3N_NVIC_H */
diff --git a/libopencm3/include/libopencm3/sam/3s/nvic.h b/libopencm3/include/libopencm3/sam/3s/nvic.h
deleted file mode 100644
index 644c873..0000000
--- a/libopencm3/include/libopencm3/sam/3s/nvic.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_SAM3S_NVIC_H
-#define LIBOPENCM3_SAM3S_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_SAM3S User interrupts for Atmel SAM3S series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_SUPC_IRQ 0
-#define NVIC_RSTC_IRQ 1
-#define NVIC_RTC_IRQ 2
-#define NVIC_RTT_IRQ 3
-#define NVIC_WDT_IRQ 4
-#define NVIC_PMC_IRQ 5
-#define NVIC_EEFC_IRQ 6
-#define NVIC_RESERVED0_IRQ 7
-#define NVIC_UART0_IRQ 8
-#define NVIC_UART1_IRQ 9
-#define NVIC_SMC_IRQ 10
-#define NVIC_PIOA_IRQ 11
-#define NVIC_PIOB_IRQ 12
-#define NVIC_PIOC_IRQ 13
-#define NVIC_USART0_IRQ 14
-#define NVIC_USART1_IRQ 15
-#define NVIC_USART2_IRQ 16
-#define NVIC_RESERVED1_IRQ 17
-#define NVIC_HSMCI_IRQ 18
-#define NVIC_TWI0_IRQ 19
-#define NVIC_TWI1_IRQ 20
-#define NVIC_SPI_IRQ 21
-#define NVIC_SSC_IRQ 22
-#define NVIC_TC0_IRQ 23
-#define NVIC_TC1_IRQ 24
-#define NVIC_TC2_IRQ 25
-#define NVIC_TC3_IRQ 26
-#define NVIC_TC4_IRQ 27
-#define NVIC_TC5_IRQ 28
-#define NVIC_ADC_IRQ 29
-#define NVIC_DACC_IRQ 30
-#define NVIC_PWM_IRQ 31
-#define NVIC_CRCCU_IRQ 32
-#define NVIC_ACC_IRQ 33
-#define NVIC_UDP_IRQ 34
-
-#define NVIC_IRQ_COUNT 35
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_SAM3S User interrupt service routines (ISR) prototypes for Atmel SAM3S series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK supc_isr(void);
-void WEAK rstc_isr(void);
-void WEAK rtc_isr(void);
-void WEAK rtt_isr(void);
-void WEAK wdt_isr(void);
-void WEAK pmc_isr(void);
-void WEAK eefc_isr(void);
-void WEAK reserved0_isr(void);
-void WEAK uart0_isr(void);
-void WEAK uart1_isr(void);
-void WEAK smc_isr(void);
-void WEAK pioa_isr(void);
-void WEAK piob_isr(void);
-void WEAK pioc_isr(void);
-void WEAK usart0_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK reserved1_isr(void);
-void WEAK hsmci_isr(void);
-void WEAK twi0_isr(void);
-void WEAK twi1_isr(void);
-void WEAK spi_isr(void);
-void WEAK ssc_isr(void);
-void WEAK tc0_isr(void);
-void WEAK tc1_isr(void);
-void WEAK tc2_isr(void);
-void WEAK tc3_isr(void);
-void WEAK tc4_isr(void);
-void WEAK tc5_isr(void);
-void WEAK adc_isr(void);
-void WEAK dacc_isr(void);
-void WEAK pwm_isr(void);
-void WEAK crccu_isr(void);
-void WEAK acc_isr(void);
-void WEAK udp_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_SAM3S_NVIC_H */
diff --git a/libopencm3/include/libopencm3/sam/3u/nvic.h b/libopencm3/include/libopencm3/sam/3u/nvic.h
deleted file mode 100644
index 4877e23..0000000
--- a/libopencm3/include/libopencm3/sam/3u/nvic.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_SAM3U_NVIC_H
-#define LIBOPENCM3_SAM3U_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_SAM3U User interrupts for Atmel SAM3U series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_SUPC_IRQ 0
-#define NVIC_RSTC_IRQ 1
-#define NVIC_RTC_IRQ 2
-#define NVIC_RTT_IRQ 3
-#define NVIC_WDT_IRQ 4
-#define NVIC_PMC_IRQ 5
-#define NVIC_EEFC0_IRQ 6
-#define NVIC_EEFC1_IRQ 7
-#define NVIC_UART_IRQ 8
-#define NVIC_SMC_IRQ 9
-#define NVIC_PIOA_IRQ 10
-#define NVIC_PIOB_IRQ 11
-#define NVIC_PIOC_IRQ 12
-#define NVIC_USART0_IRQ 13
-#define NVIC_USART1_IRQ 14
-#define NVIC_USART2_IRQ 15
-#define NVIC_USART3_IRQ 16
-#define NVIC_HSMCI_IRQ 17
-#define NVIC_TWI0_IRQ 18
-#define NVIC_TWI1_IRQ 19
-#define NVIC_SPI_IRQ 20
-#define NVIC_SSC_IRQ 21
-#define NVIC_TC0_IRQ 22
-#define NVIC_TC1_IRQ 23
-#define NVIC_TC2_IRQ 24
-#define NVIC_PWM_IRQ 25
-#define NVIC_ADC12B_IRQ 26
-#define NVIC_ADC_IRQ 27
-#define NVIC_DMAC_IRQ 28
-#define NVIC_UDPHS_IRQ 29
-
-#define NVIC_IRQ_COUNT 30
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_SAM3U User interrupt service routines (ISR) prototypes for Atmel SAM3U series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK supc_isr(void);
-void WEAK rstc_isr(void);
-void WEAK rtc_isr(void);
-void WEAK rtt_isr(void);
-void WEAK wdt_isr(void);
-void WEAK pmc_isr(void);
-void WEAK eefc0_isr(void);
-void WEAK eefc1_isr(void);
-void WEAK uart_isr(void);
-void WEAK smc_isr(void);
-void WEAK pioa_isr(void);
-void WEAK piob_isr(void);
-void WEAK pioc_isr(void);
-void WEAK usart0_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK hsmci_isr(void);
-void WEAK twi0_isr(void);
-void WEAK twi1_isr(void);
-void WEAK spi_isr(void);
-void WEAK ssc_isr(void);
-void WEAK tc0_isr(void);
-void WEAK tc1_isr(void);
-void WEAK tc2_isr(void);
-void WEAK pwm_isr(void);
-void WEAK adc12b_isr(void);
-void WEAK adc_isr(void);
-void WEAK dmac_isr(void);
-void WEAK udphs_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_SAM3U_NVIC_H */
diff --git a/libopencm3/include/libopencm3/sam/3x/nvic.h b/libopencm3/include/libopencm3/sam/3x/nvic.h
deleted file mode 100644
index aa2a29c..0000000
--- a/libopencm3/include/libopencm3/sam/3x/nvic.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_SAM3X_NVIC_H
-#define LIBOPENCM3_SAM3X_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_SAM3X User interrupts for Atmel SAM3X series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_SUPC_IRQ 0
-#define NVIC_RSTC_IRQ 1
-#define NVIC_RTC_IRQ 2
-#define NVIC_RTT_IRQ 3
-#define NVIC_WDT_IRQ 4
-#define NVIC_PMC_IRQ 5
-#define NVIC_EEFC0_IRQ 6
-#define NVIC_EEFC1_IRQ 7
-#define NVIC_UART_IRQ 8
-#define NVIC_SMC_SDRAMC_IRQ 9
-#define NVIC_SDRAMC_IRQ 10
-#define NVIC_PIOA_IRQ 11
-#define NVIC_PIOB_IRQ 12
-#define NVIC_PIOC_IRQ 13
-#define NVIC_PIOD_IRQ 14
-#define NVIC_PIOE_IRQ 15
-#define NVIC_PIOF_IRQ 16
-#define NVIC_USART0_IRQ 17
-#define NVIC_USART1_IRQ 18
-#define NVIC_USART2_IRQ 19
-#define NVIC_USART3_IRQ 20
-#define NVIC_HSMCI_IRQ 21
-#define NVIC_TWI0_IRQ 22
-#define NVIC_TWI1_IRQ 23
-#define NVIC_SPI0_IRQ 24
-#define NVIC_SPI1_IRQ 25
-#define NVIC_SSC_IRQ 26
-#define NVIC_TC0_IRQ 27
-#define NVIC_TC1_IRQ 28
-#define NVIC_TC2_IRQ 29
-#define NVIC_TC3_IRQ 30
-#define NVIC_TC4_IRQ 31
-#define NVIC_TC5_IRQ 32
-#define NVIC_TC6_IRQ 33
-#define NVIC_TC7_IRQ 34
-#define NVIC_TC8_IRQ 35
-#define NVIC_PWM_IRQ 36
-#define NVIC_ADC_IRQ 37
-#define NVIC_DACC_IRQ 38
-#define NVIC_DMAC_IRQ 39
-#define NVIC_UOTGHS_IRQ 40
-#define NVIC_TRNG_IRQ 41
-#define NVIC_EMAC_IRQ 42
-#define NVIC_CAN0_IRQ 43
-#define NVIC_CAN1_IRQ 44
-
-#define NVIC_IRQ_COUNT 45
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_SAM3X User interrupt service routines (ISR) prototypes for Atmel SAM3X series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK supc_isr(void);
-void WEAK rstc_isr(void);
-void WEAK rtc_isr(void);
-void WEAK rtt_isr(void);
-void WEAK wdt_isr(void);
-void WEAK pmc_isr(void);
-void WEAK eefc0_isr(void);
-void WEAK eefc1_isr(void);
-void WEAK uart_isr(void);
-void WEAK smc_sdramc_isr(void);
-void WEAK sdramc_isr(void);
-void WEAK pioa_isr(void);
-void WEAK piob_isr(void);
-void WEAK pioc_isr(void);
-void WEAK piod_isr(void);
-void WEAK pioe_isr(void);
-void WEAK piof_isr(void);
-void WEAK usart0_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK hsmci_isr(void);
-void WEAK twi0_isr(void);
-void WEAK twi1_isr(void);
-void WEAK spi0_isr(void);
-void WEAK spi1_isr(void);
-void WEAK ssc_isr(void);
-void WEAK tc0_isr(void);
-void WEAK tc1_isr(void);
-void WEAK tc2_isr(void);
-void WEAK tc3_isr(void);
-void WEAK tc4_isr(void);
-void WEAK tc5_isr(void);
-void WEAK tc6_isr(void);
-void WEAK tc7_isr(void);
-void WEAK tc8_isr(void);
-void WEAK pwm_isr(void);
-void WEAK adc_isr(void);
-void WEAK dacc_isr(void);
-void WEAK dmac_isr(void);
-void WEAK uotghs_isr(void);
-void WEAK trng_isr(void);
-void WEAK emac_isr(void);
-void WEAK can0_isr(void);
-void WEAK can1_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_SAM3X_NVIC_H */
diff --git a/libopencm3/include/libopencm3/stm32/f0/nvic.h b/libopencm3/include/libopencm3/stm32/f0/nvic.h
deleted file mode 100644
index 1334b98..0000000
--- a/libopencm3/include/libopencm3/stm32/f0/nvic.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_STM32_F0_NVIC_H
-#define LIBOPENCM3_STM32_F0_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_STM32F0 User interrupts for STM32 F0 series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_WWDG_IRQ 0
-#define NVIC_PVD_IRQ 1
-#define NVIC_RTC_IRQ 2
-#define NVIC_FLASH_IRQ 3
-#define NVIC_RCC_IRQ 4
-#define NVIC_EXTI0_1_IRQ 5
-#define NVIC_EXTI2_3_IRQ 6
-#define NVIC_EXTI4_15_IRQ 7
-#define NVIC_TSC_IRQ 8
-#define NVIC_DMA1_CHANNEL1_IRQ 9
-#define NVIC_DMA1_CHANNEL2_3_IRQ 10
-#define NVIC_DMA1_CHANNEL4_5_IRQ 11
-#define NVIC_ADC_COMP_IRQ 12
-#define NVIC_TIM1_BRK_UP_TRG_COM_IRQ 13
-#define NVIC_TIM1_CC_IRQ 14
-#define NVIC_TIM2_IRQ 15
-#define NVIC_TIM3_IRQ 16
-#define NVIC_TIM6_DAC_IRQ 17
-#define NVIC_TIM7_IRQ 18
-#define NVIC_TIM14_IRQ 19
-#define NVIC_TIM15_IRQ 20
-#define NVIC_TIM16_IRQ 21
-#define NVIC_TIM17_IRQ 22
-#define NVIC_I2C1_IRQ 23
-#define NVIC_I2C2_IRQ 24
-#define NVIC_SPI1_IRQ 25
-#define NVIC_SPI2_IRQ 26
-#define NVIC_USART1_IRQ 27
-#define NVIC_USART2_IRQ 28
-#define NVIC_USART3_4_IRQ 29
-#define NVIC_CEC_CAN_IRQ 30
-#define NVIC_USB_IRQ 31
-
-#define NVIC_IRQ_COUNT 32
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_STM32F0 User interrupt service routines (ISR) prototypes for STM32 F0 series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK wwdg_isr(void);
-void WEAK pvd_isr(void);
-void WEAK rtc_isr(void);
-void WEAK flash_isr(void);
-void WEAK rcc_isr(void);
-void WEAK exti0_1_isr(void);
-void WEAK exti2_3_isr(void);
-void WEAK exti4_15_isr(void);
-void WEAK tsc_isr(void);
-void WEAK dma1_channel1_isr(void);
-void WEAK dma1_channel2_3_isr(void);
-void WEAK dma1_channel4_5_isr(void);
-void WEAK adc_comp_isr(void);
-void WEAK tim1_brk_up_trg_com_isr(void);
-void WEAK tim1_cc_isr(void);
-void WEAK tim2_isr(void);
-void WEAK tim3_isr(void);
-void WEAK tim6_dac_isr(void);
-void WEAK tim7_isr(void);
-void WEAK tim14_isr(void);
-void WEAK tim15_isr(void);
-void WEAK tim16_isr(void);
-void WEAK tim17_isr(void);
-void WEAK i2c1_isr(void);
-void WEAK i2c2_isr(void);
-void WEAK spi1_isr(void);
-void WEAK spi2_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_4_isr(void);
-void WEAK cec_can_isr(void);
-void WEAK usb_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_STM32_F0_NVIC_H */
diff --git a/libopencm3/include/libopencm3/stm32/f1/nvic.h b/libopencm3/include/libopencm3/stm32/f1/nvic.h
deleted file mode 100644
index f3f8e3c..0000000
--- a/libopencm3/include/libopencm3/stm32/f1/nvic.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_STM32_F1_NVIC_H
-#define LIBOPENCM3_STM32_F1_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_STM32F1 User interrupts for STM32 F1 series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_WWDG_IRQ 0
-#define NVIC_PVD_IRQ 1
-#define NVIC_TAMPER_IRQ 2
-#define NVIC_RTC_IRQ 3
-#define NVIC_FLASH_IRQ 4
-#define NVIC_RCC_IRQ 5
-#define NVIC_EXTI0_IRQ 6
-#define NVIC_EXTI1_IRQ 7
-#define NVIC_EXTI2_IRQ 8
-#define NVIC_EXTI3_IRQ 9
-#define NVIC_EXTI4_IRQ 10
-#define NVIC_DMA1_CHANNEL1_IRQ 11
-#define NVIC_DMA1_CHANNEL2_IRQ 12
-#define NVIC_DMA1_CHANNEL3_IRQ 13
-#define NVIC_DMA1_CHANNEL4_IRQ 14
-#define NVIC_DMA1_CHANNEL5_IRQ 15
-#define NVIC_DMA1_CHANNEL6_IRQ 16
-#define NVIC_DMA1_CHANNEL7_IRQ 17
-#define NVIC_ADC1_2_IRQ 18
-#define NVIC_USB_HP_CAN_TX_IRQ 19
-#define NVIC_USB_LP_CAN_RX0_IRQ 20
-#define NVIC_CAN_RX1_IRQ 21
-#define NVIC_CAN_SCE_IRQ 22
-#define NVIC_EXTI9_5_IRQ 23
-#define NVIC_TIM1_BRK_IRQ 24
-#define NVIC_TIM1_UP_IRQ 25
-#define NVIC_TIM1_TRG_COM_IRQ 26
-#define NVIC_TIM1_CC_IRQ 27
-#define NVIC_TIM2_IRQ 28
-#define NVIC_TIM3_IRQ 29
-#define NVIC_TIM4_IRQ 30
-#define NVIC_I2C1_EV_IRQ 31
-#define NVIC_I2C1_ER_IRQ 32
-#define NVIC_I2C2_EV_IRQ 33
-#define NVIC_I2C2_ER_IRQ 34
-#define NVIC_SPI1_IRQ 35
-#define NVIC_SPI2_IRQ 36
-#define NVIC_USART1_IRQ 37
-#define NVIC_USART2_IRQ 38
-#define NVIC_USART3_IRQ 39
-#define NVIC_EXTI15_10_IRQ 40
-#define NVIC_RTC_ALARM_IRQ 41
-#define NVIC_USB_WAKEUP_IRQ 42
-#define NVIC_TIM8_BRK_IRQ 43
-#define NVIC_TIM8_UP_IRQ 44
-#define NVIC_TIM8_TRG_COM_IRQ 45
-#define NVIC_TIM8_CC_IRQ 46
-#define NVIC_ADC3_IRQ 47
-#define NVIC_FSMC_IRQ 48
-#define NVIC_SDIO_IRQ 49
-#define NVIC_TIM5_IRQ 50
-#define NVIC_SPI3_IRQ 51
-#define NVIC_UART4_IRQ 52
-#define NVIC_UART5_IRQ 53
-#define NVIC_TIM6_IRQ 54
-#define NVIC_TIM7_IRQ 55
-#define NVIC_DMA2_CHANNEL1_IRQ 56
-#define NVIC_DMA2_CHANNEL2_IRQ 57
-#define NVIC_DMA2_CHANNEL3_IRQ 58
-#define NVIC_DMA2_CHANNEL4_5_IRQ 59
-#define NVIC_DMA2_CHANNEL5_IRQ 60
-#define NVIC_ETH_IRQ 61
-#define NVIC_ETH_WKUP_IRQ 62
-#define NVIC_CAN2_TX_IRQ 63
-#define NVIC_CAN2_RX0_IRQ 64
-#define NVIC_CAN2_RX1_IRQ 65
-#define NVIC_CAN2_SCE_IRQ 66
-#define NVIC_OTG_FS_IRQ 67
-
-#define NVIC_IRQ_COUNT 68
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_STM32F1 User interrupt service routines (ISR) prototypes for STM32 F1 series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK wwdg_isr(void);
-void WEAK pvd_isr(void);
-void WEAK tamper_isr(void);
-void WEAK rtc_isr(void);
-void WEAK flash_isr(void);
-void WEAK rcc_isr(void);
-void WEAK exti0_isr(void);
-void WEAK exti1_isr(void);
-void WEAK exti2_isr(void);
-void WEAK exti3_isr(void);
-void WEAK exti4_isr(void);
-void WEAK dma1_channel1_isr(void);
-void WEAK dma1_channel2_isr(void);
-void WEAK dma1_channel3_isr(void);
-void WEAK dma1_channel4_isr(void);
-void WEAK dma1_channel5_isr(void);
-void WEAK dma1_channel6_isr(void);
-void WEAK dma1_channel7_isr(void);
-void WEAK adc1_2_isr(void);
-void WEAK usb_hp_can_tx_isr(void);
-void WEAK usb_lp_can_rx0_isr(void);
-void WEAK can_rx1_isr(void);
-void WEAK can_sce_isr(void);
-void WEAK exti9_5_isr(void);
-void WEAK tim1_brk_isr(void);
-void WEAK tim1_up_isr(void);
-void WEAK tim1_trg_com_isr(void);
-void WEAK tim1_cc_isr(void);
-void WEAK tim2_isr(void);
-void WEAK tim3_isr(void);
-void WEAK tim4_isr(void);
-void WEAK i2c1_ev_isr(void);
-void WEAK i2c1_er_isr(void);
-void WEAK i2c2_ev_isr(void);
-void WEAK i2c2_er_isr(void);
-void WEAK spi1_isr(void);
-void WEAK spi2_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK exti15_10_isr(void);
-void WEAK rtc_alarm_isr(void);
-void WEAK usb_wakeup_isr(void);
-void WEAK tim8_brk_isr(void);
-void WEAK tim8_up_isr(void);
-void WEAK tim8_trg_com_isr(void);
-void WEAK tim8_cc_isr(void);
-void WEAK adc3_isr(void);
-void WEAK fsmc_isr(void);
-void WEAK sdio_isr(void);
-void WEAK tim5_isr(void);
-void WEAK spi3_isr(void);
-void WEAK uart4_isr(void);
-void WEAK uart5_isr(void);
-void WEAK tim6_isr(void);
-void WEAK tim7_isr(void);
-void WEAK dma2_channel1_isr(void);
-void WEAK dma2_channel2_isr(void);
-void WEAK dma2_channel3_isr(void);
-void WEAK dma2_channel4_5_isr(void);
-void WEAK dma2_channel5_isr(void);
-void WEAK eth_isr(void);
-void WEAK eth_wkup_isr(void);
-void WEAK can2_tx_isr(void);
-void WEAK can2_rx0_isr(void);
-void WEAK can2_rx1_isr(void);
-void WEAK can2_sce_isr(void);
-void WEAK otg_fs_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_STM32_F1_NVIC_H */
diff --git a/libopencm3/include/libopencm3/stm32/f2/nvic.h b/libopencm3/include/libopencm3/stm32/f2/nvic.h
deleted file mode 100644
index b5b9a54..0000000
--- a/libopencm3/include/libopencm3/stm32/f2/nvic.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_STM32_F2_NVIC_H
-#define LIBOPENCM3_STM32_F2_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_STM32F2 User interrupts for STM32 F2 series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_NVIC_WWDG_IRQ 0
-#define NVIC_PVD_IRQ 1
-#define NVIC_TAMP_STAMP_IRQ 2
-#define NVIC_RTC_WKUP_IRQ 3
-#define NVIC_FLASH_IRQ 4
-#define NVIC_RCC_IRQ 5
-#define NVIC_EXTI0_IRQ 6
-#define NVIC_EXTI1_IRQ 7
-#define NVIC_EXTI2_IRQ 8
-#define NVIC_EXTI3_IRQ 9
-#define NVIC_EXTI4_IRQ 10
-#define NVIC_DMA1_STREAM0_IRQ 11
-#define NVIC_DMA1_STREAM1_IRQ 12
-#define NVIC_DMA1_STREAM2_IRQ 13
-#define NVIC_DMA1_STREAM3_IRQ 14
-#define NVIC_DMA1_STREAM4_IRQ 15
-#define NVIC_DMA1_STREAM5_IRQ 16
-#define NVIC_DMA1_STREAM6_IRQ 17
-#define NVIC_ADC_IRQ 18
-#define NVIC_CAN1_TX_IRQ 19
-#define NVIC_CAN1_RX0_IRQ 20
-#define NVIC_CAN1_RX1_IRQ 21
-#define NVIC_CAN1_SCE_IRQ 22
-#define NVIC_EXTI9_5_IRQ 23
-#define NVIC_TIM1_BRK_TIM9_IRQ 24
-#define NVIC_TIM1_UP_TIM10_IRQ 25
-#define NVIC_TIM1_TRG_COM_TIM11_IRQ 26
-#define NVIC_TIM1_CC_IRQ 27
-#define NVIC_TIM2_IRQ 28
-#define NVIC_TIM3_IRQ 29
-#define NVIC_TIM4_IRQ 30
-#define NVIC_I2C1_EV_IRQ 31
-#define NVIC_I2C1_ER_IRQ 32
-#define NVIC_I2C2_EV_IRQ 33
-#define NVIC_I2C2_ER_IRQ 34
-#define NVIC_SPI1_IRQ 35
-#define NVIC_SPI2_IRQ 36
-#define NVIC_USART1_IRQ 37
-#define NVIC_USART2_IRQ 38
-#define NVIC_USART3_IRQ 39
-#define NVIC_EXTI15_10_IRQ 40
-#define NVIC_RTC_ALARM_IRQ 41
-#define NVIC_USB_FS_WKUP_IRQ 42
-#define NVIC_TIM8_BRK_TIM12_IRQ 43
-#define NVIC_TIM8_UP_TIM13_IRQ 44
-#define NVIC_TIM8_TRG_COM_TIM14_IRQ 45
-#define NVIC_TIM8_CC_IRQ 46
-#define NVIC_DMA1_STREAM7_IRQ 47
-#define NVIC_FSMC_IRQ 48
-#define NVIC_SDIO_IRQ 49
-#define NVIC_TIM5_IRQ 50
-#define NVIC_SPI3_IRQ 51
-#define NVIC_UART4_IRQ 52
-#define NVIC_UART5_IRQ 53
-#define NVIC_TIM6_DAC_IRQ 54
-#define NVIC_TIM7_IRQ 55
-#define NVIC_DMA2_STREAM0_IRQ 56
-#define NVIC_DMA2_STREAM1_IRQ 57
-#define NVIC_DMA2_STREAM2_IRQ 58
-#define NVIC_DMA2_STREAM3_IRQ 59
-#define NVIC_DMA2_STREAM4_IRQ 60
-#define NVIC_ETH_IRQ 61
-#define NVIC_ETH_WKUP_IRQ 62
-#define NVIC_CAN2_TX_IRQ 63
-#define NVIC_CAN2_RX0_IRQ 64
-#define NVIC_CAN2_RX1_IRQ 65
-#define NVIC_CAN2_SCE_IRQ 66
-#define NVIC_OTG_FS_IRQ 67
-#define NVIC_DMA2_STREAM5_IRQ 68
-#define NVIC_DMA2_STREAM6_IRQ 69
-#define NVIC_DMA2_STREAM7_IRQ 70
-#define NVIC_USART6_IRQ 71
-#define NVIC_I2C3_EV_IRQ 72
-#define NVIC_I2C3_ER_IRQ 73
-#define NVIC_OTG_HS_EP1_OUT_IRQ 74
-#define NVIC_OTG_HS_EP1_IN_IRQ 75
-#define NVIC_OTG_HS_WKUP_IRQ 76
-#define NVIC_OTG_HS_IRQ 77
-#define NVIC_DCMI_IRQ 78
-#define NVIC_CRYP_IRQ 79
-#define NVIC_HASH_RNG_IRQ 80
-
-#define NVIC_IRQ_COUNT 81
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_STM32F2 User interrupt service routines (ISR) prototypes for STM32 F2 series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK nvic_wwdg_isr(void);
-void WEAK pvd_isr(void);
-void WEAK tamp_stamp_isr(void);
-void WEAK rtc_wkup_isr(void);
-void WEAK flash_isr(void);
-void WEAK rcc_isr(void);
-void WEAK exti0_isr(void);
-void WEAK exti1_isr(void);
-void WEAK exti2_isr(void);
-void WEAK exti3_isr(void);
-void WEAK exti4_isr(void);
-void WEAK dma1_stream0_isr(void);
-void WEAK dma1_stream1_isr(void);
-void WEAK dma1_stream2_isr(void);
-void WEAK dma1_stream3_isr(void);
-void WEAK dma1_stream4_isr(void);
-void WEAK dma1_stream5_isr(void);
-void WEAK dma1_stream6_isr(void);
-void WEAK adc_isr(void);
-void WEAK can1_tx_isr(void);
-void WEAK can1_rx0_isr(void);
-void WEAK can1_rx1_isr(void);
-void WEAK can1_sce_isr(void);
-void WEAK exti9_5_isr(void);
-void WEAK tim1_brk_tim9_isr(void);
-void WEAK tim1_up_tim10_isr(void);
-void WEAK tim1_trg_com_tim11_isr(void);
-void WEAK tim1_cc_isr(void);
-void WEAK tim2_isr(void);
-void WEAK tim3_isr(void);
-void WEAK tim4_isr(void);
-void WEAK i2c1_ev_isr(void);
-void WEAK i2c1_er_isr(void);
-void WEAK i2c2_ev_isr(void);
-void WEAK i2c2_er_isr(void);
-void WEAK spi1_isr(void);
-void WEAK spi2_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK exti15_10_isr(void);
-void WEAK rtc_alarm_isr(void);
-void WEAK usb_fs_wkup_isr(void);
-void WEAK tim8_brk_tim12_isr(void);
-void WEAK tim8_up_tim13_isr(void);
-void WEAK tim8_trg_com_tim14_isr(void);
-void WEAK tim8_cc_isr(void);
-void WEAK dma1_stream7_isr(void);
-void WEAK fsmc_isr(void);
-void WEAK sdio_isr(void);
-void WEAK tim5_isr(void);
-void WEAK spi3_isr(void);
-void WEAK uart4_isr(void);
-void WEAK uart5_isr(void);
-void WEAK tim6_dac_isr(void);
-void WEAK tim7_isr(void);
-void WEAK dma2_stream0_isr(void);
-void WEAK dma2_stream1_isr(void);
-void WEAK dma2_stream2_isr(void);
-void WEAK dma2_stream3_isr(void);
-void WEAK dma2_stream4_isr(void);
-void WEAK eth_isr(void);
-void WEAK eth_wkup_isr(void);
-void WEAK can2_tx_isr(void);
-void WEAK can2_rx0_isr(void);
-void WEAK can2_rx1_isr(void);
-void WEAK can2_sce_isr(void);
-void WEAK otg_fs_isr(void);
-void WEAK dma2_stream5_isr(void);
-void WEAK dma2_stream6_isr(void);
-void WEAK dma2_stream7_isr(void);
-void WEAK usart6_isr(void);
-void WEAK i2c3_ev_isr(void);
-void WEAK i2c3_er_isr(void);
-void WEAK otg_hs_ep1_out_isr(void);
-void WEAK otg_hs_ep1_in_isr(void);
-void WEAK otg_hs_wkup_isr(void);
-void WEAK otg_hs_isr(void);
-void WEAK dcmi_isr(void);
-void WEAK cryp_isr(void);
-void WEAK hash_rng_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_STM32_F2_NVIC_H */
diff --git a/libopencm3/include/libopencm3/stm32/f3/nvic.h b/libopencm3/include/libopencm3/stm32/f3/nvic.h
deleted file mode 100644
index a521251..0000000
--- a/libopencm3/include/libopencm3/stm32/f3/nvic.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_STM32_F3_NVIC_H
-#define LIBOPENCM3_STM32_F3_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_STM32F3 User interrupts for STM32 F3 series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_NVIC_WWDG_IRQ 0
-#define NVIC_PVD_IRQ 1
-#define NVIC_TAMP_STAMP_IRQ 2
-#define NVIC_RTC_WKUP_IRQ 3
-#define NVIC_FLASH_IRQ 4
-#define NVIC_RCC_IRQ 5
-#define NVIC_EXTI0_IRQ 6
-#define NVIC_EXTI1_IRQ 7
-#define NVIC_EXTI2_TSC_IRQ 8
-#define NVIC_EXTI3_IRQ 9
-#define NVIC_EXTI4_IRQ 10
-#define NVIC_DMA1_CHANNEL1_IRQ 11
-#define NVIC_DMA1_CHANNEL2_IRQ 12
-#define NVIC_DMA1_CHANNEL3_IRQ 13
-#define NVIC_DMA1_CHANNEL4_IRQ 14
-#define NVIC_DMA1_CHANNEL5_IRQ 15
-#define NVIC_DMA1_CHANNEL6_IRQ 16
-#define NVIC_DMA1_CHANNEL7_IRQ 17
-#define NVIC_ADC1_2_IRQ 18
-#define NVIC_USB_HP_CAN1_TX_IRQ 19
-#define NVIC_USB_LP_CAN1_RX0_IRQ 20
-#define NVIC_CAN1_RX1_IRQ 21
-#define NVIC_CAN1_SCE_IRQ 22
-#define NVIC_EXTI9_5_IRQ 23
-#define NVIC_TIM1_BRK_TIM15_IRQ 24
-#define NVIC_TIM1_UP_TIM16_IRQ 25
-#define NVIC_TIM1_TRG_COM_TIM17_IRQ 26
-#define NVIC_TIM1_CC_IRQ 27
-#define NVIC_TIM2_IRQ 28
-#define NVIC_TIM3_IRQ 29
-#define NVIC_TIM4_IRQ 30
-#define NVIC_I2C1_EV_EXTI23_IRQ 31
-#define NVIC_I2C1_ER_IRQ 32
-#define NVIC_I2C2_EV_EXTI24_IRQ 33
-#define NVIC_I2C2_ER_IRQ 34
-#define NVIC_SPI1_IRQ 35
-#define NVIC_SPI2_IRQ 36
-#define NVIC_USART1_EXTI25_IRQ 37
-#define NVIC_USART2_EXTI26_IRQ 38
-#define NVIC_USART3_EXTI28_IRQ 39
-#define NVIC_EXTI15_10_IRQ 40
-#define NVIC_RTC_ALARM_IRQ 41
-#define NVIC_USB_WKUP_A_IRQ 42
-#define NVIC_TIM8_BRK_IRQ 43
-#define NVIC_TIM8_UP_IRQ 44
-#define NVIC_TIM8_TRG_COM_IRQ 45
-#define NVIC_TIM8_CC_IRQ 46
-#define NVIC_ADC3_IRQ 47
-#define NVIC_RESERVED_1_IRQ 48
-#define NVIC_RESERVED_2_IRQ 49
-#define NVIC_RESERVED_3_IRQ 50
-#define NVIC_SPI3_IRQ 51
-#define NVIC_UART4_EXTI34_IRQ 52
-#define NVIC_UART5_EXTI35_IRQ 53
-#define NVIC_TIM6_DAC_IRQ 54
-#define NVIC_TIM7_IRQ 55
-#define NVIC_DMA2_CHANNEL1_IRQ 56
-#define NVIC_DMA2_CHANNEL2_IRQ 57
-#define NVIC_DMA2_CHANNEL3_IRQ 58
-#define NVIC_DMA2_CHANNEL4_IRQ 59
-#define NVIC_DMA2_CHANNEL5_IRQ 60
-#define NVIC_ETH_IRQ 61
-#define NVIC_RESERVED_4_IRQ 62
-#define NVIC_RESERVED_5_IRQ 63
-#define NVIC_COMP123_IRQ 64
-#define NVIC_COMP456_IRQ 65
-#define NVIC_COMP7_IRQ 66
-#define NVIC_RESERVED_6_IRQ 67
-#define NVIC_RESERVED_7_IRQ 68
-#define NVIC_RESERVED_8_IRQ 69
-#define NVIC_RESERVED_9_IRQ 70
-#define NVIC_RESERVED_10_IRQ 71
-#define NVIC_RESERVED_11_IRQ 72
-#define NVIC_RESERVED_12_IRQ 73
-#define NVIC_USB_HP_IRQ 74
-#define NVIC_USB_LP_IRQ 75
-#define NVIC_USB_WKUP_IRQ 76
-#define NVIC_RESERVED_13_IRQ 77
-#define NVIC_RESERVED_14_IRQ 78
-#define NVIC_RESERVED_15_IRQ 79
-#define NVIC_RESERVED_16_IRQ 80
-
-#define NVIC_IRQ_COUNT 81
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_STM32F3 User interrupt service routines (ISR) prototypes for STM32 F3 series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK nvic_wwdg_isr(void);
-void WEAK pvd_isr(void);
-void WEAK tamp_stamp_isr(void);
-void WEAK rtc_wkup_isr(void);
-void WEAK flash_isr(void);
-void WEAK rcc_isr(void);
-void WEAK exti0_isr(void);
-void WEAK exti1_isr(void);
-void WEAK exti2_tsc_isr(void);
-void WEAK exti3_isr(void);
-void WEAK exti4_isr(void);
-void WEAK dma1_channel1_isr(void);
-void WEAK dma1_channel2_isr(void);
-void WEAK dma1_channel3_isr(void);
-void WEAK dma1_channel4_isr(void);
-void WEAK dma1_channel5_isr(void);
-void WEAK dma1_channel6_isr(void);
-void WEAK dma1_channel7_isr(void);
-void WEAK adc1_2_isr(void);
-void WEAK usb_hp_can1_tx_isr(void);
-void WEAK usb_lp_can1_rx0_isr(void);
-void WEAK can1_rx1_isr(void);
-void WEAK can1_sce_isr(void);
-void WEAK exti9_5_isr(void);
-void WEAK tim1_brk_tim15_isr(void);
-void WEAK tim1_up_tim16_isr(void);
-void WEAK tim1_trg_com_tim17_isr(void);
-void WEAK tim1_cc_isr(void);
-void WEAK tim2_isr(void);
-void WEAK tim3_isr(void);
-void WEAK tim4_isr(void);
-void WEAK i2c1_ev_exti23_isr(void);
-void WEAK i2c1_er_isr(void);
-void WEAK i2c2_ev_exti24_isr(void);
-void WEAK i2c2_er_isr(void);
-void WEAK spi1_isr(void);
-void WEAK spi2_isr(void);
-void WEAK usart1_exti25_isr(void);
-void WEAK usart2_exti26_isr(void);
-void WEAK usart3_exti28_isr(void);
-void WEAK exti15_10_isr(void);
-void WEAK rtc_alarm_isr(void);
-void WEAK usb_wkup_a_isr(void);
-void WEAK tim8_brk_isr(void);
-void WEAK tim8_up_isr(void);
-void WEAK tim8_trg_com_isr(void);
-void WEAK tim8_cc_isr(void);
-void WEAK adc3_isr(void);
-void WEAK reserved_1_isr(void);
-void WEAK reserved_2_isr(void);
-void WEAK reserved_3_isr(void);
-void WEAK spi3_isr(void);
-void WEAK uart4_exti34_isr(void);
-void WEAK uart5_exti35_isr(void);
-void WEAK tim6_dac_isr(void);
-void WEAK tim7_isr(void);
-void WEAK dma2_channel1_isr(void);
-void WEAK dma2_channel2_isr(void);
-void WEAK dma2_channel3_isr(void);
-void WEAK dma2_channel4_isr(void);
-void WEAK dma2_channel5_isr(void);
-void WEAK eth_isr(void);
-void WEAK reserved_4_isr(void);
-void WEAK reserved_5_isr(void);
-void WEAK comp123_isr(void);
-void WEAK comp456_isr(void);
-void WEAK comp7_isr(void);
-void WEAK reserved_6_isr(void);
-void WEAK reserved_7_isr(void);
-void WEAK reserved_8_isr(void);
-void WEAK reserved_9_isr(void);
-void WEAK reserved_10_isr(void);
-void WEAK reserved_11_isr(void);
-void WEAK reserved_12_isr(void);
-void WEAK usb_hp_isr(void);
-void WEAK usb_lp_isr(void);
-void WEAK usb_wkup_isr(void);
-void WEAK reserved_13_isr(void);
-void WEAK reserved_14_isr(void);
-void WEAK reserved_15_isr(void);
-void WEAK reserved_16_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_STM32_F3_NVIC_H */
diff --git a/libopencm3/include/libopencm3/stm32/f4/nvic.h b/libopencm3/include/libopencm3/stm32/f4/nvic.h
deleted file mode 100644
index e77848e..0000000
--- a/libopencm3/include/libopencm3/stm32/f4/nvic.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_STM32_F4_NVIC_H
-#define LIBOPENCM3_STM32_F4_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_STM32F4 User interrupts for STM32 F4 series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_NVIC_WWDG_IRQ 0
-#define NVIC_PVD_IRQ 1
-#define NVIC_TAMP_STAMP_IRQ 2
-#define NVIC_RTC_WKUP_IRQ 3
-#define NVIC_FLASH_IRQ 4
-#define NVIC_RCC_IRQ 5
-#define NVIC_EXTI0_IRQ 6
-#define NVIC_EXTI1_IRQ 7
-#define NVIC_EXTI2_IRQ 8
-#define NVIC_EXTI3_IRQ 9
-#define NVIC_EXTI4_IRQ 10
-#define NVIC_DMA1_STREAM0_IRQ 11
-#define NVIC_DMA1_STREAM1_IRQ 12
-#define NVIC_DMA1_STREAM2_IRQ 13
-#define NVIC_DMA1_STREAM3_IRQ 14
-#define NVIC_DMA1_STREAM4_IRQ 15
-#define NVIC_DMA1_STREAM5_IRQ 16
-#define NVIC_DMA1_STREAM6_IRQ 17
-#define NVIC_ADC_IRQ 18
-#define NVIC_CAN1_TX_IRQ 19
-#define NVIC_CAN1_RX0_IRQ 20
-#define NVIC_CAN1_RX1_IRQ 21
-#define NVIC_CAN1_SCE_IRQ 22
-#define NVIC_EXTI9_5_IRQ 23
-#define NVIC_TIM1_BRK_TIM9_IRQ 24
-#define NVIC_TIM1_UP_TIM10_IRQ 25
-#define NVIC_TIM1_TRG_COM_TIM11_IRQ 26
-#define NVIC_TIM1_CC_IRQ 27
-#define NVIC_TIM2_IRQ 28
-#define NVIC_TIM3_IRQ 29
-#define NVIC_TIM4_IRQ 30
-#define NVIC_I2C1_EV_IRQ 31
-#define NVIC_I2C1_ER_IRQ 32
-#define NVIC_I2C2_EV_IRQ 33
-#define NVIC_I2C2_ER_IRQ 34
-#define NVIC_SPI1_IRQ 35
-#define NVIC_SPI2_IRQ 36
-#define NVIC_USART1_IRQ 37
-#define NVIC_USART2_IRQ 38
-#define NVIC_USART3_IRQ 39
-#define NVIC_EXTI15_10_IRQ 40
-#define NVIC_RTC_ALARM_IRQ 41
-#define NVIC_USB_FS_WKUP_IRQ 42
-#define NVIC_TIM8_BRK_TIM12_IRQ 43
-#define NVIC_TIM8_UP_TIM13_IRQ 44
-#define NVIC_TIM8_TRG_COM_TIM14_IRQ 45
-#define NVIC_TIM8_CC_IRQ 46
-#define NVIC_DMA1_STREAM7_IRQ 47
-#define NVIC_FSMC_IRQ 48
-#define NVIC_SDIO_IRQ 49
-#define NVIC_TIM5_IRQ 50
-#define NVIC_SPI3_IRQ 51
-#define NVIC_UART4_IRQ 52
-#define NVIC_UART5_IRQ 53
-#define NVIC_TIM6_DAC_IRQ 54
-#define NVIC_TIM7_IRQ 55
-#define NVIC_DMA2_STREAM0_IRQ 56
-#define NVIC_DMA2_STREAM1_IRQ 57
-#define NVIC_DMA2_STREAM2_IRQ 58
-#define NVIC_DMA2_STREAM3_IRQ 59
-#define NVIC_DMA2_STREAM4_IRQ 60
-#define NVIC_ETH_IRQ 61
-#define NVIC_ETH_WKUP_IRQ 62
-#define NVIC_CAN2_TX_IRQ 63
-#define NVIC_CAN2_RX0_IRQ 64
-#define NVIC_CAN2_RX1_IRQ 65
-#define NVIC_CAN2_SCE_IRQ 66
-#define NVIC_OTG_FS_IRQ 67
-#define NVIC_DMA2_STREAM5_IRQ 68
-#define NVIC_DMA2_STREAM6_IRQ 69
-#define NVIC_DMA2_STREAM7_IRQ 70
-#define NVIC_USART6_IRQ 71
-#define NVIC_I2C3_EV_IRQ 72
-#define NVIC_I2C3_ER_IRQ 73
-#define NVIC_OTG_HS_EP1_OUT_IRQ 74
-#define NVIC_OTG_HS_EP1_IN_IRQ 75
-#define NVIC_OTG_HS_WKUP_IRQ 76
-#define NVIC_OTG_HS_IRQ 77
-#define NVIC_DCMI_IRQ 78
-#define NVIC_CRYP_IRQ 79
-#define NVIC_HASH_RNG_IRQ 80
-#define NVIC_FPU_IRQ 81
-#define NVIC_UART7_IRQ 82
-#define NVIC_UART8_IRQ 83
-#define NVIC_SPI4_IRQ 84
-#define NVIC_SPI5_IRQ 85
-#define NVIC_SPI6_IRQ 86
-#define NVIC_SAI1_IRQ 87
-#define NVIC_LCD_TFT_IRQ 88
-#define NVIC_LCD_TFT_ERR_IRQ 89
-#define NVIC_DMA2D_IRQ 90
-
-#define NVIC_IRQ_COUNT 91
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_STM32F4 User interrupt service routines (ISR) prototypes for STM32 F4 series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK nvic_wwdg_isr(void);
-void WEAK pvd_isr(void);
-void WEAK tamp_stamp_isr(void);
-void WEAK rtc_wkup_isr(void);
-void WEAK flash_isr(void);
-void WEAK rcc_isr(void);
-void WEAK exti0_isr(void);
-void WEAK exti1_isr(void);
-void WEAK exti2_isr(void);
-void WEAK exti3_isr(void);
-void WEAK exti4_isr(void);
-void WEAK dma1_stream0_isr(void);
-void WEAK dma1_stream1_isr(void);
-void WEAK dma1_stream2_isr(void);
-void WEAK dma1_stream3_isr(void);
-void WEAK dma1_stream4_isr(void);
-void WEAK dma1_stream5_isr(void);
-void WEAK dma1_stream6_isr(void);
-void WEAK adc_isr(void);
-void WEAK can1_tx_isr(void);
-void WEAK can1_rx0_isr(void);
-void WEAK can1_rx1_isr(void);
-void WEAK can1_sce_isr(void);
-void WEAK exti9_5_isr(void);
-void WEAK tim1_brk_tim9_isr(void);
-void WEAK tim1_up_tim10_isr(void);
-void WEAK tim1_trg_com_tim11_isr(void);
-void WEAK tim1_cc_isr(void);
-void WEAK tim2_isr(void);
-void WEAK tim3_isr(void);
-void WEAK tim4_isr(void);
-void WEAK i2c1_ev_isr(void);
-void WEAK i2c1_er_isr(void);
-void WEAK i2c2_ev_isr(void);
-void WEAK i2c2_er_isr(void);
-void WEAK spi1_isr(void);
-void WEAK spi2_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK exti15_10_isr(void);
-void WEAK rtc_alarm_isr(void);
-void WEAK usb_fs_wkup_isr(void);
-void WEAK tim8_brk_tim12_isr(void);
-void WEAK tim8_up_tim13_isr(void);
-void WEAK tim8_trg_com_tim14_isr(void);
-void WEAK tim8_cc_isr(void);
-void WEAK dma1_stream7_isr(void);
-void WEAK fsmc_isr(void);
-void WEAK sdio_isr(void);
-void WEAK tim5_isr(void);
-void WEAK spi3_isr(void);
-void WEAK uart4_isr(void);
-void WEAK uart5_isr(void);
-void WEAK tim6_dac_isr(void);
-void WEAK tim7_isr(void);
-void WEAK dma2_stream0_isr(void);
-void WEAK dma2_stream1_isr(void);
-void WEAK dma2_stream2_isr(void);
-void WEAK dma2_stream3_isr(void);
-void WEAK dma2_stream4_isr(void);
-void WEAK eth_isr(void);
-void WEAK eth_wkup_isr(void);
-void WEAK can2_tx_isr(void);
-void WEAK can2_rx0_isr(void);
-void WEAK can2_rx1_isr(void);
-void WEAK can2_sce_isr(void);
-void WEAK otg_fs_isr(void);
-void WEAK dma2_stream5_isr(void);
-void WEAK dma2_stream6_isr(void);
-void WEAK dma2_stream7_isr(void);
-void WEAK usart6_isr(void);
-void WEAK i2c3_ev_isr(void);
-void WEAK i2c3_er_isr(void);
-void WEAK otg_hs_ep1_out_isr(void);
-void WEAK otg_hs_ep1_in_isr(void);
-void WEAK otg_hs_wkup_isr(void);
-void WEAK otg_hs_isr(void);
-void WEAK dcmi_isr(void);
-void WEAK cryp_isr(void);
-void WEAK hash_rng_isr(void);
-void WEAK fpu_isr(void);
-void WEAK uart7_isr(void);
-void WEAK uart8_isr(void);
-void WEAK spi4_isr(void);
-void WEAK spi5_isr(void);
-void WEAK spi6_isr(void);
-void WEAK sai1_isr(void);
-void WEAK lcd_tft_isr(void);
-void WEAK lcd_tft_err_isr(void);
-void WEAK dma2d_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_STM32_F4_NVIC_H */
diff --git a/libopencm3/include/libopencm3/stm32/l1/nvic.h b/libopencm3/include/libopencm3/stm32/l1/nvic.h
deleted file mode 100644
index c6905db..0000000
--- a/libopencm3/include/libopencm3/stm32/l1/nvic.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* This file is part of the libopencm3 project.
- *
- * It was generated by the irq2nvic_h script.
- */
-
-#ifndef LIBOPENCM3_STM32_L1_NVIC_H
-#define LIBOPENCM3_STM32_L1_NVIC_H
-
-#include <libopencm3/cm3/nvic.h>
-
-/** @defgroup CM3_nvic_defines_STM32L1 User interrupts for STM32 L1 series
-    @ingroup CM3_nvic_defines
-
-    @{*/
-
-#define NVIC_WWDG_IRQ 0
-#define NVIC_PVD_IRQ 1
-#define NVIC_TAMPER_STAMP_IRQ 2
-#define NVIC_RTC_WKUP_IRQ 3
-#define NVIC_FLASH_IRQ 4
-#define NVIC_RCC_IRQ 5
-#define NVIC_EXTI0_IRQ 6
-#define NVIC_EXTI1_IRQ 7
-#define NVIC_EXTI2_IRQ 8
-#define NVIC_EXTI3_IRQ 9
-#define NVIC_EXTI4_IRQ 10
-#define NVIC_DMA1_CHANNEL1_IRQ 11
-#define NVIC_DMA1_CHANNEL2_IRQ 12
-#define NVIC_DMA1_CHANNEL3_IRQ 13
-#define NVIC_DMA1_CHANNEL4_IRQ 14
-#define NVIC_DMA1_CHANNEL5_IRQ 15
-#define NVIC_DMA1_CHANNEL6_IRQ 16
-#define NVIC_DMA1_CHANNEL7_IRQ 17
-#define NVIC_ADC1_IRQ 18
-#define NVIC_USB_HP_IRQ 19
-#define NVIC_USB_LP_IRQ 20
-#define NVIC_DAC_IRQ 21
-#define NVIC_COMP_IRQ 22
-#define NVIC_EXTI9_5_IRQ 23
-#define NVIC_LCD_IRQ 24
-#define NVIC_TIM9_IRQ 25
-#define NVIC_TIM10_IRQ 26
-#define NVIC_TIM11_IRQ 27
-#define NVIC_TIM2_IRQ 28
-#define NVIC_TIM3_IRQ 29
-#define NVIC_TIM4_IRQ 30
-#define NVIC_I2C1_EV_IRQ 31
-#define NVIC_I2C1_ER_IRQ 32
-#define NVIC_I2C2_EV_IRQ 33
-#define NVIC_I2C2_ER_IRQ 34
-#define NVIC_SPI1_IRQ 35
-#define NVIC_SPI2_IRQ 36
-#define NVIC_USART1_IRQ 37
-#define NVIC_USART2_IRQ 38
-#define NVIC_USART3_IRQ 39
-#define NVIC_EXTI15_10_IRQ 40
-#define NVIC_RTC_ALARM_IRQ 41
-#define NVIC_USB_FS_WAKEUP_IRQ 42
-#define NVIC_TIM6_IRQ 43
-#define NVIC_TIM7_IRQ 44
-#define NVIC_SDIO_IRQ 45
-#define NVIC_TIM5_IRQ 46
-#define NVIC_SPI3_IRQ 47
-#define NVIC_UART4_IRQ 48
-#define NVIC_UART5_IRQ 49
-#define NVIC_DMA2_CH1_IRQ 50
-#define NVIC_DMA2_CH2_IRQ 51
-#define NVIC_DMA2_CH3_IRQ 52
-#define NVIC_DMA2_CH4_IRQ 53
-#define NVIC_DMA2_CH5_IRQ 54
-#define NVIC_AES_IRQ 55
-#define NVIC_COMP_ACQ_IRQ 56
-
-#define NVIC_IRQ_COUNT 57
-
-/**@}*/
-
-/** @defgroup CM3_nvic_isrprototypes_STM32L1 User interrupt service routines (ISR) prototypes for STM32 L1 series
-    @ingroup CM3_nvic_isrprototypes
-
-    @{*/
-
-BEGIN_DECLS
-
-void WEAK wwdg_isr(void);
-void WEAK pvd_isr(void);
-void WEAK tamper_stamp_isr(void);
-void WEAK rtc_wkup_isr(void);
-void WEAK flash_isr(void);
-void WEAK rcc_isr(void);
-void WEAK exti0_isr(void);
-void WEAK exti1_isr(void);
-void WEAK exti2_isr(void);
-void WEAK exti3_isr(void);
-void WEAK exti4_isr(void);
-void WEAK dma1_channel1_isr(void);
-void WEAK dma1_channel2_isr(void);
-void WEAK dma1_channel3_isr(void);
-void WEAK dma1_channel4_isr(void);
-void WEAK dma1_channel5_isr(void);
-void WEAK dma1_channel6_isr(void);
-void WEAK dma1_channel7_isr(void);
-void WEAK adc1_isr(void);
-void WEAK usb_hp_isr(void);
-void WEAK usb_lp_isr(void);
-void WEAK dac_isr(void);
-void WEAK comp_isr(void);
-void WEAK exti9_5_isr(void);
-void WEAK lcd_isr(void);
-void WEAK tim9_isr(void);
-void WEAK tim10_isr(void);
-void WEAK tim11_isr(void);
-void WEAK tim2_isr(void);
-void WEAK tim3_isr(void);
-void WEAK tim4_isr(void);
-void WEAK i2c1_ev_isr(void);
-void WEAK i2c1_er_isr(void);
-void WEAK i2c2_ev_isr(void);
-void WEAK i2c2_er_isr(void);
-void WEAK spi1_isr(void);
-void WEAK spi2_isr(void);
-void WEAK usart1_isr(void);
-void WEAK usart2_isr(void);
-void WEAK usart3_isr(void);
-void WEAK exti15_10_isr(void);
-void WEAK rtc_alarm_isr(void);
-void WEAK usb_fs_wakeup_isr(void);
-void WEAK tim6_isr(void);
-void WEAK tim7_isr(void);
-void WEAK sdio_isr(void);
-void WEAK tim5_isr(void);
-void WEAK spi3_isr(void);
-void WEAK uart4_isr(void);
-void WEAK uart5_isr(void);
-void WEAK dma2_ch1_isr(void);
-void WEAK dma2_ch2_isr(void);
-void WEAK dma2_ch3_isr(void);
-void WEAK dma2_ch4_isr(void);
-void WEAK dma2_ch5_isr(void);
-void WEAK aes_isr(void);
-void WEAK comp_acq_isr(void);
-
-END_DECLS
-
-/**@}*/
-
-#endif /* LIBOPENCM3_STM32_L1_NVIC_H */