CMake: Fix Analog Devices targets support

* Fix CMake syntax errors
* Fix indentation
* List directories and source files in alpahabetical order with spaces between files located in different directories
* Create STARTUP_FILE variable as done for all other targets

targets/CMakeLists.txt

@@ -1,10 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("ARM_FM" IN_LIST MBED_TARGET_LABELS)
+if("Analog_Devices" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ARM_FM)
-elseif("Analog_Devices" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_Analog_Devices)
+elseif("ARM_FM" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_ARM_FM)
 elseif("Cypress" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_Cypress)
 elseif("Freescale" IN_LIST MBED_TARGET_LABELS)

targets/TARGET_Analog_Devices/CMakeLists.txt

@@ -1,10 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("ADUCM4X50" IN_LIST MBED_TARGET_LABELS)
+if("ADUCM302X" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ADUCM4X50)
-elseif("ADUCM302X" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_ADUCM302X)
+elseif("ADUCM4X50" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_ADUCM4X50)
 endif()
 
 target_include_directories(mbed-core

targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/CMakeLists.txt

@@ -17,9 +17,11 @@ if ("EV_COG_AD3029LZ" IN_LIST MBED_TARGET_LABELS)
     target_sources(mbed-core
         INTERFACE
             TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c
-            TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c
     )
 
+    set(STARTUP_FILE TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c)
+endif()
+
 set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
 target_include_directories(mbed-core
@@ -65,41 +67,60 @@ target_include_directories(mbed-core
 
 target_sources(mbed-core
     INTERFACE
-        bsp/crypto/adi_crypto.c
+        api/analogin_api.c
-        bsp/wdt/adi_wdt.c
+        api/flash_api.c
-        bsp/crc/adi_crc.c
+        api/gpio_api.c
-        bsp/i2c/adi_i2c.c
+        api/gpio_dev_mem.c
-        bsp/i2c/adi_i2c_data.c
+        api/gpio_irq_api.c
-        bsp/sport/adi_sport.c
+        api/i2c_api.c
-        bsp/tmr/adi_tmr_data.c
+        api/PeripheralPins.c
-        bsp/tmr/adi_tmr.c
+        api/pinmap.c
-        bsp/flash/adi_flash.c
+        api/rtc_api.c
-        bsp/flash/adi_flash_data.c
+        api/serial_api.c
-        bsp/spi/adi_spi_data.c
+        api/sleep.c
-        bsp/spi/adi_spi.c
+        api/spi_api.c
-        bsp/xint/adi_xint.c
+        api/trng_api.c
+        api/us_ticker.c
+
         bsp/adc/adi_adc.c
         bsp/adc/adi_adc_data.c
+
         bsp/beep/adi_beep.c
+
+        bsp/crc/adi_crc.c
+
+        bsp/crypto/adi_crypto.c
+
+        bsp/dma/adi_dma.c
+
+        bsp/flash/adi_flash.c
+        bsp/flash/adi_flash_data.c
+
+        bsp/gpio/adi_gpio.c
+
+        bsp/i2c/adi_i2c.c
+        bsp/i2c/adi_i2c_data.c
+
+        bsp/pwr/adi_pwr.c
+
+        bsp/rng/adi_rng.c
+
         bsp/rtc/adi_rtc_data.c
         bsp/rtc/adi_rtc.c
-        bsp/pwr/adi_pwr.c
+
-        bsp/dma/adi_dma.c
+        bsp/spi/adi_spi_data.c
-        bsp/gpio/adi_gpio.c
+        bsp/spi/adi_spi.c
+
+        bsp/sport/adi_sport.c
+        
+        bsp/tmr/adi_tmr_data.c
+        bsp/tmr/adi_tmr.c
+
         bsp/uart/adi_uart.c
-        bsp/rng/adi_rng.c
+
-        api/us_ticker.c
+        bsp/wdt/adi_wdt.c
-        api/serial_api.c
+
-        api/gpio_dev_mem.c
+        bsp/xint/adi_xint.c
-        api/gpio_api.c
+
-        api/flash_api.c
+        ${STARTUP_FILE}
-        api/spi_api.c
-        api/i2c_api.c
-        api/gpio_irq_api.c
-        api/trng_api.c
-        api/sleep.c
-        api/PeripheralPins.c
-        api/analogin_api.c
-        api/rtc_api.c
-        api/pinmap.c
 )

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/CMakeLists.txt

@@ -17,8 +17,9 @@ if("EV_COG_AD4050LZ" IN_LIST MBED_TARGET_LABELS)
     target_sources(mbed-core
         INTERFACE
             TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c
-            TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c
     )
+
+    set(STARTUP_FILE TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c)
 endif()
 
 set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
@@ -66,42 +67,60 @@ target_include_directories(mbed-core
 
 target_sources(mbed-core
     INTERFACE
-        bsp/crypto/adi_crypto.c
+        api/analogin_api.c
-        bsp/wdt/adi_wdt.c
+        api/flash_api.c
-        bsp/crc/adi_crc.c
+        api/gpio_api.c
-        bsp/i2c/adi_i2c.c
+        api/gpio_dev_mem.c
-        bsp/i2c/adi_i2c_data.c
+        api/gpio_irq_api.c
-        bsp/sport/adi_sport.c
+        api/i2c_api.c
-        bsp/tmr/adi_tmr_data.c
+        api/PeripheralPins.c
-        bsp/tmr/adi_tmr.c
+        api/pinmap.c
-        bsp/flash/adi_flash.c
+        api/rtc_api.c
-        bsp/flash/adi_flash_data.c
+        api/serial_api.c
-        bsp/spi/adi_spi_data.c
+        api/sleep.c
-        bsp/spi/adi_spi.c
+        api/spi_api.c
-        bsp/xint/adi_xint.c
+        api/trng_api.c
+        api/us_ticker.c
+
         bsp/adc/adi_adc.c
         bsp/adc/adi_adc_data.c
+
         bsp/beep/adi_beep.c
+
+        bsp/crc/adi_crc.c
+
+        bsp/crypto/adi_crypto.c
+
+        bsp/dma/adi_dma.c
+
+        bsp/flash/adi_flash.c
+        bsp/flash/adi_flash_data.c
+
+        bsp/gpio/adi_gpio.c
+
+        bsp/i2c/adi_i2c.c
+        bsp/i2c/adi_i2c_data.c
+
+        bsp/pwr/adi_pwr.c
+
+        bsp/rng/adi_rng.c
+
         bsp/rtc/adi_rtc_data.c
         bsp/rtc/adi_rtc.c
-        bsp/pwr/adi_pwr.c
-        bsp/dma/adi_dma.c
-        bsp/gpio/adi_gpio.c
-        bsp/uart/adi_uart.c
-        bsp/rng/adi_rng.c
-        api/us_ticker.c
-        api/serial_api.c
-        api/gpio_dev_mem.c
-        api/gpio_api.c
-        api/flash_api.c
-        api/spi_api.c
-        api/i2c_api.c
-        api/gpio_irq_api.c
-        api/trng_api.c
-        api/sleep.c
-        api/PeripheralPins.c
-        api/analogin_api.c
-        api/rtc_api.c
-        api/pinmap.c
 
+        bsp/spi/adi_spi.c
+        bsp/spi/adi_spi_data.c
+
+        bsp/sport/adi_sport.c
+
+        bsp/tmr/adi_tmr.c
+        bsp/tmr/adi_tmr_data.c
+
+        bsp/uart/adi_uart.c
+
+        bsp/wdt/adi_wdt.c
+
+        bsp/xint/adi_xint.c
+
+        ${STARTUP_FILE}
 )