From 43a04f67d05d275d8e3927697965311eabe9357c Mon Sep 17 00:00:00 2001 From: Yuval Peress Date: Fri, 29 Jan 2021 10:06:04 -0700 Subject: zephyr: kohaku: Update build for flash The build for Kohaku needed to add the include/drivers directory so that system calls can be generated (this mirrors volteer). Additionally, since kohaku isn't upstreamed, it needed the CONFIG_FLASH_SIZE value. BRANCH=none BUG=b:176828988, b:174481378 TEST=zmake testall Signed-off-by: Yuval Peress Change-Id: I19989e85e22360e12c0dc0ee29b6769673023a22 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2659679 Reviewed-by: Jack Rosenthal --- zephyr/projects/kohaku/CMakeLists.txt | 10 ++++++++++ zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig | 1 + 2 files changed, 11 insertions(+) diff --git a/zephyr/projects/kohaku/CMakeLists.txt b/zephyr/projects/kohaku/CMakeLists.txt index a9dc7e910b..338e936f46 100644 --- a/zephyr/projects/kohaku/CMakeLists.txt +++ b/zephyr/projects/kohaku/CMakeLists.txt @@ -3,6 +3,16 @@ # found in the LICENSE file. cmake_minimum_required(VERSION 3.13.1) + +# Append ${PLATFORM_EC}/zephyr/include/drivers to SYSCALL_INCLUDE_DIRS +# variable for generating __syscall api functions by the +# `gen_syscalls.py` script. +# TODO: remove this when zmake support +list(APPEND + SYSCALL_INCLUDE_DIRS + "${CMAKE_CURRENT_LIST_DIR}/../../include/drivers" +) + find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(kohaku) diff --git a/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig b/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig index e68cb4b616..0c4fb93bf9 100644 --- a/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig +++ b/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig @@ -42,6 +42,7 @@ CONFIG_CROS_EC_RAM_BASE=0x200c0000 CONFIG_CROS_EC_DATA_RAM_SIZE=0x00010000 CONFIG_CROS_EC_RAM_SIZE=0x0000f800 +CONFIG_FLASH_SIZE=512 CONFIG_CROS_EC_RO_MEM_OFF=0x0 # (44*1024) CONFIG_CROS_EC_RO_SIZE=0x30000 -- cgit v1.2.1