Add configuration for the LM3S

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5095 7fd9a85b-ad96-42d3-883c-3090e2eb8679
13 years ago · ae148ef09e
9 changed files with 122 additions and 46 deletions
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@ -3262,3 +3262,5 @@
				@@ -3262,3 +3262,5 @@
 	  sendfile() (non-standard!)
 	* Kconfig: Refactor serial settings (moved from chip to drivers/serial).
 	  AVR "teensy" now builds with Kconfig (contributed by Richard Cochran).
+	* Kconfig: Add configuration settings for the LPC17xx
+	* Kconfig: Add configuratino settings for the LM3S (from Richard Cochran).
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@ -10,61 +10,78 @@ choice
				@@ -10,61 +10,78 @@ choice

 config ARCH_CHIP_C5471
 	bool "TMS320 C5471"
+	select ARCH_ARM7TDMI
 	---help---
 		TI TMS320 C5471, A180, or DA180 (ARM7TDMI)

 config ARCH_CHIP_CALYPSO
 	bool "Calypso"
+	select ARCH_ARM7TDMI
 	---help---
 		TI Calypso-based cell phones (ARM7TDMI)

 config ARCH_CHIP_DM320
 	bool "TMS320 DM320"
+	select ARCH_ARM926EJS
 	---help---
 		TI DMS320 DM320 (ARM926EJS)

 config ARCH_CHIP_IMX
 	bool "Freescale iMX"
+	select ARCH_ARM920T
 	---help---
 		Freescale iMX architectures (ARM920T)

 config ARCH_CHIP_KINETIS
 	bool "Freescale Kinetis"
+	select ARCH_CORTEXM
+	select ARCH_CORTEXM4
 	---help---
 		Freescale Kinetis Architectures (ARM Cortex-M4)

 config ARCH_CHIP_LM3S
 	bool "TI Stellaris"
+	select ARCH_CORTEXM
+	select ARCH_CORTEXM3
 	---help---
 		TI Stellaris LMS3 architecutres (ARM Cortex-M3)

 config ARCH_CHIP_LPC17XX
 	bool "NXP LPC17xx"
+	select ARCH_CORTEXM
+	select ARCH_CORTEXM3
 	---help---
 		NXP LPC17xx architectures (ARM Cortex-M3)

 config ARCH_CHIP_LPC214X
 	bool "NXP LPC214x"
+	select ARCH_ARM7TDMI
 	---help---
 		NXP LPC2145x architectures (ARM7TDMI)

 config ARCH_CHIP_LPC2378
 	bool "NXP LPC2378"
+	select ARCH_ARM7TDMI
 	---help---
 		NXP LPC2145x architectures (ARM7TDMI)

 config ARCH_CHIP_LPC31XX
 	bool "NXP LPC31XX"
+	select ARCH_ARM926EJS
 	---help---
 		NPX LPC31XX architectures (ARM926EJS).

 config ARCH_CHIP_LPC43XX
 	bool "NXP LPC43XX"
+	select ARCH_CORTEXM
+	select ARCH_CORTEXM4
 	---help---
 		NPX LPC43XX architectures (ARM Cortex-M4).

 config ARCH_CHIP_SAM3U
 	bool "Atmel AT91SAM3U"
+	select ARCH_CORTEXM
+	select ARCH_CORTEXM3
 	---help---
 		Atmel AT91SAM3U architectures (ARM Cortex-M3)

@ -75,6 +92,7 @@ config ARCH_CHIP_STM32
				@@ -75,6 +92,7 @@ config ARCH_CHIP_STM32

 config ARCH_CHIP_STR71X
 	bool "STMicro STR71x"
+	select ARCH_ARM7TDMI
 	---help---
 		STMicro STR71x architectures (ARM7TDMI).

@ -82,24 +100,30 @@ endchoice
				@@ -82,24 +100,30 @@ endchoice

 config ARCH_ARM7TDMI
 	bool
-	default y			if ARCH_CHIP_C5471 || ARCH_CHIP_CALYPSO || ARCH_CHIP_LPC214X || ARCH_CHIP_LPC2378 || ARCH_CHIP_STR71X

 config ARCH_ARM926EJS
 	bool
-	default y			if ARCH_CHIP_DM320 || ARCH_CHIP_LPC31XX

 config ARCH_ARM920T
 	bool
-	default y			if ARCH_CHIP_IMX

