3 files changed, 46 insertions, 1 deletions
diff --git a/Tools/Source/Merge/Merge.msa b/Tools/Source/Merge/Merge.msa
new file mode 100644
index 0000000..0920899
--- /dev/null
+++ b/Tools/Source/Merge/Merge.msa
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <MsaHeader>
+    <ModuleName>Merge Tool</ModuleName>
+    <ModuleType>BASE</ModuleType>
+    <GuidValue>fbb48848-4776-44a1-8458-1e84701fb62f</GuidValue>
+    <Version>0.1</Version>
+    <Abstract>The tool merges multiple MSA files (of the same ModuleType) into a single module</Abstract>
+    <Description>Merging multiple modules into a single module is useful for size reduction of the binary images.
+This tool will create an MSA file, based on the content of "leaf" MSA files.  It is written so that it can be executed from a command line, or later, incorporated into the Wizard.
+USAGE:
+merge [-v] -t target [-u UiName] [-p PackageFile] [-o OutputFileBasename] dir1\mod1.msa ... dirN\modN.msa</Description>
+    <Copyright>Copyright (c) 2006, Intel Corporation	All rights reserved.</Copyright>
+    <License URL="http://opensource.org/licenses/bsd-license.php">This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution.  The full text of the license may be found at  http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>EBC IA32 X64 IPF ARM PPC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>Merge</OutputFileBasename>
+  </ModuleDefinitions>
+  <SourceFiles>
+    <Filename>src/org/tianocore/Mege/CombineMsa.java</Filename>
+    <Filename>src/org/tianocore/Merge/Merge.java</Filename>
+    <Filename>src/org/tianocore/Merge/MergeCmd.java</Filename>
+    <Filename>build.xml</Filename>
+    <Filename>readme.txt</Filename>
+  </SourceFiles>
+</ModuleSurfaceArea>
+\ No newline at end of file
diff --git a/Tools/Tools.spd b/Tools/Tools.spd
index 6c03bf9..b58f304 100644
--- a/Tools/Tools.spd
+++ b/Tools/Tools.spd
@@ -38,5 +38,6 @@
     <Filename>Source/SurfaceArea/SurfaceArea.msa</Filename>
     <Filename>Source/TianoTools/TianoTools.msa</Filename>
     <Filename>Source/MigrationTools/MigrationTools.msa</Filename>
+    <Filename>Source/Merge/Merge.msa</Filename>
   </MsaFiles>
-</PackageSurfaceArea>
+</PackageSurfaceArea>
+\ No newline at end of file
diff --git a/Tools/build.xml b/Tools/build.xml
index ea6a250..e7f1031 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -40,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/FrameworkWizard/build.xml
           Source/MigrationTools/build.xml
           Source/ContextTool/build.xml
+          Source/Merge/build.xml
           "/>
     </subant>
     <echo message="The EDK II Java Tools build has completed!"/>
@@ -55,6 +56,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>
   </target>
 
+  <target name="Merge" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/Merge/build.xml
+          "/>
+    </subant>
+  </target>
+
   <target name="SurfaceArea" depends="makeCatalog">
     <subant target="" verbose="true" inheritall="false">
       <filelist dir="."
@@ -117,6 +127,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/TianoTools/build.xml
           Source/MigrationTools/build.xml
           Source/ContextTool/build.xml
+          Source/Merge/build.xml
         "/>
     </subant>
   </target>
@@ -150,6 +161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/TianoTools/build.xml
           Source/MigrationTools/build.xml
           Source/ContextTool/build.xml
+          Source/Merge/build.xml
         "/>
     </subant>
   </target>