Distinguish PEIM entrypoint and driver entrypoint

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / MsaWriter.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 62de225b5c48f5b77cfae9fb9982d57087dd9afa..23ea8b27f6046fe741d54a6408c6dc38d3941e9f 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -88,13 +88,6 @@ public class MsaWriter {
         msaheader.setGuidValue(mi.guidvalue);\r
         if (mi.moduletype != null) {\r
             msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.getModuleType()));\r
-            /*\r
-            if (mi.moduletype.contains("PEI")) {\r
-                msaheader.setModuleType(ModuleTypeDef.Enum.forString("PEIM"));\r
-            } else {\r
-                msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));\r
-            }\r
-            */\r
         } else {\r
             msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("Guid Value Not Found!  Please Input Guid Value")));\r
         }\r
@@ -126,8 +119,16 @@ public class MsaWriter {
         pd.addNewPackage().setPackageGuid("68169ab0-d41b-4009-9060-292c253ac43d");\r
         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");\r
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
-        externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
-        \r
+        if (mi.entrypoint != null) {\r
+          externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
+          org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();\r
+          if (moduleType == ModuleTypeDef.PEIM) {\r
+              mi.hashrequiredr9libs.add("PeimEntryPoint");\r
+          } else {\r
+              mi.hashrequiredr9libs.add("UefiDriverEntryPoint");\r
+          }\r
+        }\r
+       \r
         it = mi.localmodulesources.iterator();\r
         while (it.hasNext()) {\r
             addSourceFiles(it.next());\r