Skip to content

Commit ef21565

Browse files
committed
coex: add function stubs to allow CI testing
Make sure to run CI tests when CONFIG_BUILD_ONLY_NO_BLOBS=y Signed-off-by: Sylvio Alves <[email protected]>
1 parent d48b519 commit ef21565

File tree

7 files changed

+597
-15
lines changed

7 files changed

+597
-15
lines changed

zephyr/esp32/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,15 @@ if(CONFIG_SOC_SERIES_ESP32)
375375
)
376376

377377
if (CONFIG_ESP32_SW_COEXIST_ENABLE)
378-
zephyr_link_libraries_ifndef(
379-
CONFIG_BUILD_ONLY_NO_BLOBS
380-
## ble
378+
if (CONFIG_BUILD_ONLY_NO_BLOBS)
379+
zephyr_sources(
380+
../port/coex/coex_stubs.c
381+
)
382+
endif()
383+
384+
zephyr_link_libraries(
381385
btdm_app
386+
coexist
382387
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32
383388
)
384389
endif()
@@ -390,7 +395,6 @@ if(CONFIG_SOC_SERIES_ESP32)
390395
pp
391396
phy
392397
rtc
393-
coexist
394398
## esp-idf wifi libs refer gcc libs symbols, so linked in libgcc
395399
gcc
396400
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32

zephyr/esp32c2/CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,19 @@ if(CONFIG_SOC_SERIES_ESP32C2)
347347
../../components/efuse/src/efuse_controller/keys/without_key_purposes/one_key_block/esp_efuse_api_key.c
348348
)
349349

350+
if (CONFIG_ESP32_SW_COEXIST_ENABLE)
351+
if (CONFIG_BUILD_ONLY_NO_BLOBS)
352+
zephyr_sources(
353+
../port/coex/coex_stubs.c
354+
)
355+
endif()
356+
357+
zephyr_link_libraries(
358+
coexist
359+
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/${CONFIG_SOC_SERIES}
360+
)
361+
endif()
362+
350363
zephyr_sources_ifdef(
351364
CONFIG_BUILD_ONLY_NO_BLOBS
352365
../port/wifi/wifi_stubs.c
@@ -359,7 +372,6 @@ if(CONFIG_SOC_SERIES_ESP32C2)
359372
core
360373
pp
361374
phy
362-
coexist
363375
## esp-idf wifi libs refer gcc libs symbols, so linked in libgcc
364376
gcc
365377
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/${CONFIG_SOC_SERIES}

zephyr/esp32c3/CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,14 +375,26 @@ if(CONFIG_SOC_SERIES_ESP32C3)
375375
../../components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
376376
)
377377

378+
if (CONFIG_ESP32_SW_COEXIST_ENABLE)
379+
if (CONFIG_BUILD_ONLY_NO_BLOBS)
380+
zephyr_sources(
381+
../port/coex/coex_stubs.c
382+
)
383+
endif()
384+
385+
zephyr_link_libraries(
386+
coexist
387+
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32c3
388+
)
389+
endif()
390+
378391
zephyr_link_libraries_ifndef(
379392
CONFIG_BUILD_ONLY_NO_BLOBS
380393
net80211
381394
core
382395
pp
383396
phy
384397
mesh
385-
coexist
386398
## esp-idf wifi libs refer gcc libs symbols, so linked in libgcc
387399
gcc
388400
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32c3

zephyr/esp32c6/CMakeLists.txt

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,18 @@ if(CONFIG_SOC_SERIES_ESP32C6)
359359
../../components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
360360
)
361361

362-
zephyr_sources_ifdef(
363-
CONFIG_BUILD_ONLY_NO_BLOBS
364-
../port/wifi/wifi_stubs.c
365-
../port/phy/phy_stubs.c
366-
)
362+
if (CONFIG_ESP32_SW_COEXIST_ENABLE)
363+
if (CONFIG_BUILD_ONLY_NO_BLOBS)
364+
zephyr_sources(
365+
../port/coex/coex_stubs.c
366+
)
367+
endif()
368+
369+
zephyr_link_libraries(
370+
coexist
371+
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/${CONFIG_SOC_SERIES}
372+
)
373+
endif()
367374

368375
zephyr_link_libraries_ifndef(
369376
CONFIG_BUILD_ONLY_NO_BLOBS
@@ -372,7 +379,6 @@ if(CONFIG_SOC_SERIES_ESP32C6)
372379
pp
373380
phy
374381
mesh
375-
coexist
376382
## esp-idf wifi libs refer gcc libs symbols, so linked in libgcc
377383
gcc
378384
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/${CONFIG_SOC_SERIES}
@@ -393,6 +399,7 @@ if(CONFIG_SOC_SERIES_ESP32C6)
393399
btbb
394400
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/${CONFIG_SOC_SERIES}
395401
)
402+
396403
endif()
397404

398405
## WIFI definitions
@@ -555,6 +562,12 @@ if(CONFIG_SOC_SERIES_ESP32C6)
555562
)
556563
endif()
557564

565+
zephyr_sources_ifdef(
566+
CONFIG_BUILD_ONLY_NO_BLOBS
567+
../port/wifi/wifi_stubs.c
568+
../port/phy/phy_stubs.c
569+
)
570+
558571
zephyr_sources(
559572
src/wifi/esp_wifi_adapter.c
560573
src/coex/esp_coex_adapter.c

zephyr/esp32s2/CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,17 +589,29 @@ if(CONFIG_SOC_SERIES_ESP32S2)
589589

590590
zephyr_sources_ifdef(
591591
CONFIG_BUILD_ONLY_NO_BLOBS
592-
../port/wifi/wifi_stubs.c
593592
../port/phy/phy_stubs.c
593+
../port/wifi/wifi_stubs.c
594594
)
595595

596+
if (CONFIG_ESP32_SW_COEXIST_ENABLE)
597+
if (CONFIG_BUILD_ONLY_NO_BLOBS)
598+
zephyr_sources(
599+
../port/coex/coex_stubs.c
600+
)
601+
endif()
602+
603+
zephyr_link_libraries(
604+
coexist
605+
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32s2
606+
)
607+
endif()
608+
596609
zephyr_link_libraries_ifndef(
597610
CONFIG_BUILD_ONLY_NO_BLOBS
598611
net80211
599612
core
600613
pp
601614
phy
602-
coexist
603615
## esp-idf wifi libs refer gcc libs symbols, so linked in libgcc
604616
gcc
605617
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32s2

zephyr/esp32s3/CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,13 +407,25 @@ if(CONFIG_SOC_SERIES_ESP32S3)
407407
../../components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
408408
)
409409

410+
if (CONFIG_ESP32_SW_COEXIST_ENABLE)
411+
if (CONFIG_BUILD_ONLY_NO_BLOBS)
412+
zephyr_sources(
413+
../port/coex/coex_stubs.c
414+
)
415+
endif()
416+
417+
zephyr_link_libraries(
418+
coexist
419+
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32s3
420+
)
421+
endif()
422+
410423
zephyr_link_libraries_ifndef(
411424
CONFIG_BUILD_ONLY_NO_BLOBS
412425
net80211
413426
core
414427
pp
415428
phy
416-
coexist
417429
## esp-idf wifi libs refer gcc libs symbols, so linked in libgcc
418430
gcc
419431
-L${CMAKE_CURRENT_SOURCE_DIR}/../blobs/lib/esp32s3

0 commit comments

Comments
 (0)