summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/build/buildpnor/defaultPnorLayout.xml4
-rw-r--r--src/build/buildpnor/makefile2
-rw-r--r--src/build/buildpnor/pnorLayoutFake.xml4
-rw-r--r--src/build/buildpnor/pnorLayoutVpo.xml126
-rw-r--r--src/build/mkrules/dist.targets.mk1
-rwxr-xr-xsrc/build/mkrules/hbfw/img/makefile4
-rw-r--r--src/build/vpo/Setup_Env50
-rw-r--r--src/include/usr/pnor/pnor_const.H4
-rw-r--r--src/usr/isteps/istep15/host_build_stop_image.C2
-rw-r--r--src/usr/pnor/pnor_utils.C3
10 files changed, 38 insertions, 162 deletions
diff --git a/src/build/buildpnor/defaultPnorLayout.xml b/src/build/buildpnor/defaultPnorLayout.xml
index ed6e6812f..ccc84fece 100644
--- a/src/build/buildpnor/defaultPnorLayout.xml
+++ b/src/build/buildpnor/defaultPnorLayout.xml
@@ -158,8 +158,8 @@ Layout Description
<ecc/>
</section>
<section>
- <description>Sleep Winkle Ref Image (1.125MB)</description>
- <eyeCatch>WINK</eyeCatch>
+ <description>HCODE Ref Image (1.125MB)</description>
+ <eyeCatch>HCODE</eyeCatch>
<physicalOffset>0xF45000</physicalOffset>
<physicalRegionSize>0x120000</physicalRegionSize>
<sha512Version/>
diff --git a/src/build/buildpnor/makefile b/src/build/buildpnor/makefile
index bfa9302bb..f838e7007 100644
--- a/src/build/buildpnor/makefile
+++ b/src/build/buildpnor/makefile
@@ -50,7 +50,7 @@ $${IMGDIR}/$(1).pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting.
# @echo " HOSTBOOT_PROFILE enabled."
# @echo " Build of vbu.pnor skipped due to space constraints."
#else
-# ./buildpnorOld.pl --pnorLayout ./pnorLayoutVpo.xml \
+# ./buildpnorOld.pl --pnorLayout ./pnorLayoutFake.xml \
# --genToc \
# --pnorOutBin $${IMGDIR}/$(1).pnor \
# --binFile_part $${IMGDIR}/$(1)_pnor.toc \
diff --git a/src/build/buildpnor/pnorLayoutFake.xml b/src/build/buildpnor/pnorLayoutFake.xml
index 2bbd56cc9..485023a64 100644
--- a/src/build/buildpnor/pnorLayoutFake.xml
+++ b/src/build/buildpnor/pnorLayoutFake.xml
@@ -109,8 +109,8 @@ Layout Description
</section>
<section>
<!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>WINK (512K) </description>
- <eyeCatch>WINK</eyeCatch>
+ <description>HCODE (512K) </description>
+ <eyeCatch>HCODE</eyeCatch>
<physicalOffset>0x4A000</physicalOffset>
<physicalRegionSize>0x80000</physicalRegionSize>
<sha512Version/>
diff --git a/src/build/buildpnor/pnorLayoutVpo.xml b/src/build/buildpnor/pnorLayoutVpo.xml
deleted file mode 100644
index 6b0aa2994..000000000
--- a/src/build/buildpnor/pnorLayoutVpo.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG -->
-<!-- This is an automatically generated prolog. -->
-<!-- -->
-<!-- $Source: src/build/buildpnor/pnorLayoutVpo.xml $ -->
-<!-- -->
-<!-- OpenPOWER HostBoot Project -->
-<!-- -->
-<!-- Contributors Listed Below - COPYRIGHT 2012,2014 -->
-<!-- [+] 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 -->
-<pnor>
- <metadata>
- <imageSize>0x400000</imageSize>
- <blockSize>0x1000</blockSize>
- <partTableSize>0x1</partTableSize>
- <sideAOffset>0x0</sideAOffset>
- <sideBOffset>0x0</sideBOffset>
- </metadata>
- <section>
- <description>Table of Contents (2K)</description>
- <eyeCatch>part</eyeCatch>
- <physicalOffset>0</physicalOffset>
- <physicalRegionSize>0x1000</physicalRegionSize>
- <source>Generate</source>
- <sideless>no</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Module VPD (256K) -only supports 4 processors</description>
- <eyeCatch>MVPD</eyeCatch>
- <physicalOffset>0x1000</physicalOffset>
- <physicalRegionSize>0x40000</physicalRegionSize>
- <actualRegionSize>0x40000</actualRegionSize>
- <source>Blank</source>
- <sideless>yes</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>DIMM JEDEC (128K) -only supports 4 processors</description>
- <eyeCatch>DJVPD</eyeCatch>
- <physicalOffset>0x41000</physicalOffset>
- <physicalRegionSize>0x20000</physicalRegionSize>
- <actualRegionSize>0x20000</actualRegionSize>
- <source>Blank</source>
- <sideless>yes</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Centaur VPD (128K) -only supports 4 processors</description>
- <eyeCatch>CVPD</eyeCatch>
- <physicalOffset>0x61000</physicalOffset>
- <physicalRegionSize>0x20000</physicalRegionSize>
- <actualRegionSize>0x20000</actualRegionSize>
- <source>Blank</source>
- <sideless>yes</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Hostboot Extended image (3MB)</description>
- <eyeCatch>HBI</eyeCatch>
- <physicalOffset>0x81000</physicalOffset>
- <physicalRegionSize>0x300000</physicalRegionSize>
- <source>File</source>
- <sideless>no</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Sleep Winkle Ref Image (196K) </description>
- <eyeCatch>WINK</eyeCatch>
- <physicalOffset>0x381000</physicalOffset>
- <physicalRegionSize>0x31000</physicalRegionSize>
- <actualRegionSize>0x30000</actualRegionSize>
- <source>Blank</source>
- <sideless>no</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Hostboot Error Logs (64K)</description>
- <eyeCatch>HBEL</eyeCatch>
- <physicalOffset>0x3B2000</physicalOffset>
- <physicalRegionSize>0x10000</physicalRegionSize>
- <actualRegionSize>0x10000</actualRegionSize>
- <source>Blank</source>
- <sideless>no</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Attribute Data (128k)</description>
- <eyeCatch>HBD</eyeCatch>
- <physicalOffset>0x3C2000</physicalOffset>
- <physicalRegionSize>0x20000</physicalRegionSize>
- <source>File</source>
- <sideless>no</sideless>
- </section>
- <section>
- <description>Guard Data (16K)</description>
- <eyeCatch>GUARD</eyeCatch>
- <physicalOffset>0x3E2000</physicalOffset>
- <physicalRegionSize>0x4000</physicalRegionSize>
- <source>Blank</source>
- <sideless>no</sideless>
- </section>
- <section>
- <!-- NOTE: smaller than official layout for fake-PNOR -->
- <description>Centaur SBE image (64K)</description>
- <eyeCatch>SBEC</eyeCatch>
- <physicalOffset>0x3E6000</physicalOffset>
- <physicalRegionSize>0x10000</physicalRegionSize>
- <source>Blank</source>
- <sideless>no</sideless>
- </section>
-</pnor>
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index e01834e22..15e16a396 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -57,7 +57,6 @@ COPY_FILES = \
src/build/vpo/hb-virtdebug.pl:vpo \
src/build/vpo/VBU_Cacheline.pm:vpo \
src/build/simics/hb-pnor-vpd-preload.pl:vpo \
- src/build/buildpnor/pnorLayoutVpo.xml:vpo \
src/build/buildpnor/pnorLayoutFake.xml:vpo \
img/errlparser:tools,vpo,openpower \
img/hbotStringFile:tools,vpo,openpower \
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index 530c9f63c..d003c8ac2 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -307,8 +307,8 @@ inject_ecc: build_sbe_partitions
rm ${TEMP_IMG}
#@fixme - Put SBEC back (RTC:154286) "SBEC=${SBEC_IMG_ECC},"
-NIMBUS_SECT = HBD=${NIMBUS_TARG_IMG_ECC},SBE=${NIMBUS_SBE_IMG_ECC},WINK=${NIMBUS_LOCAL_SLW_IMG_ECC}
-FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE},WINK=${NIMBUS_LOCAL_SLW_IMG}
+NIMBUS_SECT = HBD=${NIMBUS_TARG_IMG_ECC},SBE=${NIMBUS_SBE_IMG_ECC},HCODE=${NIMBUS_LOCAL_SLW_IMG_ECC}
+FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE},HCODE=${NIMBUS_LOCAL_SLW_IMG}
# To build fake PNOR, set FAKEPNOR to filename of file to build,
# ie, 'export FAKEPNOR=fake8m.pnor'
diff --git a/src/build/vpo/Setup_Env b/src/build/vpo/Setup_Env
index 682f51a95..a11e9ee06 100644
--- a/src/build/vpo/Setup_Env
+++ b/src/build/vpo/Setup_Env
@@ -6,7 +6,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2016
# [+] International Business Machines Corp.
#
#
@@ -74,7 +74,7 @@ test "$AUTOVBU_USER_CMD" = "" && AUTOVBU_USER_CMD=NO_TEST
AUTOVBU_HBRELEASE_BASEDIR=/gsa/ausgsa/projects/h/hostboot/release
AUTOVBU_HBTOOLS_BASEDIR=/afs/apd.pok.ibm.com/u/thi/hbtools
AUTOVBU_HBVBUTOOLS_BASEDIR=/gsa/ausgsa/projects/h/hostboot/vbutools
-
+
# Remove any previous test definitions for HostBoot values - force everything to default if not set
# by Setup_MyEnv function or user specifed argument(s)
@@ -92,10 +92,10 @@ unset HB_VBUPNOR_ADDR HB_SYSMVPD_ADDR HB_SYSSPD_ADDR
################################################################################
Setup_MyEnv() {
-
+
# Default Sprint release
sprint=hb1107b_1445.820
-
+
# Initialize HostBoot environment/cronus/tools - note new naming convention
export AUTOVBU_CRONUS_SIM=rel
@@ -106,23 +106,23 @@ Setup_MyEnv() {
# Select default model -- choose either VBU or VPO versions
export VPO_MODEL=n_2_b; unset VBU_MODEL; VBUVPO=VPO
-
+
# Default AWAN request time - shorter periods get AWAN faster
export AWAN_TIME_REQ=-h24
-
+
# Default AWAN request server
export ASUBMIT_SERVER=${ASUBMIT_SERVER-asubmit2.pok.ibm.com}
# Default sprint test case settings
-
+
export AUTOVBU_CORE=-cft
export AUTOVBU_SIMCLOCKS=5000000
export AUTOVBU_INITIAL_CHKPT=mcguirej_14.10.05_real_after_istep_s5.chkpt
export AUTOVBU_LOOPS=1200
export AUTOVBU_PRINTK_LINES=50
-
+
# Values used internally by automated tools
test "$MY_BSO_ID" = "" && echo "Warning: Set MY_BSO_ID to IBM intranet ID if BSO firewall required"
@@ -145,7 +145,7 @@ Setup_MyArgs() {
get_awan=
load_hb_img=
-
+
# Argument parse loop
while [ $# -gt 0 ]
do
@@ -226,7 +226,7 @@ Setup_MyArgs() {
*)
;;
esac
-
+
shift
done
}
@@ -336,26 +336,26 @@ Setup_MyDynamic() {
Setup_MyAWAN() {
# Allow testing with an Austin based VNC server, but we must run in POK and lower BSO firewall
-
+
if [ `hostname -d` != "pok.ibm.com" ]; then
echo "ERROR: This script must be sourced on a POK based Linux system (batchl004, vpopok2 or vpopok3)"
return 1
fi
-
+
# Make sure DISPLAY includes our host name
-
+
test "`expr index "$DISPLAY" ':'`" = "1" && DISPLAY=`hostname`$DISPLAY
# Force common DISPLAY format "<hostname>:<vnc>"
DISPLAY=`echo $DISPLAY | sed -e 's/\(:[^\.]*\).*/\1/'`
# Defines used for AWAN communication
-
+
MY_AWAN_TARGET=/afs/apd.pok.ibm.com/u/${MY_AFS_USER-$USER}/awan/awan.target-$VBU_MODEL$VPO_MODEL-${MY_AWAN_DIR-${MY_AFS_USER-$USER}}-$DISPLAY
MY_AWAN_HAVE=/afs/apd.pok.ibm.com/u/${MY_AFS_USER-$USER}/awan/awan.HAVE-$VBU_MODEL$VPO_MODEL-${MY_AWAN_DIR-${MY_AFS_USER-$USER}}-$DISPLAY
MY_AWAN_INIT=/afs/apd.pok.ibm.com/u/${MY_AFS_USER-$USER}/awan/awan.init-$VBU_MODEL$VPO_MODEL-${MY_AWAN_DIR-${MY_AFS_USER-$USER}}-$DISPLAY
MY_AWAN_KEEP=/afs/apd.pok.ibm.com/u/${MY_AFS_USER-$USER}/awan/awan.KEEP-$VBU_MODEL$VPO_MODEL-${MY_AWAN_DIR-${MY_AFS_USER-$USER}}-$DISPLAY
-
+
if [ "$get_awan" = "YES" ]; then
unset ECMD_TARGET
# Add environmental definitions for automated test
@@ -365,7 +365,7 @@ Setup_MyAWAN() {
#export -p | egrep "P8_${VBUVPO}DD1_.*AWAN_SCRIPT"; echo
(
# Check to see if we must lower BSO firewall
-
+
echo $DISPLAY | egrep "pok.ibm.com|boeblingen.de.ibm.com" >/dev/null
if [ $? -eq 0 ]; then
# POK/BOE based VNC servers should not need BSO
@@ -377,12 +377,12 @@ Setup_MyAWAN() {
echo
return 1
fi
-
+
unset my_bso_cmd
test "$MY_BSO_ID" != "" && my_bso_cmd="--lower_firewall $MY_BSO_ID"
-
+
# Pick up SIMDISPATCH level used by this cronus, and pass it to the AWAN request
-
+
if [ -f "$ECMD_EXE" ]; then
cronus_dir=`dirname $ECMD_EXE`
if [ -f "$cronus_dir/SIMDISP_RELEASE" ]; then
@@ -403,7 +403,7 @@ Setup_MyAWAN() {
echo "$JR/auto${vbuvpo}test $my_bso_cmd --silent --keep_awan SIMDISP_RELEASE=$SIMDISP_RELEASE AUTOVBU_ECMD_VER=$AUTOVBU_ECMD_VER AUTOVBU_CRONUS_SIM=$AUTOVBU_CRONUS_SIM \\"
echo " -- : $VBU_MODEL$VPO_MODEL:$AWAN_CONFIG:HBI=\\\$AUTOVBU_USER_CMD"
echo
-
+
$JR/auto${vbuvpo}test $my_bso_cmd --silent --keep_awan SIMDISP_RELEASE=$SIMDISP_RELEASE AUTOVBU_ECMD_VER=$AUTOVBU_ECMD_VER AUTOVBU_CRONUS_SIM=$AUTOVBU_CRONUS_SIM \
-- : $VBU_MODEL$VPO_MODEL:$AWAN_CONFIG:HBI=\$AUTOVBU_USER_CMD
) || return 1
@@ -427,7 +427,7 @@ Setup_MyTarget() {
done
fi
fi
-
+
if [ -f $MY_AWAN_TARGET ]; then
my_target=`cat $MY_AWAN_TARGET`
touch $MY_AWAN_KEEP
@@ -442,12 +442,12 @@ Setup_MyTarget() {
fi
echo
target $my_target
-
+
if [ -f "$CRONUS_HOME/cnfgs/${my_target}_cnfg" ]; then
# Update target cronus config file
getconfig HW_PROCEDURE_PATH -quiet | grep -s $HB_VBUTOOLS
- test $? || setconfig HW_PROCEDURE_PATH $HB_VBUTOOLS
+ test $? || setconfig HW_PROCEDURE_PATH $HB_VBUTOOLS
setconfig GLOBAL_DEBUG $GLOBAL_DEBUG -quiet
getconfig GLOBAL_DEBUG -quiet
@@ -508,7 +508,7 @@ Setup_MyHBImage() {
fi
ls -l hbicore.bin vbu.pnor sysmvpd.dat syscvpd.dat sysspd.dat procpore.dat
- # Note: The loading addresses must match the PNOR layout in src/build/buildpnor/pnorLayoutVpo.xml
+ # Note: The loading addresses must match the PNOR layout in src/build/buildpnor/pnorLayoutFake.xml
/afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/hbicore.bin -b -cft
/afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/vbu.pnor -o ${HB_VBUPNOR_ADDR-0x400000} -b -cft
/afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/p8_load_l3 -l rel -f $PWD/sysmvpd.dat -o ${HB_SYSMVPD_ADDR-0x401000} -b -cft
@@ -530,7 +530,7 @@ Setup_MyHBImage() {
do
putscom pu 1${core}0F0105 0280000000000000 -all -quiet
done
-
+
# Set PNOR mode to fake PNOR using Scratch 1 (This is no longer needed since we use a custom image that always use faked PNOR)
# putscom pu.ex 10013284 FAC0FAC0FAC0FAC0 -p0 -cft -quiet
# putscom pu.ex 10013285 0000000000000001 -p0 -cft -quiet
diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H
index 1dd598085..a7ca2c3b0 100644
--- a/src/include/usr/pnor/pnor_const.H
+++ b/src/include/usr/pnor/pnor_const.H
@@ -43,7 +43,7 @@ enum SectionId
HB_BASE_CODE, /**< Hostboot Base Image */
CENTAUR_SBE, /**< Centaur Self-Boot Engine image */
SBE_IPL, /**< Self-Boot Engine IPL image */
- WINK, /**< Sleep Winkle Reference image */
+ HCODE, /**< HCODE Reference image */
PAYLOAD, /**< HAL/OPAL */
HB_RUNTIME, /**< Hostboot Runtime (for Sapphire) */
HB_DATA, /**< Hostboot Data */
@@ -63,8 +63,10 @@ enum SectionId
TEST, /**< Scratch space for PNOR test cases */
TESTRO, /**< Scratch space for PNOR ReadOnly test cases */
BACKUP_PART, /**< Backup of TOC*/
+ POWERVM, /**< Power VM data */
NUM_SECTIONS, /**< Number of defined sections */
+
FIRST_SECTION = TOC, /**< First section (for looping) */
/**< Used for error cases, initialization */
INVALID_SECTION = NUM_SECTIONS,
diff --git a/src/usr/isteps/istep15/host_build_stop_image.C b/src/usr/isteps/istep15/host_build_stop_image.C
index a1e1284b2..dbb9b8800 100644
--- a/src/usr/isteps/istep15/host_build_stop_image.C
+++ b/src/usr/isteps/istep15/host_build_stop_image.C
@@ -83,7 +83,7 @@ errlHndl_t loadHcodeImage( char *& o_rHcodeAddr)
do
{
// Get WINK PNOR section info from PNOR RP
- l_errl = PNOR::getSectionInfo( PNOR::WINK, l_info );
+ l_errl = PNOR::getSectionInfo( PNOR::HCODE, l_info );
if( l_errl )
{
//No need to commit error here, it gets handled later
diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C
index 1171c53fc..33dcb3a27 100644
--- a/src/usr/pnor/pnor_utils.C
+++ b/src/usr/pnor/pnor_utils.C
@@ -59,7 +59,7 @@ const char* cv_EYECATCHER[] = {
"HBB", /**< PNOR::HB_BASE_CODE : Hostboot Base Image */
"SBEC", /**< PNOR::CENTAUR_SBE : Centaur Self-Boot Engine image */
"SBE", /**< PNOR::SBE_IPL : Self-Boot Enginer IPL image */
- "WINK", /**< PNOR::WINK : Sleep Winkle Reference image */
+ "HCODE", /**< PNOR::HCODE : HCODE Reference image */
"PAYLOAD", /**< PNOR::PAYLOAD : HAL/OPAL */
"HBRT", /**< PNOR::HB_RUNTIME : Hostboot Runtime(for Sapphire)*/
"HBD", /**< PNOR::HB_DATA : Hostboot Data */
@@ -79,6 +79,7 @@ const char* cv_EYECATCHER[] = {
"TEST", /**< PNOR::TEST : Test space for PNOR*/
"TESTRO", /**< PNOR::TESTRO : ReadOnly Test space for PNOR */
"BACKUP_PART", /**PNOR::BACKUP_PART : Backup of PART*/
+ "POWERVM", /**< PNOR::POWERVM : Power VM data */
};
/**
OpenPOWER on IntegriCloud