diff options
| -rw-r--r-- | zephyr/test/skyrim/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | zephyr/test/skyrim/Kconfig | 7 | ||||
| -rw-r--r-- | zephyr/test/skyrim/tests/common/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | zephyr/test/skyrim/tests/common/src/fan.c (renamed from zephyr/test/skyrim/src/common/fan.c) | 0 |
4 files changed, 11 insertions, 5 deletions
diff --git a/zephyr/test/skyrim/CMakeLists.txt b/zephyr/test/skyrim/CMakeLists.txt index c4c53ca855..3a6c866a7b 100644 --- a/zephyr/test/skyrim/CMakeLists.txt +++ b/zephyr/test/skyrim/CMakeLists.txt @@ -16,5 +16,4 @@ add_subdirectory_ifdef(CONFIG_TEST_BOARD_WINTERHOLD tests/winterhold) target_sources(app PRIVATE src/${CONFIG_TEST_BOARD_NAME}/common.c) -target_sources_ifdef(CONFIG_TEST_BOARD_FAN app PRIVATE src/${CONFIG_TEST_BOARD_FAN_SRC} ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/fan.c) target_sources_ifdef(CONFIG_TEST_BOARD_USB_MUX_CONFIG app PRIVATE src/${TEST_BOARD_USB_MUX_CONFIG_SRC} ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/usb_mux_config.c) diff --git a/zephyr/test/skyrim/Kconfig b/zephyr/test/skyrim/Kconfig index f4c830d7a2..b96d5ce05b 100644 --- a/zephyr/test/skyrim/Kconfig +++ b/zephyr/test/skyrim/Kconfig @@ -58,10 +58,9 @@ config TEST_BOARD_ALT_CHARGER_CUSTOM config TEST_BOARD_FAN bool "Enable fan tests" -config TEST_BOARD_FAN_SRC - string "Source file to use for this test" - default "common/fan.c" - depends on TEST_BOARD_FAN +config TEST_BOARD_FAN_CUSTOM + bool "ENable fan tests with a variant-specific test file" + select TEST_BOARD_FAN config TEST_BOARD_USB_PD_POLICY bool "Enable USB PD policy specific tests" diff --git a/zephyr/test/skyrim/tests/common/CMakeLists.txt b/zephyr/test/skyrim/tests/common/CMakeLists.txt index 52f21d1ec2..efe8703fe1 100644 --- a/zephyr/test/skyrim/tests/common/CMakeLists.txt +++ b/zephyr/test/skyrim/tests/common/CMakeLists.txt @@ -12,6 +12,14 @@ if (DEFINED CONFIG_TEST_BOARD_ALT_CHARGER) endif() endif() +# Fan +if (DEFINED CONFIG_TEST_BOARD_FAN) + target_sources(app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/fan.c) + if (NOT DEFINED CONFIG_TEST_BOARD_FAN_CUSTOM) + target_sources(app PRIVATE src/fan.c) + endif() +endif() + # PPC config if (DEFINED CONFIG_TEST_BOARD_PPC_CONFIG) target_sources(app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/ppc_config.c) diff --git a/zephyr/test/skyrim/src/common/fan.c b/zephyr/test/skyrim/tests/common/src/fan.c index 4968938298..4968938298 100644 --- a/zephyr/test/skyrim/src/common/fan.c +++ b/zephyr/test/skyrim/tests/common/src/fan.c |