diff options
| author | Joel Kitching <kitching@google.com> | 2018-08-17 15:38:59 +0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-08-22 15:33:50 +0000 |
| commit | 44cff7a8975b2adbf2866718ec8c61ab0d9bd505 (patch) | |
| tree | 92d4975db05b7dde5b861f03e5ee3c65bbb6b661 /payloads | |
| parent | 5846d5727a05e395d13317daba049e0e56e15d33 (diff) | |
| download | coreboot-44cff7a8975b2adbf2866718ec8c61ab0d9bd505.tar.xz | |
cbtable: remove chromeos_acpi from cbtable
Since we can derive chromeos_acpi's location from that of
ACPI GNVS, remove chromeos_acpi entry from cbtable and
instead use acpi_gnvs + GVNS_CHROMEOS_ACPI_OFFSET.
BUG=b:112288216
TEST=None
CQ-DEPEND=CL:1179725
Change-Id: I74d8a9965a0ed7874ff03884e7a921fd725eace9
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/28190
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/libpayload/include/coreboot_tables.h | 1 | ||||
| -rw-r--r-- | payloads/libpayload/include/sysinfo.h | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libc/coreboot.c | 11 |
3 files changed, 0 insertions, 14 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 4cf57c53a3..15685264be 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -200,7 +200,6 @@ struct cb_gpios { struct cb_gpio gpios[0]; }; -#define CB_TAG_CHROMEOS_ACPI 0x0015 #define CB_TAG_VBNV 0x0019 #define CB_TAG_VBOOT_HANDOFF 0x0020 #define CB_TAG_DMA 0x0022 diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index 66933e3da0..bd64cdb7f1 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -97,8 +97,6 @@ struct sysinfo_t { void *vboot_handoff; u32 vboot_handoff_size; - void *chromeos_acpi_addr; - u32 chromeos_acpi_size; #if IS_ENABLED(CONFIG_LP_ARCH_X86) int x86_rom_var_mtrr_index; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index b8799871d5..2189161f1b 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -106,14 +106,6 @@ static void cb_parse_gpios(unsigned char *ptr, struct sysinfo_t *info) info->gpios[i] = gpios->gpios[i]; } -static void cb_parse_chromeos_acpi(unsigned char *ptr, struct sysinfo_t *info) -{ - struct lb_range *chromeos_acpi = (struct lb_range *) ptr; - - info->chromeos_acpi_addr = phys_to_virt(chromeos_acpi->range_start); - info->chromeos_acpi_size = chromeos_acpi->range_size; -} - static void cb_parse_mac_addresses(unsigned char *ptr, struct sysinfo_t *info) { @@ -357,9 +349,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_GPIO: cb_parse_gpios(ptr, info); break; - case CB_TAG_CHROMEOS_ACPI: - cb_parse_chromeos_acpi(ptr, info); - break; case CB_TAG_VBNV: cb_parse_vbnv(ptr, info); break; |