Skip to content

Commit a0b29f1

Browse files
Qinghao Shiadbridge
Qinghao Shi
authored and
adbridge
committed
update GCC startup script to align with armcc and iar
1 parent 68114ed commit a0b29f1

File tree

3 files changed

+192
-342
lines changed

3 files changed

+192
-342
lines changed

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/device/TOOLCHAIN_GCC_ARM/startup_MPS2.S

Lines changed: 64 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -46,63 +46,38 @@ __isr_vector:
4646
.long SysTick_Handler /* SysTick Handler */
4747

4848
/* External Interrupts */
49-
.long UART0_IRQHandler /* 0: UART 0 RX and TX Combined Interrupt */
50-
.long Spare_IRQHandler /* 1: Undefined */
51-
.long UART1_IRQHandler /* 2: UART 1 RX and TX Combined Interrupt */
52-
.long APB_Slave0_IRQHandler /* 3: Reserved for APB Slave */
53-
.long APB_Slave1_IRQHandler /* 4: Reserved for APB Slave */
54-
.long RTC_IRQHandler /* 5: RTC Interrupt */
55-
.long PORT0_IRQHandler /* 6: GPIO Port 0 combined Interrupt */
56-
.long PORT1_ALL_IRQHandler /* 7: GPIO Port 1 combined Interrupt */
57-
.long TIMER0_IRQHandler /* 8: TIMER 0 Interrupt */
58-
.long TIMER1_IRQHandler /* 9: TIMER 1 Interrupt */
59-
.long DUALTIMER_IRQHandler /* 10: Dual Timer Interrupt */
60-
.long APB_Slave2_IRQHandler /* 11: Reserved for APB Slave */
61-
.long UARTOVF_IRQHandler /* 12: UART 0,1,2 Overflow Interrupt */
62-
.long APB_Slave3_IRQHandler /* 13: Reserved for APB Slave */
63-
.long RESERVED0_IRQHandler /* 14: Reserved */
64-
.long TSC_IRQHandler /* 15: Touch Screen Interrupt */
65-
.long PORT0_0_IRQHandler /* 16: GPIO Port 0 pin 0 Handler */
66-
.long PORT0_1_IRQHandler /* 17: GPIO Port 0 pin 1 Handler */
67-
.long PORT0_2_IRQHandler /* 18: GPIO Port 0 pin 2 Handler */
68-
.long PORT0_3_IRQHandler /* 19: GPIO Port 0 pin 3 Handler */
69-
.long PORT0_4_IRQHandler /* 20: GPIO Port 0 pin 4 Handler */
70-
.long PORT0_5_IRQHandler /* 21: GPIO Port 0 pin 5 Handler */
71-
.long PORT0_6_IRQHandler /* 22: GPIO Port 0 pin 6 Handler */
72-
.long PORT0_7_IRQHandler /* 23: GPIO Port 0 pin 7 Handler */
73-
.long PORT0_8_IRQHandler /* 24: GPIO Port 0 pin 8 Handler */
74-
.long PORT0_9_IRQHandler /* 25: GPIO Port 0 pin 9 Handler */
75-
.long PORT0_10_IRQHandler /* 26: GPIO Port 0 pin 10 Handler */
76-
.long PORT0_11_IRQHandler /* 27: GPIO Port 0 pin 11 Handler */
77-
.long PORT0_12_IRQHandler /* 28: GPIO Port 0 pin 12 Handler */
78-
.long PORT0_13_IRQHandler /* 29: GPIO Port 0 pin 13 Handler */
79-
.long PORT0_14_IRQHandler /* 30: GPIO Port 0 pin 14 Handler */
80-
.long PORT0_15_IRQHandler /* 31: GPIO Port 0 pin 15 Handler */
81-
.long FLASH0_IRQHandler /* 32: Reserved for Flash */
82-
.long FLASH1_IRQHandler /* 33: Reserved for Flash */
83-
.long RESERVED1_IRQHandler /* 34: Reserved */
84-
.long RESERVED2_IRQHandler /* 35: Reserved */
85-
.long RESERVED3_IRQHandler /* 36: Reserved */
86-
.long RESERVED4_IRQHandler /* 37: Reserved */
87-
.long RESERVED5_IRQHandler /* 38: Reserved */
88-
.long RESERVED6_IRQHandler /* 39: Reserved */
89-
.long RESERVED7_IRQHandler /* 40: Reserved */
90-
.long RESERVED8_IRQHandler /* 41: Reserved */
91-
.long PORT2_ALL_IRQHandler /* 42: GPIO Port 2 combined Interrupt */
92-
.long PORT3_ALL_IRQHandler /* 43: GPIO Port 3 combined Interrupt */
93-
.long TRNG_IRQHandler /* 44: Random number generator Interrupt */
94-
.long UART2_IRQHandler /* 45: UART 2 RX and TX Combined Interrupt */
95-
.long UART3_IRQHandler /* 46: UART 3 RX and TX Combined Interrupt */
96-
.long ETHERNET_IRQHandler /* 47: Ethernet interrupt t.b.a. */
97-
.long I2S_IRQHandler /* 48: I2S Interrupt */
98-
.long MPS2_SPI0_IRQHandler /* 49: SPI Interrupt (spi header) */
99-
.long MPS2_SPI1_IRQHandler /* 50: SPI Interrupt (clcd) */
100-
.long MPS2_SPI2_IRQHandler /* 51: SPI Interrupt (spi 1 ADC replacement) */
101-
.long MPS2_SPI3_IRQHandler /* 52: SPI Interrupt (spi 0 shield 0 replacement) */
102-
.long MPS2_SPI4_IRQHandler /* 53: SPI Interrupt (shield 1) */
103-
.long PORT4_ALL_IRQHandler /* 54: GPIO Port 4 combined Interrupt */
104-
.long PORT5_ALL_IRQHandler /* 55: GPIO Port 5 combined Interrupt */
105-
.long UART4_IRQHandler /* 56: UART 4 RX and TX Combined Interrupt */
49+
.long UARTRX0_Handler /* UART 0 RX Handler */
50+
.long UARTTX0_Handler /* UART 0 TX Handler */
51+
.long UARTRX1_Handler /* UART 1 RX Handler */
52+
.long UARTTX1_Handler /* UART 1 TX Handler */
53+
.long UARTRX2_Handler /* UART 2 RX Handler */
54+
.long UARTTX2_Handler /* UART 2 TX Handler */
55+
.long PORT0_COMB_Handler /* GPIO Port 0 Combined Handler */
56+
.long PORT1_COMB_Handler /* GPIO Port 1 Combined Handler */
57+
.long TIMER0_Handler /* TIMER 0 handler */
58+
.long TIMER1_Handler /* TIMER 1 handler */
59+
.long DUALTIMER_HANDLER /* Dual timer handler */
60+
.long SPI_Handler /* SPI exceptions Handler */
61+
.long UARTOVF_Handler /* UART 0,1,2 Overflow Handler */
62+
.long ETHERNET_Handler /* Ethernet Overflow Handler */
63+
.long I2S_Handler /* I2S Handler */
64+
.long TSC_Handler /* Touch Screen handler */
65+
.long PORT2_COMB_Handler /* GPIO Port 2 Combined Handler */
66+
.long PORT3_COMB_Handler /* GPIO Port 3 Combined Handler */
67+
.long UARTRX3_Handler /* UART 3 RX Handler */
68+
.long UARTTX3_Handler /* UART 3 TX Handler */
69+
.long UARTRX4_Handler /* UART 4 RX Handler */
70+
.long UARTTX4_Handler /* UART 4 TX Handler */
71+
.long ADCSPI_Handler /* SHIELD ADC SPI exceptions Handler */
72+
.long SHIELDSPI_Handler /* SHIELD SPI exceptions Handler */
73+
.long PORT0_0_Handler /* GPIO Port 0 pin 0 Handler */
74+
.long PORT0_1_Handler /* GPIO Port 0 pin 1 Handler */
75+
.long PORT0_2_Handler /* GPIO Port 0 pin 2 Handler */
76+
.long PORT0_3_Handler /* GPIO Port 0 pin 3 Handler */
77+
.long PORT0_4_Handler /* GPIO Port 0 pin 4 Handler */
78+
.long PORT0_5_Handler /* GPIO Port 0 pin 5 Handler */
79+
.long PORT0_6_Handler /* GPIO Port 0 pin 6 Handler */
80+
.long PORT0_7_Handler /* GPIO Port 0 pin 7 Handler */
10681

