6 files changed, 409 insertions, 17 deletions
diff --git a/Tools/Source/FrameworkTasks/FrameworkTasks.msa b/Tools/Source/FrameworkTasks/FrameworkTasks.msa
index 7921ed3c85..e71c20be14 100644
--- a/Tools/Source/FrameworkTasks/FrameworkTasks.msa
+++ b/Tools/Source/FrameworkTasks/FrameworkTasks.msa
@@ -76,6 +76,7 @@
     <Filename>org/tianocore/framework/tasks/Tool.java</Filename>
     <Filename>org/tianocore/framework/tasks/ToolArg.java</Filename>
     <Filename>org/tianocore/framework/tasks/VfrCompilerTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/ZeroDebugDataTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/ZeroDebugDataTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/ModifyInfTask.java</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/FrameworkWizard/FrameworkWizard.msa b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
index 3c3369615f..a8ab735012 100644
--- a/Tools/Source/FrameworkWizard/FrameworkWizard.msa
+++ b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
@@ -158,5 +158,25 @@
     <Filename>src/org/tianocore/frameworkwizard/workspace/Workspace.java</Filename>
     <Filename>src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java</Filename>
     <Filename>src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/SurfaceArea/SurfaceArea.msa b/Tools/Source/SurfaceArea/SurfaceArea.msa
