[Telink] use just out folder

project-chip · Sep 14, 2023 · 8ac0682 · 8ac0682
1 parent 608807c
commit 8ac0682
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -107,8 +107,7 @@ jobs:
                   ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux
                   ./scripts/build/gn_gen.sh
                   ./scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE chip-cert chip-tool spake2p"
-                  mkdir ./out/tools
-                  mv ./out/$BUILD_TYPE/chip-cert ./out/$BUILD_TYPE/chip-tool ./out/$BUILD_TYPE/spake2p ./out/tools
+                  mv ./out/$BUILD_TYPE/chip-cert ./out/$BUILD_TYPE/chip-tool ./out/$BUILD_TYPE/spake2p ./out
 
             - name: clean out build output (keep tools)
               run: rm -rf ./out/telink*

diff --git a/config/telink/chip-module/generate_factory_data.cmake b/config/telink/chip-module/generate_factory_data.cmake
@@ -69,7 +69,7 @@ else()
 endif()
 
 # find chip cert tool
-find_program(chip_cert_exe NAMES chip-cert PATHS ${CHIP_ROOT}/out/tools REQUIRED)
+find_program(chip_cert_exe NAMES chip-cert PATHS ${CHIP_ROOT}/out REQUIRED)
 string(APPEND script_args "--chip-cert-path ${chip_cert_exe}\n")
 
 # for development purpose user can use default certs instead of generating or providing them
@@ -99,7 +99,7 @@ else()
 endif()
 
 # find chip tool requied for generating QRCode
-find_program(chip_tool_exe NAMES chip-tool PATHS ${CHIP_ROOT}/out/tools REQUIRED)
+find_program(chip_tool_exe NAMES chip-tool PATHS ${CHIP_ROOT}/out REQUIRED)
 string(APPEND script_args "--chip-tool-path ${chip_tool_exe}\n")
 
 # add Password-Authenticated Key Exchange parameters
@@ -108,7 +108,7 @@ string(APPEND script_args "--discriminator ${CONFIG_CHIP_DEVICE_DISCRIMINATOR}\n
 string(APPEND script_args "--passcode ${CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE}\n")
 
 # request spake2p to generate a new spake2_verifier
-find_program(spake_exe NAMES spake2p PATHS ${CHIP_ROOT}/out/tools REQUIRED)
+find_program(spake_exe NAMES spake2p PATHS ${CHIP_ROOT}/out REQUIRED)
 string(APPEND script_args "--spake2-path ${spake_exe}\n")
 
 if(CONFIG_CHIP_DEVICE_ENABLE_KEY)