summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-11-09 13:36:18 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2015-05-26 20:31:58 +0200
commit807127f8cc5ca63951c48e78ad1bcf2bd2c7dc22 (patch)
tree5a4e7e1370c1ec42045e02924dae24d527707998 /src/arch
parent9bb5c5c402fa26b9726019abc70c580d874bdfef (diff)
downloadcoreboot-807127f8cc5ca63951c48e78ad1bcf2bd2c7dc22.tar.xz
Make acpi_fill_hest into parameter
This avoids the need to supply weak function and avoids associated risks of forgetting to link in relevant files. Change-Id: Ie96475babb4aa4ea8db49023af5b31bfa63b21dc Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7373 Tested-by: build bot (Jenkins) Reviewed-by: Rudolf Marek <r.marek@assembler.cz>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/boot/acpi.c8
-rw-r--r--src/arch/x86/include/arch/acpi.h4
2 files changed, 4 insertions, 8 deletions
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index bc2a0ccf13..bb994e2a9d 100644
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -554,11 +554,6 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt,
rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t));
}
-unsigned long __attribute__((weak)) acpi_fill_hest(acpi_hest_t *hest)
-{
- return (unsigned long)hest;
-}
-
unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 data_len)
{
acpi_header_t *header = &(hest->header);
@@ -618,7 +613,8 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *
}
/* ACPI 4.0 */
-void acpi_write_hest(acpi_hest_t *hest)
+void acpi_write_hest(acpi_hest_t *hest,
+ unsigned long (*acpi_fill_hest)(acpi_hest_t *hest))
{
acpi_header_t *header = &(hest->header);
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index eab125c951..245599fa9d 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -546,10 +546,10 @@ unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags,
void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current);
unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 segment,
u8 dev, u8 fn);
+void acpi_write_hest(acpi_hest_t *hest,
+ unsigned long (*acpi_fill_hest)(acpi_hest_t *hest));
-void acpi_write_hest(acpi_hest_t *hest);
unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len);
-unsigned long acpi_fill_hest(acpi_hest_t *hest);
void acpi_save_gnvs(u32 gnvs_address);