Date: Sat, 6 Sep 2008 18:59:47 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149349 for review Message-ID: <200809061859.m86IxlL3006557@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149349 Change 149349 by raj@raj_mimi on 2008/09/06 18:58:54 More reorg around Marvell SOC files. Affected files ... .. //depot/projects/arm/src/sys/arm/mv/files.mv#1 add .. //depot/projects/arm/src/sys/arm/mv/files.orion#3 delete .. //depot/projects/arm/src/sys/arm/mv/ic.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/mv_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/arm/src/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/arm/src/sys/arm/mv/obio.c#3 edit .. //depot/projects/arm/src/sys/arm/mv/orion/5x.c#2 delete .. //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/files.db88f5xxx#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion/orion.c#1 add .. //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#2 edit .. //depot/projects/arm/src/sys/arm/mv/orion_machdep.c#3 delete .. //depot/projects/arm/src/sys/arm/mv/orionreg.h#2 delete .. //depot/projects/arm/src/sys/arm/mv/orionvar.h#2 delete .. //depot/projects/arm/src/sys/arm/mv/std.mv#1 add .. //depot/projects/arm/src/sys/arm/mv/std.orion#3 delete .. //depot/projects/arm/src/sys/arm/mv/timer.c#3 edit .. //depot/projects/arm/src/sys/dev/mge/if_mge.c#3 edit .. //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#3 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_mv.c#1 add .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_orion.c#3 delete .. //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/mv/ic.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <arm/mv/orionreg.h> +#include <arm/mv/mvreg.h> struct orion_ic_softc { struct resource * ic_res[1]; ==== //depot/projects/arm/src/sys/arm/mv/obio.c#3 (text+ko) ==== @@ -37,8 +37,8 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <arm/mv/orionvar.h> -#include <arm/mv/orionreg.h> +#include <arm/mv/mvvar.h> +#include <arm/mv/mvreg.h> static void mbus_identify(driver_t *, device_t); static int mbus_probe(device_t); ==== //depot/projects/arm/src/sys/arm/mv/orion/db88f5xxx.c#2 (text+ko) ==== @@ -44,8 +44,8 @@ #include <machine/pmap.h> #include <machine/vmparam.h> -#include <arm/mv/orionreg.h> -#include <arm/mv/orionvar.h> +#include <arm/mv/mvreg.h> +#include <arm/mv/mvvar.h> const struct pmap_devmap *pmap_devmap_bootstrap_table; vm_offset_t pmap_bootstrap_lastaddr; ==== //depot/projects/arm/src/sys/arm/mv/orion/files.db88f5xxx#2 (text+ko) ==== @@ -1,4 +1,4 @@ # $FreeBSD$ -arm/mv/orion/5x.c standard +arm/mv/orion/orion.c standard arm/mv/orion/db88f5xxx.c standard ==== //depot/projects/arm/src/sys/arm/mv/orion/std.db88f5xxx#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -include "../mv/std.orion" +include "../mv/std.mv" files "../mv/orion/files.db88f5xxx" makeoptions KERNPHYSADDR=0x00400000 ==== //depot/projects/arm/src/sys/arm/mv/timer.c#3 (text+ko) ==== @@ -44,8 +44,8 @@ #include <machine/frame.h> #include <machine/intr.h> -#include <arm/mv/orionreg.h> -#include <arm/mv/orionvar.h> +#include <arm/mv/mvreg.h> +#include <arm/mv/mvvar.h> #define ORION_TIMER_TICK (get_tclk() / hz) #define INITIAL_TIMECOUNTER (0xffffffff) ==== //depot/projects/arm/src/sys/dev/mge/if_mge.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ #include <dev/mii/miivar.h> #include <dev/mge/if_mgevar.h> -#include <arm/mv/orionreg.h> +#include <arm/mv/mvreg.h> #include "miibus_if.h" ==== //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include <dev/uart/uart_bus.h> #include <dev/uart/uart_cpu.h> -#include <arm/mv/orionvar.h> +#include <arm/mv/mvvar.h> static int uart_mbus_probe(device_t dev); ==== //depot/projects/arm/src/sys/dev/usb/ehci_mbus.c#3 (text+ko) ==== @@ -59,8 +59,8 @@ #include <dev/usb/ehcireg.h> #include <dev/usb/ehcivar.h> -#include <arm/mv/orionreg.h> -#include <arm/mv/orionvar.h> +#include <arm/mv/mvreg.h> +#include <arm/mv/mvvar.h> #define EHCI_VENDORID_MRVL 0x1286 #define EHCI_HC_DEVSTR "88F5XXX Integrated USB 2.0 controller"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809061859.m86IxlL3006557>