diff options
| author | Nick Sanders <nsanders@chromium.org> | 2016-12-21 06:26:58 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-12-29 19:09:57 -0800 |
| commit | 10db53d0a448f32b904c0e3c7b9375cc51da8bef (patch) | |
| tree | 6f5c363e8fc8ee7df633fb05b1b3878d4a5c23ee | |
| parent | 6731584e15a60af73721d1500c2e5f6d7f6fcc3b (diff) | |
| download | chrome-ec-10db53d0a448f32b904c0e3c7b9375cc51da8bef.tar.gz | |
Revert "servo_v4: Remove PSTATE to create more space in RO"
This reverts commit 7ed9a96cd7247e66d60464bb7737c139d71e7395.
Change-Id: Ifb3c31d04c8ff10c6186370c98ab127295b0f117
Reviewed-on: https://chromium-review.googlesource.com/422478
Commit-Ready: Scott Collyer <scollyer@chromium.org>
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
| -rw-r--r-- | board/servo_v4/board.h | 12 | ||||
| -rw-r--r-- | extra/usb_updater/servo_v4.json | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index 1480583af6..24cff51544 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -68,18 +68,6 @@ #define CONFIG_I2C_MASTER #define I2C_PORT_MASTER 1 -/* - * Create 0x1000 more space in RO so that the build with USB PD will fit. - * TODO(crosbug.com/p/61170): This fix works currently, but as more PD - * options are included, the image will no longer fit in the 0x10000 space - * that's allocated. - */ -#undef CONFIG_FLASH_PSTATE -#undef CONFIG_FLASH_PSTATE_BANK -#undef CONFIG_FW_PSTATE_SIZE -#define CONFIG_FW_PSTATE_SIZE 0 - - /* PD features */ #define CONFIG_ADC diff --git a/extra/usb_updater/servo_v4.json b/extra/usb_updater/servo_v4.json index d85949aec4..0167fa1cb4 100644 --- a/extra/usb_updater/servo_v4.json +++ b/extra/usb_updater/servo_v4.json @@ -8,6 +8,7 @@ "Comment on region format": "name: [baseoffset, length]", "regions": { "RW": ["0x10000", "0x10000"], - "RO": ["0x0000", "0x10000"] + "PSTATE": ["0xf000", "0x1000"], + "RO": ["0x0000", "0xf000"] } } |