summaryrefslogtreecommitdiffstats
path: root/IntelFrameworkModulePkg
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2009-10-28 07:54:17 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2009-10-28 07:54:17 +0000
commit019dfb9c281494a686d251997a5b36ef66b8cca1 (patch)
treeb10166e1eefa3bf3b35322a8790ecc360cfacf90 /IntelFrameworkModulePkg
parentb6b55af34cf6e1ebcd2dacdd73252aa5f16bf41e (diff)
downloadedk2-019dfb9c281494a686d251997a5b36ef66b8cca1.tar.gz
edk2-019dfb9c281494a686d251997a5b36ef66b8cca1.tar.bz2
edk2-019dfb9c281494a686d251997a5b36ef66b8cca1.zip
updated BDS to get capsule information from UEFI capsule HOB instead of CAPSULE_HOB_INFO(one GUIDed HOB).
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9379 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkModulePkg')
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf1
-rw-r--r--IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c13
2 files changed, 5 insertions, 9 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index 1e6ba5fbea..67dd4cab67 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -133,7 +133,6 @@
gEfiMiscSubClassGuid ## CONSUMES ## GUID (Indicate the datahub for holding misc sub class record)
gEfiMemorySubClassGuid ## CONSUMES ## GUID (Indicate the datahub for holding memory record)
gEfiProcessorSubClassGuid ## CONSUMES ## GUID (Indicate the datahub for holding processor record)
- gEfiCapsuleVendorGuid ## CONSUMES ## GUID (Indicate the hob for holding capsule update image)
gEfiHiiPlatformSetupFormsetGuid ## CONSUMES ## GUID (Indicate the formset class guid to be displayed)
gEfiIfrTianoGuid ## CONSUMES ## GUID (Extended IFR Guid Opcode)
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c
index 47082f57d3..f2d0d98796 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c
@@ -1,7 +1,7 @@
/** @file
BDS routines to handle capsules.
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+Copyright (c) 2004 - 2009, Intel Corporation. <BR>
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
@@ -51,7 +51,6 @@ BdsProcessCapsules (
VOID **CapsulePtr;
VOID **CapsulePtrCache;
EFI_GUID *CapsuleGuidCache;
- CAPSULE_HOB_INFO *CapsuleHobInfo;
CapsuleNumber = 0;
CapsuleTotalNumber = 0;
@@ -73,9 +72,8 @@ BdsProcessCapsules (
// Find all capsule images from hob
//
HobPointer.Raw = GetHobList ();
- while ((HobPointer.Raw = GetNextGuidHob (&gEfiCapsuleVendorGuid, HobPointer.Raw)) != NULL) {
+ while ((HobPointer.Raw = GetNextHob (EFI_HOB_TYPE_UEFI_CAPSULE, HobPointer.Raw)) != NULL) {
CapsuleTotalNumber ++;
-
HobPointer.Raw = GET_NEXT_HOB (HobPointer);
}
@@ -101,10 +99,8 @@ BdsProcessCapsules (
// Find all capsule images from hob
//
HobPointer.Raw = GetHobList ();
- while ((HobPointer.Raw = GetNextGuidHob (&gEfiCapsuleVendorGuid, HobPointer.Raw)) != NULL) {
- CapsuleHobInfo = GET_GUID_HOB_DATA (HobPointer.Guid);
- CapsulePtr [CapsuleNumber++] = (VOID *)(UINTN)(CapsuleHobInfo->BaseAddress);
-
+ while ((HobPointer.Raw = GetNextHob (EFI_HOB_TYPE_UEFI_CAPSULE, HobPointer.Raw)) != NULL) {
+ CapsulePtr [CapsuleNumber++] = (VOID *) (UINTN) HobPointer.Capsule->BaseAddress;
HobPointer.Raw = GET_NEXT_HOB (HobPointer);
}
@@ -206,3 +202,4 @@ BdsProcessCapsules (
return Status;
}
+