Skip to content

Commit b46fd20

Browse files
nirav-agrawalmmahadevan108
authored andcommitted
zephyr: rt: fix multicore build failure for IW416/IW612 SoC
- Update cmake to add explicit dependency of header(.inc file) require by source file. Update cmake-target for header file inclusion to the same as source file cmake-target.
1 parent dcb8080 commit b46fd20

File tree

1 file changed

+25
-1
lines changed

1 file changed

+25
-1
lines changed

zephyr/src/rt/CMakeLists.txt

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,37 @@ if(CONFIG_NXP_MONOLITHIC_WIFI OR CONFIG_BT_H4_NXP_CTLR)
99
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/nw61x_wifi_fw.bin.se.inc)
1010
set(wifi_binary_blob_name sduart_nw61x.bin.se)
1111
zephyr_library_sources(${CMAKE_CURRENT_LIST_DIR}/nw61x/nw61x_cpu1.c)
12+
set_source_files_properties(
13+
${CMAKE_CURRENT_LIST_DIR}/nw61x/nw61x_cpu1.c
14+
PROPERTIES OBJECT_DEPENDS ${ZEPHYR_BINARY_DIR}/include/generated/nw61x_wifi_fw.bin.se.inc
15+
)
1216
list(APPEND wifi_bt_binary_blobs_list ${hal_blobs_dir}/nw61x/${wifi_binary_blob_name})
1317
elseif(CONFIG_NXP_88W8987)
1418
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/8987_wifi_fw.bin.inc)
1519
set(wifi_binary_blob_name sd8987_wlan.bin)
1620
zephyr_library_sources(${CMAKE_CURRENT_LIST_DIR}/8987/8987_cpu1.c)
21+
set_source_files_properties(
22+
${CMAKE_CURRENT_LIST_DIR}/8987/8987_cpu1.c
23+
PROPERTIES OBJECT_DEPENDS ${ZEPHYR_BINARY_DIR}/include/generated/8987_wifi_fw.bin.inc
24+
)
1725
list(APPEND wifi_bt_binary_blobs_list ${hal_blobs_dir}/8987/${wifi_binary_blob_name})
1826
elseif(CONFIG_NXP_IW416)
1927
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/iw416_wifi_fw.bin.inc)
2028
set(wifi_binary_blob_name sduartIW416_wlan_bt.bin)
2129
zephyr_library_sources(${CMAKE_CURRENT_LIST_DIR}/IW416/IW416_cpu1.c)
30+
set_source_files_properties(
31+
${CMAKE_CURRENT_LIST_DIR}/IW416/IW416_cpu1.c
32+
PROPERTIES OBJECT_DEPENDS ${ZEPHYR_BINARY_DIR}/include/generated/iw416_wifi_fw.bin.inc
33+
)
2234
list(APPEND wifi_bt_binary_blobs_list ${hal_blobs_dir}/IW416/${wifi_binary_blob_name})
2335
elseif(CONFIG_NXP_88W8801)
2436
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/8801_wifi_fw.bin.inc)
2537
set(wifi_binary_blob_name sd8801_wlan.bin)
2638
zephyr_library_sources(${CMAKE_CURRENT_LIST_DIR}/8801/8801_cpu1.c)
39+
set_source_files_properties(
40+
${CMAKE_CURRENT_LIST_DIR}/8801/8801_cpu1.c
41+
PROPERTIES OBJECT_DEPENDS ${ZEPHYR_BINARY_DIR}/include/generated/8801_wifi_fw.bin.inc
42+
)
2743
list(APPEND wifi_bt_binary_blobs_list ${hal_blobs_dir}/8801/${wifi_binary_blob_name})
2844
elseif(CONFIG_NXP_IW610)
2945
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/iw610_wifi_fw.bin.se.inc)
@@ -40,11 +56,19 @@ if(CONFIG_NXP_MONOLITHIC_WIFI OR CONFIG_BT_H4_NXP_CTLR)
4056
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/nw61x_bt_fw.bin.inc)
4157
set(bt_binary_blob_name uart_nw61x.bin.se)
4258
zephyr_library_sources(${CMAKE_CURRENT_LIST_DIR}/nw61x/nw61x_cpu2.c)
59+
set_source_files_properties(
60+
${CMAKE_CURRENT_LIST_DIR}/nw61x/nw61x_cpu2.c
61+
PROPERTIES OBJECT_DEPENDS ${ZEPHYR_BINARY_DIR}/include/generated/nw61x_bt_fw.bin.inc
62+
)
4363
list(APPEND wifi_bt_binary_blobs_list ${hal_blobs_dir}/nw61x/${bt_binary_blob_name})
4464
elseif(CONFIG_BT_NXP_IW416)
4565
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/iw416_bt_fw.bin.inc)
4666
set(bt_binary_blob_name uartIW416_bt.bin)
4767
zephyr_library_sources(${CMAKE_CURRENT_LIST_DIR}/IW416/IW416_cpu2.c)
68+
set_source_files_properties(
69+
${CMAKE_CURRENT_LIST_DIR}/IW416/IW416_cpu2.c
70+
PROPERTIES OBJECT_DEPENDS ${ZEPHYR_BINARY_DIR}/include/generated/iw416_bt_fw.bin.inc
71+
)
4872
list(APPEND wifi_bt_binary_blobs_list ${hal_blobs_dir}/IW416/${bt_binary_blob_name})
4973
elseif(CONFIG_BT_NXP_IW610)
5074
list(APPEND output_includes_list ${ZEPHYR_BINARY_DIR}/include/generated/iw610_bt_fw.bin.inc)
@@ -77,7 +101,7 @@ if(CONFIG_NXP_MONOLITHIC_WIFI OR CONFIG_BT_H4_NXP_CTLR)
77101
list(GET output_includes_list ${i} output_include)
78102
zephyr_blobs_verify(FILES ${binary_blob})
79103
message(STATUS " generate include of binary blob: ${binary_blob}")
80-
generate_inc_file_for_target(app ${binary_blob} ${output_include})
104+
generate_inc_file_for_target(${ZEPHYR_CURRENT_LIBRARY} ${binary_blob} ${output_include})
81105
endforeach()
82106
endif()
83107

0 commit comments

Comments
 (0)