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 @@
org/tianocore/framework/tasks/Tool.java
org/tianocore/framework/tasks/ToolArg.java
org/tianocore/framework/tasks/VfrCompilerTask.java
- org/tianocore/framework/tasks/ZeroDebugDataTask.java
+ org/tianocore/framework/tasks/ZeroDebugDataTask.java
+ org/tianocore/framework/tasks/ModifyInfTask.java
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 @@
src/org/tianocore/frameworkwizard/workspace/Workspace.java
src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
+ src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java
+ src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
+ src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
+ src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java
+ src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
+ src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java
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 @@
+
+
+
+ GenBuild
+ TOOL
+ C21A4ED4-491E-4602-BF94-698EA54F254B
+ 2.0
+ This is the EFI/Tiano SurfaceArea Module
+
+ 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.
+
+ Copyright 2006, Intel Corporation
+
+ 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.
+
+ FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
+
+
+ IA32 X64 IPF EBC
+ false
+ NULL
+
+
+ build.xml
+
+
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 @@
+
+
+
+ GenBuild
+ TOOL
+ A169C678-3F55-4b6a-80BF-FD8B8DCAB883
+ 2.0
+ This is the TianoTools Module
+
+ 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.
+
+ Copyright 2006, Intel Corporation
+
+ 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.
+
+ FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
+
+
+ IA32 X64 IPF EBC
+ false
+ NULL
+
+
+ build.xml
+ Common/build.xml
+ Common/CommonLib.c
+ Common/CommonLib.h
+ Common/Crc32.c
+ Common/Crc32.h
+ Common/EfiCompress.c
+ Common/EfiCompress.h
+ Common/EfiCustomizedCompress.h
+ Common/EfiDecompress.c
+ Common/EfiDecompress.h
+ Common/EfiUtilityMsgs.c
+ Common/EfiUtilityMsgs.h
+ Common/FvLib.c
+ Common/FvLib.h
+ Common/MyAlloc.c
+ Common/MyAlloc.h
+ Common/ParseInf.c
+ Common/ParseInf.h
+ Common/SimpleFileParsing.c
+ Common/SimpleFileParsing.h
+ Common/WinNtInclude.h
+ CompressDll/build.xml
+ CompressDll/CompressDll.c
+ CompressDll/CompressDll.h
+ CreateMtFile/build.xml
+ CreateMtFile/CreateMtFile.c
+ CustomizedCompress/build.xml
+ CustomizedCompress/CustomizedCompress.c
+ EfiCompress/build.xml
+ EfiCompress/EfiCompressMain.c
+ EfiCompress/makefile
+ EfiRom/build.xml
+ EfiRom/EfiRom.c
+ FlashMap/build.xml
+ FlashMap/FlashDefFile.c
+ FlashMap/FlashDefFile.h
+ FlashMap/FlashMap.c
+ FlashMap/Microcode.c
+ FlashMap/Microcode.h
+ FlashMap/Symbols.c
+ FlashMap/Symbols.h
+ FwImage/build.xml
+ FwImage/fwimage.c
+ GenAcpiTable/build.xml
+ GenAcpiTable/GenAcpiTable.c
+ GenCapsuleHdr/build.xml
+ GenCapsuleHdr/CreateGuid.c
+ GenCapsuleHdr/GenCapsuleHdr.c
+ GenCRC32Section/build.xml
+ GenCRC32Section/GenCRC32Section.c
+ GenCRC32Section/GenCRC32Section.h
+ GenDepex/build.xml
+ GenDepex/DepexParser.c
+ GenDepex/DepexParser.h
+ GenDepex/GenDepex.c
+ GenDepex/GenDepex.h
+ GenFfsFile/build.xml
+ GenFfsFile/GenFfsFile.c
+ GenFfsFile/GenFfsFile.h
+ GenFfsFile/SimpleFileParsing.c
+ GenFvImage/build.xml
+ GenFvImage/Ebc/PeCoffLoaderEx.c
+ GenFvImage/GenFvImageExe.c
+ GenFvImage/GenFvImageExe.h
+ GenFvImage/GenFvImageLib.c
+ GenFvImage/GenFvImageLib.h
+ GenFvImage/GenFvImageLibInternal.h
+ GenSection/build.xml
+ GenSection/GenSection.c
+ GenSection/GenSection.h
+ GenTEImage/build.xml
+ GenTEImage/GenTEImage.c
+ GuidChk/build.xml
+ GuidChk/CommonUtils.h
+ GuidChk/FileSearch.c
+ GuidChk/FileSearch.h
+ GuidChk/GuidChk.c
+ GuidChk/GuidList.c
+ GuidChk/UtilsMsgs.c
+ GuidChk/UtilsMsgs.h
+ Include/Common/BaseTypes.h
+ Include/Common/Capsule.h
+ Include/Common/Dependency.h
+ Include/Common/EfiImage.h
+ Include/Common/FirmwareFileSystem.h
+ Include/Common/FirmwareVolumeHeader.h
+ Include/Common/FirmwareVolumeImageFormat.h
+ Include/Common/InternalFormRepresentation.h
+ Include/Common/MultiPhase.h
+ Include/Common/UefiBaseTypes.h
+ Include/Common/Variable.h
+ Include/Common/WorkingBlockHeader.h
+ Include/Guid/AcpiTableStorage.h
+ Include/Guid/Apriori.h
+ Include/Guid/Capsule.h
+ Include/Guid/FirmwareFileSystem.h
+ Include/Ia32/ProcessorBind.h
+ Include/IndustryStandard/pci22.h
+ Include/Library/PeCoffLib.h
+ Include/Library/PrintLib.h
+ Include/Protocol/DevicePath.h
+ Include/Protocol/GuidedSectionExtraction.h
+ Include/Protocol/Hii.h
+ Include/Protocol/UgaDraw.h
+ MakeDeps/build.xml
+ MakeDeps/MakeDeps.c
+ ModifyInf/build.xml
+ ModifyInf/ModifyInf.c
+ Pccts/antlr/antlr.1
+ Pccts/antlr/antlr.c
+ Pccts/antlr/antlr.g
+ Pccts/antlr/antlr.ilk
+ Pccts/antlr/antlr.pdb
+ Pccts/antlr/antlr.r
+ Pccts/antlr/antlr1.txt
+ Pccts/antlr/AntlrMS.mak
+ Pccts/antlr/AntlrPPC.mak
+ Pccts/antlr/bits.c
+ Pccts/antlr/build.c
+ Pccts/antlr/build.xml
+ Pccts/antlr/dumpcycles.c
+ Pccts/antlr/dumpnode.c
+ Pccts/antlr/egman.c
+ Pccts/antlr/err.c
+ Pccts/antlr/fcache.c
+ Pccts/antlr/fset.c
+ Pccts/antlr/fset2.c
+ Pccts/antlr/gen.c
+ Pccts/antlr/generic.h
+ Pccts/antlr/globals.c
+ Pccts/antlr/hash.c
+ Pccts/antlr/hash.h
+ Pccts/antlr/lex.c
+ Pccts/antlr/main.c
+ Pccts/antlr/makefile
+ Pccts/antlr/makefile1
+ Pccts/antlr/misc.c
+ Pccts/antlr/mode.h
+ Pccts/antlr/mrhoist.c
+ Pccts/antlr/parser.dlg
+ Pccts/antlr/pred.c
+ Pccts/antlr/proto.h
+ Pccts/antlr/README
+ Pccts/antlr/scan.c
+ Pccts/antlr/stdpccts.h
+ Pccts/antlr/syn.h
+ Pccts/antlr/tokens.h
+ Pccts/antlr/vc70.pdb
+ Pccts/build.xml
+ Pccts/CHANGES_FROM_131.txt
+ Pccts/CHANGES_FROM_133.txt
+ Pccts/CHANGES_FROM_133_BEFORE_MR13.txt
+ Pccts/CHANGES_SUMMARY.txt
+ Pccts/dlg/automata.c
+ Pccts/dlg/build.xml
+ Pccts/dlg/dlg.1
+ Pccts/dlg/dlg.h
+ Pccts/dlg/dlg.r
+ Pccts/dlg/dlg1.txt
+ Pccts/dlg/dlg_a.c
+ Pccts/dlg/dlg_p.c
+ Pccts/dlg/dlg_p.g
+ Pccts/dlg/DlgMS.mak
+ Pccts/dlg/DlgPPC.mak
+ Pccts/dlg/err.c
+ Pccts/dlg/main.c
+ Pccts/dlg/makefile
+ Pccts/dlg/makefile1
+ Pccts/dlg/mode.h
+ Pccts/dlg/output.c
+ Pccts/dlg/parser.dlg
+ Pccts/dlg/relabel.c
+ Pccts/dlg/stdpccts.h
+ Pccts/dlg/support.c
+ Pccts/dlg/tokens.h
+ Pccts/h/antlr.h
+ Pccts/h/AParser.cpp
+ Pccts/h/AParser.h
+ Pccts/h/ast.c
+ Pccts/h/ast.h
+ Pccts/h/ASTBase.cpp
+ Pccts/h/ASTBase.h
+ Pccts/h/AToken.h
+ Pccts/h/ATokenBuffer.cpp
+ Pccts/h/ATokenBuffer.h
+ Pccts/h/ATokenStream.h
+ Pccts/h/ATokPtr.h
+ Pccts/h/ATokPtrImpl.h
+ Pccts/h/BufFileInput.cpp
+ Pccts/h/BufFileInput.h
+ Pccts/h/charbuf.h
+ Pccts/h/charptr.c
+ Pccts/h/charptr.h
+ Pccts/h/config.h
+ Pccts/h/DLexer.h
+ Pccts/h/DLexerBase.cpp
+ Pccts/h/DLexerBase.h
+ Pccts/h/DLG_stream_input.h
+ Pccts/h/dlgauto.h
+ Pccts/h/dlgdef.h
+ Pccts/h/err.h
+ Pccts/h/int.h
+ Pccts/h/PBlackBox.h
+ Pccts/h/pccts_assert.h
+ Pccts/h/pccts_iostream.h
+ Pccts/h/pccts_istream.h
+ Pccts/h/pccts_setjmp.h
+ Pccts/h/pccts_stdarg.h
+ Pccts/h/pccts_stdio.h
+ Pccts/h/pccts_stdlib.h
+ Pccts/h/pccts_string.h
+ Pccts/h/PCCTSAST.cpp
+ Pccts/h/PCCTSAST.h
+ Pccts/h/pcctscfg.h
+ Pccts/h/pcnames.bat
+ Pccts/h/slist.cpp
+ Pccts/h/SList.h
+ Pccts/history.ps
+ Pccts/history.txt
+ Pccts/KNOWN_PROBLEMS.txt
+ Pccts/makefile
+ Pccts/MPW_Read_Me
+ Pccts/NOTES.bcc
+ Pccts/NOTES.msvc
+ Pccts/README
+ Pccts/RIGHTS
+ Pccts/support/genmk/genmk.c
+ Pccts/support/genmk/genmk_old.c
+ Pccts/support/genmk/makefile
+ Pccts/support/rexpr/makefile
+ Pccts/support/rexpr/rexpr.c
+ Pccts/support/rexpr/rexpr.h
+ Pccts/support/rexpr/test.c
+ Pccts/support/set/set.c
+ Pccts/support/set/set.h
+ Pccts/support/sym/sym.c
+ Pccts/support/sym/template.h
+ PeCoffLoader/BasePeCoff.c
+ PeCoffLoader/build.xml
+ PeCoffLoader/Common/EfiImage.h
+ PeCoffLoader/Ia32/PeCoffLoaderEx.c
+ PeCoffLoader/Ipf/PeCoffLoaderEx.c
+ PeCoffLoader/X64/PeCoffLoaderEx.c
+ PeiRebase/build.xml
+ PeiRebase/makefile
+ PeiRebase/PeiRebaseExe.c
+ PeiRebase/PeiRebaseExe.h
+ SecApResetVectorFixup/build.xml
+ SecApResetVectorFixup/SecApResetVectorFixup.c
+ SecApResetVectorFixup/SecApResetVectorFixup.h
+ SecFixup/build.xml
+ SecFixup/SecFixup.c
+ SecFixup/SecFixup.h
+ SetStamp/build.xml
+ SetStamp/SetStamp.c
+ SplitFile/build.xml
+ SplitFile/SplitFile.c
+ StrGather/build.xml
+ StrGather/StrGather.c
+ StrGather/StrGather.h
+ StrGather/StringDB.c
+ StrGather/StringDB.h
+ String/build.xml
+ String/PrintLib.c
+ String/PrintLibInternal.c
+ String/PrintLibInternal.h
+ String/String.c
+ Strip/build.xml
+ Strip/Strip.c
+ VfrCompile/build.xml
+ VfrCompile/DLGLexer.cpp
+ VfrCompile/DLGLexer.h
+ VfrCompile/EfiVfr.h
+ VfrCompile/EfiVfrParser.cpp
+ VfrCompile/EfiVfrParser.h
+ VfrCompile/parser.dlg
+ VfrCompile/tokens.h
+ VfrCompile/VfrCompile.cpp
+ VfrCompile/VfrCompile.g
+ VfrCompile/VfrServices.cpp
+ VfrCompile/VfrServices.h
+ ZeroDebugData/build.xml
+ ZeroDebugData/ZeroDebugData.c
+
+
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 @@
NULL
- Conf/FrameworkDatabase.db
- Conf/tools_def.template
- Conf/target.template
- Conf/BuildMacro.xml
- XMLSchema/FarManifest.xsd
- XMLSchema/FrameworkDataAttributes.xsd
- XMLSchema/FrameworkDataElements.xsd
- XMLSchema/FrameworkDataTypes.xsd
- XMLSchema/FrameworkHeaders.xsd
- XMLSchema/FrameworkPlatformDataElements.xsd
- XMLSchema/FrameworkPlatformDataTypes.xsd
- XMLSchema/NamingConvention.xsd
- XMLSchema/SurfaceArea.xsd
- Conf/Pcd/PcdDatabaseCommonDefinitions.sample
- Conf/Pcd/PcdDatabaseDxeDefinitions.sample
- Conf/Pcd/PcdDatabasePeiDefinitions.sample
+ build.xml
+ bin/build
+ bin/build.bat
+ bin/FrameworkWizard
+ bin/FrameworkWizard.bat
+ bin/SAVerify.bat
+ Conf/FrameworkDatabase.db
+ Conf/tools_def.template
+ Conf/target.template
+ Conf/BuildMacro.xml
+ XMLSchema/FarManifest.xsd
+ XMLSchema/FrameworkDataAttributes.xsd
+ XMLSchema/FrameworkDataElements.xsd
+ XMLSchema/FrameworkDataTypes.xsd
+ XMLSchema/FrameworkHeaders.xsd
+ XMLSchema/FrameworkPlatformDataElements.xsd
+ XMLSchema/FrameworkPlatformDataTypes.xsd
+ XMLSchema/NamingConvention.xsd
+ XMLSchema/SurfaceArea.xsd
+ XMLSchema/SurfaceArea.xsdconfig
+ Conf/Pcd/PcdDatabaseCommonDefinitions.sample
+ Conf/Pcd/PcdDatabaseDxeDefinitions.sample
+ Conf/Pcd/PcdDatabasePeiDefinitions.sample
+ gcc/README.txt
+ gcc/tianoCross-gcc-4.0
+ gcc/tianoCross-gcc-4.1
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 @@
Source/FrameworkTasks/FrameworkTasks.msa
Source/FrameworkWizard/FrameworkWizard.msa
Source/GenBuild/GenBuild.msa
+ Source/SurfaceArea/SurfaceArea.msa
+ Source/TianoTools/TianoTools.msa