You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/01/23 14:44:07 UTC
[incubator-nuttx] branch master updated: Many fixes on Kconfigs and
defconfigs do SDIO, NETDEV, USBHOST
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new ac4735c Many fixes on Kconfigs and defconfigs do SDIO, NETDEV, USBHOST
ac4735c is described below
commit ac4735cf5800a21d7d37094a0091caea0b955dbe
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jan 23 11:41:12 2020 -0300
Many fixes on Kconfigs and defconfigs do SDIO, NETDEV, USBHOST
Author: Xiang Xiao <xi...@xiaomi.com>
Fix warning: selects SDIO_DMA or SDIO_BLOCKSETUP which has unmet direct dependencies (MMCSD)
Fix warning: selects NETDEV_TELNET which has unmet direct dependencies (NETDEVICES && NET && NET_TCP)
Fix warning: selects ARCH_PHY_INTERRUPT which has unmet direct dependencies (NETDEVICES && ARCH_HAVE_PHY)
Fix warning: selects USBHOST_HAVE_ASYNCH which has unmet direct dependencies (USBHOST)
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/imxrt/Kconfig | 2 +-
arch/arm/src/lpc31xx/Kconfig | 2 +-
arch/arm/src/lpc43xx/Kconfig | 2 +-
arch/arm/src/tiva/Kconfig | 1 +
boards/arm/c5471/c5471evm/configs/nsh/defconfig | 1 -
boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig | 1 +
boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig | 1 +
boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig | 1 +
8 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/imxrt/Kconfig b/arch/arm/src/imxrt/Kconfig
index 96b4598..92cb380 100644
--- a/arch/arm/src/imxrt/Kconfig
+++ b/arch/arm/src/imxrt/Kconfig
@@ -183,7 +183,7 @@ config IMXRT_EDMA
config IMXRT_USBOTG
bool "USB EHCI"
default n
- select USBHOST_HAVE_ASYNCH
+ select USBHOST_HAVE_ASYNCH if USBHOST
select USBHOST_ASYNCH
config IMXRT_ENET
diff --git a/arch/arm/src/lpc31xx/Kconfig b/arch/arm/src/lpc31xx/Kconfig
index c439bac..63a4193 100644
--- a/arch/arm/src/lpc31xx/Kconfig
+++ b/arch/arm/src/lpc31xx/Kconfig
@@ -60,7 +60,7 @@ config LPC31_SPI
config LPC31_USBOTG
bool "USB OTG"
default n
- select USBHOST_HAVE_ASYNCH
+ select USBHOST_HAVE_ASYNCH if USBHOST
config LPC31_MCI
bool "MCI"
diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index c3c445d..dfa748b 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -324,7 +324,7 @@ config LPC43_USART3
config LPC43_USBOTG
bool "USB EHCI"
default n
- select USBHOST_HAVE_ASYNCH
+ select USBHOST_HAVE_ASYNCH if USBHOST
config LPC43_USB0
bool "USB0"
diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index 661af42..306baa9 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -1049,6 +1049,7 @@ config TIVA_ETHERNET
default n
depends on TIVA_HAVE_ETHERNET
select NETDEVICES
+ select ARCH_HAVE_PHY
select ARCH_HAVE_NETDEV_STATISTICS if ARCH_CHIP_LM3S || ARCH_CHIP_LM4F
---help---
This must be set (along with NET) to build the Stellaris Ethernet driver.
diff --git a/boards/arm/c5471/c5471evm/configs/nsh/defconfig b/boards/arm/c5471/c5471evm/configs/nsh/defconfig
index 53ca9de..90b3beb 100644
--- a/boards/arm/c5471/c5471evm/configs/nsh/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_NETDB_DNSCLIENT=y
CONFIG_NETDB_DNSCLIENT_ENTRIES=4
CONFIG_NETDB_DNSSERVER_NOADDR=y
CONFIG_NETINIT_NOMAC=y
-CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NET_BROADCAST=y
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
index c5ea3fb..b489908 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
@@ -96,6 +96,7 @@ CONFIG_LPC17_40_USBHOST=y
CONFIG_M25P_SUBSECTOR_ERASE=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
+CONFIG_MMCSD=y
CONFIG_MM_REGIONS=3
CONFIG_MTD=y
CONFIG_MTD_M25P=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
index 15a6d65..7729a60 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
@@ -28,6 +28,7 @@ CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
+CONFIG_LPC17_40_ETHERNET=y
CONFIG_LPC17_40_UART0=y
CONFIG_LPC17_40_USBHOST=y
CONFIG_MAX_TASKS=16
diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
index 39be98a..eec067c 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
@@ -31,6 +31,7 @@ CONFIG_LIB_HOSTNAME="stntest"
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_MMCSD=y
+CONFIG_MMCSD_SDIO=y
CONFIG_MM_REGIONS=3
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT=y