From b355d5ce007a02f551f9d897f0dcbc20b76464f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Smoczy=C5=84ski?= Date: Sun, 8 Aug 2021 16:13:57 +0200 Subject: [PATCH] [BH-733] Cleanup target dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove obsolete target dependencies across modules. Remove 'cross' and 'unittests' targets. Refactor some remaining target dependencies to use board include macro. Signed-off-by: Marcin Smoczyński --- CMakeLists.txt | 6 +- Target_Linux.cmake | 9 -- Target_RT1051.cmake | 55 +------ Target_Unittests.cmake | 47 ------ board/rt1051/CMakeLists.txt | 26 ++++ cmake/modules/thirdparty.cmake | 5 - module-apps/CMakeLists.txt | 5 - module-apps/apps-common/CMakeLists.txt | 4 - module-audio/CMakeLists.txt | 3 - module-bluetooth/CMakeLists.txt | 8 - module-bluetooth/lib/btstack.cmake | 3 - module-bluetooth/targets/Target_Linux.cmake | 2 - module-bsp/CMakeLists.txt | 81 ++++------ module-bsp/board/linux/CMakeLists.txt | 44 ++++++ .../keypad_backlight/keypad_backlight.cpp | 3 - module-bsp/board/linux/torch/torch.cpp | 4 - module-bsp/board/rt1051/CMakeLists.txt | 107 +++++++++++++ .../board/rt1051/bsp/BoardDefinitions.hpp | 141 ++++++++++++++++++ .../board/{cross => rt1051}/eMMC/eMMC.cpp | 0 .../board/{cross => rt1051}/eMMC/eMMC.hpp | 0 module-bsp/bsp/BoardDefinitions.hpp | 136 ----------------- module-bsp/targets/Target_Cross.cmake | 17 --- module-bsp/targets/Target_Linux.cmake | 54 ------- module-bsp/targets/Target_RT1051.cmake | 113 -------------- module-cellular/CMakeLists.txt | 16 +- module-cellular/targets/Target_Cross.cmake | 9 -- module-cellular/targets/Target_Linux.cmake | 3 - module-db/CMakeLists.txt | 14 +- module-db/targets/Target_Cross.cmake | 9 -- module-db/targets/Target_Linux.cmake | 3 - module-gui/CMakeLists.txt | 15 +- module-gui/targets/Target_Cross.cmake | 9 -- module-gui/targets/Target_Linux.cmake | 5 - module-lwip/CMakeLists.txt | 13 -- module-os/CMakeLists.txt | 31 +--- module-os/board/linux/CMakeLists.txt | 26 ++++ module-os/board/rt1051/CMakeLists.txt | 28 ++++ .../rt1051/systemview}/FreeRTOS.h | 0 .../rt1051/systemview}/FreeRTOSConfig.h | 0 .../rt1051/systemview}/port.c | 0 .../rt1051/systemview}/portmacro.h | 0 .../rt1051/systemview}/task.h | 0 .../rt1051/systemview}/tasks.c | 0 module-os/targets/Target_Linux.cmake | 14 -- module-os/targets/Target_RT1051.cmake | 34 ----- module-services/CMakeLists.txt | 15 +- module-services/service-eink/CMakeLists.txt | 13 +- module-services/service-eink/EinkDisplay.cpp | 7 +- .../service-eink/board/linux/CMakeLists.txt | 6 + .../service-eink/board/rt1051/CMakeLists.txt | 5 + .../service-fileindexer/CMakeLists.txt | 7 +- module-services/targets/Target_Linux.cmake | 8 - module-services/targets/Target_RT1051.cmake | 8 - module-sys/CMakeLists.txt | 22 +-- module-sys/targets/Target_Linux.cmake | 3 - module-sys/targets/Target_RT1051.cmake | 6 - module-utils/CMakeLists.txt | 5 - module-utils/board/CMakeLists.txt | 27 +--- module-utils/board/linux/CMakeLists.txt | 5 + module-utils/board/rt1051/CMakeLists.txt | 25 ++++ .../board/{cross => rt1051}/log_rt1051.cpp | 0 .../{cross => rt1051}/log_writeLUART.cpp | 0 .../board/{cross => rt1051}/log_writeRTT.cpp | 0 .../{cross => rt1051}/log_writeSYSTEMVIEW.cpp | 0 .../board/{cross => rt1051}/time_syscalls.cpp | 0 module-vfs/CMakeLists.txt | 5 - products/BellHybrid/CMakeLists.txt | 9 -- products/PurePhone/CMakeLists.txt | 9 -- 68 files changed, 464 insertions(+), 823 deletions(-) delete mode 100644 Target_Unittests.cmake delete mode 100644 module-bluetooth/targets/Target_Linux.cmake create mode 100644 module-bsp/board/linux/CMakeLists.txt create mode 100644 module-bsp/board/rt1051/CMakeLists.txt create mode 100644 module-bsp/board/rt1051/bsp/BoardDefinitions.hpp rename module-bsp/board/{cross => rt1051}/eMMC/eMMC.cpp (100%) rename module-bsp/board/{cross => rt1051}/eMMC/eMMC.hpp (100%) delete mode 100644 module-bsp/bsp/BoardDefinitions.hpp delete mode 100644 module-bsp/targets/Target_Cross.cmake delete mode 100644 module-bsp/targets/Target_Linux.cmake delete mode 100644 module-bsp/targets/Target_RT1051.cmake delete mode 100644 module-cellular/targets/Target_Cross.cmake delete mode 100644 module-cellular/targets/Target_Linux.cmake delete mode 100644 module-db/targets/Target_Cross.cmake delete mode 100644 module-db/targets/Target_Linux.cmake delete mode 100644 module-gui/targets/Target_Cross.cmake delete mode 100644 module-gui/targets/Target_Linux.cmake create mode 100644 module-os/board/linux/CMakeLists.txt create mode 100644 module-os/board/rt1051/CMakeLists.txt rename module-os/{systemviewPatch => board/rt1051/systemview}/FreeRTOS.h (100%) rename module-os/{systemviewPatch => board/rt1051/systemview}/FreeRTOSConfig.h (100%) rename module-os/{systemviewPatch => board/rt1051/systemview}/port.c (100%) rename module-os/{systemviewPatch => board/rt1051/systemview}/portmacro.h (100%) rename module-os/{systemviewPatch => board/rt1051/systemview}/task.h (100%) rename module-os/{systemviewPatch => board/rt1051/systemview}/tasks.c (100%) delete mode 100644 module-os/targets/Target_Linux.cmake delete mode 100644 module-os/targets/Target_RT1051.cmake create mode 100644 module-services/service-eink/board/linux/CMakeLists.txt create mode 100644 module-services/service-eink/board/rt1051/CMakeLists.txt delete mode 100644 module-services/targets/Target_Linux.cmake delete mode 100644 module-services/targets/Target_RT1051.cmake delete mode 100644 module-sys/targets/Target_Linux.cmake delete mode 100644 module-sys/targets/Target_RT1051.cmake create mode 100644 module-utils/board/linux/CMakeLists.txt create mode 100644 module-utils/board/rt1051/CMakeLists.txt rename module-utils/board/{cross => rt1051}/log_rt1051.cpp (100%) rename module-utils/board/{cross => rt1051}/log_writeLUART.cpp (100%) rename module-utils/board/{cross => rt1051}/log_writeRTT.cpp (100%) rename module-utils/board/{cross => rt1051}/log_writeSYSTEMVIEW.cpp (100%) rename module-utils/board/{cross => rt1051}/time_syscalls.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa462b1b0c023a3dc404a90e8d42e6f521a731e1..6452b552b59f4594477b09853d81f91a27fdaec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,9 +31,6 @@ message("Selected product: ${PRODUCT}") message("Selected board: ${BOARD}") message("Board revision: ${BOARD_REVISION}") message("PROJECT_TARGET: ${PROJECT_TARGET}") -message("TARGET_COMPILE_DEFINITIONS: ${TARGET_COMPILE_OPTIONS}") -message("TARGET_LIBRARIES: ${TARGET_LIBRARIES}") -message("TARGET_LINKER_FLAGS: ${TARGET_LINKER_FLAGS}") string(REPLACE "TARGET_" "" PROJECT_TARGET_NAME ${PROJECT_TARGET}) string(TOLOWER "${PROJECT_TARGET_NAME}" PROJECT_TARGET_NAME) @@ -88,7 +85,7 @@ add_compile_definitions(FSL_RTOS_FREE_RTOS SKIP_SYSCLK_INIT _GNU_SOURCE) -add_compile_options( ${TARGET_COMPILE_OPTIONS} +add_compile_options( $<$:-std=gnu11> -fsingle-precision-constant -ffunction-sections @@ -96,7 +93,6 @@ add_compile_options( ${TARGET_COMPILE_OPTIONS} -MMD -MP -fno-builtin - -fno-diagnostics-color # warning flags -Wall -Wextra -Werror -Wno-unused-parameter -Wno-deprecated-declarations) diff --git a/Target_Linux.cmake b/Target_Linux.cmake index 678fc2e6a34ae4a6cf58344f5fa4a3f316fc0f9f..cfee416d0c5394c368b10e2556c4c6d97c40bc3e 100644 --- a/Target_Linux.cmake +++ b/Target_Linux.cmake @@ -1,14 +1,5 @@ set(PROJECT_TARGET "TARGET_Linux" CACHE INTERNAL "") -set(TARGET_SOURCES CACHE INTERNAL "") - -set(TARGET_DIR_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/board/linux CACHE INTERNAL "") - -set(TARGET_COMPILE_FEATURES CACHE INTERNAL "") - -set(TARGET_COMPILE_DEFINITIONS CACHE INTERNAL "") - - add_compile_options(-funsigned-char) set(TARGET_LIBRARIES diff --git a/Target_RT1051.cmake b/Target_RT1051.cmake index d47750374101fd8b56342a39fabd2f9620faa1d6..dcaeb8688ce2f9a9fdc423ccfe1576c38a2db461 100644 --- a/Target_RT1051.cmake +++ b/Target_RT1051.cmake @@ -4,15 +4,12 @@ set(CMAKE_SYSTEM_VERSION 1) set(TOOLCHAIN_PREFIX "arm-none-eabi") -# specify the cross compiler - if(WIN32) set(CMAKE_C_COMPILER ${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-gcc.exe CACHE INTERNAL "") set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-g++.exe CACHE INTERNAL "") set(CMAKE_STRIP ${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-strip.exe CACHE INTERNAL "") set(CMAKE_OBJCOPY ${TOOLCHAIN_PATH}/bin/${TOOLCHAIN_PREFIX}-objcopy.exe CACHE INTERNAL "") else() - #make shure that if TOOLCHAIN_PATH exists finishes with / if (${TOOLCHAIN_PATH}) string(APPEND ${TOOLCHAIN_PATH} "/") endif() @@ -26,7 +23,6 @@ set(LDSCRIPTSDIR "${CMAKE_CURRENT_LIST_DIR}/board/rt1051/ldscripts" CACHE INTERN set(PROJECT_TARGET "TARGET_RT1051" CACHE INTERNAL "") - add_compile_definitions( CPU_MIMXRT1051DVL6B_cm7 CPU_MIMXRT1051DVL6B @@ -37,9 +33,9 @@ add_compile_definitions( _HAVE_SQLITE_CONFIG_H CPP_FREERTOS_NO_EXCEPTIONS _GLIBCXX_HAVE_DIRENT_H - ) +) -set(TARGET_COMPILE_OPTIONS +add_compile_options( -mcpu=cortex-m7 -mthumb -mfloat-abi=hard @@ -51,53 +47,10 @@ set(TARGET_COMPILE_OPTIONS -MP -fno-builtin -mno-unaligned-access - -Werror -Wno-psabi $<$:-Wno-register> # "register" keyword was marked as deprecated in C++17 $<$:-Wno-literal-suffix> - $<$:-Wno-register> # "register" - - - CACHE INTERNAL "" - - ) - -set(TARGET_COMPILE_FEATURES - - CACHE INTERNAL "" ) - - -set(TARGET_SOURCES - - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/_exit.c - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/newlib/io_syscalls.cpp - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/newlib/fs_dir.cc - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/memwrap.c - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/xip/evkbimxrt1050_flexspi_nor_config.c - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/xip/evkbimxrt1050_sdram_ini_dcd.c - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/xip/fsl_flexspi_nor_boot.c - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/crashdump/crashcatcher_impl.cpp - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/crashdump/crashdumpwriter_vfs.cpp - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/crashdump/consoledump.cpp - CACHE INTERNAL "" - ) - -set(TARGET_DIR_INCLUDES - - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051 - CACHE INTERNAL "" ) - -set(BOARD_DIR_INCLUDES - ${CMAKE_CURRENT_LIST_DIR}/board/rt1051/newlib/include -) - -set(TARGET_LIBRARIES - CACHE INTERNAL "" -) - -set(TARGET_LINK_OPTIONS - CACHE INTERNAL "" ) # where is the target environment @@ -107,7 +60,3 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # for libraries and headers in the target directories SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - - -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) diff --git a/Target_Unittests.cmake b/Target_Unittests.cmake deleted file mode 100644 index 3206dac0fe340d396dfcd57b48dceda525187424..0000000000000000000000000000000000000000 --- a/Target_Unittests.cmake +++ /dev/null @@ -1,47 +0,0 @@ -set(PROJECT_TARGET "TARGET_Linux" CACHE INTERNAL "") - -set(BUILD_UNIT_TESTS "") - -set(TARGET_SOURCES - - - CACHE INTERNAL "") - -set(TARGET_DIR_INCLUDES - - ${CMAKE_CURRENT_LIST_DIR}/board/linux - - CACHE INTERNAL "") - -set(TARGET_COMPILE_FEATURES - - CACHE INTERNAL "") - -set(TARGET_COMPILE_DEFINITIONS - - CACHE INTERNAL "" - ) - -set(TARGET_COMPILE_OPTIONS - - -fsanitize=address - - CACHE INTERNAL "" - ) - - -set(TARGET_LIBRARIES - - rt - pthread - portaudio - - CACHE INTERNAL "" - ) - -set(TARGET_LINK_OPTIONS - - -fsanitize=address - - CACHE INTERNAL "" - ) \ No newline at end of file diff --git a/board/rt1051/CMakeLists.txt b/board/rt1051/CMakeLists.txt index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b07651adbfa21cb903cd245fc05e85c723ba4d54 100644 --- a/board/rt1051/CMakeLists.txt +++ b/board/rt1051/CMakeLists.txt @@ -0,0 +1,26 @@ +target_sources(board + PRIVATE + _exit.c + crashdump/consoledump.cpp + crashdump/crashcatcher_impl.cpp + crashdump/crashdumpwriter_vfs.cpp + memwrap.c + newlib/fs_dir.cc + newlib/io_syscalls.cpp + xip/evkbimxrt1050_flexspi_nor_config.c + xip/evkbimxrt1050_sdram_ini_dcd.c + xip/fsl_flexspi_nor_boot.c +) + +target_include_directories(board + PUBLIC + $ +) + +target_link_libraries(board + PUBLIC + CrashCatcher::CrashCatcher +) diff --git a/cmake/modules/thirdparty.cmake b/cmake/modules/thirdparty.cmake index c904847b4d438c1a763fb7557a64bfd632ef41d1..1975d30493f5082ecbea88306452097ac36d93a5 100644 --- a/cmake/modules/thirdparty.cmake +++ b/cmake/modules/thirdparty.cmake @@ -11,10 +11,5 @@ endmacro () macro (third_party_target_setup TARGET_NAME) target_compile_definitions(${TARGET_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${TARGET_NAME} PUBLIC ${PROJECT_TARGET}) - target_compile_definitions(${TARGET_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) - target_include_directories(${TARGET_NAME} PUBLIC ${BOARD_DIR_INCLUDES} ) target_include_directories(${TARGET_NAME} PUBLIC ${PROJECT_INCLUDES}) - target_compile_features(${TARGET_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) - target_compile_options(${TARGET_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) - target_link_options(${TARGET_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) endmacro () diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt index 9a6f805948af54ab4db2464876bf6d2bf611e03a..a6c745ab738af49219b765063e3ba200fd38fe3b 100644 --- a/module-apps/CMakeLists.txt +++ b/module-apps/CMakeLists.txt @@ -113,14 +113,9 @@ target_link_libraries(${PROJECT_NAME} # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) target_include_directories(${PROJECT_NAME} - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/module-apps/apps-common/CMakeLists.txt b/module-apps/apps-common/CMakeLists.txt index 161deba7c9baa8b6123023f6af1a5a7119217690..c045fc75f454839a91f30ef2dc1e1508728b5021 100644 --- a/module-apps/apps-common/CMakeLists.txt +++ b/module-apps/apps-common/CMakeLists.txt @@ -81,11 +81,7 @@ target_link_libraries(apps-common # Board specific compilation definitions,options,include directories and features target_compile_definitions(apps-common PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(apps-common PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(apps-common PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(apps-common PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(apps-common PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(apps-common PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(apps-common PUBLIC ${TARGET_COMPILE_OPTIONS}) target_include_directories(apps-common diff --git a/module-audio/CMakeLists.txt b/module-audio/CMakeLists.txt index 17ee67ef9114c44ce32c0e6e7d302ad63b0567e8..c34ebc8aed194d08be7d4a7c2e9d4fc436d5e593 100755 --- a/module-audio/CMakeLists.txt +++ b/module-audio/CMakeLists.txt @@ -50,10 +50,7 @@ target_sources( target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) # supress warning for flac decoder diff --git a/module-bluetooth/CMakeLists.txt b/module-bluetooth/CMakeLists.txt index 3e203a5df64791c187f51884a7a15337de8be417..6eff481c305c9c93327e83f492e3caa1bed43b9c 100644 --- a/module-bluetooth/CMakeLists.txt +++ b/module-bluetooth/CMakeLists.txt @@ -38,13 +38,9 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_DIR_SOURCES}) # # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS} ${PROJECT_TARGET} - ${TARGET_COMPILE_DEFINITIONS} ${BOARD_DIR_DEFINITIONS} ) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) target_compile_options(${PROJECT_NAME} - PUBLIC - ${TARGET_COMPILE_OPTIONS} PRIVATE -Wno-sign-compare -Wno-missing-field-initializers @@ -54,18 +50,14 @@ target_compile_options(${PROJECT_NAME} # C only flags "$<$:-Wno-old-style-declaration>" ) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) target_include_directories( ${PROJECT_NAME} PUBLIC - ${BOARD_DIR_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${TARGET_LIBRARIES_INCLUDES} ${BT_STACK_ROOT}/src ${BT_STACK_ROOT}/src/classic - - ) target_link_libraries(${PROJECT_NAME} diff --git a/module-bluetooth/lib/btstack.cmake b/module-bluetooth/lib/btstack.cmake index 645898b1251332a7518a2ffd88a2eb713b41b2be..5e5fa792ba9717feb94bc310f000c7232021a16a 100644 --- a/module-bluetooth/lib/btstack.cmake +++ b/module-bluetooth/lib/btstack.cmake @@ -201,9 +201,6 @@ set(BOARD_DIR_SOURCES ) if(${PROJECT_TARGET} STREQUAL "TARGET_Linux") -message("Linux specyfic sources") -message("----------------------") - include(${CMAKE_CURRENT_SOURCE_DIR}/targets/Target_Linux.cmake) list(APPEND BOARD_DIR_SOURCES # ${BOARD_SOURCES} ${BT_STACK_ROOT}/platform/posix/btstack_stdin_posix.c diff --git a/module-bluetooth/targets/Target_Linux.cmake b/module-bluetooth/targets/Target_Linux.cmake deleted file mode 100644 index be90618cd651c00b9539e85da8fafef723e33528..0000000000000000000000000000000000000000 --- a/module-bluetooth/targets/Target_Linux.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(BOARD_SOURCES CACHE INTERNAL "") -set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "") diff --git a/module-bsp/CMakeLists.txt b/module-bsp/CMakeLists.txt index e7a39c3a5c5559dc451683153453d72767b5f8e7..f56763f4f0662b8b2711907d0bf62e8bc8e2f97a 100644 --- a/module-bsp/CMakeLists.txt +++ b/module-bsp/CMakeLists.txt @@ -2,59 +2,35 @@ # For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md project(module-bsp VERSION 1.0 - DESCRIPTION "VFS module library") + DESCRIPTION "BSP module library") -set(SOURCES - "${CMAKE_CURRENT_SOURCE_DIR}/bsp/cellular/bsp_cellular.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/bsp/lpm/bsp_lpm.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/pll/DriverPLL.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/dmamux/DriverDMAMux.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/dma/DriverDMA.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/i2c/DriverI2C.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/pwm/DriverPWM.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/lpspi/DriverLPSPI.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/lpuart/DriverLPUART.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/usdhc/DriverUSDHC.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/semc/DriverSEMC.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/drivers/gpio/DriverGPIO.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/bsp/bluetooth/Bluetooth.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/bsp/common.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/devices/Device.cpp" - ) - -if (NOT ${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Cross.cmake) -endif () - -if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - include(targets/Target_RT1051.cmake) -elseif (${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Linux.cmake) -else () - message(FATAL_ERROR "Invalid target!") -endif () - -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) - - -if (${PROJECT_TARGET} STREQUAL "TARGET_Linux") - target_compile_options(${PROJECT_NAME} PUBLIC "-Wno-unused-result") -endif() - -if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - target_compile_definitions (${PROJECT_NAME} PUBLIC USB_STACK_FREERTOS) -endif() +add_library(${PROJECT_NAME} STATIC) +target_sources( + module-bsp + PRIVATE + bsp/bluetooth/Bluetooth.cpp + bsp/cellular/bsp_cellular.cpp + bsp/common.cpp + bsp/lpm/bsp_lpm.cpp + devices/Device.cpp + drivers/dma/DriverDMA.cpp + drivers/dmamux/DriverDMAMux.cpp + drivers/gpio/DriverGPIO.cpp + drivers/i2c/DriverI2C.cpp + drivers/lpspi/DriverLPSPI.cpp + drivers/lpuart/DriverLPUART.cpp + drivers/pll/DriverPLL.cpp + drivers/pwm/DriverPWM.cpp + drivers/semc/DriverSEMC.cpp + drivers/usdhc/DriverUSDHC.cpp +) +add_board_subdirectory(board) # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) #M.P: fix me, should be declared as PRIVATE target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) target_compile_options(${PROJECT_NAME} - PUBLIC - ${TARGET_COMPILE_OPTIONS} PRIVATE -Wno-sign-compare -Wno-missing-field-initializers @@ -66,7 +42,6 @@ target_compile_options(${PROJECT_NAME} # C only flags $<$:-Wno-old-style-declaration> ) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) target_compile_definitions(${PROJECT_NAME} @@ -79,13 +54,15 @@ target_compile_definitions(${PROJECT_NAME} ) target_include_directories(${PROJECT_NAME} - PUBLIC - - ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC + $ ) -set_source_files_properties(${BOARD_SOURCE_FILES_PROPERTIES}) - target_link_libraries(${PROJECT_NAME} PUBLIC eventstore diff --git a/module-bsp/board/linux/CMakeLists.txt b/module-bsp/board/linux/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..52847a43fa9e2ace5c1635befbb8382dc70b1e27 --- /dev/null +++ b/module-bsp/board/linux/CMakeLists.txt @@ -0,0 +1,44 @@ + +target_sources(module-bsp + PRIVATE + board.cpp + + battery-charger/battery_charger.cpp + bluetooth/Bluetooth.cpp + bluetooth/test/bsp_bt.cpp + cellular/linux_cellular.cpp + eeprom/eeprom.cpp + eink_frontlight/eink_frontlight.cpp + eink/ED028TC1.c + headset/headset.cpp + keyboard/keyboard.cpp + keypad_backlight/keypad_backlight.cpp + light_sensor/light_sensor.cpp + lpm/LinuxLPM.cpp + magnetometer/magnetometer.cpp + rtc/rtc.cpp + torch/torch.cpp + usb_cdc/usb_cdc.cpp + vibrator/vibrator.cpp + watchdog/software_watchdog.cpp + watchdog/watchdog.cpp +) + +target_include_directories( + module-bsp + PUBLIC + $ +) + +set_source_files_properties(board.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-function) + +target_compile_options(module-bsp PUBLIC "-Wno-unused-result") diff --git a/module-bsp/board/linux/keypad_backlight/keypad_backlight.cpp b/module-bsp/board/linux/keypad_backlight/keypad_backlight.cpp index 0b93af935f6dec2fcd90a1cc4b0eb67f89fc0dce..59058238ec24ac6341e8a714bee0ac382dcb1379 100644 --- a/module-bsp/board/linux/keypad_backlight/keypad_backlight.cpp +++ b/module-bsp/board/linux/keypad_backlight/keypad_backlight.cpp @@ -2,9 +2,6 @@ // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "bsp/keypad_backlight/keypad_backlight.hpp" -#include "bsp/BoardDefinitions.hpp" - -using namespace drivers; namespace bsp::keypad_backlight { diff --git a/module-bsp/board/linux/torch/torch.cpp b/module-bsp/board/linux/torch/torch.cpp index 2121e85799119f6ee29c7f75655b8d56acc1c82d..3c73f82681741a029740a25be6e61229d6b16427 100644 --- a/module-bsp/board/linux/torch/torch.cpp +++ b/module-bsp/board/linux/torch/torch.cpp @@ -3,10 +3,6 @@ #include "bsp/torch/torch.hpp" -#include "bsp/BoardDefinitions.hpp" - -using namespace drivers; - static xQueueHandle qHandleIrq = NULL; namespace bsp diff --git a/module-bsp/board/rt1051/CMakeLists.txt b/module-bsp/board/rt1051/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..324564da3f76ee2c877389905ffd522cc4aac7e1 --- /dev/null +++ b/module-bsp/board/rt1051/CMakeLists.txt @@ -0,0 +1,107 @@ +# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. +# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md + + +target_sources(module-bsp + PRIVATE + bluetooth/BlueKitchen.cpp + bluetooth/BluetoothCommon.cpp + bsp/audio/CodecMAX98090.cpp + bsp/audio/qfilter.c + bsp/battery-charger/battery_charger.cpp + bsp/cellular/rt1051_cellular.cpp + bsp/eeprom/eeprom.cpp + bsp/eink_frontlight/eink_frontlight.cpp + bsp/eink/bsp_eink.cpp + bsp/eink/ED028TC1.cpp + bsp/eink/eink_binarization_luts.c + bsp/eMMC/fsl_mmc.c + bsp/eMMC/fsl_sdmmc_common.c + bsp/eMMC/fsl_sdmmc_event.c + bsp/eMMC/fsl_sdmmc_host.c + bsp/headset/headset.cpp + bsp/keyboard/keyboard.cpp + bsp/keypad_backlight/keypad_backlight.cpp + bsp/light_sensor/light_sensor.cpp + bsp/lpm/ClockState.cpp + bsp/lpm/CpuFreqLPM.cpp + bsp/lpm/Oscillator.cpp + bsp/lpm/RT1051LPM.cpp + bsp/magnetometer/ALS31300.cpp + bsp/pit/pit.cpp + bsp/rtc/rtc.cpp + bsp/torch/torch.cpp + bsp/vibrator/vibrator.cpp + bsp/watchdog/watchdog.cpp + common/audio.cpp + common/board.cpp + common/chip.cpp + common/clock_config.cpp + common/fsl_drivers/fsl_adc.c + common/fsl_drivers/fsl_cache.c + common/fsl_drivers/fsl_clock.c + common/fsl_drivers/fsl_clock.c + common/fsl_drivers/fsl_common.c + common/fsl_drivers/fsl_dcdc.c + common/fsl_drivers/fsl_dmamux.c + common/fsl_drivers/fsl_edma.c + common/fsl_drivers/fsl_flexram.c + common/fsl_drivers/fsl_gpc.c + common/fsl_drivers/fsl_gpio.c + common/fsl_drivers/fsl_gpt.c + common/fsl_drivers/fsl_lpi2c.c + common/fsl_drivers/fsl_lpspi_edma.c + common/fsl_drivers/fsl_lpspi.c + common/fsl_drivers/fsl_lpuart_edma.c + common/fsl_drivers/fsl_lpuart.c + common/fsl_drivers/fsl_pit.c + common/fsl_drivers/fsl_pmu.c + common/fsl_drivers/fsl_pwm.c + common/fsl_drivers/fsl_rtwdog.c + common/fsl_drivers/fsl_sai_edma.c + common/fsl_drivers/fsl_sai.c + common/fsl_drivers/fsl_semc.c + common/fsl_drivers/fsl_snvs_hp.c + common/fsl_drivers/fsl_snvs_lp.c + common/fsl_drivers/fsl_src.c + common/fsl_drivers/fsl_usdhc.c + common/fsl_drivers/fsl_wdog.c + common/irq/irq_gpio.cpp + common/pin_mux.c + common/startup_mimxrt1052.cpp + common/system_MIMXRT1051.c + drivers/RT1051DriverDMA.cpp + drivers/RT1051DriverDMAMux.cpp + drivers/RT1051DriverGPIO.cpp + drivers/RT1051DriverI2C.cpp + drivers/RT1051DriverLPSPI.cpp + drivers/RT1051DriverLPUART.cpp + drivers/RT1051DriverOscillator.cpp + drivers/RT1051DriverPLL.cpp + drivers/RT1051DriverPLL2.cpp + drivers/RT1051DriverPWM.cpp + drivers/RT1051DriverSEMC.cpp + drivers/RT1051DriverUSDHC.cpp + bsp/magnetometer/magnetometer.cpp +) + +target_include_directories(module-bsp + PUBLIC + $ +) + +set_source_files_properties( + eMMC/fsl_mmc.c PROPERTIES COMPILE_FLAGS -Wno-unused-function + common/i2c.c PROPERTIES COMPILE_FLAGS -Wno-unused-function +) + +target_compile_definitions(module-bsp PUBLIC USB_STACK_FREERTOS) diff --git a/module-bsp/board/rt1051/bsp/BoardDefinitions.hpp b/module-bsp/board/rt1051/bsp/BoardDefinitions.hpp new file mode 100644 index 0000000000000000000000000000000000000000..b1dfd8bcb16fb20f556bbf21f3d464136f04a75e --- /dev/null +++ b/module-bsp/board/rt1051/bsp/BoardDefinitions.hpp @@ -0,0 +1,141 @@ +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. +// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md + +#ifndef PUREPHONE_BOARDDEFINITIONS_HPP +#define PUREPHONE_BOARDDEFINITIONS_HPP + +#include "drivers/dmamux/DriverDMAMux.hpp" +#include "drivers/dma/DriverDMA.hpp" +#include "drivers/i2c/DriverI2C.hpp" +#include "drivers/pll/DriverPLL.hpp" +#include "drivers/gpio/DriverGPIO.hpp" +#include "drivers/lpspi/DriverLPSPI.hpp" +#include "drivers/usdhc/DriverUSDHC.hpp" +#include "drivers/lpuart/DriverLPUART.hpp" + +enum class BoardDefinitions +{ + + POWER_SWITCH_HOLD_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), + POWER_SWITCH_HOLD_BUTTON = 7, + + USB_FUNCTION_MUX_SELECT = 25, // GPIO_AD_B1_09, USB_MUX_SEL0 + USB_POWER_ACK = 3, // GPIO_B0_03 Note: pull-up in order to read + I2C_STD_BAUDRATE = 100000, + + AUDIOCODEC_I2C_BAUDRATE = I2C_STD_BAUDRATE, + AUDIOCODEC_I2C = static_cast(drivers::I2CInstances ::I2C2), + AUDIOCODEC_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), + AUDIOCODEC_DMA = static_cast(drivers::DMAInstances ::DMA_0), + AUDIOCODEC_TX_DMA_CHANNEL = 6, + AUDIOCODEC_RX_DMA_CHANNEL = 7, + AUDIOCODEC_IRQ = 31, // GPIO_B1_15 requires pull-up 10kΩ + AUDIOCODEC_IRQ_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), + + MIC_BIAS_DRIVER_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), + MIC_BIAS_DRIVER_EN = 19, // GPIO_B1_03 MIC_LDO_EN + + CELLULAR_AUDIO_DMAMUX = AUDIOCODEC_DMAMUX, + CELLULAR_AUDIO_DMA = AUDIOCODEC_DMA, + CELLULAR_AUDIO_TX_DMA_CHANNEL = 2, + CELLULAR_AUDIO_RX_DMA_CHANNEL = 3, + + KEYBOARD_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, + KEYBOARD_I2C = AUDIOCODEC_I2C, + KEYBOARD_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), + KEYBOARD_RF_BUTTON = 6, + KEYBOARD_IRQ_PIN = 28, + KEYBOARD_RESET_PIN = 29, + + HEADSET_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, + HEADSET_I2C = AUDIOCODEC_I2C, + HEADSET_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), + HEADSET_IRQ_PIN = 30, + + BATTERY_CHARGER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, + BATTERY_CHARGER_I2C = AUDIOCODEC_I2C, + BATTERY_CHARGER_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), + BATTERY_CHARGER_INOKB_PIN = 12, + BATTERY_CHARGER_WCINOKB = 13, // UNUSABLE as WCIN is not connected to the charger ! + BATTERY_CHARGER_INTB_PIN = 14, // interrupt on charger/fuel-gauge event + + CELLULAR_DMA = static_cast(drivers::DMAInstances ::DMA_0), + CELLULAR_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), + CELLULAR_TX_DMA_CHANNEL = 4, + CELLULAR_RX_DMA_CHANNEL = 5, + CELLULAR_GPIO_1 = static_cast(drivers::GPIOInstances ::GPIO_1), + CELLULAR_GPIO_2 = static_cast(drivers::GPIOInstances ::GPIO_2), + CELLULAR_GPIO_3 = static_cast(drivers::GPIOInstances ::GPIO_3), + CELLULAR_GPIO_1_CTS_PIN = 14, + CELLULAR_GPIO_1_RTS_PIN = 15, + CELLULAR_GPIO_3_DTR_PIN = 27, + CELLULAR_GPIO_2_POWER_PIN = 18, + CELLULAR_GPIO_2_RESET_PIN = 17, + CELLULAR_GPIO_2_RI_PIN = 21, + CELLULAR_GPIO_2_APRDY_PIN = 16, + CELLULAR_GPIO_2_WAKEUP_PIN = 22, // GPIO_B1_06, long time no see. Active low, external pull-down 10kΩ. docs: 6. Do + // not pull up WAKEUP_IN, […], pins unless the module starts up sucessfully. + CELLULAR_GPIO_2_WIRELESS_DISABLE_PIN = 23, // GPIO_B1_07, pull-up in modem, active low, equiv. AT+CFUN=4, see docs + CELLULAR_GPIO_2_SIM_TRAY_INSERTED_PIN = 11, + CELLULAR_GPIO_2_NC = 10, // GPIO_B0_10 + CELLULAR_GPIO_2_SIMCARD_PRESENCE_PIN = 9, + CELLULAR_GPIO_2_SIMSEL_PIN = 20, // GPIO_B1_04 + CELLULAR_GPIO_2_ANTSEL_PIN = 2, + CELLULAR_GPIO_1_STATUS_PIN = 2, // GPIO_AD_B0_02 + CELLULAR_GPIO_2_USB_BOOT_PIN = 24, // GPIO_B1_08, output + CELLULAR_LPUART_INSTANCE = static_cast(drivers::LPUARTInstances::LPUART_1), + + EINK_DMA = static_cast(drivers::DMAInstances ::DMA_0), + EINK_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), + EINK_TX_DMA_CHANNEL = 0, + EINK_RX_DMA_CHANNEL = 1, + EINK_GPIO = static_cast(drivers::GPIOInstances ::GPIO_3), + EINK_CS_PIN = 13, + EINK_RESET_PIN = 16, + EINK_BUSY_PIN = 17, + EINK_PLL = static_cast(drivers::PLLInstances::PLL2_PFD2), + EINK_LPSPI_INSTANCE = static_cast(drivers::LPSPIInstances::LPSPI_1), + + BLUETOOTH_DMA = static_cast(drivers::DMAInstances ::DMA_0), + BLUETOOTH_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), + BLUETOOTH_TX_DMA_CHANNEL = 8, + BLUETOOTH_RX_DMA_CHANNEL = 9, + + EMMC_PLL = static_cast(drivers::PLLInstances::PLL2_PFD2), + EMMC_USDHC_INSTANCE = static_cast(drivers::USDHCInstances::USDHC_2), + + AUDIO_PLL = static_cast(drivers::PLLInstances::PLL4_Audio), + + VIBRATOR_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), + VIBRATOR_EN = 0, // GPIO_AD_B0_00 + + MAGNETOMETER_I2C = AUDIOCODEC_I2C, + MAGNETOMETER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, + MAGNETOMETER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), + MAGNETOMETER_IRQ = 20, // GPIO_AD_B1_04 + + TORCH_DRIVER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, // can do 400 kHz + TORCH_DRIVER_I2C = AUDIOCODEC_I2C, + TORCH_DRIVER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), + TORCH_DRIVER_EN = 21, // GPIO_AD_B1_05 Active HIGH. Internal pulldown resistor of 300kΩ between HWEN and GND. + + KEYPAD_BACKLIGHT_DRIVER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, + KEYPAD_BACKLIGHT_DRIVER_I2C = AUDIOCODEC_I2C, + KEYPAD_BACKLIGHT_DRIVER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), + KEYPAD_BACKLIGHT_DRIVER_NRST = + 3, // GPIO_AD_B0_03 Active LOW. External pulldown resistor of 10kΩ between NRST and GND. + + EINK_FRONTLIGHT_PWM_INSTANCE = 2, // GPIO_AD_B0_01 = FLEXPWM2_PWM3_B + EINK_FRONTLIGHT_PWM_MODULE = 3, + EINK_FRONTLIGHT_PWM_CHANNEL = 1, // B + + LIGHT_SENSOR_I2C = AUDIOCODEC_I2C, + LIGHT_SENSOR_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, + LIGHT_SENSOR_IRQ_GPIO = static_cast(drivers::GPIOInstances::GPIO_2), + LIGHT_SENSOR_IRQ = 15, // GPIO_B0_15 + + EEPROM_I2C = AUDIOCODEC_I2C, + EEPROM_I2C_BAUDRATE = I2C_STD_BAUDRATE, +}; + +#endif // PUREPHONE_BOARDDEFINITIONS_HPP diff --git a/module-bsp/board/cross/eMMC/eMMC.cpp b/module-bsp/board/rt1051/eMMC/eMMC.cpp similarity index 100% rename from module-bsp/board/cross/eMMC/eMMC.cpp rename to module-bsp/board/rt1051/eMMC/eMMC.cpp diff --git a/module-bsp/board/cross/eMMC/eMMC.hpp b/module-bsp/board/rt1051/eMMC/eMMC.hpp similarity index 100% rename from module-bsp/board/cross/eMMC/eMMC.hpp rename to module-bsp/board/rt1051/eMMC/eMMC.hpp diff --git a/module-bsp/bsp/BoardDefinitions.hpp b/module-bsp/bsp/BoardDefinitions.hpp deleted file mode 100644 index e43e4fa8ef87e3448dd8e7126eda279cc9598850..0000000000000000000000000000000000000000 --- a/module-bsp/bsp/BoardDefinitions.hpp +++ /dev/null @@ -1,136 +0,0 @@ -#ifndef PUREPHONE_BOARDDEFINITIONS_HPP -#define PUREPHONE_BOARDDEFINITIONS_HPP - -#include "drivers/dmamux/DriverDMAMux.hpp" -#include "drivers/dma/DriverDMA.hpp" -#include "drivers/i2c/DriverI2C.hpp" -#include "drivers/pll/DriverPLL.hpp" -#include "drivers/gpio/DriverGPIO.hpp" -#include "drivers/lpspi/DriverLPSPI.hpp" -#include "drivers/usdhc/DriverUSDHC.hpp" -#include "drivers/lpuart/DriverLPUART.hpp" - -enum class BoardDefinitions -{ - - POWER_SWITCH_HOLD_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), - POWER_SWITCH_HOLD_BUTTON = 7, - - USB_FUNCTION_MUX_SELECT = 25, // GPIO_AD_B1_09, USB_MUX_SEL0 - USB_POWER_ACK = 3, // GPIO_B0_03 Note: pull-up in order to read - I2C_STD_BAUDRATE = 100000, - - AUDIOCODEC_I2C_BAUDRATE = I2C_STD_BAUDRATE, - AUDIOCODEC_I2C = static_cast(drivers::I2CInstances ::I2C2), - AUDIOCODEC_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), - AUDIOCODEC_DMA = static_cast(drivers::DMAInstances ::DMA_0), - AUDIOCODEC_TX_DMA_CHANNEL = 6, - AUDIOCODEC_RX_DMA_CHANNEL = 7, - AUDIOCODEC_IRQ = 31, // GPIO_B1_15 requires pull-up 10kΩ - AUDIOCODEC_IRQ_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), - - MIC_BIAS_DRIVER_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), - MIC_BIAS_DRIVER_EN = 19, // GPIO_B1_03 MIC_LDO_EN - - CELLULAR_AUDIO_DMAMUX = AUDIOCODEC_DMAMUX, - CELLULAR_AUDIO_DMA = AUDIOCODEC_DMA, - CELLULAR_AUDIO_TX_DMA_CHANNEL = 2, - CELLULAR_AUDIO_RX_DMA_CHANNEL = 3, - - KEYBOARD_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, - KEYBOARD_I2C = AUDIOCODEC_I2C, - KEYBOARD_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), - KEYBOARD_RF_BUTTON = 6, - KEYBOARD_IRQ_PIN = 28, - KEYBOARD_RESET_PIN = 29, - - HEADSET_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, - HEADSET_I2C = AUDIOCODEC_I2C, - HEADSET_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), - HEADSET_IRQ_PIN = 30, - - BATTERY_CHARGER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, - BATTERY_CHARGER_I2C = AUDIOCODEC_I2C, - BATTERY_CHARGER_GPIO = static_cast(drivers::GPIOInstances ::GPIO_2), - BATTERY_CHARGER_INOKB_PIN = 12, - BATTERY_CHARGER_WCINOKB = 13, // UNUSABLE as WCIN is not connected to the charger ! - BATTERY_CHARGER_INTB_PIN = 14, // interrupt on charger/fuel-gauge event - - CELLULAR_DMA = static_cast(drivers::DMAInstances ::DMA_0), - CELLULAR_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), - CELLULAR_TX_DMA_CHANNEL = 4, - CELLULAR_RX_DMA_CHANNEL = 5, - CELLULAR_GPIO_1 = static_cast(drivers::GPIOInstances ::GPIO_1), - CELLULAR_GPIO_2 = static_cast(drivers::GPIOInstances ::GPIO_2), - CELLULAR_GPIO_3 = static_cast(drivers::GPIOInstances ::GPIO_3), - CELLULAR_GPIO_1_CTS_PIN = 14, - CELLULAR_GPIO_1_RTS_PIN = 15, - CELLULAR_GPIO_3_DTR_PIN = 27, - CELLULAR_GPIO_2_POWER_PIN = 18, - CELLULAR_GPIO_2_RESET_PIN = 17, - CELLULAR_GPIO_2_RI_PIN = 21, - CELLULAR_GPIO_2_APRDY_PIN = 16, - CELLULAR_GPIO_2_WAKEUP_PIN = 22, // GPIO_B1_06, long time no see. Active low, external pull-down 10kΩ. docs: 6. Do not pull up WAKEUP_IN, […], pins unless the module starts up sucessfully. - CELLULAR_GPIO_2_WIRELESS_DISABLE_PIN = 23, // GPIO_B1_07, pull-up in modem, active low, equiv. AT+CFUN=4, see docs - CELLULAR_GPIO_2_SIM_TRAY_INSERTED_PIN = 11, - CELLULAR_GPIO_2_NC = 10, // GPIO_B0_10 - CELLULAR_GPIO_2_SIMCARD_PRESENCE_PIN = 9, - CELLULAR_GPIO_2_SIMSEL_PIN = 20, // GPIO_B1_04 - CELLULAR_GPIO_2_ANTSEL_PIN = 2, - CELLULAR_GPIO_1_STATUS_PIN = 2, // GPIO_AD_B0_02 - CELLULAR_GPIO_2_USB_BOOT_PIN = 24, // GPIO_B1_08, output - CELLULAR_LPUART_INSTANCE = static_cast(drivers::LPUARTInstances::LPUART_1), - - EINK_DMA = static_cast(drivers::DMAInstances ::DMA_0), - EINK_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), - EINK_TX_DMA_CHANNEL = 0, - EINK_RX_DMA_CHANNEL = 1, - EINK_GPIO = static_cast(drivers::GPIOInstances ::GPIO_3), - EINK_CS_PIN = 13, - EINK_RESET_PIN=16, - EINK_BUSY_PIN=17, - EINK_PLL = static_cast(drivers::PLLInstances::PLL2_PFD2), - EINK_LPSPI_INSTANCE = static_cast(drivers::LPSPIInstances::LPSPI_1), - - BLUETOOTH_DMA = static_cast(drivers::DMAInstances ::DMA_0), - BLUETOOTH_DMAMUX = static_cast(drivers::DMAMuxInstances ::DMAMUX0), - BLUETOOTH_TX_DMA_CHANNEL = 8, - BLUETOOTH_RX_DMA_CHANNEL = 9, - - EMMC_PLL = static_cast(drivers::PLLInstances::PLL2_PFD2), - EMMC_USDHC_INSTANCE = static_cast(drivers::USDHCInstances::USDHC_2), - - AUDIO_PLL = static_cast(drivers::PLLInstances::PLL4_Audio), - - VIBRATOR_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), - VIBRATOR_EN = 0, // GPIO_AD_B0_00 - - MAGNETOMETER_I2C = AUDIOCODEC_I2C, - MAGNETOMETER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, - MAGNETOMETER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), - MAGNETOMETER_IRQ = 20, // GPIO_AD_B1_04 - - TORCH_DRIVER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, // can do 400 kHz - TORCH_DRIVER_I2C = AUDIOCODEC_I2C, - TORCH_DRIVER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), - TORCH_DRIVER_EN = 21, // GPIO_AD_B1_05 Active HIGH. Internal pulldown resistor of 300kΩ between HWEN and GND. - - KEYPAD_BACKLIGHT_DRIVER_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, - KEYPAD_BACKLIGHT_DRIVER_I2C = AUDIOCODEC_I2C, - KEYPAD_BACKLIGHT_DRIVER_GPIO = static_cast(drivers::GPIOInstances::GPIO_1), - KEYPAD_BACKLIGHT_DRIVER_NRST = 3, // GPIO_AD_B0_03 Active LOW. External pulldown resistor of 10kΩ between NRST and GND. - - EINK_FRONTLIGHT_PWM_INSTANCE = 2, // GPIO_AD_B0_01 = FLEXPWM2_PWM3_B - EINK_FRONTLIGHT_PWM_MODULE = 3, - EINK_FRONTLIGHT_PWM_CHANNEL = 1, // B - - LIGHT_SENSOR_I2C = AUDIOCODEC_I2C, - LIGHT_SENSOR_I2C_BAUDRATE = AUDIOCODEC_I2C_BAUDRATE, - LIGHT_SENSOR_IRQ_GPIO = static_cast(drivers::GPIOInstances::GPIO_2), - LIGHT_SENSOR_IRQ = 15, // GPIO_B0_15 - - EEPROM_I2C = AUDIOCODEC_I2C, - EEPROM_I2C_BAUDRATE = I2C_STD_BAUDRATE, -}; - -#endif //PUREPHONE_BOARDDEFINITIONS_HPP diff --git a/module-bsp/targets/Target_Cross.cmake b/module-bsp/targets/Target_Cross.cmake deleted file mode 100644 index 8df379bcb66a69ec605dde471334078116f20298..0000000000000000000000000000000000000000 --- a/module-bsp/targets/Target_Cross.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(BOARD_SOURCES ${BOARD_SOURCES} - - ${CMAKE_CURRENT_SOURCE_DIR}/board/cross/eMMC/eMMC.cpp - - - CACHE INTERNAL "" - ) - -set(BOARD_DIR_INCLUDES ${BOARD_DIR_INCLUDES} - - ${CMAKE_CURRENT_SOURCE_DIR}/board/cross - - CACHE INTERNAL "") - -set(BOARD_SOURCE_FILES_PROPERTIES ${BOARD_SOURCE_FILES_PROPERTIES} - - CACHE INTERNAL "") \ No newline at end of file diff --git a/module-bsp/targets/Target_Linux.cmake b/module-bsp/targets/Target_Linux.cmake deleted file mode 100644 index bccadd2716280d28877d2f36fb854b0546f800f2..0000000000000000000000000000000000000000 --- a/module-bsp/targets/Target_Linux.cmake +++ /dev/null @@ -1,54 +0,0 @@ - -set(BOARD_SOURCES - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/board.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/eink/ED028TC1.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/keyboard/keyboard.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/headset/headset.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/battery-charger/battery_charger.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/cellular/linux_cellular.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/rtc/rtc.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/bluetooth/test/bsp_bt.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/lpm/LinuxLPM.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/bluetooth/Bluetooth.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/usb_cdc/usb_cdc.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/vibrator/vibrator.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/magnetometer/magnetometer.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/torch/torch.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/keypad_backlight/keypad_backlight.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/eink_frontlight/eink_frontlight.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/light_sensor/light_sensor.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/watchdog/software_watchdog.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/watchdog/watchdog.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/linux/eeprom/eeprom.cpp" - - CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR}/board/linux - ${CMAKE_CURRENT_SOURCE_DIR}/board/linux/eink - ${CMAKE_CURRENT_SOURCE_DIR}/board/linux/pwr - ${CMAKE_CURRENT_SOURCE_DIR}/board/linux/audio - ${CMAKE_CURRENT_SOURCE_DIR}/bsp/headset - - ${CMAKE_SOURCE_DIR}/module-bluetooth/Bluetooth - ${CMAKE_SOURCE_DIR}/module-sys/ - - CACHE INTERNAL "") - -set(BOARD_SOURCE_FILES_PROPERTIES ${BOARD_SOURCE_FILES_PROPERTIES} ${CMAKE_CURRENT_SOURCE_DIR}/board/linux/board.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-function CACHE INTERNAL " ") - diff --git a/module-bsp/targets/Target_RT1051.cmake b/module-bsp/targets/Target_RT1051.cmake deleted file mode 100644 index 9f82f5546bd8c8e3141fecb81e73a9ef74e13b83..0000000000000000000000000000000000000000 --- a/module-bsp/targets/Target_RT1051.cmake +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. -# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -set(BOARD_SOURCES ${BOARD_SOURCES} - - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_cache.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_clock.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_common.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_dcdc.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_gpio.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_lpspi.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_lpspi_edma.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_lpuart.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_lpuart_edma.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_pit.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_pmu.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_semc.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_usdhc.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_sai.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_sai_edma.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_flexram.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_snvs_hp.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_snvs_lp.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_gpt.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_gpc.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_src.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_adc.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_lpi2c.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_clock.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_dmamux.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_edma.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_wdog.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_rtwdog.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_pwm.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/irq/irq_gpio.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/audio.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/board.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/chip.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/clock_config.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/pin_mux.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/startup_mimxrt1052.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/system_MIMXRT1051.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eMMC/fsl_mmc.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eMMC/fsl_sdmmc_common.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eMMC/fsl_sdmmc_event.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eMMC/fsl_sdmmc_host.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eink/bsp_eink.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eink/ED028TC1.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eink/eink_binarization_luts.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/keyboard/keyboard.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/headset/headset.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/cellular/rt1051_cellular.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/pit/pit.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/vibrator/vibrator.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/watchdog/watchdog.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/lpm/RT1051LPM.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/lpm/CpuFreqLPM.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/lpm/ClockState.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/lpm/Oscillator.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bluetooth/BluetoothCommon.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bluetooth/BlueKitchen.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/rtc/rtc.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/battery-charger/battery_charger.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/audio/CodecMAX98090.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/audio/qfilter.c" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverPLL.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverPLL2.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverLPSPI.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverLPUART.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverOscillator.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverUSDHC.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverSEMC.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverI2C.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverPWM.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverDMAMux.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverDMA.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/drivers/RT1051DriverGPIO.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/magnetometer/magnetometer.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/magnetometer/ALS31300.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/torch/torch.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/keypad_backlight/keypad_backlight.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eink_frontlight/eink_frontlight.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/light_sensor/light_sensor.cpp" - - "${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp/eeprom/eeprom.cpp" - CACHE INTERNAL "" -) - -set(BOARD_DIR_INCLUDES ${BOARD_DIR_INCLUDES} - - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/bsp - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/cmsis - ${CMAKE_CURRENT_SOURCE_DIR}/bsp - ${CMAKE_CURRENT_SOURCE_DIR}/drivers/i2c - ${CMAKE_CURRENT_SOURCE_DIR}/drivers/gpio - ${CMAKE_CURRENT_SOURCE_DIR}/bsp/headset - ${CMAKE_SOURCE_DIR}/module-bluetooth/Bluetooth - ${CMAKE_SOURCE_DIR}/module-sys/ - - CACHE INTERNAL "" -) - - -set(BOARD_SOURCE_FILES_PROPERTIES ${BOARD_SOURCE_FILES_PROPERTIES} - - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/eMMC/fsl_mmc.c PROPERTIES COMPILE_FLAGS -Wno-unused-function - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/i2c.c PROPERTIES COMPILE_FLAGS -Wno-unused-function - - CACHE INTERNAL "" -) - diff --git a/module-cellular/CMakeLists.txt b/module-cellular/CMakeLists.txt index 249445967e719c5ea12f4c7d428cc19524cc6c12..72b4f8a8e1fb44fa91096266b72a4b1455fb06cf 100644 --- a/module-cellular/CMakeLists.txt +++ b/module-cellular/CMakeLists.txt @@ -38,27 +38,13 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/at/cmd/src/CPBR.cpp ) -if(NOT ${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Cross.cmake) -else() - include(targets/Target_Linux.cmake) -endif() - - -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) - +add_library(${PROJECT_NAME} STATIC ${SOURCES}) # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) define_serial(${PROJECT_NAME}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) - target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/module-cellular/targets/Target_Cross.cmake b/module-cellular/targets/Target_Cross.cmake deleted file mode 100644 index 073e8c0c65483dc576bfef2cc7b092f40d520593..0000000000000000000000000000000000000000 --- a/module-cellular/targets/Target_Cross.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(BOARD_SOURCES - - CACHE INTERNAL "" - ) - -set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/cross CACHE INTERNAL "") - - - diff --git a/module-cellular/targets/Target_Linux.cmake b/module-cellular/targets/Target_Linux.cmake deleted file mode 100644 index 4070a37c6337f72be36a665b8789445c554b6cab..0000000000000000000000000000000000000000 --- a/module-cellular/targets/Target_Linux.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(BOARD_SOURCES CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "") diff --git a/module-db/CMakeLists.txt b/module-db/CMakeLists.txt index 430220d96c1369bd91751e8558a6bef49c02c277..fea4735f833db7ae948e6f89938d6e07928ec76c 100644 --- a/module-db/CMakeLists.txt +++ b/module-db/CMakeLists.txt @@ -112,24 +112,12 @@ set(SOURCES queries/alarms/QueryAlarmsTurnOffAll.cpp ) -if(NOT ${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Cross.cmake) -else() - include(targets/Target_Linux.cmake) -endif() - -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) +add_library(${PROJECT_NAME} STATIC ${SOURCES}) # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) - set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/Database/sqlite3vfs.cpp PROPERTIES COMPILE_FLAGS -Wno-overflow) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/Database/sqlite3.c PROPERTIES COMPILE_FLAGS "-DSQLITE_DEFAULT_WAL_AUTOCHECKPOINT=1 -Wno-misleading-indentation") diff --git a/module-db/targets/Target_Cross.cmake b/module-db/targets/Target_Cross.cmake deleted file mode 100644 index 073e8c0c65483dc576bfef2cc7b092f40d520593..0000000000000000000000000000000000000000 --- a/module-db/targets/Target_Cross.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(BOARD_SOURCES - - CACHE INTERNAL "" - ) - -set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/cross CACHE INTERNAL "") - - - diff --git a/module-db/targets/Target_Linux.cmake b/module-db/targets/Target_Linux.cmake deleted file mode 100644 index 4070a37c6337f72be36a665b8789445c554b6cab..0000000000000000000000000000000000000000 --- a/module-db/targets/Target_Linux.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(BOARD_SOURCES CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "") diff --git a/module-gui/CMakeLists.txt b/module-gui/CMakeLists.txt index 69cda51f90c213af77fdec7f6cbb84bdee532c08..072a4e07cf75e0240da5cb30bc79f245450e5256 100644 --- a/module-gui/CMakeLists.txt +++ b/module-gui/CMakeLists.txt @@ -3,14 +3,7 @@ project(module-gui VERSION 1.0 module_is_test_entity() -if( NOT ${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Cross.cmake) -else() - set(CMAKE_CXX_STANDARD 17) - include(targets/Target_Linux.cmake) -endif() - -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) +add_library(${PROJECT_NAME} STATIC ${SOURCES}) include(gui/CMakeLists.txt) include(gui/core/CMakeLists.txt) include(gui/widgets/CMakeLists.txt) @@ -37,13 +30,7 @@ target_link_libraries(${PROJECT_NAME} # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES} ) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) - target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/module-gui/targets/Target_Cross.cmake b/module-gui/targets/Target_Cross.cmake deleted file mode 100644 index ab311e9f638c6ece4ea9b078fad7f72c7a273857..0000000000000000000000000000000000000000 --- a/module-gui/targets/Target_Cross.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(BOARD_SOURCES - - - CACHE INTERNAL "" - ) - -set(BOARD_DIR_INCLUDES CACHE INTERNAL "") - - diff --git a/module-gui/targets/Target_Linux.cmake b/module-gui/targets/Target_Linux.cmake deleted file mode 100644 index 4d3dea1c41514df32b804a964c2f681bc531f0d5..0000000000000000000000000000000000000000 --- a/module-gui/targets/Target_Linux.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(BOARD_SOURCES - - CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES CACHE INTERNAL "") diff --git a/module-lwip/CMakeLists.txt b/module-lwip/CMakeLists.txt index 4f7055b486c4a34e006ed176a18ec4a61ca9b356..6de1cae34f720ccf0cc9835619bb392daeea3c64 100644 --- a/module-lwip/CMakeLists.txt +++ b/module-lwip/CMakeLists.txt @@ -1,11 +1,5 @@ project(module-lwip VERSION 1.0 DESCRIPTION "LwIP port layer") - -# remove -Werror for lwip -string(REPLACE "-Wno-error=format" "" LWIP_COMPILER_FLAGS "${TARGET_COMPILE_OPTIONS}") - -# module-lwip/lib/lwip/src/include/lwip/err.h - include(${CMAKE_CURRENT_SOURCE_DIR}/lwip-includes.cmake) set (SOURCES @@ -30,20 +24,13 @@ set(LWIP_LIBRARIES lwipcontribapps lwipallapps lwipcore) add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_DIR_SOURCES}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS} ${PROJECT_TARGET} - ${TARGET_COMPILE_DEFINITIONS} ${BOARD_DIR_DEFINITIONS} ) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) - target_include_directories( ${PROJECT_NAME} PUBLIC - ${BOARD_DIR_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} - ${TARGET_LIBRARIES_INCLUDES} ${LWIP_INCLUDE_DIRS} ) diff --git a/module-os/CMakeLists.txt b/module-os/CMakeLists.txt index 7f0c261ed0cc4ac9cfef0dc25f35c6dcda38bcd9..46d9f8834e291e35233a6e6d799a9d202248bb31 100644 --- a/module-os/CMakeLists.txt +++ b/module-os/CMakeLists.txt @@ -29,39 +29,18 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/LockGuard.cpp ) -#Substitute FreeRTOS SystemvView sources if enabled -if((${PROJECT_TARGET} STREQUAL "TARGET_RT1051") AND (${SYSTEM_VIEW_ENABLED})) - set(SOURCES ${SOURCES} - - ${CMAKE_CURRENT_SOURCE_DIR}/systemviewPatch/tasks.c - ) -else() - set(SOURCES ${SOURCES} - - ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/tasks.c - ) +add_library(${PROJECT_NAME} STATIC) +target_sources(module-os PRIVATE ${SOURCES}) +if(NOT ${SYSTEM_VIEW_ENABLED}) + target_sources(module-os PRIVATE FreeRTOS/tasks.c) endif() -if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - include(targets/Target_RT1051.cmake) -elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Linux.cmake) -else() - message(FATAL_ERROR "Invalid target!") -endif() - - -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) +add_board_subdirectory(board) # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) target_compile_definitions(${PROJECT_NAME} diff --git a/module-os/board/linux/CMakeLists.txt b/module-os/board/linux/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..575abbc794176fd2f6bc2606dcf070a5ef25fff6 --- /dev/null +++ b/module-os/board/linux/CMakeLists.txt @@ -0,0 +1,26 @@ +target_sources(module-os + PRIVATE +) + +target_sources( + module-os + PRIVATE + port.c + fsl_runtimestat_gpt.c +) + +target_include_directories( + module-os + PUBLIC + $ +) + +# suppress unused variable warning +set_source_files_properties( + port.c + fsl_runtimestat_gpt.c + PROPERTIES COMPILE_FLAGS + -Wno-unused-but-set-variable +) diff --git a/module-os/board/rt1051/CMakeLists.txt b/module-os/board/rt1051/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..7e31006be535896013596c491725e067f42d2bbc --- /dev/null +++ b/module-os/board/rt1051/CMakeLists.txt @@ -0,0 +1,28 @@ +target_sources( + module-os + PRIVATE + fsl_tickless_gpt.c + fsl_tickless_systick.c + fsl_runtimestat_gpt.c + + $<$: + systemview/port.c + systemview/tasks.c + > + $<$>: + port.c + > +) + +target_include_directories( + module-os + PUBLIC + $: + systemview + > + $<$>: + ${CMAKE_CURRENT_SOURCE_DIR} + > + > +) diff --git a/module-os/systemviewPatch/FreeRTOS.h b/module-os/board/rt1051/systemview/FreeRTOS.h similarity index 100% rename from module-os/systemviewPatch/FreeRTOS.h rename to module-os/board/rt1051/systemview/FreeRTOS.h diff --git a/module-os/systemviewPatch/FreeRTOSConfig.h b/module-os/board/rt1051/systemview/FreeRTOSConfig.h similarity index 100% rename from module-os/systemviewPatch/FreeRTOSConfig.h rename to module-os/board/rt1051/systemview/FreeRTOSConfig.h diff --git a/module-os/systemviewPatch/port.c b/module-os/board/rt1051/systemview/port.c similarity index 100% rename from module-os/systemviewPatch/port.c rename to module-os/board/rt1051/systemview/port.c diff --git a/module-os/systemviewPatch/portmacro.h b/module-os/board/rt1051/systemview/portmacro.h similarity index 100% rename from module-os/systemviewPatch/portmacro.h rename to module-os/board/rt1051/systemview/portmacro.h diff --git a/module-os/systemviewPatch/task.h b/module-os/board/rt1051/systemview/task.h similarity index 100% rename from module-os/systemviewPatch/task.h rename to module-os/board/rt1051/systemview/task.h diff --git a/module-os/systemviewPatch/tasks.c b/module-os/board/rt1051/systemview/tasks.c similarity index 100% rename from module-os/systemviewPatch/tasks.c rename to module-os/board/rt1051/systemview/tasks.c diff --git a/module-os/targets/Target_Linux.cmake b/module-os/targets/Target_Linux.cmake deleted file mode 100644 index 0b42c1dc3bcb827e1ddd2532527c3325973b5d57..0000000000000000000000000000000000000000 --- a/module-os/targets/Target_Linux.cmake +++ /dev/null @@ -1,14 +0,0 @@ -set(BOARD_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/board/linux/port.c - ${CMAKE_CURRENT_SOURCE_DIR}/board/linux/fsl_runtimestat_gpt.c - - CACHE INTERNAL "" - ) - -set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "") - -#Suppress unused variable warning -set_source_files_properties(${BOARD_SOURCES} - PROPERTIES COMPILE_FLAGS - "-Wno-unused-but-set-variable" -) diff --git a/module-os/targets/Target_RT1051.cmake b/module-os/targets/Target_RT1051.cmake deleted file mode 100644 index c56ced3a634b0f4589cea65dc28b639262716b63..0000000000000000000000000000000000000000 --- a/module-os/targets/Target_RT1051.cmake +++ /dev/null @@ -1,34 +0,0 @@ -set(BOARD_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/fsl_tickless_gpt.c - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/fsl_tickless_systick.c - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/fsl_runtimestat_gpt.c - - CACHE INTERNAL "" - ) - -#Substitute FreeRTOS SystemvView sources if enabled -if(${SYSTEM_VIEW_ENABLED}) - set(SOURCES ${SOURCES} - - ${CMAKE_CURRENT_SOURCE_DIR}/systemviewPatch/port.c - ) -else() - set(SOURCES ${SOURCES} - - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/port.c - ) -endif() - -set(BOARD_DIR_INCLUDES ${BOARD_DIR_INCLUDES} - - ${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051 - CACHE INTERNAL "") - -#Add FreeRTOS SystemvView headers if enabled -if(${SYSTEM_VIEW_ENABLED}) - set(BOARD_DIR_INCLUDES ${BOARD_DIR_INCLUDES} - - ${CMAKE_CURRENT_SOURCE_DIR}/systemviewPatch - CACHE INTERNAL "") -endif() - diff --git a/module-services/CMakeLists.txt b/module-services/CMakeLists.txt index 4c17b6f7d14a440569d8ad6fc103f9f5eb747d8a..58d29c0a63d9c87011e3d936ce599e683efe780e 100644 --- a/module-services/CMakeLists.txt +++ b/module-services/CMakeLists.txt @@ -5,16 +5,7 @@ module_is_test_entity() include(${CMAKE_SOURCE_DIR}/module-lwip/lwip-includes.cmake) -if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - include(targets/Target_RT1051.cmake) -elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux") - set(CMAKE_CXX_STANDARD 17) - include(targets/Target_Linux.cmake) -else() - message(FATAL_ERROR "Invalid target!") -endif() - -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) +add_library(${PROJECT_NAME} STATIC ${SOURCES}) add_subdirectory( service-alarm ) add_subdirectory( service-antenna ) @@ -55,12 +46,8 @@ target_link_libraries(${PROJECT_NAME} # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${LWIP_INCLUDE_DIRS}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/module-services/service-eink/CMakeLists.txt b/module-services/service-eink/CMakeLists.txt index 7f3020607bc54ef88b9480ad399a568132248980..db56ffa84764b87e39f516a044567aab5d86a027 100644 --- a/module-services/service-eink/CMakeLists.txt +++ b/module-services/service-eink/CMakeLists.txt @@ -1,17 +1,6 @@ project(service-eink) message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" ) -if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - set( EINK_BOARD_PATH "board/rt1051" ) -elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux") - set( EINK_BOARD_PATH "board/linux" ) - add_subdirectory( "board/linux/renderer" ) -else() - message(FATAL_ERROR "Invalid target!") -endif() - -message( "EINK BOARD PATH: ${CMAKE_CURRENT_LIST_DIR}/${EINK_BOARD_PATH}" ) - set(SOURCES ServiceEink.cpp EinkDisplay.cpp @@ -20,6 +9,7 @@ set(SOURCES ) add_library(${PROJECT_NAME} STATIC ${SOURCES}) +add_board_subdirectory(board) target_link_libraries( ${PROJECT_NAME} module-utils @@ -31,5 +21,4 @@ target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_CURRENT_LIST_DIR}/messages" - "${CMAKE_CURRENT_LIST_DIR}/${EINK_BOARD_PATH}" ) diff --git a/module-services/service-eink/EinkDisplay.cpp b/module-services/service-eink/EinkDisplay.cpp index cfcb3f5f42fcf25bbb7bb4a911262847fe9b43df..0797f9bc5d9c335cbf3fa4205aad972a9dfa235a 100644 --- a/module-services/service-eink/EinkDisplay.cpp +++ b/module-services/service-eink/EinkDisplay.cpp @@ -3,9 +3,12 @@ #include "EinkDisplay.hpp" +#if defined(TARGET_RT1051) +#include +#endif + #include #include -#include #include #include @@ -46,8 +49,10 @@ namespace service::eink : size{screenSize}, currentWaveform{createDefaultWaveFormSettings(EinkWaveformGC16)}, displayMode{EinkDisplayColorMode_e::EinkDisplayColorModeStandard} { +#if defined(TARGET_RT1051) driverLPSPI = drivers::DriverLPSPI::Create( "EInk", static_cast(BoardDefinitions::EINK_LPSPI_INSTANCE)); +#endif } EinkDisplay::~EinkDisplay() noexcept diff --git a/module-services/service-eink/board/linux/CMakeLists.txt b/module-services/service-eink/board/linux/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..6ded94d031d8ae5ae1251ddd3985b8d231647ac6 --- /dev/null +++ b/module-services/service-eink/board/linux/CMakeLists.txt @@ -0,0 +1,6 @@ +target_include_directories( + service-eink + PUBLIC + $ +) +add_subdirectory(renderer) diff --git a/module-services/service-eink/board/rt1051/CMakeLists.txt b/module-services/service-eink/board/rt1051/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..0c025904f23c60146264aadbb94c921835ba2383 --- /dev/null +++ b/module-services/service-eink/board/rt1051/CMakeLists.txt @@ -0,0 +1,5 @@ +target_include_directories( + service-eink + PUBLIC + $ +) diff --git a/module-services/service-fileindexer/CMakeLists.txt b/module-services/service-fileindexer/CMakeLists.txt index a5b9f63ae1e141ef9cf61eb0b73e4770bc8512f1..547833902aa2b0b01ab7e7b9f42db9365f1f004c 100644 --- a/module-services/service-fileindexer/CMakeLists.txt +++ b/module-services/service-fileindexer/CMakeLists.txt @@ -1,17 +1,12 @@ project(service-fileindexer VERSION 1.0 DESCRIPTION "File indexer service ") -add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES}) +add_library(${PROJECT_NAME} STATIC ${SOURCES}) # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) - target_sources( ${PROJECT_NAME} PRIVATE diff --git a/module-services/targets/Target_Linux.cmake b/module-services/targets/Target_Linux.cmake deleted file mode 100644 index f7771ba64472a74c652ec1590232513ed5758f17..0000000000000000000000000000000000000000 --- a/module-services/targets/Target_Linux.cmake +++ /dev/null @@ -1,8 +0,0 @@ -#set(BOARD_SOURCES -# ${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/linux/ServiceEink.cpp -# CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/linux - ${CMAKE_CURRENT_SOURCE_DIR}/service-eink/ - CACHE INTERNAL "") \ No newline at end of file diff --git a/module-services/targets/Target_RT1051.cmake b/module-services/targets/Target_RT1051.cmake deleted file mode 100644 index 7998e387585d73dc28af16d395cd139aa9cb68ab..0000000000000000000000000000000000000000 --- a/module-services/targets/Target_RT1051.cmake +++ /dev/null @@ -1,8 +0,0 @@ -#set(BOARD_SOURCES -# ${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/rt1051/ServiceEink.cpp -# CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR}/service-eink/ - ${CMAKE_CURRENT_SOURCE_DIR}/service-eink/board/rt1051 - CACHE INTERNAL "") diff --git a/module-sys/CMakeLists.txt b/module-sys/CMakeLists.txt index 76bf3c9092ccff6bfb9226a904bdf8b5086316c7..ab40f3383524c66541cb3e0882d717dc21fdbf6e 100644 --- a/module-sys/CMakeLists.txt +++ b/module-sys/CMakeLists.txt @@ -29,28 +29,15 @@ set(SOURCES ) -if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - include(targets/Target_RT1051.cmake) -elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux") - include(targets/Target_Linux.cmake) -else() - message(FATAL_ERROR "Invalid target!") -endif() - add_library(bus STATIC ${BUS_IMPL_SOURCES}) target_link_libraries(bus PRIVATE module-os) target_compile_definitions(bus PRIVATE ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(bus PRIVATE ${PROJECT_TARGET}) -target_compile_definitions(bus PRIVATE ${TARGET_COMPILE_DEFINITIONS}) -target_compile_features(bus PRIVATE ${TARGET_COMPILE_FEATURES}) -target_compile_options(bus PRIVATE ${TARGET_COMPILE_OPTIONS}) -target_include_directories(bus PRIVATE ${BOARD_DIR_INCLUDES}) target_include_directories(bus PRIVATE ${PROJECT_INCLUDES}) -target_link_options(bus PRIVATE ${TARGET_LINK_OPTIONS}) add_library(module-sys) -target_sources(module-sys PRIVATE ${SOURCES} ${BOARD_SOURCES}) +target_sources(module-sys PRIVATE ${SOURCES}) target_link_libraries(module-sys PRIVATE @@ -68,15 +55,8 @@ target_link_libraries(module-sys # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(${PROJECT_NAME} PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) target_include_directories(${PROJECT_NAME} PUBLIC ../module-services ) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) - - target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/module-sys/targets/Target_Linux.cmake b/module-sys/targets/Target_Linux.cmake deleted file mode 100644 index 3f12f06c1c6de70296677fe2c6a5a0e2d88c1fed..0000000000000000000000000000000000000000 --- a/module-sys/targets/Target_Linux.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(BOARD_SOURCES CACHE INTERNAL "") - -set(BOARD_DIR_INCLUDES CACHE INTERNAL "") diff --git a/module-sys/targets/Target_RT1051.cmake b/module-sys/targets/Target_RT1051.cmake deleted file mode 100644 index 6bff553cd72aa4789526f834a0cf892ebb47dec4..0000000000000000000000000000000000000000 --- a/module-sys/targets/Target_RT1051.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(BOARD_SOURCES - - CACHE INTERNAL "" - ) - -set(BOARD_DIR_INCLUDES CACHE INTERNAL "") diff --git a/module-utils/CMakeLists.txt b/module-utils/CMakeLists.txt index 81b8e273b6d0b5a13142dad99426243b78a46629..f7af0bcdc3af7940b8918dd5be936b198344a508 100644 --- a/module-utils/CMakeLists.txt +++ b/module-utils/CMakeLists.txt @@ -37,12 +37,7 @@ PRIVATE # Board specific compilation definitions,options,include directories and features target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES}) -target_compile_features(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_OPTIONS}) -#target_compile_options( ${PROJECT_NAME} PUBLIC "-Wno-error=deprecated-declarations") -target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS}) target_include_directories(${PROJECT_NAME} PUBLIC diff --git a/module-utils/board/CMakeLists.txt b/module-utils/board/CMakeLists.txt index bfe44b39a50cc3e6fe5d248e28e519f2ca6703af..d4c4d135229ec00aa9db928afd6c1592a7c1ee5e 100644 --- a/module-utils/board/CMakeLists.txt +++ b/module-utils/board/CMakeLists.txt @@ -1,27 +1,2 @@ -if(${PROJECT_TARGET} STREQUAL "TARGET_Linux") - target_sources(board - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/linux/log_linux.cpp) - -elseif(${PROJECT_TARGET} STREQUAL "TARGET_RT1051") - target_sources(board - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/cross/log_rt1051.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cross/time_syscalls.cpp) - - if (${LOG_REDIRECT} STREQUAL "RTT_JLINK") - target_sources(board - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/cross/log_writeRTT.cpp) - elseif (${LOG_REDIRECT} STREQUAL "RTT_LUART") - target_sources(board - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/cross/log_writeLUART.cpp) - elseif ((${LOG_REDIRECT} STREQUAL "RTT_SYSTEMVIEW") AND (${SYSTEM_VIEW_ENABLED} EQUAL 1)) - target_sources(board - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/cross/log_writeSYSTEMVIEW.cpp) - endif () -endif() - +add_board_subdirectory() target_link_libraries(board PUBLIC module-bsp PRIVATE segger::rtt) diff --git a/module-utils/board/linux/CMakeLists.txt b/module-utils/board/linux/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..4f0ac64e008c1b7ade438b5b3effe35e1e9dfd39 --- /dev/null +++ b/module-utils/board/linux/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources( + board +PRIVATE + log_linux.cpp +) diff --git a/module-utils/board/rt1051/CMakeLists.txt b/module-utils/board/rt1051/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..aa5f7bbbf3c2e8492ac601b12b6a239e88292e19 --- /dev/null +++ b/module-utils/board/rt1051/CMakeLists.txt @@ -0,0 +1,25 @@ +target_sources(board + PRIVATE + log_rt1051.cpp + time_syscalls.cpp +) + +if (${LOG_REDIRECT} STREQUAL "RTT_JLINK") + target_sources( + board + PRIVATE + log_writeRTT.cpp + ) +elseif (${LOG_REDIRECT} STREQUAL "RTT_LUART") + target_sources( + board + PRIVATE + log_writeLUART.cpp + ) +elseif ((${LOG_REDIRECT} STREQUAL "RTT_SYSTEMVIEW") AND (${SYSTEM_VIEW_ENABLED} EQUAL 1)) + target_sources( + board + PRIVATE + log_writeSYSTEMVIEW.cpp + ) +endif () diff --git a/module-utils/board/cross/log_rt1051.cpp b/module-utils/board/rt1051/log_rt1051.cpp similarity index 100% rename from module-utils/board/cross/log_rt1051.cpp rename to module-utils/board/rt1051/log_rt1051.cpp diff --git a/module-utils/board/cross/log_writeLUART.cpp b/module-utils/board/rt1051/log_writeLUART.cpp similarity index 100% rename from module-utils/board/cross/log_writeLUART.cpp rename to module-utils/board/rt1051/log_writeLUART.cpp diff --git a/module-utils/board/cross/log_writeRTT.cpp b/module-utils/board/rt1051/log_writeRTT.cpp similarity index 100% rename from module-utils/board/cross/log_writeRTT.cpp rename to module-utils/board/rt1051/log_writeRTT.cpp diff --git a/module-utils/board/cross/log_writeSYSTEMVIEW.cpp b/module-utils/board/rt1051/log_writeSYSTEMVIEW.cpp similarity index 100% rename from module-utils/board/cross/log_writeSYSTEMVIEW.cpp rename to module-utils/board/rt1051/log_writeSYSTEMVIEW.cpp diff --git a/module-utils/board/cross/time_syscalls.cpp b/module-utils/board/rt1051/time_syscalls.cpp similarity index 100% rename from module-utils/board/cross/time_syscalls.cpp rename to module-utils/board/rt1051/time_syscalls.cpp diff --git a/module-vfs/CMakeLists.txt b/module-vfs/CMakeLists.txt index 8b5af09d9a5ee61a6d0a5db9ce377877a36138ae..1fdc563f321162ee1c41522bfe0a01cae293ffc5 100644 --- a/module-vfs/CMakeLists.txt +++ b/module-vfs/CMakeLists.txt @@ -71,13 +71,8 @@ target_sources(module-vfs target_compile_definitions(module-vfs PUBLIC ${PROJECT_CONFIG_DEFINITIONS}) target_compile_definitions(module-vfs PUBLIC ${PROJECT_TARGET}) -target_compile_definitions(module-vfs PUBLIC ${TARGET_COMPILE_DEFINITIONS}) -target_include_directories(module-vfs PUBLIC ${BOARD_DIR_INCLUDES}) target_include_directories(module-vfs PUBLIC ${PROJECT_INCLUDES}) target_include_directories(module-vfs PUBLIC ${CMAKE_BINARY_DIR}) -target_compile_features(module-vfs PUBLIC ${TARGET_COMPILE_FEATURES}) -target_compile_options(module-vfs PUBLIC ${TARGET_COMPILE_OPTIONS}) -target_link_options(module-vfs PUBLIC ${TARGET_LINK_OPTIONS}) target_include_directories(module-vfs PRIVATE diff --git a/products/BellHybrid/CMakeLists.txt b/products/BellHybrid/CMakeLists.txt index 543f862040b9e154c2c518dc63aab5b51bf330b3..0c4c59f895507e1c3a1912f8de0f51f6505220c5 100644 --- a/products/BellHybrid/CMakeLists.txt +++ b/products/BellHybrid/CMakeLists.txt @@ -5,15 +5,9 @@ target_link_directories(BellHybrid PRIVATE ${PROJECT_LIB_DIRECTORY}) target_compile_definitions(BellHybrid PRIVATE ${PROJECT_CONFIG_DEFINITIONS} - ${TARGET_COMPILE_DEFINITIONS} ${PROJECT_TARGET} ) -target_compile_features(BellHybrid - PRIVATE - ${TARGET_COMPILE_FEATURES} - ) - target_compile_options(BellHybrid PRIVATE $<$:-Wno-discarded-qualifiers> @@ -23,7 +17,6 @@ target_compile_options(BellHybrid target_sources(BellHybrid PRIVATE - ${TARGET_SOURCES} BellHybridMain.cpp PlatformFactory.cpp ) @@ -61,8 +54,6 @@ target_link_libraries(BellHybrid "$<$:CrashCatcher::CrashCatcher>" ) -target_link_options(BellHybrid PRIVATE ${TARGET_LINK_OPTIONS}) - if (${PROJECT_TARGET} STREQUAL "TARGET_Linux") add_dependencies(BellHybrid service_renderer) endif() diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt index 3331820b556074d4bb91590073fb2885817bd969..c4b6773c5efb7935922956e2cd320fef12e60ed0 100644 --- a/products/PurePhone/CMakeLists.txt +++ b/products/PurePhone/CMakeLists.txt @@ -10,17 +10,11 @@ target_link_directories(PurePhone PUBLIC ${PROJECT_LIB_DIRECTORY}) target_compile_definitions(PurePhone PRIVATE ${PROJECT_CONFIG_DEFINITIONS} - ${TARGET_COMPILE_DEFINITIONS} ${PROJECT_TARGET} ) define_serial(PurePhone) -target_compile_features(PurePhone - PRIVATE - ${TARGET_COMPILE_FEATURES} - ) - target_compile_options(PurePhone PRIVATE $<$:-Wno-discarded-qualifiers> @@ -29,7 +23,6 @@ target_compile_options(PurePhone target_sources(PurePhone PRIVATE - ${TARGET_SOURCES} PurePhoneMain.cpp PlatformFactory.cpp ) @@ -76,8 +69,6 @@ target_link_libraries(PurePhone "$<$:CrashCatcher::CrashCatcher>" ) -target_link_options(PurePhone PUBLIC ${TARGET_LINK_OPTIONS}) - if (${PROJECT_TARGET} STREQUAL "TARGET_Linux") add_dependencies(Pure service_renderer) endif()