diff options
| author | Rong Chang <rongchang@google.com> | 2017-02-22 11:32:39 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-02-27 16:56:24 -0800 |
| commit | ec98dbfb35bb22bb6b9096eceedda93c9f88f85c (patch) | |
| tree | 17a36638e971abafe0ad4b7a452a2078f47a67e4 /include/flash.h | |
| parent | 31cfc63b80ea8f5b778e6c3f568f325a6064244a (diff) | |
| download | chrome-ec-ec98dbfb35bb22bb6b9096eceedda93c9f88f85c.tar.gz | |
stm32f09x: fix flash protection offset
STM32F091VC has 32 flash protection sectors (31 x 4KB + 1 x 132KB),
which doesn't fit the layout requirement in config_std_internal_flash.h.
This CL hardcodes the layout and flash bank mapping.
BUG=chrome-os-partner:62372
BUG=chromium:694972
TEST=load on elm and manually enable write protect using flashrom
# flashrom -p ec:dev=0 --wp-enable
check ec console write protect option bytes, bank 31 is writable
> rw 0x1ffff808
read 0x1ffff808 = 0xff00ff00
> rw 0x1ffff80c
read 0x1ffff80c = 0x7f80ff00
BRANCH=oak
Change-Id: I23dcf87bfbcd2f37e97a87e94847dce1ea1d343c
Signed-off-by: Rong Chang <rongchang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/446176
Diffstat (limited to 'include/flash.h')
| -rw-r--r-- | include/flash.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/flash.h b/include/flash.h index 2d50708f8a..5963020c8a 100644 --- a/include/flash.h +++ b/include/flash.h @@ -16,16 +16,24 @@ * TODO(crosbug.com/p/62372): This assumes flash protection blocks are all of * identical sizes, which is incorrect, for example, on STM32F091VC. */ +#ifndef PHYSICAL_BANKS #define PHYSICAL_BANKS (CONFIG_FLASH_SIZE / CONFIG_FLASH_BANK_SIZE) +#endif /* WP region offset and size in units of flash banks */ #define WP_BANK_OFFSET (CONFIG_WP_STORAGE_OFF / CONFIG_FLASH_BANK_SIZE) +#ifndef WP_BANK_COUNT #define WP_BANK_COUNT (CONFIG_WP_STORAGE_SIZE / CONFIG_FLASH_BANK_SIZE) +#endif /* Persistent protection state flash offset / size / bank */ #if defined(CONFIG_FLASH_PSTATE) && defined(CONFIG_FLASH_PSTATE_BANK) +#ifndef PSTATE_BANK #define PSTATE_BANK (CONFIG_FW_PSTATE_OFF / CONFIG_FLASH_BANK_SIZE) +#endif +#ifndef PSTATE_BANK_COUNT #define PSTATE_BANK_COUNT (CONFIG_FW_PSTATE_SIZE / CONFIG_FLASH_BANK_SIZE) +#endif #else #define PSTATE_BANK_COUNT 0 #endif |