Remove over-specified dependencies on IntelFrameworkPkg and IntelFrameworkModulePkg.

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

12 files changed, 5 insertions, 23 deletions

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf
index 22b58342a3..fef1279917 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.inf
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf
@@ -38,7 +38,6 @@
 

 [Packages]

   IntelFrameworkPkg/IntelFrameworkPkg.dec

-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

   UnixPkg/UnixPkg.dec

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
index f19d7a200d..12b3b998a7 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
@@ -35,8 +35,6 @@
 

 

 [Packages]

-  IntelFrameworkPkg/IntelFrameworkPkg.dec

-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

   UnixPkg/UnixPkg.dec

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index d9c27b15a6..7312b1054a 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file

   OEM hook status code library functions with no library constructor/destructor

 

-  Copyright (c) 2006, Intel Corporation

+  Copyright (c) 2006 - 2010, 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

@@ -13,7 +13,6 @@
   Module Name:  UnixOemHookStatusCodeLib.c

 

 **/

-#include <FrameworkDxe.h>

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

 #include "UnixDxe.h"

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
index 1305996f60..c184a49aa6 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
@@ -37,8 +37,6 @@
   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   UnixPkg/UnixPkg.dec

-  IntelFrameworkPkg/IntelFrameworkPkg.dec

-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

 

 

 [LibraryClasses]

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index ad68d51c72..69525a59da 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -1,7 +1,7 @@
 /** @file

   OEM hook status code library functions with no library constructor/destructor

 

-  Copyright (c) 2006 - 2008, Intel Corporation

+  Copyright (c) 2006 - 2010, 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

@@ -13,7 +13,6 @@
   Module Name:  UnixOemHookStatusCodeLib.c

 

 **/

-#include <FrameworkPei.h>

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

 #include <Ppi/UnixThunk.h>

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index e1f4ad8490..bc5439f17c 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -75,7 +75,6 @@
   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   IntelFrameworkPkg/IntelFrameworkPkg.dec

-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

   UnixPkg/UnixPkg.dec

 

 [LibraryClasses]

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index 0e5597d267..f19fd0c3c2 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -36,7 +36,6 @@ Abstract:
 #include "SecMain.h"
 #include <sys/mman.h>
 #include <Ppi/UnixPeiLoadFile.h>
-#include <Framework/StatusCode.h>
 #include <Ppi/TemporaryRamSupport.h>
 #include <dlfcn.h>
 
diff --git a/UnixPkg/Sec/SecMain.h b/UnixPkg/Sec/SecMain.h
index 7a120f7a0a..d862847f69 100644
--- a/UnixPkg/Sec/SecMain.h
+++ b/UnixPkg/Sec/SecMain.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006 - 2009, Intel Corporation                                                         

+Copyright (c) 2006 - 2010, Intel Corporation                                                         

 Portions copyright (c) 2008-2009 Apple Inc.

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

@@ -18,7 +18,7 @@ Abstract:
   Include file for host API based SEC

 

 --*/

-#include <FrameworkPei.h>

+#include <PiPei.h>

 

 #include <Protocol/UnixThunk.h>

 #include <Ppi/StatusCode.h>

diff --git a/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf
index caa1b724c9..e16fac2caf 100644
--- a/UnixPkg/Sec/SecMain.inf
+++ b/UnixPkg/Sec/SecMain.inf
@@ -43,7 +43,6 @@
 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

-  IntelFrameworkPkg/IntelFrameworkPkg.dec

   UnixPkg/UnixPkg.dec

 

 [LibraryClasses]

diff --git a/UnixPkg/UnixFlashMapPei/FlashMap.c b/UnixPkg/UnixFlashMapPei/FlashMap.c
index f33b00ec17..f37355d7a1 100644
--- a/UnixPkg/UnixFlashMapPei/FlashMap.c
+++ b/UnixPkg/UnixFlashMapPei/FlashMap.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006 - 2008, Intel Corporation                                                         

+Copyright (c) 2006 - 2010, 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        

@@ -23,7 +23,6 @@ Abstract:
 #include "PiPei.h"

 

 #include <Guid/SystemNvDataGuid.h>

-#include <Guid/FirmwareFileSystem.h>

 #include <Ppi/UnixFwh.h>

 #include <Protocol/FirmwareVolumeBlock.h>

 

diff --git a/UnixPkg/UnixFlashMapPei/FlashMap.inf b/UnixPkg/UnixFlashMapPei/FlashMap.inf
index 352a9deaba..8ccf68aa28 100644
--- a/UnixPkg/UnixFlashMapPei/FlashMap.inf
+++ b/UnixPkg/UnixFlashMapPei/FlashMap.inf
@@ -35,7 +35,6 @@
 [Packages]

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-  IntelFrameworkPkg/IntelFrameworkPkg.dec

   UnixPkg/UnixPkg.dec

 

 [LibraryClasses]

@@ -47,10 +46,6 @@
   PeimEntryPoint

   DebugLib

 

-

-[Guids]

-  gEfiFirmwareFileSystemGuid                    # ALWAYS_CONSUMED

-

 [Protocols]

   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_CONSUMED

 

diff --git a/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
index 6b40755607..b1762037df 100644
--- a/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
+++ b/UnixPkg/UnixThunkPpiToProtocolPei/UnixThunkPpiToProtocol.inf
@@ -34,9 +34,7 @@
 

 

 [Packages]

-#  MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

-#  IntelFrameworkPkg/IntelFrameworkPkg.dec

   UnixPkg/UnixPkg.dec