10782
.size __isr_vector, . - __isr_vector
10883

@@ -196,62 +171,37 @@ system_startup:
196171
.endm
197172

198173
/* External interrupts */
199-
def_irq_default_handler UART0_IRQHandler /* 0: UART 0 RX and TX Combined Interrupt */
200-
def_irq_default_handler Spare_IRQHandler /* 1: Undefined */
201-
def_irq_default_handler UART1_IRQHandler /* 2: UART 1 RX and TX Combined Interrupt */
202-
def_irq_default_handler APB_Slave0_IRQHandler /* 3: Reserved for APB Slave */
203-
def_irq_default_handler APB_Slave1_IRQHandler /* 4: Reserved for APB Slave */
204-
def_irq_default_handler RTC_IRQHandler /* 5: RTC Interrupt */
205-
def_irq_default_handler PORT0_IRQHandler /* 6: GPIO Port 0 combined Interrupt */
206-
def_irq_default_handler PORT1_ALL_IRQHandler /* 7: GPIO Port 1 combined Interrupt */
207-
def_irq_default_handler TIMER0_IRQHandler /* 8: TIMER 0 Interrupt */
208-
def_irq_default_handler TIMER1_IRQHandler /* 9: TIMER 1 Interrupt */
209-
def_irq_default_handler DUALTIMER_IRQHandler /* 10: Dual Timer Interrupt */
210-
def_irq_default_handler APB_Slave2_IRQHandler /* 11: Reserved for APB Slave */
211-
def_irq_default_handler UARTOVF_IRQHandler /* 12: UART 0,1,2 Overflow Interrupt */
212-
def_irq_default_handler APB_Slave3_IRQHandler /* 13: Reserved for APB Slave */
213-
def_irq_default_handler RESERVED0_IRQHandler /* 14: Reserved */
214-
def_irq_default_handler TSC_IRQHandler /* 15: Touch Screen Interrupt */
215-
def_irq_default_handler PORT0_0_IRQHandler /* 16: GPIO Port 0 pin 0 Handler */
216-
def_irq_default_handler PORT0_1_IRQHandler /* 17: GPIO Port 0 pin 1 Handler */
217-
def_irq_default_handler PORT0_2_IRQHandler /* 18: GPIO Port 0 pin 2 Handler */
218-
def_irq_default_handler PORT0_3_IRQHandler /* 19: GPIO Port 0 pin 3 Handler */
219-
def_irq_default_handler PORT0_4_IRQHandler /* 20: GPIO Port 0 pin 4 Handler */
220-
def_irq_default_handler PORT0_5_IRQHandler /* 21: GPIO Port 0 pin 5 Handler */
221-
def_irq_default_handler PORT0_6_IRQHandler /* 22: GPIO Port 0 pin 6 Handler */
222-
def_irq_default_handler PORT0_7_IRQHandler /* 23: GPIO Port 0 pin 7 Handler */
223-
def_irq_default_handler PORT0_8_IRQHandler /* 24: GPIO Port 0 pin 8 Handler */
224-
def_irq_default_handler PORT0_9_IRQHandler /* 25: GPIO Port 0 pin 9 Handler */
225-
def_irq_default_handler PORT0_10_IRQHandler /* 26: GPIO Port 0 pin 10 Handler */
226-
def_irq_default_handler PORT0_11_IRQHandler /* 27: GPIO Port 0 pin 11 Handler */
227-
def_irq_default_handler PORT0_12_IRQHandler /* 28: GPIO Port 0 pin 12 Handler */
228-
def_irq_default_handler PORT0_13_IRQHandler /* 29: GPIO Port 0 pin 13 Handler */
229-
def_irq_default_handler PORT0_14_IRQHandler /* 30: GPIO Port 0 pin 14 Handler */
230-
def_irq_default_handler PORT0_15_IRQHandler /* 31: GPIO Port 0 pin 15 Handler */
231-
def_irq_default_handler FLASH0_IRQHandler /* 32: Reserved for Flash */
232-
def_irq_default_handler FLASH1_IRQHandler /* 33: Reserved for Flash */
233-
def_irq_default_handler RESERVED1_IRQHandler /* 34: Reserved */
234-
def_irq_default_handler RESERVED2_IRQHandler /* 35: Reserved */
235-
def_irq_default_handler RESERVED3_IRQHandler /* 36: Reserved */
236-
def_irq_default_handler RESERVED4_IRQHandler /* 37: Reserved */
237-
def_irq_default_handler RESERVED5_IRQHandler /* 38: Reserved */
238-
def_irq_default_handler RESERVED6_IRQHandler /* 39: Reserved */
239-
def_irq_default_handler RESERVED7_IRQHandler /* 40: Reserved */
240-
def_irq_default_handler RESERVED8_IRQHandler /* 41: Reserved */
241-
def_irq_default_handler PORT2_ALL_IRQHandler /* 42: GPIO Port 2 combined Interrupt */
242-
def_irq_default_handler PORT3_ALL_IRQHandler /* 43: GPIO Port 3 combined Interrupt */
243-
def_irq_default_handler TRNG_IRQHandler /* 44: Random number generator Interrupt */
244-
def_irq_default_handler UART2_IRQHandler /* 45: UART 2 RX and TX Combined Interrupt */
245-
def_irq_default_handler UART3_IRQHandler /* 46: UART 3 RX and TX Combined Interrupt */
246-
def_irq_default_handler ETHERNET_IRQHandler /* 47: Ethernet interrupt t.b.a. */
247-
def_irq_default_handler I2S_IRQHandler /* 48: I2S Interrupt */
248-
def_irq_default_handler MPS2_SPI0_IRQHandler /* 49: SPI Interrupt (spi header) */
249-
def_irq_default_handler MPS2_SPI1_IRQHandler /* 50: SPI Interrupt (clcd) */
250-
def_irq_default_handler MPS2_SPI2_IRQHandler /* 51: SPI Interrupt (spi 1 ADC replacement) */
251-
def_irq_default_handler MPS2_SPI3_IRQHandler /* 52: SPI Interrupt (spi 0 shield 0 replacement) */
252-
def_irq_default_handler MPS2_SPI4_IRQHandler /* 53: SPI Interrupt (shield 1) */
253-
def_irq_default_handler PORT4_ALL_IRQHandler /* 54: GPIO Port 4 combined Interrupt */
254-
def_irq_default_handler PORT5_ALL_IRQHandler /* 55: GPIO Port 5 combined Interrupt */
255-
def_irq_default_handler UART4_IRQHandler /* 56: UART 4 RX and TX Combined Interrupt */
174+
def_irq_default_handler UARTRX0_Handler /* 0: UART 0 RX Handler */
175+
def_irq_default_handler UARTTX0_Handler /* 1: UART 0 TX Handler */
176+
def_irq_default_handler UARTRX1_Handler /* 2: UART 1 RX Handler */
177+
def_irq_default_handler UARTTX1_Handler /* 3: UART 1 TX Handler */
178+
def_irq_default_handler UARTRX2_Handler /* 4: UART 2 RX Handler */
179+
def_irq_default_handler UARTTX2_Handler /* 5: UART 2 TX Handler */
180+
def_irq_default_handler PORT0_COMB_Handler /* 6: GPIO Port 0 Combined Handler */
181+
def_irq_default_handler PORT1_COMB_Handler /* 7: GPIO Port 1 Combined Handler */
182+
def_irq_default_handler TIMER0_Handler /* 8: TIMER 0 handler */
183+
def_irq_default_handler TIMER1_Handler /* 9: TIMER 1 handler */
184+
def_irq_default_handler DUALTIMER_HANDLER /* 10: Dual timer handler */
185+
def_irq_default_handler SPI_Handler /* 11: SPI exceptions Handler */
186+
def_irq_default_handler UARTOVF_Handler /* 12: UART 0,1,2 Overflow Handler */
187+
def_irq_default_handler ETHERNET_Handler /* 13: Ethernet Overflow Handler */
188+
def_irq_default_handler I2S_Handler /* 14: I2S Handler */
189+
def_irq_default_handler TSC_Handler /* 15: Touch Screen handler */
190+
def_irq_default_handler PORT2_COMB_Handler /* 16: GPIO Port 2 Combined Handler */
191+
def_irq_default_handler PORT3_COMB_Handler /* 17: GPIO Port 3 Combined Handler */
192+
def_irq_default_handler UARTRX3_Handler /* 18: UART 3 RX Handler */
193+
def_irq_default_handler UARTTX3_Handler /* 19: UART 3 TX Handler */
194+
def_irq_default_handler UARTRX4_Handler /* 20: UART 4 RX Handler */
195+
def_irq_default_handler UARTTX4_Handler /* 21: UART 4 TX Handler */
196+
def_irq_default_handler ADCSPI_Handler /* 22: SHIELD ADC SPI exceptions Handler */
197+
def_irq_default_handler SHIELDSPI_Handler /* 23: SHIELD SPI exceptions Handler */
198+
def_irq_default_handler PORT0_0_Handler /* 24: GPIO Port 0 pin 0 Handler */
199+
def_irq_default_handler PORT0_1_Handler /* 25: GPIO Port 0 pin 1 Handler */
200+
def_irq_default_handler PORT0_2_Handler /* 26: GPIO Port 0 pin 2 Handler */
201+
def_irq_default_handler PORT0_3_Handler /* 27: GPIO Port 0 pin 3 Handler */
202+
def_irq_default_handler PORT0_4_Handler /* 28: GPIO Port 0 pin 4 Handler */
203+
def_irq_default_handler PORT0_5_Handler /* 29: GPIO Port 0 pin 5 Handler */
204+
def_irq_default_handler PORT0_6_Handler /* 30: GPIO Port 0 pin 6 Handler */
205+
def_irq_default_handler PORT0_7_Handler /* 31: GPIO Port 0 pin 7 Handler */
256206

257207
.end

0 commit comments

Comments
 (0)