Add Build Macro to build SEC modules.

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

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index e847ed10ddad2791ec40c3595e257833e82e723c..5529116824be7d6ca8fcb0f3dc577297f235b0da 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -17921,7 +17921,7 @@
         <Section SectionType="EFI_SECTION_RAW">\r
           <!--add 12 bytes blank.pad file-->\r
           <Filenames>\r
         <Section SectionType="EFI_SECTION_RAW">\r
           <!--add 12 bytes blank.pad file-->\r
           <Filenames>\r

-            <Filename>Blank.pad</Filename>\r
+            <Filename>${PLATFORM_DIR}/Blank.pad</Filename>\r

           </Filenames>\r
         </Section>\r
         <Section SectionType="EFI_SECTION_PE32"/>\r
           </Filenames>\r
         </Section>\r
         <Section SectionType="EFI_SECTION_PE32"/>\r

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 8e7ef7802521c00340b03af15f6db4616918a52e..621ec609cbf8bd5f2c3fd1cb7f974b367939dbe3 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -738,6 +738,29 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </sequential>\r
   </macrodef>\r
 \r
     </sequential>\r
   </macrodef>\r
 \r

+  <!--\r
+      Build the real mode ASM file\r
+    -->\r
+  <macrodef name="Build_RealAsm">\r
+    <attribute name="FILEPATH"/>\r
+    <attribute name="FILENAME"/>\r
+    <attribute name="FILEEXT" default="asm"/>\r
+\r
+    <element name="EXTRA.INC" optional="yes"/>\r
+    <element name="EXTRA.ARG" optional="yes"/>\r
+    \r
+    <sequential>\r
+      <!-- Lack Dependency Check -->\r
+      <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">\r
+        <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>\r
+      </exec>\r
+      <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">\r
+        <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>\r
+        <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>\r
+      </concat>\r
+    </sequential>\r
+  </macrodef>\r
+  \r

   <!--\r
     DUMMY\r
     -->\r
   <!--\r
     DUMMY\r
     -->\r


@@ -1124,6 +1147,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </sequential>\r
   </macrodef>\r
 \r
     </sequential>\r
   </macrodef>\r
 \r

