diff options
| author | Yuval Peress <peress@chromium.org> | 2021-01-14 01:29:08 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-15 04:07:55 +0000 |
| commit | 9e422c3c05fdd324565049b09be27c446f9dc0ca (patch) | |
| tree | b4694ca5abc8c1be1000a1efe7a7bd8a02ddd856 /zephyr | |
| parent | 6aa3d78608b681e6374f30747a7f6ab80938bde6 (diff) | |
| download | chrome-ec-9e422c3c05fdd324565049b09be27c446f9dc0ca.tar.gz | |
Refactor CONFIG_FLASH_SIZE to CONFIG_FLASH_SIZE_BYTES
In Zephyr CONFIG_FLASH_SIZE is a Kconfig value that is used
throughout. The issue is that the units don't match. In
Zephyr the value is in KiB instead of bytes. This refactor
simply renames CONFIG_FLASH_SIZE in platform/ec to include
the unit (via _BYTES).
BRANCH=none
BUG=b:174873770
TEST=make buildall
be generated by the build instead of per board
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: I44bf3c7a20fcf62aaa9ae15715be78db4210f384
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2627638
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 4 | ||||
| -rw-r--r-- | zephyr/shim/src/flash.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index f1aebbb2ff..572183ccb2 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -94,13 +94,13 @@ enum battery_type { #undef CONFIG_EXTERNAL_STORAGE #undef CONFIG_MAPPED_STORAGE #undef CONFIG_FLASH_PSTATE -#undef CONFIG_FLASH_SIZE +#undef CONFIG_FLASH_SIZE_BYTES #ifdef CONFIG_PLATFORM_EC_FLASH #undef CONFIG_CMD_FLASHINFO #undef CONFIG_CMD_FLASH #define CONFIG_FLASH #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 /* TODO(b:176490413): use DT_PROP(DT_INST(inst, DT_DRV_COMPAT), size) ? */ #define CONFIG_MAPPED_STORAGE_BASE 0x64000000 #define CONFIG_FLASH_WRITE_SIZE 0x1 /* minimum write size */ diff --git a/zephyr/shim/src/flash.c b/zephyr/shim/src/flash.c index 12824753e7..e2fff3d139 100644 --- a/zephyr/shim/src/flash.c +++ b/zephyr/shim/src/flash.c @@ -126,7 +126,7 @@ static int flash_set_status_for_prot(int reg1, int reg2) static int flash_check_prot_range(unsigned int offset, unsigned int bytes) { /* Invalid value */ - if (offset + bytes > CONFIG_FLASH_SIZE) + if (offset + bytes > CONFIG_FLASH_SIZE_BYTES) return EC_ERROR_INVAL; /* Check if ranges overlap */ @@ -158,7 +158,7 @@ static int flash_check_prot_reg(unsigned int offset, unsigned int bytes) sr2 = flash_get_status2(); /* Invalid value */ - if (offset + bytes > CONFIG_FLASH_SIZE) + if (offset + bytes > CONFIG_FLASH_SIZE_BYTES) return EC_ERROR_INVAL; /* Compute current protect range */ @@ -181,7 +181,7 @@ static int flash_write_prot_reg(unsigned int offset, unsigned int bytes, uint8_t sr2 = flash_get_status2(); /* Invalid values */ - if (offset + bytes > CONFIG_FLASH_SIZE) + if (offset + bytes > CONFIG_FLASH_SIZE_BYTES) return EC_ERROR_INVAL; /* Compute desired protect range */ |