npcx7_evb: Add initial board driver of npcx7 ec evb.

Add the evaluation board driver of npcx7 series ec for testing. If you
received the evb which ec is 128-pins package, please notice it has
the following limitations.

a. No GPIOD7/E0 pins.
b. No I2C4_0, I2C4_1, I2C5_1 and I2C6_1 ports.
c. No ADC7, ADC8 and ADC9 channels.
d. No JTAG port 1.
e. Do not enable CONFIG_HIBERNATE_PSL since no PSL circuit on evb.

This CL also includes:
1. Modified reset config from srst to sysresetreq in openocd/npcx.cfg.
   Make sure openocd driver can reset ec by using NVIC_SYSRESETREQ.
2. Add flash utilities for npcx7 ec in openocd/npcx_cmds.tcl.
3. Add npcx7_evb support in flash_ec.

BRANCH=none
BUG=none
TEST=Passed all npcx7 drivers verification on the evb no matter which
     ec's package is 128 or 144 pins package.

Change-Id: I8224d97cd66ce483d70816f47b2e124308f1b69c
Signed-off-by: Mulin Chao <mlchao@nuvoton.com>
Reviewed-on: https://chromium-review.googlesource.com/505832
Reviewed-by: Randall Spangler <rspangler@chromium.org>

12 files changed, 402 insertions, 7 deletions

