Fix broken Chef NRF build caused by #18983 and #18955

project-chip · Jun 4, 2022 · 2b18010 · 2b18010
1 parent 6544002
commit 2b18010
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt
@@ -122,6 +122,7 @@ set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
 include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
 
+pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
 pw_set_backend(pw_log pw_log_basic)
 pw_set_backend(pw_assert pw_assert_log)
 pw_set_backend(pw_sys_io pw_sys_io.nrfconnect)

diff --git a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
@@ -20,10 +20,10 @@
 #include "console/console.h"
 #include "pw_sys_io/sys_io.h"
 #include <cassert>
-#include <zephyr/zephyr.h>
+#include <zephyr.h>
 
 #ifdef CONFIG_USB
-#include <zephyr/usb/usb_device.h>
+#include <usb/usb_device.h>
 #endif
 
 extern "C" void pw_sys_io_Init()