projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Move remaining CONFIG_SYS_* to CFG_SYS_*
[platform/kernel/u-boot.git]
/
arch
/
m68k
/
cpu
/
mcf530x
/
start.S
diff --git
a/arch/m68k/cpu/mcf530x/start.S
b/arch/m68k/cpu/mcf530x/start.S
index
ca8bb32
..
dbe2b54
100644
(file)
--- a/
arch/m68k/cpu/mcf530x/start.S
+++ b/
arch/m68k/cpu/mcf530x/start.S
@@
-1,19
+1,13
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Angelo Dureghello <angelo@sysam.it>
* Based on code from Bernhard Kuhn <bkuhn@metrowerks.com>
/*
* (C) Copyright 2015 Angelo Dureghello <angelo@sysam.it>
* Based on code from Bernhard Kuhn <bkuhn@metrowerks.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <asm-offsets.h>
#include <config.h>
*/
#include <asm-offsets.h>
#include <config.h>
-#include "version.h"
#include <asm/cache.h>
#include <asm/cache.h>
-#ifndef CONFIG_IDENT_STRING
-#define CONFIG_IDENT_STRING ""
-#endif
-
#define _START _start
#define _FAULT _fault
#define _START _start
#define _FAULT _fault
@@
-36,17
+30,17
@@
#if !defined(CONFIG_MONITOR_IS_IN_RAM)
.text
#if !defined(CONFIG_MONITOR_IS_IN_RAM)
.text
+
/*
/*
- *
Vector table. This is used for initial platform startup.
- *
These vectors are to catch any un-intended traps.
+ * Vector table. This is used for initial platform startup.
+ * These vectors are to catch any un-intended traps.
*/
_vectors:
*/
_vectors:
-
/* Flash offset is 0 until we setup CS0 */
.long 0x00000000
#if defined(CONFIG_M5307) && \
/* Flash offset is 0 until we setup CS0 */
.long 0x00000000
#if defined(CONFIG_M5307) && \
- (CONFIG_
SYS_TEXT_BASE == CONFI
G_SYS_INT_FLASH_BASE)
-.long _start - CONFIG_
SYS_
TEXT_BASE
+ (CONFIG_
TEXT_BASE == CF
G_SYS_INT_FLASH_BASE)
+.long _start - CONFIG_TEXT_BASE
#else
.long _START
#endif
#else
.long _START
#endif
@@
-89,33
+83,34
@@
_vectors:
#endif
#endif
- .text
- .globl _start
+.text
+
+.globl _start
_start:
nop
nop
_start:
nop
nop
- move.w #0x2700,%sr
+ move.w #0x2700,%sr
/* set MBAR address + valid flag */
/* set MBAR address + valid flag */
- move.l #(C
ONFI
G_SYS_MBAR + 1), %d0
+ move.l #(C
F
G_SYS_MBAR + 1), %d0
move.c %d0, %MBAR
move.c %d0, %MBAR
- move.l #(C
ONFI
G_SYS_INIT_RAM_ADDR + 1), %d0
+ move.l #(C
F
G_SYS_INIT_RAM_ADDR + 1), %d0
move.c %d0, %RAMBAR
/* DS 4.8.2 (Cache Organization) invalidate and disable cache */
move.c %d0, %RAMBAR
/* DS 4.8.2 (Cache Organization) invalidate and disable cache */
- move.l
#CF_CACR_CINVA, %d0
- movec
%d0, %CACR
- move.l
#0, %d0
- movec
%d0, %ACR0
- movec
%d0, %ACR1
+ move.l #CF_CACR_CINVA, %d0
+ movec %d0, %CACR
+ move.l #0, %d0
+ movec %d0, %ACR0
+ movec %d0, %ACR1
/*
* if we come from a pre-loader we have no exception table and
* therefore no VBR to set
*/
#if !defined(CONFIG_MONITOR_IS_IN_RAM)
/*
* if we come from a pre-loader we have no exception table and
* therefore no VBR to set
*/
#if !defined(CONFIG_MONITOR_IS_IN_RAM)
- move.l #C
ONFI
G_SYS_FLASH_BASE, %d0
+ move.l #C
F
G_SYS_FLASH_BASE, %d0
movec %d0, %VBR
#endif
movec %d0, %VBR
#endif
@@
-127,10
+122,10
@@
_start:
move.l %d0, (%a2)
/* put relocation table address to a5 */
move.l %d0, (%a2)
/* put relocation table address to a5 */
- move.l #__got_start, %a5
+ move.l
#__got_start, %a5
/* setup stack initially on top of internal static ram */
/* setup stack initially on top of internal static ram */
- move.l #(C
ONFIG_SYS_INIT_RAM_ADDR + CONFI
G_SYS_INIT_RAM_SIZE), %sp
+ move.l #(C
FG_SYS_INIT_RAM_ADDR + CF
G_SYS_INIT_RAM_SIZE), %sp
/*
* if configured, malloc_f arena will be reserved first,
/*
* if configured, malloc_f arena will be reserved first,
@@
-140,32
+135,32
@@
_start:
bsr board_init_f_alloc_reserve
/* update stack and frame-pointers */
bsr board_init_f_alloc_reserve
/* update stack and frame-pointers */
- move.l %d0, %sp
- move.l %sp, %fp
+ move.l %d0, %sp
+ move.l %sp, %fp
/* initialize reserved area */
/* initialize reserved area */
- move.l %d0, -(%sp)
- bsr board_init_f_init_reserve
+ move.l %d0, -(%sp)
+ bsr board_init_f_init_reserve
/* run low-level CPU init code (from flash) */
/* run low-level CPU init code (from flash) */
- bsr cpu_init_f
+ bsr
cpu_init_f
/* run low-level board init code (from flash) */
/* run low-level board init code (from flash) */
- clr.l %sp@-
- bsr board_init_f
+ clr.l %sp@-
+ bsr
board_init_f
/* board_init_f() does not return */
/* board_init_f() does not return */
-/*
--------------------------------------------------------------------------
*/
+/*
****************************************************************************
*/
/*
/*
- * 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.
*
*/
*
* This "function" does not return, instead it continues in RAM
* after relocating the monitor code.
*
*/
-
.globl
relocate_code
+
.globl
relocate_code
relocate_code:
link.w %a6,#0
move.l 8(%a6), %sp /* set new stack pointer */
relocate_code:
link.w %a6,#0
move.l 8(%a6), %sp /* set new stack pointer */
@@
-209,7
+204,8
@@
clear_bss:
*/
move.l %a0, %a1
add.l #(__got_start - CONFIG_SYS_MONITOR_BASE), %a1
*/
move.l %a0, %a1
add.l #(__got_start - CONFIG_SYS_MONITOR_BASE), %a1
- /* * fix got pointer register a5 */
+
+ /* fix got pointer register a5 */
move.l %a1,%a5
move.l %a0, %a2
move.l %a1,%a5
move.l %a0, %a2
@@
-230,39
+226,31
@@
clear_bss:
/* set parameters for board_init_r */
move.l %a0,-(%sp) /* dest_addr */
move.l %d0,-(%sp) /* gd */
/* set parameters for board_init_r */
move.l %a0,-(%sp) /* dest_addr */
move.l %d0,-(%sp) /* gd */
-#if defined(DEBUG) && (CONFIG_SYS_TEXT_BASE!=CONFIG_SYS_INT_FLASH_BASE) && \
- defined(CONFIG_SYS_HALT_BEFOR_RAM_JUMP)
- halt
-#endif
jsr (%a1)
jsr (%a1)
-/*--------------------------------------------------------------------------*/
+/******************************************************************************/
+
/* exception code */
/* exception code */
-
.globl _fault
+.globl _fault
_fault:
bra _fault
_fault:
bra _fault
-
.globl
_exc_handler
+
.globl
_exc_handler
_exc_handler:
SAVE_ALL
movel %sp,%sp@-
_exc_handler:
SAVE_ALL
movel %sp,%sp@-
- bsr exc_handler
+ bsr exc_handler
addql #4,%sp
RESTORE_ALL
addql #4,%sp
RESTORE_ALL
-
.globl
_int_handler
+
.globl
_int_handler
_int_handler:
SAVE_ALL
movel %sp,%sp@-
_int_handler:
SAVE_ALL
movel %sp,%sp@-
- bsr int_handler
+ bsr int_handler
addql #4,%sp
RESTORE_ALL
addql #4,%sp
RESTORE_ALL
-/*
--------------------------------------------------------------------------
*/
+/*
****************************************************************************
*/
- .globl version_string
-version_string:
- .ascii U_BOOT_VERSION
- .ascii " (", U_BOOT_DATE, " - ", U_BOOT_TIME, ")"
- .ascii CONFIG_IDENT_STRING, "\0"
- .align 4
+.align 4