diff --git a/board/npcx7_evb/board.c b/board/npcx7_evb/board.c
new file mode 100644
index 0000000000..6822a49a43
--- /dev/null
+++ b/board/npcx7_evb/board.c
@@ -0,0 +1,118 @@
+/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Nuvoton M4 EB board-specific configuration */
+
+#include "adc.h"
+#include "adc_chip.h"
+#include "backlight.h"
+#include "chipset.h"
+#include "common.h"
+#include "driver/temp_sensor/tmp006.h"
+#include "extpower.h"
+#include "fan.h"
+#include "fan_chip.h"
+#include "gpio.h"
+#include "i2c.h"
+#include "keyboard_scan.h"
+#include "lid_switch.h"
+#include "peci.h"
+#include "power.h"
+#include "power_button.h"
+#include "pwm.h"
+#include "pwm_chip.h"
+#include "registers.h"
+#include "spi.h"
+#include "switch.h"
+#include "temp_sensor.h"
+#include "temp_sensor_chip.h"
+#include "timer.h"
+#include "thermal.h"
+#include "util.h"
+
+#include "gpio_list.h"
+
+/******************************************************************************/
+/* ADC channels. Must be in the exactly same order as in enum adc_channel. */
+const struct adc_t adc_channels[] = {
+	[ADC_CH_0] = {"ADC0", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0},
+	[ADC_CH_1] = {"ADC1", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0},
+	[ADC_CH_2] = {"ADC2", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0},
+	[ADC_CH_3] = {"ADC3", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0},
+	[ADC_CH_4] = {"ADC4", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0},
+};
+BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
+
+/******************************************************************************/
+/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
+const struct pwm_t pwm_channels[] = {
+	[PWM_CH_FAN] = { 0, PWM_CONFIG_OPEN_DRAIN, 25000},
+	[PWM_CH_KBLIGHT] = { 2, 0, 10000 },
+};
+BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT);
+
+/******************************************************************************/
+/* Physical fans. These are logically separate from pwm_channels. */
+const struct fan_t fans[] = {
+	[FAN_CH_0] = {
+		.flags = FAN_USE_RPM_MODE,
+		.rpm_min = 1000,
+		.rpm_start = 1000,
+		.rpm_max = 5200,
+		.ch = 0,/* Use MFT id to control fan */
+		.pgood_gpio = GPIO_PGOOD_FAN,
+		.enable_gpio = -1,
+	},
+};
+BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT);
+
+/******************************************************************************/
+/* MFT channels. These are logically separate from pwm_channels. */
+const struct mft_t mft_channels[] = {
+	[MFT_CH_0] = { NPCX_MFT_MODULE_1, TCKC_LFCLK, PWM_CH_FAN},
+};
+BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT);
+
+/******************************************************************************/
+/* I2C ports */
+const struct i2c_port_t i2c_ports[] = {
+	{"master0-0", NPCX_I2C_PORT0_0, 100, GPIO_I2C0_SCL0, GPIO_I2C0_SDA0},
+	{"master1-0", NPCX_I2C_PORT1_0, 100, GPIO_I2C1_SCL0, GPIO_I2C1_SDA0},
+	{"master2-0", NPCX_I2C_PORT2_0, 100, GPIO_I2C2_SCL0, GPIO_I2C2_SDA0},
+	{"master3-0", NPCX_I2C_PORT3_0, 100, GPIO_I2C3_SCL0, GPIO_I2C3_SDA0},
+	{"master7-0", NPCX_I2C_PORT7_0, 100, GPIO_I2C7_SCL0, GPIO_I2C7_SDA0},
+};
+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,
+	GPIO_LID_OPEN,
+	GPIO_POWER_BUTTON_L,
+};
+const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins);
+
+/******************************************************************************/
+/* Keyboard scan setting */
+struct keyboard_scan_config keyscan_config = {
+	.output_settle_us = 40,
+	.debounce_down_us = 6 * MSEC,
+	.debounce_up_us = 30 * MSEC,
+	.scan_period_us = 1500,
+	.min_post_scan_delay_us = 1000,
+	.poll_timeout_us = SECOND,
+	.actual_key_mask = {
+		0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff,
+		0xa4, 0xff, 0xf6, 0x55, 0xfa, 0xc8  /* full set */
+	},
+};
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h
new file mode 100644
index 0000000000..1b00a4715a
--- /dev/null
+++ b/board/npcx7_evb/board.h
@@ -0,0 +1,101 @@
+/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Configuration for Nuvoton M4 EB */
+
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
+
+/* EC modules */
+#define CONFIG_ADC
+#define CONFIG_PWM
+#define CONFIG_SPI
+#define CONFIG_LPC
+#define CONFIG_I2C
+
+/* Optional features */
+#define CONFIG_BOARD_VERSION
+#define CONFIG_EXTPOWER_GPIO
+#define CONFIG_I2C_MASTER
+#define CONFIG_KEYBOARD_BOARD_CONFIG
+#define CONFIG_KEYBOARD_PROTOCOL_8042
+#undef  CONFIG_LOW_POWER_IDLE /* Deep Sleep Support */
+#define CONFIG_POWER_BUTTON
+#undef  CONFIG_PSTORE
+#define CONFIG_PWM_KBLIGHT
+#define CONFIG_VBOOT_HASH
+#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands */
+
+/* EC console commands */
+#define CONFIG_CMD_TASKREADY
+#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
+
+/* I2C port for CONFIG_CMD_I2CWEDGE */
+#define I2C_PORT_MASTER NPCX_I2C_PORT0_0
+#define I2C_PORT_HOST   0
+
+/* LPC UART */
+#define CONFIG_UART_HOST 0
+
+/* Fans for testing */
+#define CONFIG_FANS 1
+
+/* Internal spi-flash on npcx7 ec */
+#define CONFIG_FLASH_SIZE 0x00100000 /* 1MB internal spi flash */
+#define CONFIG_SPI_FLASH_PORT 0
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_REGS
+#define CONFIG_SPI_FLASH_W25Q80 /* Internal spi flash type */
+
+/* New features on npcx7 ec */
+#define CONFIG_KEYBOARD_KSO_HIGH_DRIVE /* Quasi-bidirectional buf for KSOs */
+#undef CONFIG_HIBERNATE_PSL /* Use PSL (Power Switch Logic) for hibernate */
+
+/* Optional feature to configure npcx7 chip */
+#define NPCX_UART_MODULE2  0 /* 0:GPIO10/11 1:GPIO64/65 as UART */
+#define NPCX_JTAG_MODULE2  0 /* 0:GPIO21/17/16/20 1:GPIOD5/E2/D4/E5 as JTAG */
+#define NPCX_TACH_SEL2     0 /* 0:GPIO40/73 1:GPIO93/A6 as TACH */
+#define NPCX7_PWM1_SEL     0 /* 0:GPIOC2 as I2CSCL0 1:as PWM1 (only in npcx7) */
+
+#ifndef __ASSEMBLER__
+
+enum adc_channel {
+	ADC_CH_0 = 0,
+	ADC_CH_1,
+	ADC_CH_2,
+	ADC_CH_3,
+	ADC_CH_4,
+	ADC_CH_COUNT
+};
+
+enum pwm_channel {
+	PWM_CH_FAN,
+	PWM_CH_KBLIGHT,
+	/* Number of PWM channels */
+	PWM_CH_COUNT
+};
+
+enum fan_channel {
+	FAN_CH_0,
+	/* Number of FAN channels */
+	FAN_CH_COUNT
+};
+
+enum mft_channel {
+	MFT_CH_0,
+	/* Number of MFT channels */
+	MFT_CH_COUNT
+};
+
+#include "gpio_signal.h"
+
+#endif /* !__ASSEMBLER__ */
+
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/npcx7_evb/build.mk b/board/npcx7_evb/build.mk
new file mode 100644
index 0000000000..438573deb4
--- /dev/null
+++ b/board/npcx7_evb/build.mk
@@ -0,0 +1,15 @@
+# -*- makefile -*-
+# Copyright 2017 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# Board specific files build
+#
+
+# the IC is Nuvoton NPCX7 M-Series EC (npcx7m6f)
+
+CHIP:=npcx
+CHIP_FAMILY:=npcx7
+CHIP_VARIANT:=npcx7m6f
+
+board-y=board.o
diff --git a/board/npcx7_evb/ec.tasklist b/board/npcx7_evb/ec.tasklist
new file mode 100644
index 0000000000..ddd6135672
--- /dev/null
+++ b/board/npcx7_evb/ec.tasklist
@@ -0,0 +1,24 @@
+/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**
+ * List of enabled tasks in the priority order
+ *
+ * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK_ALWAYS(n, r, d, s) for base tasks and
+ * TASK_NOTEST(n, r, d, s) for tasks that can be excluded in test binaries,
+ * where :
+ * 'n' is the name of the task
+ * 'r' is the main routine of the task
+ * 'd' is an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
+ */
+#define CONFIG_TASK_LIST \
+	TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
+	TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE)
diff --git a/board/npcx7_evb/gpio.inc b/board/npcx7_evb/gpio.inc
new file mode 100644
index 0000000000..2fe60c5b71
--- /dev/null
+++ b/board/npcx7_evb/gpio.inc
@@ -0,0 +1,102 @@
+/* -*- mode:c -*-
+ *
+ * Copyright 2017 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Declare symbolic names for all the GPIOs that we care about.
+ * Note: Those with interrupt handlers must be declared first. */
+
+/* Pins for internal flash testing */
+GPIO_INT(RECOVERY_L,       PIN(0, 3), GPIO_INT_BOTH | GPIO_PULL_UP, switch_interrupt)
+GPIO_INT(WP_L,             PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, switch_interrupt)
+
+/* Pins for hibernate testing */
+#ifdef CONFIG_HIBERNATE_PSL
+/*
+ * Please notice internal PU/PD is gone if IOs are selected to PSL_INx. The
+ * power consumption of PSL is ultra-low and sensitive. Putting a large
+ * external PU/PD resistance for PSL input pins is recommended.
+ */
+GPIO_INT(AC_PRESENT,       PIN(D, 2), GPIO_INT_BOTH, extpower_interrupt)                 /* PSL_IN1# (Low Active) */
+GPIO_INT(POWER_BUTTON_L,   PIN(0, 0), GPIO_INT_BOTH, power_button_interrupt)             /* PSL_IN2# (Low Active) */
+GPIO_INT(LID_OPEN,         PIN(0, 1), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) /* PSL_IN3# (High Active) */
+#else
+GPIO_INT(AC_PRESENT,       PIN(7, 4), GPIO_INT_BOTH | GPIO_PULL_UP,   extpower_interrupt)
+GPIO_INT(POWER_BUTTON_L,   PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP,   power_button_interrupt)
+GPIO_INT(LID_OPEN,         PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_DOWN, lid_interrupt)
+#endif
+
+/* Pins for SPI/FAN/LPC modules testing */
+GPIO(ENTERING_RW,          PIN(3, 6), GPIO_OUT_LOW )
+GPIO(PCH_WAKE_L,           PIN(5, 0), GPIO_OUT_HIGH)
+GPIO(PGOOD_FAN,            PIN(C, 7), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(SPI_CS_L,             PIN(A, 5), GPIO_OUT_HIGH)
+
+/* Pins for I2C module testing */
+GPIO(I2C0_SCL0,            PIN(B, 5), GPIO_ODR_HIGH)
+GPIO(I2C0_SDA0,            PIN(B, 4), GPIO_ODR_HIGH)
+GPIO(I2C1_SCL0,            PIN(9, 0), GPIO_ODR_HIGH)
+GPIO(I2C1_SDA0,            PIN(8, 7), GPIO_ODR_HIGH)
+GPIO(I2C2_SCL0,            PIN(9, 2), GPIO_ODR_HIGH)
+GPIO(I2C2_SDA0,            PIN(9, 1), GPIO_ODR_HIGH)
+GPIO(I2C3_SCL0,            PIN(D, 1), GPIO_ODR_HIGH)
+GPIO(I2C3_SDA0,            PIN(D, 0), GPIO_ODR_HIGH)
+GPIO(I2C7_SDA0,            PIN(B, 2), GPIO_ODR_HIGH)
+GPIO(I2C7_SCL0,            PIN(B, 3), GPIO_ODR_HIGH)
+
+/* Pins for board version command */
+GPIO(BOARD_VERSION1,       PIN(6, 4), GPIO_INPUT)
+GPIO(BOARD_VERSION2,       PIN(6, 5), GPIO_INPUT)
+GPIO(BOARD_VERSION3,       PIN(6, 6), GPIO_INPUT)
+
+/*********************** Alternate pins for npcx7 series **********************/
+/* UART Tx/Rx */
+#if NPCX_UART_MODULE2
+ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, 0) /* CR_SIN/SOUT  GPIO64/65 */
+#else
+ALTERNATE(PIN_MASK(1, 0x03), 1, MODULE_UART, 0) /* CR_SIN/SOUT  GPIO10/11 */
+#endif
+
+/* ADC */
+ALTERNATE(PIN_MASK(4, 0x3E), 1, MODULE_ADC, 0) /* ADC0/1/2/3/4 GPIO45/44/43/42/41 */
+
+/* SPI */
+ALTERNATE(PIN_MASK(A, 0x0A), 1, MODULE_SPI, 0) /* SPIP_MOSI/SPIP_SCLK GPIOA3/A1 */
+ALTERNATE(PIN_MASK(9, 0x20), 1, MODULE_SPI, 0) /* SPIP_MISO           GPIO95    */
+
+/* PWM */
+ALTERNATE(PIN_MASK(C, 0x10), 1, MODULE_PWM, 0) /* PWM2 for KBLIGHT Test - GPIOC4 */
+
+/* Fan (Tachometer) */
+#ifdef CONFIG_FANS
+ALTERNATE(PIN_MASK(C, 0x08), 1, MODULE_PWM, 0) /* PWM0 for FAN Test - GPIOC3    */
+#if NPCX_TACH_SEL2
+ALTERNATE(PIN_MASK(9, 0x08), 1, MODULE_PWM, 0) /* TA1_SL1 for FAN Test - GPIO93 */
+#else
+ALTERNATE(PIN_MASK(4, 0x01), 1, MODULE_PWM, 0) /* TA1_SL2 for FAN Test - GPIO40 */
+#endif
+#endif
+
+/* I2C Ports */
+ALTERNATE(PIN_MASK(B, 0x30), 1, MODULE_I2C, 0) /* I2C0SDA0/SCL0          GPIOB4/B5    */
+ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* I2C1SDA0               GPIO87       */
+ALTERNATE(PIN_MASK(9, 0x07), 1, MODULE_I2C, 0) /* I2C1SCL0/I2C2SDA0/SCL0 GPIO90/91/92 */
+ALTERNATE(PIN_MASK(D, 0x03), 1, MODULE_I2C, 0) /* I2C3SDA0/SCL0          GPIOD0/D1    */
+ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, 0) /* I2C7SDA0/SCL0          GPIOB2/B3    */
+
+/* Keyboard Columns */
+ALTERNATE(PIN_MASK(0, 0xE0), 0, MODULE_KEYBOARD_SCAN, 0)
+ALTERNATE(PIN_MASK(1, 0xFF), 0, MODULE_KEYBOARD_SCAN, 0)
+ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, 0)
+
+/* Keyboard Rows */
+ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, 0)
+ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, 0)
+
+/* PSL for hibernating */
+#ifdef CONFIG_HIBERNATE_PSL
+ALTERNATE(PIN_MASK(D, 0x04), 1,  MODULE_PMU, 0) /* PSL_IN1     GPIOD2 */
+ALTERNATE(PIN_MASK(0, 0x07), 1,  MODULE_PMU, 0) /* PSL_IN2/3/4 GPIO00/01/02 */
+#endif
diff --git a/board/npcx_evb/board.c b/board/npcx_evb/board.c
index cca0692a85..9a185ada2f 100644
--- a/board/npcx_evb/board.c
+++ b/board/npcx_evb/board.c
@@ -80,7 +80,7 @@ const struct fan_t fans[] = {
 BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT);
 
 /******************************************************************************/
-/* MFT channels. These are logically separate from mft_channels. */
+/* MFT channels. These are logically separate from pwm_channels. */
 const struct mft_t mft_channels[] = {
 	[MFT_CH_0] = { NPCX_MFT_MODULE_1, TCKC_LFCLK, PWM_CH_FAN},
 #if (CONFIG_FANS == 2)
diff --git a/board/npcx_evb/build.mk b/board/npcx_evb/build.mk
index a5be8dc055..786afd9d94 100644
--- a/board/npcx_evb/build.mk
+++ b/board/npcx_evb/build.mk
@@ -6,8 +6,10 @@
 # Board specific files build
 #
 
-# the IC is Nuvoton M-Series EC (npcx5m5g, npcx5m6g)
+# the IC is Nuvoton NPCX5 M-Series EC (npcx5m5g, npcx5m6g)
+
 CHIP:=npcx
+CHIP_FAMILY:=npcx5
 CHIP_VARIANT:=npcx5m5g
 
 board-y=board.o
diff --git a/board/npcx_evb_arm/board.c b/board/npcx_evb_arm/board.c
index b5a82c3ba9..9e3ae7d0dd 100644
--- a/board/npcx_evb_arm/board.c
+++ b/board/npcx_evb_arm/board.c
@@ -66,7 +66,7 @@ const struct fan_t fans[] = {
 BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT);
 
 /******************************************************************************/
-/* MFT channels. These are logically separate from mft_channels. */
+/* MFT channels. These are logically separate from pwm_channels. */
 const struct mft_t mft_channels[] = {
 	[MFT_CH_0] = { NPCX_MFT_MODULE_1, TCKC_LFCLK, PWM_CH_FAN},
 };
diff --git a/board/npcx_evb_arm/build.mk b/board/npcx_evb_arm/build.mk
index 9d848171c2..48116c5454 100644
--- a/board/npcx_evb_arm/build.mk
+++ b/board/npcx_evb_arm/build.mk
@@ -6,8 +6,10 @@
 # Board specific files build
 #
 
-# the IC is Nuvoton M-Series EC (npcx5m5g, npcx5m6g)
+# the IC is Nuvoton NPCX5 M-Series EC (npcx5m5g, npcx5m6g)
+
 CHIP:=npcx
+CHIP_FAMILY:=npcx5
 CHIP_VARIANT:=npcx5m5g
 
 board-y=board.o
diff --git a/util/flash_ec b/util/flash_ec
index b8b3470e19..4a75ba0db6 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -104,6 +104,10 @@ BOARDS_NPCX_5M5G_JTAG=(
 BOARDS_NPCX_5M6G_JTAG=(
 )
 
+BOARDS_NPCX_7M6X_JTAG=(
+	npcx7_evb
+)
+
 BOARDS_NPCX_SPI=(
 	coral
 	eve
@@ -204,6 +208,8 @@ elif $(in_array "${BOARDS_NPCX_5M5G_JTAG[@]}" "${BOARD}"); then
 	CHIP="npcx_5m5g_jtag"
 elif $(in_array "${BOARDS_NPCX_5M6G_JTAG[@]}" "${BOARD}"); then
 	CHIP="npcx_5m6g_jtag"
+elif $(in_array "${BOARDS_NPCX_7M6X_JTAG[@]}" "${BOARD}"); then
+	CHIP="npcx_7m6x_jtag"
 elif $(in_array "${BOARDS_NPCX_SPI[@]}" "${BOARD}"); then
 	CHIP="npcx_spi"
 elif $(in_array "${BOARDS_NRF51[@]}" "${BOARD}"); then
@@ -671,6 +677,10 @@ function flash_npcx_5m6g_jtag() {
 	flash_npcx_jtag
 }
 
+function flash_npcx_7m6x_jtag() {
+	flash_npcx_jtag
+}
+
 function flash_npcx_spi() {
 	flash_flashrom
 }
diff --git a/util/openocd/npcx.cfg b/util/openocd/npcx.cfg
index 42b04dcd3d..b32f62b363 100644
--- a/util/openocd/npcx.cfg
+++ b/util/openocd/npcx.cfg
@@ -48,8 +48,8 @@ adapter_khz 100
 adapter_nsrst_delay 100
 jtag_ntrst_delay 100
 
-# use srst to perform a system reset
-cortex_m reset_config srst
+# use sysresetreq to perform a system reset
+cortex_m reset_config sysresetreq
 
 #reset configuration
 reset_config trst_and_srst
diff --git a/util/openocd/npcx_cmds.tcl b/util/openocd/npcx_cmds.tcl
index 579aa3834e..ca44343084 100644
--- a/util/openocd/npcx_cmds.tcl
+++ b/util/openocd/npcx_cmds.tcl
@@ -71,6 +71,17 @@ proc flash_npcx5m6g {image_path image_offset spifw_image} {
 	echo "*** Finish program npcx5m6g ***\r\n"
 }
 
+proc flash_npcx7m6x {image_path image_offset spifw_image} {
+	# 192 KB for RO & RW regions
+	set fw_size   0x30000
+	# Code RAM start address
+	set cram_addr 0x10090000
+
+	echo "*** Start to program npcx7m6f/g/k with $image_path ***"
+	flash_npcx $image_path $cram_addr $image_offset $fw_size $spifw_image
+	echo "*** Finish program npcx7m6f/g/k ***\r\n"
+}
+
 proc flash_npcx_ro {chip_name image_dir image_offset} {
 	set MPU_RNR  0xE000ED98;
 	set MPU_RASR 0xE000EDA0;
@@ -92,6 +103,9 @@ proc flash_npcx_ro {chip_name image_dir image_offset} {
 	} elseif {$chip_name == "npcx_5m6g_jtag"} {
 		# program RO region
 		flash_npcx5m6g $ro_image_path $image_offset $spifw_image
+	} elseif {$chip_name == "npcx_7m6x_jtag"} {
+		# program RO region
+		flash_npcx7m6x $ro_image_path $image_offset $spifw_image
 	} else {
 		echo $chip_name "no supported."
 	}
@@ -121,12 +135,19 @@ proc flash_npcx_all {chip_name image_dir image_offset} {
 		# program RW region
 		flash_npcx5m5g $rw_image_path $rw_image_offset $spifw_image
 	} elseif {$chip_name == "npcx_5m6g_jtag"} {
-		# RW images offset - 512 KB
+		# RW images offset - 256 KB
 		set rw_image_offset  [expr ($image_offset + 0x40000)]
 		# program RO region
 		flash_npcx5m6g $ro_image_path $image_offset $spifw_image
 		# program RW region
 		flash_npcx5m6g $rw_image_path $rw_image_offset $spifw_image
+	} elseif {$chip_name == "npcx_7m6x_jtag"} {
+		# RW images offset - 256 KB
+		set rw_image_offset  [expr ($image_offset + 0x40000)]
+		# program RO region
+		flash_npcx7m6x $ro_image_path $image_offset $spifw_image
+		# program RW region
+		flash_npcx7m6x $rw_image_path $rw_image_offset $spifw_image
 	} else {
 		echo $chip_name "no supported."
 	}