From 584ea2c8ef87e06cee9142966620db7a5bd2d344 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Fri, 3 Apr 2015 02:49:10 +0000 Subject: IntelFrameworkModulePkg: Move LzmaDecompress GUID Move LzmaDecompress GUID definition from IntelFrameworkModulePkg to MdeModulePkg Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao Reviewed-by: Star Zeng Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17110 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Include/Guid/LzmaDecompress.h | 35 ---------------------- .../IntelFrameworkModulePkg.dec | 7 +---- .../LzmaArchCustomDecompressLib.inf | 4 +-- .../LzmaCustomDecompressLib.inf | 4 +-- 4 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Include/Guid/LzmaDecompress.h (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/Include/Guid/LzmaDecompress.h b/IntelFrameworkModulePkg/Include/Guid/LzmaDecompress.h deleted file mode 100644 index 18a6552f9c..0000000000 --- a/IntelFrameworkModulePkg/Include/Guid/LzmaDecompress.h +++ /dev/null @@ -1,35 +0,0 @@ -/** @file - Lzma Custom decompress algorithm Guid definition. - -Copyright (c) 2009 - 2012, 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 that 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. - -**/ - -#ifndef __LZMA_DECOMPRESS_GUID_H__ -#define __LZMA_DECOMPRESS_GUID_H__ - -/// -/// The Global ID used to identify a section of an FFS file of type -/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using LZMA. -/// -#define LZMA_CUSTOM_DECOMPRESS_GUID \ - { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF } } - -/// -/// The Global ID used to identify a section of an FFS file of type -/// EFI_SECTION_GUID_DEFINED, whose contents have been compressed using LZMA with X86 code Converter. -/// -#define LZMAF86_CUSTOM_DECOMPRESS_GUID \ - { 0xD42AE6BD, 0x1352, 0x4bfb, { 0x90, 0x9A, 0xCA, 0x72, 0xA6, 0xEA, 0xE8, 0x89 } } - -extern GUID gLzmaCustomDecompressGuid; -extern GUID gLzmaF86CustomDecompressGuid; - -#endif diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec index 16771add2f..14380d1cb9 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec @@ -4,7 +4,7 @@ # This package contains the definitions and module implementation # which follows Intel EFI Framework Specification. # -# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2015, 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 @@ -46,11 +46,6 @@ # Include/Guid/TianoDecompress.h gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }} - ## GUID indicates the LZMA custom compress/decompress algorithm. - # Include/Guid/LzmaDecompress.h - gLzmaCustomDecompressGuid = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }} - gLzmaF86CustomDecompressGuid = { 0xD42AE6BD, 0x1352, 0x4bfb, { 0x90, 0x9A, 0xCA, 0x72, 0xA6, 0xEA, 0xE8, 0x89 }} - ## Include/Guid/AcpiVariable.h gEfiAcpiVariableCompatiblityGuid = { 0xc020489e, 0x6db2, 0x4ef2, { 0x9a, 0xa5, 0xca, 0x6, 0xfc, 0x11, 0xd3, 0x6a }} diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf index 9bc7b221ca..ec7585d55b 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf @@ -5,7 +5,7 @@ # LZMA SDK 4.65 was placed in the public domain on 2009-02-03. # It was released on the http://www.7-zip.org/sdk.html website. # -# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2015, 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 @@ -53,7 +53,7 @@ [Packages] MdePkg/MdePkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + MdeModulePkg/MdeModulePkg.dec [Guids.Ia32, Guids.X64] gLzmaF86CustomDecompressGuid ## PRODUCES ## GUID # specifies LZMA custom decompress algorithm with converter for x86 code. diff --git a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf index e01385d148..f5624fd039 100644 --- a/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf +++ b/IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf @@ -5,7 +5,7 @@ # LZMA SDK 4.65 was placed in the public domain on 2009-02-03. # It was released on the http://www.7-zip.org/sdk.html website. # -# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2015, 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 @@ -49,7 +49,7 @@ [Packages] MdePkg/MdePkg.dec - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + MdeModulePkg/MdeModulePkg.dec [Guids] gLzmaCustomDecompressGuid ## PRODUCES ## UNDEFINED # specifies LZMA custom decompress algorithm. -- cgit v1.2.3