diff options
| author | Keith Short <keithshort@chromium.org> | 2022-10-28 11:38:13 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-04 19:09:57 +0000 |
| commit | bfb09dd789ef4eedcc213abe0aacb2646874626b (patch) | |
| tree | 956647b7cdce0e14c4601cf7fa6a37a080925d97 | |
| parent | 366174d656fbc6d853f8d31e0751c35bff5aeaaf (diff) | |
| download | chrome-ec-bfb09dd789ef4eedcc213abe0aacb2646874626b.tar.gz | |
zephyr: Create CMake variable for the program directory
Many board tests need a path to the board specific sources. Add
PROGRAM_EC_PROGRAM_DIR as a helper variable
BUG=b:254097139
BRANCH=none
TEST=twister -v -i -c
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I71a7c555101fff3ba6158962cd333da642562b24
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4000782
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | zephyr/test/herobrine/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | zephyr/test/kingler/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | zephyr/test/krabby/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | zephyr/test/rex/CMakeLists.txt | 4 |
5 files changed, 15 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b2f3525fe..e4d48e00b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,9 @@ endif() set(PLATFORM_EC "${ZEPHYR_CURRENT_MODULE_DIR}" CACHE PATH "Path to the platform/ec repo.") +set(PLATFORM_EC_PROGRAM_DIR "${PLATFORM_EC}/zephyr/projects" CACHE PATH + "Path to the root directory containing all Zephyr EC programs and projects.") + if(NOT EXISTS "${PLATFORM_EC}/zephyr/module.yml") message(FATAL_ERROR "Failed to resolve PLATFORM_EC at ${PLATFORM_EC}/zephyr/module.yml") diff --git a/zephyr/test/herobrine/CMakeLists.txt b/zephyr/test/herobrine/CMakeLists.txt index 800762ed8e..17b3d973a1 100644 --- a/zephyr/test/herobrine/CMakeLists.txt +++ b/zephyr/test/herobrine/CMakeLists.txt @@ -6,9 +6,9 @@ cmake_minimum_required(VERSION 3.13.1) find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") project(herobrine) -zephyr_include_directories("${PLATFORM_EC}/zephyr/projects/herobrine/include") +zephyr_include_directories("${PLATFORM_EC_PROGRAM_DIR}/herobrine/include") target_sources_ifdef(CONFIG_TEST_BOARD_CHIPSET app PRIVATE src/board_chipset.c) target_sources_ifdef(CONFIG_TEST_BOARD_CHIPSET - app PRIVATE ${PLATFORM_EC}/zephyr/projects/herobrine/src/board_chipset.c) + app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/herobrine/src/board_chipset.c) diff --git a/zephyr/test/kingler/CMakeLists.txt b/zephyr/test/kingler/CMakeLists.txt index 4a30d06a61..725831d2db 100644 --- a/zephyr/test/kingler/CMakeLists.txt +++ b/zephyr/test/kingler/CMakeLists.txt @@ -8,18 +8,18 @@ project(kingler) add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils) -zephyr_include_directories("${PLATFORM_EC}/zephyr/projects/corsola/include") +zephyr_include_directories("${PLATFORM_EC_PROGRAM_DIR}/corsola/include") target_sources(app PRIVATE src/fakes.c) target_sources_ifdef(CONFIG_TEST_STEELIX_RUSTY -app PRIVATE ${PLATFORM_EC}/zephyr/projects/corsola/src/kingler/board_steelix.c) +app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/corsola/src/kingler/board_steelix.c) target_sources_ifdef(CONFIG_TEST_FORM_FACTOR_CONVERTIBLE app PRIVATE src/tablet.c) target_sources_ifdef(CONFIG_TEST_FORM_FACTOR_CLAMSHELL app PRIVATE src/clamshell.c) target_sources_ifdef(CONFIG_VARIANT_CORSOLA_DB_DETECTION -app PRIVATE ${PLATFORM_EC}/zephyr/projects/corsola/src/variant_db_detection.c) +app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/corsola/src/variant_db_detection.c) target_sources_ifdef(CONFIG_TEST_DB_DETECT_TYPEC app PRIVATE src/db_detect_typec.c) target_sources_ifdef(CONFIG_TEST_DB_DETECT_HDMI @@ -32,4 +32,4 @@ target_sources_ifdef(CONFIG_TEST_DB_DETECT_NONE target_sources_ifdef(CONFIG_TEST_ALT_SENSOR_PROBE app PRIVATE src/alt_sensor.c) target_sources_ifdef(CONFIG_TEST_KINGLER_CCD -app PRIVATE src/ccd.c ${PLATFORM_EC}/zephyr/projects/corsola/src/board.c) +app PRIVATE src/ccd.c ${PLATFORM_EC_PROGRAM_DIR}/corsola/src/board.c) diff --git a/zephyr/test/krabby/CMakeLists.txt b/zephyr/test/krabby/CMakeLists.txt index bb96633d5b..ce13e9520a 100644 --- a/zephyr/test/krabby/CMakeLists.txt +++ b/zephyr/test/krabby/CMakeLists.txt @@ -8,19 +8,19 @@ project(krabby) add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils) -zephyr_include_directories("${PLATFORM_EC}/zephyr/projects/corsola/include") +zephyr_include_directories("${PLATFORM_EC_PROGRAM_DIR}/corsola/include") target_sources(app PRIVATE src/stubs.c - ${PLATFORM_EC}/zephyr/projects/corsola/src/krabby/usbc_config.c) + ${PLATFORM_EC_PROGRAM_DIR}/corsola/src/krabby/usbc_config.c) target_sources_ifdef(CONFIG_TEST_KRABBY app PRIVATE src/charger_workaround.c src/usb_mux_init.c - ${PLATFORM_EC}/zephyr/projects/corsola/src/krabby/charger_workaround.c) + ${PLATFORM_EC_PROGRAM_DIR}/corsola/src/krabby/charger_workaround.c) target_sources_ifdef(CONFIG_TEST_TENTACRUEL app PRIVATE src/temp_tentacruel.c - ${PLATFORM_EC}/zephyr/projects/corsola/src/krabby/temp_tentacruel.c) + ${PLATFORM_EC_PROGRAM_DIR}/corsola/src/krabby/temp_tentacruel.c) diff --git a/zephyr/test/rex/CMakeLists.txt b/zephyr/test/rex/CMakeLists.txt index 89d646a747..ddee5d0120 100644 --- a/zephyr/test/rex/CMakeLists.txt +++ b/zephyr/test/rex/CMakeLists.txt @@ -6,9 +6,9 @@ cmake_minimum_required(VERSION 3.13.1) find_package(Zephyr REQUIRED HINTS "${ZEPHYR_BASE}") project(rex) -zephyr_include_directories("${PLATFORM_EC}/zephyr/projects/rex/include") +zephyr_include_directories("${PLATFORM_EC_PROGRAM_DIR}/rex/include") add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils) target_sources_ifdef(CONFIG_TEST_USB_PD_POLICY app PRIVATE src/usb_pd_policy.c) -target_sources_ifdef(CONFIG_TEST_USB_PD_POLICY app PRIVATE ${PLATFORM_EC}/zephyr/projects/rex/src/usb_pd_policy.c) +target_sources_ifdef(CONFIG_TEST_USB_PD_POLICY app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/rex/src/usb_pd_policy.c) |