Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24849/arch/ppc/boot/simple
Modified Files:
embed_config.c misc-embedded.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: embed_config.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/embed_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- embed_config.c 14 Feb 2004 17:50:21 -0000 1.2
+++ embed_config.c 25 Apr 2004 18:57:10 -0000 1.3
@@ -17,10 +17,12 @@
#include <asm/mpc8260.h>
#include <asm/immap_8260.h>
#endif
+#ifdef CONFIG_6xx
+#include <asm/ppc6xx.h>
+#endif
#ifdef CONFIG_40x
#include <asm/io.h>
#endif
-#include <asm/processor.h>
extern unsigned long timebase_period_ns;
/* For those boards that don't provide one.
@@ -902,18 +904,23 @@
#endif
#ifdef CONFIG_GAMECUBE
+/*
+ * We're the only 7xx board without a rom monitor, yet. This
+ * should suffice until we have one (uBoot, here we come ...)
+ */
void
embed_config(bd_t **bdp)
{
- bd_t *bd;
- bd = &bdinfo;
- *bdp = bd;
- bd->bi_memsize = 24 * 1024 * 1024;
- bd->bi_tbfreq = 200 * 1000 * 1000;
- bd->bi_intfreq = 200000000;
- bd->bi_busfreq = 100000000;
- timebase_period_ns = 1000000000 / bd->bi_tbfreq;
+ bd_t *bd;
+
+ bd = &bdinfo;
+ *bdp = bd;
+
+ bd->bi_memsize = 24 * 1024 * 1024;
+ bd->bi_tbfreq = 200 * 1000 * 1000;
+ bd->bi_intfreq = 200000000;
+ bd->bi_busfreq = 100000000;
+ timebase_period_ns = 1000000000 / bd->bi_tbfreq;
}
#endif
-
Index: misc-embedded.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/misc-embedded.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- misc-embedded.c 23 Jan 2004 03:26:19 -0000 1.1.1.1
+++ misc-embedded.c 25 Apr 2004 18:57:11 -0000 1.2
@@ -16,12 +16,13 @@
#include <asm/residual.h>
#if defined(CONFIG_4xx)
#include <asm/ibm4xx.h>
+#elif defined(CONFIG_6xx)
+#include <asm/ppc6xx.h>
#elif defined(CONFIG_8xx)
#include <asm/mpc8xx.h>
#elif defined(CONFIG_8260)
#include <asm/mpc8260.h>
#endif
-#include <asm/processor.h>
#include "nonstdio.h"
#include "zlib.h"
@@ -80,7 +81,7 @@
char *cp, ch;
int timer = 0, zimage_size;
unsigned long initrd_size;
-
+
/* First, capture the embedded board information. Then
* initialize the serial console port.
*/
|
