sw: update tu support firmware in v3rc2

023c270c · Benoit Rat · 5dfe7ee0 · 023c270c · 023c270c · 023c270c
Commit 023c270c authored Jul 13, 2012 by Benoit Rat
8 changed files
--- a/sw/alpha-pts/001-MD5_Checking.sh
+++ b/sw/alpha-pts/001-MD5_Checking.sh
@@ -25,9 +25,9 @@ printf "MAC="$(ifconfig | grep 'eth0'    | tr -s ' '    | cut -d ' ' -f5)"\n"
 ret1=$?

 printf "printing md5sum the loading file:\n"
-md5sum "$(which load-fpga)"
+md5sum "$(which load-virtex)"
 ret2=$?
-md5sum "$(which lm32-loader)"
+md5sum "$(which load-lm32)"
 ret3=$?

 md5sum /wr/lib/firmware/8ports_mb.bin

--- a/sw/alpha-pts/002-LED_Checking.sh
+++ b/sw/alpha-pts/002-LED_Checking.sh
@@ -24,8 +24,8 @@ exit_multierr 0


 #First loading the correct firmwares:
-load-fpga /wr/lib/firmware/8ports_mb.bin
-lm32-loader /wr/lib/firmware/rt_cpu.bin
+load-virtex /wr/lib/firmware/8ports_mb.bin
+load-lm32 /wr/lib/firmware/rt_cpu.bin

 ret=0
 user_echoasking "y/n" "Did you see the LEDs moving" "LEDS"

--- a/sw/alpha-pts/005-USB.sh
+++ b/sw/alpha-pts/005-USB.sh
--- a/sw/alpha-pts/006-FPGA_EBI1Bridge.sh
+++ b/sw/alpha-pts/006-FPGA_EBI1Bridge.sh
@@ -22,8 +22,10 @@ printf "======: $0\n"
 . 000-functions.sh

 #First loading the correct firmwares:
-load-fpga ${APTS_SWITCH_DIR}/bin/006-scb_test.bit
-lm32-loader ${APTS_SWITCH_DIR}/bin/006-cpu_rt.bin
+#load-virtex /wr/lib/firmware/8ports_mb.bin
+#load-lm32 /wr/lib/firmware/rt_cpu.bin
+load-virtex ${APTS_SWITCH_DIR}/bin/fpga_scbtest.bit
+load-lm32 ${APTS_SWITCH_DIR}/bin/cpu_rt.bin

 nTot=512
 addr=0x10000000
@@ -65,4 +67,4 @@ done

 echo ""
 echo "Result CPU-FPGA bus: OK=${nOK}/${nTot}W"
-exit_errpercent ${nOK} ${nTot}
\ No newline at end of file
+exit_errpercent ${nOK} ${nTot}
--- a/sw/alpha-pts/004-FPGA_TempMonitor.sh
+++ b/sw/alpha-pts/004-FPGA_TempMonitor.sh
 #!/bin/sh
 ## Testing QDRII, PLL, and GPIOs
 ##
-##	This test stress the QDRII at maximum, and read the different temperature sensor to check
-##	that it is working correctly.
+##	This test stress the QDRII at maximum, and start monitoring the 
+##	different temperature sensor.
+##	
 ##
 ##	Future Improvements:
 ##	- There are no communications between the FPGA and CPU
 ##	- The test should be divided in first a QDRII check, then a temperature stress
-##	- The temperature test should be run at the same time then the NAND & DF test (15min)
-##
+#
 ##
 ##
 ## Authors: 
@@ -28,12 +28,12 @@ printf "======: $0\n"


 #First loading the correct firmwares:
-load-fpga ${APTS_SWITCH_DIR}/bin/004-fpga_montemp.bit
+load-virtex ${APTS_SWITCH_DIR}/bin/fpga_qdr2temp.bit

-timeout=60 #Timeout before reading
+timeout=10 #Timeout before reading


-printf "Monitoring temperature and testing CPU (${timeout}s): "
+printf "FPGA QDRII stress and temperature monitoring (${timeout}s): "
 i=0
 while [ $i -lt $timeout ]; do
 	printf "."
@@ -41,7 +41,6 @@ while [ $i -lt $timeout ]; do
 	i=`expr $i + 1`
 done
 echo ""
-load-fpga /wr/lib/firmware/8ports_mb.bin ## We force to reset 


 ret=0
@@ -53,14 +52,4 @@ else
 	ret0="0"
 fi;	

