Update LPC43 Kconfig

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5103 42af7a65-404d-4744-a932-0658087f49c3

9 files changed, 51 insertions, 14 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 3608c33c1..c8e53d173 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3264,11 +3264,14 @@
 	  AVR "teensy" now builds with Kconfig (contributed by Richard Cochran).
 	* Kconfig: Add configuration settings for the LPC17xx
 	* Kconfig: Add configuration settings for the LM3S (from Richard Cochran).
-	* Kconfig: Verify configuration settings for the STM32.  This include
+	* Kconfig: Verify configuration settings for the STM32.  This includes
 	  changes in the way that the external SRAM is configured:  Define
 	  CONFIG_HEAP2_SIZE (decimal) instead of CONFIG_HEAP2_END (hex).
 	* tools/configure.sh:  Don't append the apps directory path setting
 	  if the correct setting is already in defined in the defconfig file.
 	* fs/fat/fs_utils.c:  Improper constructed bool expression.  This
 	  would cause many unnecessary writes to FLASH (Thanks Ronen Vainish).
+	* Kconfig: Verify configuration settings for the LPC432xx.  This includes
+  some corrections to configuration variable names and defconfig settings.
+
 
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 2b06f354c..79462b6f5 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/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/nuttx/arch/arm/src/lpc43xx/Kconfig b/nuttx/arch/arm/src/lpc43xx/Kconfig
index 500f8da20..b4f19b524 100644
--- a/nuttx/arch/arm/src/lpc43xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc43xx/Kconfig
@@ -86,8 +86,36 @@ config ARCH_FAMILY_LPC4357
 	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/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.h b/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.h
index 97076cd80..94a2a64ea 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_usb0dev.h
+++ b/nuttx/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 */
 
diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index c9dd08ac5..cc15746d4 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -146,7 +146,7 @@ GNU Toolchain Options
   the CodeSourcery or devkitARM toolchain, you simply need add one of the
   following configuration options to your .config (or defconfig) file:
 
-    CONFIG_LPC32_CODEREDW=y       : Code Red "RedSuite" under Windows
+    CONFIG_LPC43_CODEREDW=y       : Code Red "RedSuite" under Windows
     CONFIG_LPC43_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_LPC43_CODESOURCERYL=y  : CodeSourcery under Linux
     CONFIG_LPC43_ATOLLIC_LITE=y   : The free, "Lite" version of Atollic toolchain under Windows
@@ -431,7 +431,7 @@ Code Red IDE/Tools
   from SRAM.
 
     CONFIG_BOOT_SRAM=y             : Executing in SRAM
-    CONFIG_LPC32_CODEREDW=y        : Code Red under Windows
+    CONFIG_LPC43_CODEREDW=y        : Code Red under Windows
 
   To execute from SPIFI, you would need to set:
 
@@ -859,7 +859,7 @@ Where <subdir> is one of the following:
     executing directly from SRAM.
 
       CONFIG_BOOT_SRAM=y             : Executing in SRAM
-      CONFIG_LPC32_CODEREDW=y        : Code Red under Windows
+      CONFIG_LPC43_CODEREDW=y        : Code Red under Windows
 
     This configuration directory, performs a simple test of the USB host
     HID keyboard class driver using the test logic in examples/hidkbd.
@@ -899,7 +899,7 @@ Where <subdir> is one of the following:
     executing directly from SRAM.
 
       CONFIG_BOOT_SRAM=y             : Executing in SRAM
-      CONFIG_LPC32_CODEREDW=y        : Code Red under Windows
+      CONFIG_LPC43_CODEREDW=y        : Code Red under Windows
 
     To execute from SPIFI, you would need to set:
 
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
index 22c48c57e..db7b72815 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
@@ -38,7 +38,7 @@ include ${TOPDIR}/tools/Config.mk
 
 # Setup for the selected toolchain
 
-ifeq ($(CONFIG_LPC32_CODEREDW),y)
+ifeq ($(CONFIG_LPC43_CODEREDW),y)
   # Code Red RedSuite under Windows
   CROSSDEV = arm-none-eabi-
   ARCROSSDEV = arm-none-eabi-
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index db3474a4a..1396a6b9d 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM4=y
 CONFIG_ARCH_CHIP="lpc43xx"
+CONFIG_ARCH_CHIP_LPC43XX=y
 CONFIG_ARCH_CHIP_LPC4330FET100=y
 CONFIG_ARCH_BOARD="lpc4330-xplorer"
 CONFIG_ARCH_BOARD_LPC4330_XPLORER=y
@@ -71,7 +72,7 @@ CONFIG_BOOT_CS3FLASH=n
 #
 # Identify toolchain and linker options
 #
-CONFIG_LPC32_CODEREDW=y
+CONFIG_LPC43_CODEREDW=y
 CONFIG_LPC43_CODESOURCERYW=n
 CONFIG_LPC43_CODESOURCERYL=n
 CONFIG_LPC43_ATOLLIC_LITE=n
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
index 22c48c57e..db7b72815 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
@@ -38,7 +38,7 @@ include ${TOPDIR}/tools/Config.mk
 
 # Setup for the selected toolchain
 
-ifeq ($(CONFIG_LPC32_CODEREDW),y)
+ifeq ($(CONFIG_LPC43_CODEREDW),y)
   # Code Red RedSuite under Windows
   CROSSDEV = arm-none-eabi-
   ARCROSSDEV = arm-none-eabi-
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
index 40af52c5a..5f58cd544 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM4=y
 CONFIG_ARCH_CHIP="lpc43xx"
+CONFIG_ARCH_CHIP_LPC43XX=y
 CONFIG_ARCH_CHIP_LPC4330FET100=y
 CONFIG_ARCH_BOARD="lpc4330-xplorer"
 CONFIG_ARCH_BOARD_LPC4330_XPLORER=y
@@ -71,7 +72,7 @@ CONFIG_BOOT_CS3FLASH=n
 #
 # Identify toolchain and linker options
 #
-CONFIG_LPC32_CODEREDW=y
+CONFIG_LPC43_CODEREDW=y
 CONFIG_LPC43_CODESOURCERYW=n
 CONFIG_LPC43_CODESOURCERYL=n
 CONFIG_LPC43_ATOLLIC_LITE=n