summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>2007-08-10 07:35:19 +0000
committerklu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>2007-08-10 07:35:19 +0000
commitc0691ef00994dcc82d9f9956e4bbc6eb86d49d10 (patch)
tree80c6ceb610fc6f6486ace91e20e317c9b7696b58
parent3fb0bd7bc2ad1c9495938e1fdb9b0406bd9401d0 (diff)
downloadedk2-platforms-c0691ef00994dcc82d9f9956e4bbc6eb86d49d10.tar.xz
1) Move definition of FFS-related in Include/Framework/FirmwareFileSystem.h to IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
2) Remove Include/Framework/FirmwareFileSystem.h git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3608 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h31
-rw-r--r--IntelFrameworkPkg/Include/FrameworkPei.h1
-rw-r--r--IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h6
3 files changed, 6 insertions, 32 deletions
diff --git a/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h b/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h
deleted file mode 100644
index c0acbc98f0..0000000000
--- a/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/** @file
- This file defines the data structures that comprise the FFS file system.
-
- Copyright (c) 2007, 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.
-
- Module Name: FrameworkFirmwareFileSystem.h
-
- @par Revision Reference:
- These definitions are from Firmware File System Spec 0.9 but not in PI specs.
-
-**/
-
-#ifndef _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_
-#define _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_
-
-#include <PiPei.h>
-
-typedef UINT16 EFI_FFS_FILE_TAIL;
-
-#define FFS_ATTRIB_TAIL_PRESENT 0x01
-#define FFS_ATTRIB_RECOVERY 0x02
-#define FFS_ATTRIB_HEADER_EXTENSION 0x04
-
-#endif
diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index 93f2cc9798..e88691abca 100644
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -23,7 +23,6 @@
#include <PiPei.h>
#include <Framework/DataHubRecords.h>
-#include <Framework/FirmwareFileSystem.h>
#include <Framework/FirmwareVolumeImageFormat.h>
#include <Framework/FirmwareVolumeHeader.h>
#include <Framework/Hob.h>
diff --git a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
index baf8e04a1a..af091a538b 100644
--- a/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
+++ b/IntelFrameworkPkg/Include/Guid/FirmwareFileSystem.h
@@ -29,6 +29,12 @@
#define EFI_FIRMWARE_FILE_SYSTEM_GUID \
{ 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}
+typedef UINT16 EFI_FFS_FILE_TAIL;
+
+#define FFS_ATTRIB_TAIL_PRESENT 0x01
+#define FFS_ATTRIB_RECOVERY 0x02
+#define FFS_ATTRIB_HEADER_EXTENSION 0x04
+
extern EFI_GUID gEfiFirmwareFileSystemGuid;
#endif