diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2020-12-22 13:22:11 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-22 14:34:19 +0000 |
| commit | 0822de05d8fe9cada1329991a5edc1a0eb3ea544 (patch) | |
| tree | acb1a6d368e465623402e6b6d622136accb2ada4 | |
| parent | 99a7217bd4bf3462316a0ac80e6712e0133a0e38 (diff) | |
| download | chrome-ec-0822de05d8fe9cada1329991a5edc1a0eb3ea544.tar.gz | |
Revert "npcx9_evb: remove CONFIG_SPI_FLASH"
This reverts commit 3f9e0a2ebb45d4b610ec770d0d2d3c6d455625c9.
Reason for revert: chromium:1161113
board/npcx9_evb/board.c:103:4:error:
CONFIG_SPI_FLASH_PORTundeclared here
Original change's description:
> npcx9_evb: remove CONFIG_SPI_FLASH
>
> In npcx9, the internal flash is accessed via FIU/UMA (implementing in
> chip/npcx/flash.c). It won’t use the common/spi_flash.c to access the
> internal flash. Let’s remove configs related to common/spi_flash.c.
>
> BRANCH=none
> BUG=b:165777478
> TEST=buildall pass
>
> Signed-off-by: Wealian Liao <whliao@nuvoton.corp-partner.google.com>
> Signed-off-by: CHLin <CHLin56@nuvoton.com>
> Change-Id: I2f1a82edf703752f1385358b977834ec21fdf879
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2597125
> Reviewed-by: caveh jalali <caveh@chromium.org>
Bug: chromium:1161113
Change-Id: I8d061b249596c95674e3d6d25c2f6f0e5310d2d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2600426
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Auto-Submit: Hung-Te Lin <hungte@chromium.org>
| -rw-r--r-- | board/npcx9_evb/board.c | 7 | ||||
| -rw-r--r-- | board/npcx9_evb/board.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/board/npcx9_evb/board.c b/board/npcx9_evb/board.c index 3f1f460fc5..892c0d1031 100644 --- a/board/npcx9_evb/board.c +++ b/board/npcx9_evb/board.c @@ -98,6 +98,13 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); /******************************************************************************/ +/* SPI devices */ +const struct spi_device_t spi_devices[] = { + { CONFIG_SPI_FLASH_PORT, 0, GPIO_SPI_CS_L}, +}; +const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); + +/******************************************************************************/ /* Wake-up pins for hibernate */ const enum gpio_signal hibernate_wake_pins[] = { GPIO_AC_PRESENT, diff --git a/board/npcx9_evb/board.h b/board/npcx9_evb/board.h index 209c25a803..f91fd1c28d 100644 --- a/board/npcx9_evb/board.h +++ b/board/npcx9_evb/board.h @@ -11,6 +11,7 @@ /* EC modules */ #define CONFIG_ADC #define CONFIG_PWM +#define CONFIG_SPI #define CONFIG_I2C /* Features of eSPI */ #define CONFIG_HOSTCMD_ESPI @@ -36,6 +37,7 @@ #define CONFIG_CMD_STACKOVERFLOW #define CONFIG_CMD_JUMPTAGS #define CONFIG_CMD_FLASH +#define CONFIG_CMD_SPI_FLASH #define CONFIG_CMD_SCRATCHPAD #define CONFIG_CMD_I2CWEDGE |