leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: relocate_code() is no longer noreturn

Browse Source 
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:
Benoît Thébaudeau 2013-04-11 09:35:43 +00:00 committed by Albert ARIBAUD
parent 508611bcb7
commit 959eaa74b8
14 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/arm1136/start.S
View File

@ -176,9 +176,7 @@ next:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm1176/start.S
View File

@ -239,9 +239,7 @@ skip_tcmdisable:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm720t/start.S
View File

@ -154,9 +154,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm920t/start.S
View File

@ -193,9 +193,7 @@ copyex:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm925t/start.S
View File

@ -183,9 +183,7 @@ poll1:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm926ejs/start.S
View File

@ -200,9 +200,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm946es/start.S
View File

@ -158,9 +158,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/arm_intcm/start.S
View File

@ -154,9 +154,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/armv7/start.S
View File

@ -167,9 +167,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
ENTRY(relocate_code)
mov r4, r0 /* save addr_sp */

4
arch/arm/cpu/ixp/start.S
View File

@ -256,9 +256,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/pxa/start.S
View File

@ -171,9 +171,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/s3c44b0/start.S
View File

@ -139,9 +139,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

4
arch/arm/cpu/sa1100/start.S
View File

@ -143,9 +143,7 @@ reset:
/*
* 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 relocates the monitor code.
*/
.globl relocate_code
relocate_code:

6
include/common.h
View File

@ -530,7 +530,11 @@ int dcache_status (void);
void dcache_enable (void);
void dcache_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);
void trap_init (ulong);
#if defined (CONFIG_4xx) || \