-config ARCH_CORTEXM
+config ARCH_CORTEXM3
 	bool
-	default y			if ARCH_CHIP_KINETIS || ARCH_CHIP_LM3S || ARCH_CHIP_LPC17XX || ARCH_CHIP_LPC43XX || ARCH_CHIP_SAM3U || ARCH_CHIP_STM32
+
+config ARCH_CORTEXM4
+	bool
+
+config ARCH_FPU
+	bool "FPU support"
+	default y
+	depends on ARCH_CORTEXM4
+	---help---
+		Build in support for the ARM Cortex-M4 FPU.

 config ARCH_FAMILY
 	string
 	default "arm"		if ARCH_ARM7TDMI || ARCH_ARM926EJS || ARCH_ARM920T
-	default "armv7-m"	if ARCH_CORTEXM
+	default "armv7-m"	if ARCH_CORTEXM3 || ARCH_CORTEXM4

 config ARCH_CHIP
 	string
@ -134,7 +158,7 @@ config ARCH_INTERRUPTSTACK
				@@ -134,7 +158,7 @@ config ARCH_INTERRUPTSTACK

 config ARCH_IRQPRIO
 	bool "Interrupt priority"
-	default y		if ARCH_CORTEXM
+	default y		if ARCH_CORTEXM3 || ARCH_CORTEXM4
 	---help---
 		Select if your board supports interrupt prioritization.

--- a/nuttx/arch/arm/src/lm3s/Kconfig
+++ b/nuttx/arch/arm/src/lm3s/Kconfig
@ -2,3 +2,74 @@
				@@ -2,3 +2,74 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+choice
+	prompt "LM3S Chip Selection"
+	default ARCH_CHIP_LM3S6965
+	depends on ARCH_CHIP_LM3S
+
+config ARCH_CHIP_LM3S6918
+	bool "LM3S6918"
+
+config ARCH_CHIP_LM3S9B96
+	bool "LM3S9B96"
+
+config ARCH_CHIP_LM3S6432
+	bool "LM3S6432"
+
+config ARCH_CHIP_LM3S6965
+	bool "LM3S6965"
+
+config ARCH_CHIP_LM3S8962
+	bool "LM3S8962"
+
+endchoice
+
+choice
+        prompt "Toolchain"
+        default LM3S_BUILDROOT
+
+config LM3S_CODESOURCERYW
+	bool "CodeSourcery GNU toolchain under Windows"
+
+config LM3S_CODESOURCERYL
+	bool "CodeSourcery GNU toolchain under Linux"
+
+config LM3S_DEVKITARM
+	bool "devkitARM GNU toolchain"
+
+config LM3S_BUILDROOT
+	bool "Buildroot"
+
+endchoice
+
+config LM3S_DFU
+	bool "DFU"
+	default y
+
+config LM3S_DISABLE_GPIOA_IRQS
+	bool "Disable GPIOA IRQs"
+
+config LM3S_DISABLE_GPIOB_IRQS
+	bool "Disable GPIOB IRQs"
+
+config LM3S_DISABLE_GPIOC_IRQS
+	bool "Disable GPIOC IRQs"
+
+config LM3S_DISABLE_GPIOD_IRQS
+	bool "Disable GPIOD IRQs"
+
+config LM3S_DISABLE_GPIOE_IRQS
+	bool "Disable GPIOE IRQs"
+
+config LM3S_DISABLE_GPIOF_IRQS
+	bool "Disable GPIOF IRQs"
+
+config LM3S_DISABLE_GPIOG_IRQS
+	bool "Disable GPIOG IRQs"
+
+config LM3S_DISABLE_GPIOH_IRQS
+	bool "Disable GPIOH IRQs"
+
+config LM3S_DISABLE_GPIOJ_IRQS
+	bool "Disable GPIOJ IRQs"
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@ -54,14 +54,6 @@ config ARCH_FAMILY_LPC176X
				@@ -54,14 +54,6 @@ config ARCH_FAMILY_LPC176X
 	bool
 	default y if ARCH_CHIP_LPC1764 || ARCH_CHIP_LPC1765 || ARCH_CHIP_LPC1766 || ARCH_CHIP_LPC1767 || ARCH_CHIP_LPC1768 || ARCH_CHIP_LPC1769

