[U-Boot-Users] PATCH: Removing all these "extern void reset_cpu()"
25 Oct
2004
25 Oct
'04
4:14 p.m.
Hi there,
please consider the patch attached.
CHANGELOG:
* Patch by Steven Scholz, 25 Oct 2004: - Replace all "extern void reset_cpu()" with one occurence of "void reset_cpu (ulong addr)" in include/common.h
--
Steven Scholz
Index: cpu/arm720t/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm720t/cpu.c,v
retrieving revision 1.6
diff -p -u -r1.6 cpu.c
--- cpu/arm720t/cpu.c 1 Aug 2004 22:48:19 -0000 1.6
+++ cpu/arm720t/cpu.c 25 Oct 2004 14:03:13 -0000
@@ -84,8 +84,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
disable_interrupts ();
reset_cpu (0);
/*NOTREACHED*/
Index: cpu/arm720t/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm720t/interrupts.c,v
retrieving revision 1.6
diff -p -u -r1.6 interrupts.c
--- cpu/arm720t/interrupts.c 11 Jul 2004 22:19:27 -0000 1.6
+++ cpu/arm720t/interrupts.c 25 Oct 2004 14:03:13 -0000
@@ -31,8 +31,6 @@
#include <asm/proc-armv/ptrace.h>
#include <asm/hardware.h>
-extern void reset_cpu(ulong addr);
-
#ifndef CONFIG_NETARM
/* we always count down the max. */
#define TIMER_LOAD_VAL 0xffff
Index: cpu/arm920t/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm920t/cpu.c,v
retrieving revision 1.3
diff -p -u -r1.3 cpu.c
--- cpu/arm920t/cpu.c 8 Feb 2004 19:38:43 -0000 1.3
+++ cpu/arm920t/cpu.c 25 Oct 2004 14:03:13 -0000
@@ -124,8 +124,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
disable_interrupts ();
reset_cpu (0);
/*NOTREACHED*/
Index: cpu/arm920t/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm920t/interrupts.c,v
retrieving revision 1.6
diff -p -u -r1.6 interrupts.c
--- cpu/arm920t/interrupts.c 1 Aug 2004 22:48:19 -0000 1.6
+++ cpu/arm920t/interrupts.c 25 Oct 2004 14:03:13 -0000
@@ -34,8 +34,6 @@
#include <arm920t.h>
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu(ulong addr);
-
#ifdef CONFIG_USE_IRQ
/* enable IRQ interrupts */
void enable_interrupts (void)
Index: cpu/arm920t/s3c24x0/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm920t/s3c24x0/interrupts.c,v
retrieving revision 1.1
diff -p -u -r1.1 interrupts.c
--- cpu/arm920t/s3c24x0/interrupts.c 9 Oct 2004 22:21:30 -0000 1.1
+++ cpu/arm920t/s3c24x0/interrupts.c 25 Oct 2004 14:03:13 -0000
@@ -39,7 +39,6 @@
#include <s3c2410.h>
#endif
-extern void reset_cpu(ulong addr);
int timer_load_val = 0;
/* macro to read the 16 bit timer */
Index: cpu/arm925t/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm925t/cpu.c,v
retrieving revision 1.3
diff -p -u -r1.3 cpu.c
--- cpu/arm925t/cpu.c 8 Feb 2004 19:38:43 -0000 1.3
+++ cpu/arm925t/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -125,8 +125,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
disable_interrupts ();
reset_cpu (0);
/*NOTREACHED*/
Index: cpu/arm925t/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm925t/interrupts.c,v
retrieving revision 1.6
diff -p -u -r1.6 interrupts.c
--- cpu/arm925t/interrupts.c 25 Apr 2004 14:37:30 -0000 1.6
+++ cpu/arm925t/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -38,7 +38,6 @@
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu(ulong addr);
#define TIMER_LOAD_VAL 0xffffffff
/* macro to read the 32 bit timer */
Index: cpu/arm926ejs/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm926ejs/cpu.c,v
retrieving revision 1.3
diff -p -u -r1.3 cpu.c
--- cpu/arm926ejs/cpu.c 8 Feb 2004 19:38:43 -0000 1.3
+++ cpu/arm926ejs/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -125,8 +125,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
disable_interrupts ();
reset_cpu (0);
/*NOTREACHED*/
Index: cpu/arm926ejs/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/arm926ejs/interrupts.c,v
retrieving revision 1.7
diff -p -u -r1.7 interrupts.c
--- cpu/arm926ejs/interrupts.c 23 Mar 2004 21:43:08 -0000 1.7
+++ cpu/arm926ejs/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -40,7 +40,6 @@
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu(ulong addr);
#define TIMER_LOAD_VAL 0xffffffff
/* macro to read the 32 bit timer */
Index: cpu/at91rm9200/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/at91rm9200/cpu.c,v
retrieving revision 1.9
diff -p -u -r1.9 cpu.c
--- cpu/at91rm9200/cpu.c 10 Oct 2004 20:23:59 -0000 1.9
+++ cpu/at91rm9200/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -115,8 +115,6 @@ int do_reset (cmd_tbl_t *cmdtp, int flag
{
#ifdef CFG_SOFT_RESET
- extern void reset_cpu(ulong addr);
-
disable_interrupts();
reset_cpu(0);
#else
Index: cpu/at91rm9200/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/at91rm9200/interrupts.c,v
retrieving revision 1.6
diff -p -u -r1.6 interrupts.c
--- cpu/at91rm9200/interrupts.c 11 Oct 2004 22:25:50 -0000 1.6
+++ cpu/at91rm9200/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -35,8 +35,6 @@
#include <asm/arch/hardware.h>
#include <asm/proc/ptrace.h>
-extern void reset_cpu(ulong addr);
-
/* the number of clocks per CFG_HZ */
#define TIMER_LOAD_VAL (CFG_HZ_CLOCK/CFG_HZ)
Index: cpu/i386/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/i386/cpu.c,v
retrieving revision 1.3
diff -p -u -r1.3 cpu.c
--- cpu/i386/cpu.c 27 Jun 2003 21:32:33 -0000 1.3
+++ cpu/i386/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -50,8 +50,6 @@ int cpu_init(void)
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu(ulong addr);
-
printf ("resetting ...\n");
udelay(50000); /* wait 50 ms */
disable_interrupts();
Index: cpu/ixp/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/ixp/cpu.c,v
retrieving revision 1.2
diff -p -u -r1.2 cpu.c
--- cpu/ixp/cpu.c 8 Feb 2004 19:38:44 -0000 1.2
+++ cpu/ixp/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -76,8 +76,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */
Index: cpu/ixp/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/ixp/interrupts.c,v
retrieving revision 1.2
diff -p -u -r1.2 interrupts.c
--- cpu/ixp/interrupts.c 15 Oct 2003 23:53:51 -0000 1.2
+++ cpu/ixp/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -30,8 +30,6 @@
#include <common.h>
#include <asm/arch/ixp425.h>
-extern void reset_cpu (ulong addr);
-
#ifdef CONFIG_USE_IRQ
/* enable IRQ/FIQ interrupts */
void enable_interrupts (void)
Index: cpu/lh7a40x/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/lh7a40x/cpu.c,v
retrieving revision 1.1
diff -p -u -r1.1 cpu.c
--- cpu/lh7a40x/cpu.c 9 Jun 2004 13:37:53 -0000 1.1
+++ cpu/lh7a40x/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -124,8 +124,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
disable_interrupts ();
reset_cpu (0);
/*NOTREACHED*/
Index: cpu/lh7a40x/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/lh7a40x/interrupts.c,v
retrieving revision 1.2
diff -p -u -r1.2 interrupts.c
--- cpu/lh7a40x/interrupts.c 10 Jun 2004 21:55:34 -0000 1.2
+++ cpu/lh7a40x/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -35,7 +35,6 @@
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu(ulong addr);
static ulong timer_load_val = 0;
/* macro to read the 16 bit timer */
Index: cpu/pxa/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/pxa/cpu.c,v
retrieving revision 1.5
diff -p -u -r1.5 cpu.c
--- cpu/pxa/cpu.c 8 Feb 2004 19:38:44 -0000 1.5
+++ cpu/pxa/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -74,8 +74,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */
Index: cpu/pxa/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/pxa/interrupts.c,v
retrieving revision 1.4
diff -p -u -r1.4 interrupts.c
--- cpu/pxa/interrupts.c 9 Jun 2004 13:37:53 -0000 1.4
+++ cpu/pxa/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -29,8 +29,6 @@
#include <common.h>
#include <asm/arch/pxa-regs.h>
-extern void reset_cpu (ulong addr);
-
#ifdef CONFIG_USE_IRQ
/* enable IRQ/FIQ interrupts */
void enable_interrupts (void)
Index: cpu/s3c44b0/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/s3c44b0/cpu.c,v
retrieving revision 1.2
diff -p -u -r1.2 cpu.c
--- cpu/s3c44b0/cpu.c 17 Oct 2004 21:12:11 -0000 1.2
+++ cpu/s3c44b0/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -86,8 +86,6 @@ void reset_cpu (ulong addr)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
disable_interrupts ();
reset_cpu (0);
Index: cpu/s3c44b0/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/s3c44b0/interrupts.c,v
retrieving revision 1.1
diff -p -u -r1.1 interrupts.c
--- cpu/s3c44b0/interrupts.c 24 Feb 2004 00:16:44 -0000 1.1
+++ cpu/s3c44b0/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -29,8 +29,6 @@
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu(ulong addr);
-
/* we always count down the max. */
#define TIMER_LOAD_VAL 0xffff
Index: cpu/sa1100/cpu.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/sa1100/cpu.c,v
retrieving revision 1.3
diff -p -u -r1.3 cpu.c
--- cpu/sa1100/cpu.c 8 Feb 2004 19:38:44 -0000 1.3
+++ cpu/sa1100/cpu.c 25 Oct 2004 14:03:14 -0000
@@ -73,8 +73,6 @@ int cleanup_before_linux (void)
int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- extern void reset_cpu (ulong addr);
-
printf ("resetting ...\n");
udelay (50000); /* wait 50 ms */
Index: cpu/sa1100/interrupts.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/cpu/sa1100/interrupts.c,v
retrieving revision 1.3
diff -p -u -r1.3 interrupts.c
--- cpu/sa1100/interrupts.c 14 Mar 2004 15:20:56 -0000 1.3
+++ cpu/sa1100/interrupts.c 25 Oct 2004 14:03:14 -0000
@@ -31,8 +31,6 @@
#include <asm/proc-armv/ptrace.h>
-extern void reset_cpu (ulong addr);
-
#ifdef CONFIG_USE_IRQ
/* enable IRQ/FIQ interrupts */
void enable_interrupts (void)
Index: include/common.h
===================================================================
RCS file: /cvsroot/u-boot/u-boot/include/common.h,v
retrieving revision 1.46
diff -p -u -r1.46 common.h
--- include/common.h 10 Oct 2004 18:41:14 -0000 1.46
+++ include/common.h 25 Oct 2004 14:03:15 -0000
@@ -378,6 +378,7 @@ int checkicache (void);
int checkdcache (void);
void upmconfig (unsigned int, unsigned int *, unsigned int);
ulong get_tbclk (void);
+void reset_cpu (ulong addr);
/* $(CPU)/serial.c */
int serial_init (void);
3 Apr
3 Apr
5:58 p.m.
In message 417D0A5F.6000606@imc-berlin.de you wrote:
- Patch by Steven Scholz, 25 Oct 2004:
- Replace all "extern void reset_cpu()" with one occurence of "void reset_cpu (ulong addr)" in include/common.h
Added, thanks.
Best regards,
Wolfgang Denk
--
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
I'm what passes for a Unix guru in my office. This is a frightening
concept. - Lee Ann Goldstein, in 3k55ba$c43@butch.lmsc.lockheed.com
7338
Age (days ago)
7498
Last active (days ago)
2 comments
2 participants
participants (2)
-
Steven Scholz -
Wolfgang Denk