UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / BaseTools / Source / Python / TargetTool / TargetTool.py

diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py
index a49a01f9e324d77d3baae2cf4e0f135bbcad6637..7f2479f0f0acbf92563d096f55beb9fd9bdc7c22 100644 (file)
--- a/BaseTools/Source/Python/TargetTool/TargetTool.py
+++ b/BaseTools/Source/Python/TargetTool/TargetTool.py
@@ -1,15 +1,9 @@
 ## @file\r
 # Target Tool Parser\r
 #\r
-#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 from __future__ import print_function\r
@@ -23,6 +17,7 @@ import Common.BuildToolError as BuildToolError
 from Common.DataType import *\r
 from Common.BuildVersion import gBUILD_VERSION\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.TargetTxtClassObject import gDefaultTargetTxtFile\r
 \r
 # To Do 1.set clean, 2. add item, if the line is disabled.\r
 \r
@@ -31,7 +26,7 @@ class TargetTool():
         self.WorkSpace = os.path.normpath(os.getenv('WORKSPACE'))\r
         self.Opt       = opt\r
         self.Arg       = args[0]\r
-        self.FileName  = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', 'target.txt'))\r
+        self.FileName  = os.path.normpath(os.path.join(self.WorkSpace, 'Conf', gDefaultTargetTxtFile))\r
         if os.path.isfile(self.FileName) == False:\r
             print("%s does not exist." % self.FileName)\r
             sys.exit(1)\r
@@ -143,14 +138,14 @@ def GetConfigureKeyValue(self, Key):
         if os.path.exists(dscFullPath):\r
             Line = "%-30s = %s\n" % (Key, self.Opt.DSCFILE)\r
         else:\r
-            EdkLogger.error("TagetTool", BuildToolError.FILE_NOT_FOUND,\r
+            EdkLogger.error("TargetTool", BuildToolError.FILE_NOT_FOUND,\r
                             "DSC file %s does not exist!" % self.Opt.DSCFILE, RaiseError=False)\r
     elif Key == TAB_TAT_DEFINES_TOOL_CHAIN_CONF and self.Opt.TOOL_DEFINITION_FILE is not None:\r
         tooldefFullPath = os.path.join(self.WorkSpace, self.Opt.TOOL_DEFINITION_FILE)\r
         if os.path.exists(tooldefFullPath):\r
             Line = "%-30s = %s\n" % (Key, self.Opt.TOOL_DEFINITION_FILE)\r
         else:\r
-            EdkLogger.error("TagetTool", BuildToolError.FILE_NOT_FOUND,\r
+            EdkLogger.error("TargetTool", BuildToolError.FILE_NOT_FOUND,\r
                             "Tooldef file %s does not exist!" % self.Opt.TOOL_DEFINITION_FILE, RaiseError=False)\r
 \r
     elif self.Opt.NUM >= 2:\r
@@ -203,7 +198,7 @@ def RangeCheckCallback(option, opt_str, value, parser):
 \r
 def MyOptionParser():\r
     parser = OptionParser(version=__version__, prog="TargetTool.exe", usage=__usage__, description=__copyright__)\r
-    parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32', 'X64', 'EBC', 'ARM', 'AARCH64', '0'], dest="TARGET_ARCH",\r
+    parser.add_option("-a", "--arch", action="append", dest="TARGET_ARCH",\r
         help="ARCHS is one of list: IA32, X64, ARM, AARCH64 or EBC, which replaces target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option. 0 will clear this setting in target.txt and can't combine with other value.")\r
     parser.add_option("-p", "--platform", action="callback", type="string", dest="DSCFILE", callback=SingleCheckCallback,\r
         help="Specify a DSC file, which replace target.txt's ACTIVE_PLATFORM definition. 0 will clear this setting in target.txt and can't combine with other value.")\r