Skip to content

Commit 656adf4

Browse files
BujSetBujSet
committed
Addressing some of the PR ocmments
1 parent 105ea68 commit 656adf4

File tree

2 files changed

+55
-54
lines changed

2 files changed

+55
-54
lines changed

‎examples/arm/ethos-u-setup/arm-zephyr-eabi-gcc.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ set(CMAKE_C_COMPILER "arm-zephyr-eabi-gcc")
3030
set(CMAKE_CXX_COMPILER "arm-zephyr-eabi-g++")
3131
set(CMAKE_ASM_COMPILER "arm-zephyr-eabi-gcc")
3232
set(CMAKE_LINKER "arm-zephyr-eabi-ld")
33+
find_program(ARM_ZEPHYR_GCC arm-zephyr-eabi-gcc DOC "arm zephyr toolchain location")
34+
if(NOT ARM_ZEPHYR_GCC)
35+
message(FATAL_ERROR "Arm zephyr toolchain not found on PATH, please be sure to run `./examples/arm/setup.sh --i-agree-to-the-contained-eula --user-toolchain-url 'https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz' --user-toolchain-dir 'arm-zephyr-eabi'` followed by `source /home/zephyruser/executorch/examples/arm/ethos-u-scratch/setup_path.sh`")
36+
endif()
3337

3438
set(CMAKE_EXECUTABLE_SUFFIX ".elf")
3539
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)

‎tools/cmake/preset/zephyr.cmake‎

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,54 @@
55
# This source code is licensed under the BSD-style license found in the
66
# LICENSE file in the root directory of this source tree.
77

