[coreboot-gerrit] Change in coreboot[master]: mb/google: 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/+/48785 )

Change subject: mb/google: Convert some CONFIG(CHROMEOS) preprocessor
......................................................................

mb/google: Convert some CONFIG(CHROMEOS) preprocessor

Change-Id: Ica8691e3dc4feecbeb11ba3f5868932f926965b2
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48785
Reviewed-by: Furquan Shaikh 
Reviewed-by: EricR Lai 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/gale/mainboard.c
M src/mainboard/google/mistral/mainboard.c
M src/mainboard/google/storm/mainboard.c
3 files changed, 6 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  EricR Lai: Looks good to me, approved

diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c
index 39a3428..bc4fc93 100644
--- a/src/mainboard/google/gale/mainboard.c
+++ b/src/mainboard/google/gale/mainboard.c
@@ -30,10 +30,9 @@
    setup_mmu(DRAM_INITIALIZED);
    setup_usb();

-	if (CONFIG(CHROMEOS)) {
-		/* Copy WIFI calibration data into CBMEM. */
+	/* Copy WIFI calibration data into CBMEM. */
+	if (CONFIG(CHROMEOS))
    	cbmem_add_vpd_calibration_data();
-	}

/*
     * Make sure bootloader can issue sounds The frequency is calculated
diff --git a/src/mainboard/google/mistral/mainboard.c b/src/mainboard/google/mistral/mainboard.c
index e0cd75d..4079182 100644
--- a/src/mainboard/google/mistral/mainboard.c
+++ b/src/mainboard/google/mistral/mainboard.c
@@ -19,10 +19,9 @@

static void mainboard_init(struct device *dev)
 {
-	if (CONFIG(CHROMEOS)) {
-		/* Copy WIFI calibration data into CBMEM. */
+	/* Copy WIFI calibration data into CBMEM. */
+	if (CONFIG(CHROMEOS))
    	cbmem_add_vpd_calibration_data();
-	}

setup_usb();
 }
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 6a89be0..4faf832 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -76,10 +76,9 @@
     /* Functionally a 0-cost no-op if NAND is not present */
     board_nand_init();

-#if CONFIG(CHROMEOS)
    /* Copy WIFI calibration data into CBMEM. */
-	cbmem_add_vpd_calibration_data();
-#endif
+	if (CONFIG(CHROMEOS))
+		cbmem_add_vpd_calibration_data();

/*
     * Make sure bootloader can issue sounds The frequency is calculated