From b7c0b383736b2a45e8593d0c8eb5326baf1f36ea Mon Sep 17 00:00:00 2001 From: Scott Chao Date: Fri, 20 Nov 2020 15:00:11 +0800 Subject: 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 Change-Id: I7ce77a6813a977612b5c804cb335add419ac80b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2550117 Reviewed-by: Keith Short (cherry picked from commit dcdd0522d12ec52790f73963d6845b5da2b49308) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2570872 Reviewed-by: Nick Chen Reviewed-by: YH Lin Commit-Queue: YH Lin Tested-by: YH Lin --- board/eldrid/board.h | 7 +++++++ board/eldrid/build.mk | 5 +++++ board/eldrid_npcx796 | 1 + 3 files changed, 13 insertions(+) create mode 120000 board/eldrid_npcx796 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 -- cgit v1.2.1