diff options
| -rw-r--r-- | sbe/image/Makefile | 4 | ||||
| -rw-r--r-- | sbe/image/img_defs.mk | 6 | ||||
| -rwxr-xr-x | sbe/image/parsAndCutElf.py | 30 | ||||
| -rwxr-xr-x | sbe/test/citest/populate-sandbox | 4 | ||||
| -rwxr-xr-x | sbe/tools/scripts/ppeSetFixed.pl | 3 |
5 files changed, 38 insertions, 9 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile index 24165b25..d0588948 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -112,8 +112,8 @@ SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).dis SIMICS_PPE_TAR_FILES += $(OBJDIR)/sbe.syms -SIMICS_PPE_TAR_FILES += $(OBJDIR)/../test/*.xml -SIMICS_PPE_TAR_FILES += $(OBJDIR)/../test/*.py +SIMICS_PPE_TAR_FILES += $(TEST_SRCDIR)/*.xml +SIMICS_PPE_TAR_FILES += $(TEST_SRCDIR)/*.py SIMICS_PPE_TAR_FILES += $(PPETRACEPP_DIR)/fsp-trace SIMICS_PPE_TAR_FILES += $(OBJDIR)/sbeStringFile SIMICS_PPE_TAR_FILES += $(OBJDIR)/ppe2fsp diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index 47ff6013..1551f566 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -95,6 +95,10 @@ ifndef TOOLS_SRCDIR export TOOLS_SRCDIR = $(SBE_SRC_DIR)/tools endif +ifndef TEST_SRCDIR +export TEST_SRCDIR = $(SBE_SRC_DIR)/test +endif + ifndef DEBUGTOOLS_SRCDIR export DEBUGTOOLS_SRCDIR = $(TOOLS_SRCDIR)/debug endif @@ -144,7 +148,7 @@ export IMAGEPROCS_SRCDIR = $(IMPORT_SRCDIR)/tools/imageProcs endif ifndef BASE_OBJDIR -export BASE_OBJDIR = $(SBE_SRC_DIR)/obj +export BASE_OBJDIR = $(SBE_ROOT_DIR)/obj endif ifndef P9_XIP_SRCDIR diff --git a/sbe/image/parsAndCutElf.py b/sbe/image/parsAndCutElf.py index 44c4b8a7..2c514f13 100755 --- a/sbe/image/parsAndCutElf.py +++ b/sbe/image/parsAndCutElf.py @@ -1,4 +1,28 @@ #!/usr/bin/python +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: sbe/image/parsAndCutElf.py $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG import os import subprocess import re @@ -7,9 +31,9 @@ import sys # Workaround to cut SBE image from elf image. def parserElf(): - cmd = "readelf -S ../obj/sbe_seeprom.out" + cmd = "readelf -S ../../obj/sbe_seeprom.out" firstSection = ".header" - cmd1 = "nm ../obj/sbe_seeprom.out | grep _sbe_image_size" + cmd1 = "nm ../../obj/sbe_seeprom.out | grep _sbe_image_size" output = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) i = 0; for line in output.stdout: @@ -36,7 +60,7 @@ def parserElf(): exit(-1) # cut the image - cmd1 = "dd skip=" + str(startSize) + " count=" + str(endSize) + " if=../obj/sbe_seeprom.out of=../obj/sbe_seeprom.bin bs=1" + cmd1 = "dd skip=" + str(startSize) + " count=" + str(endSize) + " if=../../obj/sbe_seeprom.out of=../../obj/sbe_seeprom.bin bs=1" rc = os.system(cmd1) if ( rc ): print "ERROR running %s: %d "%( cmd1, rc ) diff --git a/sbe/test/citest/populate-sandbox b/sbe/test/citest/populate-sandbox index 7df47896..4e2e2f10 100755 --- a/sbe/test/citest/populate-sandbox +++ b/sbe/test/citest/populate-sandbox @@ -44,8 +44,8 @@ mkdir -p $SBETESTDIR || exit -1 mkdir -p $SBEFW_IMG_DIR || exit -1 # Copy sbe binaries -cp $SBEROOT/sbe/obj/*.bin $SBEFW_IMG_DIR/ || exit -1 -cp $SBEROOT/sbe/obj/simics.tar $SBEFW_DIR/ || exit -1 +cp $SBEROOT/obj/*.bin $SBEFW_IMG_DIR/ || exit -1 +cp $SBEROOT/obj/simics.tar $SBEFW_DIR/ || exit -1 # Compile sbe code in sandbox to copy binaries at right place echo "---Setup sandbox for sbe binaries." diff --git a/sbe/tools/scripts/ppeSetFixed.pl b/sbe/tools/scripts/ppeSetFixed.pl index 29db6c23..1e779e70 100755 --- a/sbe/tools/scripts/ppeSetFixed.pl +++ b/sbe/tools/scripts/ppeSetFixed.pl @@ -7,6 +7,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +44,7 @@ if ($numArgs < 3) print ("example:\n"); print ("./ppeSetFixed.pl \\\n" ); print (". \\\n" ); - print (" ../../sbe/obj/seeprom_main.bin \\\n" ); + print (" ../../obj/seeprom_main.bin \\\n" ); print ("$attrpath/p9_ppe_attributes.xml \\\n" ); print ("$attrpath/attribute_info/perv_attributes.xml \\\n" ); print ("$attrpath/attribute_info/proc_attributes.xml \\\n" ); |
