diff options
Diffstat (limited to 'zephyr/drivers/cros_flash')
| -rw-r--r-- | zephyr/drivers/cros_flash/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | zephyr/drivers/cros_flash/Kconfig | 2 | ||||
| -rw-r--r-- | zephyr/drivers/cros_flash/cros_flash_it8xxx2.c | 32 | ||||
| -rw-r--r-- | zephyr/drivers/cros_flash/cros_flash_npcx.c | 2 | ||||
| -rw-r--r-- | zephyr/drivers/cros_flash/cros_flash_xec.c | 12 |
5 files changed, 24 insertions, 26 deletions
diff --git a/zephyr/drivers/cros_flash/CMakeLists.txt b/zephyr/drivers/cros_flash/CMakeLists.txt index 1846d10576..fdd60a2f44 100644 --- a/zephyr/drivers/cros_flash/CMakeLists.txt +++ b/zephyr/drivers/cros_flash/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Copyright 2021 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/drivers/cros_flash/Kconfig b/zephyr/drivers/cros_flash/Kconfig index 68ed451f27..247f261cc5 100644 --- a/zephyr/drivers/cros_flash/Kconfig +++ b/zephyr/drivers/cros_flash/Kconfig @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c index 7be6ef86fb..4838c5d583 100644 --- a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c +++ b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -102,7 +102,7 @@ static int cros_flash_it8xxx2_init(const struct device *dev) reset_flags = system_get_reset_flags(); prot_flags = crec_flash_get_protect(); unwanted_prot_flags = EC_FLASH_PROTECT_ALL_NOW | - EC_FLASH_PROTECT_ERROR_INCONSISTENT; + EC_FLASH_PROTECT_ERROR_INCONSISTENT; /* * If we have already jumped between images, an earlier image could @@ -113,12 +113,12 @@ static int cros_flash_it8xxx2_init(const struct device *dev) if (prot_flags & EC_FLASH_PROTECT_GPIO_ASSERTED) { /* Protect the entire flash of host interface */ - flash_protect_banks(0, - CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE, + flash_protect_banks( + 0, CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE, FLASH_WP_HOST); /* Protect the entire flash of DBGR interface */ - flash_protect_banks(0, - CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE, + flash_protect_banks( + 0, CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE, FLASH_WP_DBGR); /* * Write protect is asserted. If we want RO flash protected, @@ -126,8 +126,9 @@ static int cros_flash_it8xxx2_init(const struct device *dev) */ if ((prot_flags & EC_FLASH_PROTECT_RO_AT_BOOT) && !(prot_flags & EC_FLASH_PROTECT_RO_NOW)) { - int rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_NOW, - EC_FLASH_PROTECT_RO_NOW); + int rv = + crec_flash_set_protect(EC_FLASH_PROTECT_RO_NOW, + EC_FLASH_PROTECT_RO_NOW); if (rv) return rv; @@ -206,13 +207,13 @@ static int cros_flash_it8xxx2_erase(const struct device *dev, int offset, * during erasing. */ if (IS_ENABLED(HAS_TASK_HOSTCMD) && - IS_ENABLED(CONFIG_HOST_COMMAND_STATUS)) { + IS_ENABLED(CONFIG_HOST_COMMAND_STATUS)) { irq_enable(DT_IRQN(DT_NODELABEL(shi))); } /* Always use sector erase command */ for (; size > 0; size -= CONFIG_FLASH_ERASE_SIZE) { ret = flash_erase(flash_controller, offset, - CONFIG_FLASH_ERASE_SIZE); + CONFIG_FLASH_ERASE_SIZE); if (ret) break; @@ -273,17 +274,16 @@ static int cros_flash_it8xxx2_protect_now(const struct device *dev, int all) if (all) { /* Protect the entire flash */ - flash_protect_banks(0, - CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE, + flash_protect_banks( + 0, CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE, FLASH_WP_EC); data->all_protected = 1; } else { /* Protect the read-only section and persistent state */ - flash_protect_banks(WP_BANK_OFFSET, - WP_BANK_COUNT, FLASH_WP_EC); + flash_protect_banks(WP_BANK_OFFSET, WP_BANK_COUNT, FLASH_WP_EC); #ifdef PSTATE_BANK - flash_protect_banks(PSTATE_BANK, - PSTATE_BANK_COUNT, FLASH_WP_EC); + flash_protect_banks(PSTATE_BANK, PSTATE_BANK_COUNT, + FLASH_WP_EC); #endif } diff --git a/zephyr/drivers/cros_flash/cros_flash_npcx.c b/zephyr/drivers/cros_flash/cros_flash_npcx.c index e0ffe9f348..032bb5906c 100644 --- a/zephyr/drivers/cros_flash/cros_flash_npcx.c +++ b/zephyr/drivers/cros_flash/cros_flash_npcx.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/zephyr/drivers/cros_flash/cros_flash_xec.c b/zephyr/drivers/cros_flash/cros_flash_xec.c index 2424c2a499..2b92eae25b 100644 --- a/zephyr/drivers/cros_flash/cros_flash_xec.c +++ b/zephyr/drivers/cros_flash/cros_flash_xec.c @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. All rights reserved. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -184,7 +184,7 @@ static int cros_flash_xec_set_status_reg(const struct device *dev, } static int cros_flash_xec_write_protection_set(const struct device *dev, - bool enable) + bool enable) { int ret = 0; @@ -303,8 +303,7 @@ static int flash_set_status_for_prot(const struct device *dev, int reg1) flash_set_status(dev, reg1); - spi_flash_reg_to_protect(reg1, 0, &addr_prot_start, - &addr_prot_length); + spi_flash_reg_to_protect(reg1, 0, &addr_prot_start, &addr_prot_length); return EC_SUCCESS; } @@ -392,7 +391,6 @@ static int cros_flash_xec_init(const struct device *dev) return 0; } - static int cros_flash_xec_write(const struct device *dev, int offset, int size, const char *src_data) { @@ -524,7 +522,7 @@ static int cros_flash_xec_protect_now(const struct device *dev, int all) } static int cros_flash_xec_get_jedec_id(const struct device *dev, - uint8_t *manufacturer, uint16_t *device) + uint8_t *manufacturer, uint16_t *device) { int ret; uint8_t jedec_id[3]; @@ -546,7 +544,7 @@ static int cros_flash_xec_get_jedec_id(const struct device *dev, } static int cros_flash_xec_get_status(const struct device *dev, uint8_t *sr1, - uint8_t *sr2) + uint8_t *sr2) { flash_get_status(dev, sr1); *sr2 = 0; |