diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-03-07 14:32:42 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-03-08 15:36:54 +0100 |
| commit | 2433a8ab1c451e47f39c3414ad1e46074b6b7607 (patch) | |
| tree | 2a555dfde1d58ae3e49a409f4830fff8cdef8229 /c/src/lib/libbsp/arm/csb336 | |
| parent | bsp/qoriq: Fix memory configuration (diff) | |
| download | rtems-2433a8ab1c451e47f39c3414ad1e46074b6b7607.tar.bz2 | |
arm: Remove legacy execption support
Diffstat (limited to 'c/src/lib/libbsp/arm/csb336')
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/start/start.S | 55 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb336/startup/bspstart.c | 6 |
3 files changed, 31 insertions, 32 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index 27d159f3c9..09bc3582cd 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -38,8 +38,6 @@ libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c # console libbsp_a_SOURCES += console/uart.c -# abort -libbsp_a_SOURCES += ../shared/abort/abort.c # IRQ include_bsp_HEADERS += ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h diff --git a/c/src/lib/libbsp/arm/csb336/start/start.S b/c/src/lib/libbsp/arm/csb336/start/start.S index 1935ded76a..ce452f52a2 100644 --- a/c/src/lib/libbsp/arm/csb336/start/start.S +++ b/c/src/lib/libbsp/arm/csb336/start/start.S @@ -132,28 +132,35 @@ _hang: b _hang * of 16 words (64 bytes) */ vector_block: - ldr pc, Reset_Handler - ldr pc, Undefined_Handler - ldr pc, SWI_Handler - ldr pc, Prefetch_Handler - ldr pc, Abort_Handler + ldr pc, handler_addr_reset + ldr pc, handler_addr_undef + ldr pc, handler_addr_swi + ldr pc, handler_addr_prefetch + ldr pc, handler_addr_abort nop - ldr pc, IRQ_Handler - ldr pc, FIQ_Handler - -Reset_Handler: b bsp_reset -Undefined_Handler: b Undefined_Handler -SWI_Handler: b SWI_Handler -Prefetch_Handler: b Prefetch_Handler -Abort_Handler: b Abort_Handler - nop -IRQ_Handler: b IRQ_Handler -FIQ_Handler: b FIQ_Handler - -.globl Reset_Handler -.globl Undefined_Handler -.globl SWI_Handler -.globl Prefetch_Handler -.globl Abort_Handler -.globl IRQ_Handler -.globl FIQ_Handler + ldr pc, handler_addr_irq + ldr pc, handler_addr_fiq + +handler_addr_reset: + .word bsp_reset + +handler_addr_undef: + .word _ARMV4_Exception_undef_default + +handler_addr_swi: + .word _ARMV4_Exception_swi_default + +handler_addr_prefetch: + .word _ARMV4_Exception_pref_abort_default + +handler_addr_abort: + .word _ARMV4_Exception_data_abort_default + +handler_addr_reserved: + .word _ARMV4_Exception_reserved_default + +handler_addr_irq: + .word _ARMV4_Exception_interrupt + +handler_addr_fiq: + .word _ARMV4_Exception_fiq_default diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c index 0a134ba162..8970dfbe4a 100644 --- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c @@ -55,12 +55,6 @@ static void bsp_start_default( void ) MC9328MXL_AITC_NIMASK = 0x1f; /* - * Init rtems exceptions management - */ - /* FIXME: Use shared start.S */ - rtems_exception_init_mngt(); - - /* * Init rtems interrupt management */ bsp_interrupt_initialize(); |