Skip to content

Commit a42ad9d

Browse files
rajkan01hugueskamba
authored andcommitted
Update CMake based on new STM32L4 directory structure
1 parent d283e69 commit a42ad9d

File tree

9 files changed

+173
-147
lines changed

9 files changed

+173
-147
lines changed

targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if("STM32L475xG" IN_LIST MBED_TARGET_LABELS)
55
add_subdirectory(TARGET_STM32L475xG)
66
endif()
77

8-
add_subdirectory(device)
8+
add_subdirectory(STM32Cube_FW)
99

1010
target_sources(mbed-os
1111
PRIVATE
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(STM32L4xx_HAL_Driver)
5+
6+
target_sources(mbed-os
7+
PRIVATE
8+
system_stm32l4xx.c
9+
)
10+
11+
target_include_directories(mbed-os
12+
PUBLIC
13+
${CMAKE_CURRENT_SOURCE_DIR}
14+
CMSIS
15+
)
Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(Legacy)
5+
6+
target_sources(mbed-os
7+
PRIVATE
8+
stm32l4xx_hal_adc.c
9+
stm32l4xx_hal_adc_ex.c
10+
stm32l4xx_hal.c
11+
stm32l4xx_hal_can.c
12+
stm32l4xx_hal_comp.c
13+
stm32l4xx_hal_cortex.c
14+
stm32l4xx_hal_crc.c
15+
stm32l4xx_hal_crc_ex.c
16+
stm32l4xx_hal_cryp.c
17+
stm32l4xx_hal_cryp_ex.c
18+
stm32l4xx_hal_dac.c
19+
stm32l4xx_hal_dac_ex.c
20+
stm32l4xx_hal_dcmi.c
21+
stm32l4xx_hal_dfsdm.c
22+
stm32l4xx_hal_dfsdm_ex.c
23+
stm32l4xx_hal_dma2d.c
24+
stm32l4xx_hal_dma.c
25+
stm32l4xx_hal_dma_ex.c
26+
stm32l4xx_hal_dsi.c
27+
stm32l4xx_hal_exti.c
28+
stm32l4xx_hal_firewall.c
29+
stm32l4xx_hal_flash.c
30+
stm32l4xx_hal_flash_ex.c
31+
stm32l4xx_hal_flash_ramfunc.c
32+
stm32l4xx_hal_gfxmmu.c
33+
stm32l4xx_hal_gpio.c
34+
stm32l4xx_hal_hash.c
35+
stm32l4xx_hal_hash_ex.c
36+
stm32l4xx_hal_hcd.c
37+
stm32l4xx_hal_i2c.c
38+
stm32l4xx_hal_i2c_ex.c
39+
stm32l4xx_hal_irda.c
40+
stm32l4xx_hal_iwdg.c
41+
stm32l4xx_hal_lcd.c
42+
stm32l4xx_hal_lptim.c
43+
stm32l4xx_hal_ltdc.c
44+
stm32l4xx_hal_ltdc_ex.c
45+
stm32l4xx_hal_mmc.c
46+
stm32l4xx_hal_mmc_ex.c
47+
stm32l4xx_hal_nand.c
48+
stm32l4xx_hal_nor.c
49+
stm32l4xx_hal_opamp.c
50+
stm32l4xx_hal_opamp_ex.c
51+
stm32l4xx_hal_ospi.c
52+
stm32l4xx_hal_pcd.c
53+
stm32l4xx_hal_pcd_ex.c
54+
stm32l4xx_hal_pka.c
55+
stm32l4xx_hal_pssi.c
56+
stm32l4xx_hal_pwr.c
57+
stm32l4xx_hal_pwr_ex.c
58+
stm32l4xx_hal_qspi.c
59+
stm32l4xx_hal_rcc.c
60+
stm32l4xx_hal_rcc_ex.c
61+
stm32l4xx_hal_rng.c
62+
stm32l4xx_hal_rng_ex.c
63+
stm32l4xx_hal_rtc.c
64+
stm32l4xx_hal_rtc_ex.c
65+
stm32l4xx_hal_sai.c
66+
stm32l4xx_hal_sai_ex.c
67+
stm32l4xx_hal_sd.c
68+
stm32l4xx_hal_sd_ex.c
69+
stm32l4xx_hal_smartcard.c
70+
stm32l4xx_hal_smartcard_ex.c
71+
stm32l4xx_hal_smbus.c
72+
stm32l4xx_hal_spi.c
73+
stm32l4xx_hal_spi_ex.c
74+
stm32l4xx_hal_sram.c
75+
stm32l4xx_hal_swpmi.c
76+
stm32l4xx_hal_tim.c
77+
stm32l4xx_hal_tim_ex.c
78+
stm32l4xx_hal_tsc.c
79+
stm32l4xx_hal_uart.c
80+
stm32l4xx_hal_uart_ex.c
81+
stm32l4xx_hal_usart.c
82+
stm32l4xx_hal_usart_ex.c
83+
stm32l4xx_hal_wwdg.c
84+
stm32l4xx_ll_adc.c
85+
stm32l4xx_ll_comp.c
86+
stm32l4xx_ll_crc.c
87+
stm32l4xx_ll_crs.c
88+
stm32l4xx_ll_dac.c
89+
stm32l4xx_ll_dma2d.c
90+
stm32l4xx_ll_dma.c
91+
stm32l4xx_ll_exti.c
92+
stm32l4xx_ll_fmc.c
93+
stm32l4xx_ll_gpio.c
94+
stm32l4xx_ll_i2c.c
95+
stm32l4xx_ll_lptim.c
96+
stm32l4xx_ll_lpuart.c
97+
stm32l4xx_ll_opamp.c
98+
stm32l4xx_ll_pka.c
99+
stm32l4xx_ll_pwr.c
100+
stm32l4xx_ll_rcc.c
101+
stm32l4xx_ll_rng.c
102+
stm32l4xx_ll_rtc.c
103+
stm32l4xx_ll_sdmmc.c
104+
stm32l4xx_ll_spi.c
105+
stm32l4xx_ll_swpmi.c
106+
stm32l4xx_ll_tim.c
107+
stm32l4xx_ll_usart.c
108+
stm32l4xx_ll_usb.c
109+
stm32l4xx_ll_utils.c
110+
)
111+
112+
target_include_directories(mbed-os
113+
PUBLIC
114+
${CMAKE_CURRENT_SOURCE_DIR}
115+
)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
target_sources(mbed-os
5+
PRIVATE
6+
stm32l4xx_hal_can_legacy.c
7+
)
8+
9+
target_include_directories(mbed-os
10+
PUBLIC
11+
${CMAKE_CURRENT_SOURCE_DIR}
12+
)

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/CMakeLists.txt

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,35 @@ if("DISCO_L475VG_IOT01A" IN_LIST MBED_TARGET_LABELS)
55
add_subdirectory(TARGET_DISCO_L475VG_IOT01A)
66
endif()
77

8-
add_subdirectory(device)
8+
function(_mbed_get_assembly_disco_l475vg_iot01a)
9+
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
10+
set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32l475xx.S)
11+
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
12+
set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32l475xx.S)
13+
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
14+
set(STARTUP_FILE TOOLCHAIN_IAR/startup_stm32l475xx.S)
15+
endif()
16+
target_sources(mbed-os PRIVATE ${STARTUP_FILE})
17+
endfunction()
18+
19+
function(_mbed_set_linker_file)
20+
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
21+
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_GCC_ARM/stm32l475xg.ld)
22+
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
23+
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_ARM/stm32l475xg.sct)
24+
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
25+
set(LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/TOOLCHAIN_IAR/stm32l475xg.icf)
26+
endif()
27+
set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${LINKER_FILE})
28+
endfunction()
29+
30+
_mbed_get_assembly_disco_l475vg_iot01a()
31+
_mbed_set_linker_file()
32+
33+
target_sources(mbed-os
34+
PRIVATE
35+
system_clock.c
36+
)
937

1038
target_include_directories(mbed-os
1139
PUBLIC

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
target_sources(mbed-os
55
PRIVATE
66
PeripheralPins.c
7-
system_clock.c
87
)
98

109
target_include_directories(mbed-os

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TOOLCHAIN_ARM/stm32l475xg.sct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! armcc -E
1+
#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
22
; Scatter-Loading Description File
33
;
44
; SPDX-License-Identifier: BSD-3-Clause

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/CMakeLists.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

targets/TARGET_STM/TARGET_STM32L4/device/CMakeLists.txt

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)