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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 62de225b5c..23ea8b27f6 100644
--- 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);
         if (mi.moduletype != null) {
             msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.getModuleType()));
-            /*
-            if (mi.moduletype.contains("PEI")) {
-                msaheader.setModuleType(ModuleTypeDef.Enum.forString("PEIM"));
-            } else {
-                msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));
-            }
-            */
         } else {
             msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("Guid Value Not Found!  Please Input Guid Value")));
         }
@@ -126,8 +119,16 @@ public class MsaWriter {
         pd.addNewPackage().setPackageGuid("68169ab0-d41b-4009-9060-292c253ac43d");
         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");
-        externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);
-        
+        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");
+          }
+        }
+       
         it = mi.localmodulesources.iterator();
         while (it.hasNext()) {
             addSourceFiles(it.next());