PERFORCE change 149348 for review

[Rafal Jaworowski]

http://perforce.freebsd.org/chv.cgi?CH=149348

Change 149348 by raj at raj_mimi on 2008/09/06 18:31:39

	Reorg Marvell SOC directory layout to better accomodate many chip
	variations.
	
	Step 2/2 (DB-88F5XXX RECOVERED)

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#3 edit
.. //depot/projects/arm/src/sys/arm/mv/5x/5x.c#2 delete
.. //depot/projects/arm/src/sys/arm/mv/5x/db88f5xxx.c#2 delete
.. //depot/projects/arm/src/sys/arm/mv/5x/files.db88f5xxx#2 delete
.. //depot/projects/arm/src/sys/arm/mv/5x/std.db88f5xxx#2 delete
.. //depot/projects/arm/src/sys/arm/mv/files.orion#2 edit
.. //depot/projects/arm/src/sys/arm/mv/ic.c#2 edit
.. //depot/projects/arm/src/sys/arm/mv/obio.c#2 edit
.. //depot/projects/arm/src/sys/arm/mv/orion/5x.c#1 add
.. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#1 add
.. //depot/projects/arm/src/sys/arm/mv/orion/files.db88f5xxx#1 add
.. //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#1 add
.. //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#2 edit
.. //depot/projects/arm/src/sys/arm/mv/std.orion#2 edit
.. //depot/projects/arm/src/sys/arm/mv/timer.c#2 edit
.. //depot/projects/arm/src/sys/dev/mge/if_mge.c#2 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#2 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#2 edit
.. //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/DB-88F5XXX#3 (text+ko) ====

@@ -6,7 +6,7 @@
 
 machine		arm
 ident		DB-88F5XXX
-include		"../orion/5x/std.db88f5xxx"
+include		"../mv/orion/std.db88f5xxx"
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

==== //depot/projects/arm/src/sys/arm/mv/files.orion#2 (text+ko) ====

@@ -18,11 +18,11 @@
 arm/arm/cpufunc_asm_armv5_ec.S	standard
 arm/arm/irq_dispatch.S		standard
 
-arm/orion/bus_space.c		standard
-arm/orion/ic.c			standard
-arm/orion/obio.c		standard
-arm/orion/orion_machdep.c	standard
-arm/orion/timer.c		standard
+arm/mv/bus_space.c		standard
+arm/mv/ic.c			standard
+arm/mv/obio.c			standard
+arm/mv/orion_machdep.c		standard
+arm/mv/timer.c			standard
 
 dev/mge/if_mge.c		optional	mge
 dev/uart/uart_bus_mbus.c	optional	uart

==== //depot/projects/arm/src/sys/arm/mv/ic.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-#include <arm/orion/orionreg.h>
+#include <arm/mv/orionreg.h>
 
 struct orion_ic_softc {
 	struct resource	*	ic_res[1];

==== //depot/projects/arm/src/sys/arm/mv/obio.c#2 (text+ko) ====

@@ -37,8 +37,8 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-#include <arm/orion/orionvar.h>
-#include <arm/orion/orionreg.h>
+#include <arm/mv/orionvar.h>
+#include <arm/mv/orionreg.h>
 
 static void	mbus_identify(driver_t *, device_t);
 static int	mbus_probe(device_t);

==== //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#2 (text+ko) ====

@@ -84,7 +84,7 @@
 #include <machine/bus.h>
 #include <sys/reboot.h>
 
-#include <arm/orion/orionvar.h>	/* XXX eventually this should be eliminated */
+#include <arm/mv/orionvar.h>	/* XXX eventually this should be eliminated */
 
 #define KERNEL_PT_SYS	0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERN	1

==== //depot/projects/arm/src/sys/arm/mv/std.orion#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-files		"../orion/files.orion"
+files		"../mv/files.orion"
 cpu		CPU_ARM9E
 makeoptions	CONF_CFLAGS="-march=armv5te"

==== //depot/projects/arm/src/sys/arm/mv/timer.c#2 (text+ko) ====

@@ -44,8 +44,8 @@
 #include <machine/frame.h>
 #include <machine/intr.h>
 
-#include <arm/orion/orionreg.h>
-#include <arm/orion/orionvar.h>
+#include <arm/mv/orionreg.h>
+#include <arm/mv/orionvar.h>
 
 #define ORION_TIMER_TICK	(get_tclk() / hz)
 #define INITIAL_TIMECOUNTER	(0xffffffff)

==== //depot/projects/arm/src/sys/dev/mge/if_mge.c#2 (text+ko) ====

@@ -61,7 +61,7 @@
 #include <dev/mii/miivar.h>
 
 #include <dev/mge/if_mgevar.h>
-#include <arm/orion/orionreg.h>
+#include <arm/mv/orionreg.h>
 
 #include "miibus_if.h"
 

==== //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#2 (text+ko) ====

@@ -47,7 +47,7 @@
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/orion/orionvar.h>
+#include <arm/mv/orionvar.h>
 
 static int uart_mbus_probe(device_t dev);
 

==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#2 (text+ko) ====

@@ -44,8 +44,8 @@
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/orion/orionreg.h>
-#include <arm/orion/orionvar.h>
+#include <arm/mv/orionreg.h>
+#include <arm/mv/orionvar.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;

==== //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#2 (text+ko) ====

@@ -59,8 +59,8 @@
 #include <dev/usb/ehcireg.h>
 #include <dev/usb/ehcivar.h>
 
-#include <arm/orion/orionreg.h>
-#include <arm/orion/orionvar.h>
+#include <arm/mv/orionreg.h>
+#include <arm/mv/orionvar.h>
 
 #define EHCI_VENDORID_MRVL	0x1286
 #define EHCI_HC_DEVSTR		"88F5XXX Integrated USB 2.0 controller"