GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coreboot_table: Convert some CONFIG(CHROMEOS) preprocessor 

Change-Id: I0c42720fdcc3b05337af692ed93a424575defd36
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48786
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-12-21 07:51:59 +02:00
parent 563c860c0f
commit 07bce4ba36
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/coreboot_table.c
View File

@ -189,10 +189,8 @@ static void lb_gpios(struct lb_header *header)
} }
} }
#if CONFIG(CHROMEOS)
static void lb_vbnv(struct lb_header *header) static void lb_vbnv(struct lb_header *header)
{ {
#if CONFIG(PC80_SYSTEM)
struct lb_range *vbnv; struct lb_range *vbnv;
vbnv = (struct lb_range *)lb_new_record(header); vbnv = (struct lb_range *)lb_new_record(header);
@ -200,9 +198,7 @@ static void lb_vbnv(struct lb_header *header)
vbnv->size = sizeof(*vbnv); vbnv->size = sizeof(*vbnv);
vbnv->range_start = CONFIG_VBOOT_VBNV_OFFSET + 14; vbnv->range_start = CONFIG_VBOOT_VBNV_OFFSET + 14;
vbnv->range_size = VBOOT_VBNV_BLOCK_SIZE; vbnv->range_size = VBOOT_VBNV_BLOCK_SIZE;
#endif
} }
#endif /* CONFIG_CHROMEOS */
__weak uint32_t board_id(void) { return UNDEFINED_STRAPPING_ID; } __weak uint32_t board_id(void) { return UNDEFINED_STRAPPING_ID; }
__weak uint32_t ram_code(void) { return UNDEFINED_STRAPPING_ID; } __weak uint32_t ram_code(void) { return UNDEFINED_STRAPPING_ID; }
@ -490,10 +486,9 @@ static uintptr_t write_coreboot_table(uintptr_t rom_table_end)
if (CONFIG(CHROMEOS)) if (CONFIG(CHROMEOS))
lb_gpios(head); lb_gpios(head);
#if CONFIG(CHROMEOS)
/* pass along VBNV offsets in CMOS */ /* pass along VBNV offsets in CMOS */
lb_vbnv(head); if (CONFIG(CHROMEOS) && CONFIG(PC80_SYSTEM))
#endif lb_vbnv(head);
/* Pass mmc early init status */ /* Pass mmc early init status */
lb_mmc_info(head); lb_mmc_info(head);