Commit bbe580d6 authored by Marek Gumiński's avatar Marek Gumiński

Fixed error that occured when pts path contained fmcmasterfip directory other than main pts one.

Small fix of eeprom content created in test05.
parent 4b299253
......@@ -7,6 +7,12 @@ fi
# make sure that top directory is called properly
# TOPDIRNAME="fmcmasterfip"
# if [ `dirname $PWD | grep "$TOPDIRNAME"` -ne 0 ]
# then
# echo "Work directory path contain forbidden directory called $TOPDIRNAME"
# echo "Please change "
topdir=`basename $PWD`
if [ "$topdir" != "fmcmasterfip" ]
then
......@@ -26,8 +32,7 @@ then
fi
fi
apt-get install python-numpy python-scipy python-matplotlib ipython python2-pyro4
apt-get install python-psutil python-dnspython
apt-get install python-numpy python-scipy python-matplotlib ipython python2-pyro4 python-psutil python-dnspython
apt-get install git gitk libusb-dev
# initialise and update repository
......@@ -93,3 +98,4 @@ echo "Creating desktop shortcut"
# create desktop shortcut
echo "cd ${PWD}/pts/" > ~/Desktop/test_fmcmasterfip.sh
echo "./fmcmasterfip.sh" >> ~/Desktop/test_fmcmasterfip.sh
chmod +x ~/Desktop/test_fmcmasterfip.sh
\ No newline at end of file
......@@ -39,7 +39,16 @@ else
) || exit
prg=$dir/$(basename -- "$prg") || exit
top=`echo "$prg" | sed "s/\/${topdirname}\/.*/\/${topdirname}/"`
top=$prg
while true
do
if [ `basename "$top"` == "$topdirname" ]
then
break;
else
top=`dirname "$top"`
fi
done
fi
......@@ -51,6 +60,8 @@ if [ ! -d "${top}/${projectpath}/software" ]; then
exit 1
fi
echo "Identified $top as FMC masterFip top directory"
#######################################################################
####################### Drivers management ############################
#######################################################################
......
fmc-masterfip
FmcMasterFip
......@@ -34,7 +34,7 @@ def main (card=None, default_directory='.',suite=None, serial=None):
testname= "Test05: EEPROM communication"
util.header_msg( testname, [ "EEPROM communication" ] )
if(serial == None):
raise ptsexcept.PtsError("Serial number was not specified. Cannot create EEPROM content")
......@@ -122,7 +122,7 @@ def main (card=None, default_directory='.',suite=None, serial=None):
speed = dut.fipcore.read_regname('speed')
# create FRU information
util.section_msg("Creating IPMI-FRU information")
......@@ -135,14 +135,14 @@ def main (card=None, default_directory='.',suite=None, serial=None):
# serial
"-s", serial,
# part
"-p", "EDA-03098-V1-1",
"-p", "EDA-03098-V1-%d" % speed,
# output
"-o", sdbfs_path+"/IPMI-FRU" ]
)
# create file in sdbfs
# containing speed version
speed = dut.fipcore.read_regname('speed')
with open(sdbfs_path+"speed","w") as f:
f.write(str(speed))
f.close()
......
......@@ -33,9 +33,19 @@ else
) || exit
prg=$dir/$(basename -- "$prg") || exit
top=`echo "$prg" | sed "s/\/${topdirname}\/.*/\/${topdirname}/"`
top=$prg
while true
do
if [ `basename "$top"` == "$topdirname" ]
then
break;
else
top=`dirname "$top"`
fi
done
fi
# path verification
if [ ! -d "${top}/${projectpath}/software" ]; then
......@@ -44,6 +54,8 @@ if [ ! -d "${top}/${projectpath}/software" ]; then
exit 1
fi
echo "Identified $top as FMC masterFip top directory"
insmod "${top}/${projectpath}/software/fmc-bus/kernel/fmc.ko"
insmod "${top}/${projectpath}/software/spec-sw/kernel/spec.ko" "fw_name=../../${top}/${projectpath}/gateware/spec-init.bin-2012-12-14"
insmod "${top}/${projectpath}/software/zio/zio.ko"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment