diff options
| author | Sam Hurst <shurst@google.com> | 2021-05-10 17:56:06 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-11 23:01:43 +0000 |
| commit | 868d67e6eb73e26e19dd80495ab81981a74287af (patch) | |
| tree | 10b99f6ee471bc970193491730277a9183d0d11a | |
| parent | 0574818bfb2b61051f28d8a6a30c76b502882250 (diff) | |
| download | chrome-ec-868d67e6eb73e26e19dd80495ab81981a74287af.tar.gz | |
zephyr: lazor: Use correct Nuvoton EC Variant
Change Zephyr Lazor Nuvoton EC variant from npcx7m7fc
to npcx7m6fc.
BRANCH=none
BUG=b:187337449
TEST=Verified that sysjump from EC_RO to ZEPHER_RW worked.
Signed-off-by: Sam Hurst <shurst@google.com>
Change-Id: Ib49e5e6e5e45dd8d898ca559a897de7fedc24ced
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2885726
Reviewed-by: Wai-Hong Tam <waihong@google.com>
3 files changed, 4 insertions, 10 deletions
diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/board.cmake b/zephyr/projects/trogdor/boards/arm/trogdor/board.cmake index 5c02f2707f..3ce47418ca 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/board.cmake +++ b/zephyr/projects/trogdor/boards/arm/trogdor/board.cmake @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -set(ECST_CHIP_ARG npcx7m7) +set(ECST_CHIP_ARG npcx7m6) diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts index 39ae06d7e6..b329014360 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts @@ -195,12 +195,6 @@ pinctrl-0 = <>; }; }; - - /* Update flash size to 512KB from 196KB since we are using C variant */ - /delete-node/ flash@10090000; - flash0: flash@10070000 { - reg = <0x10070000 0x40000>; - }; }; &uart1 { diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig index fa7a688057..2fadd1f951 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig @@ -35,7 +35,7 @@ CONFIG_CLOCK_NPCX_APB3_PRESCALER=6 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=15000000 # Code RAM base for NPCX797FC -CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x10070000 +CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x10090000 CONFIG_CROS_EC_RAM_BASE=0x200c0000 CONFIG_CROS_EC_DATA_RAM_SIZE=0x00010000 CONFIG_CROS_EC_RAM_SIZE=0x0000f800 @@ -47,12 +47,12 @@ CONFIG_PLATFORM_EC_ADC_OVERSAMPLING=0 CONFIG_FLASH_SIZE=512 CONFIG_CROS_EC_RO_MEM_OFF=0x0 -CONFIG_CROS_EC_RO_SIZE=0x40000 +CONFIG_CROS_EC_RO_SIZE=0x30000 # (CONFIG_CROS_EC_RO_MEM_OFF + CONFIG_CROS_EC_RO_SIZE) CONFIG_CROS_EC_RW_MEM_OFF=0x0 # (CONFIG_CROS_EC_FLASH_SIZE - CONFIG_CROS_EC_RW_MEM_OFF - # CONFIG_CROS_EC_RO_MEM_OFF) -CONFIG_CROS_EC_RW_SIZE=0x40000 +CONFIG_CROS_EC_RW_SIZE=0x30000 # WATCHDOG configuration CONFIG_WATCHDOG=y |