From a2ee107c441a4aad0744897f3dbc0d883dbf6f4e Mon Sep 17 00:00:00 2001 From: Glenn Miles Date: Tue, 30 Apr 2019 14:47:08 -0500 Subject: Update simbuild for axone simics bringup The XML for the RAM1 register was not being parsed correctly resulting in too few registers being allocated in uchip_regs.chip not defining all of the registers. This latest build adds those registers manually until the parser can be fixed. This build also sets the POR values for the RAM1 registers. Also changes OCMB I2C addresses to 0x40 Change-Id: Icd2df80874200741d82fc152cb4b8bdbc75c5bed Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76764 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Matthew Raybuck Reviewed-by: Ilya Smirnov Reviewed-by: Daniel M. Crowell --- src/build/citest/cxxtest-start.sh | 2 +- src/build/citest/etc/simbuild | 2 +- src/build/tools/hb | 4 ++-- .../targeting/common/xmltohb/simics_AXONE.system.xml | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/build/citest/cxxtest-start.sh b/src/build/citest/cxxtest-start.sh index f7fad9390..d857fd270 100755 --- a/src/build/citest/cxxtest-start.sh +++ b/src/build/citest/cxxtest-start.sh @@ -38,7 +38,7 @@ if [ "$MACHINE" != "NIMBUS" ] && [ "$MACHINE" != "CUMULUS" ] && \ [ "$MACHINE" != "CUMULUS_CDIMM" ] && [ "$MACHINE" != "FSPBUILD" ]; then export PATH=$PATH:$SANDBOXBASE/simics/ - export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/11a4199cd205aaad34566b1832e3ef6a" + export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/93089f4195ff3941cf4e62de103ba902" fi # Front end to autocitest - script to execute unit tests under simics. diff --git a/src/build/citest/etc/simbuild b/src/build/citest/etc/simbuild index 9b0bb11dd..59bc920a4 100644 --- a/src/build/citest/etc/simbuild +++ b/src/build/citest/etc/simbuild @@ -1 +1 @@ -/gsa/ausgsa/projects/h/hostboot/simbuild/04_26_19_57d024_simics.tar.gz \ No newline at end of file +/gsa/ausgsa/projects/h/hostboot/simbuild/05_01_19_a9c398_simics.tar.gz diff --git a/src/build/tools/hb b/src/build/tools/hb index e3d6514e0..41caa5a8b 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -424,8 +424,8 @@ hb_startsimics() #export MYDIR=$bb/obj/ppc/hbfw/simics/startup.simics #then /runsim -m axone -o hb_script_to_run=$MYDIR export MY_DIR="${SANDBOXBASE}/obj/ppc/simu/scripts/hbfw" - echo "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/11a4199cd205aaad34566b1832e3ef6a" - execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/11a4199cd205aaad34566b1832e3ef6a" "ppc" + echo "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/93089f4195ff3941cf4e62de103ba902" + execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/93089f4195ff3941cf4e62de103ba902" "ppc" else execute_in_sandbox \ "start_simics -machine ${MACHINE} ${SIMICSOPTIONS} $*" "ppc" diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml index eb779d2f6..9cb2296ea 100644 --- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml @@ -8652,7 +8652,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x08 i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -8719,7 +8719,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x09 i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -8786,7 +8786,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x0A i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -8853,7 +8853,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x0B i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -8920,7 +8920,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x0C i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -8987,7 +8987,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x0D i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -9054,7 +9054,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x0E i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -9121,7 +9121,7 @@ engine3 port1 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0x0F i2cMuxPathphysical:sys-0/node-0/i2c_mux-0 @@ -9188,7 +9188,7 @@ engine3 port0 - devAddr0xD0 + devAddr0x40 i2cMuxBusSelector0xFF i2cMuxPathphysical:sys-0 -- cgit v1.2.1