new file mode 100644
index 0000000000..38adc49584
--- /dev/null
+++ b/Tools/Source/SurfaceArea/SurfaceArea.msa
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
+  <MsaHeader>
+    <ModuleName>GenBuild</ModuleName>
+    <ModuleType>TOOL</ModuleType>
+    <GuidValue>C21A4ED4-491E-4602-BF94-698EA54F254B</GuidValue>
+    <Version>2.0</Version>
+    <Abstract>This is the EFI/Tiano SurfaceArea Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These tools require compilation only once if the Developer Workstation and
+      the Developer's choice of HOST tool chain are stable.  If the developer
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.
+    </Description>
+    <Copyright>Copyright 2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved.
+      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>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>NULL</OutputFileBasename>
+  </ModuleDefinitions>
+  <SourceFiles>
+    <Filename>build.xml</Filename>
+  </SourceFiles>
+</ModuleSurfaceArea>
diff --git a/Tools/Source/TianoTools/TianoTools.msa b/Tools/Source/TianoTools/TianoTools.msa
new file mode 100644
index 0000000000..3a4d820cdc
--- /dev/null
+++ b/Tools/Source/TianoTools/TianoTools.msa
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
+  <MsaHeader>
+    <ModuleName>GenBuild</ModuleName>
+    <ModuleType>TOOL</ModuleType>
+    <GuidValue>A169C678-3F55-4b6a-80BF-FD8B8DCAB883</GuidValue>
+    <Version>2.0</Version>
+    <Abstract>This is the TianoTools Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These tools require compilation only once if the Developer Workstation and
+      the Developer's choice of HOST tool chain are stable.  If the developer
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.
+    </Description>
+    <Copyright>Copyright 2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved.
+      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>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>NULL</OutputFileBasename>
+  </ModuleDefinitions>
+  <SourceFiles>
+    <Filename>build.xml</Filename>
+    <Filename>Common/build.xml</Filename>
+    <Filename>Common/CommonLib.c</Filename>
+    <Filename>Common/CommonLib.h</Filename>
+    <Filename>Common/Crc32.c</Filename>
+    <Filename>Common/Crc32.h</Filename>
+    <Filename>Common/EfiCompress.c</Filename>
+    <Filename>Common/EfiCompress.h</Filename>
+    <Filename>Common/EfiCustomizedCompress.h</Filename>
+    <Filename>Common/EfiDecompress.c</Filename>
+    <Filename>Common/EfiDecompress.h</Filename>
+    <Filename>Common/EfiUtilityMsgs.c</Filename>
+    <Filename>Common/EfiUtilityMsgs.h</Filename>
+    <Filename>Common/FvLib.c</Filename>
+    <Filename>Common/FvLib.h</Filename>
+    <Filename>Common/MyAlloc.c</Filename>
+    <Filename>Common/MyAlloc.h</Filename>
+    <Filename>Common/ParseInf.c</Filename>
+    <Filename>Common/ParseInf.h</Filename>
+    <Filename>Common/SimpleFileParsing.c</Filename>
+    <Filename>Common/SimpleFileParsing.h</Filename>
+    <Filename>Common/WinNtInclude.h</Filename>
+    <Filename>CompressDll/build.xml</Filename>
+    <Filename>CompressDll/CompressDll.c</Filename>
+    <Filename>CompressDll/CompressDll.h</Filename>
+    <Filename>CreateMtFile/build.xml</Filename>
+    <Filename>CreateMtFile/CreateMtFile.c</Filename>
+    <Filename>CustomizedCompress/build.xml</Filename>
+    <Filename>CustomizedCompress/CustomizedCompress.c</Filename>
+    <Filename>EfiCompress/build.xml</Filename>
+    <Filename>EfiCompress/EfiCompressMain.c</Filename>
+    <Filename>EfiCompress/makefile</Filename>
+    <Filename>EfiRom/build.xml</Filename>
+    <Filename>EfiRom/EfiRom.c</Filename>
+    <Filename>FlashMap/build.xml</Filename>
+    <Filename>FlashMap/FlashDefFile.c</Filename>
+    <Filename>FlashMap/FlashDefFile.h</Filename>
+    <Filename>FlashMap/FlashMap.c</Filename>
+    <Filename>FlashMap/Microcode.c</Filename>
+    <Filename>FlashMap/Microcode.h</Filename>
+    <Filename>FlashMap/Symbols.c</Filename>
+    <Filename>FlashMap/Symbols.h</Filename>
+    <Filename>FwImage/build.xml</Filename>
+    <Filename>FwImage/fwimage.c</Filename>
+    <Filename>GenAcpiTable/build.xml</Filename>
+    <Filename>GenAcpiTable/GenAcpiTable.c</Filename>
+    <Filename>GenCapsuleHdr/build.xml</Filename>
+    <Filename>GenCapsuleHdr/CreateGuid.c</Filename>
+    <Filename>GenCapsuleHdr/GenCapsuleHdr.c</Filename>
+    <Filename>GenCRC32Section/build.xml</Filename>
+    <Filename>GenCRC32Section/GenCRC32Section.c</Filename>
+    <Filename>GenCRC32Section/GenCRC32Section.h</Filename>
+    <Filename>GenDepex/build.xml</Filename>
+    <Filename>GenDepex/DepexParser.c</Filename>
+    <Filename>GenDepex/DepexParser.h</Filename>
+    <Filename>GenDepex/GenDepex.c</Filename>
+    <Filename>GenDepex/GenDepex.h</Filename>
+    <Filename>GenFfsFile/build.xml</Filename>
+    <Filename>GenFfsFile/GenFfsFile.c</Filename>
+    <Filename>GenFfsFile/GenFfsFile.h</Filename>
+    <Filename>GenFfsFile/SimpleFileParsing.c</Filename>
+    <Filename>GenFvImage/build.xml</Filename>
+    <Filename>GenFvImage/Ebc/PeCoffLoaderEx.c</Filename>
+    <Filename>GenFvImage/GenFvImageExe.c</Filename>
+    <Filename>GenFvImage/GenFvImageExe.h</Filename>
+    <Filename>GenFvImage/GenFvImageLib.c</Filename>
+    <Filename>GenFvImage/GenFvImageLib.h</Filename>
+    <Filename>GenFvImage/GenFvImageLibInternal.h</Filename>
+    <Filename>GenSection/build.xml</Filename>
+    <Filename>GenSection/GenSection.c</Filename>
+    <Filename>GenSection/GenSection.h</Filename>
+    <Filename>GenTEImage/build.xml</Filename>
+    <Filename>GenTEImage/GenTEImage.c</Filename>
+    <Filename>GuidChk/build.xml</Filename>
+    <Filename>GuidChk/CommonUtils.h</Filename>
+    <Filename>GuidChk/FileSearch.c</Filename>
+    <Filename>GuidChk/FileSearch.h</Filename>
+    <Filename>GuidChk/GuidChk.c</Filename>
+    <Filename>GuidChk/GuidList.c</Filename>
+    <Filename>GuidChk/UtilsMsgs.c</Filename>
+    <Filename>GuidChk/UtilsMsgs.h</Filename>
+    <Filename>Include/Common/BaseTypes.h</Filename>
+    <Filename>Include/Common/Capsule.h</Filename>
+    <Filename>Include/Common/Dependency.h</Filename>
+    <Filename>Include/Common/EfiImage.h</Filename>
+    <Filename>Include/Common/FirmwareFileSystem.h</Filename>
+    <Filename>Include/Common/FirmwareVolumeHeader.h</Filename>
+    <Filename>Include/Common/FirmwareVolumeImageFormat.h</Filename>
+    <Filename>Include/Common/InternalFormRepresentation.h</Filename>
+    <Filename>Include/Common/MultiPhase.h</Filename>
+    <Filename>Include/Common/UefiBaseTypes.h</Filename>
+    <Filename>Include/Common/Variable.h</Filename>
+    <Filename>Include/Common/WorkingBlockHeader.h</Filename>
+    <Filename>Include/Guid/AcpiTableStorage.h</Filename>
+    <Filename>Include/Guid/Apriori.h</Filename>
+    <Filename>Include/Guid/Capsule.h</Filename>
+    <Filename>Include/Guid/FirmwareFileSystem.h</Filename>
+    <Filename>Include/Ia32/ProcessorBind.h</Filename>
+    <Filename>Include/IndustryStandard/pci22.h</Filename>
+    <Filename>Include/Library/PeCoffLib.h</Filename>
+    <Filename>Include/Library/PrintLib.h</Filename>
+    <Filename>Include/Protocol/DevicePath.h</Filename>
+    <Filename>Include/Protocol/GuidedSectionExtraction.h</Filename>
+    <Filename>Include/Protocol/Hii.h</Filename>
+    <Filename>Include/Protocol/UgaDraw.h</Filename>
+    <Filename>MakeDeps/build.xml</Filename>
+    <Filename>MakeDeps/MakeDeps.c</Filename>
+    <Filename>ModifyInf/build.xml</Filename>
+    <Filename>ModifyInf/ModifyInf.c</Filename>
+    <Filename>Pccts/antlr/antlr.1</Filename>
+    <Filename>Pccts/antlr/antlr.c</Filename>
+    <Filename>Pccts/antlr/antlr.g</Filename>
+    <Filename>Pccts/antlr/antlr.ilk</Filename>
+    <Filename>Pccts/antlr/antlr.pdb</Filename>
+    <Filename>Pccts/antlr/antlr.r</Filename>
+    <Filename>Pccts/antlr/antlr1.txt</Filename>
+    <Filename>Pccts/antlr/AntlrMS.mak</Filename>
+    <Filename>Pccts/antlr/AntlrPPC.mak</Filename>
+    <Filename>Pccts/antlr/bits.c</Filename>
+    <Filename>Pccts/antlr/build.c</Filename>
+    <Filename>Pccts/antlr/build.xml</Filename>
+    <Filename>Pccts/antlr/dumpcycles.c</Filename>
+    <Filename>Pccts/antlr/dumpnode.c</Filename>
+    <Filename>Pccts/antlr/egman.c</Filename>
+    <Filename>Pccts/antlr/err.c</Filename>
+    <Filename>Pccts/antlr/fcache.c</Filename>
+    <Filename>Pccts/antlr/fset.c</Filename>
+    <Filename>Pccts/antlr/fset2.c</Filename>
+    <Filename>Pccts/antlr/gen.c</Filename>
+    <Filename>Pccts/antlr/generic.h</Filename>
+    <Filename>Pccts/antlr/globals.c</Filename>
+    <Filename>Pccts/antlr/hash.c</Filename>
+    <Filename>Pccts/antlr/hash.h</Filename>
+    <Filename>Pccts/antlr/lex.c</Filename>
+    <Filename>Pccts/antlr/main.c</Filename>
+    <Filename>Pccts/antlr/makefile</Filename>
+    <Filename>Pccts/antlr/makefile1</Filename>
+    <Filename>Pccts/antlr/misc.c</Filename>
+    <Filename>Pccts/antlr/mode.h</Filename>
+    <Filename>Pccts/antlr/mrhoist.c</Filename>
+    <Filename>Pccts/antlr/parser.dlg</Filename>
+    <Filename>Pccts/antlr/pred.c</Filename>
+    <Filename>Pccts/antlr/proto.h</Filename>
+    <Filename>Pccts/antlr/README</Filename>
+    <Filename>Pccts/antlr/scan.c</Filename>
+    <Filename>Pccts/antlr/stdpccts.h</Filename>
+    <Filename>Pccts/antlr/syn.h</Filename>
+    <Filename>Pccts/antlr/tokens.h</Filename>
+    <Filename>Pccts/antlr/vc70.pdb</Filename>
+    <Filename>Pccts/build.xml</Filename>
+    <Filename>Pccts/CHANGES_FROM_131.txt</Filename>
+    <Filename>Pccts/CHANGES_FROM_133.txt</Filename>
+    <Filename>Pccts/CHANGES_FROM_133_BEFORE_MR13.txt</Filename>
+    <Filename>Pccts/CHANGES_SUMMARY.txt</Filename>
+    <Filename>Pccts/dlg/automata.c</Filename>
+    <Filename>Pccts/dlg/build.xml</Filename>
+    <Filename>Pccts/dlg/dlg.1</Filename>
+    <Filename>Pccts/dlg/dlg.h</Filename>
+    <Filename>Pccts/dlg/dlg.r</Filename>
+    <Filename>Pccts/dlg/dlg1.txt</Filename>
+    <Filename>Pccts/dlg/dlg_a.c</Filename>
+    <Filename>Pccts/dlg/dlg_p.c</Filename>
+    <Filename>Pccts/dlg/dlg_p.g</Filename>
+    <Filename>Pccts/dlg/DlgMS.mak</Filename>
+    <Filename>Pccts/dlg/DlgPPC.mak</Filename>
+    <Filename>Pccts/dlg/err.c</Filename>
+    <Filename>Pccts/dlg/main.c</Filename>
+    <Filename>Pccts/dlg/makefile</Filename>
+    <Filename>Pccts/dlg/makefile1</Filename>
+    <Filename>Pccts/dlg/mode.h</Filename>
+    <Filename>Pccts/dlg/output.c</Filename>
+    <Filename>Pccts/dlg/parser.dlg</Filename>
+    <Filename>Pccts/dlg/relabel.c</Filename>
+    <Filename>Pccts/dlg/stdpccts.h</Filename>
+    <Filename>Pccts/dlg/support.c</Filename>
+    <Filename>Pccts/dlg/tokens.h</Filename>
+    <Filename>Pccts/h/antlr.h</Filename>
+    <Filename>Pccts/h/AParser.cpp</Filename>
+    <Filename>Pccts/h/AParser.h</Filename>
+    <Filename>Pccts/h/ast.c</Filename>
+    <Filename>Pccts/h/ast.h</Filename>
+    <Filename>Pccts/h/ASTBase.cpp</Filename>
+    <Filename>Pccts/h/ASTBase.h</Filename>
+    <Filename>Pccts/h/AToken.h</Filename>
+    <Filename>Pccts/h/ATokenBuffer.cpp</Filename>
+    <Filename>Pccts/h/ATokenBuffer.h</Filename>
+    <Filename>Pccts/h/ATokenStream.h</Filename>
+    <Filename>Pccts/h/ATokPtr.h</Filename>
+    <Filename>Pccts/h/ATokPtrImpl.h</Filename>
+    <Filename>Pccts/h/BufFileInput.cpp</Filename>
+    <Filename>Pccts/h/BufFileInput.h</Filename>
+    <Filename>Pccts/h/charbuf.h</Filename>
+    <Filename>Pccts/h/charptr.c</Filename>
+    <Filename>Pccts/h/charptr.h</Filename>
+    <Filename>Pccts/h/config.h</Filename>
+    <Filename>Pccts/h/DLexer.h</Filename>
+    <Filename>Pccts/h/DLexerBase.cpp</Filename>
+    <Filename>Pccts/h/DLexerBase.h</Filename>
+    <Filename>Pccts/h/DLG_stream_input.h</Filename>
+    <Filename>Pccts/h/dlgauto.h</Filename>
+    <Filename>Pccts/h/dlgdef.h</Filename>
+    <Filename>Pccts/h/err.h</Filename>
+    <Filename>Pccts/h/int.h</Filename>
+    <Filename>Pccts/h/PBlackBox.h</Filename>
+    <Filename>Pccts/h/pccts_assert.h</Filename>
+    <Filename>Pccts/h/pccts_iostream.h</Filename>
+    <Filename>Pccts/h/pccts_istream.h</Filename>
+    <Filename>Pccts/h/pccts_setjmp.h</Filename>
+    <Filename>Pccts/h/pccts_stdarg.h</Filename>
+    <Filename>Pccts/h/pccts_stdio.h</Filename>
+    <Filename>Pccts/h/pccts_stdlib.h</Filename>
+    <Filename>Pccts/h/pccts_string.h</Filename>
+    <Filename>Pccts/h/PCCTSAST.cpp</Filename>
+    <Filename>Pccts/h/PCCTSAST.h</Filename>
+    <Filename>Pccts/h/pcctscfg.h</Filename>
+    <Filename>Pccts/h/pcnames.bat</Filename>
+    <Filename>Pccts/h/slist.cpp</Filename>
+    <Filename>Pccts/h/SList.h</Filename>
+    <Filename>Pccts/history.ps</Filename>
+    <Filename>Pccts/history.txt</Filename>
+    <Filename>Pccts/KNOWN_PROBLEMS.txt</Filename>
+    <Filename>Pccts/makefile</Filename>
+    <Filename>Pccts/MPW_Read_Me</Filename>
+    <Filename>Pccts/NOTES.bcc</Filename>
+    <Filename>Pccts/NOTES.msvc</Filename>
+    <Filename>Pccts/README</Filename>
+    <Filename>Pccts/RIGHTS</Filename>
+    <Filename>Pccts/support/genmk/genmk.c</Filename>
+    <Filename>Pccts/support/genmk/genmk_old.c</Filename>
+    <Filename>Pccts/support/genmk/makefile</Filename>
+    <Filename>Pccts/support/rexpr/makefile</Filename>
+    <Filename>Pccts/support/rexpr/rexpr.c</Filename>
+    <Filename>Pccts/support/rexpr/rexpr.h</Filename>
+    <Filename>Pccts/support/rexpr/test.c</Filename>
+    <Filename>Pccts/support/set/set.c</Filename>
+    <Filename>Pccts/support/set/set.h</Filename>
+    <Filename>Pccts/support/sym/sym.c</Filename>
+    <Filename>Pccts/support/sym/template.h</Filename>
+    <Filename>PeCoffLoader/BasePeCoff.c</Filename>
+    <Filename>PeCoffLoader/build.xml</Filename>
+    <Filename>PeCoffLoader/Common/EfiImage.h</Filename>
+    <Filename>PeCoffLoader/Ia32/PeCoffLoaderEx.c</Filename>
+    <Filename>PeCoffLoader/Ipf/PeCoffLoaderEx.c</Filename>
+    <Filename>PeCoffLoader/X64/PeCoffLoaderEx.c</Filename>
+    <Filename>PeiRebase/build.xml</Filename>
+    <Filename>PeiRebase/makefile</Filename>
+    <Filename>PeiRebase/PeiRebaseExe.c</Filename>
+    <Filename>PeiRebase/PeiRebaseExe.h</Filename>
+    <Filename>SecApResetVectorFixup/build.xml</Filename>
+    <Filename>SecApResetVectorFixup/SecApResetVectorFixup.c</Filename>
+    <Filename>SecApResetVectorFixup/SecApResetVectorFixup.h</Filename>
+    <Filename>SecFixup/build.xml</Filename>
+    <Filename>SecFixup/SecFixup.c</Filename>
+    <Filename>SecFixup/SecFixup.h</Filename>
+    <Filename>SetStamp/build.xml</Filename>
+    <Filename>SetStamp/SetStamp.c</Filename>
+    <Filename>SplitFile/build.xml</Filename>
+    <Filename>SplitFile/SplitFile.c</Filename>
+    <Filename>StrGather/build.xml</Filename>
+    <Filename>StrGather/StrGather.c</Filename>
+    <Filename>StrGather/StrGather.h</Filename>
+    <Filename>StrGather/StringDB.c</Filename>
+    <Filename>StrGather/StringDB.h</Filename>
+    <Filename>String/build.xml</Filename>
+    <Filename>String/PrintLib.c</Filename>
+    <Filename>String/PrintLibInternal.c</Filename>
+    <Filename>String/PrintLibInternal.h</Filename>
+    <Filename>String/String.c</Filename>
+    <Filename>Strip/build.xml</Filename>
+    <Filename>Strip/Strip.c</Filename>
+    <Filename>VfrCompile/build.xml</Filename>
+    <Filename>VfrCompile/DLGLexer.cpp</Filename>
+    <Filename>VfrCompile/DLGLexer.h</Filename>
+    <Filename>VfrCompile/EfiVfr.h</Filename>
+    <Filename>VfrCompile/EfiVfrParser.cpp</Filename>
+    <Filename>VfrCompile/EfiVfrParser.h</Filename>
+    <Filename>VfrCompile/parser.dlg</Filename>
+    <Filename>VfrCompile/tokens.h</Filename>
+    <Filename>VfrCompile/VfrCompile.cpp</Filename>
+    <Filename>VfrCompile/VfrCompile.g</Filename>
+    <Filename>VfrCompile/VfrServices.cpp</Filename>
+    <Filename>VfrCompile/VfrServices.h</Filename>
+    <Filename>ZeroDebugData/build.xml</Filename>
+    <Filename>ZeroDebugData/ZeroDebugData.c</Filename>
+  </SourceFiles>
+</ModuleSurfaceArea>
diff --git a/Tools/ToolResources.msa b/Tools/ToolResources.msa
index 1c8029d7c2..256aefdc05 100644
--- a/Tools/ToolResources.msa
+++ b/Tools/ToolResources.msa
@@ -33,21 +33,31 @@
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename ToolCode="NULL">Conf/FrameworkDatabase.db</Filename>
-    <Filename ToolCode="NULL">Conf/tools_def.template</Filename>
-    <Filename ToolCode="NULL">Conf/target.template</Filename>
-    <Filename ToolCode="NULL">Conf/BuildMacro.xml</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FarManifest.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FrameworkDataAttributes.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FrameworkDataElements.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FrameworkDataTypes.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FrameworkHeaders.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FrameworkPlatformDataElements.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/FrameworkPlatformDataTypes.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/NamingConvention.xsd</Filename>
-    <Filename ToolCode="NULL">XMLSchema/SurfaceArea.xsd</Filename>
-    <Filename ToolCode="NULL">Conf/Pcd/PcdDatabaseCommonDefinitions.sample</Filename>
-    <Filename ToolCode="NULL">Conf/Pcd/PcdDatabaseDxeDefinitions.sample</Filename>
-    <Filename ToolCode="NULL">Conf/Pcd/PcdDatabasePeiDefinitions.sample</Filename>
+    <Filename>build.xml</Filename>
+    <Filename>bin/build</Filename>
+    <Filename>bin/build.bat</Filename>
+    <Filename>bin/FrameworkWizard</Filename>
+    <Filename>bin/FrameworkWizard.bat</Filename>
+    <Filename>bin/SAVerify.bat</Filename>
+    <Filename>Conf/FrameworkDatabase.db</Filename>
+    <Filename>Conf/tools_def.template</Filename>
+    <Filename>Conf/target.template</Filename>
+    <Filename>Conf/BuildMacro.xml</Filename>
+    <Filename>XMLSchema/FarManifest.xsd</Filename>
+    <Filename>XMLSchema/FrameworkDataAttributes.xsd</Filename>
+    <Filename>XMLSchema/FrameworkDataElements.xsd</Filename>
+    <Filename>XMLSchema/FrameworkDataTypes.xsd</Filename>
+    <Filename>XMLSchema/FrameworkHeaders.xsd</Filename>
+    <Filename>XMLSchema/FrameworkPlatformDataElements.xsd</Filename>
+    <Filename>XMLSchema/FrameworkPlatformDataTypes.xsd</Filename>
+    <Filename>XMLSchema/NamingConvention.xsd</Filename>
+    <Filename>XMLSchema/SurfaceArea.xsd</Filename>
+    <Filename>XMLSchema/SurfaceArea.xsdconfig</Filename>
+    <Filename>Conf/Pcd/PcdDatabaseCommonDefinitions.sample</Filename>
+    <Filename>Conf/Pcd/PcdDatabaseDxeDefinitions.sample</Filename>
+    <Filename>Conf/Pcd/PcdDatabasePeiDefinitions.sample</Filename>
+    <Filename>gcc/README.txt</Filename>
+    <Filename>gcc/tianoCross-gcc-4.0</Filename>
+    <Filename>gcc/tianoCross-gcc-4.1</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Tools.spd b/Tools/Tools.spd
index fb387e6334..1e42d5d533 100644
--- a/Tools/Tools.spd
+++ b/Tools/Tools.spd
@@ -38,5 +38,7 @@
     <Filename>Source/FrameworkTasks/FrameworkTasks.msa</Filename>
     <Filename>Source/FrameworkWizard/FrameworkWizard.msa</Filename>
     <Filename>Source/GenBuild/GenBuild.msa</Filename>
+    <Filename>Source/SurfaceArea/SurfaceArea.msa</Filename>
+    <Filename>Source/TianoTools/TianoTools.msa</Filename>
   </MsaFiles>
 </PackageSurfaceArea>