[coreboot-gerrit] Change in coreboot[master]: coreboot_table: Convert some CONFIG(CHROMEOS) preprocessor

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48786 )

Change subject: coreboot_table: Convert some CONFIG(CHROMEOS) preprocessor
......................................................................

coreboot_table: Convert some CONFIG(CHROMEOS) preprocessor

Change-Id: I0c42720fdcc3b05337af692ed93a424575defd36
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48786
Reviewed-by: Arthur Heymans 
Reviewed-by: Duncan Laurie 
Reviewed-by: Furquan Shaikh 
Tested-by: build bot (Jenkins) 
---
M src/lib/coreboot_table.c
1 file changed, 2 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Duncan Laurie: Looks good to me, approved
  Furquan Shaikh: Looks good to me, approved
  Arthur Heymans: Looks good to me, approved

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);