Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / nds32 / cpu / n1213 / start.S

diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S
index 1d1fcf77e471f1ba603ea5e65ccfa806647eab2d..558fd0ee6cb478512070cc385606cb45350240c4 100644 (file)
--- a/arch/nds32/cpu/n1213/start.S
+++ b/arch/nds32/cpu/n1213/start.S
@@ -68,15 +68,17 @@ _start:     j       reset
        j       tlb_not_present
        j       tlb_misc
        j       tlb_vlpt_miss
-       j       cache_parity_error
+       j       machine_error
        j       debug
        j       general_exception
+       j       syscall
        j       internal_interrupt              ! H0I
        j       internal_interrupt              ! H1I
        j       internal_interrupt              ! H2I
        j       internal_interrupt              ! H3I
        j       internal_interrupt              ! H4I
        j       internal_interrupt              ! H5I
+       j       software_interrupt              ! S0I
 
        .balign 16
 
@@ -238,7 +240,7 @@ fix_got_loop:
 clear_bss:
        la      $r0, __bss_start        /* r0 <- rel __bss_start in FLASH */
        add     $r0, $r0, $r9           /* r0 <- rel __bss_start in FLASH */
-       la      $r1, __bss_end__        /* r1 <- rel __bss_end in RAM */
+       la      $r1, __bss_end          /* r1 <- rel __bss_end in RAM */
        add     $r1, $r1, $r9           /* r0 <- rel __bss_end in RAM */
        li      $r2, 0x00000000         /* clear */
 
@@ -477,7 +479,7 @@ tlb_vlpt_miss:
        bal     do_interruption
 
        .align  5
-cache_parity_error:
+machine_error:
        SAVE_ALL
        move    $r0, $sp                        ! To get the kernel stack
        li      $r1, 5                          ! Determine interruption type
@@ -498,12 +500,26 @@ general_exception:
        bal     do_interruption
 
        .align  5
-internal_interrupt:
+syscall:
        SAVE_ALL
        move    $r0, $sp                        ! To get the kernel stack
        li      $r1, 8                          ! Determine interruption type
        bal     do_interruption
 
+       .align  5
+internal_interrupt:
+       SAVE_ALL
+       move    $r0, $sp                        ! To get the kernel stack
+       li      $r1, 9                          ! Determine interruption type
+       bal     do_interruption
+
+       .align  5
+software_interrupt:
+       SAVE_ALL
+       move    $r0, $sp                        ! To get the kernel stack
+       li      $r1, 10                         ! Determine interruption type
+       bal     do_interruption
+
        .align  5
 
 /*