diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt index a273a0a69c..64190c0a05 100644 --- a/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt +++ b/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt @@ -1,141 +1,141 @@ # Copyright (c) 2020-2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_subdirectory(network EXCLUDE_FROM_ALL) +add_subdirectory(whd-bsp-integration EXCLUDE_FROM_ALL) add_library(mbed-cy-psoc6-whd-43012 INTERFACE) target_include_directories(mbed-cy-psoc6-whd-43012 INTERFACE - resources/firmware/COMPONENT_43012 + wifi-host-driver/resources/firmware/COMPONENT_43012 ) target_sources(mbed-cy-psoc6-whd-43012 INTERFACE - resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c - resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c - resources/firmware/COMPONENT_43012/43012C0_bin.c - resources/firmware/COMPONENT_43012/43012C0_clm_blob.c + wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c + wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c + wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_bin.c + wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c ) add_library(mbed-cy-psoc6-whd-43438 INTERFACE) target_include_directories(mbed-cy-psoc6-whd-43438 INTERFACE - resources/firmware/COMPONENT_43438 + wifi-host-driver/resources/firmware/COMPONENT_43438 ) target_sources(mbed-cy-psoc6-whd-43438 INTERFACE - resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c - resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c - resources/firmware/COMPONENT_43438/43438A1_bin.c - resources/firmware/COMPONENT_43438/43438A1_clm_blob.c + wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c + wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c + wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_bin.c + wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c ) add_library(mbed-cy-psoc6-whd-4343w INTERFACE) target_include_directories(mbed-cy-psoc6-whd-4343w INTERFACE - resources/firmware/COMPONENT_4343W + wifi-host-driver/resources/firmware/COMPONENT_4343W ) target_sources(mbed-cy-psoc6-whd-4343w INTERFACE - resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c - resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c - resources/firmware/COMPONENT_4343W/4343WA1_bin.c - resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c + wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c + wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c + wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_bin.c + wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c ) add_library(mbed-cy8ckit-062s2-43012-whd INTERFACE) -target_include_directories(mbed-cy8ckit-062s2-43012-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062S2_43012) +target_include_directories(mbed-cy8ckit-062s2-43012-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062S2_43012) add_library(mbed-cy8ckit-062s2-4343w-whd INTERFACE) -target_include_directories(mbed-cy8ckit-062s2-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062S2_4343W) +target_include_directories(mbed-cy8ckit-062s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062S2_4343W) add_library(mbed-cy8ckit-062-4343w-whd INTERFACE) -target_include_directories(mbed-cy8ckit-062-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062_4343W) +target_include_directories(mbed-cy8ckit-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062_4343W) add_library(mbed-cy8ckit-062-wifi-bt-whd INTERFACE) -target_include_directories(mbed-cy8ckit-062-wifi-bt-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062_WIFI_BT) +target_include_directories(mbed-cy8ckit-062-wifi-bt-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT) add_library(mbed-cy8ckit-064s1-4343w-whd INTERFACE) -target_include_directories(mbed-cy8ckit-064s1-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_064S1_4343W) +target_include_directories(mbed-cy8ckit-064s1-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064S1_4343W) add_library(mbed-cy8ckit-064s2-4343w-whd INTERFACE) -target_include_directories(mbed-cy8ckit-064s2-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_064S2_4343W) +target_include_directories(mbed-cy8ckit-064s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064S2_4343W) add_library(mbed-cy8cmod-062s2-43012-whd INTERFACE) -target_include_directories(mbed-cy8cmod-062s2-43012-whd INTERFACE resources/nvram/TARGET_CY8CMOD_062S2_43012) +target_include_directories(mbed-cy8cmod-062s2-43012-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062S2_43012) add_library(mbed-cy8cmod-062s3-4343w-whd INTERFACE) -target_include_directories(mbed-cy8cmod-062s3-4343w-whd INTERFACE resources/nvram/TARGET_CY8CMOD_062S3_4343W) +target_include_directories(mbed-cy8cmod-062s3-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062S3_4343W) add_library(mbed-cy8cmod-062-4343w-whd INTERFACE) -target_include_directories(mbed-cy8cmod-062-4343w-whd INTERFACE resources/nvram/TARGET_CY8CMOD_062_4343W) +target_include_directories(mbed-cy8cmod-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062_4343W) add_library(mbed-cy8cproto-062s3-4343w-whd INTERFACE) -target_include_directories(mbed-cy8cproto-062s3-4343w-whd INTERFACE resources/nvram/TARGET_CY8CPROTO_062S3_4343W) +target_include_directories(mbed-cy8cproto-062s3-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CPROTO_062S3_4343W) add_library(mbed-cy8cproto-062-4343w-whd INTERFACE) -target_include_directories(mbed-cy8cproto-062-4343w-whd INTERFACE resources/nvram/TARGET_CY8CPROTO_062_4343W) +target_include_directories(mbed-cy8cproto-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CPROTO_062_4343W) add_library(mbed-cytfm-064b0s2-4343w-whd INTERFACE) -target_include_directories(mbed-cytfm-064b0s2-4343w-whd INTERFACE resources/nvram/TARGET_CYTFM_064B0S2_4343W) +target_include_directories(mbed-cytfm-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYTFM_064B0S2_4343W) add_library(mbed-cyw943012p6evb-01-whd INTERFACE) -target_include_directories(mbed-cyw943012p6evb-01-whd INTERFACE resources/nvram/TARGET_CYW943012P6EVB_01) +target_include_directories(mbed-cyw943012p6evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW943012P6EVB_01) add_library(mbed-cyw943012wcd2-whd INTERFACE) -target_include_directories(mbed-cyw943012wcd2-whd INTERFACE resources/nvram/TARGET_CYW943012WCD2) +target_include_directories(mbed-cyw943012wcd2-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW943012WCD2) add_library(mbed-cyw9p62s1-43012car-01-whd INTERFACE) -target_include_directories(mbed-cyw9p62s1-43012car-01-whd INTERFACE resources/nvram/TARGET_CYW9P62S1_43012CAR_01) +target_include_directories(mbed-cyw9p62s1-43012car-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43012CAR_01) add_library(mbed-cyw9p62s1-43012evb-01-whd INTERFACE) -target_include_directories(mbed-cyw9p62s1-43012evb-01-whd INTERFACE resources/nvram/TARGET_CYW9P62S1_43012EVB_01) +target_include_directories(mbed-cyw9p62s1-43012evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43012EVB_01) add_library(mbed-cyw9p62s1-43438evb-01-whd INTERFACE) -target_include_directories(mbed-cyw9p62s1-43438evb-01-whd INTERFACE resources/nvram/TARGET_CYW9P62S1_43438EVB_01) +target_include_directories(mbed-cyw9p62s1-43438evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43438EVB_01) add_library(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE) -target_include_directories(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_064B0S2_4343W) +target_include_directories(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W) add_library(mbed-cy-psoc6-whd INTERFACE) target_include_directories(mbed-cy-psoc6-whd INTERFACE - . - inc - resources/resource_imp - src - src/include - src/bus_protocols + wifi-host-driver + wifi-host-driver/inc + wifi-host-driver/resources/resource_imp + wifi-host-driver/src + wifi-host-driver/src/include + wifi-host-driver/src/bus_protocols ) target_sources(mbed-cy-psoc6-whd INTERFACE - resources/resource_imp/whd_resources.c + wifi-host-driver/resources/resource_imp/whd_resources.c - src/whd_ap.c - src/whd_buffer_api.c - src/whd_cdc_bdc.c - src/whd_chip.c - src/whd_chip_constants.c - src/whd_clm.c - src/whd_debug.c - src/whd_events.c - src/whd_logging.c - src/whd_management.c - src/whd_network_if.c - src/whd_resource_if.c - src/whd_sdpcm.c - src/whd_thread.c - src/whd_utils.c - src/whd_wifi.c - src/whd_wifi_api.c - src/whd_wifi_p2p.c + wifi-host-driver/src/whd_ap.c + wifi-host-driver/src/whd_buffer_api.c + wifi-host-driver/src/whd_cdc_bdc.c + wifi-host-driver/src/whd_chip.c + wifi-host-driver/src/whd_chip_constants.c + wifi-host-driver/src/whd_clm.c + wifi-host-driver/src/whd_debug.c + wifi-host-driver/src/whd_events.c + wifi-host-driver/src/whd_logging.c + wifi-host-driver/src/whd_management.c + wifi-host-driver/src/whd_network_if.c + wifi-host-driver/src/whd_resource_if.c + wifi-host-driver/src/whd_sdpcm.c + wifi-host-driver/src/whd_thread.c + wifi-host-driver/src/whd_utils.c + wifi-host-driver/src/whd_wifi.c + wifi-host-driver/src/whd_wifi_api.c + wifi-host-driver/src/whd_wifi_p2p.c - src/bus_protocols/whd_bus.c - src/bus_protocols/whd_bus_common.c - src/bus_protocols/whd_bus_sdio_protocol.c - src/bus_protocols/whd_bus_spi_protocol.c + wifi-host-driver/src/bus_protocols/whd_bus.c + wifi-host-driver/src/bus_protocols/whd_bus_common.c + wifi-host-driver/src/bus_protocols/whd_bus_sdio_protocol.c + wifi-host-driver/src/bus_protocols/whd_bus_spi_protocol.c ) target_compile_definitions(mbed-cy-psoc6-whd diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt index 42d0566a8d..41abf47f26 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt @@ -7,8 +7,8 @@ add_library(mbed-cat1a INTERFACE) target_include_directories(mbed-cat1a INTERFACE - psoc6pdl/devices/COMPONENT_CAT1A/include - psoc6pdl/devices/COMPONENT_CAT1A/include/ip + mtb-pdl-cat1/devices/COMPONENT_CAT1A/include + mtb-pdl-cat1/devices/COMPONENT_CAT1A/include/ip ) add_subdirectory(TARGET_CY8CKIT064B0S2_4343W EXCLUDE_FROM_ALL) @@ -22,7 +22,7 @@ add_subdirectory(TARGET_CYTFM_064B0S2_4343W EXCLUDE_FROM_ALL) add_subdirectory(TARGET_CYW9P62S1_43012EVB_01 EXCLUDE_FROM_ALL) add_subdirectory(TARGET_CYW9P62S1_43438EVB_01 EXCLUDE_FROM_ALL) -add_subdirectory(psoc6csp/abstraction/rtos EXCLUDE_FROM_ALL) +add_subdirectory(abstraction-rtos EXCLUDE_FROM_ALL) add_library(mbed-cm0p-bless INTERFACE) target_sources(mbed-cm0p-bless @@ -58,53 +58,52 @@ target_sources(mbed-cm0p-sleep add_library(mbed-udb-sdio-p12 INTERFACE) target_include_directories(mbed-udb-sdio-p12 INTERFACE - common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12 + udb-sdio-whd/COMPONENT_UDB_SDIO_P12 ) target_sources(mbed-udb-sdio-p12 INTERFACE - common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.c + udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.c ) add_library(mbed-udb-sdio-p2 INTERFACE) target_include_directories(mbed-udb-sdio-p2 INTERFACE - common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2 + udb-sdio-whd/COMPONENT_UDB_SDIO_P2 ) target_sources(mbed-udb-sdio-p2 INTERFACE - common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.c + udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.c ) add_library(mbed-udb-sdio-p9 INTERFACE) target_include_directories(mbed-udb-sdio-p9 INTERFACE - common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9 + udb-sdio-whd/COMPONENT_UDB_SDIO_P9 ) target_sources(mbed-udb-sdio-p9 INTERFACE - common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.c + udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.c ) add_library(mbed-psoc6 INTERFACE) target_include_directories(mbed-psoc6 INTERFACE . - common - common/udb-sdio-whd - psoc6csp/abstraction/resource/include - psoc6csp/core_lib/include - psoc6csp/hal/include - psoc6csp/hal/include/pin_packages - psoc6csp/hal/include/triggers - psoc6pdl/devices/include - psoc6pdl/devices/include/ip - psoc6pdl/drivers/include + udb-sdio-whd + serial-flash + core-lib/include + mtb-hal-cat1/include + mtb-hal-cat1/include/pin_packages + mtb-hal-cat1/include/triggers + mtb-pdl-cat1/devices/include + mtb-pdl-cat1/devices/include/ip + mtb-pdl-cat1/drivers/include ) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(ASSEMBLY_ROUTINES psoc6pdl/drivers/source/TOOLCHAIN_ARM/cy_syslib_mdk.S) + set(ASSEMBLY_ROUTINES mtb-pdl-cat1/drivers/source/TOOLCHAIN_ARM/cy_syslib_mdk.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(ASSEMBLY_ROUTINES psoc6pdl/drivers/source/TOOLCHAIN_GCC_ARM/cy_syslib_gcc.S) + set(ASSEMBLY_ROUTINES mtb-pdl-cat1/drivers/source/TOOLCHAIN_GCC_ARM/cy_syslib_gcc.S) endif() target_sources(mbed-psoc6 @@ -132,148 +131,180 @@ target_sources(mbed-psoc6 mbed_overrides.c pinmap.c - common/cy_serial_flash_prog.c - common/cy_serial_flash_qspi.c + serial-flash/cy_serial_flash_prog.c + serial-flash/cy_serial_flash_qspi.c - common/udb-sdio-whd/SDIO_HOST.c + udb-sdio-whd/SDIO_HOST.c - psoc6csp/abstraction/resource/source/cyabs_resource.c + mtb-hal-cat1/source/cyhal_adc.c + mtb-hal-cat1/source/cyhal_analog_common.c + mtb-hal-cat1/source/cyhal_clock.c + mtb-hal-cat1/source/cyhal_comp.c + mtb-hal-cat1/source/cyhal_comp_ctb.c + mtb-hal-cat1/source/cyhal_comp_lp.c + mtb-hal-cat1/source/cyhal_crc.c + mtb-hal-cat1/source/cyhal_crypto_common.c + mtb-hal-cat1/source/cyhal_dac.c + mtb-hal-cat1/source/cyhal_deprecated.c + mtb-hal-cat1/source/cyhal_dma.c + mtb-hal-cat1/source/cyhal_dma_dmac.c + mtb-hal-cat1/source/cyhal_dma_dw.c + mtb-hal-cat1/source/cyhal_ezi2c.c + mtb-hal-cat1/source/cyhal_flash.c + mtb-hal-cat1/source/cyhal_gpio.c + mtb-hal-cat1/source/cyhal_hwmgr.c + mtb-hal-cat1/source/cyhal_i2c.c + mtb-hal-cat1/source/cyhal_i2s.c + mtb-hal-cat1/source/cyhal_interconnect.c + mtb-hal-cat1/source/cyhal_lptimer.c + mtb-hal-cat1/source/cyhal_opamp.c + mtb-hal-cat1/source/cyhal_pdmpcm.c + mtb-hal-cat1/source/cyhal_pwm.c + mtb-hal-cat1/source/cyhal_qspi.c + mtb-hal-cat1/source/cyhal_quaddec.c + mtb-hal-cat1/source/cyhal_rtc.c + mtb-hal-cat1/source/cyhal_scb_common.c + mtb-hal-cat1/source/cyhal_sdhc.c + mtb-hal-cat1/source/cyhal_spi.c + mtb-hal-cat1/source/cyhal_syspm.c + mtb-hal-cat1/source/cyhal_system.c + mtb-hal-cat1/source/cyhal_tcpwm_common.c + mtb-hal-cat1/source/cyhal_timer.c + mtb-hal-cat1/source/cyhal_trng.c + mtb-hal-cat1/source/cyhal_uart.c + mtb-hal-cat1/source/cyhal_udb_sdio.c + mtb-hal-cat1/source/cyhal_usb_dev.c + mtb-hal-cat1/source/cyhal_utils.c + mtb-hal-cat1/source/cyhal_wdt.c - psoc6csp/hal/source/cyhal_adc.c - psoc6csp/hal/source/cyhal_analog_common.c - psoc6csp/hal/source/cyhal_clock.c - psoc6csp/hal/source/cyhal_crc.c - psoc6csp/hal/source/cyhal_crypto_common.c - psoc6csp/hal/source/cyhal_dac.c - psoc6csp/hal/source/cyhal_deprecated.c - psoc6csp/hal/source/cyhal_dma.c - psoc6csp/hal/source/cyhal_dma_dmac.c - psoc6csp/hal/source/cyhal_dma_dw.c - psoc6csp/hal/source/cyhal_ezi2c.c - psoc6csp/hal/source/cyhal_flash.c - psoc6csp/hal/source/cyhal_gpio.c - psoc6csp/hal/source/cyhal_hwmgr.c - psoc6csp/hal/source/cyhal_i2c.c - psoc6csp/hal/source/cyhal_i2s.c - psoc6csp/hal/source/cyhal_interconnect.c - psoc6csp/hal/source/cyhal_lptimer.c - psoc6csp/hal/source/cyhal_not_implemented.c - psoc6csp/hal/source/cyhal_pdmpcm.c - psoc6csp/hal/source/cyhal_pwm.c - psoc6csp/hal/source/cyhal_qspi.c - psoc6csp/hal/source/cyhal_rtc.c - psoc6csp/hal/source/cyhal_scb_common.c - psoc6csp/hal/source/cyhal_sdhc.c - psoc6csp/hal/source/cyhal_spi.c - psoc6csp/hal/source/cyhal_syspm.c - psoc6csp/hal/source/cyhal_system.c - psoc6csp/hal/source/cyhal_tcpwm_common.c - psoc6csp/hal/source/cyhal_timer.c - psoc6csp/hal/source/cyhal_trng.c - psoc6csp/hal/source/cyhal_uart.c - psoc6csp/hal/source/cyhal_udb_sdio.c - psoc6csp/hal/source/cyhal_usb_dev.c - psoc6csp/hal/source/cyhal_utils.c - psoc6csp/hal/source/cyhal_wdt.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble_usb.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_116_bga_ble.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_116_bga_usb.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_124_bga.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_124_bga_sip.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_43_smt.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_68_qfn_ble.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_01_80_wlcsp.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_02_100_wlcsp.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_02_124_bga.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_02_128_tqfp.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_02_68_qfn.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_03_100_tqfp.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_03_49_wlcsp.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_03_68_qfn.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_04_64_tqfp.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_04_68_qfn.c + mtb-hal-cat1/source/pin_packages/cyhal_psoc6_04_80_tqfp.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_104_m_csp_ble_usb.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_116_bga_ble.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_116_bga_usb.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_124_bga.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_124_bga_sip.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_43_smt.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_68_qfn_ble.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_01_80_wlcsp.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_02_100_wlcsp.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_02_124_bga.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_02_128_tqfp.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_02_68_qfn.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_03_100_tqfp.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_03_49_wlcsp.c - psoc6csp/hal/source/pin_packages/cyhal_psoc6_03_68_qfn.c + mtb-hal-cat1/source/triggers/cyhal_triggers_psoc6_01.c + mtb-hal-cat1/source/triggers/cyhal_triggers_psoc6_02.c + mtb-hal-cat1/source/triggers/cyhal_triggers_psoc6_03.c + mtb-hal-cat1/source/triggers/cyhal_triggers_psoc6_04.c - psoc6csp/hal/source/triggers/cyhal_triggers_psoc6_01.c - psoc6csp/hal/source/triggers/cyhal_triggers_psoc6_02.c - psoc6csp/hal/source/triggers/cyhal_triggers_psoc6_03.c - - psoc6pdl/drivers/source/cy_ble_clk.c - psoc6pdl/drivers/source/cy_canfd.c - psoc6pdl/drivers/source/cy_crypto.c - psoc6pdl/drivers/source/cy_crypto_core_aes_v1.c - psoc6pdl/drivers/source/cy_crypto_core_aes_v2.c - psoc6pdl/drivers/source/cy_crypto_core_cmac_v1.c - psoc6pdl/drivers/source/cy_crypto_core_cmac_v2.c - psoc6pdl/drivers/source/cy_crypto_core_crc_v1.c - psoc6pdl/drivers/source/cy_crypto_core_crc_v2.c - psoc6pdl/drivers/source/cy_crypto_core_des_v1.c - psoc6pdl/drivers/source/cy_crypto_core_des_v2.c - psoc6pdl/drivers/source/cy_crypto_core_ecc_domain_params.c - psoc6pdl/drivers/source/cy_crypto_core_ecc_ecdsa.c - psoc6pdl/drivers/source/cy_crypto_core_ecc_key_gen.c - psoc6pdl/drivers/source/cy_crypto_core_ecc_nist_p.c - psoc6pdl/drivers/source/cy_crypto_core_hmac_v1.c - psoc6pdl/drivers/source/cy_crypto_core_hmac_v2.c - psoc6pdl/drivers/source/cy_crypto_core_hw.c - psoc6pdl/drivers/source/cy_crypto_core_hw_v1.c - psoc6pdl/drivers/source/cy_crypto_core_mem_v1.c - psoc6pdl/drivers/source/cy_crypto_core_mem_v2.c - psoc6pdl/drivers/source/cy_crypto_core_prng_v1.c - psoc6pdl/drivers/source/cy_crypto_core_prng_v2.c - psoc6pdl/drivers/source/cy_crypto_core_rsa.c - psoc6pdl/drivers/source/cy_crypto_core_sha_v1.c - psoc6pdl/drivers/source/cy_crypto_core_sha_v2.c - psoc6pdl/drivers/source/cy_crypto_core_trng_v1.c - psoc6pdl/drivers/source/cy_crypto_core_trng_v2.c - psoc6pdl/drivers/source/cy_crypto_core_vu.c - psoc6pdl/drivers/source/cy_crypto_server.c - psoc6pdl/drivers/source/cy_csd.c - psoc6pdl/drivers/source/cy_ctb.c - psoc6pdl/drivers/source/cy_ctdac.c - psoc6pdl/drivers/source/cy_device.c - psoc6pdl/drivers/source/cy_dma.c - psoc6pdl/drivers/source/cy_dmac.c - psoc6pdl/drivers/source/cy_efuse.c - psoc6pdl/drivers/source/cy_flash.c - psoc6pdl/drivers/source/cy_gpio.c - psoc6pdl/drivers/source/cy_i2s.c - psoc6pdl/drivers/source/cy_ipc_drv.c - psoc6pdl/drivers/source/cy_ipc_pipe.c - psoc6pdl/drivers/source/cy_ipc_sema.c - psoc6pdl/drivers/source/cy_lpcomp.c - psoc6pdl/drivers/source/cy_lvd.c - psoc6pdl/drivers/source/cy_mcwdt.c - psoc6pdl/drivers/source/cy_pdm_pcm.c - psoc6pdl/drivers/source/cy_pra.c - psoc6pdl/drivers/source/cy_pra_cfg.c - psoc6pdl/drivers/source/cy_profile.c - psoc6pdl/drivers/source/cy_prot.c - psoc6pdl/drivers/source/cy_rtc.c - psoc6pdl/drivers/source/cy_sar.c - psoc6pdl/drivers/source/cy_scb_common.c - psoc6pdl/drivers/source/cy_scb_ezi2c.c - psoc6pdl/drivers/source/cy_scb_i2c.c - psoc6pdl/drivers/source/cy_scb_spi.c - psoc6pdl/drivers/source/cy_scb_uart.c - psoc6pdl/drivers/source/cy_sd_host.c - psoc6pdl/drivers/source/cy_seglcd.c - psoc6pdl/drivers/source/cy_smartio.c - psoc6pdl/drivers/source/cy_smif.c - psoc6pdl/drivers/source/cy_smif_memslot.c - psoc6pdl/drivers/source/cy_sysanalog.c - psoc6pdl/drivers/source/cy_sysclk.c - psoc6pdl/drivers/source/cy_sysint.c - psoc6pdl/drivers/source/cy_syslib.c - psoc6pdl/drivers/source/cy_syspm.c - psoc6pdl/drivers/source/cy_systick.c - psoc6pdl/drivers/source/cy_tcpwm_counter.c - psoc6pdl/drivers/source/cy_tcpwm_pwm.c - psoc6pdl/drivers/source/cy_tcpwm_quaddec.c - psoc6pdl/drivers/source/cy_trigmux.c - psoc6pdl/drivers/source/cy_usbfs_dev_drv.c - psoc6pdl/drivers/source/cy_usbfs_dev_drv_io.c - psoc6pdl/drivers/source/cy_usbfs_dev_drv_io_dma.c - psoc6pdl/drivers/source/cy_wdt.c + mtb-pdl-cat1/devices/COMPONENT_CAT1A/source/cy_device.c + mtb-pdl-cat1/drivers/source/cy_adc.c + mtb-pdl-cat1/drivers/source/cy_ble_clk.c + mtb-pdl-cat1/drivers/source/cy_canfd.c + mtb-pdl-cat1/drivers/source/cy_comp.c + mtb-pdl-cat1/drivers/source/cy_crypto.c + mtb-pdl-cat1/drivers/source/cy_cryptolite.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_aes_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_aes_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_cmac_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_cmac_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_crc_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_crc_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_des_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_des_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_ecc_domain_params.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_ecc_ecdsa.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_ecc_key_gen.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_ecc_nist_p.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_hmac_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_hmac_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_hw.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_hw_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_mem_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_mem_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_prng_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_prng_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_rsa.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_sha_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_sha_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_trng_v1.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_trng_v2.c + mtb-pdl-cat1/drivers/source/cy_crypto_core_vu.c + mtb-pdl-cat1/drivers/source/cy_crypto_server.c + mtb-pdl-cat1/drivers/source/cy_csd.c + mtb-pdl-cat1/drivers/source/cy_ctb.c + mtb-pdl-cat1/drivers/source/cy_ctdac.c + mtb-pdl-cat1/drivers/source/cy_dma.c + mtb-pdl-cat1/drivers/source/cy_dmac.c + mtb-pdl-cat1/drivers/source/cy_efuse.c + mtb-pdl-cat1/drivers/source/cy_efuse_v3.c + mtb-pdl-cat1/drivers/source/cy_ephy.c + mtb-pdl-cat1/drivers/source/cy_ethif.c + mtb-pdl-cat1/drivers/source/cy_flash.c + mtb-pdl-cat1/drivers/source/cy_gpio.c + mtb-pdl-cat1/drivers/source/cy_i2s.c + mtb-pdl-cat1/drivers/source/cy_i3c.c + mtb-pdl-cat1/drivers/source/cy_ipc_bt.c + mtb-pdl-cat1/drivers/source/cy_ipc_drv.c + mtb-pdl-cat1/drivers/source/cy_ipc_pipe.c + mtb-pdl-cat1/drivers/source/cy_ipc_sema.c + mtb-pdl-cat1/drivers/source/cy_keyscan.c + mtb-pdl-cat1/drivers/source/cy_lin.c + mtb-pdl-cat1/drivers/source/cy_lpcomp.c + mtb-pdl-cat1/drivers/source/cy_lvd.c + mtb-pdl-cat1/drivers/source/cy_mcwdt.c + mtb-pdl-cat1/drivers/source/cy_mpc.c + mtb-pdl-cat1/drivers/source/cy_mxconnbridge.c + mtb-pdl-cat1/drivers/source/cy_mxotpc.c + mtb-pdl-cat1/drivers/source/cy_mxsdiodev.c + mtb-pdl-cat1/drivers/source/cy_pdm_pcm.c + mtb-pdl-cat1/drivers/source/cy_pdm_pcm_v2.c + mtb-pdl-cat1/drivers/source/cy_pd_ppu.c + mtb-pdl-cat1/drivers/source/cy_pra.c + mtb-pdl-cat1/drivers/source/cy_pra_cfg.c + mtb-pdl-cat1/drivers/source/cy_profile.c + mtb-pdl-cat1/drivers/source/cy_prot.c + mtb-pdl-cat1/drivers/source/cy_rtc.c + mtb-pdl-cat1/drivers/source/cy_sar.c + mtb-pdl-cat1/drivers/source/cy_scb_common.c + mtb-pdl-cat1/drivers/source/cy_scb_ezi2c.c + mtb-pdl-cat1/drivers/source/cy_scb_i2c.c + mtb-pdl-cat1/drivers/source/cy_scb_spi.c + mtb-pdl-cat1/drivers/source/cy_scb_uart.c + mtb-pdl-cat1/drivers/source/cy_sd_host.c + mtb-pdl-cat1/drivers/source/cy_seglcd.c + mtb-pdl-cat1/drivers/source/cy_smartio.c + mtb-pdl-cat1/drivers/source/cy_smif.c + mtb-pdl-cat1/drivers/source/cy_smif_memslot.c + mtb-pdl-cat1/drivers/source/cy_sysanalog.c + mtb-pdl-cat1/drivers/source/cy_sysclk.c + mtb-pdl-cat1/drivers/source/cy_sysclk_v2.c + mtb-pdl-cat1/drivers/source/cy_sysint.c + mtb-pdl-cat1/drivers/source/cy_sysint_v2.c + mtb-pdl-cat1/drivers/source/cy_syslib.c + mtb-pdl-cat1/drivers/source/cy_syspm.c + mtb-pdl-cat1/drivers/source/cy_syspm_v2.c + mtb-pdl-cat1/drivers/source/cy_systick.c + mtb-pdl-cat1/drivers/source/cy_systick_v2.c + mtb-pdl-cat1/drivers/source/cy_tcpwm_counter.c + mtb-pdl-cat1/drivers/source/cy_tcpwm_pwm.c + mtb-pdl-cat1/drivers/source/cy_tcpwm_quaddec.c + mtb-pdl-cat1/drivers/source/cy_tcpwm_shiftreg.c + mtb-pdl-cat1/drivers/source/cy_tdm.c + mtb-pdl-cat1/drivers/source/cy_trigmux.c + mtb-pdl-cat1/drivers/source/cy_usbfs_dev_drv.c + mtb-pdl-cat1/drivers/source/cy_usbfs_dev_drv_io.c + mtb-pdl-cat1/drivers/source/cy_usbfs_dev_drv_io_dma.c + mtb-pdl-cat1/drivers/source/cy_wdt.c + mtb-pdl-cat1/drivers/source/edd.c + mtb-pdl-cat1/drivers/source/edd_rx.c + mtb-pdl-cat1/drivers/source/edd_tx.c + mtb-pdl-cat1/drivers/source/ppu_v1.c ${ASSEMBLY_ROUTINES} ) diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt index ffef882205..6cb68eed84 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062S2_43012/CMakeLists.txt @@ -10,6 +10,7 @@ target_sources(mbed-cy8ckit-062s2-43012-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c @@ -19,30 +20,30 @@ target_sources(mbed-cy8ckit-062s2-43012-bsp-design-modus add_library(mbed-cy8ckit-062s2-43012-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S) - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S) - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld) endif() target_sources(mbed-cy8ckit-062s2-43012-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cy8ckit-062s2-43012-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cy8ckit-062s2-43012-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S) - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S) - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld) endif() target_sources(mbed-cy8ckit-062s2-43012-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cy8ckit-062s2-43012-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -51,7 +52,6 @@ add_library(mbed-cy8ckit-062s2-43012 INTERFACE) target_include_directories(mbed-cy8ckit-062s2-43012 INTERFACE . - device ) target_sources(mbed-cy8ckit-062s2-43012 INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/CMakeLists.txt index 78ab98a08b..06fb29f1e4 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/CMakeLists.txt @@ -19,30 +19,30 @@ target_sources(mbed-cy8ckit-062-ble-bsp-design-modus add_library(mbed-cy8ckit-062-ble-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) endif() target_sources(mbed-cy8ckit-062-ble-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cy8ckit-062-ble-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cy8ckit-062-ble-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) endif() target_sources(mbed-cy8ckit-062-ble-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cy8ckit-062-ble-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -52,7 +52,6 @@ add_library(mbed-cy8ckit-062-ble INTERFACE) target_include_directories(mbed-cy8ckit-062-ble INTERFACE . - device ) target_sources(mbed-cy8ckit-062-ble INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt index 5ca0d671bc..2d66224f69 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/CMakeLists.txt @@ -10,6 +10,7 @@ target_sources(mbed-cy8ckit-062-wifi-bt-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c @@ -19,30 +20,30 @@ target_sources(mbed-cy8ckit-062-wifi-bt-bsp-design-modus add_library(mbed-cy8ckit-062-wifi-bt-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) endif() target_sources(mbed-cy8ckit-062-wifi-bt-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cy8ckit-062-wifi-bt-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cy8ckit-062-wifi-bt-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) endif() target_sources(mbed-cy8ckit-062-wifi-bt-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cy8ckit-062-wifi-bt-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -51,7 +52,6 @@ add_library(mbed-cy8ckit-062-wifi-bt INTERFACE) target_include_directories(mbed-cy8ckit-062-wifi-bt INTERFACE . - device ) target_sources(mbed-cy8ckit-062-wifi-bt INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt index 624167648a..5edf88d0c3 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062S3_4343W/CMakeLists.txt @@ -10,39 +10,41 @@ target_sources(mbed-cy8cproto-062s3-4343w-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_routing.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_system.c + ) add_library(mbed-cy8cproto-062s3-4343w-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx5_cm0plus.sct) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_03_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx5_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_03_cm0plus.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm0plus.ld) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm0plus.S) endif() target_sources(mbed-cy8cproto-062s3-4343w-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cy8cproto-062s3-4343w-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cy8cproto-062s3-4343w-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx5_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_03_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx5_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_03_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm4.S) endif() target_sources(mbed-cy8cproto-062s3-4343w-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cy8cproto-062s3-4343w-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -51,7 +53,6 @@ add_library(mbed-cy8cproto-062s3-4343w INTERFACE) target_include_directories(mbed-cy8cproto-062s3-4343w INTERFACE . - device ) target_sources(mbed-cy8cproto-062s3-4343w INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt index ea56d5c039..5490d9d013 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CPROTO_062_4343W/CMakeLists.txt @@ -10,6 +10,7 @@ target_sources(mbed-cy8cproto-062-4343w-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c @@ -19,30 +20,30 @@ target_sources(mbed-cy8cproto-062-4343w-bsp-design-modus add_library(mbed-cy8cproto-062-4343w-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S) endif() target_sources(mbed-cy8cproto-062-4343w-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cy8cproto-062-4343w-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cy8cproto-062-4343w-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S) endif() target_sources(mbed-cy8cproto-062-4343w-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cy8cproto-062-4343w-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -52,7 +53,6 @@ add_library(mbed-cy8cproto-062-4343w INTERFACE) target_include_directories(mbed-cy8cproto-062-4343w INTERFACE . - device ) target_sources(mbed-cy8cproto-062-4343w INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYSBSYSKIT_01/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYSBSYSKIT_01/CMakeLists.txt index 4a8682bf9d..2245ac2809 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYSBSYSKIT_01/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYSBSYSKIT_01/CMakeLists.txt @@ -11,23 +11,24 @@ target_include_directories(mbed-cysbsyskit-01-bsp-design-modus target_sources(mbed-cysbsyskit-01-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c - COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_routing.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_system.c ) add_library(mbed-cysbsyskit-01-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S) endif() target_sources(mbed-cysbsyskit-01-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cysbsyskit-01-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -36,7 +37,6 @@ add_library(mbed-cysbsyskit-01 INTERFACE) target_include_directories(mbed-cysbsyskit-01 INTERFACE . - device ) target_sources(mbed-cysbsyskit-01 INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt index 46711a1a12..dc3a1e4f46 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt @@ -11,6 +11,7 @@ target_sources(mbed-cyw9p62s1-43012evb-01-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c @@ -20,30 +21,30 @@ target_sources(mbed-cyw9p62s1-43012evb-01-bsp-design-modus add_library(mbed-cyw9p62s1-43012evb-01-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) endif() target_sources(mbed-cyw9p62s1-43012evb-01-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cyw9p62s1-43012evb-01-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cyw9p62s1-43012evb-01-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) endif() target_sources(mbed-cyw9p62s1-43012evb-01-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cyw9p62s1-43012evb-01-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -53,7 +54,6 @@ add_library(mbed-cyw9p62s1-43012evb-01 INTERFACE) target_include_directories(mbed-cyw9p62s1-43012evb-01 INTERFACE . - device ) target_sources(mbed-cyw9p62s1-43012evb-01 INTERFACE diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt index a5cddef07f..72531c1c0f 100644 --- a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt +++ b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW9P62S1_43438EVB_01/CMakeLists.txt @@ -10,6 +10,7 @@ target_sources(mbed-cyw9p62s1-43438evb-01-bsp-design-modus INTERFACE COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_clocks.c + COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_connectivity_bt.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_peripherals.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_qspi_memslot.c @@ -19,30 +20,30 @@ target_sources(mbed-cyw9p62s1-43438evb-01-bsp-design-modus add_library(mbed-cyw9p62s1-43438evb-01-cm0p INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/cy8c6xx7_cm0plus.sct) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) - set(STARTUP_FILE_CM0P device/COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) + set(LINKER_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm0plus.ld) + set(STARTUP_FILE_CM0P COMPONENT_CM0P/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm0plus.S) endif() target_sources(mbed-cyw9p62s1-43438evb-01-cm0p INTERFACE - device/COMPONENT_CM0P/system_psoc6_cm0plus.c + COMPONENT_CM0P/system_psoc6_cm0plus.c ${STARTUP_FILE_CM0P} ) mbed_set_linker_script(mbed-cyw9p62s1-43438evb-01-cm0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM0P}) add_library(mbed-cyw9p62s1-43438evb-01-cm4 INTERFACE) if(${MBED_TOOLCHAIN} STREQUAL "ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/cy8c6xx7_cm4_dual.sct) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S) elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM") - set(LINKER_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) - set(STARTUP_FILE_CM4 device/COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) + set(LINKER_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/cy8c6xx7_cm4_dual.ld) + set(STARTUP_FILE_CM4 COMPONENT_CM4/TOOLCHAIN_GCC_ARM/startup_psoc6_01_cm4.S) endif() target_sources(mbed-cyw9p62s1-43438evb-01-cm4 INTERFACE - device/COMPONENT_CM4/system_psoc6_cm4.c + COMPONENT_CM4/system_psoc6_cm4.c ${STARTUP_FILE_CM4} ) mbed_set_linker_script(mbed-cyw9p62s1-43438evb-01-cm4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE_CM4}) @@ -52,7 +53,6 @@ add_library(mbed-cyw9p62s1-43438evb-01 INTERFACE) target_include_directories(mbed-cyw9p62s1-43438evb-01 INTERFACE . - device ) target_sources(mbed-cyw9p62s1-43438evb-01 INTERFACE