Change BDS to get the default logo picture by default bmp logo guid.

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

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
index aafed235077e6b6f408897c59ccfb8e894a9d160..7bab91228a24ff490330fb4e3741740536b7306d 100644 (file)
--- a/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
+++ b/EdkModulePkg/Library/EdkGraphicsLib/EdkGraphicsLib.msa
@@ -68,11 +68,6 @@
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
index 00e556ea21235fa852a2fb634ac98393fc76bad6..e718ad395f5f48c37e33313be9d763e4a1dacf64 100644 (file)
--- a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
+++ b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
@@ -86,7 +86,7 @@ Returns:
     //\r
     Status = Fv->ReadSection (\r
                   Fv,\r
     //\r
     Status = Fv->ReadSection (\r
                   Fv,\r

-                  &gEfiDefaultBmpLogoGuid,\r
+                  FileNameGuid,\r

                   EFI_SECTION_RAW,\r
                   0,\r
                   Image,\r
                   EFI_SECTION_RAW,\r
                   0,\r
                   Image,\r

diff --git a/EdkModulePkg/Logo/Logo.msa b/EdkModulePkg/Logo/Logo.msa
index d64bb07d592135beb40f07aee8a3f48a706274d9..35923df62d582037dcb98fe2e58a1c427ff20113 100644 (file)
--- a/EdkModulePkg/Logo/Logo.msa
+++ b/EdkModulePkg/Logo/Logo.msa
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?xml version="1.0" encoding="UTF-8"?>\r

-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r

   <MsaHeader>\r
     <ModuleName>Logo</ModuleName>\r
     <ModuleType>BASE</ModuleType>\r
     <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for creating a Logo file.</Abstract>\r
   <MsaHeader>\r
     <ModuleName>Logo</ModuleName>\r
     <ModuleType>BASE</ModuleType>\r
     <GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for creating a Logo file.</Abstract>\r

-    <Description>This module provides the logo bitmap picture shown on setup screen.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>\r
+      This module provides the default logo bitmap picture \r
+      shown on setup screen, which is correspondig to gEfiDefaultBmpLogoGuid.\r
+    </Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r

     <License>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
     <License>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


@@ -24,9 +27,6 @@
   <SourceFiles>\r
     <Filename>Logo.bmp</Filename>\r
   </SourceFiles>\r
   <SourceFiles>\r
     <Filename>Logo.bmp</Filename>\r
   </SourceFiles>\r

-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-  </PackageDependencies>\r

   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
index 1d6f9139c6818e02d2f40c74f0f10f66f1122f30..89dbef0e52ae3904ed5b26e382fa3bd5cb1a0570 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/BdsPlatform.c
@@ -254,7 +254,7 @@ Returns:
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r

-    EnableQuietBoot (&gEfiUgaSplashProtocolGuid);\r
+    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);\r

     //\r
     // Perform system diagnostic\r
     //\r
     //\r
     // Perform system diagnostic\r
     //\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index d9943bb799de698cf7c6885006112d3a150c4574..d1ee0ff3c215f3c9675d8f277067219f58c8ef2d 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -136,9 +136,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiUgaSplashProtocolGuid</ProtocolCName>\r
-    </Protocol>\r

     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
     </Protocol>\r


@@ -227,6 +224,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFileInfoGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFileInfoGuid</GuidCName>\r
     </GuidCNames>\r

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>\r
+    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
index f6e29c73e7d2cf0c3dca7e06bdbaac88a8cc774c..39a24d28814013aef63831af1c256f00966ad940 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.c
@@ -243,7 +243,7 @@ Returns:
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r

-    EnableQuietBoot (&gEfiUgaSplashProtocolGuid);\r
+    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);\r

     //\r
     // Perform system diagnostic\r
     //\r
     //\r
     // Perform system diagnostic\r
     //\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa b/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa
index 1dec5985141668aa048e5dd1d702ee48da30e5b6..989117590f5eef705c3597e2dc9d8c8586992a86 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkUnixPkg/Dxe/PlatformBds/PlatformBds.msa
@@ -98,9 +98,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiLegacyBiosProtocolGuid</ProtocolCName>
     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">
-      <ProtocolCName>gEfiUgaSplashProtocolGuid</ProtocolCName>
-    </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>
     </Protocol>


@@ -195,6 +192,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFileInfoGuid</GuidCName>
     </GuidCNames>

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiDefaultBmpLogoGuid</GuidCName>\r
+    </GuidCNames>

   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

diff --git a/MdePkg/Include/IndustryStandard/SmBus.h b/MdePkg/Include/IndustryStandard/SmBus.h
index d2755dd39acd18a8e6b72d6406c94d899877736f..41a82246cf9c370781f37b6a6cdbb30027dd71fc 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBus.h
+++ b/MdePkg/Include/IndustryStandard/SmBus.h
@@ -45,50 +45,4 @@ typedef enum _EFI_SMBUS_OPERATION
 } EFI_SMBUS_OPERATION;\r
 \r
 #endif\r
 } EFI_SMBUS_OPERATION;\r
 \r
 #endif\r

-/** @file\r
-  This file declares the SMBus definitions defined in SmBus Specifciation\r
-  V2.0.\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
-  @par Revision Reference:\r
-  These definitions are defined in System Management Bus (SmBus) Specification V2.0.\r
-\r
-**/\r
-\r
-#ifndef _SMBUS_H_\r
-#define _SMBUS_H_\r
-\r
-//\r
-// Smbus Device Address, Smbus Device Command, Smbus Operations\r
-//\r
-typedef struct {\r
-  UINTN SmbusDeviceAddress : 7;\r
-} EFI_SMBUS_DEVICE_ADDRESS;\r
-\r
-typedef UINTN EFI_SMBUS_DEVICE_COMMAND;\r

 \r
 \r

-typedef enum _EFI_SMBUS_OPERATION\r
-{\r
-  EfiSmbusQuickRead,\r
-  EfiSmbusQuickWrite,\r
-  EfiSmbusReceiveByte,\r
-  EfiSmbusSendByte,\r
-  EfiSmbusReadByte,\r
-  EfiSmbusWriteByte,\r
-  EfiSmbusReadWord,\r
-  EfiSmbusWriteWord,\r
-  EfiSmbusReadBlock,\r
-  EfiSmbusWriteBlock,\r
-  EfiSmbusProcessCall,\r
-  EfiSmbusBWBRProcessCall\r
-} EFI_SMBUS_OPERATION;\r
-\r
-#endif\r