Skip to content

Commit 94cc37b

Browse files
0xc01700xc0170
authored
Merge pull request #14027 from hugueskamba/hk_cmake_fix_analog_devices_support
CMake: Fix Analog Devices targets support
2 parents 626168a + 99c92b5 commit 94cc37b

File tree

4 files changed

+111
-71
lines changed

4 files changed

+111
-71
lines changed

‎targets/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if("ARM_FM" IN_LIST MBED_TARGET_LABELS)
5-
add_subdirectory(TARGET_ARM_FM)
6-
elseif("Analog_Devices" IN_LIST MBED_TARGET_LABELS)
4+
if("Analog_Devices" IN_LIST MBED_TARGET_LABELS)
75
add_subdirectory(TARGET_Analog_Devices)
6+
elseif("ARM_FM" IN_LIST MBED_TARGET_LABELS)
7+
add_subdirectory(TARGET_ARM_FM)
88
elseif("Cypress" IN_LIST MBED_TARGET_LABELS)
99
add_subdirectory(TARGET_Cypress)
1010
elseif("Freescale" IN_LIST MBED_TARGET_LABELS)

‎targets/TARGET_Analog_Devices/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if("ADUCM4X50" IN_LIST MBED_TARGET_LABELS)
5-
add_subdirectory(TARGET_ADUCM4X50)
6-
elseif("ADUCM302X" IN_LIST MBED_TARGET_LABELS)
4+
if("ADUCM302X" IN_LIST MBED_TARGET_LABELS)
75
add_subdirectory(TARGET_ADUCM302X)
6+
elseif("ADUCM4X50" IN_LIST MBED_TARGET_LABELS)
7+
add_subdirectory(TARGET_ADUCM4X50)
88
endif()
99

