Remove proprietary CAPP microcode partition entirely

Increase PNOR version partition to 8k

3 files changed, 3 insertions, 34 deletions

diff --git a/create_pnor_image.pl b/create_pnor_image.pl
index 563f64a..030dc2c 100755
--- a/create_pnor_image.pl
+++ b/create_pnor_image.pl
@@ -164,7 +164,6 @@ $build_pnor_command .= " --binFile_ATTR_TMP $scratch_dir/attr_tmp.bin.ecc";
 $build_pnor_command .= " --binFile_OCC $occ_binary_filename.ecc";
 $build_pnor_command .= " --binFile_ATTR_PERM $scratch_dir/attr_perm.bin.ecc";
 $build_pnor_command .= " --binFile_FIRDATA $scratch_dir/firdata.bin.ecc";
-$build_pnor_command .= " --binFile_CAPP $scratch_dir/cappucode.bin.ecc";
 $build_pnor_command .= " --binFile_SECBOOT $scratch_dir/secboot.bin.ecc";
 $build_pnor_command .= " --binFile_VERSION $scratch_dir/openpower_pnor_version.bin";
 $build_pnor_command .= " --binFile_IMA_CATALOG $scratch_dir/ima_catalog.bin.ecc";
diff --git a/p9Layouts/defaultPnorLayout_64.xml b/p9Layouts/defaultPnorLayout_64.xml
index 9d6feb8..ce1e4bd 100644
--- a/p9Layouts/defaultPnorLayout_64.xml
+++ b/p9Layouts/defaultPnorLayout_64.xml
@@ -251,14 +251,13 @@ Layout Description
         <clearOnEccErr/>
     </section>
     <section>
-        <description>CAPP Lid (144K)</description>
-        <eyeCatch>CAPP</eyeCatch>
+        <description>PNOR Version (8K)</description>
+        <eyeCatch>VERSION</eyeCatch>
         <physicalOffset>0x3944000</physicalOffset>
-        <physicalRegionSize>0x24000</physicalRegionSize>
+        <physicalRegionSize>0x2000</physicalRegionSize>
         <side>A</side>
         <sha512Version/>
         <readOnly/>
-        <ecc/>
     </section>
     <section>
         <description>BMC Inventory (36K)</description>
@@ -299,15 +298,6 @@ Layout Description
         <clearOnEccErr/>
     </section>
     <section>
-        <description>PNOR Version (4K)</description>
-        <eyeCatch>VERSION</eyeCatch>
-        <physicalOffset>0x3988000</physicalOffset>
-        <physicalRegionSize>0x1000</physicalRegionSize>
-        <side>A</side>
-        <sha512Version/>
-        <readOnly/>
-    </section>
-    <section>
         <description>IMA Catalog (256K)</description>
         <eyeCatch>IMA_CATALOG</eyeCatch>
         <physicalOffset>0x3989000</physicalOffset>
diff --git a/update_image.pl b/update_image.pl
index fffe2ea..ee61d7b 100755
--- a/update_image.pl
+++ b/update_image.pl
@@ -22,7 +22,6 @@ my $sbe_binary_filename = "";
 my $sbec_binary_filename = "";
 my $wink_binary_filename = "";
 my $occ_binary_filename = "";
-my $capp_binary_filename = "";
 my $ima_catalog_binary_filename = "";
 my $openpower_version_filename = "";
 my $payload = "";
@@ -116,11 +115,6 @@ while (@ARGV > 0){
         $occ_binary_filename = $ARGV[1] or die "Bad command line arg given: expecting a config type.\n";
         shift;
     }
-    elsif (/^-capp_binary_filename/i){
-        #This filename is necessary if the file exists, but if it's not given, we add a blank partition
-        $capp_binary_filename = $ARGV[1] or die "Bad command line arg given: execting a config type.\n";
-        shift;
-    }
     elsif (/^-ima_catalog_binary_filename/i){
         $ima_catalog_binary_filename = $ARGV[1] or die "Bad command line arg given: execting a config type.\n";
         shift;
@@ -345,16 +339,6 @@ sub processConvergedSections {
     }
     $sections{CVPD}{out}    = "$scratch_dir/cvpd.bin.ecc";
 
-    if(-e $capp_binary_filename)
-    {
-        $sections{CAPP}{in} = "$capp_binary_filename";
-    }
-    else
-    {
-        print "WARNING: CAPP partition is not found, including blank binary instead\n";
-    }
-    $sections{CAPP}{out}    = "$scratch_dir/cappucode.bin.ecc";
-
     # Build up the system bin files specification
     my $system_bin_files;
     foreach my $section (keys %sections)
@@ -509,10 +493,6 @@ else
     run_command("dd if=$occ_binary_filename of=$scratch_dir/hostboot.temp.bin ibs=1M conv=sync");
     run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $occ_binary_filename.ecc --p8");
 
-    # Inject ECC into CAPP partition binary
-    run_command("dd if=$capp_binary_filename bs=144K count=1 > $scratch_dir/hostboot.temp.bin");
-    run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/cappucode.bin.ecc --p8");
-
     # Stage PAYLOAD partition
     run_command("cp $payload.bin $scratch_dir/$payload_filename");