Patch by Steven Scholz, 25 Oct 2004:

Declare reset_cpu() in include/common.h instead locally
This commit is contained in:
wdenk 2005-04-03 17:23:39 +00:00
parent 756f586a73
commit 3ec924a3cb
26 changed files with 4 additions and 43 deletions

View File

@ -2,6 +2,9 @@
Changes for U-Boot 1.1.3: Changes for U-Boot 1.1.3:
====================================================================== ======================================================================
* Patch by Steven Scholz, 25 Oct 2004:
Declare reset_cpu() in include/common.h instead locally
* Patch by Yusdi Santoso, 22 Oct 2004: * Patch by Yusdi Santoso, 22 Oct 2004:
- Add support for HIDDEN_DRAGON board - Add support for HIDDEN_DRAGON board
- fix endianess problem in driver/rtl1839.c - fix endianess problem in driver/rtl1839.c

View File

@ -131,8 +131,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);
/*NOTREACHED*/ /*NOTREACHED*/

View File

@ -35,7 +35,6 @@
#include <asm/arch/omap2420.h> #include <asm/arch/omap2420.h>
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu(ulong addr);
#define TIMER_LOAD_VAL 0 #define TIMER_LOAD_VAL 0
/* macro to read the 32 bit timer */ /* macro to read the 32 bit timer */

View File

@ -84,8 +84,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);
/*NOTREACHED*/ /*NOTREACHED*/

View File

@ -31,8 +31,6 @@
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
#include <asm/hardware.h> #include <asm/hardware.h>
extern void reset_cpu(ulong addr);
#ifndef CONFIG_NETARM #ifndef CONFIG_NETARM
/* we always count down the max. */ /* we always count down the max. */
#define TIMER_LOAD_VAL 0xffff #define TIMER_LOAD_VAL 0xffff

View File

@ -124,8 +124,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);
/*NOTREACHED*/ /*NOTREACHED*/

View File

@ -34,8 +34,6 @@
#include <arm920t.h> #include <arm920t.h>
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu(ulong addr);
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
/* enable IRQ interrupts */ /* enable IRQ interrupts */
void enable_interrupts (void) void enable_interrupts (void)

View File

@ -39,7 +39,6 @@
#include <s3c2410.h> #include <s3c2410.h>
#endif #endif
extern void reset_cpu(ulong addr);
int timer_load_val = 0; int timer_load_val = 0;
/* macro to read the 16 bit timer */ /* macro to read the 16 bit timer */

View File

@ -125,8 +125,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);
/*NOTREACHED*/ /*NOTREACHED*/

View File

@ -38,7 +38,6 @@
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu(ulong addr);
#define TIMER_LOAD_VAL 0xffffffff #define TIMER_LOAD_VAL 0xffffffff
/* macro to read the 32 bit timer */ /* macro to read the 32 bit timer */

View File

@ -125,8 +125,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);
/*NOTREACHED*/ /*NOTREACHED*/

View File

@ -40,7 +40,6 @@
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu(ulong addr);
#define TIMER_LOAD_VAL 0xffffffff #define TIMER_LOAD_VAL 0xffffffff
/* macro to read the 32 bit timer */ /* macro to read the 32 bit timer */

View File

@ -115,8 +115,6 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
#ifdef CFG_SOFT_RESET #ifdef CFG_SOFT_RESET
extern void reset_cpu(ulong addr);
disable_interrupts(); disable_interrupts();
reset_cpu(0); reset_cpu(0);
#else #else

View File

@ -35,8 +35,6 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/proc/ptrace.h> #include <asm/proc/ptrace.h>
extern void reset_cpu(ulong addr);
/* the number of clocks per CFG_HZ */ /* the number of clocks per CFG_HZ */
#define TIMER_LOAD_VAL (CFG_HZ_CLOCK/CFG_HZ) #define TIMER_LOAD_VAL (CFG_HZ_CLOCK/CFG_HZ)

View File

@ -50,8 +50,6 @@ int cpu_init(void)
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu(ulong addr);
printf ("resetting ...\n"); printf ("resetting ...\n");
udelay(50000); /* wait 50 ms */ udelay(50000); /* wait 50 ms */
disable_interrupts(); disable_interrupts();

View File

@ -76,8 +76,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
printf ("resetting ...\n"); printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */ udelay (50000); /* wait 50 ms */

View File

@ -30,8 +30,6 @@
#include <common.h> #include <common.h>
#include <asm/arch/ixp425.h> #include <asm/arch/ixp425.h>
extern void reset_cpu (ulong addr);
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
/* enable IRQ/FIQ interrupts */ /* enable IRQ/FIQ interrupts */
void enable_interrupts (void) void enable_interrupts (void)

View File

@ -124,8 +124,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);
/*NOTREACHED*/ /*NOTREACHED*/

View File

@ -35,7 +35,6 @@
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu(ulong addr);
static ulong timer_load_val = 0; static ulong timer_load_val = 0;
/* macro to read the 16 bit timer */ /* macro to read the 16 bit timer */

View File

@ -74,8 +74,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
printf ("resetting ...\n"); printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */ udelay (50000); /* wait 50 ms */

View File

@ -29,8 +29,6 @@
#include <common.h> #include <common.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
extern void reset_cpu (ulong addr);
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
/* enable IRQ/FIQ interrupts */ /* enable IRQ/FIQ interrupts */
void enable_interrupts (void) void enable_interrupts (void)

View File

@ -86,8 +86,6 @@ void reset_cpu (ulong addr)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
disable_interrupts (); disable_interrupts ();
reset_cpu (0); reset_cpu (0);

View File

@ -29,8 +29,6 @@
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu(ulong addr);
/* we always count down the max. */ /* we always count down the max. */
#define TIMER_LOAD_VAL 0xffff #define TIMER_LOAD_VAL 0xffff

View File

@ -73,8 +73,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern void reset_cpu (ulong addr);
printf ("resetting ...\n"); printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */ udelay (50000); /* wait 50 ms */

View File

@ -31,8 +31,6 @@
#include <asm/proc-armv/ptrace.h> #include <asm/proc-armv/ptrace.h>
extern void reset_cpu (ulong addr);
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
/* enable IRQ/FIQ interrupts */ /* enable IRQ/FIQ interrupts */
void enable_interrupts (void) void enable_interrupts (void)

View File

@ -383,6 +383,7 @@ int checkicache (void);
int checkdcache (void); int checkdcache (void);
void upmconfig (unsigned int, unsigned int *, unsigned int); void upmconfig (unsigned int, unsigned int *, unsigned int);
ulong get_tbclk (void); ulong get_tbclk (void);
void reset_cpu (ulong addr);
/* $(CPU)/serial.c */ /* $(CPU)/serial.c */
int serial_init (void); int serial_init (void);