patch-2.4.14 linux/include/asm-ppc/fads.h

• Lines: 84
• Date: Fri Nov 2 17:43:54 2001
• Orig file: v2.4.13/linux/include/asm-ppc/fads.h
• Orig date: Sun Sep 23 11:41:01 2001

diff -u --recursive --new-file v2.4.13/linux/include/asm-ppc/fads.h linux/include/asm-ppc/fads.h
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.fads.h 1.11 08/17/01 15:23:17 paulus
+ * BK Id: SCCS/s.fads.h 1.14 10/26/01 10:14:09 trini
  */
 
 /*
@@ -8,41 +8,33 @@
  *
  * Copyright (c) 1998 Dan Malek (dmalek@jlc.net)
  */
-#ifndef __MACH_FADS_DEFS
-#define __MACH_FADS_DEFS
+#ifdef __KERNEL__
+#ifndef __ASM_FADS_H__
+#define __ASM_FADS_H__
 
-#ifndef __ASSEMBLY__
-/* A Board Information structure that is given to a program when
- * prom starts it up.
- */
-typedef struct bd_info {
-	unsigned int	bi_memstart;	/* Memory start address */
-	unsigned int	bi_memsize;	/* Memory (end) size in bytes */
-	unsigned int	bi_intfreq;	/* Internal Freq, in Hz */
-	unsigned int	bi_busfreq;	/* Bus Freq, in Hz */
-	unsigned char	bi_enetaddr[6];
-	unsigned int	bi_baudrate;
-} bd_t;
+#include <linux/config.h>
 
-extern bd_t m8xx_board_info;
+#include <asm/ppcboot.h>
 
 /* Memory map is configured by the PROM startup.
  * I tried to follow the FADS manual, although the startup PROM
  * dictates this and we simply have to move some of the physical
  * addresses for Linux.
  */
-#define BCSR_ADDR		((uint)0xfe000000)
+#define BCSR_ADDR		((uint)0xff010000)
 #define BCSR_SIZE		((uint)(64 * 1024))
-#define	BCSR0			((uint)0xfe000000)
-#define	BCSR1			((uint)0xfe000004)
-#define	BCSR2			((uint)0xfe000008)
-#define	BCSR3			((uint)0xfe00000c)
-#define	BCSR4			((uint)0xfe000010)
-#define IMAP_ADDR		((uint)0xf0000000)
+#define	BCSR0			((uint)0xff010000)
+#define	BCSR1			((uint)0xff010004)
+#define	BCSR2			((uint)0xff010008)
+#define	BCSR3			((uint)0xff01000c)
+#define	BCSR4			((uint)0xff010010)
+
+#define IMAP_ADDR		((uint)0xff000000)
 #define IMAP_SIZE		((uint)(64 * 1024))
-#define PCMCIA_MEM_ADDR		((uint)0x04000000)
+
+#define PCMCIA_MEM_ADDR		((uint)0xff020000)
 #define PCMCIA_MEM_SIZE		((uint)(64 * 1024))
- 
+
 /* Bits of interest in the BCSRs.
  */
 #define BCSR1_ETHEN		((uint)0x20000000)
@@ -55,8 +47,7 @@
 #define BCSR4_FETHCFG1		((uint)0x00400000)	/* PHY autoneg mode */
 #define BCSR4_FETHFDE		((uint)0x02000000)	/* PHY FDX advertise */
 #define BCSR4_FETHRST		((uint)0x00200000)	/* PHY Reset */
-#endif /* !__ASSEMBLY__ */
- 
+
 /* Interrupt level assignments.
  */
 #define FEC_INTERRUPT	SIU_LEVEL1	/* FEC interrupt */
@@ -65,5 +56,6 @@
 /* We don't use the 8259.
  */
 #define NR_8259_INTS	0
- 
-#endif
+
+#endif /* __ASM_FADS_H__ */
+#endif /* __KERNEL__ */