diff options
| author | Randall Spangler <rspangler@chromium.org> | 2015-02-25 13:37:41 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-02-27 19:56:47 +0000 |
| commit | 16eec7f14c4fbd947344bfb441f6e525974d4380 (patch) | |
| tree | 319bd24cab453d8c4989503e68f40dd6162472d0 | |
| parent | ca8cf312a3f75ed9e903ae6867490b8105c7a0b3 (diff) | |
| download | chrome-ec-16eec7f14c4fbd947344bfb441f6e525974d4380.tar.gz | |
Remove unused CONFIG_PSTATE_AT_END option
All current boards in ToT place pstate at the end of the RO section.
Remove the unused option to place it at the end of the RW section;
we'll never do that again.
BUG=none
BRANCH=none
TEST=make buildall -j
Change-Id: I0d279a4c9786bb33367a7387423481cc9b94e115
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/253636
Reviewed-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | chip/g/config_std_flash.h | 12 | ||||
| -rw-r--r-- | chip/it83xx/config_chip.h | 12 | ||||
| -rw-r--r-- | chip/lm4/config_chip.h | 12 | ||||
| -rw-r--r-- | include/config.h | 8 |
4 files changed, 3 insertions, 41 deletions
diff --git a/chip/g/config_std_flash.h b/chip/g/config_std_flash.h index a123b6cccc..cee332fad2 100644 --- a/chip/g/config_std_flash.h +++ b/chip/g/config_std_flash.h @@ -15,23 +15,13 @@ */ #define CONFIG_FW_PSTATE_SIZE CONFIG_FLASH_BANK_SIZE -#ifdef CONFIG_PSTATE_AT_END -/* PSTATE is at end of flash */ -#define CONFIG_FW_RO_SIZE CONFIG_FW_IMAGE_SIZE -#define CONFIG_FW_PSTATE_OFF (CONFIG_FLASH_PHYSICAL_SIZE \ - - CONFIG_FW_PSTATE_SIZE) -/* Don't claim PSTATE is part of flash */ -#define CONFIG_FLASH_SIZE CONFIG_FW_PSTATE_OFF - -#else /* PSTATE immediately follows RO, in the first half of flash */ #define CONFIG_FW_RO_SIZE (CONFIG_FW_IMAGE_SIZE \ - CONFIG_FW_PSTATE_SIZE) #define CONFIG_FW_PSTATE_OFF CONFIG_FW_RO_SIZE #define CONFIG_FLASH_SIZE CONFIG_FLASH_PHYSICAL_SIZE -#endif -/* Either way, RW firmware is one firmware image offset from the start */ +/* RW firmware is one firmware image offset from the start */ #define CONFIG_FW_RW_OFF CONFIG_FW_IMAGE_SIZE #define CONFIG_FW_RW_SIZE CONFIG_FW_IMAGE_SIZE diff --git a/chip/it83xx/config_chip.h b/chip/it83xx/config_chip.h index 55e41763b4..a282933faa 100644 --- a/chip/it83xx/config_chip.h +++ b/chip/it83xx/config_chip.h @@ -69,23 +69,13 @@ */ #define CONFIG_FW_PSTATE_SIZE CONFIG_FLASH_BANK_SIZE -#ifdef CONFIG_PSTATE_AT_END -/* PSTATE is at end of flash */ -#define CONFIG_FW_RO_SIZE CONFIG_FW_IMAGE_SIZE -#define CONFIG_FW_PSTATE_OFF (CONFIG_FLASH_PHYSICAL_SIZE \ - - CONFIG_FW_PSTATE_SIZE) -/* Don't claim PSTATE is part of flash */ -#define CONFIG_FLASH_SIZE CONFIG_FW_PSTATE_OFF - -#else /* PSTATE immediately follows RO, in the first half of flash */ #define CONFIG_FW_RO_SIZE (CONFIG_FW_IMAGE_SIZE \ - CONFIG_FW_PSTATE_SIZE) #define CONFIG_FW_PSTATE_OFF CONFIG_FW_RO_SIZE #define CONFIG_FLASH_SIZE CONFIG_FLASH_PHYSICAL_SIZE -#endif -/* Either way, RW firmware is one firmware image offset from the start */ +/* RW firmware is one firmware image offset from the start */ #define CONFIG_FW_RW_OFF CONFIG_FW_IMAGE_SIZE #define CONFIG_FW_RW_SIZE CONFIG_FW_IMAGE_SIZE diff --git a/chip/lm4/config_chip.h b/chip/lm4/config_chip.h index 88f6a76668..535b677701 100644 --- a/chip/lm4/config_chip.h +++ b/chip/lm4/config_chip.h @@ -83,23 +83,13 @@ */ #define CONFIG_FW_PSTATE_SIZE CONFIG_FLASH_BANK_SIZE -#ifdef CONFIG_PSTATE_AT_END -/* PSTATE is at end of flash */ -#define CONFIG_FW_RO_SIZE CONFIG_FW_IMAGE_SIZE -#define CONFIG_FW_PSTATE_OFF (CONFIG_FLASH_PHYSICAL_SIZE \ - - CONFIG_FW_PSTATE_SIZE) -/* Don't claim PSTATE is part of flash */ -#define CONFIG_FLASH_SIZE CONFIG_FW_PSTATE_OFF - -#else /* PSTATE immediately follows RO, in the first half of flash */ #define CONFIG_FW_RO_SIZE (CONFIG_FW_IMAGE_SIZE \ - CONFIG_FW_PSTATE_SIZE) #define CONFIG_FW_PSTATE_OFF CONFIG_FW_RO_SIZE #define CONFIG_FLASH_SIZE CONFIG_FLASH_PHYSICAL_SIZE -#endif -/* Either way, RW firmware is one firmware image offset from the start */ +/* RW firmware is one firmware image offset from the start */ #define CONFIG_FW_RW_OFF CONFIG_FW_IMAGE_SIZE #define CONFIG_FW_RW_SIZE CONFIG_FW_IMAGE_SIZE diff --git a/include/config.h b/include/config.h index dd5e836ede..245d50301b 100644 --- a/include/config.h +++ b/include/config.h @@ -970,14 +970,6 @@ /* Compile common code for AP power state machine */ #undef CONFIG_POWER_COMMON -/* - * The EC stores persistent state information for flash write protect in a - * block of flash. If this option is defined, the information is in the last - * bank of flash, instead of the last bank in the nominally read-only section - * of flash. - */ -#undef CONFIG_PSTATE_AT_END - /* Use part of the EC's data EEPROM to hold persistent storage for the AP. */ #undef CONFIG_PSTORE |