diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-09-05 17:27:37 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-09-16 14:49:32 -0700 |
| commit | 558c465165acf494905fa59c822c7190b4646899 (patch) | |
| tree | a20a512da9d8aed29cb46d99b8df0b8bb0ab5714 /chip/npcx/flash.c | |
| parent | d58e54730c03290296df5bb65cb84264e4b2facc (diff) | |
| download | chrome-ec-558c465165acf494905fa59c822c7190b4646899.tar.gz | |
cleanup: Remove CDRAM / CODERAM CONFIGs
CDRAM / CODERAM configs were previously used for chips which copied code
from external SPI to program memory prior to execution, and were used
inconsistently between npcx and mec1322.
These CONFIGs are now completely redundant given new configs like
CONFIG_MAPPED_STORAGE_BASE and CONFIG_EXTERNAL_STORAGE.
BRANCH=None
BUG=chrome-os-partner:23796
TEST=With entire patch series, on both Samus and Glados:
- Verify 'version' EC console command is correct
- Verify 'flashrom -p ec -r read.bin' reads back EC image
- Verify software sync correctly flashes both EC and PD RW images
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I0e054ab4c939f9dcf54abee8e5ebd9b2e42fe9c4
Reviewed-on: https://chromium-review.googlesource.com/297804
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'chip/npcx/flash.c')
| -rw-r--r-- | chip/npcx/flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c index c97c2b38cc..2bdcefe8a2 100644 --- a/chip/npcx/flash.c +++ b/chip/npcx/flash.c @@ -23,7 +23,7 @@ uint8_t flag_prot_inconsistent; #define FLASH_ABORT_TIMEOUT 10000 -#ifdef CONFIG_CODERAM_ARCH +#ifdef CONFIG_EXTERNAL_STORAGE #define TRISTATE_FLASH(x) #else #define TRISTATE_FLASH(x) flash_tristate(x) @@ -770,7 +770,7 @@ int flash_pre_init(void) /* Enable FIU interface */ flash_pinmux(1); -#ifdef CONFIG_CODERAM_ARCH +#ifdef CONFIG_EXTERNAL_STORAGE /* Disable tristate all the time */ CLEAR_BIT(NPCX_DEVCNT, NPCX_DEVCNT_F_SPI_TRIS); #endif |