Merge pull request #14186 from hugueskamba/hk_cmake_nxp_cleanup

0xc0170 · web-flow · commit 4d1d9874152d · 2021-01-25T07:47:56.000Z
NXP: Fix CMake support and clean up
diff --git a/targets/TARGET_NXP/TARGET_LPC11XX_11CXX/device/TOOLCHAIN_ARM_STD/TARGET_LPC11XX/LPC1114.sct b/targets/TARGET_NXP/TARGET_LPC11XX_11CXX/device/TOOLCHAIN_ARM_STD/TARGET_LPC11XX/LPC1114.sct
@@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m0
 
 #if !defined(MBED_APP_START)
   #define MBED_APP_START            0x00000000
diff --git a/targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_STD/LPC1768.sct b/targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_STD/LPC1768.sct
@@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m3
 
 #if !defined(MBED_APP_START)
   #define MBED_APP_START            0x00000000
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/CMakeLists.txt b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/CMakeLists.txt
@@ -13,10 +13,6 @@ if("LPC54114" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_LPC54114)
 endif()
 
-if("LPC55S69" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_LPC55S69)
-endif()
-
 if("MCU_LPC546XX" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_MCU_LPC546XX)
 endif()
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/device/TARGET_LPC54114_M4/TOOLCHAIN_ARM_STD/LPC54114J256_cm4.sct b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/device/TARGET_LPC54114_M4/TOOLCHAIN_ARM_STD/LPC54114J256_cm4.sct
@@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
 /*
 ** ###################################################################
 **     Processors:          LPC54114J256BD64_cm4
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/CMakeLists.txt b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/CMakeLists.txt
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/CMakeLists.txt b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/CMakeLists.txt
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_S/CMakeLists.txt b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_S/CMakeLists.txt
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MCU_LPC546XX/device/TOOLCHAIN_ARM_STD/LPC54628J512.sct b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MCU_LPC546XX/device/TOOLCHAIN_ARM_STD/LPC54628J512.sct
@@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m4
 /*
 ** ###################################################################
 **     Processor:           LPC54628J512ET180
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT1050/device/TOOLCHAIN_ARM_STD/MIMXRT1052xxxxx.sct b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT1050/device/TOOLCHAIN_ARM_STD/MIMXRT1052xxxxx.sct
@@ -1,4 +1,4 @@
-#! armcc -E
+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m7
 /*
 ** ###################################################################
 **     Processors:          MIMXRT1052CVJ5B

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#! armcc -E`
	`1`	`+#! armclang -E --target=arm-arm-none-eabi -x c -mcpu=cortex-m0`
`2`	`2`
`3`	`3`	`#if !defined(MBED_APP_START)`
`4`	`4`	`#define MBED_APP_START 0x00000000`