From owner-p4-projects@FreeBSD.ORG  Fri Feb 15 20:13:25 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id BADC78F; Fri, 15 Feb 2013 20:13:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7EB997E
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:13:25 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5743B226
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:13:25 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1FKDPar065228
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:13:25 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1FKDPRU065223
 for perforce@freebsd.org; Fri, 15 Feb 2013 20:13:25 GMT
 (envelope-from brooks@freebsd.org)
Date: Fri, 15 Feb 2013 20:13:25 GMT
Message-Id: <201302152013.r1FKDPRU065223@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222079 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Feb 2013 20:13:25 -0000

http://p4web.freebsd.org/@@222079?ac=10

Change 222079 by brooks@brooks_zenith on 2013/02/15 20:12:59

	Teach flashit about cfi(4).

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/flashit/flashit.sh#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/ctsrd/flashit/flashit.sh#4 (text+ko) ====

@@ -1,32 +1,28 @@
 #!/bin/sh
 
-isf0_DEV=isf0
-isf0_OFFSET=0
-isf0_MAXLEN=0x02000000
-
-isf1_DEV=isf1
-isf1_OFFSET=0
-isf1_MAXLEN=0x02000000
-
-boot_DEV=isf0
+boot_DEV=cfid0
 boot_OFFSET=0x01F00000
 boot_MAXLEN=0x100000
 
-fpga_DEV=isf0
+fpga_DEV=cfid0
 fpga_OFFSET=0x00020000
 fpga_MAXLEN=0x00C00000
 fpga_SKIP=0x20000
 
-fpga2_DEV=isf0
+fpga2_DEV=cfid0
 fpga2_OFFSET=0x00C20000
 fpga2_MAXLEN=0x00C00000
 fpga2_SKIP=0x20000
 
-kernel_DEV=isf1
-kernel_OFFSET=0x00000000
+osconfig_DEV=cfid0
+osconfig_OFFSET=0x01820000
+osconfig_MAXLEN=0x00020000
+
+kernel_DEV=cfid0
+kernel_OFFSET=0x02000000
 kernel_MAXLEN=0x02000000
 
-TARGETS="boot:fpga:kernel:kernel2:root"
+TARGETS="boot:fpga:fpga2:osconfig:kernel"
 
 prog=`basename "$0"`
 
@@ -152,20 +148,6 @@
 	fi
 fi
 
-ksize=$((${size} / 1024))
-eblocks=$((${ksize} / 128))
-if [ $((${ksize} % 128)) -ne 0 ]; then
-	eblocks=$((${eblocks} + 1))
-fi
-echo "Erasing ${eblocks} 128K blocks from ${OFFSET} on ${DEV}"
-if [ ${DRYRUN} -eq 0 ]; then
-	/usr/sbin/isfctl ${DEV} erase ${OFFSET} \
-	    $((${eblocks} * 128 * 1024))
-	if [ $? -ne 0 ]; then
-		err 1 "Failed to erase"
-	fi
-fi
-
 echo "Writing ${binfile} to ${DEV} @ ${OFFSET}"
 if [ ${DRYRUN} -eq 0 ]; then
 	iseek=$((`printf "%d" ${SKIP}` / 512))