From 752033164fd0b0772e1cd6ff2f153718f0e2cb69 Mon Sep 17 00:00:00 2001 From: DariuszSabala Date: Mon, 14 Jun 2021 16:46:46 +0200 Subject: [PATCH] [BH-464] Moved USB stack to third-party dir Moved USB stack, defined separate library and its dependencies, assigned library to specific sections in linker script, reduced build time by more than 10 percent thanks to ending building usb stack file both in module-bsp and module-vfs --- .gitmodules | 6 ++-- board/rt1051/ldscripts/sections.ld | 2 ++ module-bsp/board/rt1051/bsp/usb | 1 - module-bsp/targets/Target_RT1051.cmake | 4 --- .../service-desktop/CMakeLists.txt | 1 + third-party/CMakeLists.txt | 28 ++++++++++--------- third-party/usb_stack | 1 + 7 files changed, 22 insertions(+), 21 deletions(-) delete mode 160000 module-bsp/board/rt1051/bsp/usb create mode 160000 third-party/usb_stack diff --git a/.gitmodules b/.gitmodules index cea833e0fccee4e2e9c4897c7b762e878845da88..2f165addd8d7e6a3c076b9f54f5285bbb5685d85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/board/rt1051/ldscripts/sections.ld b/board/rt1051/ldscripts/sections.ld index ddb61b47e402c4bc608ea687b46339c4e05def88..4c25eb961cf3c6e433b2bd244fe54a35f95ac798 100644 --- a/board/rt1051/ldscripts/sections.ld +++ b/board/rt1051/ldscripts/sections.ld @@ -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 */ diff --git a/module-bsp/board/rt1051/bsp/usb b/module-bsp/board/rt1051/bsp/usb deleted file mode 160000 index a2c9e2d9ab20427cd8675c7eccd2a12a0fd40ccb..0000000000000000000000000000000000000000 --- a/module-bsp/board/rt1051/bsp/usb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a2c9e2d9ab20427cd8675c7eccd2a12a0fd40ccb diff --git a/module-bsp/targets/Target_RT1051.cmake b/module-bsp/targets/Target_RT1051.cmake index ddc5c20346ee5dd23bcefe0856d948615ed43fcb..9f82f5546bd8c8e3141fecb81e73a9ef74e13b83 100644 --- a/module-bsp/targets/Target_RT1051.cmake +++ b/module-bsp/targets/Target_RT1051.cmake @@ -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 "" ) diff --git a/module-services/service-desktop/CMakeLists.txt b/module-services/service-desktop/CMakeLists.txt index 7f38ed8f7e7d008c9d63fcc7dd8328f123e34899..ee5c9e578d93535df722a71bc923f7b45f4cb10f 100644 --- a/module-services/service-desktop/CMakeLists.txt +++ b/module-services/service-desktop/CMakeLists.txt @@ -66,6 +66,7 @@ target_link_libraries(${PROJECT_NAME} Microsoft.GSL::GSL json::json base64::base64 + $<$:usb_stack::usb_stack> PUBLIC module-cellular eventstore diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index b7499e1e5440bb21d1305020a78603bb4ccd4472..95cc074a9bd36f9c70f4a9a42599de68c8957dc2 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -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 diff --git a/third-party/usb_stack b/third-party/usb_stack new file mode 160000 index 0000000000000000000000000000000000000000..55448aebc85f27aba795cb0d4caacf5258b3943a --- /dev/null +++ b/third-party/usb_stack @@ -0,0 +1 @@ +Subproject commit 55448aebc85f27aba795cb0d4caacf5258b3943a