Shenzhou board is first to use ONLY Kconfig for configuration

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5114 7fd9a85b-ad96-42d3-883c-3090e2eb8679

6 files changed, 69 insertions, 40 deletions

diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig
index f22f67344..dc28f8c10 100644
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@@ -96,7 +96,7 @@ config LPC17_PLL1
 config LPC17_ETHERNET
 	bool "Ethernet"
 	select NET
-	select ARCH_HAS_PHY
+	select ARCH_HAVE_PHY
 	default n
 
 config LPC17_USBHOST
@@ -116,27 +116,27 @@ config LPC17_USBOTG
 
 config LPC17_UART0
 	bool "UART0"
-	select ARCH_HAS_UART0
+	select ARCH_HAVE_UART0
 	default n
 
 config LPC17_UART1
 	bool "UART1"
-	select ARCH_HAS_UART1
+	select ARCH_HAVE_UART1
 	default n
 
 config LPC17_UART2
 	bool "UART2"
-	select ARCH_HAS_UART2
+	select ARCH_HAVE_UART2
 	default n
 
 config LPC17_UART3
 	bool "UART3"
-	select ARCH_HAS_UART3
+	select ARCH_HAVE_UART3
 	default n
 
 config LPC17_CAN1
 	bool "CAN1"
-	select ARCH_HAS_UART4
+	select ARCH_HAVE_UART4
 	default n
 
 config LPC17_CAN2
diff --git a/nuttx/arch/arm/src/lpc31xx/Kconfig b/nuttx/arch/arm/src/lpc31xx/Kconfig
index 53691f494..17daf94b7 100644
--- a/nuttx/arch/arm/src/lpc31xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc31xx/Kconfig
@@ -119,7 +119,7 @@ menu "LPC31xx Peripheral Support"
 config LPC31_UART
 	bool "UART"
 	default n
-	select ARCH_HAS_UART
+	select ARCH_HAVE_UART
 
 config LPC31_SPI
 	bool "SPI"
diff --git a/nuttx/arch/arm/src/lpc43xx/Kconfig b/nuttx/arch/arm/src/lpc43xx/Kconfig
index b4f19b524..0ae9f8ffe 100644
--- a/nuttx/arch/arm/src/lpc43xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc43xx/Kconfig
@@ -269,22 +269,22 @@ config LPC43_TMR3
 
 config LPC43_USART0
 	bool "USART0"
-	select ARCH_HAS_USART0
+	select ARCH_HAVE_USART0
 	default n
 
 config LPC43_UART1
 	bool "UART1"
-	select ARCH_HAS_UART1
+	select ARCH_HAVE_UART1
 	default n
 
 config LPC43_USART2
 	bool "USART2"
-	select ARCH_HAS_USART2
+	select ARCH_HAVE_USART2
 	default n
 
 config LPC43_USART3
 	bool "USART3"
-	select ARCH_HAS_USART3
+	select ARCH_HAVE_USART3
 	default n
 
 config LPC43_USB0
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index 661f6d8f4..ef1ca63ce 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -11,80 +11,93 @@ choice
 config ARCH_CHIP_STM32F103ZET6
 	bool "STM32F103ZET6"
 	select ARCH_CORTEXM3
+	select STM32_STM32F10XX
 
 config ARCH_CHIP_STM32F103RET6
 	bool "STM32F103RET6"
 	select ARCH_CORTEXM3
+	select STM32_STM32F10XX
 
 config ARCH_CHIP_STM32F103VCT6
 	bool "STM32F103VCT6"
 	select ARCH_CORTEXM3
+	select STM32_STM32F10XX
 
 config ARCH_CHIP_STM32F105VBT7
 	bool "STM32F105VBT7"
 	select ARCH_CORTEXM3
+	select STM32_STM32F10XX
+	select STM32_CONNECTIVITYLINE
 
 config ARCH_CHIP_STM32F107VC
 	bool "STM32F107VC"
 	select ARCH_CORTEXM3
+	select STM32_STM32F10XX
+	select STM32_CONNECTIVITYLINE
 
 config ARCH_CHIP_STM32F207IG
 	bool "STM32F207IG"
 	select ARCH_CORTEXM3
