PERFORCE change 110283 for review
Warner Losh
imp at FreeBSD.org
Tue Nov 21 17:25:05 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=110283
Change 110283 by imp at imp_paco-paco on 2006/11/20 06:36:53
Bring in the most trivial diffs
Affected files ...
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#13 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#9 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#9 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#26 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#10 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#8 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#4 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#20 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#3 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#4 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#5 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_intr.h#3 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#9 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#8 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#17 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#3 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#10 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#3 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#5 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_timer.c#5 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_wdog.c#4 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#8 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#9 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/std.avila#3 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/std.ixp425#4 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#7 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#5 edit
Differences ...
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* Compact Flash Support for the Avila Gateworks XScale boards.
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_machdep.c#9 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#9 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $
arm/arm/cpufunc_asm_xscale.S standard
arm/arm/irq_dispatch.S standard
arm/xscale/ixp425/ixp425.c standard
@@ -16,7 +16,8 @@
arm/xscale/ixp425/ixp425_a4x_io.S optional uart
dev/uart/uart_dev_ns8250.c optional uart
#
-# NPE-based Ethernet support (requires qmgr also)
+# NPE-based Ethernet support (requires qmgr also). Note the
+# firmware images must be downloaded from the Intel web site.
#
arm/xscale/ixp425/if_npe.c optional npe
arm/xscale/ixp425/ixp425_npe.c optional npe
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#26 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -1668,5 +1668,6 @@
DRIVER_MODULE(npe, ixp, npe_driver, npe_devclass, 0, 0);
DRIVER_MODULE(miibus, npe, miibus_driver, miibus_devclass, 0, 0);
+MODULE_DEPEND(npe, ixpqmgr, 1, 1, 1);
MODULE_DEPEND(npe, miibus, 1, 1, 1);
MODULE_DEPEND(npe, ether, 1, 1, 1);
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npereg.h#10 (text+ko) ====
@@ -25,6 +25,8 @@
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * $FreeBSD: src/sys/arm/xscale/ixp425/if_npereg.h,v 1.1 2006/11/19 23:55:23 sam Exp $
*/
/*
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425_pci.c#8 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixdp425_pci.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixdp425reg.h#4 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/arm/xscale/ixp425/ixdp425reg.h,v 1.1 2006/11/19 23:55:23 sam Exp $ */
#ifndef _IXDP425REG_H_
#define _IXDP425REG_H_
/* GPIOs */
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#20 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#3 (text+ko) ====
@@ -43,7 +43,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_a4x_io.S,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* bus_space I/O functions with offset*4
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#4 (text+ko) ====
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_a4x_space.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_intr.h#3 (text+ko) ====
@@ -34,7 +34,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_intr.h,v 1.1 2006/11/19 23:55:23 sam Exp $
*
*/
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_mem.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#9 (text+ko) ====
@@ -57,7 +57,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* Intel XScale Network Processing Engine (NPE) support.
@@ -99,7 +99,7 @@
#include <arm/xscale/ixp425/ixp425reg.h>
#include <arm/xscale/ixp425/ixp425var.h>
-#include <arm/xscale/ixp425/ixp425_npe.h>
+#include <arm/xscale/ixp425/ixp425_npereg.h>
#include <arm/xscale/ixp425/ixp425_npevar.h>
struct ixpnpe_softc {
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#8 (text+ko) ====
@@ -20,6 +20,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.1 2006/11/19 23:55:23 sam Exp $
*/
#ifndef _IXP425_NPEVAR_H_
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#17 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#3 (text+ko) ====
@@ -34,7 +34,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci_asm.S,v 1.1 2006/11/19 23:55:23 sam Exp $
*
*/
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#10 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci_space.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* bus_space PCI functions for ixp425
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 (text+ko) ====
@@ -57,7 +57,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* Intel XScale Queue Manager support.
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#3 (text+ko) ====
@@ -25,6 +25,8 @@
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $
*/
/*-
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_space.c#5 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_space.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* bus_space I/O functions for ixp425
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_timer.c#5 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_timer.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_wdog.c#4 (text+ko) ====
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
/*
* IXP425 Watchdog Timer Support.
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#8 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.1 2006/11/19 23:55:23 sam Exp $
*
*/
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425var.h#9 (text+ko) ====
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.1 2006/11/19 23:55:23 sam Exp $
*
*/
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/std.avila#3 (text+ko) ====
@@ -1,5 +1,5 @@
#GW2348-4 board configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/std.avila,v 1.1 2006/11/19 23:55:23 sam Exp $
include "../xscale/ixp425/std.ixp425"
files "../xscale/ixp425/files.avila"
makeoptions KERNPHYSADDR=0x10200000
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/std.ixp425#4 (text+ko) ====
@@ -1,5 +1,5 @@
#XScale IXP425 generic configuration
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/std.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $
files "../xscale/ixp425/files.ixp425"
include "../xscale/std.xscale"
cpu CPU_XSCALE_IXP425
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#include <sys/param.h>
#include <sys/systm.h>
More information about the p4-projects
mailing list