summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Chao <scott_chao@wistron.corp-partner.google.com>2020-11-20 15:00:11 +0800
committerCommit Bot <commit-bot@chromium.org>2020-12-08 01:14:21 +0000
commit590ac3bc3f34bb0c9d92f35c853adb5bca252892 (patch)
tree0ad1a0b3b01b236ed2d5bd7f23481dd572016dc7
parent3e07bd51fd251f3f0b7abcf38a745e87d60a8e09 (diff)
downloadchrome-ec-590ac3bc3f34bb0c9d92f35c853adb5bca252892.tar.gz
eldrid: add npcx7m7fc support and backward support npcx7m6fc.
BUG=b:173754312 BRANCH=firmware-volteer-13521.B-master TEST=make buildall Signed-off-by: Scott Chao <scott_chao@wistron.corp-partner.google.com> Change-Id: I7ce77a6813a977612b5c804cb335add419ac80b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2550117 Reviewed-by: Keith Short <keithshort@chromium.org> (cherry picked from commit dcdd0522d12ec52790f73963d6845b5da2b49308) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2576455 Commit-Queue: YH Lin <yueherngl@chromium.org> Tested-by: YH Lin <yueherngl@chromium.org>
-rw-r--r--board/eldrid/board.h7
-rw-r--r--board/eldrid/build.mk5
l---------board/eldrid_npcx7961
3 files changed, 13 insertions, 0 deletions
diff --git a/board/eldrid/board.h b/board/eldrid/board.h
index cb3ffbd0c7..585e6e0c9f 100644
--- a/board/eldrid/board.h
+++ b/board/eldrid/board.h
@@ -13,6 +13,13 @@
/* Optional features */
#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */
+#ifndef BOARD_ELDRID_NPCX796FC
+/*
+ * The RAM and flash size combination on the the NPCX797FC does not leave
+ * any unused flash space that can be used to store the .init_rom section.
+ */
+#undef CONFIG_CHIP_INIT_ROM_REGION
+#endif
#define CONFIG_VBOOT_EFS2
diff --git a/board/eldrid/build.mk b/board/eldrid/build.mk
index 8a5f8f68cd..36b37435e1 100644
--- a/board/eldrid/build.mk
+++ b/board/eldrid/build.mk
@@ -8,7 +8,12 @@
CHIP:=npcx
CHIP_FAMILY:=npcx7
+
+ifeq ($(BOARD),eldrid_npcx796fc)
CHIP_VARIANT:=npcx7m6fc
+else
+CHIP_VARIANT:=npcx7m7fc
+endif
BASEBOARD:=volteer
board-y=board.o
diff --git a/board/eldrid_npcx796 b/board/eldrid_npcx796
new file mode 120000
index 0000000000..e33b439d8e
--- /dev/null
+++ b/board/eldrid_npcx796
@@ -0,0 +1 @@
+eldrid \ No newline at end of file