+	select STM32_STM32F20XX
 
 config ARCH_CHIP_STM32F405RG
 	bool "STM32F405RG"
-	select ARCH_CORTEXM3
+	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F405VG
 	bool "STM32F405VG"
-	select ARCH_CORTEXM3
+	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F405ZG
 	bool "STM32F405ZG"
-	select ARCH_CORTEXM3
+	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F407VE
 	bool "STM32F407VE"
-	select ARCH_CORTEXM3
+	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F407VG
 	bool "STM32F407VG"
 	select ARCH_CORTEXM3
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F407ZE
 	bool "STM32F407ZE"
 	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F407ZG
 	bool "STM32F407ZG"
 	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F407IE
 	bool "STM32F407IE"
 	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 config ARCH_CHIP_STM32F407IG
 	bool "STM32F407IG"
 	select ARCH_CORTEXM4
+	select STM32_STM32F40XX
 
 endchoice
 
 config STM32_STM32F10XX
 	bool
-	default y if ARCH_CHIP_STM32F103ZET6 || ARCH_CHIP_STM32F103RET6 || ARCH_CHIP_STM32F103VCT6 || ARCH_CHIP_STM32F105VBT7 || ARCH_CHIP_STM32F107VC
 
 config STM32_CONNECTIVITYLINE
 	bool
-	default y if ARCH_CHIP_STM32F105VBT7 || ARCH_CHIP_STM32F107VC
 
 config STM32_STM32F20XX
 	bool
-	default y if ARCH_CHIP_STM32F207IG
 
 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_STM32F407IG
 
 choice
 	prompt "Toolchain Selection"
@@ -160,11 +173,13 @@ config STM32_BKPSRAM
 config STM32_CAN1
 	bool "CAN1"
 	default n
+	select CAN
 
 config STM32_CAN2
 	bool "CAN2"
 	default n
 	depends on STM32_STM32F20XX || STM32_STM32F40XX
+	select CAN
 
 config STM32_CCMDATARAM
 	bool "CMD/DATA RAM"
@@ -192,11 +207,12 @@ config STM32_DCMI
 config STM32_ETHMAC
 	bool "Ethernet MAC"
 	default n
-	depends on STM32_STM32F20XX || STM32_STM32F40XX
+	depends on STM32_CONNECTIVITYLINE || STM32_STM32F20XX || STM32_STM32F40XX
 
 config STM32_FSMC
 	bool "FSMC"
 	default n
+	depends on !STM32_CONNECTIVITYLINE
 
 config STM32_HASH
 	bool "HASH"
@@ -219,6 +235,7 @@ config STM32_I2C3
 config STM32_IWDG
 	bool "IWDG"
 	default n
+	select WATCHDOG
 
 config STM32_OTGFS
 	bool "OTG FS"
@@ -242,24 +259,29 @@ config STM32_RNG
 config STM32_SDIO
 	bool "SDIO"
 	default n
+	depends on !STM32_CONNECTIVITYLINE
 
 config STM32_SPI1
 	bool "SPI1"
 	default n
+	select SPI
 
 config STM32_SPI2
 	bool "SPI2"
 	default n
+	select SPI
 
 config STM32_SPI3
 	bool "SPI3"
 	default n
 	depends on STM32_STM32F20XX || STM32_STM32F40XX
+	select SPI
 
 config STM32_SPI4
 	bool "SPI4"
 	default n
 	depends on STM32_STM32F10XX
+	select SPI
 
 config STM32_SYSCFG
 	bool "SYSCFG"
@@ -330,43 +352,45 @@ config STM32_TIM14
 
 config STM32_USART1
 	bool "USART1"
-	select ARCH_HAS_USART1
 	default n
+	select ARCH_HAVE_USART1
 
 config STM32_USART2
 	bool "USART2"
-	select ARCH_HAS_USART2
 	default n
+	select ARCH_HAVE_USART2
 
 config STM32_USART3
 	bool "USART3"
-	select ARCH_HAS_USART3
 	default n
+	select ARCH_HAVE_USART3
 
 config STM32_UART4
 	bool "UART4"
-	select ARCH_HAS_UART4
 	default n
