sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfs: Fix mismerge.

Browse Source 
cbfs_get_file_content was replaced with cbfs_boot_map_with_leak but
36f8d27ea9 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)
This commit is contained in:
Vladimir Serbinenko
2015-06-02 21:40:29 +02:00
parent 1aeea7fbdf
commit a4cf83df7a
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/boot/acpi.c
View File

@@ -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) {

2
src/mainboard/amd/serengeti_cheetah/acpi_tables.c
View File

@@ -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))

2
src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
View File

@@ -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))

2
src/mainboard/iwill/dk8_htx/acpi_tables.c
View File

@@ -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))