Skip to content

Commit

Permalink
[slc] move slc folder to third_party/silabs/ to maintain Silabs l…
Browse files Browse the repository at this point in the history
…icensing (#913)
  • Loading branch information
lmnotran authored Jul 16, 2024
1 parent 18ea060 commit 95d645f
Show file tree
Hide file tree
Showing 20 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ __pycache__

# slc-cli
?/
slc/slc_cli/
slc/**/*.zip
**/third_party/silabs/slc/slc_cli/
**/third_party/silabs/slc/**/*.zip

.cache
.toolchain
2 changes: 1 addition & 1 deletion ot-efr32.slce
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ sdk:
id: gecko_sdk
version: 4.4.0
component_path:
- path: slc/component
- path: third_party/silabs/slc/component
6 changes: 3 additions & 3 deletions script/build
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ generate()
echo "========================================================================================================="
set -x
"${repo_dir}/script/generate" \
"${repo_dir}/slc/platform_projects/openthread-efr32-soc.slcp" \
"${repo_dir}/third_party/silabs/slc/platform_projects/openthread-efr32-soc.slcp" \
"${slc_generated_projects_dir}/soc" \
"${board}"
fi
Expand All @@ -121,7 +121,7 @@ generate()
echo "========================================================================================================="
set -x
"${repo_dir}/script/generate" \
"${repo_dir}/slc/platform_projects/openthread-efr32-rcp-uart.slcp" \
"${repo_dir}/third_party/silabs/slc/platform_projects/openthread-efr32-rcp-uart.slcp" \
"${slc_generated_projects_dir}/rcp_uart" \
"${board}"
fi
Expand All @@ -132,7 +132,7 @@ generate()
echo "========================================================================================================="
set -x
"${repo_dir}/script/generate" \
"${repo_dir}/slc/platform_projects/openthread-efr32-rcp-spi.slcp" \
"${repo_dir}/third_party/silabs/slc/platform_projects/openthread-efr32-rcp-spi.slcp" \
"${slc_generated_projects_dir}/rcp_spi" \
"${board}"
fi
Expand Down
6 changes: 3 additions & 3 deletions script/build_example_apps
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ get_associated_slcp()

case "${cmake_executable}" in
sleepy-demo-ftd)
echo "${repo_dir}/slc/platform_projects/openthread-efr32-soc-with-buttons.slcp"
echo "${repo_dir}/third_party/silabs/slc/platform_projects/openthread-efr32-soc-with-buttons.slcp"
;;
sleepy-demo-mtd)
echo "${repo_dir}/slc/platform_projects/openthread-efr32-soc-with-buttons-power-manager.slcp"
echo "${repo_dir}/third_party/silabs/slc/platform_projects/openthread-efr32-soc-with-buttons-power-manager.slcp"
;;
sleepy-demo-ssed)
echo "${repo_dir}/slc/platform_projects/openthread-efr32-soc-with-buttons-power-manager-csl.slcp"
echo "${repo_dir}/third_party/silabs/slc/platform_projects/openthread-efr32-soc-with-buttons-power-manager-csl.slcp"
;;
*)
die "Unknown CMake executable: ${cmake_executable}"
Expand Down
4 changes: 2 additions & 2 deletions script/generate
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ generate()
project_name="${project_line//project_name:/}"
project_name="${project_name// /}"
local generation_dir=${2?A generation output dir is expected as the second argument}
local export_templates="${repo_dir}/slc/exporter_templates/platform_library"
local export_templates="${repo_dir}/third_party/silabs/slc/exporter_templates/platform_library"
local board=${3?A board is expected as the third argument}
local build_dir=${OT_CMAKE_BUILD_DIR-"${repo_dir}/build/${board}"}
local openthread_slc_data=${openthread_slc_data-"${build_dir}/slc/openthread_slc.data"}
Expand All @@ -202,7 +202,7 @@ generate()

trust_sdk_and_extensions

local yaml_export_templates="${repo_dir}/slc/exporter_templates/yaml"
local yaml_export_templates="${repo_dir}/third_party/silabs/slc/exporter_templates/yaml"
set +x
echo
echo
Expand Down
2 changes: 1 addition & 1 deletion script/generate_cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def f(flag: str) -> bool:
script_dir: Path = Path(os.path.dirname(os.path.abspath(__file__)))
repo_root: Path = script_dir.parent
environment = jinja2.Environment(
loader=jinja2.FileSystemLoader(f"{repo_root}/slc/exporter_templates/platform_library"))
loader=jinja2.FileSystemLoader(f"{repo_root}/third_party/silabs/slc/exporter_templates/platform_library"))
platform_lib_template: jinja2.Template = environment.get_template("CMakeLists.txt.jinja")
mbedtls_lib_template: jinja2.Template = environment.get_template("mbedtls.cmake.jinja")

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 95d645f

Please sign in to comment.