mirror of
https://github.com/hathach/tinyusb.git
synced 2025-04-16 05:42:56 +00:00
* don't force dependency on pico-pio-usb submodule
* suppress compiler warning/errors especially in pico-pio-usb * disable use of pico-pio-usb on gcc 11.3+ for now as it doesn't compile
This commit is contained in:
parent
792b552c5c
commit
8d3f0ffb95
@ -25,15 +25,3 @@ target_include_directories(${PROJECT} PUBLIC
|
|||||||
# Configure compilation flags and libraries for the example... see the corresponding function
|
# Configure compilation flags and libraries for the example... see the corresponding function
|
||||||
# in hw/bsp/FAMILY/family.cmake for details.
|
# in hw/bsp/FAMILY/family.cmake for details.
|
||||||
family_configure_host_example(${PROJECT})
|
family_configure_host_example(${PROJECT})
|
||||||
|
|
||||||
# For rp2040 enable pico-pio-usb
|
|
||||||
if(FAMILY STREQUAL "rp2040")
|
|
||||||
family_add_pico_pio_usb(${PROJECT})
|
|
||||||
|
|
||||||
# due to warnings from Pico-PIO-USB
|
|
||||||
target_compile_options(${PROJECT} PUBLIC
|
|
||||||
-Wno-error=cast-qual
|
|
||||||
-Wno-error=sign-conversion
|
|
||||||
-Wno-error=conversion
|
|
||||||
)
|
|
||||||
endif()
|
|
@ -28,15 +28,3 @@ target_include_directories(${PROJECT} PUBLIC
|
|||||||
# Configure compilation flags and libraries for the example... see the corresponding function
|
# Configure compilation flags and libraries for the example... see the corresponding function
|
||||||
# in hw/bsp/FAMILY/family.cmake for details.
|
# in hw/bsp/FAMILY/family.cmake for details.
|
||||||
family_configure_host_example(${PROJECT})
|
family_configure_host_example(${PROJECT})
|
||||||
|
|
||||||
# For rp2040 enable pico-pio-usb
|
|
||||||
if(FAMILY STREQUAL "rp2040")
|
|
||||||
family_add_pico_pio_usb(${PROJECT})
|
|
||||||
|
|
||||||
# due to warnings from Pico-PIO-USB
|
|
||||||
target_compile_options(${PROJECT} PUBLIC
|
|
||||||
-Wno-error=cast-qual
|
|
||||||
-Wno-error=sign-conversion
|
|
||||||
-Wno-error=conversion
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
@ -26,15 +26,3 @@ target_include_directories(${PROJECT} PUBLIC
|
|||||||
# Configure compilation flags and libraries for the example... see the corresponding function
|
# Configure compilation flags and libraries for the example... see the corresponding function
|
||||||
# in hw/bsp/FAMILY/family.cmake for details.
|
# in hw/bsp/FAMILY/family.cmake for details.
|
||||||
family_configure_host_example(${PROJECT})
|
family_configure_host_example(${PROJECT})
|
||||||
|
|
||||||
# For rp2040 enable pico-pio-usb
|
|
||||||
if(FAMILY STREQUAL "rp2040")
|
|
||||||
family_add_pico_pio_usb(${PROJECT})
|
|
||||||
|
|
||||||
# due to warnings from Pico-PIO-USB
|
|
||||||
target_compile_options(${PROJECT} PUBLIC
|
|
||||||
-Wno-error=cast-qual
|
|
||||||
-Wno-error=sign-conversion
|
|
||||||
-Wno-error=conversion
|
|
||||||
)
|
|
||||||
endif()
|
|
@ -32,14 +32,3 @@ target_include_directories(${PROJECT} PUBLIC
|
|||||||
# in hw/bsp/FAMILY/family.cmake for details.
|
# in hw/bsp/FAMILY/family.cmake for details.
|
||||||
family_configure_host_example(${PROJECT})
|
family_configure_host_example(${PROJECT})
|
||||||
|
|
||||||
# For rp2040 enable pico-pio-usb
|
|
||||||
if(FAMILY STREQUAL "rp2040")
|
|
||||||
family_add_pico_pio_usb(${PROJECT})
|
|
||||||
|
|
||||||
# due to warnings from Pico-PIO-USB
|
|
||||||
target_compile_options(${PROJECT} PUBLIC
|
|
||||||
-Wno-error=cast-qual
|
|
||||||
-Wno-error=sign-conversion
|
|
||||||
-Wno-error=conversion
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
@ -161,14 +161,22 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
|
|||||||
rp2040_family_configure_example_warnings(${TARGET})
|
rp2040_family_configure_example_warnings(${TARGET})
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
function(family_add_pico_pio_usb TARGET)
|
||||||
|
target_link_libraries(${TARGET} PUBLIC tinyusb_pico_pio_usb)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
function(family_configure_host_example TARGET)
|
function(family_configure_host_example TARGET)
|
||||||
family_configure_target(${TARGET})
|
family_configure_target(${TARGET})
|
||||||
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_host)
|
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_host)
|
||||||
rp2040_family_configure_example_warnings(${TARGET})
|
rp2040_family_configure_example_warnings(${TARGET})
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(family_add_pico_pio_usb TARGET)
|
# For rp2040 enable pico-pio-usb
|
||||||
target_link_libraries(${TARGET} PUBLIC tinyusb_pico_pio_usb)
|
if (TARGET tinyusb_pico_pio_usb)
|
||||||
|
# code does not compile with GCC 12+
|
||||||
|
if (NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.3))
|
||||||
|
family_add_pico_pio_usb(${PROJECT})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(family_configure_dual_usb_example TARGET)
|
function(family_configure_dual_usb_example TARGET)
|
||||||
@ -272,10 +280,36 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
|
|||||||
endif()
|
endif()
|
||||||
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
|
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
|
${PICO_TINYUSB_PATH}/lib/fatfs/source/ff.c
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "-Wno-stringop-overflow -Wno-array-bounds")
|
COMPILE_FLAGS "-Wno-stringop-overflow -Wno-array-bounds")
|
||||||
endif()
|
endif()
|
||||||
|
set_source_files_properties(
|
||||||
|
${PICO_TINYUSB_PATH}/lib/fatfs/source/ff.c
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-conversion -Wno-cast-qual")
|
||||||
|
|
||||||
|
set_source_files_properties(
|
||||||
|
${PICO_TINYUSB_PATH}/lib/lwip/src/core/tcp_in.c
|
||||||
|
${PICO_TINYUSB_PATH}/lib/lwip/src/core/tcp_out.c
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-conversion")
|
||||||
|
|
||||||
|
set_source_files_properties(
|
||||||
|
${PICO_TINYUSB_PATH}/lib/networking/dnserver.c
|
||||||
|
${PICO_TINYUSB_PATH}/lib/networking/dhserver.c
|
||||||
|
${PICO_TINYUSB_PATH}/lib/networking/rndis_reports.c
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-conversion -Wno-sign-conversion")
|
||||||
|
|
||||||
|
if (TARGET tinyusb_pico_pio_usb)
|
||||||
|
set_source_files_properties(
|
||||||
|
${PICO_TINYUSB_PATH}/hw/mcu/raspberry_pi/Pico-PIO-USB/src/pio_usb_device.c
|
||||||
|
${PICO_TINYUSB_PATH}/hw/mcu/raspberry_pi/Pico-PIO-USB/src/pio_usb.c
|
||||||
|
${PICO_TINYUSB_PATH}/hw/mcu/raspberry_pi/Pico-PIO-USB/src/pio_usb_host.c
|
||||||
|
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/pio_usb/hcd_pio_usb.c
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-conversion -Wno-cast-qual -Wno-attributes")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user