summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2017-10-12 15:57:19 -0600
committerMartin Roth <martinroth@google.com>2017-10-22 01:45:23 +0000
commit3191e0fcf51672ffd58f029f2077ea0359cb9068 (patch)
treeac2d996097f717021f0e6283edcd1fb066341eb9
parent1899fbe420037312c369eda3c3ba8c5ad57acb2f (diff)
downloadcoreboot-3191e0fcf51672ffd58f029f2077ea0359cb9068.tar.xz
soc/amd/common: Revert PI blob search hack
Remove the check for CONFIG_VBOOT when finding the binaryPI blob and rely on the cbfs search 100% of the time. The change was initially put in to avoid a hang when vboot presearched memory for the blob. The implementation now supports early cbmem init and cbmem_top() is careful to return 0 if DRAM has not yet been set up. As a result the hang no longer occurs and the hack may be removed safely. BUG=b:67747902 Change-Id: I1f38709fcce250b0902a639ebf0554219bc47cf8 Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/22053 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/amd/common/agesawrapper.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c
index 38ca3a8f76..26c48f33b3 100644
--- a/src/soc/amd/common/agesawrapper.c
+++ b/src/soc/amd/common/agesawrapper.c
@@ -395,14 +395,8 @@ const void *agesawrapper_locate_module (const CHAR8 name[8])
const AMD_MODULE_HEADER* module;
size_t file_size;
- if (IS_ENABLED(CONFIG_VBOOT)) {
- /* Use phys. location in flash and prevent vboot from searching cbmem */
- agesa = (void *)CONFIG_AGESA_BINARY_PI_LOCATION;
- file_size = 0x100000;
- } else {
- agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME,
- CBFS_TYPE_RAW, &file_size);
- }
+ agesa = cbfs_boot_map_with_leak((const char *)CONFIG_AGESA_CBFS_NAME,
+ CBFS_TYPE_RAW, &file_size);
if (!agesa)
return NULL;