-config ARCH_CORTEXM3
-	bool
-	default y if ARCH_CHIP_LPC17XX
-
-config ARCH_CORTEXM4
-	bool
-	default n
-
 menu "LPC17xx Peripheral Support"

 config LPC17_MAINOSC
--- a/nuttx/arch/arm/src/lpc43xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc43xx/Kconfig
@ -85,21 +85,6 @@ config ARCH_FAMILY_LPC4357
				@@ -85,21 +85,6 @@ config ARCH_FAMILY_LPC4357
 	bool
 	default y if ARCH_CHIP_LPC4357FET180 || ARCH_CHIP_LPC4357FBD208 || ARCH_CHIP_LPC4357FET256

-config ARCH_CORTEXM3
-	bool
-	default n if !ARCH_CHIP_LPC43XX
-
-config ARCH_CORTEXM4
-	bool
-	default y if ARCH_CHIP_LPC43XX
-
-config ARCH_FPU
-	bool "FPU support"
-	default y
-	depends on ARCH_CORTEXM4
-	---help---
-		Build in support for the ARM Cortex-M4 FPU.
-
 choice
 	prompt "LPC43XX Boot Configuration"
 	default CONFIG_BOOT_SRAM
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@ -10,48 +10,63 @@ choice
				@@ -10,48 +10,63 @@ choice

 config ARCH_CHIP_STM32F103ZET6
 	bool "STM32F103ZET6"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F103RET6
 	bool "STM32F103RET6"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F103VCT6
 	bool "STM32F103VCT6"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F105VBT7
 	bool "STM32F105VBT7"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F107VC
 	bool "STM32F107VC"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F207IG
 	bool "STM32F207IG"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F405RG
 	bool "STM32F405RG"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F405VG
 	bool "STM32F405VG"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F405ZG
 	bool "STM32F405ZG"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F407VE
 	bool "STM32F407VE"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F407VG
 	bool "STM32F407VG"
+	select ARCH_CORTEXM3

 config ARCH_CHIP_STM32F407ZE
 	bool "STM32F407ZE"
+	select ARCH_CORTEXM4

 config ARCH_CHIP_STM32F407ZG
 	bool "STM32F407ZG"
+	select ARCH_CORTEXM4

 config ARCH_CHIP_STM32F407IE
 	bool "STM32F407IE"
+	select ARCH_CORTEXM4

 config ARCH_CHIP_STM32F407IG
 	bool "STM32F407IG"
+	select ARCH_CORTEXM4

 endchoice

@ -71,14 +86,6 @@ config STM32_STM32F40XX
				@@ -71,14 +86,6 @@ config STM32_STM32F40XX
 	bool
 	default y if ARCH_CHIP_STM32F405RG || ARCH_CHIP_STM32F405VG || ARCH_CHIP_STM32F405ZG || ARCH_CHIP_STM32F407VE || ARCH_CHIP_STM32F407VG || ARCH_CHIP_STM32F407ZE || ARCH_CHIP_STM32F407ZG || ARCH_CHIP_STM32F407IE || ARCH_CHIP_STM32F407IE

-config ARCH_CORTEXM3
-	bool
-	default y if !STM32_STM32F40XX
-
-config ARCH_CORTEXM4
-	bool
-	default y if STM32_STM32F40XX
-
 menu "STM32 Peripheral Support"

 config STM32_ADC1
@ -528,14 +535,6 @@ config HEAP2_END
				@@ -528,14 +535,6 @@ config HEAP2_END
 	---help---
 		The end (+1) of the SRAM in the FSMC address space

-config ARCH_FPU
-	bool "FPU support"
-	default y
-	depends on ARCH_CORTEXM4
-	---help---
-		Build in support for the ARM Cortex-M4 FPU.  Only the STM3240xxx supports
-		a floating point unit (FPU)
-
 config STM32_TIM1_PWM
 	bool "TIM1 PWM"
 	default n
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
				@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6965=y
 CONFIG_ARCH_BOARD="lm3s6965-ek"
 CONFIG_ARCH_BOARD_LM3S6965EK=y
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
				@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6965=y
 CONFIG_ARCH_BOARD="lm3s6965-ek"
 CONFIG_ARCH_BOARD_LM3S6965EK=y
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
				@@ -39,6 +39,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S6965=y
 CONFIG_ARCH_BOARD="lm3s6965-ek"
 CONFIG_ARCH_BOARD_LM3S6965EK=y