From a4cf83df7a3ef3401e12ca3732cbe07294684d02 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 2 Jun 2015 21:40:29 +0200 Subject: cbfs: Fix mismerge. cbfs_get_file_content was replaced with cbfs_boot_map_with_leak but 36f8d27ea9f741e184b76b5f42d7f777f207edc0 failed to get it into account. Change-Id: I0c7840043b2ea6abaf8e70f4bf1a63c96aedebc1 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/10403 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 2 +- src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c index 14ef93830a..225f8971c3 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c @@ -162,7 +162,7 @@ unsigned long mainboard_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp default: continue; } - p = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, + p = cbfs_boot_map_with_leak( file_name, CBFS_TYPE_RAW, &p_size); if (!p || p_size < sizeof(acpi_header_t)) diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c index cc932d2676..ac021d020b 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c @@ -168,7 +168,7 @@ unsigned long mainboard_write_acpi_tables(unsigned long current, //HTX no io apic file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml"; } - p = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, + p = cbfs_boot_map_with_leak( file_name, CBFS_TYPE_RAW, &p_size); if (!p || p_size < sizeof(acpi_header_t)) -- cgit v1.2.3