add cmake RTOS=zephyr (default noos) for zephyr build

5 files changed, 26 insertions, 43 deletions

diff --git a/examples/build_system/cmake/toolchain/arm_gcc.cmake b/examples/build_system/cmake/toolchain/arm_gcc.cmake
index 0b0949dd8..4cef07ff5 100644
--- a/examples/build_system/cmake/toolchain/arm_gcc.cmake
+++ b/examples/build_system/cmake/toolchain/arm_gcc.cmake
@@ -1,21 +1,25 @@
-if (NOT DEFINED CMAKE_C_COMPILER)
-  set(CMAKE_C_COMPILER "arm-none-eabi-gcc")
-endif ()
+if (RTOS STREQUAL zephyr)
 
-if (NOT DEFINED CMAKE_CXX_COMPILER)
-  set(CMAKE_CXX_COMPILER "arm-none-eabi-g++")
-endif ()
+else ()
+  if (NOT DEFINED CMAKE_C_COMPILER)
+    set(CMAKE_C_COMPILER "arm-none-eabi-gcc")
+  endif ()
+
+  if (NOT DEFINED CMAKE_CXX_COMPILER)
+    set(CMAKE_CXX_COMPILER "arm-none-eabi-g++")
+  endif ()
 
-set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-find_program(CMAKE_SIZE arm-none-eabi-size)
-find_program(CMAKE_OBJCOPY arm-none-eabi-objcopy)
-find_program(CMAKE_OBJDUMP arm-none-eabi-objdump)
+  set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
+  find_program(CMAKE_SIZE arm-none-eabi-size)
+  find_program(CMAKE_OBJCOPY arm-none-eabi-objcopy)
+  find_program(CMAKE_OBJDUMP arm-none-eabi-objdump)
 
-include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
+  include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
 
-get_property(IS_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
-if (IS_IN_TRY_COMPILE)
-  set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib")
-  set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -nostdlib")
-  cmake_print_variables(CMAKE_C_LINK_FLAGS)
+  get_property(IS_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
+  if (IS_IN_TRY_COMPILE)
+    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib")
+    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -nostdlib")
+    cmake_print_variables(CMAKE_C_LINK_FLAGS)
+  endif ()
 endif ()
diff --git a/examples/build_system/cmake/toolchain/common.cmake b/examples/build_system/cmake/toolchain/common.cmake
index 7fe0aac4b..4c181137b 100644
--- a/examples/build_system/cmake/toolchain/common.cmake
+++ b/examples/build_system/cmake/toolchain/common.cmake
@@ -1,7 +1,3 @@
-if (BUILD_ZEPHYR)
-  return()
-endif()
-
 include(CMakePrintHelpers)
 
 # ----------------------------------------------------------------------------
diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt
index adcc3ba3d..9a604a732 100644
--- a/examples/device/board_test/CMakeLists.txt
+++ b/examples/device/board_test/CMakeLists.txt
@@ -5,11 +5,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
 # gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
 family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
 
-if (BUILD_ZEPHYR)
-  set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
-  find_package(Zephyr REQUIRED HINTS ${TOP}/lib/zephyr)
-endif ()
-
 project(${PROJECT} C CXX ASM)
 
 # Checks this example is valid for the family and initializes the project
@@ -20,7 +15,7 @@ if(FAMILY STREQUAL "espressif")
   return()
 endif()
 
-if (BUILD_ZEPHYR)
+if (RTOS STREQUAL zephyr)
   set(EXE_NAME app)
 else()
   set(EXE_NAME ${PROJECT})
@@ -39,8 +34,4 @@ target_include_directories(${EXE_NAME} PUBLIC
 
 # Configure compilation flags and libraries for the example without RTOS.
 # See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
-if (BUILD_ZEPHYR)
-  family_configure_device_example(${EXE_NAME} zephyr)
-else()
-  family_configure_device_example(${EXE_NAME} noos)
-endif()
+family_configure_device_example(${EXE_NAME} ${RTOS})
diff --git a/examples/device/cdc_msc/CMakeLists.txt b/examples/device/cdc_msc/CMakeLists.txt
index 1c00ae0b2..b07f92342 100644
--- a/examples/device/cdc_msc/CMakeLists.txt
+++ b/examples/device/cdc_msc/CMakeLists.txt
@@ -16,7 +16,7 @@ if(FAMILY STREQUAL "espressif")
   return()
 endif()
 
-if (BUILD_ZEPHYR)
+if (RTOS STREQUAL zephyr)
   set(EXE_NAME app)
 else()
   set(EXE_NAME ${PROJECT})
@@ -37,8 +37,4 @@ target_include_directories(${EXE_NAME} PUBLIC
 
 # Configure compilation flags and libraries for the example without RTOS.
 # See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
-if (BUILD_ZEPHYR)
-  family_configure_device_example(${EXE_NAME} zephyr)
-else()
-  family_configure_device_example(${EXE_NAME} noos)
-endif()
+family_configure_device_example(${EXE_NAME} ${RTOS})
diff --git a/examples/device/msc_dual_lun/CMakeLists.txt b/examples/device/msc_dual_lun/CMakeLists.txt
index 8c39168e8..3955bfb49 100644
--- a/examples/device/msc_dual_lun/CMakeLists.txt
+++ b/examples/device/msc_dual_lun/CMakeLists.txt
@@ -15,7 +15,7 @@ if(FAMILY STREQUAL "espressif")
   return()
 endif()
 
-if (BUILD_ZEPHYR)
+if (RTOS STREQUAL zephyr)
   set(EXE_NAME app)
 else()
   set(EXE_NAME ${PROJECT})
@@ -36,8 +36,4 @@ target_include_directories(${EXE_NAME} PUBLIC
 
 # Configure compilation flags and libraries for the example without RTOS.
 # See the corresponding function in hw/bsp/FAMILY/family.cmake for details.
-if (BUILD_ZEPHYR)
-  family_configure_device_example(${EXE_NAME} zephyr)
-else()
-  family_configure_device_example(${EXE_NAME} noos)
-endif()
+family_configure_device_example(${EXE_NAME} ${RTOS})