+  <!--\r
+    EFI_SECTION_RAW_SEC\r
+    -->\r
+  <macrodef name="EFI_SECTION_RAW_SEC">\r
+    <attribute name="FILEPATH"/>\r
+    <attribute name="FILENAME"/>\r
+    <attribute name="FILEEXT" default="cat"/>\r
+\r
+    <element name="PRE.PROCESS" optional="yes"/>\r
+    <element name="POST.PROCESS" optional="yes"/>\r
+\r
+    <sequential>\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${DEST_DIR_OUTPUT}/ResetVec.@{FILEEXT}"/>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.te"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>\r
+        </targetfiles>\r
+\r
+        <sequential>\r
+          <PRE.PROCESS/>\r
+          <secfixup secexefile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" resetvectorDatafile="${DEST_DIR_OUTPUT}/ResetVec.@{FILEEXT}"\r
+                   outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.bin"/>\r
+                   \r
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.bin" \r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.sec" \r
+                      sectiontype="EFI_SECTION_RAW"/>\r
+          <POST.PROCESS/>\r
+        </sequential>\r
+      </OnDependency>\r
+    </sequential>\r
+  </macrodef>\r
+  \r

   <!--\r
     EFI_SECTION_FIRMWARE_VOLUME_IMAGE\r
     -->\r
   <!--\r
     EFI_SECTION_FIRMWARE_VOLUME_IMAGE\r
     -->\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 26b93909019cd75dce831bb3af1f4970d8a950be..baa9eab9a591b5ea7b365bfba9a78bac70fa35f0 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -379,7 +379,7 @@ public class FfsProcess {
             if (fileName == null) {\r
                 ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));\r
             } else {\r
             if (fileName == null) {\r
                 ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));\r
             } else {\r

-                ele.setAttribute("file", "${PLATFORM_DIR}" + File.separatorChar + fileName);\r
+                ele.setAttribute("file", fileName);\r

             }\r
             root.appendChild(ele);\r
         } else {\r
             }\r
             root.appendChild(ele);\r
         } else {\r


@@ -390,7 +390,7 @@ public class FfsProcess {
             if (fileName == null) {\r
                 ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));\r
             } else {\r
             if (fileName == null) {\r
                 ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));\r
             } else {\r

-                ele.setAttribute("fileName", "${PLATFORM_DIR}" + File.separatorChar + fileName);\r
+                ele.setAttribute("fileName", fileName);\r

             }\r
             root.appendChild(ele);\r
         }\r
             }\r
             root.appendChild(ele);\r
         }\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 4ba6ec4c6ac8d8aa1330ce2111d7c816bc2c580c..3d17befe1973b614b3c8a1af0dd79bc4f8ec3b1a 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -77,9 +77,9 @@ public class FrameworkBuildTask extends Task{
     \r
     private Set<File> msaFiles = new LinkedHashSet<File>();\r
     \r
     \r
     private Set<File> msaFiles = new LinkedHashSet<File>();\r
     \r

-    //\r
-    // This is only for none-multi-thread build to reduce overriding message\r
-    //\r
+    ///\r
+    /// This is only for none-multi-thread build to reduce overriding message\r
+    ///\r

     public static Hashtable<String, String> originalProperties = new Hashtable<String, String>();\r
     \r
     String toolsDefFilename = ToolDefinitions.DEFAULT_TOOLS_DEF_FILE_PATH;\r
     public static Hashtable<String, String> originalProperties = new Hashtable<String, String>();\r
     \r
     String toolsDefFilename = ToolDefinitions.DEFAULT_TOOLS_DEF_FILE_PATH;\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index a38c3c69d19989ab5c87a2e35f365b3d0089bc39..da6847d9da9686755d3bdc6597c3a4089401d1b5 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
@@ -465,7 +465,11 @@ public class ModuleBuildFileGenerator {
             String[] list = fp.getGenSectionElements(document, "${BASE_NAME}", fpdModuleId.getModule().getGuid(), targetFilename);\r
 \r
             for (int i = 0; i < list.length; i++) {\r
             String[] list = fp.getGenSectionElements(document, "${BASE_NAME}", fpdModuleId.getModule().getGuid(), targetFilename);\r
 \r
             for (int i = 0; i < list.length; i++) {\r

-                Element ele = document.createElement(list[i]);\r
+                String sectiontype = list[i];\r
+                if (sectiontype.equalsIgnoreCase("EFI_SECTION_RAW") && project.getProperty("MODULE_TYPE").equalsIgnoreCase("SEC")) {\r
+                    sectiontype += "_SEC";\r
+                }\r
+                Element ele = document.createElement(sectiontype);\r

                 ele.setAttribute("FILEPATH", ".");\r
                 ele.setAttribute("FILENAME", "${BASE_NAME}");\r
                 root.appendChild(ele);\r
                 ele.setAttribute("FILEPATH", ".");\r
                 ele.setAttribute("FILENAME", "${BASE_NAME}");\r
                 root.appendChild(ele);\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 86fb256e95afff47e82bcdad9e0fefd889952af0..d45abcdcd8dfe713c8ed3b7fd807c6074994db68 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -337,10 +337,10 @@ public class FpdParserTask extends Task {
             }\r
         }\r
     }\r
             }\r
         }\r
     }\r

+    \r

     /**\r
       This method is used for Single Module Build.\r
 \r
     /**\r
       This method is used for Single Module Build.\r
 \r

-\r

       @throws BuildException\r
                   FPD file is not valid.\r
     **/\r
       @throws BuildException\r
                   FPD file is not valid.\r
     **/\r