mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
arm: relocate_code() is no longer noreturn
Commit e05e5de7fa
made ARM's relocate_code()
return to its caller, but it did not update its declaration accordingly.
Fixing this function declaration fixes dropped C code following calls to
relocate_code().
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
This commit is contained in:
parent
508611bcb7
commit
959eaa74b8
14 changed files with 18 additions and 40 deletions
|
@ -176,9 +176,7 @@ next:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -239,9 +239,7 @@ skip_tcmdisable:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -154,9 +154,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -193,9 +193,7 @@ copyex:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -183,9 +183,7 @@ poll1:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -200,9 +200,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -158,9 +158,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -154,9 +154,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -167,9 +167,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
ENTRY(relocate_code)
|
ENTRY(relocate_code)
|
||||||
mov r4, r0 /* save addr_sp */
|
mov r4, r0 /* save addr_sp */
|
||||||
|
|
|
@ -256,9 +256,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -171,9 +171,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -139,9 +139,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -143,9 +143,7 @@ reset:
|
||||||
/*
|
/*
|
||||||
* 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
|
* This function relocates the monitor code.
|
||||||
* after relocating the monitor code.
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
.globl relocate_code
|
.globl relocate_code
|
||||||
relocate_code:
|
relocate_code:
|
||||||
|
|
|
@ -530,7 +530,11 @@ int dcache_status (void);
|
||||||
void dcache_enable (void);
|
void dcache_enable (void);
|
||||||
void dcache_disable(void);
|
void dcache_disable(void);
|
||||||
void mmu_disable(void);
|
void mmu_disable(void);
|
||||||
void relocate_code (ulong, gd_t *, ulong) __attribute__ ((noreturn));
|
void relocate_code(ulong, gd_t *, ulong)
|
||||||
|
#if !defined(CONFIG_ARM)
|
||||||
|
__attribute__ ((noreturn))
|
||||||
|
#endif
|
||||||
|
;
|
||||||
ulong get_endaddr (void);
|
ulong get_endaddr (void);
|
||||||
void trap_init (ulong);
|
void trap_init (ulong);
|
||||||
#if defined (CONFIG_4xx) || \
|
#if defined (CONFIG_4xx) || \
|
||||||
|
|
Loading…
Add table
Reference in a new issue