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>
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 86e0606..00d73a0 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -189,10 +189,8 @@
}
}
-#if CONFIG(CHROMEOS)
static void lb_vbnv(struct lb_header *header)
{
-#if CONFIG(PC80_SYSTEM)
struct lb_range *vbnv;
vbnv = (struct lb_range *)lb_new_record(header);
@@ -200,9 +198,7 @@
vbnv->size = sizeof(*vbnv);
vbnv->range_start = CONFIG_VBOOT_VBNV_OFFSET + 14;
vbnv->range_size = VBOOT_VBNV_BLOCK_SIZE;
-#endif
}
-#endif /* CONFIG_CHROMEOS */
__weak uint32_t board_id(void) { return UNDEFINED_STRAPPING_ID; }
__weak uint32_t ram_code(void) { return UNDEFINED_STRAPPING_ID; }
@@ -490,10 +486,9 @@
if (CONFIG(CHROMEOS))
lb_gpios(head);
-#if CONFIG(CHROMEOS)
/* pass along VBNV offsets in CMOS */
- lb_vbnv(head);
-#endif
+ if (CONFIG(CHROMEOS) && CONFIG(PC80_SYSTEM))
+ lb_vbnv(head);
/* Pass mmc early init status */
lb_mmc_info(head);