summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCHLin <CHLIN56@nuvoton.com>2019-03-28 13:43:02 +0800
committerchrome-bot <chrome-bot@chromium.org>2019-04-04 10:48:48 -0700
commit3d6eccfb9ff17a5022522d2ae3d78dc42c73c4e0 (patch)
treef82060a4ea5c489f97a083e66d1eb9c6d85701ef
parent748c3872b3226b8b65ec7c16fa0b81a1e5d5517b (diff)
downloadchrome-ec-3d6eccfb9ff17a5022522d2ae3d78dc42c73c4e0.tar.gz
npcx7_evb: illustrate the flash configuration of npcx7m7wc
There are only 512 Kbytes of internal flash in Rev.C of npcx7m7w (i.e. npcx7m7wc.) It is different from the Rev.B of npcx7m7w (i.e. npcx7m7wb.) This CL illustrates how to set the flash type and flash size when chip variant is npcx7m7wc. BRANCH=none BUG=none TEST=pass "make buildall". TEST=with related CLs, switch to different chip variant in build.mk; build and flash the image; make sure each EC image can boot up on EVB or internal testing board of different chip variant. Change-Id: I2b50c7a023b1634ed4a200cb826532174baae117 Signed-off-by: CHLin <CHLIN56@nuvoton.com> Reviewed-on: https://chromium-review.googlesource.com/1543063 Commit-Ready: CH Lin <chlin56@nuvoton.com> Tested-by: CH Lin <chlin56@nuvoton.com> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r--board/npcx7_evb/board.h7
-rw-r--r--board/npcx7_evb/build.mk1
2 files changed, 5 insertions, 3 deletions
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h
index a7a5328d17..66766934b1 100644
--- a/board/npcx7_evb/board.h
+++ b/board/npcx7_evb/board.h
@@ -16,7 +16,8 @@
#if defined(CHIP_VARIANT_NPCX7M6G)
#define BOARD_VERSION 1
#elif defined(CHIP_VARIANT_NPCX7M6F) || defined(CHIP_VARIANT_NPCX7M6FB) || \
- defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7WB)
+ defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7WB) || \
+ defined(CHIP_VARIANT_NPCX7M7WC)
#define BOARD_VERSION 2
#endif
@@ -62,7 +63,7 @@
#define CONFIG_SPI_FLASH_PORT 0
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_REGS
-#if defined(CHIP_VARIANT_NPCX7M6FC)
+#if defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7WC)
#define CONFIG_SPI_FLASH_W25Q40 /* Internal spi flash type */
#define CONFIG_FLASH_SIZE 0x00080000 /* 512 KB internal spi flash */
#else
@@ -75,7 +76,7 @@
#if (BOARD_VERSION == 2)
#define CONFIG_HIBERNATE_PSL /* Use PSL (Power Switch Logic) for hibernate */
#define CONFIG_CLOCK_SRC_EXTERNAL /* Use external 32kHz OSC as LFCLK source */
-#ifdef CHIP_VARIANT_NPCX7M7WB
+#if defined(CHIP_VARIANT_NPCX7M7WB) || defined(CHIP_VARIANT_NPCX7M7WC)
#define CONFIG_WAKE_ON_VOICE /* Use Audio front-end for Wake-on-Voice */
#endif
#undef CONFIG_FANS /* Remove fan application */
diff --git a/board/npcx7_evb/build.mk b/board/npcx7_evb/build.mk
index a2831c0d10..01ff3f3aa6 100644
--- a/board/npcx7_evb/build.mk
+++ b/board/npcx7_evb/build.mk
@@ -14,6 +14,7 @@
# npcx7m6fb - for npcx7 ec with internal flash, enhanced features.
# npcx7m6fc - the same as npcx7m6fb but internal flash size is 512 Kbytes.
# npcx7m7wb - for npcx7 ec with internal flash, enhanced features + WOV.
+# npcx7m7wc - the same as npcx7m7wb but internal flash size is 512 Kbytes.
CHIP:=npcx
CHIP_FAMILY:=npcx7