summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2022-05-10 22:14:00 +0700
committerhathach <[email protected]>2022-05-10 22:14:00 +0700
commit35b77a4a81b62da0558630a7148fb3934faa4391 (patch)
tree2158070ade8b83f7d4bd1fc93ab7559b32cd7d6a
parent717a47412548923123141503749f721184222cf0 (diff)
cmake lib rename
-rw-r--r--examples/dual/host_hid_to_device_cdc/CMakeLists.txt2
-rw-r--r--examples/host/bare_api/CMakeLists.txt2
-rw-r--r--examples/host/cdc_msc_hid/CMakeLists.txt2
-rw-r--r--examples/host/hid_controller/CMakeLists.txt2
-rw-r--r--hw/bsp/rp2040/family.cmake14
5 files changed, 11 insertions, 11 deletions
diff --git a/examples/dual/host_hid_to_device_cdc/CMakeLists.txt b/examples/dual/host_hid_to_device_cdc/CMakeLists.txt
index bf3e042d1..24ebfdec3 100644
--- a/examples/dual/host_hid_to_device_cdc/CMakeLists.txt
+++ b/examples/dual/host_hid_to_device_cdc/CMakeLists.txt
@@ -27,4 +27,4 @@ target_include_directories(${PROJECT} PUBLIC
# in hw/bsp/FAMILY/family.cmake for details.
family_configure_device_example(${PROJECT})
family_configure_host_example(${PROJECT})
-family_configure_pio_usb_example(${PROJECT})
+family_configure_pico_pio_usb_example(${PROJECT})
diff --git a/examples/host/bare_api/CMakeLists.txt b/examples/host/bare_api/CMakeLists.txt
index e2e8d4fd5..607ef22eb 100644
--- a/examples/host/bare_api/CMakeLists.txt
+++ b/examples/host/bare_api/CMakeLists.txt
@@ -27,4 +27,4 @@ target_include_directories(${PROJECT} PUBLIC
family_configure_host_example(${PROJECT})
# For rp2040, un-comment to enable pico-pio-usb
-# family_configure_pio_usb_example(${PROJECT})
+# family_configure_pico_pio_usb_example(${PROJECT})
diff --git a/examples/host/cdc_msc_hid/CMakeLists.txt b/examples/host/cdc_msc_hid/CMakeLists.txt
index ca0f8e48a..214e9f2e7 100644
--- a/examples/host/cdc_msc_hid/CMakeLists.txt
+++ b/examples/host/cdc_msc_hid/CMakeLists.txt
@@ -29,4 +29,4 @@ target_include_directories(${PROJECT} PUBLIC
family_configure_host_example(${PROJECT})
# For rp2040, un-comment to enable pico-pio-usb
-# family_configure_pio_usb_example(${PROJECT})
+# family_configure_pico_pio_usb_example(${PROJECT})
diff --git a/examples/host/hid_controller/CMakeLists.txt b/examples/host/hid_controller/CMakeLists.txt
index 60678fc1c..6227e0790 100644
--- a/examples/host/hid_controller/CMakeLists.txt
+++ b/examples/host/hid_controller/CMakeLists.txt
@@ -28,4 +28,4 @@ target_include_directories(${PROJECT} PUBLIC
family_configure_host_example(${PROJECT})
# For rp2040, un-comment to enable pico-pio-usb
-# family_configure_pio_usb_example(${PROJECT})
+# family_configure_pico_pio_usb_example(${PROJECT})
diff --git a/hw/bsp/rp2040/family.cmake b/hw/bsp/rp2040/family.cmake
index 06ca74988..f52274c15 100644
--- a/hw/bsp/rp2040/family.cmake
+++ b/hw/bsp/rp2040/family.cmake
@@ -61,26 +61,26 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
#------------------------------------
# PIO USB for both host and device
#------------------------------------
- add_library(tinyusb_pio_usb_base INTERFACE)
+ add_library(pico_pio_usb INTERFACE)
- target_sources(tinyusb_pio_usb_base INTERFACE
+ target_sources(pico_pio_usb INTERFACE
${TOP}/lib/Pico-PIO-USB/src/pio_usb.c
${TOP}/lib/Pico-PIO-USB/src/pio_usb_host.c
${TOP}/lib/Pico-PIO-USB/src/pio_usb_device.c
${TOP}/lib/Pico-PIO-USB/src/usb_crc.c
)
- target_include_directories(tinyusb_pio_usb_base INTERFACE
+ target_include_directories(pico_pio_usb INTERFACE
${TOP}/lib/Pico-PIO-USB/src
)
- target_link_libraries(tinyusb_pio_usb_base INTERFACE
+ target_link_libraries(pico_pio_usb INTERFACE
hardware_dma
hardware_pio
pico_multicore
)
- target_compile_definitions(tinyusb_pio_usb_base INTERFACE
+ target_compile_definitions(pico_pio_usb INTERFACE
PIO_USB_USE_TINYUSB
)
@@ -185,9 +185,9 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_host)
endfunction()
- function(family_configure_pio_usb_example TARGET)
+ function(family_configure_pico_pio_usb_example TARGET)
family_configure_target(${TARGET})
- target_link_libraries(${TARGET} PUBLIC pico_stdlib tinyusb_pio_usb_base)
+ target_link_libraries(${TARGET} PUBLIC pico_stdlib pico_pio_usb)
pico_generate_pio_header(tinyusb_common_base ${TOP}/lib/Pico-PIO-USB/src/usb_tx.pio)
pico_generate_pio_header(tinyusb_common_base ${TOP}/lib/Pico-PIO-USB/src/usb_rx.pio)
endfunction()