Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions p9Layouts/defaultPnorLayout_128.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ Layout Description
<physicalRegionSize>0x100000</physicalRegionSize>
<side>A</side>
<sha512Version/>
<readOnly/>
<ecc/>
</section>
<section>
Expand All @@ -173,6 +174,7 @@ Layout Description
<physicalRegionSize>0xEA0000</physicalRegionSize>
<side>A</side>
<sha512Version/>
<readOnly/>
<ecc/>
</section>
<section>
Expand Down
6 changes: 4 additions & 2 deletions p9Layouts/defaultPnorLayout_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ Layout Description
<physicalRegionSize>0x100000</physicalRegionSize>
<side>A</side>
<sha512Version/>
<readOnly/>
<ecc/>
</section>
<section>
Expand All @@ -173,6 +174,7 @@ Layout Description
<physicalRegionSize>0xEA0000</physicalRegionSize>
<side>A</side>
<sha512Version/>
<readOnly/>
<ecc/>
</section>
<section>
Expand All @@ -199,7 +201,7 @@ Layout Description
<section>
<description>Hostboot Runtime Services for Sapphire (4.5MB)</description>
<eyeCatch>HBRT</eyeCatch>
<physicalOffset>0x1381000</physicalOffset>
<physicalOffset>0x14A1000</physicalOffset>
<physicalRegionSize>0x480000</physicalRegionSize>
<side>A</side>
<sha512Version/>
Expand Down Expand Up @@ -303,7 +305,7 @@ Layout Description
<section>
<description>IMA Catalog (256K)</description>
<eyeCatch>IMA_CATALOG</eyeCatch>
<physicalOffset>0x2A88000</physicalOffset>
<physicalOffset>0x2A89000</physicalOffset>
<physicalRegionSize>0x40000</physicalRegionSize>
<side>A</side>
<sha512Version/>
Expand Down
9 changes: 3 additions & 6 deletions update_image.pl
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ 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

# SMC COPY SAME ideas for hdat
if(-e $hdat_binary_filename)
{
$sections{HDAT}{in} = "$hdat_binary_filename";
Expand Down Expand Up @@ -358,7 +358,6 @@ sub processConvergedSections {
# Point to the location of the signing tools
$ENV{'DEV_KEY_DIR'}="$ENV{'HOST_DIR'}/etc/keys/";
$ENV{'SIGNING_DIR'} = "$ENV{'HOST_DIR'}/usr/bin/";
$ENV{'SIGNING_TOOL_EDITION'} = "community";

# Determine whether to securely sign the images
my $securebootArg = $secureboot ? "--secureboot" : "";
Expand All @@ -382,8 +381,6 @@ sub processConvergedSections {
{
print STDOUT "SIGNING_DIR: " . $ENV{'SIGNING_DIR'} . "\n";
print STDOUT "DEV_KEY_DIR: " . $ENV{'DEV_KEY_DIR'} . "\n";
print STDOUT "SIGNING_TOOL_EDITION: "
. $ENV{'SIGNING_TOOL_EDITION'} . "\n";
}

run_command($cmd);
Expand Down Expand Up @@ -489,7 +486,7 @@ sub processConvergedSections {
# Create blank binary file for ATTR_TMP 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_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");
Expand Down