Skip to content

Commit e95ba30

Browse files
committed
Merge branch 'bugfix/use_quotes_in_embedding_ulp_apps' into 'master'
ulp: use quotes when specifying files for embedding ulp binaries See merge request espressif/esp-idf!7606
2 parents 7bce9ad + bb639bb commit e95ba30

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

components/ulp/component_ulp_common.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ foreach(ulp_exp_dep_src ${ULP_EXP_DEP_SRCS})
1515
list(APPEND ulp_dep_srcs ${ulp_dep_src})
1616
endforeach()
1717

18-
ulp_embed_binary(${ULP_APP_NAME} ${ulp_srcs} ${ulp_dep_srcs})
18+
ulp_embed_binary(${ULP_APP_NAME} "${ulp_srcs}" "${ulp_dep_srcs}")

components/ulp/test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ if(IDF_TARGET STREQUAL "esp32")
66
set(ulp_app_name ulp_test_app)
77
set(ulp_s_sources "ulp/test_jumps_esp32.S")
88
set(ulp_exp_dep_srcs "esp32/test_ulp_as.c")
9-
ulp_embed_binary(${ulp_app_name} ${ulp_s_sources} ${ulp_exp_dep_srcs})
9+
ulp_embed_binary(${ulp_app_name} "${ulp_s_sources}" "${ulp_exp_dep_srcs}")
1010
endif()

docs/en/api-guides/ulp.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To compile the ULP code as part of the component, the following steps must be ta
4242
set(ulp_s_sources ulp/ulp_assembly_source_file.S)
4343
set(ulp_exp_dep_srcs "ulp_c_source_file.c")
4444

45-
ulp_embed_binary(${ulp_app_name} ${ulp_s_sources} ${ulp_exp_dep_srcs})
45+
ulp_embed_binary(${ulp_app_name} "${ulp_s_sources}" "${ulp_exp_dep_srcs}")
4646

4747
The first argument to ``ulp_embed_binary`` specifies the ULP binary name. The name specified here will also be used by other generated artifacts
4848
such as the ELF file, map file, header file and linker export file. The second argument specifies the ULP assembly source files.

docs/zh_CN/api-guides/ulp.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ULP 协处理器代码是用汇编语言编写的,并使用 `binutils-esp32ulp
4444
set(ulp_s_sources ulp/ulp_assembly_source_file.S)
4545
set(ulp_exp_dep_srcs "ulp_c_source_file.c")
4646

47-
ulp_embed_binary(${ulp_app_name} ${ulp_s_sources} ${ulp_exp_dep_srcs})
47+
ulp_embed_binary(${ulp_app_name} "${ulp_s_sources}" "${ulp_exp_dep_srcs}")
4848

4949
上述第一个参数到 ``ulp_embed_binary`` 为 ULP 二进制文件命名。此名称也用于生成的其他文件,如:ELF 文件、.map 文件、头文件和链接器导出文件。第二个参数设置 ULP 程序集源文件。最后,第三个参数设置组件源文件列表,其中包括被生成的头文件。此列表用以建立正确的依赖项,并确保在构建过程会先生成再编译包含头文件的源文件。请参考下文,查看为 ULP 应用程序生成的头文件等相关概念。
5050

examples/system/ulp/main/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ set(ulp_exp_dep_srcs "ulp_example_main.c")
1818
#
1919
# 4. Call function to build ULP binary and embed in project using the argument
2020
# values above.
21-
ulp_embed_binary(${ulp_app_name} ${ulp_s_sources} ${ulp_exp_dep_srcs})
21+
ulp_embed_binary(${ulp_app_name} "${ulp_s_sources}" "${ulp_exp_dep_srcs}")

examples/system/ulp_adc/main/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ set(ulp_exp_dep_srcs "ulp_adc_example_main.c")
1818
#
1919
# 4. Call function to build ULP binary and embed in project using the argument
2020
# values above.
21-
ulp_embed_binary(${ulp_app_name} ${ulp_s_sources} ${ulp_exp_dep_srcs})
21+
ulp_embed_binary(${ulp_app_name} "${ulp_s_sources}" "${ulp_exp_dep_srcs}")

0 commit comments

Comments
 (0)