From e2f17f782f6a9236259f2c25ac30d35dc24d45bb Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 5 Dec 2017 13:39:10 -0800 Subject: boardid: Minor clean up and standardization Merge the different coreboot table strapping ID structures into one because they're really just all the same, and I want to add more. Make the signature of the board_id() function return a uint32_t because that's also what goes in the coreboot table. Add a printk to the generic code handling strapping IDs in ramstage so that not every individual mainboard implementation needs its own print. (In turn, remove one such print from fsp1_1 code because it's in the way of my next patch.) Change-Id: Ib9563edf07b623a586a4dc168fe357564c5e68b5 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/22741 Tested-by: build bot (Jenkins) --- src/commonlib/include/commonlib/coreboot_tables.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/commonlib') diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h index 4b3f787885..feee17274a 100644 --- a/src/commonlib/include/commonlib/coreboot_tables.h +++ b/src/commonlib/include/commonlib/coreboot_tables.h @@ -289,18 +289,12 @@ struct lb_x86_rom_mtrr { }; #define LB_TAG_BOARD_ID 0x0025 -struct lb_board_id { - uint32_t tag; - uint32_t size; - /* Board ID as retrieved from the board revision GPIOs. */ - uint32_t board_id; -}; - #define LB_TAG_RAM_CODE 0x0028 -struct lb_ram_code { + +struct lb_strapping_id { uint32_t tag; uint32_t size; - uint32_t ram_code; + uint32_t id_code; }; #define LB_TAG_SPI_FLASH 0x0029 -- cgit v1.2.3