From 1f5487a7c0687b910a898b1fe704e9b75947b5dc Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 27 Aug 2013 15:38:54 -0700 Subject: coreboot_tables: reduce redundant data structures There are three coreboot table tags that all define some kind of memory region, and each has their own homologous struct. I'm about to add a fourth so I'll just clean this up and turn it into a generic struct lb_range instead. Change-Id: Id148b2737d442e0636d2c05e74efa1fdf844a0d3 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/167154 (cherry picked from commit 22d82ffa3f5500fbc1b785e343add25e61f4f194) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6456 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/include/boot/coreboot_tables.h | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'src/include/boot') diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index f8f80228cf..3c569a132d 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -215,13 +215,15 @@ struct lb_gpios { struct lb_gpio gpios[0]; }; -#define LB_TAG_VDAT 0x0015 -struct lb_vdat { +#define LB_TAG_VDAT 0x0015 +#define LB_TAG_VBNV 0x0019 +#define LB_TAB_VBOOT_HANDOFF 0x0020 +struct lb_range { uint32_t tag; uint32_t size; - uint64_t vdat_addr; - uint32_t vdat_size; + uint64_t range_start; + uint32_t range_size; }; #define LB_TAG_TIMESTAMPS 0x0016 @@ -235,24 +237,6 @@ struct lb_cbmem_ref { uint64_t cbmem_addr; }; -#define LB_TAG_VBNV 0x0019 -struct lb_vbnv { - uint32_t tag; - uint32_t size; - - uint32_t vbnv_start; - uint32_t vbnv_size; -}; - -#define LB_TAB_VBOOT_HANDOFF 0x0020 -struct lb_vboot_handoff { - uint32_t tag; - uint32_t size; - - uint64_t vboot_handoff_addr; - uint32_t vboot_handoff_size; -}; - #define LB_TAG_X86_ROM_MTRR 0x0021 struct lb_x86_rom_mtrr { uint32_t tag; -- cgit v1.2.3