X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FMsaWriter.java;h=72fa0679762073618e0b37ba02f9cc30a875abaa;hp=23ea8b27f6046fe741d54a6408c6dc38d3941e9f;hb=fd16b4dddd7eadf267c0caac61ba934edb5b8e66;hpb=37e5cd656db059c9b7f506aacd7ca0044f0b2388

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 23ea8b27f6..72fa067976 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -20,12 +20,11 @@ import org.tianocore.SupportedArchitectures.Enum;
 import org.apache.xmlbeans.*;
 
 public class MsaWriter {
-    MsaWriter(ModuleInfo moduleinfo) {
-        mi = moduleinfo;
-    }
-
+	MsaWriter(ModuleInfo moduleinfo) {
+		mi = moduleinfo;
+	}
+	
     private ModuleInfo mi;
-    
     private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();
     
     private ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = msadoc.addNewModuleSurfaceArea();
@@ -120,13 +119,13 @@ public class MsaWriter {
         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");
         if (mi.entrypoint != null) {
-          externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);
-          org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();
-          if (moduleType == ModuleTypeDef.PEIM) {
-              mi.hashrequiredr9libs.add("PeimEntryPoint");
-          } else {
-              mi.hashrequiredr9libs.add("UefiDriverEntryPoint");
-          }
+            externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);
+            org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();
+            if (moduleType == ModuleTypeDef.PEIM) {
+                mi.hashrequiredr9libs.add("PeimEntryPoint");
+            } else {
+                mi.hashrequiredr9libs.add("UefiDriverEntryPoint");
+            }
         }
        
         it = mi.localmodulesources.iterator();
@@ -168,7 +167,7 @@ public class MsaWriter {
         }
         it = mi.hashrequiredr9libs.iterator();
         while (it.hasNext()) {
-            if ((temp = it.next()) != null && !temp.matches("%")) {
+            if ((temp = it.next()) != null && !temp.matches("%") && !temp.matches("n/a")) {
                 LibraryClassDocument.LibraryClass lc = libclassdefs.addNewLibraryClass();
                 lc.setKeyword(temp);
                 lc.setUsage(UsageTypes.ALWAYS_CONSUMED);
@@ -206,7 +205,7 @@ public class MsaWriter {
         bw.flush();
         bw.close();
     }
-    
+
     public static final void parse(String msafile) throws Exception {
         ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.parse(msafile);
         flush("c:\\temp.msa", msadoc);