aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/SAM7S256/Include
diff options
context:
space:
mode:
Diffstat (limited to 'AT91SAM7S256/SAM7S256/Include')
-rw-r--r--AT91SAM7S256/SAM7S256/Include/Cstartup.S11
-rw-r--r--AT91SAM7S256/SAM7S256/Include/sam7s256.c4
2 files changed, 13 insertions, 2 deletions
diff --git a/AT91SAM7S256/SAM7S256/Include/Cstartup.S b/AT91SAM7S256/SAM7S256/Include/Cstartup.S
index e3e996e..8a6a540 100644
--- a/AT91SAM7S256/SAM7S256/Include/Cstartup.S
+++ b/AT91SAM7S256/SAM7S256/Include/Cstartup.S
@@ -136,11 +136,20 @@ FIQ_Handler_Entry:
/* end of fiqhandler */
Reset_Addr: .word InitReset
+#ifdef ARMDEBUG
Undef_Addr: .word undef_handler /* BKPT instruction trap */
+#else
+Undef_Addr: .word Undef_Handler
+#endif
SWI_Addr: .word SWI_Handler
/*SWI_Addr: .word SoftwareInterruptASM*/ /*in swi_handler.S */
+#ifdef ARMDEBUG
PAbt_Addr: .word prefetch_abort_handler
DAbt_Addr: .word data_abort_handler
+#else
+PAbt_Addr: .word PAbt_Handler
+DAbt_Addr: .word DAbt_Handler
+#endif
IRQ_Addr: .word IRQ_Handler_Entry
.global default_undef_handler
@@ -271,9 +280,11 @@ already_remapped:
//*-------------------------------*/
mov r0, sp /* see (**) */
+#ifdef ARMDEBUG
/*- Set up Abort Mode Stack for Debugger*/
msr CPSR_c, #ARM_MODE_ABT | I_BIT | F_BIT
ldr sp, =__abort_stack_top__
+#endif
/*- Set up Fast Interrupt Mode and set FIQ Mode Stack*/
msr CPSR_c, #ARM_MODE_FIQ | I_BIT | F_BIT
diff --git a/AT91SAM7S256/SAM7S256/Include/sam7s256.c b/AT91SAM7S256/SAM7S256/Include/sam7s256.c
index 8ff0ab4..b2657d5 100644
--- a/AT91SAM7S256/SAM7S256/Include/sam7s256.c
+++ b/AT91SAM7S256/SAM7S256/Include/sam7s256.c
@@ -11,7 +11,7 @@
//
// Platform C
//
-#ifdef __ARMDEBUG__
+#ifdef ARMDEBUG
#include "debug_stub.h"
#endif
@@ -21,7 +21,7 @@ void main(void)
{
HARDWAREInit;
mSchedInit();
-#ifdef __ARMDEBUG__
+#ifdef ARMDEBUG
dbg__bkpt_init();
#endif
while(TRUE == mSchedCtrl())