PERFORCE change 213471 for review

[Brooks Davis]

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

Change 213471 by brooks at 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}"