Skip to content

Commit 6b3a595

Browse files
hathachhathach
committed
cmake remove EXAMPLE-tinyusb target as library
1 parent dc514c6 commit 6b3a595

File tree

54 files changed

+164
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+164
-218
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
toolchain:
6060
# - 'arm-clang' is built by circle-ci in PR
6161
- 'aarch64-gcc'
62-
# - 'arm-gcc'
62+
- 'arm-gcc'
6363
- 'msp430-gcc'
6464
- 'riscv-gcc'
6565
with:
@@ -72,7 +72,7 @@ jobs:
7272
# Build Make (built by circle-ci in PR, only build on push here)
7373
# ---------------------------------------
7474
make:
75-
if: github.event_name == 'push' && false
75+
if: github.event_name == 'push'
7676
needs: set-matrix
7777
uses: ./.github/workflows/build_util.yml
7878
strategy:
@@ -113,7 +113,7 @@ jobs:
113113
# Build IAR on HFP self-hosted
114114
# ---------------------------------------
115115
arm-iar:
116-
if: github.repository_owner == 'hathach' && github.event_name == 'push' && false
116+
if: github.repository_owner == 'hathach' && github.event_name == 'push'
117117
needs: set-matrix
118118
runs-on: [self-hosted, Linux, X64, hifiphile]
119119
env:

‎hw/bsp/broadcom_32bit/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,14 @@ function(family_configure_example TARGET RTOS)
9595

9696
# Add TinyUSB target and port source
9797
family_add_tinyusb(${TARGET} OPT_MCU_BCM2835)
98-
target_sources(${TARGET}-tinyusb PUBLIC
98+
target_sources(${TARGET} PUBLIC
9999
${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c
100100
${TOP}/src/portable/synopsys/dwc2/hcd_dwc2.c
101101
${TOP}/src/portable/synopsys/dwc2/dwc2_common.c
102102
)
103-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
103+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
104+
104105

105-
# Link dependencies
106-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
107106

108107
# Flashing
109108
family_add_bin_hex(${TARGET})

‎hw/bsp/broadcom_64bit/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,14 @@ function(family_configure_example TARGET RTOS)
102102

103103
# Add TinyUSB target and port source
104104
family_add_tinyusb(${TARGET} OPT_MCU_BCM${BCM_VERSION})
105-
target_sources(${TARGET}-tinyusb PUBLIC
105+
target_sources(${TARGET} PUBLIC
106106
${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c
107107
${TOP}/src/portable/synopsys/dwc2/hcd_dwc2.c
108108
${TOP}/src/portable/synopsys/dwc2/dwc2_common.c
109109
)
110-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
110+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
111+
111112

112-
# Link dependencies
113-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
114113

115114
# Flashing
116115
family_add_bin_hex(${TARGET})

‎hw/bsp/ch32v10x/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,12 @@ function(family_configure_example TARGET RTOS)
100100
# Add TinyUSB target and port source
101101
family_add_tinyusb(${TARGET} OPT_MCU_CH32V103)
102102

103-
target_sources(${TARGET}-tinyusb PUBLIC
103+
target_sources(${TARGET} PUBLIC
104104
${TOP}/src/portable/wch/dcd_ch32_usbfs.c
105105
)
106-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
106+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
107+
107108

108-
# Link dependencies
109-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
110109

111110
# Flashing
112111
family_add_bin_hex(${TARGET})

‎hw/bsp/ch32v20x/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,13 @@ function(family_configure_example TARGET RTOS)
125125
# Add TinyUSB target and port source
126126
family_add_tinyusb(${TARGET} OPT_MCU_CH32V20X)
127127

128-
target_sources(${TARGET}-tinyusb PUBLIC
128+
target_sources(${TARGET} PUBLIC
129129
${TOP}/src/portable/wch/dcd_ch32_usbfs.c
130130
${TOP}/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
131131
)
132-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
132+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
133+
133134

134-
# Link dependencies
135-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
136135

137136
# Flashing
138137
family_add_bin_hex(${TARGET})

‎hw/bsp/ch32v307/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,13 @@ function(family_configure_example TARGET RTOS)
114114

115115
# Add TinyUSB target and port source
116116
family_add_tinyusb(${TARGET} OPT_MCU_CH32V307)
117-
target_sources(${TARGET}-tinyusb PUBLIC
117+
target_sources(${TARGET} PUBLIC
118118
${TOP}/src/portable/wch/dcd_ch32_usbhs.c
119119
${TOP}/src/portable/wch/dcd_ch32_usbfs.c
120120
)
121-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
121+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
122+
122123

123-
# Link dependencies
124-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
125124

126125
# Flashing
127126
family_add_bin_hex(${TARGET})

‎hw/bsp/da1469x/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,12 @@ function(family_configure_example TARGET RTOS)
127127

128128
# Add TinyUSB target and port source
129129
family_add_tinyusb(${TARGET} OPT_MCU_DA1469X)
130-
target_sources(${TARGET}-tinyusb PUBLIC
130+
target_sources(${TARGET} PUBLIC
131131
${TOP}/src/portable/dialog/da146xx/dcd_da146xx.c
132132
)
133-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
133+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
134+
134135

135-
# Link dependencies
136-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
137136

138137
# Flashing
139138
family_add_bin_hex(${TARGET})

‎hw/bsp/f1c100s/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,12 @@ function(family_configure_example TARGET RTOS)
101101

102102
# Add TinyUSB target and port source
103103
family_add_tinyusb(${TARGET} OPT_MCU_F1C100S)
104-
target_sources(${TARGET}-tinyusb PRIVATE
104+
target_sources(${TARGET} PRIVATE
105105
${TOP}/src/portable/sunxi/dcd_sunxi_musb.c
106106
)
107-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
107+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
108+
108109

109-
# Link dependencies
110-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
111110

112111
# Flashing
113112
family_add_bin_hex(${TARGET})

‎hw/bsp/fomu/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ function(family_configure_example TARGET RTOS)
7878

7979
# Add TinyUSB target and port source
8080
family_add_tinyusb(${TARGET} OPT_MCU_VALENTYUSB_EPTRI)
81-
target_sources(${TARGET}-tinyusb PUBLIC
81+
target_sources(${TARGET} PUBLIC
8282
${TOP}/src/portable/valentyusb/eptri/dcd_eptri.c
8383
)
84-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
84+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
85+
8586

86-
# Link dependencies
87-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
8887

8988
# Flashing
9089
family_add_bin_hex(${TARGET})

‎hw/bsp/gd32vf103/family.cmake‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,14 @@ function(family_configure_example TARGET RTOS)
106106

107107
# Add TinyUSB target and port source
108108
family_add_tinyusb(${TARGET} OPT_MCU_GD32VF103)
109-
target_sources(${TARGET}-tinyusb PUBLIC
109+
target_sources(${TARGET} PUBLIC
110110
${TOP}/src/portable/synopsys/dwc2/dcd_dwc2.c
111111
${TOP}/src/portable/synopsys/dwc2/hcd_dwc2.c
112112
${TOP}/src/portable/synopsys/dwc2/dwc2_common.c
113113
)
114-
target_link_libraries(${TARGET}-tinyusb PUBLIC board_${BOARD})
114+
target_link_libraries(${TARGET} PUBLIC board_${BOARD})
115+
115116

116-
# Link dependencies
117-
target_link_libraries(${TARGET} PUBLIC board_${BOARD} ${TARGET}-tinyusb)
118117

119118
# Flashing
120119
family_add_bin_hex(${TARGET})

0 commit comments

Comments
 (0)