diff options
| author | Wealian Liao <whliao@nuvoton.corp-partner.google.com> | 2020-12-17 18:43:51 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-28 18:03:26 +0000 |
| commit | b490e372ec3d321b71d949cb48f274c0f784b622 (patch) | |
| tree | f79ca7d78f8d14316901ff2512d46981e8073852 | |
| parent | 7cf197d455b3afc565f03abf0b911fd4a208a52e (diff) | |
| download | chrome-ec-b490e372ec3d321b71d949cb48f274c0f784b622.tar.gz | |
npcx9: remove unnecessary default CONFIGs for internal 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. This CL remove the two default configs related to the
SPI flash in the npcx9 chip config and fix the npcx9_evb setting for
the SPI flash.
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: I7c525791d001fa2833b7d895f277768948783938
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2600807
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | board/npcx9_evb/board.c | 7 | ||||
| -rw-r--r-- | board/npcx9_evb/board.h | 2 | ||||
| -rw-r--r-- | chip/npcx/config_chip-npcx9.h | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/board/npcx9_evb/board.c b/board/npcx9_evb/board.c index 892c0d1031..3f1f460fc5 100644 --- a/board/npcx9_evb/board.c +++ b/board/npcx9_evb/board.c @@ -98,13 +98,6 @@ 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 f91fd1c28d..209c25a803 100644 --- a/board/npcx9_evb/board.h +++ b/board/npcx9_evb/board.h @@ -11,7 +11,6 @@ /* EC modules */ #define CONFIG_ADC #define CONFIG_PWM -#define CONFIG_SPI #define CONFIG_I2C /* Features of eSPI */ #define CONFIG_HOSTCMD_ESPI @@ -37,7 +36,6 @@ #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 diff --git a/chip/npcx/config_chip-npcx9.h b/chip/npcx/config_chip-npcx9.h index 9f7b0f52d0..a13723f980 100644 --- a/chip/npcx/config_chip-npcx9.h +++ b/chip/npcx/config_chip-npcx9.h @@ -98,8 +98,6 @@ #endif /* Internal spi-flash setting */ -#define CONFIG_SPI_FLASH_PORT 0 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q40 /* Internal spi flash type */ #define CONFIG_FLASH_SIZE 0x00080000 /* 512 KB internal spi flash */ |