-user_echoasking "y/n" "Do you see temperature message on UART?" "UART temp"
-if [ $ret == "y" ]; then
-	user_echoasking "num" "System Monitor Temp. " "temp-sysmon"
-	user_echoasking "num" "Temp. Sensor FPGA:" "temp-fpga"
-	user_echoasking "num" "Temp. Sensor Power Supply:" "tmp-powsup"
-	ret1="0"
-else
-	ret1="100"
-fi
-
-exit_multierr $ret0 $ret1
+exit_multierr $ret0 
--- a/sw/alpha-pts/006-FPGA_TempRetrieving.sh
+++ b/sw/alpha-pts/006-FPGA_TempRetrieving.sh
+#!/bin/sh
+## Retrieve Temperatures
+##
+##	Read the different temperature sensor at the end of the test
+##
+##	Future Improvements:
+##	- There are no communications between the FPGA and CPU, the test s
+##	should read automatically temperature.
+##
+##
+## Authors: 
+##	- Benoit Rat (Seven Solutions, www.sevensols.com)
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+#######################################################################################################
+
+printf "======: $0\n"
+. 000-functions.sh
+
+
+user_echoasking "y/n" "Do you see temperature message on UART?" "UART temp"
+if [ $ret == "y" ]; then
+	user_echoasking "num" "Number of iteration. " "num-iter"
+	user_echoasking "num" "System Monitor Temp. " "temp-sysmon"
+	user_echoasking "num" "Temp. Sensor FPGA:" "temp-fpga"
+	user_echoasking "num" "Temp. Sensor Power Supply:" "tmp-powsup"
+	ret1="0"
+else
+	ret1="100"
+fi
+
+load-virtex ${APTS_SWITCH_DIR}/bin/fpga_scbtest.bit
+load-lm32 ${APTS_SWITCH_DIR}/bin/cpu_rt.bin
+
+006-FPGA_TempRetrieving.sh
+
+
+exit_multierr $ret0
--- a/sw/alpha-pts/007-NF_MT29F4G16.sh
+++ b/sw/alpha-pts/007-NF_MT29F4G16.sh
@@ -99,7 +99,7 @@ testblocks()
 	
 		dd $ddopt if=/dev/urandom of=${f2w} 		  2> /dev/null
 		printf "..."
-		mtd_debug erase ${device} ${startaddr} ${sizeblock} &> /dev/null
+		#mtd_debug erase ${device} ${startaddr} ${sizeblock} &> /dev/null
 		printf "..."
 		mtd_debug write ${device} ${startaddr} ${sizeblock} ${f2w} &> /dev/null
 		printf "..."
@@ -111,10 +111,10 @@ testblocks()
 	
 		if [ "$md5w" != "$md5r" ]; then
 			nKO=$(expr ${nKO} + 1)		
-			printf "ERROR (%02d %%) \n" $(expr $(expr $iblock \* 100 ) / $nblock)
+			printf "ERROR (%02d %%) \n" $(expr $(expr $itest \* 100 ) / $ntest)
 		else
 			nOK=$(expr ${nOK} + 1) 
-			printf " %02d %% \\r" $(expr $(expr $iblock \* 100 ) / $nblock)
+			printf " %02d %% \\r" $(expr $(expr $itest \* 100 ) / $ntest)
 		fi
 	
 		tmp=$RANDOM #Improve RANDOM generation

--- a/sw/alpha-pts/testing.sh
+++ b/sw/alpha-pts/testing.sh
 #!/bin/ash

+cd $(dirname $0)
+
 ## Load generic function
 . 000-functions.sh

 ## setup default parameters
-setupGlobalVar "APTS_SWITCH_DIR" "/alpha-pts"
+setupGlobalVar "APTS_SWITCH_DIR" "$(dirname $0)"
 setupGlobalVar "APTS_HOST_DIR" "."
 setupGlobalVar "APTS_HOST_IP" "192.168.7.7"

 ## Creating directories structure
-mkdir ${APTS_SWITCH_DIR} &> /dev/null
 mkdir ${APTS_SWITCH_DIR}/bin &> /dev/null
 mkdir ${APTS_SWITCH_DIR}/logs &> /dev/null
-cd ${APTS_SWITCH_DIR}
+


 # Run the scritps
@@ -21,7 +22,7 @@ run()
 	if [ x"$1" != x ]; then
 		numseq="$1"
 	else
-		numseq="01 02 04 06 07 08 09"
+		numseq="01 02 05 06 07 08 09 10"
 	fi
 	for itest in $numseq; do
 		load_ask2run $(ls *${itest}-*.sh) $ask $update $inlog
@@ -95,4 +96,5 @@ run "$num";
 ## Append all log to an history
 cat $logfname.log >> ${logfname}_history.log
 echo "" >> ${logfname}_history.log
+chmod +r ${APTS_SWITCH_DIR}/logs/*
 exit 0;