1010
target_include_directories(mbed-core

‎targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/CMakeLists.txt

Lines changed: 52 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ if ("EV_COG_AD3029LZ" IN_LIST MBED_TARGET_LABELS)
1717
target_sources(mbed-core
1818
INTERFACE
1919
TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c
20-
TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c
2120
)
2221

22+
set(STARTUP_FILE TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c)
23+
endif()
24+
2325
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
2426

2527
target_include_directories(mbed-core
@@ -65,41 +67,60 @@ target_include_directories(mbed-core
6567

6668
target_sources(mbed-core
6769
INTERFACE
68-
bsp/crypto/adi_crypto.c
69-
bsp/wdt/adi_wdt.c
70+
api/analogin_api.c
71+
api/flash_api.c
72+
api/gpio_api.c
73+
api/gpio_dev_mem.c
74+
api/gpio_irq_api.c
75+
api/i2c_api.c
76+
api/PeripheralPins.c
77+
api/pinmap.c
78+
api/rtc_api.c
79+
api/serial_api.c
80+
api/sleep.c
81+
api/spi_api.c
82+
api/trng_api.c
83+
api/us_ticker.c
84+
85+
bsp/adc/adi_adc.c
86+
bsp/adc/adi_adc_data.c
87+
88+
bsp/beep/adi_beep.c
89+
7090
bsp/crc/adi_crc.c
91+
92+
bsp/crypto/adi_crypto.c
93+
94+
bsp/dma/adi_dma.c
95+
96+
bsp/flash/adi_flash.c
97+
bsp/flash/adi_flash_data.c
98+
99+
bsp/gpio/adi_gpio.c
100+
71101
bsp/i2c/adi_i2c.c
72102
bsp/i2c/adi_i2c_data.c
103+
104+
bsp/pwr/adi_pwr.c
105+
106+
bsp/rng/adi_rng.c
107+
108+
bsp/rtc/adi_rtc_data.c
109+
bsp/rtc/adi_rtc.c
110+
111+
bsp/spi/adi_spi_data.c
112+
bsp/spi/adi_spi.c
113+
73114
bsp/sport/adi_sport.c
115+
74116
bsp/tmr/adi_tmr_data.c
75117
bsp/tmr/adi_tmr.c
76-
bsp/flash/adi_flash.c
77-
bsp/flash/adi_flash_data.c
78-
bsp/spi/adi_spi_data.c
79-
bsp/spi/adi_spi.c
80-
bsp/xint/adi_xint.c
81-
bsp/adc/adi_adc.c
82-
bsp/adc/adi_adc_data.c
83-
bsp/beep/adi_beep.c
84-
bsp/rtc/adi_rtc_data.c
85-
bsp/rtc/adi_rtc.c
86-
bsp/pwr/adi_pwr.c
87-
bsp/dma/adi_dma.c
88-
bsp/gpio/adi_gpio.c
118+
89119
bsp/uart/adi_uart.c
90-
bsp/rng/adi_rng.c
91-
api/us_ticker.c
92-
api/serial_api.c
93-
api/gpio_dev_mem.c
94-
api/gpio_api.c
95-
api/flash_api.c
96-
api/spi_api.c
97-
api/i2c_api.c
98-
api/gpio_irq_api.c
99-
api/trng_api.c
100-
api/sleep.c
101-
api/PeripheralPins.c
102-
api/analogin_api.c
103-
api/rtc_api.c
104-
api/pinmap.c
120+
121+
bsp/wdt/adi_wdt.c
122+
123+
bsp/xint/adi_xint.c
124+
125+
${STARTUP_FILE}
105126
)

‎targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/CMakeLists.txt

Lines changed: 53 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ if("EV_COG_AD4050LZ" IN_LIST MBED_TARGET_LABELS)
1717
target_sources(mbed-core
1818
INTERFACE
1919
TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c
20-
TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c
21-
)
20+
)
21+
22+
set(STARTUP_FILE TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c)
2223
endif()
2324

2425
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
@@ -66,42 +67,60 @@ target_include_directories(mbed-core
6667

6768
target_sources(mbed-core
6869
INTERFACE
69-
bsp/crypto/adi_crypto.c
70-
bsp/wdt/adi_wdt.c
71-
bsp/crc/adi_crc.c
72-
bsp/i2c/adi_i2c.c
73-
bsp/i2c/adi_i2c_data.c
74-
bsp/sport/adi_sport.c
75-
bsp/tmr/adi_tmr_data.c
76-
bsp/tmr/adi_tmr.c
77-
bsp/flash/adi_flash.c
78-
bsp/flash/adi_flash_data.c
79-
bsp/spi/adi_spi_data.c
80-
bsp/spi/adi_spi.c
81-
bsp/xint/adi_xint.c
70+
api/analogin_api.c
71+
api/flash_api.c
72+
api/gpio_api.c
73+
api/gpio_dev_mem.c
74+
api/gpio_irq_api.c
75+
api/i2c_api.c
76+
api/PeripheralPins.c
77+
api/pinmap.c
78+
api/rtc_api.c
79+
api/serial_api.c
80+
api/sleep.c
81+
api/spi_api.c
82+
api/trng_api.c
83+
api/us_ticker.c
84+
8285
bsp/adc/adi_adc.c
8386
bsp/adc/adi_adc_data.c
87+
8488
bsp/beep/adi_beep.c
85-
bsp/rtc/adi_rtc_data.c
86-
bsp/rtc/adi_rtc.c
87-
bsp/pwr/adi_pwr.c
89+
90+
bsp/crc/adi_crc.c
91+
92+
bsp/crypto/adi_crypto.c
93+
8894
bsp/dma/adi_dma.c
95+
96+
bsp/flash/adi_flash.c
97+
bsp/flash/adi_flash_data.c
98+
8999
bsp/gpio/adi_gpio.c
90-
bsp/uart/adi_uart.c
100+
101+
bsp/i2c/adi_i2c.c
102+
bsp/i2c/adi_i2c_data.c
103+
104+
bsp/pwr/adi_pwr.c
105+
91106
bsp/rng/adi_rng.c
92-
api/us_ticker.c
93-
api/serial_api.c
94-
api/gpio_dev_mem.c
95-
api/gpio_api.c
96-
api/flash_api.c
97-
api/spi_api.c
98-
api/i2c_api.c
99-
api/gpio_irq_api.c
100-
api/trng_api.c
101-
api/sleep.c
102-
api/PeripheralPins.c
103-
api/analogin_api.c
104-
api/rtc_api.c
105-
api/pinmap.c
106107

107-
)
108+
bsp/rtc/adi_rtc_data.c
109+
bsp/rtc/adi_rtc.c
110+
111+
bsp/spi/adi_spi.c
112+
bsp/spi/adi_spi_data.c
113+
114+
bsp/sport/adi_sport.c
115+
116+
bsp/tmr/adi_tmr.c
117+
bsp/tmr/adi_tmr_data.c
118+
119+
bsp/uart/adi_uart.c
120+
121+
bsp/wdt/adi_wdt.c
122+
123+
bsp/xint/adi_xint.c
124+
125+
${STARTUP_FILE}
126+
)

0 commit comments

Comments
 (0)