From owner-p4-projects@FreeBSD.ORG Wed Jan 2 10:58:58 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C953BB8; Wed, 2 Jan 2013 10:58:58 +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 18ACFBB6 for ; Wed, 2 Jan 2013 10:58:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E8CDB8FC17 for ; Wed, 2 Jan 2013 10:58:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id r02AwvKM078145 for ; Wed, 2 Jan 2013 10:58:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id r02Awv3r078142 for perforce@freebsd.org; Wed, 2 Jan 2013 10:58:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 2 Jan 2013 10:58:57 GMT Message-Id: <201301021058.r02Awv3r078142@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219936 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jan 2013 10:58:58 -0000 http://p4web.freebsd.org/@@219936?ac=10 Change 219936 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/01/02 10:58:46 Avoid collisions when numbering avgen devices; due to an existing collision, we weren't properly setting up /dev/de4bsw. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#16 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#7 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#16 (text+ko) ==== @@ -61,26 +61,26 @@ hint.altera_avgen.0.devname="berirom" # +# Expose the DE4 buttons and switches via an Avalon "generic" device. +# +hint.altera_avgen.1.at="nexus0" +hint.altera_avgen.1.maddr=0x7f009000 +hint.altera_avgen.1.msize=2 +hint.altera_avgen.1.width=1 +hint.altera_avgen.1.fileio="r" +hint.altera_avgen.1.devname="de4bsw" + +# # Expose the DE4 flash via an Avalon "generic" device. # This is incompatible with the isf(4) driver. # -#hint.altera_avgen.0.at="nexus0" -#hint.altera_avgen.0.maddr=0x74000000 -#hint.altera_avgen.0.msize=0x4000000 -#hint.altera_avgen.0.width=2 -#hint.altera_avgen.0.fileio="rw" -#hint.altera_avgen.0.mmapio="rwx" -#hint.altera_avgen.0.devname="de4flash" - -# -# Expose the DE4 buttons and switches via an Avalon "generic" device. -# -hint.altera_avgen.0.at="nexus0" -hint.altera_avgen.0.maddr=0x7f009000 -hint.altera_avgen.0.msize=2 -hint.altera_avgen.0.width=1 -hint.altera_avgen.0.fileio="r" -hint.altera_avgen.0.devname="de4bsw" +#hint.altera_avgen.2.at="nexus0" +#hint.altera_avgen.2.maddr=0x74000000 +#hint.altera_avgen.2.msize=0x4000000 +#hint.altera_avgen.2.width=2 +#hint.altera_avgen.2.fileio="rw" +#hint.altera_avgen.2.mmapio="rwx" +#hint.altera_avgen.2.devname="de4flash" # # General Intel StrataFlash driver ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_FDT_DE4.hints#7 (text+ko) ==== @@ -61,26 +61,26 @@ hint.altera_avgen.0.devname="berirom" # +# Expose the DE4 buttons and switches via an Avalon "generic" device. +# +hint.altera_avgen.1.at="nexus0" +hint.altera_avgen.1.maddr=0x7f009000 +hint.altera_avgen.1.msize=2 +hint.altera_avgen.1.width=1 +hint.altera_avgen.1.fileio="r" +hint.altera_avgen.1.devname="de4bsw" + +# # Expose the DE4 flash via an Avalon "generic" device. # This is incompatible with the isf(4) driver. # -#hint.altera_avgen.0.at="nexus0" -#hint.altera_avgen.0.maddr=0x74000000 -#hint.altera_avgen.0.msize=0x4000000 -#hint.altera_avgen.0.width=2 -#hint.altera_avgen.0.fileio="rw" -#hint.altera_avgen.0.mmapio="rwx" -#hint.altera_avgen.0.devname="de4flash" - -# -# Expose the DE4 buttons and switches via an Avalon "generic" device. -# -hint.altera_avgen.0.at="nexus0" -hint.altera_avgen.0.maddr=0x7f009000 -hint.altera_avgen.0.msize=2 -hint.altera_avgen.0.width=1 -hint.altera_avgen.0.fileio="r" -hint.altera_avgen.0.devname="de4bsw" +#hint.altera_avgen.2.at="nexus0" +#hint.altera_avgen.2.maddr=0x74000000 +#hint.altera_avgen.2.msize=0x4000000 +#hint.altera_avgen.2.width=2 +#hint.altera_avgen.2.fileio="rw" +#hint.altera_avgen.2.mmapio="rwx" +#hint.altera_avgen.2.devname="de4flash" # # General Intel StrataFlash driver