zephyr: Enable link time optimization for board files

Move the baseboard and board files into the zephyr_ec library to take
advantage of the LTO compiler option enabled for the zephyr_ec library.

On Volteer, this reduces the image size by 832 bytes. Total LTO saving
is just over 10,000 bytes.

BUG=none
BRANCH=none
TEST=zmake testall
TEST=boot zephry-ec on Volteer, verify AP boots

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I2f3aa7f6c400a5b5cd1b346fcf52160b834e66a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2776218
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>

4 files changed, 22 insertions, 23 deletions

diff --git a/zephyr/projects/delbin/CMakeLists.txt b/zephyr/projects/delbin/CMakeLists.txt
index 059ab77018..0303ee7c62 100644
--- a/zephyr/projects/delbin/CMakeLists.txt
+++ b/zephyr/projects/delbin/CMakeLists.txt
@@ -13,13 +13,11 @@ set(PLATFORM_EC_BASEBOARD "${PLATFORM_EC}/baseboard/volteer" CACHE PATH
   "Path to the platform/ec baseboard directory")
 
 # Include board specific header files
-zephyr_include_directories(
+zephyr_library_include_directories(
   include
   "${PLATFORM_EC_BASEBOARD}"
   "${PLATFORM_EC_BOARD}")
 
 # Include selected EC source for the baseboard
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ
   "${PLATFORM_EC_BASEBOARD}/power.c")
-
-zephyr_include_directories(include)
diff --git a/zephyr/projects/kohaku/CMakeLists.txt b/zephyr/projects/kohaku/CMakeLists.txt
index 8d618ef6b2..5a8c045731 100644
--- a/zephyr/projects/kohaku/CMakeLists.txt
+++ b/zephyr/projects/kohaku/CMakeLists.txt
@@ -7,4 +7,4 @@ cmake_minimum_required(VERSION 3.13.1)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(kohaku)
 
-zephyr_include_directories(include)
+zephyr_library_include_directories(include)
diff --git a/zephyr/projects/trogdor/lazor/CMakeLists.txt b/zephyr/projects/trogdor/lazor/CMakeLists.txt
index 37d42dab52..030e92ed58 100644
--- a/zephyr/projects/trogdor/lazor/CMakeLists.txt
+++ b/zephyr/projects/trogdor/lazor/CMakeLists.txt
@@ -9,18 +9,18 @@ set(BOARD_ROOT "${CMAKE_CURRENT_LIST_DIR}/..")
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(lazor)
 
-zephyr_include_directories(include)
+zephyr_library_include_directories(include)
 
 set(PLATFORM_EC_BASEBOARD "${PLATFORM_EC}/baseboard/trogdor" CACHE PATH
     "Path to the platform/ec baseboard directory")
 set(PLATFORM_EC_BOARD "${PLATFORM_EC}/board/lazor" CACHE PATH
   "Path to the platform/ec board directory")
 
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
   "${PLATFORM_EC_BASEBOARD}/usbc_config.c"
   "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c")
 
-zephyr_sources(
+zephyr_library_sources(
   "${PLATFORM_EC_BOARD}/battery.c"
   "${PLATFORM_EC_BOARD}/sku.c"
   "${PLATFORM_EC_BOARD}/switchcap.c"
diff --git a/zephyr/projects/volteer/CMakeLists.txt b/zephyr/projects/volteer/CMakeLists.txt
index 5736c8d0ee..7c8e8f24fc 100644
--- a/zephyr/projects/volteer/CMakeLists.txt
+++ b/zephyr/projects/volteer/CMakeLists.txt
@@ -16,37 +16,38 @@ set(PLATFORM_EC_BASEBOARD "${PLATFORM_EC}/baseboard/volteer" CACHE PATH
     "Path to the platform/ec baseboard directory")
 
 # Include board specific header files
-zephyr_include_directories(
+zephyr_library_include_directories(
   include
-  ${PLATFORM_EC_BASEBOARD}
-  ${PLATFORM_EC_BOARD})
+  "${PLATFORM_EC_BASEBOARD}"
+  "${PLATFORM_EC_BOARD}")
 
 # Include selected EC source for the baseboard
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
   "${PLATFORM_EC_BASEBOARD}/battery_presence.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_CHARGE_MANAGER
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGE_MANAGER
   "${PLATFORM_EC_BASEBOARD}/charger.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_CBI
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI
   "${PLATFORM_EC_BASEBOARD}/cbi.c"
   "${PLATFORM_EC_BASEBOARD}/cbi_ec_fw_config.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ
   "${PLATFORM_EC_BASEBOARD}/power.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_POWER_DELIVERY
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USB_POWER_DELIVERY
   "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
   "${PLATFORM_EC_BASEBOARD}/usbc_config.c")
 
 # Include selected EC source for the board
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
   "${PLATFORM_EC_BOARD}/battery.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_CBI
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI
   "${PLATFORM_EC_BOARD}/cbi.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD_BOARD_CONFIG
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD_BOARD_CONFIG
   "${PLATFORM_EC_BOARD}/keyboard.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
   "${PLATFORM_EC_BOARD}/led.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
   "${PLATFORM_EC_BOARD}/usbc_config.c")
 
 # Board specific sensor implementation
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_MOTIONSENSE "src/sensors.c")
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_MOTIONSENSE
+  "src/sensors.c")