summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCHLin <CHLin56@nuvoton.com>2020-08-06 15:52:26 +0800
committerCommit Bot <commit-bot@chromium.org>2020-08-19 06:56:58 +0000
commitbc42cf5a82db4a77b986a6c609ccaa145900334d (patch)
treee742279bc444e410f463f5846e0358039eaa2070
parent0e91682bdbd15b8f4ab8a4e08d39d652d26164cb (diff)
downloadchrome-ec-bc42cf5a82db4a77b986a6c609ccaa145900334d.tar.gz
npcx7_evb: add support for npcx7m7fc to npcx7_evb
BRANCH=none BUG=b:163910671 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 the internal testing board of different chip variant. Signed-off-by: CHLin <CHLin56@nuvoton.com> Change-Id: I6575b23bbeda2a4a7912352c15f1537aba4c93bc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2355157 Tested-by: CH Lin <chlin56@nuvoton.com> Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-by: caveh jalali <caveh@chromium.org> Commit-Queue: CH Lin <chlin56@nuvoton.com>
-rw-r--r--board/npcx7_evb/board.h12
-rw-r--r--board/npcx7_evb/build.mk3
2 files changed, 9 insertions, 6 deletions
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h
index 298b5acad0..6d36f901b0 100644
--- a/board/npcx7_evb/board.h
+++ b/board/npcx7_evb/board.h
@@ -10,14 +10,15 @@
/*
* npcx7 EVB version:
- * 1 - for EVB version 1 which supports npcx7m6g
- * 2 - for EVB version 2 which supports npcx7m6f/npcx7m6fb/npcx7m6fc/npcx7m7wb
+ * 1 - EVB version 1 supports: npcx7m6g
+ * 2 - EVB version 2 supports:
+ * npcx7m6f/npcx7m6fb/npcx7m6fc/npcx7m7fc/npcx7m7wb/npcx7m7wc
*/
#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_NPCX7M7WC)
+ defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7FC) || \
+ defined(CHIP_VARIANT_NPCX7M7WB) || defined(CHIP_VARIANT_NPCX7M7WC)
#define BOARD_VERSION 2
#endif
@@ -65,7 +66,8 @@
#define CONFIG_SPI_FLASH_PORT 0
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_REGS
-#if defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7WC)
+#if defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7FC) || \
+ defined(CHIP_VARIANT_NPCX7M7WC)
#define CONFIG_SPI_FLASH_W25Q40 /* Internal spi flash type */
#define CONFIG_FLASH_SIZE 0x00080000 /* 512 KB internal spi flash */
#else
diff --git a/board/npcx7_evb/build.mk b/board/npcx7_evb/build.mk
index 01ff3f3aa6..4bd829202c 100644
--- a/board/npcx7_evb/build.mk
+++ b/board/npcx7_evb/build.mk
@@ -7,12 +7,13 @@
#
# the IC is Nuvoton NPCX7 M-Series EC (npcx7m6g, npcx7m6f, npcx7m6fb, npcx7m6fc,
-# npcx7m7wb)
+# npcx7m7fc, npcx7m7wb, npcx7m7wc)
# CHIP_VARIANT:
# npcx7m6g - for npcx7 ec without internal flash
# npcx7m6f - for npcx7 ec with internal flash
# npcx7m6fb - for npcx7 ec with internal flash, enhanced features.
# npcx7m6fc - the same as npcx7m6fb but internal flash size is 512 Kbytes.
+# npcx7m7fc - the same as npcx7m6fc but more RAM sizes.
# npcx7m7wb - for npcx7 ec with internal flash, enhanced features + WOV.
# npcx7m7wc - the same as npcx7m7wb but internal flash size is 512 Kbytes.