GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfs: Fix mismerge. 

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
Show Stats 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) if (fw)
return fw; return fw;
dsdt_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, dsdt_file = cbfs_boot_map_with_leak(
CONFIG_CBFS_PREFIX "/dsdt.aml", CONFIG_CBFS_PREFIX "/dsdt.aml",
CBFS_TYPE_RAW, &dsdt_size); CBFS_TYPE_RAW, &dsdt_size);
if (!dsdt_file) { 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: default:
continue; continue;
} }
p = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, p = cbfs_boot_map_with_leak(
file_name, file_name,
CBFS_TYPE_RAW, &p_size); CBFS_TYPE_RAW, &p_size);
if (!p || p_size < sizeof(acpi_header_t)) 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 //HTX no io apic
file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml"; file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml";
} }
p = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, p = cbfs_boot_map_with_leak(
file_name, file_name,
CBFS_TYPE_RAW, &p_size); CBFS_TYPE_RAW, &p_size);
if (!p || p_size < sizeof(acpi_header_t)) 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"; file_name = CONFIG_CBFS_PREFIX "/ssdt5.aml";
break; break;
} }
p = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, p = cbfs_boot_map_with_leak(
file_name, file_name,
CBFS_TYPE_RAW, &p_size); CBFS_TYPE_RAW, &p_size);
if (!p || p_size < sizeof(acpi_header_t)) if (!p || p_size < sizeof(acpi_header_t))

2
util/autoport/readme.md
View File

@ -213,7 +213,7 @@ soldered and another is socketed:
void *spd_file; void *spd_file;
size_t spd_file_len = 0; size_t spd_file_len = 0;
/* C0S0 is a soldered RAM with no real SPD. Use stored SPD. */ /* 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); &spd_file_len);
if (spd_file && spd_file_len >= 128) if (spd_file && spd_file_len >= 128)
memcpy(&spd[0], spd_file, 128); memcpy(&spd[0], spd_file, 128);