1) Move definition of FFS-related in Include/Framework/FirmwareFileSystem.h to IntelF...

2) Remove Include/Framework/FirmwareFileSystem.h

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

diff --git a/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h b/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h
deleted file mode 100644 (file)
index c0acbc9..0000000
--- a/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @file\r
-  This file defines the data structures that comprise the FFS file system.\r
-\r
-  Copyright (c) 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-  Module Name:  FrameworkFirmwareFileSystem.h\r
-\r
-  @par Revision Reference:\r
-  These definitions are from Firmware File System Spec 0.9 but not in PI specs.\r
-\r
-**/\r
-\r
-#ifndef _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_\r
-#define _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_\r
-\r
-#include <PiPei.h>\r
-\r
-typedef UINT16                      EFI_FFS_FILE_TAIL;\r
-\r
-#define FFS_ATTRIB_TAIL_PRESENT     0x01\r
-#define FFS_ATTRIB_RECOVERY         0x02\r
-#define FFS_ATTRIB_HEADER_EXTENSION 0x04\r
-\r
-#endif\r

diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index 93f2cc9798662b9dc786289ed6cea7e66581b33a..e88691abca2ba9cabf7c965d181e3770bf870281 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -23,7 +23,6 @@
 #include <PiPei.h>\r
 \r
 #include <Framework/DataHubRecords.h>\r
-#include <Framework/FirmwareFileSystem.h>\r
 #include <Framework/FirmwareVolumeImageFormat.h>\r
 #include <Framework/FirmwareVolumeHeader.h>\r
 #include <Framework/Hob.h>\r

diff --git a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
index baf8e04a1a6b6caf36bf9dbf3db3a87ba8a4e6ec..af091a538bddaeb8968dee5806087566f9775c85 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
+++ b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
@@ -29,6 +29,12 @@
 #define EFI_FIRMWARE_FILE_SYSTEM_GUID \\r
   { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}\r
 \r
+typedef UINT16                      EFI_FFS_FILE_TAIL;\r
+\r
+#define FFS_ATTRIB_TAIL_PRESENT     0x01\r
+#define FFS_ATTRIB_RECOVERY         0x02\r
+#define FFS_ATTRIB_HEADER_EXTENSION 0x04\r
+\r
 extern EFI_GUID gEfiFirmwareFileSystemGuid;\r
 \r
 #endif\r