From 4db4364e916a507d9386984c6ae2de2cda65f5f8 Mon Sep 17 00:00:00 2001
From: "Sadik.Ozer" <Sadik.Ozer@maximintegrated.com>
Date: Thu, 7 Oct 2021 12:29:42 +0300
Subject: [PATCH] Remove device folder as subdir

Signed-off-by: Sadik.Ozer <Sadik.Ozer@maximintegrated.com>
---
 .../TARGET_MAX32660/CMakeLists.txt            | 14 +++++++--
 .../TARGET_MAX32660/device/CMakeLists.txt     | 29 -------------------
 2 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 targets/TARGET_Maxim/TARGET_MAX32660/device/CMakeLists.txt

diff --git a/targets/TARGET_Maxim/TARGET_MAX32660/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32660/CMakeLists.txt
index 18e1dd935e7..b5c31c0d3f8 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32660/CMakeLists.txt
+++ b/targets/TARGET_Maxim/TARGET_MAX32660/CMakeLists.txt
@@ -2,10 +2,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(TARGET_MAX32660EVSYS EXCLUDE_FROM_ALL)
-add_subdirectory(device EXCLUDE_FROM_ALL)
 
-add_library(mbed-max32660 INTERFACE)
+if(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    set(LINKER_FILE  device/TOOLCHAIN_ARM_STD/MAX32660.sct)
+    set(STARTUP_FILE device/TOOLCHAIN_ARM_STD/startup_MAX32660.S)
+elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    set(LINKER_FILE  device/TOOLCHAIN_GCC_ARM/max32660.ld)
+    set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_max32660.S)
+endif()
 
+add_library(mbed-max32660 INTERFACE)
+mbed_set_linker_script(mbed-max32660 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
 set(MXM_PARTNUMBER          MAX32660)
 set(MXM_SOURCE_DIR          ./Libraries/PeriphDrivers/Source)
@@ -15,6 +22,7 @@ set(MXM_CMSIS_DIR           ./Libraries/CMSIS/Device/Maxim)
 target_include_directories(mbed-max32660
     INTERFACE
         .
+        device
         
         ${MXM_PERIPH_DRIVER_DIR}/Include/${MXM_PARTNUMBER}
         ${MXM_CMSIS_DIR}/${MXM_PARTNUMBER}/Include
@@ -99,6 +107,8 @@ target_sources(mbed-max32660
         ${MXM_SOURCE_DIR}/WDT/wdt_common.c
         ${MXM_SOURCE_DIR}/WDT/wdt_me11.c
         ${MXM_SOURCE_DIR}/WDT/wdt_reva.c
+
+        ${STARTUP_FILE}
 )
 
 target_link_libraries(mbed-max32660
diff --git a/targets/TARGET_Maxim/TARGET_MAX32660/device/CMakeLists.txt b/targets/TARGET_Maxim/TARGET_MAX32660/device/CMakeLists.txt
deleted file mode 100644
index 0f684ccd6f4..00000000000
--- a/targets/TARGET_Maxim/TARGET_MAX32660/device/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2021 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-if(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    set(LINKER_FILE  TOOLCHAIN_ARM_STD/MAX32660.sct)
-    set(STARTUP_FILE TOOLCHAIN_ARM_STD/startup_MAX32660.S)
-elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(LINKER_FILE  TOOLCHAIN_GCC_ARM/max32660.ld)
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_max32660.S)
-endif()
-
-add_library(mbed-max32660-device INTERFACE)
-
-mbed_set_linker_script(mbed-max32660-device ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
-
-target_include_directories(mbed-max32660-device
-    INTERFACE
-        .
-)
-
-target_sources(mbed-max32660-device
-    INTERFACE
-        ${STARTUP_FILE}
-)
-
-target_link_libraries(mbed-max32660-device
-    INTERFACE 
-        mbed-max32660
-)