Date: Tue, 3 Feb 2009 20:01:51 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r188097 - in projects/vap7/sys: . arm/conf arm/xscale/ixp425 contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/... Message-ID: <200902032001.n13K1pBh040503@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Tue Feb 3 20:01:51 2009 New Revision: 188097 URL: http://svn.freebsd.org/changeset/base/188097 Log: merge r188088+r188089: add support for the StrataFlash on 2348 boards Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/arm/conf/AVILA projects/vap7/sys/arm/conf/AVILA.hints projects/vap7/sys/arm/xscale/ixp425/avila_machdep.c projects/vap7/sys/arm/xscale/ixp425/files.ixp425 projects/vap7/sys/arm/xscale/ixp425/ixp425.c projects/vap7/sys/arm/xscale/ixp425/ixp425reg.h projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cfi/cfi_bus_ixp4xx.c projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/sys/arm/conf/AVILA ============================================================================== --- projects/vap7/sys/arm/conf/AVILA Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/arm/conf/AVILA Tue Feb 3 20:01:51 2009 (r188097) @@ -88,13 +88,15 @@ device mem # Memory and kernel memory device pci device uart +device ixpwdog # watchdog timer +device cfi # flash support + # I2C Bus device iicbus device iicbb device iic device ixpiic -device ixpwdog # watchdog timer device ds1672 # DS1672 on I2C bus device ad7418 # AD7418 on I2C bus Modified: projects/vap7/sys/arm/conf/AVILA.hints ============================================================================== --- projects/vap7/sys/arm/conf/AVILA.hints Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/arm/conf/AVILA.hints Tue Feb 3 20:01:51 2009 (r188097) @@ -28,6 +28,10 @@ hint.npe.1.mac="B" hint.npe.1.mii="A" hint.npe.1.phy=1 +# FLASH +hint.cfi.0.at="ixp0" +hint.cfi.0.addr=0x50000000 + # CF IDE controller hint.ata_avila.0.at="ixp0" Modified: projects/vap7/sys/arm/xscale/ixp425/avila_machdep.c ============================================================================== --- projects/vap7/sys/arm/xscale/ixp425/avila_machdep.c Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/arm/xscale/ixp425/avila_machdep.c Tue Feb 3 20:01:51 2009 (r188097) @@ -159,6 +159,10 @@ static const struct pmap_devmap ixp425_d PTE_NOCACHE, }, + /* CFI Flash on the Expansion Bus */ + { IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, + IXP425_EXP_BUS_CS0_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* IXP425 PCI Configuration */ { IXP425_PCI_VBASE, Modified: projects/vap7/sys/arm/xscale/ixp425/files.ixp425 ============================================================================== --- projects/vap7/sys/arm/xscale/ixp425/files.ixp425 Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/arm/xscale/ixp425/files.ixp425 Tue Feb 3 20:01:51 2009 (r188097) @@ -15,6 +15,7 @@ arm/xscale/ixp425/uart_cpu_ixp425.c opti arm/xscale/ixp425/uart_bus_ixp425.c optional uart arm/xscale/ixp425/ixp425_a4x_space.c optional uart arm/xscale/ixp425/ixp425_a4x_io.S optional uart +dev/cfi/cfi_bus_ixp4xx.c optional cfi dev/uart/uart_dev_ns8250.c optional uart # # NPE-based Ethernet support (requires qmgr also). Modified: projects/vap7/sys/arm/xscale/ixp425/ixp425.c ============================================================================== --- projects/vap7/sys/arm/xscale/ixp425/ixp425.c Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/arm/xscale/ixp425/ixp425.c Tue Feb 3 20:01:51 2009 (r188097) @@ -73,6 +73,8 @@ static struct { { IXP425_EXP_HWBASE, IXP425_EXP_SIZE, IXP425_EXP_VBASE }, { IXP425_PCI_HWBASE, IXP425_PCI_SIZE, IXP425_PCI_VBASE }, { IXP425_PCI_MEM_HWBASE,IXP425_PCI_MEM_SIZE, IXP425_PCI_MEM_VBASE }, + { IXP425_EXP_BUS_CS0_HWBASE, IXP425_EXP_BUS_CS0_SIZE, + IXP425_EXP_BUS_CS0_VBASE }, #if 0 { IXP425_PCI_IO_HWBASE, IXP425_PCI_IO_SIZE, IXP425_PCI_IO_VBASE }, #endif Modified: projects/vap7/sys/arm/xscale/ixp425/ixp425reg.h ============================================================================== --- projects/vap7/sys/arm/xscale/ixp425/ixp425reg.h Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/arm/xscale/ixp425/ixp425reg.h Tue Feb 3 20:01:51 2009 (r188097) @@ -73,6 +73,10 @@ /* * FFFF FFFF --------------------------- * + * FE00 0000 --------------------------- + * 16M CFI Flash (on ext bus) + * FD00 0000 --------------------------- + * * FC00 0000 --------------------------- * PCI Data (memory space) * F800 0000 --------------------------- @@ -569,6 +573,9 @@ #define IXP425_EXP_BUS_CSx_VBASE(i) \ (IXP425_MAC_B_VBASE + (i)*IXP425_MAC_B_SIZE) +#define IXP425_EXP_BUS_CS0_HWBASE IXP425_EXP_BUS_CSx_HWBASE(0) +#define IXP425_EXP_BUS_CS0_VBASE 0xFD000000UL +#define IXP425_EXP_BUS_CS0_SIZE 0x01000000 /* NB: 16M */ #define IXP425_EXP_BUS_CS1_HWBASE IXP425_EXP_BUS_CSx_HWBASE(1) #define IXP425_EXP_BUS_CS1_VBASE IXP425_EXP_BUS_CSx_VBASE(1) #define IXP425_EXP_BUS_CS1_SIZE 0x1000 @@ -583,7 +590,6 @@ #define IXP425_EXP_BUS_CS4_SIZE 0x1000 /* NB: not mapped (yet) */ -#define IXP425_EXP_BUS_CS0_HWBASE IXP425_EXP_BUS_CSx_HWBASE(0) #define IXP425_EXP_BUS_CS5_HWBASE IXP425_EXP_BUS_CSx_HWBASE(5) #define IXP425_EXP_BUS_CS6_HWBASE IXP425_EXP_BUS_CSx_HWBASE(6) #define IXP425_EXP_BUS_CS7_HWBASE IXP425_EXP_BUS_CSx_HWBASE(7) Modified: projects/vap7/sys/dev/cfi/cfi_bus_ixp4xx.c ============================================================================== --- projects/vap7/sys/dev/cfi/cfi_bus_ixp4xx.c Tue Feb 3 19:58:28 2009 (r188096) +++ projects/vap7/sys/dev/cfi/cfi_bus_ixp4xx.c Tue Feb 3 20:01:51 2009 (r188097) @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2009 Roelof Jonkman, Carlson Wireless Inc. * Copyright (c) 2009 Sam Leffler, Errno Consulting * All rights reserved. *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902032001.n13K1pBh040503>