diff options
Diffstat (limited to 'chip/mchp/flash.c')
| -rw-r--r-- | chip/mchp/flash.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/chip/mchp/flash.c b/chip/mchp/flash.c index 1679cf92cb..4b0e407fb2 100644 --- a/chip/mchp/flash.c +++ b/chip/mchp/flash.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -55,7 +55,7 @@ int crec_flash_physical_read(int offset, int size, char *data) int crec_flash_physical_write(int offset, int size, const char *data) { int ret = EC_SUCCESS; - int i, write_size; + int i, write_size; trace13(0, FLASH, 0, "flash_phys_write: offset=0x%08X size=0x%08X dataptr=0x%08X", @@ -70,8 +70,7 @@ int crec_flash_physical_write(int offset, int size, const char *data) for (i = 0; i < size; i += write_size) { write_size = MIN((size - i), SPI_FLASH_MAX_WRITE_SIZE); - ret = spi_flash_write(offset + i, - write_size, + ret = spi_flash_write(offset + i, write_size, (uint8_t *)data + i); if (ret != EC_SUCCESS) break; @@ -94,8 +93,7 @@ int crec_flash_physical_erase(int offset, int size) if (entire_flash_locked) return EC_ERROR_ACCESS_DENIED; - trace12(0, FLASH, 0, - "flash_phys_erase: offset=0x%08X size=0x%08X", + trace12(0, FLASH, 0, "flash_phys_erase: offset=0x%08X size=0x%08X", offset, size); ret = spi_flash_erase(offset, size); return ret; @@ -110,7 +108,7 @@ int crec_flash_physical_erase(int offset, int size) int crec_flash_physical_get_protect(int bank) { return spi_flash_check_protect(bank * CONFIG_FLASH_BANK_SIZE, - CONFIG_FLASH_BANK_SIZE); + CONFIG_FLASH_BANK_SIZE); } /** @@ -164,8 +162,7 @@ uint32_t crec_flash_physical_get_protect_flags(void) */ uint32_t crec_flash_physical_get_valid_flags(void) { - return EC_FLASH_PROTECT_RO_AT_BOOT | - EC_FLASH_PROTECT_RO_NOW | + return EC_FLASH_PROTECT_RO_AT_BOOT | EC_FLASH_PROTECT_RO_NOW | EC_FLASH_PROTECT_ALL_NOW; } @@ -182,8 +179,9 @@ uint32_t crec_flash_physical_get_writable_flags(uint32_t cur_flags) wp_status = spi_flash_check_wp(); - if (wp_status == SPI_WP_NONE || (wp_status == SPI_WP_HARDWARE && - !(cur_flags & EC_FLASH_PROTECT_GPIO_ASSERTED))) + if (wp_status == SPI_WP_NONE || + (wp_status == SPI_WP_HARDWARE && + !(cur_flags & EC_FLASH_PROTECT_GPIO_ASSERTED))) ret = EC_FLASH_PROTECT_RO_AT_BOOT | EC_FLASH_PROTECT_RO_NOW; if (!entire_flash_locked) @@ -253,7 +251,7 @@ int crec_flash_physical_restore_state(void) */ if (reset_flags & EC_RESET_FLAG_SYSJUMP) { prev = (const struct flash_wp_state *)system_get_jump_tag( - FLASH_SYSJUMP_TAG, &version, &size); + FLASH_SYSJUMP_TAG, &version, &size); if (prev && version == FLASH_HOOK_VERSION && size == sizeof(*prev)) entire_flash_locked = prev->entire_flash_locked; |