Merge tag 'u-boot-stm32-20211012' of https://source.denx.de/u-boot/custodians/u-boot-stm

[platform/kernel/u-boot.git] / arch / m68k / cpu / mcf5445x / start.S

diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
index db30b26..27bcd40 100644 (file)
--- a/arch/m68k/cpu/mcf5445x/start.S
+++ b/arch/m68k/cpu/mcf5445x/start.S
@@ -10,8 +10,6 @@
 #include <common.h>
 #include <asm-offsets.h>
 #include <config.h>
-#include <timestamp.h>
-#include "version.h"
 #include <asm/cache.h>
 
 #define _START _start
@@ -46,16 +44,16 @@ _vectors:
 
 INITSP:        .long   0                       /* Initial SP   */
 #ifdef CONFIG_CF_SBF
-INITPC:        .long   ASM_DRAMINIT            /* Initial PC   */
+INITPC:        .long   ASM_DRAMINIT            /* Initial PC   */
 #endif
 #ifdef CONFIG_SYS_NAND_BOOT
-INITPC:        .long   ASM_DRAMINIT_N          /* Initial PC   */
+INITPC:        .long   ASM_DRAMINIT_N          /* Initial PC   */
 #endif
 
 #else
 
 INITSP:        .long   0                       /* Initial SP   */
-INITPC:        .long   _START                  /* Initial PC   */
+INITPC:        .long   _START                  /* Initial PC   */
 
 #endif
 
@@ -202,10 +200,6 @@ asm_dspi_init:
        move.b  #0x80, (%a2)
 #endif
 
-#ifdef CONFIG_MCF5445x
-       move.l  #0xFC0A4063, %a0
-       move.b  #0x7F, (%a0)
-#endif
        /* Configure DSPI module */
        move.l  #0xFC05C000, %a0
        move.l  #0x80FF0C00, (%a0)      /* Master, clear TX/RX FIFO */
@@ -214,9 +208,6 @@ asm_dspi_init:
 #ifdef CONFIG_MCF5441x
        move.l  #0x3E000016, (%a0)
 #endif
-#ifdef CONFIG_MCF5445x
-       move.l  #0x3E000011, (%a0)
-#endif
 
        move.l  #0xFC05C034, %a2        /* dtfr */
        move.l  #0xFC05C03B, %a3        /* drfr */
@@ -514,7 +505,7 @@ _start:
 /******************************************************************************/
 
 /*
- * 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.
@@ -617,7 +608,4 @@ _int_handler:
 
 /******************************************************************************/
 
-.globl version_string
-version_string:
-.ascii U_BOOT_VERSION_STRING, "\0"
 .align 4