diff options
| author | Keith Short <keithshort@chromium.org> | 2021-01-19 12:53:56 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-19 23:29:49 +0000 |
| commit | 50cfda251734eba69016e5a2535a023049c05e28 (patch) | |
| tree | a2b88b42fb6abf2066bb74098d8d3d45c1318503 | |
| parent | 04c39c214ef44d4e285ee16c75211ee67f3ba494 (diff) | |
| download | chrome-ec-50cfda251734eba69016e5a2535a023049c05e28.tar.gz | |
zephyr: Increase volteer image size
Change the Volteer part number to the NPCX797FC for Zephyr builds.
[226/231] Linking C executable zephyr/zephyr_prebuilt.elf
Memory region Used Size Region Size %age Used
FLASH: 172844 B 256 KB 65.93%
SRAM: 35104 B 64 KB 53.56%
IDT_LIST: 504 B 2 KB 24.61%
[231/231] Linking C executable zephyr/zephyr.elf
BUG=none
BRANCH=none
TEST=make buildall, zmake testall
TEST=Verify ELF file locates rom_start to 0x10070000 and boot zephyr on
Volteer
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I8e81c9e939b890112dd2530bfc20df36077848c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2638355
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
3 files changed, 15 insertions, 9 deletions
diff --git a/zephyr/projects/volteer/boards/arm/volteer/CMakeLists.txt b/zephyr/projects/volteer/boards/arm/volteer/CMakeLists.txt index acf50524d1..e1e03d8310 100644 --- a/zephyr/projects/volteer/boards/arm/volteer/CMakeLists.txt +++ b/zephyr/projects/volteer/boards/arm/volteer/CMakeLists.txt @@ -9,5 +9,5 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/boards/arm/npcx7m6fb_evb/support/ecst.py -i ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin -o ${TARGET_IMAGE_FILE} -nohcrc -nofcrc - -chip npcx7m6 -flashsize 8 -spimaxclk 50 -spireadmode dual + -chip npcx7m7 -flashsize 8 -spimaxclk 50 -spireadmode dual ) diff --git a/zephyr/projects/volteer/boards/arm/volteer/volteer.dts b/zephyr/projects/volteer/boards/arm/volteer/volteer.dts index fdcade2188..f09f5cae27 100644 --- a/zephyr/projects/volteer/boards/arm/volteer/volteer.dts +++ b/zephyr/projects/volteer/boards/arm/volteer/volteer.dts @@ -393,9 +393,13 @@ }; }; -/* Update flash size to 512KB from 196KB since we are using C variant */ +/* + * The NPCX loader copies our image from ROM to code RAM, so the flash + * node actually represents the code RAM location and size. + * Override the code RAM for the NPCX797FC. + */ &flash0 { - reg = <0x10090000 0x80000>; + reg = <0x10070000 0x40000>; }; &uart1 { diff --git a/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig b/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig index 39b5844395..84df5902a6 100644 --- a/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig +++ b/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig @@ -36,19 +36,21 @@ CONFIG_CORTEX_M_SYSTICK=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=15000000 # The following are valid for all: -# npcx7m6f, npcx7m6fb, npcx7m6fc, npcx7m6g -CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x10090000 +# Code RAM base for NPCX797FC +CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x10070000 CONFIG_CROS_EC_RAM_BASE=0x200c0000 CONFIG_CROS_EC_DATA_RAM_SIZE=0x00010000 CONFIG_CROS_EC_RAM_SIZE=0x0000f800 CONFIG_CROS_EC_RO_MEM_OFF=0x0 -# (44*1024) -CONFIG_CROS_EC_RO_SIZE=0x30000 +# Image size: MAX (1/2 Flash size, Code RAM size) +# For NPCX796FC: Flash = 512 KiB, Code Ram 192 KiB +# For NPCX797FC: Flash = 512 KiB, Code Ram 320 KiB +CONFIG_CROS_EC_RO_SIZE=0x40000 # (CONFIG_CROS_EC_RO_MEM_OFF + CONFIG_CROS_EC_RO_SIZE) -CONFIG_CROS_EC_RW_MEM_OFF=0x30000 +CONFIG_CROS_EC_RW_MEM_OFF=0x40000 # (CONFIG_CROS_EC_FLASH_SIZE - CONFIG_CROS_EC_RW_MEM_OFF - # CONFIG_CROS_EC_RO_MEM_OFF) -CONFIG_CROS_EC_RW_SIZE=0x30000 +CONFIG_CROS_EC_RW_SIZE=0x40000 CONFIG_SHIMMED_TASKS=y |