M CMakeLists.txt => CMakeLists.txt +1 -5
@@ 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(
$<$<COMPILE_LANGUAGE:C>:-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)
M Target_Linux.cmake => Target_Linux.cmake +0 -9
@@ 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
M Target_RT1051.cmake => Target_RT1051.cmake +2 -53
@@ 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
$<$<COMPILE_LANGUAGE:CXX>:-Wno-register> # "register" keyword was marked as deprecated in C++17
$<$<COMPILE_LANGUAGE:CXX>:-Wno-literal-suffix>
- $<$<COMPILE_LANGUAGE:CXX>:-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)
D Target_Unittests.cmake => Target_Unittests.cmake +0 -47
@@ 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
M board/rt1051/CMakeLists.txt => board/rt1051/CMakeLists.txt +26 -0
@@ 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
+ $<BUILD_INTERFACE:
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/newlib/include
+ >
+)
+
+target_link_libraries(board
+ PUBLIC
+ CrashCatcher::CrashCatcher
+)
M cmake/modules/thirdparty.cmake => cmake/modules/thirdparty.cmake +0 -5
@@ 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 ()
M module-apps/CMakeLists.txt => module-apps/CMakeLists.txt +0 -5
@@ 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}
M module-apps/apps-common/CMakeLists.txt => module-apps/apps-common/CMakeLists.txt +0 -4
@@ 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
M module-audio/CMakeLists.txt => module-audio/CMakeLists.txt +0 -3
@@ 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
M module-bluetooth/CMakeLists.txt => module-bluetooth/CMakeLists.txt +0 -8
@@ 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
"$<$<COMPILE_LANGUAGE:C>:-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}
M module-bluetooth/lib/btstack.cmake => module-bluetooth/lib/btstack.cmake +0 -3
@@ 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
D module-bluetooth/targets/Target_Linux.cmake => module-bluetooth/targets/Target_Linux.cmake +0 -2
@@ 1,2 0,0 @@
-set(BOARD_SOURCES CACHE INTERNAL "")
-set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "")
M module-bsp/CMakeLists.txt => module-bsp/CMakeLists.txt +29 -52
@@ 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
$<$<COMPILE_LANGUAGE:C>:-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
+ $<BUILD_INTERFACE:
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/bsp/headset
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/gpio
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/i2c
+ >
)
-set_source_files_properties(${BOARD_SOURCE_FILES_PROPERTIES})
-
target_link_libraries(${PROJECT_NAME}
PUBLIC
eventstore
A module-bsp/board/linux/CMakeLists.txt => module-bsp/board/linux/CMakeLists.txt +44 -0
@@ 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
+ $<BUILD_INTERFACE:
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/audio
+ ${CMAKE_CURRENT_SOURCE_DIR}/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/eink
+ ${CMAKE_CURRENT_SOURCE_DIR}/pwr
+
+ ${CMAKE_SOURCE_DIR}/module-bluetooth/Bluetooth
+ ${CMAKE_SOURCE_DIR}/module-sys/
+ >
+)
+
+set_source_files_properties(board.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-function)
+
+target_compile_options(module-bsp PUBLIC "-Wno-unused-result")
M module-bsp/board/linux/keypad_backlight/keypad_backlight.cpp => module-bsp/board/linux/keypad_backlight/keypad_backlight.cpp +0 -3
@@ 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
{
M module-bsp/board/linux/torch/torch.cpp => module-bsp/board/linux/torch/torch.cpp +0 -4
@@ 3,10 3,6 @@
#include "bsp/torch/torch.hpp"
-#include "bsp/BoardDefinitions.hpp"
-
-using namespace drivers;
-
static xQueueHandle qHandleIrq = NULL;
namespace bsp
A module-bsp/board/rt1051/CMakeLists.txt => module-bsp/board/rt1051/CMakeLists.txt +107 -0
@@ 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
+ $<BUILD_INTERFACE:
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/bsp
+ ${CMAKE_CURRENT_SOURCE_DIR}/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/common/fsl_drivers
+ ${CMAKE_CURRENT_SOURCE_DIR}/common/cmsis
+
+ ${CMAKE_SOURCE_DIR}/module-bluetooth/Bluetooth
+ ${CMAKE_SOURCE_DIR}/module-sys/
+ >
+)
+
+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)
A module-bsp/board/rt1051/bsp/BoardDefinitions.hpp => module-bsp/board/rt1051/bsp/BoardDefinitions.hpp +141 -0
@@ 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<int>(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<int>(drivers::I2CInstances ::I2C2),
+ AUDIOCODEC_DMAMUX = static_cast<int>(drivers::DMAMuxInstances ::DMAMUX0),
+ AUDIOCODEC_DMA = static_cast<int>(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<int>(drivers::GPIOInstances ::GPIO_2),
+
+ MIC_BIAS_DRIVER_GPIO = static_cast<int>(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<int>(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<int>(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<int>(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<int>(drivers::DMAInstances ::DMA_0),
+ CELLULAR_DMAMUX = static_cast<int>(drivers::DMAMuxInstances ::DMAMUX0),
+ CELLULAR_TX_DMA_CHANNEL = 4,
+ CELLULAR_RX_DMA_CHANNEL = 5,
+ CELLULAR_GPIO_1 = static_cast<int>(drivers::GPIOInstances ::GPIO_1),
+ CELLULAR_GPIO_2 = static_cast<int>(drivers::GPIOInstances ::GPIO_2),
+ CELLULAR_GPIO_3 = static_cast<int>(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<int>(drivers::LPUARTInstances::LPUART_1),
+
+ EINK_DMA = static_cast<int>(drivers::DMAInstances ::DMA_0),
+ EINK_DMAMUX = static_cast<int>(drivers::DMAMuxInstances ::DMAMUX0),
+ EINK_TX_DMA_CHANNEL = 0,
+ EINK_RX_DMA_CHANNEL = 1,
+ EINK_GPIO = static_cast<int>(drivers::GPIOInstances ::GPIO_3),
+ EINK_CS_PIN = 13,
+ EINK_RESET_PIN = 16,
+ EINK_BUSY_PIN = 17,
+ EINK_PLL = static_cast<int>(drivers::PLLInstances::PLL2_PFD2),
+ EINK_LPSPI_INSTANCE = static_cast<int>(drivers::LPSPIInstances::LPSPI_1),
+
+ BLUETOOTH_DMA = static_cast<int>(drivers::DMAInstances ::DMA_0),
+ BLUETOOTH_DMAMUX = static_cast<int>(drivers::DMAMuxInstances ::DMAMUX0),
+ BLUETOOTH_TX_DMA_CHANNEL = 8,
+ BLUETOOTH_RX_DMA_CHANNEL = 9,
+
+ EMMC_PLL = static_cast<int>(drivers::PLLInstances::PLL2_PFD2),
+ EMMC_USDHC_INSTANCE = static_cast<int>(drivers::USDHCInstances::USDHC_2),
+
+ AUDIO_PLL = static_cast<int>(drivers::PLLInstances::PLL4_Audio),
+
+ VIBRATOR_GPIO = static_cast<int>(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<int>(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<int>(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<int>(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<int>(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
R module-bsp/board/cross/eMMC/eMMC.cpp => module-bsp/board/rt1051/eMMC/eMMC.cpp +0 -0
R module-bsp/board/cross/eMMC/eMMC.hpp => module-bsp/board/rt1051/eMMC/eMMC.hpp +0 -0
D module-bsp/bsp/BoardDefinitions.hpp => module-bsp/bsp/BoardDefinitions.hpp +0 -136
@@ 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<int>(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<int>(drivers::I2CInstances ::I2C2),
- AUDIOCODEC_DMAMUX = static_cast<int>(drivers::DMAMuxInstances ::DMAMUX0),
- AUDIOCODEC_DMA = static_cast<int>(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<int>(drivers::GPIOInstances ::GPIO_2),
-
- MIC_BIAS_DRIVER_GPIO = static_cast<int>(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<int>(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<int >(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<int >(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<int >(drivers::DMAInstances ::DMA_0),
- CELLULAR_DMAMUX = static_cast<int >(drivers::DMAMuxInstances ::DMAMUX0),
- CELLULAR_TX_DMA_CHANNEL = 4,
- CELLULAR_RX_DMA_CHANNEL = 5,
- CELLULAR_GPIO_1 = static_cast<int >(drivers::GPIOInstances ::GPIO_1),
- CELLULAR_GPIO_2 = static_cast<int >(drivers::GPIOInstances ::GPIO_2),
- CELLULAR_GPIO_3 = static_cast<int >(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<int >(drivers::LPUARTInstances::LPUART_1),
-
- EINK_DMA = static_cast<int >(drivers::DMAInstances ::DMA_0),
- EINK_DMAMUX = static_cast<int >(drivers::DMAMuxInstances ::DMAMUX0),
- EINK_TX_DMA_CHANNEL = 0,
- EINK_RX_DMA_CHANNEL = 1,
- EINK_GPIO = static_cast<int >(drivers::GPIOInstances ::GPIO_3),
- EINK_CS_PIN = 13,
- EINK_RESET_PIN=16,
- EINK_BUSY_PIN=17,
- EINK_PLL = static_cast<int >(drivers::PLLInstances::PLL2_PFD2),
- EINK_LPSPI_INSTANCE = static_cast<int >(drivers::LPSPIInstances::LPSPI_1),
-
- BLUETOOTH_DMA = static_cast<int >(drivers::DMAInstances ::DMA_0),
- BLUETOOTH_DMAMUX = static_cast<int >(drivers::DMAMuxInstances ::DMAMUX0),
- BLUETOOTH_TX_DMA_CHANNEL = 8,
- BLUETOOTH_RX_DMA_CHANNEL = 9,
-
- EMMC_PLL = static_cast<int >(drivers::PLLInstances::PLL2_PFD2),
- EMMC_USDHC_INSTANCE = static_cast<int >(drivers::USDHCInstances::USDHC_2),
-
- AUDIO_PLL = static_cast<int >(drivers::PLLInstances::PLL4_Audio),
-
- VIBRATOR_GPIO = static_cast<int>(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<int>(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<int>(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<int>(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<int>(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
D module-bsp/targets/Target_Cross.cmake => module-bsp/targets/Target_Cross.cmake +0 -17
@@ 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
D module-bsp/targets/Target_Linux.cmake => module-bsp/targets/Target_Linux.cmake +0 -54
@@ 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 " ")
-
D module-bsp/targets/Target_RT1051.cmake => module-bsp/targets/Target_RT1051.cmake +0 -113
@@ 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 ""
-)
-
M module-cellular/CMakeLists.txt => module-cellular/CMakeLists.txt +1 -15
@@ 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
D module-cellular/targets/Target_Cross.cmake => module-cellular/targets/Target_Cross.cmake +0 -9
@@ 1,9 0,0 @@
-set(BOARD_SOURCES
-
- CACHE INTERNAL ""
- )
-
-set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/cross CACHE INTERNAL "")
-
-
-
D module-cellular/targets/Target_Linux.cmake => module-cellular/targets/Target_Linux.cmake +0 -3
@@ 1,3 0,0 @@
-set(BOARD_SOURCES CACHE INTERNAL "")
-
-set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "")
M module-db/CMakeLists.txt => module-db/CMakeLists.txt +1 -13
@@ 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")
D module-db/targets/Target_Cross.cmake => module-db/targets/Target_Cross.cmake +0 -9
@@ 1,9 0,0 @@
-set(BOARD_SOURCES
-
- CACHE INTERNAL ""
- )
-
-set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/cross CACHE INTERNAL "")
-
-
-
D module-db/targets/Target_Linux.cmake => module-db/targets/Target_Linux.cmake +0 -3
@@ 1,3 0,0 @@
-set(BOARD_SOURCES CACHE INTERNAL "")
-
-set(BOARD_DIR_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/board/linux CACHE INTERNAL "")
M module-gui/CMakeLists.txt => module-gui/CMakeLists.txt +1 -14
@@ 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
D module-gui/targets/Target_Cross.cmake => module-gui/targets/Target_Cross.cmake +0 -9
@@ 1,9 0,0 @@
-set(BOARD_SOURCES
-
-
- CACHE INTERNAL ""
- )
-
-set(BOARD_DIR_INCLUDES CACHE INTERNAL "")
-
-
D module-gui/targets/Target_Linux.cmake => module-gui/targets/Target_Linux.cmake +0 -5
@@ 1,5 0,0 @@
-set(BOARD_SOURCES
-
- CACHE INTERNAL "")
-
-set(BOARD_DIR_INCLUDES CACHE INTERNAL "")
M module-lwip/CMakeLists.txt => module-lwip/CMakeLists.txt +0 -13
@@ 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}
)
M module-os/CMakeLists.txt => module-os/CMakeLists.txt +5 -26
@@ 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}
A module-os/board/linux/CMakeLists.txt => module-os/board/linux/CMakeLists.txt +26 -0
@@ 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
+ $<BUILD_INTERFACE:
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ >
+)
+
+# suppress unused variable warning
+set_source_files_properties(
+ port.c
+ fsl_runtimestat_gpt.c
+ PROPERTIES COMPILE_FLAGS
+ -Wno-unused-but-set-variable
+)
A module-os/board/rt1051/CMakeLists.txt => module-os/board/rt1051/CMakeLists.txt +28 -0
@@ 0,0 1,28 @@
+target_sources(
+ module-os
+ PRIVATE
+ fsl_tickless_gpt.c
+ fsl_tickless_systick.c
+ fsl_runtimestat_gpt.c
+
+ $<$<BOOL:${SYSTEM_VIEW_ENABLED}>:
+ systemview/port.c
+ systemview/tasks.c
+ >
+ $<$<NOT:$<BOOL:${SYSTEM_VIEW_ENABLED}>>:
+ port.c
+ >
+)
+
+target_include_directories(
+ module-os
+ PUBLIC
+ $<BUILD_INTERFACE:
+ $<$<BOOL:${SYSTEM_VIEW_ENABLED}>:
+ systemview
+ >
+ $<$<NOT:$<BOOL:${SYSTEM_VIEW_ENABLED}>>:
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ >
+ >
+)
R module-os/systemviewPatch/FreeRTOS.h => module-os/board/rt1051/systemview/FreeRTOS.h +0 -0
R module-os/systemviewPatch/FreeRTOSConfig.h => module-os/board/rt1051/systemview/FreeRTOSConfig.h +0 -0
R module-os/systemviewPatch/port.c => module-os/board/rt1051/systemview/port.c +0 -0
R module-os/systemviewPatch/portmacro.h => module-os/board/rt1051/systemview/portmacro.h +0 -0
R module-os/systemviewPatch/task.h => module-os/board/rt1051/systemview/task.h +0 -0
R module-os/systemviewPatch/tasks.c => module-os/board/rt1051/systemview/tasks.c +0 -0
D module-os/targets/Target_Linux.cmake => module-os/targets/Target_Linux.cmake +0 -14
@@ 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"
-)
D module-os/targets/Target_RT1051.cmake => module-os/targets/Target_RT1051.cmake +0 -34
@@ 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()
-
M module-services/CMakeLists.txt => module-services/CMakeLists.txt +1 -14
@@ 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
M module-services/service-eink/CMakeLists.txt => module-services/service-eink/CMakeLists.txt +1 -12
@@ 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}"
)
M module-services/service-eink/EinkDisplay.cpp => module-services/service-eink/EinkDisplay.cpp +6 -1
@@ 3,9 3,12 @@
#include "EinkDisplay.hpp"
+#if defined(TARGET_RT1051)
+#include <bsp/BoardDefinitions.hpp>
+#endif
+
#include <gui/core/Color.hpp>
#include <gsl/util>
-#include <bsp/BoardDefinitions.hpp>
#include <cstdio>
#include <cstring>
@@ 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<drivers::LPSPIInstances>(BoardDefinitions::EINK_LPSPI_INSTANCE));
+#endif
}
EinkDisplay::~EinkDisplay() noexcept
A module-services/service-eink/board/linux/CMakeLists.txt => module-services/service-eink/board/linux/CMakeLists.txt +6 -0
@@ 0,0 1,6 @@
+target_include_directories(
+ service-eink
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+add_subdirectory(renderer)
A module-services/service-eink/board/rt1051/CMakeLists.txt => module-services/service-eink/board/rt1051/CMakeLists.txt +5 -0
@@ 0,0 1,5 @@
+target_include_directories(
+ service-eink
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
M module-services/service-fileindexer/CMakeLists.txt => module-services/service-fileindexer/CMakeLists.txt +1 -6
@@ 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
D module-services/targets/Target_Linux.cmake => module-services/targets/Target_Linux.cmake +0 -8
@@ 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
D module-services/targets/Target_RT1051.cmake => module-services/targets/Target_RT1051.cmake +0 -8
@@ 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 "")
M module-sys/CMakeLists.txt => module-sys/CMakeLists.txt +1 -21
@@ 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
D module-sys/targets/Target_Linux.cmake => module-sys/targets/Target_Linux.cmake +0 -3
@@ 1,3 0,0 @@
-set(BOARD_SOURCES CACHE INTERNAL "")
-
-set(BOARD_DIR_INCLUDES CACHE INTERNAL "")
D module-sys/targets/Target_RT1051.cmake => module-sys/targets/Target_RT1051.cmake +0 -6
@@ 1,6 0,0 @@
-set(BOARD_SOURCES
-
- CACHE INTERNAL ""
- )
-
-set(BOARD_DIR_INCLUDES CACHE INTERNAL "")
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +0 -5
@@ 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
M module-utils/board/CMakeLists.txt => module-utils/board/CMakeLists.txt +1 -26
@@ 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)
A module-utils/board/linux/CMakeLists.txt => module-utils/board/linux/CMakeLists.txt +5 -0
@@ 0,0 1,5 @@
+target_sources(
+ board
+PRIVATE
+ log_linux.cpp
+)
A module-utils/board/rt1051/CMakeLists.txt => module-utils/board/rt1051/CMakeLists.txt +25 -0
@@ 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 ()
R module-utils/board/cross/log_rt1051.cpp => module-utils/board/rt1051/log_rt1051.cpp +0 -0
R module-utils/board/cross/log_writeLUART.cpp => module-utils/board/rt1051/log_writeLUART.cpp +0 -0
R module-utils/board/cross/log_writeRTT.cpp => module-utils/board/rt1051/log_writeRTT.cpp +0 -0
R module-utils/board/cross/log_writeSYSTEMVIEW.cpp => module-utils/board/rt1051/log_writeSYSTEMVIEW.cpp +0 -0
R module-utils/board/cross/time_syscalls.cpp => module-utils/board/rt1051/time_syscalls.cpp +0 -0
M module-vfs/CMakeLists.txt => module-vfs/CMakeLists.txt +0 -5
@@ 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
M products/BellHybrid/CMakeLists.txt => products/BellHybrid/CMakeLists.txt +0 -9
@@ 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
$<$<COMPILE_LANGUAGE:C>:-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
"$<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:CrashCatcher::CrashCatcher>"
)
-target_link_options(BellHybrid PRIVATE ${TARGET_LINK_OPTIONS})
-
if (${PROJECT_TARGET} STREQUAL "TARGET_Linux")
add_dependencies(BellHybrid service_renderer)
endif()
M products/PurePhone/CMakeLists.txt => products/PurePhone/CMakeLists.txt +0 -9
@@ 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
$<$<COMPILE_LANGUAGE:C>:-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
"$<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:CrashCatcher::CrashCatcher>"
)
-target_link_options(PurePhone PUBLIC ${TARGET_LINK_OPTIONS})
-
if (${PROJECT_TARGET} STREQUAL "TARGET_Linux")
add_dependencies(Pure service_renderer)
endif()