PERFORCE change 173822 for review

[Rafal Jaworowski]

http://p4web.freebsd.org/chv.cgi?CH=173822

Change 173822 by raj at raj_fdt on 2010/01/28 11:48:06

	Clean up PowerPC MPC85XX build.
	
	- Connect and disconnect files.
	- Eliminate unused #defines.

Affected files ...

.. //depot/projects/fdt/sys/conf/files.powerpc#15 edit
.. //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#3 edit

Differences ...

==== //depot/projects/fdt/sys/conf/files.powerpc#15 (text+ko) ====

@@ -32,6 +32,7 @@
 dev/cfi/cfi_bus_fdt.c		optional	cfi fdt
 dev/fb/fb.c			optional	sc
 dev/fdt/fdt_common.c		optional	fdt
+dev/fdt/fdt_powerpc.c		optional	fdt
 dev/fdt/fdtbus.c		optional	fdt
 dev/fdt/simplebus.c		optional	fdt
 dev/hwpmc/hwpmc_powerpc.c	optional	hwpmc
@@ -127,7 +128,6 @@
 powerpc/mpc85xx/lbc.c		optional	mpc85xx
 powerpc/mpc85xx/mpc85xx.c	optional	mpc85xx
 powerpc/mpc85xx/nexus.c		optional	mpc85xx
-powerpc/mpc85xx/ocpbus.c	optional	mpc85xx
 powerpc/mpc85xx/openpic_fdt.c	optional	fdt
 powerpc/mpc85xx/pci_ocp.c	optional	pci mpc85xx
 powerpc/ofw/ofw_cpu.c		optional	aim

==== //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#3 (text+ko) ====

@@ -87,40 +87,6 @@
 #define	OCP85XX_RSTCR		(CCSRBAR_VA + 0xe00b0)
 
 /*
- * OCP Bus Definitions
- */
-#define	OCP85XX_I2C0_OFF	0x03000
-#define	OCP85XX_I2C1_OFF	0x03100
-#define	OCP85XX_I2C_SIZE	0x16
-#define	OCP85XX_UART0_OFF	0x04500
-#define	OCP85XX_UART1_OFF	0x04600
-#define	OCP85XX_UART_SIZE	0x10
-#define	OCP85XX_LBC_OFF		0x05000
-#define	OCP85XX_LBC_SIZE	0x1000
-
-#define	OCP85XX_PCI0_OFF	0x0A000
-#define	OCP85XX_PCI1_OFF	0x09000
-#define	OCP85XX_PCI2_OFF	0x08000
-#if 0
-#define	OCP85XX_PCI0_OFF	0x08000
-#define	OCP85XX_PCI1_OFF	0x09000
-#define	OCP85XX_PCI2_OFF	0x0A000
-#endif
-
-#define	OCP85XX_PCI_SIZE	0x1000
-#define	OCP85XX_TSEC0_OFF	0x24000
-#define	OCP85XX_TSEC1_OFF	0x25000
-#define	OCP85XX_TSEC2_OFF	0x26000
-#define	OCP85XX_TSEC3_OFF	0x27000
-#define	OCP85XX_TSEC_SIZE	0x1000
-#define	OCP85XX_OPENPIC_OFF	0x40000
-#define	OCP85XX_OPENPIC_SIZE	0x200B4
-#define	OCP85XX_QUICC_OFF	0x80000
-#define	OCP85XX_QUICC_SIZE	0x20000
-#define	OCP85XX_SEC_OFF		0x30000
-#define	OCP85XX_SEC_SIZE	0x10000
-
-/*
  * PIC definitions
  */
 #define	ISA_IRQ_START	0