M .gitmodules => .gitmodules +3 -3
@@ 44,9 44,6 @@
[submodule "module-utils/tinyexpr"]
path = third-party/tinyexpr/src
url = https://github.com/codeplea/tinyexpr.git
-[submodule "module-bsp/board/rt1051/bsp/usb"]
- path = module-bsp/board/rt1051/bsp/usb
- url = ../usb_stack.git
[submodule "module-vfs/thirdparty/fatfs"]
path = third-party/fatfs/src
url = ../fatfs.git
@@ 93,3 90,6 @@
path = third-party/hash-library/src
url = https://github.com/mudita/hash-library.git
branch = rt1051
+[submodule "third-party/usb_stack"]
+ path = third-party/usb_stack
+ url = ../usb_stack.git
M board/rt1051/ldscripts/sections.ld => board/rt1051/ldscripts/sections.ld +2 -0
@@ 83,6 83,7 @@ SECTIONS
*libmodule-os.a:*(.bss*)
*libmodule-sys.a:*(.bss*)
*libmodule-bsp.a:*(.bss*)
+ *libusb_stack.a:*(.bss*)
} > SRAM_DTC
/* System initialized data */
@@ 93,6 94,7 @@ SECTIONS
*libmodule-os.a:*(.data*)
*libmodule-sys.a:*(.data*)
*libmodule-bsp.a:*(.data*)
+ *libusb_stack.a:*(.data*)
} > SRAM_DTC AT > BOARD_SDRAM_TEXT
/* MAIN TEXT SECTION */
D module-bsp/board/rt1051/bsp/usb => module-bsp/board/rt1051/bsp/usb +0 -1
@@ 1,1 0,0 @@
-Subproject commit a2c9e2d9ab20427cd8675c7eccd2a12a0fd40ccb
M module-bsp/targets/Target_RT1051.cmake => module-bsp/targets/Target_RT1051.cmake +0 -4
@@ 1,8 1,6 @@
# Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-include(board/rt1051/bsp/usb/usb.cmake)
-
set(BOARD_SOURCES ${BOARD_SOURCES}
"${CMAKE_CURRENT_SOURCE_DIR}/board/rt1051/common/fsl_drivers/fsl_cache.c"
@@ 65,7 63,6 @@ set(BOARD_SOURCES ${BOARD_SOURCES}
"${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"
- "${USB_SRC}"
"${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"
@@ 101,7 98,6 @@ set(BOARD_DIR_INCLUDES ${BOARD_DIR_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/bsp/headset
${CMAKE_SOURCE_DIR}/module-bluetooth/Bluetooth
${CMAKE_SOURCE_DIR}/module-sys/
- ${USB_DIR_INCLUDES}
CACHE INTERNAL ""
)
M module-services/service-desktop/CMakeLists.txt => module-services/service-desktop/CMakeLists.txt +1 -0
@@ 66,6 66,7 @@ target_link_libraries(${PROJECT_NAME}
Microsoft.GSL::GSL
json::json
base64::base64
+ $<$<STREQUAL:${PROJECT_TARGET},TARGET_RT1051>:usb_stack::usb_stack>
PUBLIC
module-cellular
eventstore
M third-party/CMakeLists.txt => third-party/CMakeLists.txt +15 -13
@@ 1,22 1,24 @@
+add_subdirectory(base64)
+add_subdirectory(date)
+add_subdirectory(fatfs)
+add_subdirectory(gsl)
+add_subdirectory(hash-library)
+add_subdirectory(json)
+add_subdirectory(libphonenumber)
+add_subdirectory(littlefs)
add_subdirectory(magic_enum)
add_subdirectory(microtar)
-add_subdirectory(date)
-add_subdirectory(pugixml)
-add_subdirectory(sml)
-add_subdirectory(taglib)
add_subdirectory(minimp3)
-add_subdirectory(tinyexpr)
add_subdirectory(parallel-hashmap)
add_subdirectory(protobuf)
-add_subdirectory(littlefs)
-add_subdirectory(json)
-add_subdirectory(gsl)
+add_subdirectory(pugixml)
add_subdirectory(re2)
+add_subdirectory(sml)
+add_subdirectory(taglib)
+add_subdirectory(tinyexpr)
+add_subdirectory(usb_stack)
add_subdirectory(utz)
-add_subdirectory(libphonenumber)
+
if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
add_subdirectory(CrashDebug)
-endif()
-add_subdirectory(fatfs)
-add_subdirectory(base64)
-add_subdirectory(hash-library)
+endif()<
\ No newline at end of file
A third-party/usb_stack => third-party/usb_stack +1 -0
@@ 0,0 1,1 @@
+Subproject commit 55448aebc85f27aba795cb0d4caacf5258b3943a