diff options
-rw-r--r-- | src/build/buildpnor/pnorLayoutFSP.xml | 8 | ||||
-rw-r--r-- | src/build/configs/fsprelease.config | 2 | ||||
-rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 12 | ||||
-rw-r--r-- | src/usr/runtime/populate_hbruntime.C | 59 |
4 files changed, 42 insertions, 39 deletions
diff --git a/src/build/buildpnor/pnorLayoutFSP.xml b/src/build/buildpnor/pnorLayoutFSP.xml index 39fbe326c..67fb220ef 100644 --- a/src/build/buildpnor/pnorLayoutFSP.xml +++ b/src/build/buildpnor/pnorLayoutFSP.xml @@ -249,14 +249,6 @@ Layout Description - Used when building an FSP driver <side>sideless</side> <ecc/> </section> - <section> - <description>OCC Lid (1.125M)</description> - <eyeCatch>OCC</eyeCatch> - <physicalOffset>0x2AD4000</physicalOffset> - <physicalRegionSize>0x120000</physicalRegionSize> - <side>sideless</side> - <ecc/> - </section> <section> <description>VFRT data for WOF (3MB)</description> <!-- We need 266KB per module sort, going to support diff --git a/src/build/configs/fsprelease.config b/src/build/configs/fsprelease.config index 75d97efff..0d204efd3 100644 --- a/src/build/configs/fsprelease.config +++ b/src/build/configs/fsprelease.config @@ -7,7 +7,7 @@ unset ALLOW_MACRONIX_PNOR unset INCLUDE_XML_OPPOWERVM unset INCLUDE_XML_OPENPOWER unset ENABLE_HDAT_IN_HOSTBOOT -unset START_OCC_DURING_BOOT +set START_OCC_DURING_BOOT unset NO_SBE_UPDATES unset BMC_BT_LPC_IPMI unset HTMGT diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 3835265ba..5050ac32e 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -247,7 +247,11 @@ SBEC_FINAL_IMG = SBEC.bin # Decide which PNOR to build .if(${FAKEPNOR} == "") # Paramemters passed into GEN_PNOR_IMAGE_SCRIPT. - GEN_NIMBUS_BIN_FILES = ${NIMBUS}:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},OCC=${${NIMBUS_OCC_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P} + .if(${DEFAULT_PNOR} == 1) + GEN_NIMBUS_BIN_FILES = ${NIMBUS}:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},OCC=${${NIMBUS_OCC_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P} + .else + GEN_NIMBUS_BIN_FILES = ${NIMBUS}:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P} + .endif #@TODO RTC:163810 - Put SBEC back "--systemBinFile SBEC=${${SBEC_IMG}:P}" SYSTEM_SPECIFIC_PARAMS = --install-all --emit-eccless ${TARGET_TEST:b--test} ${CONFIG_SECUREBOOT:b--secureboot} \ --pnorLayout ${PNOR_LAYOUT} ${CORRUPT_PARAMS} ${HB_STANDALONE:b--hb-standalone} \ @@ -278,7 +282,11 @@ gen_system_specific_images: build_sbe_partitions .PMAKE HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},TEST=${TEST_FINAL_IMG},TESTRO=${TESTRO_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},PAYLOAD=${PAYLOAD_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},WOFDATA=${WOFDATA_FINAL_IMG} #@TODO RTC:163810 - Put SBEC back "SBEC=${SBEC_FINAL_IMG}," -NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG} +.if(${DEFAULT_PNOR} == 1) + NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG} +.else + NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG} +.endif PNOR_IMG_INFO = \ nimbus.pnor:${PNOR_LAYOUT}:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \ ${FIPS_PNOR_INFO} diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C index 4be72cce3..2a0d57daf 100644 --- a/src/usr/runtime/populate_hbruntime.C +++ b/src/usr/runtime/populate_hbruntime.C @@ -624,37 +624,40 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) #ifdef CONFIG_START_OCC_DURING_BOOT /////////////////////////////////////////////////// // OCC Common entry - TARGETING::Target * l_sys = nullptr; - TARGETING::targetService().getTopLevelTarget( l_sys ); - assert(l_sys != nullptr); - uint64_t l_occCommonAddr = l_sys->getAttr - <TARGETING::ATTR_OCC_COMMON_AREA_PHYS_ADDR>(); - l_label = HBRT_RSVD_MEM__OCC_COMMON; - l_labelSize = strlen(l_label) + 1; - - // Get a pointer to the next available HDAT HB Rsv Mem entry - l_rngPtr = nullptr; - l_elog = getNextRhbAddrRange(l_rngPtr); - if(l_elog) + if( !(TARGETING::is_phyp_load()) ) { - break; - } + TARGETING::Target * l_sys = nullptr; + TARGETING::targetService().getTopLevelTarget( l_sys ); + assert(l_sys != nullptr); + uint64_t l_occCommonAddr = l_sys->getAttr + <TARGETING::ATTR_OCC_COMMON_AREA_PHYS_ADDR>(); + l_label = HBRT_RSVD_MEM__OCC_COMMON; + l_labelSize = strlen(l_label) + 1; - // Fill in the entry - l_rngPtr->hdatRhbRngType = - static_cast<uint8_t>(HDAT::RHB_TYPE_HOMER_OCC); - l_rngPtr->hdatRhbRngId = i_nodeId; - l_rngPtr->hdatRhbAddrRngStrAddr = - l_occCommonAddr | VmmManager::FORCE_PHYS_ADDR; - l_rngPtr->hdatRhbAddrRngEndAddr = - (l_occCommonAddr | VmmManager::FORCE_PHYS_ADDR) - + VMM_OCC_COMMON_SIZE - 1 ; - l_rngPtr->hdatRhbLabelSize = l_labelSize; - memcpy( l_rngPtr->hdatRhbLabelString, - l_label, - l_labelSize ); + // Get a pointer to the next available HDAT HB Rsv Mem entry + l_rngPtr = nullptr; + l_elog = getNextRhbAddrRange(l_rngPtr); + if(l_elog) + { + break; + } - traceHbRsvMemRange(l_rngPtr); + // Fill in the entry + l_rngPtr->hdatRhbRngType = + static_cast<uint8_t>(HDAT::RHB_TYPE_HOMER_OCC); + l_rngPtr->hdatRhbRngId = i_nodeId; + l_rngPtr->hdatRhbAddrRngStrAddr = + l_occCommonAddr | VmmManager::FORCE_PHYS_ADDR; + l_rngPtr->hdatRhbAddrRngEndAddr = + (l_occCommonAddr | VmmManager::FORCE_PHYS_ADDR) + + VMM_OCC_COMMON_SIZE - 1 ; + l_rngPtr->hdatRhbLabelSize = l_labelSize; + memcpy( l_rngPtr->hdatRhbLabelString, + l_label, + l_labelSize ); + + traceHbRsvMemRange(l_rngPtr); + } #endif } |