Skip to content

Commit

Permalink
Resize WOF to allow AXONE test pnor to fit inside 64 MB
Browse files Browse the repository at this point in the history 
This commit reduces the size of the WOFDATA section in PNOR from
12 MB -> 6 MB in an effort to get axone pnor test image fitting in
64 MB. We also had to move from using the very larg ZZ WOF image
to use the smaller Zeppelin WOF image. Due to the way the makefile
that generates the pnor image works we always generate "final" versions
of all 3 WOF images (ZZ, Zeppelin, Fleetwood) regardless of what we
are actually building. There were some checks in the genPnorImages
script that would ensure the layout you are using was big enough
for any binary that we generate. I have removed this restriction so
you can now generate binaries that are larger then the space allotted
(we will not use the larger binaries but they still get generated). The
alternative is to edit the makefile to only generate the "final" images
of the sections we want. That is possible but would require a larger
rewrite of the makefile.

Change-Id: Ib52572ad5e3d58accb49f414b6a0c61babf3cefd
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75257
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@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>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
  • Loading branch information
@crgeddes @wghoffa
crgeddes authored and wghoffa committed Apr 1, 2019
1 parent 09b6e80 commit f55c462
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 22 deletions.
3 changes: 0 additions & 3 deletions src/build/buildpnor/genPnorImages.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,6 @@

#Perform any data integrity manipulation (ECC, sha-hash, etc)
manipulateImages(\%pnorLayout, \%binFiles, $system_target);

# Make sure provided files will fit in their sections
checkSpaceConstraints(\%pnorLayout, \%binFiles, $testRun);
}

################################################################################
Expand Down
27 changes: 9 additions & 18 deletions src/build/buildpnor/pnorLayoutAxone.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,23 +256,23 @@ Layout Description
40 tables by default, plus ECC -->
<eyeCatch>WOFDATA</eyeCatch>
<physicalOffset>0x3258000</physicalOffset>
<physicalRegionSize>0xC00000</physicalRegionSize>
<physicalRegionSize>0x600000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
<ecc/>
</section>
<section>
<description>FIRDATA (12K)</description>
<eyeCatch>FIRDATA</eyeCatch>
<physicalOffset>0x3E58000</physicalOffset>
<physicalOffset>0x3858000</physicalOffset>
<physicalRegionSize>0x3000</physicalRegionSize>
<side>sideless</side>
<ecc/>
</section>
<section>
<description>Memory Data (128K)</description>
<eyeCatch>MEMD</eyeCatch>
<physicalOffset>0x3E5B000</physicalOffset>
<physicalOffset>0x385B000</physicalOffset>
<physicalRegionSize>0x20000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
Expand All @@ -281,7 +281,7 @@ Layout Description
<section>
<description>Secureboot Test Load (12K)</description>
<eyeCatch>TESTLOAD</eyeCatch>
<physicalOffset>0x3E7B000</physicalOffset>
<physicalOffset>0x387B000</physicalOffset>
<physicalRegionSize>0x3000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
Expand All @@ -290,7 +290,7 @@ Layout Description
<section>
<description>Centaur Hw Ref Image (12K)</description>
<eyeCatch>CENHWIMG</eyeCatch>
<physicalOffset>0x3E7E000</physicalOffset>
<physicalOffset>0x387E000</physicalOffset>
<physicalRegionSize>0x3000</physicalRegionSize>
<sha512Version/>
<side>sideless</side>
Expand All @@ -299,7 +299,7 @@ Layout Description
<section>
<description>Secure Boot (144K)</description>
<eyeCatch>SECBOOT</eyeCatch>
<physicalOffset>0x3E81000</physicalOffset>
<physicalOffset>0x3881000</physicalOffset>
<physicalRegionSize>0x24000</physicalRegionSize>
<side>sideless</side>
<ecc/>
Expand All @@ -308,7 +308,7 @@ Layout Description
<section>
<description>Open CAPI Memory Buffer (OCMB) Firmware (300K)</description>
<eyeCatch>OCMBFW</eyeCatch>
<physicalOffset>0x3EA5000</physicalOffset>
<physicalOffset>0x38A5000</physicalOffset>
<physicalRegionSize>0x4B000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
Expand All @@ -318,7 +318,7 @@ Layout Description
<section>
<description>HDAT Data (16K)</description>
<eyeCatch>HDAT</eyeCatch>
<physicalOffset>0x3EF0000</physicalOffset>
<physicalOffset>0x38F0000</physicalOffset>
<physicalRegionSize>0x4000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
Expand All @@ -327,18 +327,9 @@ Layout Description
<section>
<description>Eeprom Cache(512K)</description>
<eyeCatch>EECACHE</eyeCatch>
<physicalOffset>0x3EF4000</physicalOffset>
<physicalOffset>0x38F4000</physicalOffset>
<physicalRegionSize>0x80000</physicalRegionSize>
<side>sideless</side>
<ecc/>
</section>
<section>
<description>Ultravisor XSCOM White/Blacklist (64K)</description>
<eyeCatch>UVBWLIST</eyeCatch>
<physicalOffset>0x3F74000</physicalOffset>
<physicalRegionSize>0x10000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
<readOnly/>
</section>
</pnor>
2 changes: 1 addition & 1 deletion src/build/mkrules/hbfw/img/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ gen_system_specific_images: build_sbe_partitions .PMAKE
NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG},WOFDATA=${ZZ_WOFDATA_FINAL_IMG},CENHWIMG=${NIMBUS_CENHWIMG_FINAL_IMG},MEMD=${ZZ_MEMD_FINAL_IMG}
CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG},MEMD=${ZEPPELIN_MEMD_FINAL_IMG}
CUMULUS_CDIMM_SECT = HBD=${CUMULUS_CDIMM_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${CUMULUS_CENHWIMG_FINAL_IMG},MEMD=${MEMD_FINAL_IMG}
AXONE_SECT = HBD=${AXONE_HBD_FINAL_IMG},SBE=${AXONE_SBE_FINAL_IMG},HCODE=${AXONE_HCODE_FINAL_IMG},OCC=${AXONE_OCC_FINAL_IMG},WOFDATA=${ZZ_WOFDATA_FINAL_IMG},CENHWIMG=${AXONE_CENHWIMG_FINAL_IMG},EECACHE=${EECACHE_FINAL_IMG},FIRDATA=${FIRDATA_FINAL_IMG},MEMD=${MEMD_FINAL_IMG}
AXONE_SECT = HBD=${AXONE_HBD_FINAL_IMG},SBE=${AXONE_SBE_FINAL_IMG},HCODE=${AXONE_HCODE_FINAL_IMG},OCC=${AXONE_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG},CENHWIMG=${AXONE_CENHWIMG_FINAL_IMG},EECACHE=${EECACHE_FINAL_IMG},FIRDATA=${FIRDATA_FINAL_IMG},MEMD=${MEMD_FINAL_IMG}


.if (${PNOR_LAYOUT_SELECTED} == "AXONE")
Expand Down

0 comments on commit f55c462

Please sign in to comment.