FUTURE_SEQUANA: Flatten PDL library paths

This change moves all PDL drivers into common source and include
directories to alleviate issue with Windows version of GNU Make 4.x
maximum command line length limit.

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M0/ipc_rpc_m0.c

@@ -19,7 +19,7 @@
 #include "ipc_rpc.h"
 #include "rpc_defs.h"
 #include "cy_ipc_config.h"
-#include "ipc/cy_ipc_pipe.h"
+#include "cy_ipc_pipe.h"
 
 #define RPC_GEN     RPC_GEN_IMPLEMENTATION
 #include "rpc_api.h"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M0/system_psoc63_cm0plus.c

@@ -21,11 +21,11 @@
 
 #if defined(CY_DEVICE_PSOC6ABLE2)
     #if !defined(CY_PSOC6ABLE2_REV_0A_SUPPORT_DISABLE)
-        #include "syslib/cy_syslib.h"
+        #include "cy_syslib.h"
     #endif /* !defined(CY_PSOC6ABLE2_REV_0A_SUPPORT_DISABLE) */
     #if !defined(CY_IPC_DEFAULT_CFG_DISABLE)
-        #include "ipc/cy_ipc_drv.h"
-        #include "flash/cy_flash.h"
+        #include "cy_ipc_drv.h"
+        #include "cy_flash.h"
     #endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
 #endif /* defined(CY_DEVICE_PSOC6ABLE2) */
 
@@ -583,7 +583,7 @@ void Cy_SysResetCM4(void)
 * linker configuration files. The following symbols used by the cymcuelftool.
 *
 *******************************************************************************/
