Rearrange configuration settings so that ARCH_HAVE_SDIO is moved to higher, sharable level

9 files changed, 13 insertions, 8 deletions

diff --git a/nuttx/arch/arm/src/kinetis/Kconfig b/nuttx/arch/arm/src/kinetis/Kconfig
index bdca8c68b..786ab2002 100644
--- a/nuttx/arch/arm/src/kinetis/Kconfig
+++ b/nuttx/arch/arm/src/kinetis/Kconfig
@@ -228,7 +228,7 @@ config KINETIS_VREF
 config KINETIS_SDHC
 	bool "SDHC"
 	default n
-	select MMCSD_SDIO
+	select ARCH_HAVE_SDIO
 	---help---
 		Support SD host controller
 
diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig
index 1194e3fa3..5097437ab 100644
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@@ -112,9 +112,6 @@ config ARCH_FAMILY_LPC178X
 config ARCH_HAVE_SPIFI
 	bool
 
-config ARCH_HAVE_SDIO
-	bool
-
 menu "LPC17xx Peripheral Support"
 
 config LPC17_MAINOSC
diff --git a/nuttx/arch/arm/src/lpc31xx/Kconfig b/nuttx/arch/arm/src/lpc31xx/Kconfig
index c2447cb7f..a832c6bfe 100644
--- a/nuttx/arch/arm/src/lpc31xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc31xx/Kconfig
@@ -88,6 +88,7 @@ config LPC31_USB
 config LPC31_MCI
 	bool "MCI"
 	default n
+	select ARCH_HAVE_SDIO
 
 endmenu # LPC31xx Peripheral Support
 
diff --git a/nuttx/arch/arm/src/sam34/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig
index 14ebc357e..bbf0c6895 100644
--- a/nuttx/arch/arm/src/sam34/Kconfig
+++ b/nuttx/arch/arm/src/sam34/Kconfig
@@ -519,6 +519,7 @@ config SAM34_HSMCI
 	bool "High Speed Multimedia Card Interface (HSMCI)"
 	default n
 	depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4S
+	select ARCH_HAVE_SDIO
 
 endmenu # AT91SAM3/4 Peripheral Support
 
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index 094d86488..74b7acde3 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -665,6 +665,7 @@ config STM32_SDIO
 	bool "SDIO"
 	default n
 	depends on !STM32_CONNECTIVITYLINE && !STM32_VALUELINE
+	select ARCH_HAVE_SDIO
 
 config STM32_SPI1
 	bool "SPI1"
diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index a572ff497..2d90c2c48 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -1065,8 +1065,8 @@ Configurations
         configuration needs to be recalibrated.
 
       2013-8-3:  SDRAM configuration and RAM test usage have been verified
-        and are functional.  I not some issues now; Occassionally, SDRAM is
-        not functional on initial boot.  Or is initially not functional but
+        and are functional.  I note some issues; occassionally, SDRAM is
+        not functional on initial boot or is initially not functional but
         improves with accesses.  Clearly, more work needs to be done.
 
         Here is another strange observation:  SDRAM accesses tend to
@@ -1074,6 +1074,8 @@ Configurations
         where the memory test fails!  No idea why.
 
       2013-8-5:  The AT25 configuration has been verified to be functional.
+      2013-9-9:  The AT25 configuration has been verified with DMA
+        enabled.
 
   ostest:
     This configuration directory, performs a simple OS test using
diff --git a/nuttx/drivers/mmcsd/Kconfig b/nuttx/drivers/mmcsd/Kconfig
index 7e3843faa..b518ea482 100644
--- a/nuttx/drivers/mmcsd/Kconfig
+++ b/nuttx/drivers/mmcsd/Kconfig
@@ -61,6 +61,9 @@ config MMCSD_SPIMODE
 
 endif
 
+config ARCH_HAVE_SDIO
+	bool
+
 config MMCSD_SDIO
 	bool "MMC/SD SDIO transfer support"
 	default n
diff --git a/nuttx/drivers/sensors/Kconfig b/nuttx/drivers/sensors/Kconfig
index 386cdc3a8..9433b5e77 100644
--- a/nuttx/drivers/sensors/Kconfig
+++ b/nuttx/drivers/sensors/Kconfig
@@ -2,6 +2,7 @@
 # For a description of the syntax of this configuration file,
 # see misc/tools/kconfig-language.txt.
 #
+
 config LIS331DL
 	bool "ST LIS331DL device support"
 	default n
@@ -30,4 +31,3 @@ config DEBUG_QENCODER
 	bool "Enable Qencoder Debug"
 	default n
 	depends on QENCODER
-	
diff --git a/nuttx/drivers/serial/Kconfig b/nuttx/drivers/serial/Kconfig
index 3757cd657..baa87ba02 100644
--- a/nuttx/drivers/serial/Kconfig
+++ b/nuttx/drivers/serial/Kconfig
@@ -396,7 +396,7 @@ config USART2_ISUART
 config USART3_ISUART
 	bool "USART3 is a UART"
 	default y
-	depends on USART3_ISUART
+	depends on ARCH_HAVE_USART3
 
 config USART4_ISUART
 	bool "USART4 is a UART"