3 files changed, 7 insertions, 12 deletions
diff --git a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
index aafed23507..7bab91228a 100644
--- a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
+++ b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
@@ -68,11 +68,6 @@
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
-  <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>
-    </GuidCNames>
-  </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
diff --git a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
index 00e556ea21..e718ad395f 100644
--- a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
+++ b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
@@ -86,7 +86,7 @@ Returns:
     //
     Status = Fv->ReadSection (
                   Fv,
-                  &gEfiDefaultBmpLogoGuid,
+                  FileNameGuid,
                   EFI_SECTION_RAW,
                   0,
                   Image,
diff --git a/EdkModulePkg/Logo/Logo.msa b/EdkModulePkg/Logo/Logo.msa
index d64bb07d59..35923df62d 100644
--- a/EdkModulePkg/Logo/Logo.msa
+++ b/EdkModulePkg/Logo/Logo.msa
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
     <ModuleName>Logo</ModuleName>
     <ModuleType>BASE</ModuleType>
     <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>
     <Version>1.0</Version>
     <Abstract>Component description file for creating a Logo file.</Abstract>
-    <Description>This module provides the logo bitmap picture shown on setup screen.</Description>
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <Description>
+      This module provides the default logo bitmap picture 
+      shown on setup screen, which is correspondig to gEfiDefaultBmpLogoGuid.
+    </Description>
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>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
@@ -24,9 +27,6 @@
   <SourceFiles>
     <Filename>Logo.bmp</Filename>
   </SourceFiles>
-  <PackageDependencies>
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-  </PackageDependencies>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>