+	select ARCH_HAVE_UART4
 
 config STM32_UART5
 	bool "UART5"
-	select ARCH_HAS_UART5
 	default n
+	select ARCH_HAVE_UART5
 
 config STM32_USART6
 	bool "USART6"
 	default n
-	select ARCH_HAS_USART6
 	depends on STM32_STM32F20XX || STM32_STM32F40XX
+	select ARCH_HAVE_USART6
 
 config STM32_USB
 	bool "USB Device"
 	default n
 	depends on STM32_STM32F10XX
+	select USBDEV
 
 config STM32_WWDG
 	bool "WWDG"
 	default n
+	select WATCHDOG
 
 endmenu
 
@@ -495,18 +519,23 @@ choice
 config STM32_CAN1_NO_REMAP
 	bool "No pin remapping"
 
-config STM32_CAN1_FULL_REMAP
-	bool "Full pin remapping"
+config CONFIG_STM32_CAN1_REMAP1
+	bool "CAN1 alternate pin remapping #1"
 
-config STM32_CAN1_PARTIAL_REMAP
-	bool "Partial pin remapping"
+config CONFIG_STM32_CAN1_REMAP2
+	bool "CAN1 alternate pin remapping #2"
 
 endchoice
 
 config STM32_CAN2_REMAP
 	bool "CAN2 Alternate Pin Mapping"
 	default n
-	depends on STM32_STM32F10XX && STM32_CAN2
+	depends on STM32_CONNECTIVITYLINE && STM32_CAN2
+
+config STM32_ETH_REMAP
+	bool "Ethernet Alternate Pin Mapping"
+	default n
+	depends on STM32_CONNECTIVITYLINE && STM32_ETHMAC
 
 choice
 	prompt "JTAG Configuration"
diff --git a/nuttx/arch/avr/Kconfig b/nuttx/arch/avr/Kconfig
index 010837142..4ebd26d5f 100644
--- a/nuttx/arch/avr/Kconfig
+++ b/nuttx/arch/avr/Kconfig
@@ -118,10 +118,10 @@ source arch/avr/src/at32uc3/Kconfig
 
 config AVR_USART0
 	bool "USART0 specific serial device driver settings"
-	select ARCH_HAS_USART0
+	select ARCH_HAVE_USART0
 
 config AVR_USART1
 	bool "USART1 specific serial device driver settings"
-	select ARCH_HAS_USART1
+	select ARCH_HAVE_USART1
 
 endif
diff --git a/nuttx/arch/mips/src/pic32mx/Kconfig b/nuttx/arch/mips/src/pic32mx/Kconfig
index 74a093e3f..222c7e4de 100644
--- a/nuttx/arch/mips/src/pic32mx/Kconfig
+++ b/nuttx/arch/mips/src/pic32mx/Kconfig
@@ -493,32 +493,32 @@ config PIC32MX_SPI4
 config PIC32MX_UART1
 	bool "UART1"
 	default n
-	select ARCH_HAS_UART1
+	select ARCH_HAVE_UART1
 
 config PIC32MX_UART2
 	bool "UART2"
 	default n
-	select ARCH_HAS_UART1
+	select ARCH_HAVE_UART1
 
 config PIC32MX_UART3
 	bool "UART3"
 	default n
-	select ARCH_HAS_UART3
+	select ARCH_HAVE_UART3
 
 config PIC32MX_UART4
 	bool "UART4"
 	default n
-	select ARCH_HAS_UART4
+	select ARCH_HAVE_UART4
 
 config PIC32MX_UART5
 	bool "UART5"
 	default n
-	select ARCH_HAS_UART5
+	select ARCH_HAVE_UART5
 
 config PIC32MX_UART6
 	bool "UART6"
 	default n
-	select ARCH_HAS_UART6
+	select ARCH_HAVE_UART6
 
 config PIC32MX_ADC
 	bool "ADC1"
@@ -568,7 +568,7 @@ config PIC32MX_ETHERNET
 	bool "Ethernet"
 	default n
 	select NET
-	select ARCH_HAS_PHY
+	select ARCH_HAVE_PHY
 
 config PIC32MX_CTMU
 	bool "Charge Time Measurement Unit (CMTU)"