diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2018-07-17 09:55:12 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-08-20 13:13:37 -0500 |
commit | 1b5a02cab7f8c7f0de2536a46ae8c8448023e484 (patch) | |
tree | eb91c4ea42f119f05b47463ac36436509d6283ea /src/build/citest | |
parent | 307b61a6de9baae0c7bb73078ea856b728c19e7f (diff) | |
download | talos-hostboot-1b5a02cab7f8c7f0de2536a46ae8c8448023e484.tar.gz talos-hostboot-1b5a02cab7f8c7f0de2536a46ae8c8448023e484.zip |
Use Cumulus DD1.3 SBE image instead of DD1.0
Adding support for Cumulus DD1.3 SBE images in the FSP PNOR
Dropping support for Cumulus DD1.0 SBE image from FSP PNOR
CMVC-Prereq: 1060757
CMVC-Prereq: 1063108
CMVC-Prereq: 1061378
Change-Id: Ia315c6f786ef6c522acf4e580ad435b0180513b3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62636
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/citest')
-rw-r--r-- | src/build/citest/etc/bbuild | 3 | ||||
-rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 9 | ||||
-rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 14fddbc07..5d549ca19 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1,2 +1 @@ -/esw/fips920/Builds/b0710c_1827.920 - +/esw/fips930/Builds/b0731a_1832.930 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 82a1c72fe..8708e2b03 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -38,3 +38,12 @@ cp $BACKING_BUILD/src/simu/data/cec-chip/centaur_memory.act $sb/simu/data/cec-ch chmod 777 $sb/simu/data/cec-chip/centaur_memory.act patch -p0 $sb/simu/data/cec-chip/centaur_memory.act $PROJECT_ROOT/src/build/citest/etc/patches/centaur_memory.act.patch + +########################################################################## +echo "+++ SBE support for Cumulus DD1.3 +++" +#Pull in the code +sbex -t 1060757 +#Build sbei to create p9c_13.sbe_seeprom.hdr.bin +mkdir -p $sb/sbei/sbfw/ +cd $sb/sbei/sbfw/ +mk diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index a4d682dd7..08da3baed 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -35,12 +35,17 @@ #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo +########################################################################## +echo "+++ Update standalone configs to use modern proc levels +++" +sbex -t 1063108 + echo "+++ Need to alter where we look for pnor images so they will be picked up properly" mkdir -p $sb/simu/data ############################################################################### ### NOTE - if you need to sbex a simicsInfo track it needs to be done BEFORE ### executing the code below +### NOTE - these lines are permanent to allow external PNOR testing ############################################################################### cp $bb/src/simu/data/simicsInfo $sb/simu/data/ chmod +w $sb/simu/data/simicsInfo |