8-
set(CMAKE_CXX_STANDARD 17)
9-
set(CMAKE_SYSTEM_PROCESSOR cortex-m55)
10-
set(CMAKE_BUILD_TYPE Release)
11-
set(PYTHON_EXECUTABLE /home/zephyruser/executorch/.venv/bin/python3)
12-
set(BUCK2 /home/zephyruser/executorch/buck2-bin/buck2-2025-05-06-201beb86106fecdc84e30260b0f1abb5bf576988)
13-
set(CMAKE_CXX_COMPILER_ID GNU)
14-
set(CMAKE_TOOLCHAIN_FILE /home/zephyruser/executorch/examples/arm/ethos-u-setup/arm-zephyr-eabi-gcc.cmake)
15-
set(EXECUTORCH_ENABLE_LOGGING ON)
16-
set(EXECUTORCH_BUILD_COREML OFF)
17-
set(EXECUTORCH_FLATBUFFERS_MAX_ALIGNMENT 1024)
18-
set(EXECUTORCH_PAL_DEFAULT posix)
19-
set(EXECUTORCH_PAL_DEFAULT_FILE_PATH /home/zephyruser/executorch/runtime/platform/default/posix.cpp)
20-
set(EXECUTORCH_LOG_LEVEL Info)
21-
set(EXECUTORCH_ENABLE_PROGRAM_VERIFICATION OFF)
22-
set(EXECUTORCH_ENABLE_EVENT_TRACER OFF)
23-
set(EXECUTORCH_OPTIMIZE_SIZE ON)
24-
set(EXECUTORCH_BUILD_ARM_BAREMETAL OFF)
25-
set(EXECUTORCH_BUILD_KERNELS_CUSTOM OFF)
26-
set(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT OFF)
27-
set(EXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT OFF)
28-
set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER OFF)
29-
set(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR OFF)
30-
set(EXECUTORCH_BUILD_EXTENSION_LLM OFF)
31-
set(EXECUTORCH_BUILD_EXTENSION_MODULE OFF)
32-
set(EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL OFF)
33-
set(EXECUTORCH_BUILD_EXTENSION_TENSOR OFF)
34-
set(EXECUTORCH_BUILD_EXTENSION_TRAINING OFF)
35-
set(EXECUTORCH_BUILD_EXTENSION_APPLE OFF)
36-
set(EXECUTORCH_BUILD_MPS OFF)
37-
set(EXECUTORCH_BUILD_NEURON OFF)
38-
set(EXECUTORCH_BUILD_OPENVINO OFF)
39-
set(EXECUTORCH_BUILD_PYBIND OFF)
40-
set(EXECUTORCH_BUILD_QNN OFF)
41-
set(EXECUTORCH_BUILD_KERNELS_OPTIMIZED OFF)
42-
set(EXECUTORCH_BUILD_KERNELS_QUANTIZED OFF)
43-
set(EXECUTORCH_BUILD_DEVTOOLS OFF)
44-
set(EXECUTORCH_BUILD_TESTS OFF)
45-
set(EXECUTORCH_NNLIB_OPT OFF)
46-
set(EXECUTORCH_CADENCE_CPU_RUNNER OFF)
47-
set(EXECUTORCH_BUILD_SIZE_TEST OFF)
48-
set(EXECUTORCH_BUILD_XNNPACK OFF)
49-
set(EXECUTORCH_BUILD_VULKAN OFF)
50-
set(EXECUTORCH_BUILD_PORTABLE_OPS ON)
51-
set(EXECUTORCH_USE_DL ON)
52-
set(EXECUTORCH_BUILD_CADENCE OFF)
53-
set(EXECUTORCH_BUILD_CORTEX_M ON)
54-
set(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER OFF)
55-
set(EXECUTORCH_BUILD_PTHREADPOOL OFF)
56-
set(EXECUTORCH_BUILD_CPUINFO OFF)
57-
set(EXECUTORCH_BUILD_EXECUTOR_RUNNER ON)
58-
set(EXECUTORCH_XNNPACK_SHARED_WORKSPACE ON)
59-
set(EXECUTORCH_XNNPACK_ENABLE_KLEIDI OFF)
60-
set(EXECUTORCH_XNNPACK_ENABLE_WEIGHT_CACHE OFF)
61-
set(EXECUTORCH_USE_CPP_CODE_COVERAGE OFF)
8+
set_overridable_option(CMAKE_SYSTEM_PROCESSOR cortex-m55)
9+
set_overridable_option(CMAKE_BUILD_TYPE Release)
10+
set_overridable_option(PYTHON_EXECUTABLE /home/zephyruser/executorch/.venv/bin/python3)
11+
set_overridable_option(CMAKE_CXX_COMPILER_ID GNU)
12+
set_overridable_option(CMAKE_TOOLCHAIN_FILE "${PROJECT_SOURCE_DIR}/examples/arm/ethos-u-setup/arm-zephyr-eabi-gcc.cmake")
13+
set_overridable_option(EXECUTORCH_ENABLE_LOGGING ON)
14+
set_overridable_option(EXECUTORCH_BUILD_COREML OFF)
15+
set_overridable_option(EXECUTORCH_FLATBUFFERS_MAX_ALIGNMENT 1024)
16+
set_overridable_option(EXECUTORCH_PAL_DEFAULT posix)
17+
set_overridable_option(EXECUTORCH_LOG_LEVEL Info)
18+
set_overridable_option(EXECUTORCH_ENABLE_PROGRAM_VERIFICATION OFF)
19+
set_overridable_option(EXECUTORCH_ENABLE_EVENT_TRACER OFF)
20+
set_overridable_option(EXECUTORCH_OPTIMIZE_SIZE ON)
21+
set_overridable_option(EXECUTORCH_BUILD_ARM_BAREMETAL OFF)
22+
set_overridable_option(EXECUTORCH_BUILD_KERNELS_CUSTOM OFF)
23+
set_overridable_option(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT OFF)
24+
set_overridable_option(EXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT OFF)
25+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER OFF)
26+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR OFF)
27+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_LLM OFF)
28+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_MODULE OFF)
29+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL OFF)
30+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_TENSOR OFF)
31+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_TRAINING OFF)
32+
set_overridable_option(EXECUTORCH_BUILD_EXTENSION_APPLE OFF)
33+
set_overridable_option(EXECUTORCH_BUILD_MPS OFF)
34+
set_overridable_option(EXECUTORCH_BUILD_NEURON OFF)
35+
set_overridable_option(EXECUTORCH_BUILD_OPENVINO OFF)
36+
set_overridable_option(EXECUTORCH_BUILD_PYBIND OFF)
37+
set_overridable_option(EXECUTORCH_BUILD_QNN OFF)
38+
set_overridable_option(EXECUTORCH_BUILD_KERNELS_OPTIMIZED OFF)
39+
set_overridable_option(EXECUTORCH_BUILD_KERNELS_QUANTIZED OFF)
40+
set_overridable_option(EXECUTORCH_BUILD_DEVTOOLS OFF)
41+
set_overridable_option(EXECUTORCH_BUILD_TESTS OFF)
42+
set_overridable_option(EXECUTORCH_NNLIB_OPT OFF)
43+
set_overridable_option(EXECUTORCH_CADENCE_CPU_RUNNER OFF)
44+
set_overridable_option(EXECUTORCH_BUILD_SIZE_TEST OFF)
45+
set_overridable_option(EXECUTORCH_BUILD_XNNPACK OFF)
46+
set_overridable_option(EXECUTORCH_BUILD_VULKAN OFF)
47+
set_overridable_option(EXECUTORCH_BUILD_PORTABLE_OPS ON)
48+
set_overridable_option(EXECUTORCH_USE_DL ON)
49+
set_overridable_option(EXECUTORCH_BUILD_CADENCE OFF)
50+
set_overridable_option(EXECUTORCH_BUILD_CORTEX_M ON)
51+
set_overridable_option(EXECUTORCH_COREML_BUILD_EXECUTOR_RUNNER OFF)
52+
set_overridable_option(EXECUTORCH_BUILD_PTHREADPOOL OFF)
53+
set_overridable_option(EXECUTORCH_BUILD_CPUINFO OFF)
54+
set_overridable_option(EXECUTORCH_BUILD_EXECUTOR_RUNNER ON)
55+
set_overridable_option(EXECUTORCH_XNNPACK_SHARED_WORKSPACE ON)
56+
set_overridable_option(EXECUTORCH_XNNPACK_ENABLE_KLEIDI OFF)
57+
set_overridable_option(EXECUTORCH_XNNPACK_ENABLE_WEIGHT_CACHE OFF)
58+
set_overridable_option(EXECUTORCH_USE_CPP_CODE_COVERAGE OFF)

0 commit comments

Comments
 (0)