diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2012-02-29 18:57:50 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-03-21 16:09:39 -0500 |
commit | 606503c551de7b751c6a0b78df2b0c43bd9446cd (patch) | |
tree | d8b7251ea9703c8a337856a2a6f83f8f4ded506f /src/build | |
parent | 1a97a0ae095c01180fe85c2367b97a81d10cc8d0 (diff) | |
download | talos-hostboot-606503c551de7b751c6a0b78df2b0c43bd9446cd.tar.gz talos-hostboot-606503c551de7b751c6a0b78df2b0c43bd9446cd.zip |
Add support for MURANO simics config
Update bbuild to released 1209 driver (b0229a_1209.760)
RTC: 35596
Change-Id: Ifeb06070ac61943982509e88df6a1ca27c5e0aea
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/717
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
-rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 3 | ||||
-rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 22 | ||||
-rwxr-xr-x | src/build/tools/cpfiles.pl | 1 |
4 files changed, 17 insertions, 11 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 06f34cdb3..a3dc4f4e1 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips760/Builds/b0209a_1207.760 +/esw/fips760/Builds/b0229a_1209.760 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index b4ee2e082..44eb1a37c 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -27,6 +27,3 @@ ## to setup the sandbox ## -echo "+++ Patch for PHYP flight recorder." -sed -i -e's/.*PHYPLEVEL.*//' $sb/../simics/.simics_flightrecorder -sed -i -e's/.*PHYP_PATCH_LEVEL.*//' $sb/../simics/.simics_flightrecorder diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index 6e10b8e81..8a7ea500c 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -41,9 +41,16 @@ sed -i -e's/SETENV GFW_P8_VENICE_L3_MB_SIZE.*/SETENV GFW_P8_VENICE_L3_MB_SIZE 8/ # Backing build already contains 910431. Leave this workaround here for future scomdef files #sed -i -e's/SETENV GFW_P8_VENICE_MODEL_EC.*/SETENV GFW_P8_VENICE_MODEL_EC 910431/' $sb/simu/configs/P8_VENICE.config +echo "+++ Copy desired MURANO config file to sandbox and modify L3 to 8MB." +mkdir -p $sb/simu/configs +cp --update $BACKING_BUILD/src/simu/configs/P8_MURANO.config $sb/simu/configs +sed -i -e's/SETENV GFW_P8_MURANO_L3_MB_SIZE.*/SETENV GFW_P8_MURANO_L3_MB_SIZE 8/' $sb/simu/configs/P8_MURANO.config +# Backing build already contains 910431. Leave this workaround here for future scomdef files +#sed -i -e's/SETENV GFW_P8_MURANO_MODEL_EC.*/SETENV GFW_P8_MURANO_MODEL_EC 910431/' $sb/simu/configs/P8_MURANO.config + #Note: Leave this here as an example -#echo "+++ Update to new simics build for ECCB support." +#echo "+++ Some message about why you need to do this." #mkdir -p $sb/simu/data #egrep -v "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL|WSALIAS HOSTBOOT_LEVEL SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo #echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo @@ -69,9 +76,10 @@ cp $HOSTBOOTROOT/src/build/citest/etc/patches/centaur.act $sb/simu/data/cec-chip #fixme -echo "+++ Update to new phyp and mambo level." -mkdir -p $sb/simu/data -cp --update $BACKING_BUILD/src/simu/data/simicsInfo $sb/simu/data/simicsInfo -sed -i -e's/^WSALIAS HOSTBOOT_LEVEL MAMBOLEVEL.*/WSALIAS HOSTBOOT_LEVEL MAMBOLEVEL env\/mamboa\/2011_11_10__4.2/' $sb/simu/data/simicsInfo -sed -i -e's/^WSALIAS HOSTBOOT_LEVEL PHYPLEVEL.*/WSALIAS HOSTBOOT_LEVEL PHYPLEVEL env\/phypa\/simics-4.2.0\/simics-4.2.83\/ph120201a700.42/' $sb/simu/data/simicsInfo -sed -i -e's/^WSALIAS HOSTBOOT_LEVEL PHYP_PATCH_LEVEL.*/WSALIAS HOSTBOOT_LEVEL PHYP_PATCH_LEVEL env\/phypa\/simics-4.2.0\/simics-4.2.82\/patches\/ph120201a700.42/' $sb/simu/data/simicsInfo +# Leaving this here as an example for the future +#echo "+++ Update to new phyp and mambo level." +#mkdir -p $sb/simu/data +#cp --update $BACKING_BUILD/src/simu/data/simicsInfo $sb/simu/data/simicsInfo +#sed -i -e's/^WSALIAS HOSTBOOT_LEVEL MAMBOLEVEL.*/WSALIAS HOSTBOOT_LEVEL MAMBOLEVEL env\/mamboa\/2011_11_10__4.2/' $sb/simu/data/simicsInfo +#sed -i -e's/^WSALIAS HOSTBOOT_LEVEL PHYPLEVEL.*/WSALIAS HOSTBOOT_LEVEL PHYPLEVEL env\/phypa\/simics-4.2.0\/simics-4.2.83\/ph120201a700.42/' $sb/simu/data/simicsInfo +#sed -i -e's/^WSALIAS HOSTBOOT_LEVEL PHYP_PATCH_LEVEL.*/WSALIAS HOSTBOOT_LEVEL PHYP_PATCH_LEVEL env\/phypa\/simics-4.2.0\/simics-4.2.82\/patches\/ph120201a700.42/' $sb/simu/data/simicsInfo diff --git a/src/build/tools/cpfiles.pl b/src/build/tools/cpfiles.pl index a0bd64806..3a7781b0f 100755 --- a/src/build/tools/cpfiles.pl +++ b/src/build/tools/cpfiles.pl @@ -86,6 +86,7 @@ my %files = ("src/build/tools/hb-parsedump.pl" => "rsv", "img/pnor.toc" => "rsv", "img/simics_SALERNO_targeting.bin" => "rs", "img/simics_VENICE_targeting.bin" => "rs", + "img/simics_MURANO_targeting.bin" => "rs", "img/vbu_targeting.bin" => "rv", "img/isteplist.csv" => "rsv", "src/usr/hwpf/hwp/fapiTestHwp.C" => "r", |