diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-12-19 21:52:21 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-04 07:08:17 +0000 |
| commit | 43881bb21456802536a4545172cfc5134496d9e1 (patch) | |
| tree | fe68e60c828402a5dcac3ee20a89e177eceb4e22 | |
| parent | 864be5bae5dea454a6867c39bdb12271bf39db3c (diff) | |
mb/google: Convert some CONFIG(CHROMEOS) preprocessor
Change-Id: Ica8691e3dc4feecbeb11ba3f5868932f926965b2
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48785
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/google/gale/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/google/mistral/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/google/storm/mainboard.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c index 39a342810a..bc4fc933be 100644 --- a/src/mainboard/google/gale/mainboard.c +++ b/src/mainboard/google/gale/mainboard.c @@ -30,10 +30,9 @@ static void mainboard_init(struct device *dev) 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 e0cd75d8c3..4079182497 100644 --- a/src/mainboard/google/mistral/mainboard.c +++ b/src/mainboard/google/mistral/mainboard.c @@ -19,10 +19,9 @@ static void setup_usb(void) 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 6a89be04df..4faf8329bc 100644 --- a/src/mainboard/google/storm/mainboard.c +++ b/src/mainboard/google/storm/mainboard.c @@ -76,10 +76,9 @@ static void mainboard_init(struct device *dev) /* 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 |