diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b06f354c5c..79462b6f511 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -75,8 +75,8 @@ config ARCH_CHIP_LPC31XX
 
 config ARCH_CHIP_LPC43XX
 	bool "NXP LPC43XX"
-	select ARCH_CORTEXM
 	select ARCH_CORTEXM4
+	select ARMV7M_CMNVECTOR
 	---help---
 		NPX LPC43XX architectures (ARM Cortex-M4).
 
@@ -115,6 +115,10 @@ config ARCH_CORTEXM3
 config ARCH_CORTEXM4
 	bool
 
+config ARMV7M_CMNVECTOR
+	bool
+	default n
+
 config ARCH_FPU
 	bool "FPU support"
 	default y
diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 500f8da2096..b4f19b524fa 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -85,9 +85,37 @@ config ARCH_FAMILY_LPC4357
 	bool
 	default y if ARCH_CHIP_LPC4357FET180 || ARCH_CHIP_LPC4357FBD208 || ARCH_CHIP_LPC4357FET256
 
+choice
+	prompt "Toolchain Selection"
+	default LPC43_CODEREDW
+	depends on ARCH_CHIP_LPC43XX
+
+config LPC43_CODEREDW
+	bool "CodeRed for Windows"
+
+config LPC43_CODESOURCERYW
+	bool "CodeSourcery for Windows"
+
+config LPC43_CODESOURCERYL
+	bool "CodeSourcery for Linux"
+
+config LPC43_ATOLLIC_LITE
+	bool "Atollic Lite for Windows"
+
+config LPC43_ATOLLIC_PRO
+	bool "Atollic Pro for Windows"
+
+config LPC43_DEVKITARM
+	bool "DevkitARM (Windows)"
+
+config LPC43_BUILDROOT
+	bool "NuttX buildroot (Cygwin or Linux)"
+
+endchoice
+
 choice
 	prompt "LPC43XX Boot Configuration"
-	default CONFIG_BOOT_SRAM
+	default BOOT_SRAM
 	depends on ARCH_CHIP_LPC43XX
 	---help---
 		The startup code needs to know if the code is running from internal FLASH,
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.h b/arch/arm/src/lpc43xx/lpc43_usb0dev.h
index 97076cd802f..94a2a64eaca 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.h
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC32_USB0DEV_H
-#define __ARCH_ARM_SRC_LPC43XX_LPC32_USB0DEV_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_USB0DEV_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_USB0DEV_H
 
 /************************************************************************************
  * Included Files
@@ -94,5 +94,5 @@ EXTERN void lpc43_usbsuspend(FAR struct usbdev_s *dev, bool resume);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC32_USB0DEV_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_USB0DEV_H */