[Gc-linux-cvs] linux/arch/ppc/platforms gamecube.c,1.14,1.15 gamecube.h,1.4,1.5 gamecube_pic.c,1.1,1.2

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24849/arch/ppc/platforms

Modified Files:
	gamecube.c gamecube.h gamecube_pic.c 
Log Message:
Futzing with include/asm-ppc/processor.h broke build dependencies;
almost half of the tree was being re-built just by touching, for
example, arch/ppc/platforms/gamecube.c.

This kills off include/asm-ppc/processor.h while consolidating things
into include/asm-ppc/ppc{6xx,boot}.h until we have a ROM monitor ...

cvs -d:pserver:ano...@cv...:/cvsroot/u-boot/ co u-boot ;)


Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gamecube.c	17 Apr 2004 08:55:01 -0000	1.14
+++ gamecube.c	25 Apr 2004 18:57:12 -0000	1.15
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 
 #include "console.h"
+#include "gamecube.h"
 
 
 extern void gamecube_init_IRQ(void);

Index: gamecube.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gamecube.h	8 Mar 2004 23:19:06 -0000	1.4
+++ gamecube.h	25 Apr 2004 18:57:28 -0000	1.5
@@ -17,26 +17,11 @@
  * or implied.
  */
 
-#ifdef __KERNEL__
-#ifndef __ASM_GAMECUBE_H__
-#define __ASM_GAMECUBE_H__
+#ifndef __MACH_GAMECUBE_H
+#define __MACH_GAMECUBE_H
 
-#ifndef __ASSEMBLY__
-typedef struct board_info {
-	unsigned char	bi_s_version[4];	/* Version of this structure */
-	unsigned char	bi_r_version[30];	/* Version of the IBM ROM */
-	unsigned int	bi_memsize;		/* DRAM installed, in bytes */
-	unsigned int	bi_dummy;		/* field shouldn't exist */
-	unsigned char	bi_enetaddr[6];		/* Ethernet MAC address */
-	unsigned int	bi_intfreq;		/* Processor speed, in Hz */
-	unsigned int	bi_busfreq;		/* Bus speed, in Hz */
-	unsigned int	bi_tbfreq;		/* Software timebase freq */
-	unsigned int	bi_opb_busfreq;		/* OPB Bus speed, in Hz */
-	int		bi_iic_fast[2];		/* Use fast i2c mode */
-} bd_t;
-#endif /* !__ASSEMBLY__ */
+#include <asm/ppcboot.h>
 
-#define BASE_BAUD		(378000000 / 18 / 16)
 
 #define GAMECUBE_PIIC 0xcc003000 /* PI interrupt cause */
 #define GAMECUBE_PIIM 0xcc003004 /* PI interrupt mask */
@@ -57,5 +42,4 @@
 
 #define GAMECUBE_IRQS 14
 
-#endif /* __ASM_GAMECUBE_H__ */
-#endif /* __KERNEL__ */
+#endif /* !__MACH_GAMECUBE_H */

Index: gamecube_pic.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube_pic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gamecube_pic.c	26 Feb 2004 21:20:10 -0000	1.1
+++ gamecube_pic.c	25 Apr 2004 18:57:28 -0000	1.2
@@ -11,6 +11,8 @@
 
 #include <asm/io.h>
 
+#include "gamecube.h"
+
 
 static void gamecube_mask_and_ack_irq(unsigned int irq)
 {