Changeset 77671 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 12, 2019 8:58:43 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129307

Message:

EFI: Removing no longer necessary customizations, build fixes.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• BaseTools/Source/Python/Common/TargetTxtClassObject.py (modified) (1 diff)
• BaseTools/Source/Python/GenFds/GenFds.py (modified) (1 diff)
• BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py (modified) (1 diff)
• BaseTools/Source/Python/TargetTool/TargetTool.py (modified) (1 diff)
• BaseTools/Source/Python/Workspace/WorkspaceDatabase.py (modified) (1 diff)
• OvmfPkg/OvmfPkgIa32.fdf (modified) (1 diff)
• OvmfPkg/OvmfPkgX64.fdf (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/Python/Common/TargetTxtClassObject.py

@@ -175 +175 @@
 def TargetTxtDict(ConfDir):
     Target = TargetTxtClassObject()
-    # VBox begin
-    if 'VBOX_TARGET_CONF' in os.environ:
-        Target.LoadTargetTxtFile(os.path.abspath(os.environ['VBOX_TARGET_CONF']))
-        return Target
-    # VBox end
     Target.LoadTargetTxtFile(os.path.normpath(os.path.join(ConfDir, gDefaultTargetTxtFile)))
     return Target

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/Python/GenFds/GenFds.py

@@ -167 +167 @@
             GlobalData.gConfDirectory = GenFdsGlobalVariable.ConfDir
         BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))
-        # VBox - begin
-        if 'VBOX_TARGET_CONF' in os.environ:
-            BuildConfigurationFile = os.path.abspath(os.environ['VBOX_TARGET_CONF']);
-        # VBox - end
         if os.path.isfile(BuildConfigurationFile) == True:
             TargetTxt = TargetTxtClassObject.TargetTxtClassObject()

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py

@@ -98 +98 @@
             return GenFdsGlobalVariable.__BuildRuleDatabase
         BuildConfigurationFile = os.path.normpath(os.path.join(GenFdsGlobalVariable.ConfDir, "target.txt"))
-        # VBox - begin
-        if 'VBOX_TARGET_CONF' in os.environ:
-            BuildConfigurationFile = os.path.abspath(os.environ['VBOX_TARGET_CONF']);
-        # VBox - end
         TargetTxt = TargetTxtClassObject()
         if os.path.isfile(BuildConfigurationFile) == True:

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/Python/TargetTool/TargetTool.py

@@ -32 +32 @@
         self.Arg       = args[0]
         self.FileName  = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', 'target.txt'))
-        # VBox - begin
-        if 'VBOX_TARGET_CONF' in os.environ:
-            self.FileName = os.path.abspath(os.environ['VBOX_TARGET_CONF']);
-        # VBox - end
         if os.path.isfile(self.FileName) == False:
             print "%s does not exist." % self.FileName

trunk/src/VBox/Devices/EFI/FirmwareNew/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py

@@ -30 +30 @@
 from Workspace.InfBuildData import InfBuildData
 
-## Database
 ## Database
 #

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgIa32.fdf

@@ -280 +280 @@
  # we need it for VBoxAppleSim
 INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
-INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 !endif
 

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgX64.fdf

@@ -281 +281 @@
  # we need it for VBoxAppleSim
 INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf
-INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 !endif