From owner-p4-projects@FreeBSD.ORG Sat Sep 6 18:59:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEF9F106567B; Sat, 6 Sep 2008 18:59:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B33E81065674 for ; Sat, 6 Sep 2008 18:59:47 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6DDB8FC14 for ; Sat, 6 Sep 2008 18:59:47 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m86IxlC7006559 for ; Sat, 6 Sep 2008 18:59:47 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m86IxlL3006557 for perforce@freebsd.org; Sat, 6 Sep 2008 18:59:47 GMT (envelope-from raj@freebsd.org) Date: Sat, 6 Sep 2008 18:59:47 GMT Message-Id: <200809061859.m86IxlL3006557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 149349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2008 18:59:48 -0000 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 #include -#include +#include 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 #include -#include -#include +#include +#include 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 #include -#include -#include +#include +#include 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 #include -#include -#include +#include +#include #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 #include -#include +#include #include "miibus_if.h" ==== //depot/projects/arm/src/sys/dev/uart/uart_bus_mbus.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include #include -#include +#include 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 #include -#include -#include +#include +#include #define EHCI_VENDORID_MRVL 0x1286 #define EHCI_HC_DEVSTR "88F5XXX Integrated USB 2.0 controller"