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>
master
Benoît Thébaudeau 11 years ago committed by Albert ARIBAUD
parent 508611bcb7
commit 959eaa74b8
  1. 4
      arch/arm/cpu/arm1136/start.S
  2. 4
      arch/arm/cpu/arm1176/start.S
  3. 4
      arch/arm/cpu/arm720t/start.S
  4. 4
      arch/arm/cpu/arm920t/start.S
  5. 4
      arch/arm/cpu/arm925t/start.S
  6. 4
      arch/arm/cpu/arm926ejs/start.S
  7. 4
      arch/arm/cpu/arm946es/start.S
  8. 4
      arch/arm/cpu/arm_intcm/start.S
  9. 4
      arch/arm/cpu/armv7/start.S
  10. 4
      arch/arm/cpu/ixp/start.S
  11. 4
      arch/arm/cpu/pxa/start.S
  12. 4
      arch/arm/cpu/s3c44b0/start.S
  13. 4
      arch/arm/cpu/sa1100/start.S
  14. 6
      include/common.h

@ -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:

@ -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:

@ -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:

@ -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:

@ -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:

@ -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:

@ -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:

@ -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:

@ -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 */

@ -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:

@ -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:

@ -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:

@ -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:

@ -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) || \

Loading…
Cancel
Save