Correct invalid HUID and chiplet id values for NPU targets

There was a bug for NPU targets would incorrectly have a
HUID with a value indicating that they were of target type MC instead of
target type NPU. This commit corrects that issue and gives the correct
chiplet id for NPU targets.

Change-Id: I543e80e1c0da7a02bef61f9657270684abc6e7c7
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71159
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Ilya Smirnov <ismirno@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@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: Daniel M. Crowell <dcrowell@us.ibm.com>

src/usr/targeting/common/genHwsvMrwXml.pl

@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2013,2018
+# Contributors Listed Below - COPYRIGHT 2013,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -5416,7 +5416,7 @@ sub generate_sbe
 sub generate_npu
 {
     my ($proc, $npu, $ordinalId, $ipath) = @_;
-    my $uidstr = sprintf("0x%02X44%04X",${node},$proc*MAX_NPU_PER_PROC + $npu);
+    my $uidstr = sprintf("0x%02X43%04X",${node},$proc*MAX_NPU_PER_PROC + $npu);
 
     my $fapi_name    = "NA";
     my $path = "sys-$sys/node-$node/proc-$proc/npu-$npu";
@@ -5447,6 +5447,10 @@ sub generate_npu
         <id>CHIP_UNIT</id>
         <default>$npu</default>
     </attribute>
+    <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x05</default>
+    </attribute>
     <attribute>
         <id>REL_POS</id>
         <default>$npu</default>