Add one more platform level common property "TARGET_DIR". Take Nt32 for example:...

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

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index ec2db718e35952ca46f18fc5edbe5939bae70916..ada68752b9dddd6146cd6de0280151c81eb730bb 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -7330,7 +7330,7 @@
     </concat>\r
     <!--Generate Run.cmd file. This file will call SecMain.exe to start shell.-->\r
     <pathconvert property="SecMainPath" targetos="windows">\r
     </concat>\r
     <!--Generate Run.cmd file. This file will call SecMain.exe to start shell.-->\r
     <pathconvert property="SecMainPath" targetos="windows">\r

-      <path path="${FV_DIR}/../IA32"/>\r
+      <path path="${TARGET_DIR}/IA32"/>\r

     </pathconvert>\r
     <echo file="${PLATFORM_DIR}/run.cmd">@REM\r
       @REM Copyright (c) 2006, Intel Corporation\r
     </pathconvert>\r
     <echo file="${PLATFORM_DIR}/run.cmd">@REM\r
       @REM Copyright (c) 2006, Intel Corporation\r

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0de9f321f3e376835ca227fe3bd709db1bdd7dae..280a1c088abe6cc8e257fa6a7135302595c8963b 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -1167,8 +1167,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r
     <element name="EXTRA.ARG" optional="yes"/>\r
 \r
     <sequential>\r

-      <mkdir dir="${BUILD_DIR}/${TARGET}_${TOOLCHAIN}/Microcode"/>\r
-      <flashmap MCIFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" MCOFILE="${BUILD_DIR}/${TARGET}_${TOOLCHAIN}/Microcode/@{FILENAME}.bin"/>\r
+      <mkdir dir="${TARGET_DIR}/Microcode"/>\r
+      <flashmap MCIFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" MCOFILE="${TARGET_DIR}/Microcode/@{FILENAME}.bin"/>\r

     </sequential>\r
   </macrodef> \r
 \r
     </sequential>\r
   </macrodef> \r
 \r