-#if defined (__ARMCC_VERSION)
+#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION < 6000000)
 __asm void Cy_MemorySymbols(void)
 {
     /* Flash */

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M4/ipc_rpc.cpp

@@ -20,7 +20,7 @@
 #include "Semaphore.h"
 #include "mbed_assert.h"
 #include "cy_ipc_config.h"
-#include "ipc/cy_ipc_pipe.h"
+#include "cy_ipc_pipe.h"
 #include <stdarg.h>
 #include "platform/SingletonPtr.h"
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/TARGET_MCU_PSOC6_M4/system_psoc63_cm4.c

@@ -20,8 +20,8 @@
 #include "psoc6_utils.h"
 
 #if defined(CY_DEVICE_PSOC6ABLE2) && !defined(CY_IPC_DEFAULT_CFG_DISABLE)
-    #include "ipc/cy_ipc_drv.h"
-    #include "flash/cy_flash.h"
+    #include "cy_ipc_drv.h"
+    #include "cy_flash.h"
 #endif /* defined(CY_DEVICE_PSOC6ABLE2) && !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
 
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_CY8C63XX/device/cy_ipc_config.c

@@ -12,9 +12,9 @@
 * SPDX-License-Identifier: Apache-2.0
 *******************************************************************************/
 
-#include "ipc/cy_ipc_drv.h"
-#include "ipc/cy_ipc_pipe.h"
-#include "ipc/cy_ipc_sema.h"
+#include "cy_ipc_drv.h"
+#include "cy_ipc_pipe.h"
+#include "cy_ipc_sema.h"
 
 #include "cy_ipc_config.h"
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/TARGET_FUTURE_SEQUANA/TARGET_FUTURE_SEQUANA_M0/board_config.c

@@ -17,18 +17,18 @@
 
 #include <string.h>
 #include "device.h"
-#include "gpio/cy_gpio.h"
-#include "syslib/cy_syslib.h"
-#include "sysclk/cy_sysclk.h"
-#include "systick/cy_systick.h"
-#include "sysanalog/cy_sysanalog.h"
+#include "cy_gpio.h"
+#include "cy_syslib.h"
+#include "cy_sysclk.h"
+#include "cy_systick.h"
+#include "cy_sysanalog.h"
 
 #if FEATURE_BLE
 #include "ble/cy_ble_clk.h"
 #endif // FEATURE_BLE
 
 #define CY_NEED_CYCLOCKSTARTUPERROR 1
-#include "syspm/cy_syspm.h"
+#include "cy_syspm.h"
 
 #include "psoc6_utils.h"
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ctb.h

@@ -300,8 +300,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "sysanalog/cy_sysanalog.h"
+#include "cy_syslib.h"
+#include "cy_sysanalog.h"
 
 #ifndef CY_IP_MXS40PASS_CTB
     #error "The CTB driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ctdac.h

@@ -338,9 +338,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syspm/cy_syspm.h"
-#include "syslib/cy_syslib.h"
-#include "sysclk/cy_sysclk.h"
+#include "cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_sysclk.h"
 
 #ifndef CY_IP_MXS40PASS_CTDAC
     #error "The CTDAC driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_dma.h

@@ -150,7 +150,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 
 #ifndef CY_IP_M4CPUSS_DMA

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_efuse.h

@@ -109,7 +109,7 @@
 */
 
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 /***************************************
 * Macro Definitions

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_flash.h

@@ -296,7 +296,7 @@
 */
 
 #include <cy_device_headers.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #if defined(__cplusplus)
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_gpio.h

@@ -120,7 +120,7 @@
 #define CY_GPIO_H
 
 #include <stddef.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 
 #if defined(__cplusplus)

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_i2s.h

@@ -142,8 +142,8 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 
 #ifndef CY_IP_MXAUDIOSS
     #error "The I2S driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ipc_drv.h

@@ -282,7 +282,7 @@
 /******************************************************************************/
 /* Include files                                                              */
 /******************************************************************************/
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 #include "cy_ipc_config.h"
 #include <stddef.h>

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_ipc_pipe.h

@@ -17,9 +17,9 @@
 /******************************************************************************/
 /* Include files                                                              */
 /******************************************************************************/
-#include "ipc/cy_ipc_drv.h"
-#include "syslib/cy_syslib.h"
-#include "sysint/cy_sysint.h"
+#include "cy_ipc_drv.h"
+#include "cy_syslib.h"
+#include "cy_sysint.h"
 
 /**
 * \addtogroup group_ipc_pipe IPC pipes layer (IPC_PIPE)

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_lpcomp.h

@@ -150,8 +150,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 
 #ifndef CY_IP_MXLPCOMP
     #error "The LPCOMP driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_lvd.h

@@ -105,7 +105,7 @@
 #if !defined CY_LVD_H
 #define CY_LVD_H
 
-#include "syspm/cy_syspm.h"
+#include "cy_syspm.h"
 
 #ifdef __cplusplus
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_mcwdt.h

@@ -121,7 +121,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #ifndef CY_IP_MXS40SRSS_MCWDT
     #error "The MCWDT driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_pdm_pcm.h

@@ -161,8 +161,8 @@
 /******************************************************************************/
 
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 #include <stddef.h>
 #include <stdbool.h>
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_profile.h

@@ -178,7 +178,7 @@
 #define CY_PROFILE_H
 
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include <stddef.h>
 
 #ifndef CY_IP_MXPROFILE

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_prot.h

@@ -380,7 +380,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 
 #if defined(__cplusplus)

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_rtc.h

@@ -280,8 +280,8 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 
 #ifndef CY_IP_MXS40SRSS_RTC
     #error "The RTC driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_sar.h

@@ -584,8 +584,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 
 #ifndef CY_IP_MXS40PASS_SAR
     #error "The SAR driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_scb_common.h

@@ -99,8 +99,8 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 
 #ifndef CY_IP_MXSCB
     #error "The SCB driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_smif.h

@@ -247,8 +247,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 #include "cy_device_headers.h"
 
 #ifndef CY_IP_MXSMIF

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_smif_memslot.h

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 #include "cy_smif.h"
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_sysanalog.h

@@ -144,8 +144,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 
 #ifndef CY_IP_MXS40PASS
     #error "The SysAnalog driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_sysclk.h

@@ -574,8 +574,8 @@
 #define __CY_SYSCLK_H__
 
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
-#include "syspm/cy_syspm.h"
+#include "cy_syslib.h"
+#include "cy_syspm.h"
 #include <stdbool.h>
 
 #if defined(__cplusplus)

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_sysint.h

@@ -154,7 +154,7 @@
 #define CY_SYSINT_H
 
 #include <stddef.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 
 #if defined(__cplusplus)

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_syspm.h

@@ -621,7 +621,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #ifdef __cplusplus
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_systick.h

@@ -84,7 +84,7 @@
 */
 
 #include <stdint.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #ifdef __cplusplus
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_tcpwm.h

@@ -201,7 +201,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include "cy_device_headers.h"
 
 #ifndef CY_IP_MXTCPWM

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/include/cy_trigmux.h

@@ -132,7 +132,7 @@
 #define CY_TRIGMUX_H
 
 #include "cy_device_headers.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #ifndef CY_IP_MXPERI_TR
     #error "The TRIGMUX driver is not supported on this device"

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_ctb.c

@@ -11,7 +11,7 @@
 * SPDX-License-Identifier: Apache-2.0
 *******************************************************************************/
 
-#include "ctb/cy_ctb.h"
+#include "cy_ctb.h"
 
 #if defined(__cplusplus)
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_ctdac.c

@@ -10,7 +10,7 @@
 * SPDX-License-Identifier: Apache-2.0
 *******************************************************************************/
 
-#include "ctdac/cy_ctdac.h"
+#include "cy_ctdac.h"
 
 #if defined(__cplusplus)
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_efuse.c

@@ -12,7 +12,7 @@
 *******************************************************************************/
 
 #include "cy_efuse.h"
-#include "ipc/cy_ipc_drv.h"
+#include "cy_ipc_drv.h"
 
 /** \cond INTERNAL */
 #define CY_EFUSE_OPCODE_SUCCESS             (0xA0000000UL)    /**< The command completed with no errors */

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_flash.c

@@ -10,12 +10,12 @@
 * Copyright 2016-2018, Cypress Semiconductor Corporation.  All rights reserved.
 * SPDX-License-Identifier: Apache-2.0
 *******************************************************************************/
-#include "flash/cy_flash.h"
-#include "sysclk/cy_sysclk.h"
-#include "sysint/cy_sysint.h"
-#include "ipc/cy_ipc_drv.h"
-#include "ipc/cy_ipc_sema.h"
-#include "ipc/cy_ipc_pipe.h"
+#include "cy_flash.h"
+#include "cy_sysclk.h"
+#include "cy_sysint.h"
+#include "cy_ipc_drv.h"
+#include "cy_ipc_sema.h"
+#include "cy_ipc_pipe.h"
 
 /***************************************
 * Data Structure definitions

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_ipc_sema.c

@@ -12,9 +12,9 @@
 * SPDX-License-Identifier: Apache-2.0
 *******************************************************************************/
 
-#include "ipc/cy_ipc_drv.h"
-#include "ipc/cy_ipc_sema.h"
-#include "syslib/cy_syslib.h"
+#include "cy_ipc_drv.h"
+#include "cy_ipc_sema.h"
+#include "cy_syslib.h"
 #include <string.h> /* The memset() definition */
 
 /* Defines a mask to Check if semaphore count is a multiple of 32 */

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_sysclk.c

@@ -12,7 +12,7 @@
 
 
 #include "cy_sysclk.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 #include <math.h>
 #include <stdlib.h>
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_syslib.c

@@ -12,7 +12,7 @@
 *******************************************************************************/
 
 #include "cy_syslib.h"
-#include "ipc/cy_ipc_drv.h"
+#include "cy_ipc_drv.h"
 #if !defined(NDEBUG)
     #include <string.h>
 #endif /* NDEBUG */

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/source/cy_wdt.c

@@ -11,7 +11,7 @@
 *******************************************************************************/
 
 #include "cy_wdt.h"
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #if defined(__cplusplus)
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/flash_api.c

@@ -16,7 +16,7 @@
 
 #include "device.h"
 #include "flash_api.h"
-#include "drivers/peripheral/flash/cy_flash.h"
+#include "cy_flash.h"
 
 #if DEVICE_FLASH
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/gpio_object.h

@@ -22,7 +22,7 @@
 #include "PinNamesTypes.h"
 #include "PinNames.h"
 
-#include "drivers/peripheral/gpio/cy_gpio.h"
+#include "cy_gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/i2c_api.c

@@ -23,10 +23,10 @@
 #include "i2c_api.h"
 #include "psoc6_utils.h"
 
-#include "drivers/peripheral/sysclk/cy_sysclk.h"
-#include "drivers/peripheral/gpio/cy_gpio.h"
-#include "drivers/peripheral/scb/cy_scb_i2c.h"
-#include "drivers/peripheral/sysint/cy_sysint.h"
+#include "cy_sysclk.h"
+#include "cy_gpio.h"
+#include "cy_scb_i2c.h"
+#include "cy_sysint.h"
 
 #define I2C_DEFAULT_SPEED               100000
 #define NUM_I2C_PORTS                   8

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/ipcpipe_transport.c

@@ -17,8 +17,7 @@
 
 #include "ipcpipe_transport.h"
 #include "cy_ipc_config.h"
-#include "ipc/cy_ipc_pipe.h"
-//#include "syspm/cy_syspm.h"
+#include "cy_ipc_pipe.h"
 
 #ifdef __cplusplus
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/lp_ticker.c

@@ -19,8 +19,8 @@
 #include "device.h"
 #include "mbed_error.h"
 #include "lp_ticker_api.h"
-#include "device/drivers/peripheral/mcwdt/cy_mcwdt.h"
-#include "device/drivers/peripheral/sysint/cy_sysint.h"
+#include "cy_mcwdt.h"
+#include "cy_sysint.h"
 #include "psoc6_utils.h"
 
 #if DEVICE_LPTICKER

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/objects.h

@@ -25,8 +25,8 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_object.h"
-#include "drivers/peripheral/sysclk/cy_sysclk.h"
-#include "drivers/peripheral/syspm/cy_syspm.h"
+#include "cy_sysclk.h"
+#include "cy_syspm.h"
 
 #ifdef __cplusplus
 extern "C" {

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/psoc6_utils.c

@@ -30,7 +30,7 @@
  * a global static variable for interrupt status saving.
  */
 
-#include "syslib/cy_syslib.h"
+#include "cy_syslib.h"
 
 #define error(arg)  CY_ASSERT(0)
 #define MBED_ASSERT CY_ASSERT

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/psoc6_utils.h

@@ -22,8 +22,8 @@
 
 #include <stdint.h>
 #include <device.h>
-#include "drivers/peripheral/gpio/cy_gpio.h"
-#include "drivers/peripheral/sysclk/cy_sysclk.h"
+#include "cy_gpio.h"
+#include "cy_sysclk.h"
 
 #else
 

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/serial_api.c

@@ -27,10 +27,10 @@
 #include "serial_api.h"
 #include "psoc6_utils.h"
 
-#include "drivers/peripheral/sysclk/cy_sysclk.h"
-#include "drivers/peripheral/gpio/cy_gpio.h"
-#include "drivers/peripheral/scb/cy_scb_uart.h"
-#include "drivers/peripheral/sysint/cy_sysint.h"
+#include "cy_sysclk.h"
+#include "cy_gpio.h"
+#include "cy_scb_uart.h"
+#include "cy_sysint.h"
 
 #define UART_OVERSAMPLE                 12
 #define UART_DEFAULT_BAUDRATE           115200

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/spi_api.c

@@ -24,10 +24,10 @@
 #include "spi_api.h"
 #include "psoc6_utils.h"
 
-#include "drivers/peripheral/sysclk/cy_sysclk.h"
-#include "drivers/peripheral/gpio/cy_gpio.h"
-#include "drivers/peripheral/scb/cy_scb_spi.h"
-#include "drivers/peripheral/sysint/cy_sysint.h"
+#include "cy_sysclk.h"
+#include "cy_gpio.h"
+#include "cy_scb_spi.h"
+#include "cy_sysint.h"
 
 #define SPI_DEFAULT_SPEED               100000
 #define NUM_SPI_PORTS                   8

targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/us_ticker.c

@@ -23,10 +23,10 @@
 #include "mbed_error.h"
 #include "psoc6_utils.h"
 
-#include "drivers/peripheral/sysint/cy_sysint.h"
-#include "drivers/peripheral/sysclk/cy_sysclk.h"
-#include "drivers/peripheral/tcpwm/cy_tcpwm_counter.h"
-#include "drivers/peripheral/syspm/cy_syspm.h"
+#include "cy_sysint.h"
+#include "cy_sysclk.h"
+#include "cy_tcpwm_counter.h"
+#include "cy_syspm.h"
 
 /** Each CPU core in PSoC6 needs its own usec timer.
  ** Although each of TCPWM timers have two compare registers,