GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/zork: Update style of check on cbi return values 

Since google_chromeec_cbi_get_board_version and google_chromeec_cbi_get_fw_config both call cbi_get_unit32 and return 0 as success, non-zero as failure. Let's add more readability for the false condition.

BUG=None
TEST=check with empty CBI value

Signed-off-by: Eric Lai <ericr_lai@compal.corp-partner.google.com>
Change-Id: Ia49ac1ee35302f8f6afe8c0eb8e13afdf36c5b2b
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46566
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Eric Lai 2020-10-20 02:44:53 +08:00 committed by Patrick Georgi
parent 7d1a137b84
commit f209b18df3
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mainboard/google/zork/variants/baseboard/helpers.c
View File

@ -57,7 +57,7 @@ static int get_fw_config(uint32_t *val)
return 0; return 0;
} }
if (google_chromeec_cbi_get_fw_config(&known_value)) { if (google_chromeec_cbi_get_fw_config(&known_value) != 0) {
printk(BIOS_ERR, "FW_CONFIG not set in CBI\n"); printk(BIOS_ERR, "FW_CONFIG not set in CBI\n");
return -1; return -1;
} }
@ -95,7 +95,7 @@ bool variant_uses_v3_schematics(void)
if (!CONFIG(VARIANT_SUPPORTS_PRE_V3_SCHEMATICS)) if (!CONFIG(VARIANT_SUPPORTS_PRE_V3_SCHEMATICS))
return true; return true;
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
return false; return false;
if ((int)board_version < CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS) if ((int)board_version < CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)
@ -111,7 +111,7 @@ bool variant_uses_v3_6_schematics(void)
if (!CONFIG(VARIANT_SUPPORTS_PRE_V3_6_SCHEMATICS)) if (!CONFIG(VARIANT_SUPPORTS_PRE_V3_6_SCHEMATICS))
return true; return true;
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
return false; return false;
if ((int)board_version < CONFIG_VARIANT_MIN_BOARD_ID_V3_6_SCHEMATICS) if ((int)board_version < CONFIG_VARIANT_MIN_BOARD_ID_V3_6_SCHEMATICS)
@ -136,7 +136,7 @@ bool variant_has_active_low_wifi_power(void)
if (!CONFIG(VARIANT_SUPPORTS_WIFI_POWER_ACTIVE_HIGH)) if (!CONFIG(VARIANT_SUPPORTS_WIFI_POWER_ACTIVE_HIGH))
return true; return true;
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
return false; return false;
if ((int)board_version < CONFIG_VARIANT_MIN_BOARD_ID_WIFI_POWER_ACTIVE_LOW) if ((int)board_version < CONFIG_VARIANT_MIN_BOARD_ID_WIFI_POWER_ACTIVE_LOW)

2
src/mainboard/google/zork/variants/berknip/gpio.c
View File

@ -61,7 +61,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version <= 1) { if (board_version <= 1) {

2
src/mainboard/google/zork/variants/dalboz/gpio.c
View File

@ -47,7 +47,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version < 2) { if (board_version < 2) {

2
src/mainboard/google/zork/variants/dirinboz/gpio.c
View File

@ -36,7 +36,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version < 2) { if (board_version < 2) {

2
src/mainboard/google/zork/variants/ezkinil/gpio.c
View File

@ -81,7 +81,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version <= 1) { if (board_version <= 1) {

2
src/mainboard/google/zork/variants/morphius/gpio.c
View File

@ -69,7 +69,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version <= 1) { if (board_version <= 1) {

2
src/mainboard/google/zork/variants/trembyle/gpio.c
View File

@ -60,7 +60,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version <= 2) { if (board_version <= 2) {

2
src/mainboard/google/zork/variants/vilboz/gpio.c
View File

@ -25,7 +25,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
* and so apply overrides. If board version is provided by the EC, then apply overrides * and so apply overrides. If board version is provided by the EC, then apply overrides
* if version < 2. * if version < 2.
*/ */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 1; board_version = 1;
if (board_version < 2) { if (board_version < 2) {

2
src/mainboard/google/zork/variants/woomax/gpio.c
View File

@ -60,7 +60,7 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
uint32_t board_version; uint32_t board_version;
/* If board version cannot be read, assume it is board_version 0. */ /* If board version cannot be read, assume it is board_version 0. */
if (google_chromeec_cbi_get_board_version(&board_version)) if (google_chromeec_cbi_get_board_version(&board_version) != 0)
board_version = 0; board_version = 0;
if (board_version == 0) { if (board_version == 0) {