summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-06-16 17:29:52 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-07-23 12:07:07 +0000
commit452aaae601a56ad81e7ddf84cc83c8262d80ea73 (patch)
tree8c1deeba077af111005b0dcda7170225c4aa3cbb /payloads
parent52f0e84ba7b004d6d110340d2b0b0d4b2985e073 (diff)
downloadcoreboot-452aaae601a56ad81e7ddf84cc83c8262d80ea73.tar.xz
vboot: deprecate vboot_handoff structure
vboot_handoff is no longer used in coreboot, and is not needed in CBMEM or cbtable. BUG=b:124141368, b:124192753 TEST=make clean && make runtests BRANCH=none Change-Id: I782d53f969dc9ae2775e3060371d06e7bf8e1af6 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33536 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/include/coreboot_tables.h2
-rw-r--r--payloads/libpayload/include/sysinfo.h2
-rw-r--r--payloads/libpayload/libc/coreboot.c11
3 files changed, 1 insertions, 14 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index b0d7c90389..9b69a6d3d3 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -57,7 +57,7 @@ enum {
CB_TAG_CBMEM_CONSOLE = 0x0017,
CB_TAG_MRC_CACHE = 0x0018,
CB_TAG_VBNV = 0x0019,
- CB_TAG_VBOOT_HANDOFF = 0x0020,
+ CB_TAG_VBOOT_HANDOFF = 0x0020, /* deprecated */
CB_TAG_X86_ROM_MTRR = 0x0021,
CB_TAG_DMA = 0x0022,
CB_TAG_RAM_OOPS = 0x0023,
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index 72059adb91..50f0e3962c 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -95,8 +95,6 @@ struct sysinfo_t {
struct cb_header *header;
struct cb_mainboard *mainboard;
- void *vboot_handoff;
- u32 vboot_handoff_size;
void *vboot_workbuf;
uint32_t vboot_workbuf_size;
diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c
index 26a3a48c23..03778b6d2a 100644
--- a/payloads/libpayload/libc/coreboot.c
+++ b/payloads/libpayload/libc/coreboot.c
@@ -78,14 +78,6 @@ static void cb_parse_serial(void *ptr, struct sysinfo_t *info)
info->serial = ((struct cb_serial *)ptr);
}
-static void cb_parse_vboot_handoff(unsigned char *ptr, struct sysinfo_t *info)
-{
- struct lb_range *vbho = (struct lb_range *)ptr;
-
- info->vboot_handoff = (void *)(uintptr_t)vbho->range_start;
- info->vboot_handoff_size = vbho->range_size;
-}
-
static void cb_parse_vboot_workbuf(unsigned char *ptr, struct sysinfo_t *info)
{
struct lb_range *vbwb = (struct lb_range *)ptr;
@@ -367,9 +359,6 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_VBNV:
cb_parse_vbnv(ptr, info);
break;
- case CB_TAG_VBOOT_HANDOFF:
- cb_parse_vboot_handoff(ptr, info);
- break;
case CB_TAG_VBOOT_WORKBUF:
cb_parse_vboot_workbuf(ptr, info);
break;