Secure Boot: Mark PAYLOAD and CAPP PNOR partitions as secured

Change-Id: I076e1fb883253c01553fef6764617d6e4c83708e
RTC: 174017
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42629
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

src/build/buildpnor/genPnorImages.pl

@@ -546,8 +546,8 @@ sub manipulateImages
         #$isNormalSecure ||= ($eyeCatch eq "SBEC");
         $isNormalSecure ||= ($eyeCatch eq "PAYLOAD");
         $isNormalSecure ||= ($eyeCatch eq "OCC");
-        #$isNormalSecure ||= ($eyeCatch eq "CAPP");
-        #$isNormalSecure ||= ($eyeCatch eq "BOOTKERNEL");
+        $isNormalSecure ||= ($eyeCatch eq "CAPP");
+        $isNormalSecure ||= ($eyeCatch eq "BOOTKERNEL");
         $isNormalSecure ||= ($eyeCatch eq "HCODE");
         $isNormalSecure ||= ($eyeCatch eq "WOFDATA");