diff options
Diffstat (limited to 'src/ec')
| -rw-r--r-- | src/ec/acpi/ec.c | 3 | ||||
| -rw-r--r-- | src/ec/google/chromeec/ec_boardid.c | 2 | ||||
| -rw-r--r-- | src/ec/google/chromeec/ec_skuid.c | 2 | ||||
| -rw-r--r-- | src/ec/google/wilco/boardid.c | 2 | ||||
| -rw-r--r-- | src/ec/intel/board_id.c | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c index f183801e43..dddfb6baa8 100644 --- a/src/ec/acpi/ec.c +++ b/src/ec/acpi/ec.c @@ -147,9 +147,6 @@ void ec_clr_bit(u8 addr, u8 bit) void ec_set_ports(u16 cmd_reg, u16 data_reg) { - if (!ENV_HAS_DATA_SECTION) - return; - ec_cmd_reg = cmd_reg; ec_data_reg = data_reg; } diff --git a/src/ec/google/chromeec/ec_boardid.c b/src/ec/google/chromeec/ec_boardid.c index b19d9a74b2..d728324272 100644 --- a/src/ec/google/chromeec/ec_boardid.c +++ b/src/ec/google/chromeec/ec_boardid.c @@ -5,7 +5,7 @@ uint32_t board_id(void) { - MAYBE_STATIC_NONZERO uint32_t id = BOARD_ID_INIT; + static uint32_t id = BOARD_ID_INIT; if (id == BOARD_ID_INIT) { if (google_chromeec_get_board_version(&id)) diff --git a/src/ec/google/chromeec/ec_skuid.c b/src/ec/google/chromeec/ec_skuid.c index 874324497f..259ce44f2a 100644 --- a/src/ec/google/chromeec/ec_skuid.c +++ b/src/ec/google/chromeec/ec_skuid.c @@ -5,7 +5,7 @@ uint32_t google_chromeec_get_board_sku(void) { - MAYBE_STATIC_NONZERO uint32_t sku_id = CROS_SKU_UNKNOWN; + static uint32_t sku_id = CROS_SKU_UNKNOWN; if (sku_id != CROS_SKU_UNKNOWN) return sku_id; diff --git a/src/ec/google/wilco/boardid.c b/src/ec/google/wilco/boardid.c index 8bde715e3b..9ff88995ef 100644 --- a/src/ec/google/wilco/boardid.c +++ b/src/ec/google/wilco/boardid.c @@ -5,7 +5,7 @@ uint32_t board_id(void) { - MAYBE_STATIC_NONZERO uint32_t id = BOARD_ID_INIT; + static uint32_t id = BOARD_ID_INIT; if (id == BOARD_ID_INIT) { uint8_t ec_id; diff --git a/src/ec/intel/board_id.c b/src/ec/intel/board_id.c index 15acad6617..72d74c51f0 100644 --- a/src/ec/intel/board_id.c +++ b/src/ec/intel/board_id.c @@ -19,7 +19,7 @@ static uint32_t get_board_id_via_ext_ec(void) /* Get Board ID via EC I/O port write/read */ int get_rvp_board_id(void) { - MAYBE_STATIC_NONZERO int id = BOARD_ID_UNKNOWN; + static int id = BOARD_ID_UNKNOWN; if (CONFIG(EC_GOOGLE_CHROMEEC)) { /* CHROME_EC */ id = get_board_id_via_ext_ec(); |