15 files changed, 32 insertions, 8 deletions
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 6550950e7..3bd531232 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -216,14 +216,6 @@ config PAGING
 		If set =y in your configation file, this setting will enable the on-demand
 		paging feature as described in http://www.nuttx.org/NuttXDemandPaging.html.
 
-config ARCH_INTERRUPTSTACK
-	bool "Use interrupt stack"
-	default y
-	---help---
-		This architecture supports an interrupt stack. If defined, this symbol
-		is the size of the interrupt stack in bytes.  If not defined, the user
-		task stacks will be used during interrupt handling.
-
 config ARCH_IRQPRIO
 	bool "Interrupt priority"
 	default y		if ARCH_CORTEXM3 || ARCH_CORTEXM4
diff --git a/nuttx/arch/arm/src/c5471/Kconfig b/nuttx/arch/arm/src/c5471/Kconfig
index ae2bf3130..06363ad7d 100644
--- a/nuttx/arch/arm/src/c5471/Kconfig
+++ b/nuttx/arch/arm/src/c5471/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "C5471 Configuration Options"
diff --git a/nuttx/arch/arm/src/calypso/Kconfig b/nuttx/arch/arm/src/calypso/Kconfig
index ae2bf3130..65726a609 100644
--- a/nuttx/arch/arm/src/calypso/Kconfig
+++ b/nuttx/arch/arm/src/calypso/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "Calypso Configuration Options"
diff --git a/nuttx/arch/arm/src/dm320/Kconfig b/nuttx/arch/arm/src/dm320/Kconfig
index ae2bf3130..0255c5ff1 100644
--- a/nuttx/arch/arm/src/dm320/Kconfig
+++ b/nuttx/arch/arm/src/dm320/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "DM320 Configuration Options"
diff --git a/nuttx/arch/arm/src/imx/Kconfig b/nuttx/arch/arm/src/imx/Kconfig
index ae2bf3130..879f50ef7 100644
--- a/nuttx/arch/arm/src/imx/Kconfig
+++ b/nuttx/arch/arm/src/imx/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "i.MX Configuration Options"
diff --git a/nuttx/arch/arm/src/kinetis/Kconfig b/nuttx/arch/arm/src/kinetis/Kconfig
index ae2bf3130..210683f59 100644
--- a/nuttx/arch/arm/src/kinetis/Kconfig
+++ b/nuttx/arch/arm/src/kinetis/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "Kinetis Configuration Options"
diff --git a/nuttx/arch/arm/src/lm3s/Kconfig b/nuttx/arch/arm/src/lm3s/Kconfig
index 1fd203f4f..03da5c458 100644
--- a/nuttx/arch/arm/src/lm3s/Kconfig
+++ b/nuttx/arch/arm/src/lm3s/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LM3S Configuration Options"
+
 choice
 	prompt "LM3S Chip Selection"
 	default ARCH_CHIP_LM3S6965
diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig
index dc28f8c10..2769fc231 100644
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LPC17xx Configuration Options"
+
 choice
 	prompt "NXP LPC17XX Chip Selection"
 	default ARCH_CHIP_LPC1768
diff --git a/nuttx/arch/arm/src/lpc214x/Kconfig b/nuttx/arch/arm/src/lpc214x/Kconfig
index ae2bf3130..a26483ed9 100644
--- a/nuttx/arch/arm/src/lpc214x/Kconfig
+++ b/nuttx/arch/arm/src/lpc214x/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "LPC214x Configuration Options"
diff --git a/nuttx/arch/arm/src/lpc2378/Kconfig b/nuttx/arch/arm/src/lpc2378/Kconfig
index ae2bf3130..89a515d6a 100644
--- a/nuttx/arch/arm/src/lpc2378/Kconfig
+++ b/nuttx/arch/arm/src/lpc2378/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "LPC2378 Configuration Options"
diff --git a/nuttx/arch/arm/src/lpc31xx/Kconfig b/nuttx/arch/arm/src/lpc31xx/Kconfig
index 17daf94b7..39b19b95d 100644
--- a/nuttx/arch/arm/src/lpc31xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc31xx/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LPC31xx Configuration Options"
+
 choice
 	prompt "LPC31 Chip Selection"
 	default ARCH_CHIP_LPC3131
diff --git a/nuttx/arch/arm/src/lpc43xx/Kconfig b/nuttx/arch/arm/src/lpc43xx/Kconfig
index 0ae9f8ffe..4653b2ee3 100644
--- a/nuttx/arch/arm/src/lpc43xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc43xx/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "LPC43xx Configuration Options"
+
 choice
 	prompt "LPC43XX Chip Selection"
 	default ARCH_CHIP_LPC4330FET100
diff --git a/nuttx/arch/arm/src/sam3u/Kconfig b/nuttx/arch/arm/src/sam3u/Kconfig
index ae2bf3130..b84565547 100644
--- a/nuttx/arch/arm/src/sam3u/Kconfig
+++ b/nuttx/arch/arm/src/sam3u/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "AT91SAM3U Configuration Options"
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index ef1ca63ce..80610f271 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+comment "STM32 Configuration Options"
+
 choice
 	prompt "STM32 Chip Selection"
 	default ARCH_CHIP_STM32F103ZET6
@@ -414,6 +416,8 @@ config STM32_CAN
 	bool
 	default y if STM32_CAN1 || STM32_CAN2
 
+menu "Alternate Pin Mapping"
+
 choice
 	prompt "TIM1 Alternate Pin Mappings"
 	depends on STM32_STM32F10XX && STM32_TIM1
@@ -537,6 +541,8 @@ config STM32_ETH_REMAP
 	default n
 	depends on STM32_CONNECTIVITYLINE && STM32_ETHMAC
 
+endmenu
+
 choice
 	prompt "JTAG Configuration"
 	default STM32_JTAG_DISABLE
diff --git a/nuttx/arch/arm/src/str71x/Kconfig b/nuttx/arch/arm/src/str71x/Kconfig
index ae2bf3130..0e9c87d54 100644
--- a/nuttx/arch/arm/src/str71x/Kconfig
+++ b/nuttx/arch/arm/src/str71x/Kconfig
@@ -2,3 +2,5 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
+comment "STR71x Configuration Options"