From owner-p4-projects@FreeBSD.ORG Tue Mar 10 21:57:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D4F21065673; Tue, 10 Mar 2009 21:57:15 +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 2335E106566B for ; Tue, 10 Mar 2009 21:57:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 114B48FC19 for ; Tue, 10 Mar 2009 21:57:15 +0000 (UTC) (envelope-from jhb@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 n2ALvEYG010474 for ; Tue, 10 Mar 2009 21:57:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2ALvE6K010472 for perforce@freebsd.org; Tue, 10 Mar 2009 21:57:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 10 Mar 2009 21:57:14 GMT Message-Id: <200903102157.n2ALvE6K010472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 159033 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: Tue, 10 Mar 2009 21:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=159033 Change 159033 by jhb@jhb_jhbbsd on 2009/03/10 21:56:13 IFC @159032 Affected files ... .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#6 integrate .. //depot/projects/smpng/sys/conf/options.arm#20 integrate Differences ... ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.7 2009/03/09 23:25:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.8 2009/03/10 21:49:51 sam Exp $ ident CAMBRIA @@ -67,6 +67,8 @@ device uart device ixpwdog # watchdog timer + +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.1 2008/12/20 03:26:09 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -27,6 +27,10 @@ #hint.npe.1.mii="C" #hint.npe.1.phy=2 +# FLASH +hint.cfi.0.at="ixp0" +hint.cfi.0.addr=0x50000000 + # CF IDE controller hint.ata_avila.0.at="ixp0" ==== //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.17 2009/03/06 23:29:00 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.18 2009/03/10 21:47:17 sam Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -187,6 +187,10 @@ { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, VM_PROT_READ|VM_PROT_WRITE, 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, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, ==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.6 2009/03/06 23:32:45 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.7 2009/03/10 21:49:22 sam Exp $ * */ @@ -660,7 +660,11 @@ /* NB: CS0 is special; it maps flash */ #define IXP425_EXP_BUS_CS0_HWBASE IXP425_EXP_BUS_CSx_HWBASE(0) #define IXP425_EXP_BUS_CS0_VBASE 0xFD000000UL +#ifndef IXP4XX_FLASH_SIZE #define IXP425_EXP_BUS_CS0_SIZE 0x01000000 /* NB: 16M */ +#else +#define IXP425_EXP_BUS_CS0_SIZE IXP4XX_FLASH_SIZE +#endif #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 IXP425_EXP_BUS_CSx_SIZE ==== //depot/projects/smpng/sys/conf/options.arm#20 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.23 2008/12/20 03:26:09 sam Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.24 2009/03/10 21:49:22 sam Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -18,6 +18,7 @@ CPU_XSCALE_IXP435 opt_global.h CPU_XSCALE_PXA2X0 opt_global.h FLASHADDR opt_global.h +IXP4XX_FLASH_SIZE opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h LOADERRAMADDR opt_global.h