Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "New Pnor HDAT partition addition." #86

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "New Pnor HDAT partition addition." #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions create_pnor_image.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
my $openpower_version_filename = "";
my $wofdata_binary_filename = "";
my $memddata_binary_filename = "";
my $hdat_binary_filename = "";

while (@ARGV > 0){
$_ = $ARGV[0];
Expand Down Expand Up @@ -100,10 +99,6 @@
$memddata_binary_filename = $ARGV[1] or die "Bad command line arg given: expecting a memddata binary filename.\n";
shift;
}
elsif (/^-hdat_binary_filename/i){
$hdat_binary_filename = $ARGV[1] or die "Bad command line arg given: expecting a hdat binary filename.\n";
shift;
}
else {
print "Unrecognized command line arg: $_ \n";
print "To view all the options and help text run \'$program_name -h\' \n";
Expand Down Expand Up @@ -139,6 +134,7 @@
$build_pnor_command .= " --binFile_DJVPD $scratch_dir/djvpd_fill.bin.ecc";
$build_pnor_command .= " --binFile_CVPD $scratch_dir/cvpd.bin.ecc";
$build_pnor_command .= " --binFile_ATTR_TMP $scratch_dir/attr_tmp.bin.ecc";
$build_pnor_command .= " --binFile_ATTR_PERM $scratch_dir/attr_perm.bin.ecc";
$build_pnor_command .= " --binFile_OCC $occ_binary_filename.ecc";
$build_pnor_command .= " --binFile_FIRDATA $scratch_dir/firdata.bin.ecc";
$build_pnor_command .= " --binFile_CAPP $scratch_dir/cappucode.bin.ecc";
Expand All @@ -149,7 +145,6 @@
if ($release eq "p9"){
$build_pnor_command .= " --binFile_WOFDATA $wofdata_binary_filename" if -e $wofdata_binary_filename;
$build_pnor_command .= " --binFile_MEMD $memddata_binary_filename" if -e $memddata_binary_filename;
$build_pnor_command .= " --binFile_HDAT $hdat_binary_filename" if -e $hdat_binary_filename;
}
if ($release eq "p8"){
$build_pnor_command .= " --binFile_SBEC $scratch_dir/$sbec_binary_filename";
Expand Down
16 changes: 0 additions & 16 deletions p9Layouts/defaultPnorLayout_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,6 @@ Layout Description
<side>A</side>
<reprovision/>
</section>
<!-- Commenting this temporarily as a workaround for accomadating
new partition. Due to incorrect Toc size assumption, currently
we are unable to create more than 31 partitions. Until the
proper fix comes in, commenting this out based on internal
discussion.
<section>
<description>Permanent Attribute Override (32K)</description>
<eyeCatch>ATTR_PERM</eyeCatch>
Expand All @@ -297,7 +292,6 @@ Layout Description
<reprovision/>
<clearOnEccErr/>
</section>
-->
<section>
<description>PNOR Version (4K)</description>
<eyeCatch>VERSION</eyeCatch>
Expand Down Expand Up @@ -366,14 +360,4 @@ Layout Description
<readOnly/>
<ecc/>
</section>
<section>
<description>HDAT binary data (16KB)</description>
<eyeCatch>HDAT</eyeCatch>
<physicalOffset>0x2BC6000</physicalOffset>
<physicalRegionSize>0x8000</physicalRegionSize>
<side>sideless</side>
<sha512Version/>
<readOnly/>
<ecc/>
</section>
</pnor>
22 changes: 5 additions & 17 deletions update_image.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
my $pnor_layout = "";
my $debug = 0;
my $sign_mode = "";
my $hdat_binary_filename = "";

while (@ARGV > 0){
$_ = $ARGV[0];
Expand Down Expand Up @@ -143,11 +142,6 @@
$memd_binary_filename = $ARGV[1];
shift;
}
elsif(/^-hdat_binary_filename/i){
# This filename is necessary if the file exists, but if its not given, we add blank partition
$hdat_binary_filename = $ARGV[1];
shift;
}
else {
print "Unrecognized command line arg: $_ \n";
#print "To view all the options and help text run \'$program_name -h\' \n";
Expand Down Expand Up @@ -268,6 +262,7 @@ sub processConvergedSections {
$sections{MVPD}{out} = "$scratch_dir/mvpd_fill.bin.ecc";
$sections{DJVPD}{out} = "$scratch_dir/djvpd_fill.bin.ecc";
$sections{ATTR_TMP}{out} = "$scratch_dir/attr_tmp.bin.ecc";
$sections{ATTR_PERM}{out} = "$scratch_dir/attr_perm.bin.ecc";
$sections{FIRDATA}{out} = "$scratch_dir/firdata.bin.ecc";
$sections{SECBOOT}{out} = "$scratch_dir/secboot.bin.ecc";
$sections{RINGOVD}{out} = "$scratch_dir/ringOvd.bin";
Expand All @@ -291,17 +286,6 @@ sub processConvergedSections {
print "WARNING: MEMD partition is not found, including blank binary instead\n";
}
$sections{MEMD}{out} = "$scratch_dir/memd_extra_data.bin.ecc";

# SMC COPY SAME ideas for hdat
if(-e $hdat_binary_filename)
{
$sections{HDAT}{in} = "$hdat_binary_filename";
}
else
{
print "WARNING: HDAT partition is not found, including blank binary instead\n";
}
$sections{HDAT}{out} = "$scratch_dir/hdat.bin.ecc";

# Build up the system bin files specification
my $system_bin_files;
Expand Down Expand Up @@ -489,6 +473,10 @@ sub processConvergedSections {
run_command("dd if=/dev/zero bs=28K count=1 | tr \"\\000\" \"\\377\" > $scratch_dir/hostboot.temp.bin");
run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/attr_tmp.bin.ecc --p8");

# Create blank binary file for ATTR_PERM partition
run_command("dd if=/dev/zero bs=28K count=1 | tr \"\\000\" \"\\377\" > $scratch_dir/hostboot.temp.bin");
run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/attr_perm.bin.ecc --p8");

# Create blank binary file for FIRDATA partition
run_command("dd if=/dev/zero bs=8K count=1 | tr \"\\000\" \"\\377\" > $scratch_dir/hostboot.temp.bin");
run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/firdata.bin.ecc --p8");
Expand Down