diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2015-06-02 21:40:29 +0200 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2015-06-02 21:48:24 +0200 |
| commit | a4cf83df7a3ef3401e12ca3732cbe07294684d02 (patch) | |
| tree | 7b72f5063736eedf59d5e6065a707135b0ac6486 | |
| parent | 1aeea7fbdf252c95e1e3cdf45339a1430125f85d (diff) | |
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@gmail.com>
Reviewed-on: http://review.coreboot.org/10403
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/arch/x86/boot/acpi.c | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c | 2 | ||||
| -rw-r--r-- | src/mainboard/iwill/dk8_htx/acpi_tables.c | 2 | ||||
| -rw-r--r-- | 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 03d40d0be3..f0e56ea0e8 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 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)) diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c index 834d1fe0c7..5767878d70 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 9a16fd2c76..35526f8105 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); |