diff options
| author | Keith Short <keithshort@chromium.org> | 2021-05-05 17:37:40 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-06 01:03:17 +0000 |
| commit | 0a9949d1b059698247bde17a34c9c8caace4d48d (patch) | |
| tree | 2e84b40b55aa9c045a1270ff3f89d25488bcd087 | |
| parent | 6a0678dbe2bb8a77ad438b5232b5c1a1747369fe (diff) | |
| download | chrome-ec-0a9949d1b059698247bde17a34c9c8caace4d48d.tar.gz | |
zephyr: Fix flash region offsets and sizes
The flash region offsets and sizes were swapped when reading from
binman.dtsi.
This caused the flashrom on the AP from read only half of the flash when
using "flashrom -p ec -r /tmp/zephyr.bin". This also broke the
firmware_SoftwareSync FAFT test.
BUG=b:184343587
BRANCH=none
TEST=test_that -b volteer $DUT firmware_SoftwareSync
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I080b48d75e21ed9dc3fb8fe34998fc1a33bbb609
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2876176
Commit-Queue: Yuval Peress <peress@chromium.org>
Commit-Queue: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Yuval Peress <peress@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index bd12196adf..df6897a742 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -307,10 +307,10 @@ #define _BINMAN_RO_PATH DT_PATH(binman, wp_ro) #define _BINMAN_RW_PATH DT_PATH(binman, ec_rw) -#define CONFIG_EC_PROTECTED_STORAGE_OFF DT_PROP(_BINMAN_RO_PATH, size) -#define CONFIG_EC_PROTECTED_STORAGE_SIZE DT_PROP(_BINMAN_RO_PATH, offset) -#define CONFIG_EC_WRITABLE_STORAGE_OFF DT_PROP(_BINMAN_RW_PATH, size) -#define CONFIG_EC_WRITABLE_STORAGE_SIZE DT_PROP(_BINMAN_RW_PATH, offset) +#define CONFIG_EC_PROTECTED_STORAGE_OFF DT_PROP(_BINMAN_RO_PATH, offset) +#define CONFIG_EC_PROTECTED_STORAGE_SIZE DT_PROP(_BINMAN_RO_PATH, size) +#define CONFIG_EC_WRITABLE_STORAGE_OFF DT_PROP(_BINMAN_RW_PATH, offset) +#define CONFIG_EC_WRITABLE_STORAGE_SIZE DT_PROP(_BINMAN_RW_PATH, size) /* RO image resides at start of protected region, right after header */ #define CONFIG_RO_STORAGE_OFF CONFIG_RO_HDR_SIZE |