diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index d6fd84a..e00c2a4 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -152,7 +152,6 @@
 	gpios->size += table_size;
 }
 
-#if CONFIG(CHROMEOS)
 static void lb_gpios(struct lb_header *header)
 {
 	struct lb_gpios *gpios;
@@ -191,6 +190,7 @@
 	}
 }
 
+#if CONFIG(CHROMEOS)
 static void lb_vbnv(struct lb_header *header)
 {
 #if CONFIG(PC80_SYSTEM)
@@ -487,10 +487,11 @@
 	/* Record our framebuffer */
 	lb_framebuffer(head);
 
-#if CONFIG(CHROMEOS)
 	/* Record our GPIO settings (ChromeOS specific) */
-	lb_gpios(head);
+	if (CONFIG(CHROMEOS))
+		lb_gpios(head);
 
+#if CONFIG(CHROMEOS)
 	/* pass along VBNV offsets in CMOS */
 	lb_vbnv(head);
 #endif
@@ -511,9 +512,8 @@
 	/* Add board-specific table entries, if any. */
 	lb_board(head);
 
-#if CONFIG(CHROMEOS_RAMOOPS)
-	lb_ramoops(head);
-#endif
+	if (CONFIG(CHROMEOS_RAMOOPS))
+		lb_ramoops(head);
 
 	lb_boot_media_params(head);