CMake STM32: fix search and replace errors

2021-02-10 09:32:55 +00:00 · 2021-02-10 09:32:55 +00:00 · b3181a102c
parent 4536a5efe5
commit b3181a102c
5 changed files with 76 additions and 76 deletions
--- a/targets/TARGET_STM/TARGET_STM32F0/STM32Cube_FW/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/STM32Cube_FW/CMakeLists.txt
@ -5,73 +5,73 @@ add_library(mbed-stm32f0cube-fw INTERFACE)

 target_sources(mbed-stm32f0cube-fw
    INTERFACE
-        stm32f0xx_HAL_Driver/Legacy/stm32f0xx_hal_can_legacy.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_adc.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_adc_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_can.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_cec.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_comp.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_cortex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_crc.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_crc_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_dac.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_dac_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_dma.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_exti.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_flash.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_flash_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_gpio.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_i2c.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_i2c_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_i2s.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_irda.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_iwdg.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_pcd.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_pcd_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_pwr.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_pwr_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_rcc.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_rcc_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_rtc.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_rtc_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_smartcard.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_smartcard_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_smbus.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_spi.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_spi_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_tim.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_tim_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_tsc.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_uart.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_uart_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_usart.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_usart_ex.c
-        stm32f0xx_HAL_Driver/stm32f0xx_hal_wwdg.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_adc.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_comp.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_crc.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_crs.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_dac.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_dma.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_exti.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_gpio.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_i2c.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_pwr.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_rcc.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_rtc.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_spi.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_tim.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_usart.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_usb.c
-        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_utils.c
-        system_mbed-stm32f0xx.c
+        STM32F0xx_HAL_Driver/Legacy/stm32f0xx_hal_can_legacy.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_adc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_adc_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_can.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_cec.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_comp.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_cortex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_crc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_crc_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_dac.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_dac_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_dma.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_exti.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_flash.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_flash_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_gpio.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_i2c.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_i2c_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_i2s.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_irda.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_iwdg.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_pcd.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_pcd_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_pwr.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_pwr_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_rcc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_rcc_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_rtc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_rtc_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_smartcard.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_smartcard_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_smbus.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_spi.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_spi_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_tim.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_tim_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_tsc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_uart.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_uart_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_usart.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_usart_ex.c
+        STM32F0xx_HAL_Driver/stm32f0xx_hal_wwdg.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_adc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_comp.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_crc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_crs.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_dac.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_dma.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_exti.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_gpio.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_i2c.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_pwr.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_rcc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_rtc.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_spi.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_tim.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_usart.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_usb.c
+        STM32F0xx_HAL_Driver/stm32f0xx_ll_utils.c
+        system_stm32f0xx.c
 )

 target_include_directories(mbed-stm32f0cube-fw
    INTERFACE
        .
        CMSIS
-        stm32f0xx_HAL_Driver
-        stm32f0xx_HAL_Driver/Legacy
+        STM32F0xx_HAL_Driver
+        STM32F0xx_HAL_Driver/Legacy
 )
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F030x8/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F030x8/CMakeLists.txt
@ -2,11 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0

 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_mbed-stm32f030x8.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/mbed-stm32f030x8.ld)
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f030x8.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32f030x8.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE TOOLCHAIN_ARM/startup_mbed-stm32f030x8.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/mbed-stm32f030x8.sct)
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f030x8.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32f030x8.sct)
 endif()

 add_library(mbed-stm32f030x8 INTERFACE)
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F070xB/CMakeLists.txt
@ -4,11 +4,11 @@
 add_subdirectory(TARGET_NUCLEO_F070RB EXCLUDE_FROM_ALL)

 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_mbed-stm32f070xb.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/mbed-stm32f070xb.ld)
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f070xb.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32f070xb.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE TOOLCHAIN_ARM/startup_mbed-stm32f070xb.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/mbed-stm32f070xb.sct)
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f070xb.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32f070xb.sct)
 endif()

 add_library(mbed-stm32f070xB INTERFACE)
--- a/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F072xB/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F072xB/CMakeLists.txt
@ -4,11 +4,11 @@
 add_subdirectory(TARGET_NUCLEO_F072RB EXCLUDE_FROM_ALL)

 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_mbed-stm32f072xb.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/mbed-stm32f072xb.ld)
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f072xb.S)
+    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32f072xb.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(STARTUP_FILE TOOLCHAIN_ARM/startup_mbed-stm32f072xb.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/mbed-stm32f072xb.sct)
+    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32f072xb.S)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32f072xb.sct)
 endif()

 add_library(mbed-stm32f072xB INTERFACE)
--- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/CMakeLists.txt
@ -6,7 +6,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
    set(LINKER_FILE TOOLCHAIN_GCC_ARM/STM32H745xI_CM7.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
    set(STARTUP_FILE TOOLCHAIN_ARM/startup_stm32h745xx.S)
-    set(LINKER_FILE TOOLCHAIN_ARM/stm32h745xi-cm7.sct)
+    set(LINKER_FILE TOOLCHAIN_ARM/stm32h745xI_CM7.sct)
 endif()

 add_library(mbed-stm32h745xi-cm7 INTERFACE)