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 /src/arch/x86 | |
| parent | 1aeea7fbdf252c95e1e3cdf45339a1430125f85d (diff) | |
| download | coreboot-a4cf83df7a3ef3401e12ca3732cbe07294684d02.tar.xz | |
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)
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/boot/acpi.c | 2 |
1 files changed, 1 insertions, 1 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) { |