From owner-p4-projects@FreeBSD.ORG  Tue Jun 26 01:12:24 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 894671065674; Tue, 26 Jun 2012 01:12:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4B9641065672
	for <perforce@freebsd.org>; Tue, 26 Jun 2012 01:12:24 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 34D428FC0C
	for <perforce@freebsd.org>; Tue, 26 Jun 2012 01:12:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q5Q1COXq057927
	for <perforce@freebsd.org>; Tue, 26 Jun 2012 01:12:24 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5Q1CNvH057924
	for perforce@freebsd.org; Tue, 26 Jun 2012 01:12:23 GMT
	(envelope-from brooks@freebsd.org)
Date: Tue, 26 Jun 2012 01:12:23 GMT
Message-Id: <201206260112.q5Q1CNvH057924@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 213471 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Tue, 26 Jun 2012 01:12:24 -0000

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

Change 213471 by brooks@brooks_ecr_current on 2012/06/26 01:11:27

	Update the location of the kernel.  Add isf0 and isf1 targets
	for reflashing the whole chip.
	
	Add a bit more error handling.

Affected files ...

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

Differences ...

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

@@ -1,24 +1,26 @@
 #!/bin/sh
 
+isf0_DEV=isf0
+isf0_OFFSET=0
+isf0_MAXLEN=0x02000000
+
+isf1_DEV=isf1
+isf1_OFFSET=0
+isf1_MAXLEN=0x02000000
+
 fpga_DEV=isf0
 fpga_OFFSET=0x00020000
-fpga_MAXLEN=0x00FE0000
+fpga_MAXLEN=0x00C00000
 fpga_SKIP=0x20000
 
-# New kernel location on isf0
-kernel_DEV=isf0
-kernel_OFFSET=0x01000000
-kernel_MAXLEN=0x01000000
+fpga2_DEV=isf0
+fpga2_OFFSET=0x00C20000
+fpga2_MAXLEN=0x00C00000
+fpga2_SKIP=0x20000
 
-# Old kernel location on isf1
-kernel2_DEV=isf1
-kernel2_OFFSET=0x01000000
-kernel2_MAXLEN=0x01000000
-
-# Proposed root location
-root_DEV=isf1
-root_OFFSET=0x00000000
-root_MAXLEN=0x02000000
+kernel_DEV=isf1
+kernel_OFFSET=0x00000000
+kernel_MAXLEN=0x02000000
 
 TARGETS="fpga:kernel:kernel2:root"
 
@@ -114,11 +116,17 @@
 
 case "${source}" in
 *.bz2)
+	if [ -z "${tmpdir}" ]; then
+		err 1 "Can't make a temporary directory, is /tmp writable?"
+	fi
 	binfile="${tmpdir}/${src_name%.bz2}"
 	echo "Extracting to ${binfile}"
 	bunzip2 -c "${source}" > "${binfile}"
 	;;
 *.gz)
+	if [ -z "${tmpdir}" ]; then
+		err 1 "Can't make a temporary directory, is /tmp writable?"
+	fi
 	binfile="${tmpdir}/${src_name%.gz}"
 	echo "Extracting to ${binfile}"
 	gunzip -c "${source}" > "${binfile}"