WS cleanup: remove SPACE(s) followed by TAB

[platform/kernel/u-boot.git] / arch / nds32 / cpu / n1213 / start.S

diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S
index cf966e2..93ea5e4 100644 (file)
--- a/arch/nds32/cpu/n1213/start.S
+++ b/arch/nds32/cpu/n1213/start.S
@@ -20,7 +20,7 @@
  */
 #define ENA_DCAC               2UL
 #define DIS_DCAC               ~ENA_DCAC
-#define ICAC_MEM_KBF_ISET      (0x07)          ! I Cache sets per way
+#define ICAC_MEM_KBF_ISET      (0x07)          ! I Cache sets per way
 #define ICAC_MEM_KBF_IWAY      (0x07<<3)       ! I cache ways
 #define ICAC_MEM_KBF_ISZ       (0x07<<6)       ! I cache line size
 #define DCAC_MEM_KBF_DSET      (0x07)          ! D Cache sets per way
@@ -129,7 +129,7 @@ set_ivb:
        mfsr    $r1, $mr8
        and     $r1, $r1, $r0
        mtsr    $r1, $mr8
-#if (!defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF))
+#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
 /*
  * MMU_CTL NTC0 Cacheable/Write-Back
  */
@@ -139,7 +139,7 @@ set_ivb:
        mtsr    $r1, $mr0
 #endif
 
-#ifndef CONFIG_SYS_DCACHE_OFF
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #ifdef CONFIG_ARCH_MAP_SYSMEM
 /*
  * MMU_CTL NTC1 Non-cacheable
@@ -158,14 +158,14 @@ set_ivb:
 #endif
 #endif
 
-#if !defined(CONFIG_SYS_ICACHE_OFF)
+#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)
        li      $r0, 0x1
        mfsr    $r1, $mr8
        or      $r1, $r1, $r0
        mtsr    $r1, $mr8
 #endif
 
-#if !defined(CONFIG_SYS_DCACHE_OFF)
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
        li      $r0, 0x2
        mfsr    $r1, $mr8
        or      $r1, $r1, $r0
@@ -174,7 +174,7 @@ set_ivb:
 
        jal mem_init
 
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
+#if !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT)
        jal     lowlevel_init
 /*
  *  gp = ~VMA          for burn mode
@@ -223,7 +223,7 @@ call_board_init_f:
        j       board_init_f            ! jump to board_init_f() in lib/board.c
 
 /*
- * void relocate_code (addr_sp, gd, addr_moni)
+ * void relocate_code(addr_sp, gd, addr_moni)
  *
  * This "function" does not return, instead it continues in RAM
  * after relocating the monitor code.
@@ -434,21 +434,21 @@ tlb_fill:
        SAVE_ALL
        move    $r0, $sp                        ! To get the kernel stack
        li      $r1, 1                          ! Determine interruption type
-       bal     do_interruption
+       bal     do_interruption
 
        .align  5
 tlb_not_present:
        SAVE_ALL
        move    $r0, $sp                        ! To get the kernel stack
        li      $r1, 2                          ! Determine interruption type
-       bal     do_interruption
+       bal     do_interruption
 
        .align  5
 tlb_misc:
        SAVE_ALL
        move    $r0, $sp                        ! To get the kernel stack
        li      $r1, 3                          ! Determine interruption type
-       bal     do_interruption
+       bal     do_interruption
 
        .align  5
 tlb_vlpt_miss:
@@ -500,25 +500,3 @@ software_interrupt:
        bal     do_interruption
 
        .align  5
-
-/*
- * void reset_cpu(ulong addr);
- * $r0: input address to jump to
- */
-.globl reset_cpu
-reset_cpu:
-/* No need to disable MMU because we never enable it */
-
-       bal     invalidate_icac
-       bal     invalidate_dcac
-       mfsr    $p0, $MMU_CFG
-       andi    $p0, $p0, 0x3                   ! MMPS
-       li      $p1, 0x2                        ! TLB MMU
-       bne     $p0, $p1, 1f
-       tlbop   flushall                        ! Flush TLB
-1:
-       mfsr    $p0, MR_CAC_CTL                 ! Get the $CACHE_CTL reg
-       li      $p1, DIS_DCAC
-       and     $p0, $p0, $p1                   ! Clear the DC_EN bit
-       mtsr    $p0, MR_CAC_CTL                 ! Write back the $CACHE_CTL reg
-       br      $r0                             ! Jump to the input address