Change to new XML Schema. Using Module_Type to determine SubSystem value

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@683 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/TianoTools/FwImage/fwimage.c b/Tools/Source/TianoTools/FwImage/fwimage.c
index b8fd1e1c33e80f78a98e91215004c34a60da3128..e06e7dc16cb8f9241ac17e84cf89e8497627c81f 100644 (file)
--- a/Tools/Source/TianoTools/FwImage/fwimage.c
+++ b/Tools/Source/TianoTools/FwImage/fwimage.c
@@ -49,7 +49,7 @@ Usage (
   VOID\r
   )\r
 {\r
-  printf ("Usage: " UTILITY_NAME "  {-t time-date} [APPLICATION|BS_DRIVER|RT_DRIVER|SAL_RT_DRIVER|COMBINED_PEIM_DRIVER|SECURITY_CORE|PEI_CORE|PE32_PEIM|RELOCATABLE_PEIM] peimage [outimage]");\r
+  printf ("Usage: " UTILITY_NAME "  {-t time-date} [BASE|SEC|PEI_CORE|PEIM|DXE_CORE|DXE_DRIVER|DXE_RUNTIME_DRIVER|DXE_SAL_DRIVER|DXE_SMM_DRIVER|TOOL|UEFI_DRIVER|UEFI_APPLICATION|USER_DEFINED] peimage [outimage]");\r
 }\r
 \r
 static\r
@@ -201,33 +201,39 @@ Returns:
     p += 1;\r
   }\r
 \r
-  if (stricmp (p, "app") == 0 || stricmp (p, "APPLICATION") == 0) {\r
+  if (stricmp (p, "app") == 0 || stricmp (p, "UEFI_APPLICATION") == 0) {\r
     Type  = EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION;\r
     Ext   = ".efi";\r
 \r
-  } else if (stricmp (p, "bsdrv") == 0 || stricmp (p, "BS_DRIVER") == 0) {\r
+  } else if (stricmp (p, "bsdrv") == 0 || stricmp (p, "DXE_DRIVER") == 0) {\r
     Type  = EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;\r
     Ext   = ".efi";\r
 \r
-  } else if (stricmp (p, "rtdrv") == 0 || stricmp (p, "RT_DRIVER") == 0) {\r
+  } else if (stricmp (p, "rtdrv") == 0 || stricmp (p, "DXE_RUNTIME_DRIVER") == 0) {\r
     Type  = EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;\r
     Ext   = ".efi";\r
 \r
-  } else if (stricmp (p, "rtdrv") == 0 || stricmp (p, "SAL_RT_DRIVER") == 0) {\r
+  } else if (stricmp (p, "rtdrv") == 0 || stricmp (p, "DXE_SAL_DRIVER") == 0) {\r
     Type  = EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER;\r
     Ext   = ".efi";\r
-  } else if (stricmp (p, "SECURITY_CORE") == 0) {\r
+  } else if (stricmp (p, "SEC") == 0) {\r
     Type  = EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;\r
     Ext   = ".sec";\r
   } else if (stricmp (p, "peim") == 0 ||\r
+           stricmp (p, "BASE") == 0 ||\r
            stricmp (p, "PEI_CORE") == 0 ||\r
-           stricmp (p, "PE32_PEIM") == 0 ||\r
-           stricmp (p, "RELOCATABLE_PEIM") == 0 ||\r
-           stricmp (p, "combined_peim_driver") == 0\r
+           stricmp (p, "PEIM") == 0 ||\r
+           stricmp (p, "DXE_SMM_DRIVER") == 0 ||\r
+           stricmp (p, "TOOL") == 0 ||\r
+           stricmp (p, "UEFI_APPLICATION") == 0 ||\r
+           stricmp (p, "USER_DEFINED") == 0 ||\r
+           stricmp (p, "UEFI_DRIVER") == 0 ||\r
+           stricmp (p, "DXE_CORE") == 0\r
           ) {\r
     Type  = EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;\r
     Ext   = ".pei";\r
   } else {\r
+       printf ("%s", p);\r
     Usage ();\r
     return STATUS_ERROR;\r
   }\r