[coreboot-gerrit] New patch to review for coreboot: b06ba1c cbfs: Fix mismerge.

[Vladimir Serbinenko (phcoder@gmail.com)]

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10403

-gerrit

commit b06ba1c3b2b35fe169f8aeaa61ff2622a5310cb0
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Tue Jun 2 21:40:29 2015 +0200

    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 <phcoder at gmail.com>
---
 src/arch/x86/boot/acpi.c                                | 2 +-
 src/mainboard/amd/serengeti_cheetah/acpi_tables.c       | 2 +-
 src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c | 2 +-
 src/mainboard/iwill/dk8_htx/acpi_tables.c               | 2 +-
 util/autoport/readme.md                                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index 03d40d0..f0e56ea 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -757,7 +757,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	if (fw)
 		return fw;
 
-	dsdt_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
+	dsdt_file = cbfs_boot_map_with_leak(
 				     CONFIG_CBFS_PREFIX "/dsdt.aml",
 				     CBFS_TYPE_RAW, &dsdt_size);
 	if (!dsdt_file) {
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index 14ef938..225f897 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 cc932d2..ac021d0 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))
diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c
index 834d1fe..5767878 100644
--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -170,7 +170,7 @@ unsigned long mainboard_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp
 			file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml";
 			break;
                 }
-		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/util/autoport/readme.md b/util/autoport/readme.md
index 9a16fd2..35526f8 100644
--- a/util/autoport/readme.md
+++ b/util/autoport/readme.md
@@ -213,7 +213,7 @@ soldered and another is socketed:
 		void *spd_file;
 		size_t spd_file_len = 0;
 		/* C0S0 is a soldered RAM with no real SPD. Use stored SPD.  */
-		spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", CBFS_TYPE_RAW,
+		spd_file = cbfs_boot_map_with_leak( "spd.bin", CBFS_TYPE_RAW,
 						 &spd_file_len);
 		if (spd_file && spd_file_len >= 128)
 			memcpy(&spd[0], spd_file, 128);