BaseTools/AutoGen: Update header file for MM modules.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenC.py

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index eac41ed9bf81a7b8910b9a95ea679efc0ec818b8..aaa88f876aeb089d42f60f8e8030dadc9b78b7e3 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -13,6 +13,7 @@
 \r
 ## Import Modules\r
 #\r
+from __future__ import absolute_import\r
 import string\r
 import collections\r
 import struct\r
@@ -22,9 +23,9 @@ from Common.BuildToolError import *
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r
-from StrGather import *\r
-from GenPcdDb import CreatePcdDatabaseCode\r
-from IdfClassObject import *\r
+from .StrGather import *\r
+from .GenPcdDb import CreatePcdDatabaseCode\r
+from .IdfClassObject import *\r
 \r
 ## PCD type string\r
 gItemTypeStringDatabase  = {\r
@@ -265,7 +266,7 @@ EFI_STATUS
 EFIAPI\r
 ${Function} (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   );\r
 ${END}\r
 """)\r
@@ -278,7 +279,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessModuleEntryPointList (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 \r
 {\r
@@ -292,7 +293,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessModuleEntryPointList (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 \r
 {\r
@@ -307,7 +308,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessModuleEntryPointList (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 \r
 {\r
@@ -675,7 +676,7 @@ EFI_STATUS
 EFIAPI\r
 ${Function} (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2  *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   );${END}\r
 """),\r
 }\r
@@ -755,7 +756,7 @@ VOID
 EFIAPI\r
 ProcessLibrary${Type}List (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2  *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 {\r
 ${BEGIN}  EFI_STATUS  Status;\r
@@ -779,8 +780,8 @@ gModuleTypeHeaderFile = {
     SUP_MODULE_UEFI_DRIVER       :   ["Uefi.h",  "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
     SUP_MODULE_UEFI_APPLICATION  :   ["Uefi.h",  "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiApplicationEntryPoint.h"],\r
     SUP_MODULE_SMM_CORE          :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    SUP_MODULE_MM_STANDALONE     :   ["PiSmm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/SmmDriverStandaloneEntryPoint.h"],\r
-    SUP_MODULE_MM_CORE_STANDALONE :  ["PiSmm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/SmmCoreStandaloneEntryPoint.h"],\r
+    SUP_MODULE_MM_STANDALONE     :   ["PiMm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/StandaloneMmDriverEntryPoint.h"],\r
+    SUP_MODULE_MM_CORE_STANDALONE :  ["PiMm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/StandaloneMmCoreEntryPoint.h"],\r
     SUP_MODULE_USER_DEFINED      :   [gBasicHeaderFile]\r
 }\r
 \r
@@ -890,6 +891,8 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
 \r
     if Pcd.PcdValueFromComm:\r
         Pcd.DefaultValue = Pcd.PcdValueFromComm\r
+    elif Pcd.PcdValueFromFdf:\r
+        Pcd.DefaultValue = Pcd.PcdValueFromFdf\r
 \r
     if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
         TokenNumber = int(Pcd.TokenValue, 0)\r
@@ -1183,6 +1186,8 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
 \r
     if Pcd.PcdValueFromComm:\r
         Pcd.DefaultValue = Pcd.PcdValueFromComm\r
+    elif Pcd.PcdValueFromFdf:\r
+        Pcd.DefaultValue = Pcd.PcdValueFromFdf\r
     #\r
     # Write PCDs\r
     #\r