BaseTools: Remove unused logic for EDKI

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove EDK module type support from BaseTools python code.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 1 insertions, 17 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index ef7bc845d0..4da10e3950 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -476,18 +476,11 @@ cleanlib:
         else:

             ModuleEntryPoint = "_ModuleEntryPoint"

 

-        # Intel EBC compiler enforces EfiMain

-        if MyAgo.AutoGenVersion < 0x00010005 and MyAgo.Arch == "EBC":

-            ArchEntryPoint = "EfiMain"

-        else:

-            ArchEntryPoint = ModuleEntryPoint

+        ArchEntryPoint = ModuleEntryPoint

 

         if MyAgo.Arch == "EBC":

             # EBC compiler always use "EfiStart" as entry point. Only applies to EdkII modules

             ImageEntryPoint = "EfiStart"

-        elif MyAgo.AutoGenVersion < 0x00010005:

-            # Edk modules use entry point specified in INF file

-            ImageEntryPoint = ModuleEntryPoint

         else:

             # EdkII modules always use "_ModuleEntryPoint" as entry point

             ImageEntryPoint = "_ModuleEntryPoint"

@@ -625,11 +618,6 @@ cleanlib:
                 False

                 )

 

-        # Edk modules need <BaseName>StrDefs.h for string ID

-        #if MyAgo.AutoGenVersion < 0x00010005 and len(MyAgo.UnicodeFileList) > 0:

-        #    BcTargetList = ['strdefs']

-        #else:

-        #    BcTargetList = []

         BcTargetList = []

 

         MakefileName = self._FILE_NAME_[self._FileType]

@@ -1537,13 +1525,9 @@ class TopLevelMakefile(BuildFile):
         if MyAgo.FdfFile is not None and MyAgo.FdfFile != "":

             FdfFileList = [MyAgo.FdfFile]

             # macros passed to GenFds

-            MacroList.append('"%s=%s"' % ("EFI_SOURCE", GlobalData.gEfiSource.replace('\\', '\\\\')))

-            MacroList.append('"%s=%s"' % ("EDK_SOURCE", GlobalData.gEdkSource.replace('\\', '\\\\')))

             MacroDict = {}

             MacroDict.update(GlobalData.gGlobalDefines)

             MacroDict.update(GlobalData.gCommandLineDefines)

-            MacroDict.pop("EFI_SOURCE", "dummy")

-            MacroDict.pop("EDK_SOURCE", "dummy")

             for MacroName in MacroDict:

                 if MacroDict[MacroName] != "":

                     MacroList.append('"%s=%s"' % (MacroName, MacroDict[MacroName].replace('\\', '\\\\')))