You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/02/08 23:58:44 UTC
[incubator-nuttx] branch pr232 updated (04128b4 -> ed5fe49)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch pr232
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 04128b4 arch/sim/src: Rename board_lcd.c to up_lcd.c like other sim code
new 429c8b8 Kconfig: Fix unmet dependencies on ARCH_PHY_INTERRUPT
new 569ac29 Kconfig: Alternative implementation
new ed5fe49 Revert a portion of previous commit in the PR set.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/Kconfig | 14 +++++++-------
drivers/net/Kconfig | 8 ++------
net/Kconfig | 4 ++++
3 files changed, 13 insertions(+), 13 deletions(-)
[incubator-nuttx] 02/03: Kconfig: Alternative implementation
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr232
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 569ac29df0449b6241f57767e7104eb39b7c927f
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Feb 8 13:09:58 2020 -0600
Kconfig: Alternative implementation
Per feedback from Xiao Xiang, instead of propagating the practice of conditionally selecting configuration options, move the ARCH_PHY_INTERRUPT option to net/Kconfig and make it unconditionally selectable.
---
boards/Kconfig | 14 +++++++-------
drivers/net/Kconfig | 4 ----
net/Kconfig | 4 ++++
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/boards/Kconfig b/boards/Kconfig
index b622863..67c2cf9 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -1320,7 +1320,7 @@ config ARCH_BOARD_SAMA5D3X_EK
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
---help---
The port of NuttX to the Atmel SAMA5D3x-EK development board (where x=1,3,4, or 5).
@@ -1330,7 +1330,7 @@ config ARCH_BOARD_SAMA5D3_XPLAINED
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
- select ARCH_PHY_INTERRUPT if NETDEVICES && (SAMA5_EMACA || SAMA5_EMAC0 || SAMA5_EMAC1 || SAMA5_GMAC)
+ select ARCH_PHY_INTERRUPT if SAMA5_EMACA || SAMA5_EMAC0 || SAMA5_EMAC1 || SAMA5_GMAC
---help---
The port of NuttX to the Atmel SAMA5D3 Xplained development board.
@@ -1340,7 +1340,7 @@ config ARCH_BOARD_SAMA5D4_EK
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
---help---
The port of NuttX to the Atmel SAMA5D4-EK development board
@@ -1407,7 +1407,7 @@ config ARCH_BOARD_SAM4EEK
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
---help---
The port of NuttX to the Atmel SAM4E-EK development board. This
board features the SAM4E16 MCU running at up to 120MHz.
@@ -1445,7 +1445,7 @@ config ARCH_BOARD_SAME70_XPLAINED
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
---help---
The port of NuttX to the Atmel SAME70 Xplained evaluation board.
@@ -1455,7 +1455,7 @@ config ARCH_BOARD_SAMV71_XULT
select ARCH_HAVE_LEDS
select ARCH_HAVE_BUTTONS
select ARCH_HAVE_IRQBUTTONS
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
---help---
The port of NuttX to the Atmel SAMV71 Xplained Ultra evaluation board.
@@ -2030,7 +2030,7 @@ config BOARD_CUSTOM_INTERRUPT
bool "Custom board PHY interrupts"
default n
depends on NETDEVICES
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
endmenu # Custom Board Configuration
endif #ARCH_BOARD_CUSTOM
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6ddf981..e1647f7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -339,10 +339,6 @@ if ARCH_HAVE_PHY
comment "External Ethernet PHY Device Support"
-config ARCH_PHY_INTERRUPT
- bool
- default n
-
choice
prompt "Board PHY Selection (ETH0)"
default ETH0_PHY_NONE
diff --git a/net/Kconfig b/net/Kconfig
index e7c6973..fffbfa8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -11,6 +11,10 @@ config ARCH_HAVE_PHY
bool
default n
+config ARCH_PHY_INTERRUPT
+ bool
+ default n
+
config ARCH_HAVE_NETDEV_STATISTICS
bool
default n
[incubator-nuttx] 03/03: Revert a portion of previous commit in the
PR set.
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr232
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ed5fe4953fa1e4e0fbcf1fba99666be693e5277c
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Feb 8 13:14:10 2020 -0600
Revert a portion of previous commit in the PR set.
---
arch/arm/src/imxrt/Kconfig | 2 +-
arch/arm/src/s32k1xx/Kconfig | 2 +-
arch/arm/src/tiva/Kconfig | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/imxrt/Kconfig b/arch/arm/src/imxrt/Kconfig
index 826bc59..0e1518f 100644
--- a/arch/arm/src/imxrt/Kconfig
+++ b/arch/arm/src/imxrt/Kconfig
@@ -190,7 +190,7 @@ config IMXRT_ENET
bool "Ethernet"
default n
select ARCH_HAVE_PHY
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
select ARCH_HAVE_NETDEV_STATISTICS
config IMXRT_LCD
diff --git a/arch/arm/src/s32k1xx/Kconfig b/arch/arm/src/s32k1xx/Kconfig
index 1ccb548..63e0cd9 100644
--- a/arch/arm/src/s32k1xx/Kconfig
+++ b/arch/arm/src/s32k1xx/Kconfig
@@ -80,7 +80,7 @@ config S32K1XX_HAVE_ENET
bool
default n
select ARCH_HAVE_PHY
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
select ARCH_HAVE_NETDEV_STATISTICS
config S32K1XX_HAVE_EWM
diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index f955410..861ade5 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -1599,7 +1599,7 @@ endif # !TIVA_PHY_INTERNAL
config TIVA_PHY_INTERRUPTS
bool "PHY interrupt support"
- select ARCH_PHY_INTERRUPT if NETDEVICES
+ select ARCH_PHY_INTERRUPT
select NETDEV_PHY_IOCTL
default n
---help---
[incubator-nuttx] 01/03: Kconfig: Fix unmet dependencies on
ARCH_PHY_INTERRUPT
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr232
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 429c8b8a9e755d0bb19290cfb4419bec4c9a9bc0
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Feb 8 12:37:30 2020 -0600
Kconfig: Fix unmet dependencies on ARCH_PHY_INTERRUPT
Fix new warnings in the build test output. The warnings were were of the form "... selects ARCH_PHY_INTERRUPT which has unmet dependencies (NETDEVICES && ARCH_HAVE_PHY). This was observed on the s32k148evb:nsh configuration.
I assume that this is because of the NETDEVICES dependency. In most cases, the 'select ARCH_PHY_INTERRUPT' depended on NETDEVICES, but that was not the case for i.MX RT, S32K1xx, and Tiva. This commit adds that dependency to the select like:
select ARCH_PHY_INTERRUPT if NETDEVICES
as it is done in all other Kconfig files that select ARCH_PHY_INTERRUPT.
---
arch/arm/src/imxrt/Kconfig | 2 +-
arch/arm/src/s32k1xx/Kconfig | 2 +-
arch/arm/src/tiva/Kconfig | 2 +-
drivers/net/Kconfig | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/imxrt/Kconfig b/arch/arm/src/imxrt/Kconfig
index 0e1518f..826bc59 100644
--- a/arch/arm/src/imxrt/Kconfig
+++ b/arch/arm/src/imxrt/Kconfig
@@ -190,7 +190,7 @@ config IMXRT_ENET
bool "Ethernet"
default n
select ARCH_HAVE_PHY
- select ARCH_PHY_INTERRUPT
+ select ARCH_PHY_INTERRUPT if NETDEVICES
select ARCH_HAVE_NETDEV_STATISTICS
config IMXRT_LCD
diff --git a/arch/arm/src/s32k1xx/Kconfig b/arch/arm/src/s32k1xx/Kconfig
index 63e0cd9..1ccb548 100644
--- a/arch/arm/src/s32k1xx/Kconfig
+++ b/arch/arm/src/s32k1xx/Kconfig
@@ -80,7 +80,7 @@ config S32K1XX_HAVE_ENET
bool
default n
select ARCH_HAVE_PHY
- select ARCH_PHY_INTERRUPT
+ select ARCH_PHY_INTERRUPT if NETDEVICES
select ARCH_HAVE_NETDEV_STATISTICS
config S32K1XX_HAVE_EWM
diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index 861ade5..f955410 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -1599,7 +1599,7 @@ endif # !TIVA_PHY_INTERNAL
config TIVA_PHY_INTERRUPTS
bool "PHY interrupt support"
- select ARCH_PHY_INTERRUPT
+ select ARCH_PHY_INTERRUPT if NETDEVICES
select NETDEV_PHY_IOCTL
default n
---help---
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 176e7ac..6ddf981 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -380,7 +380,7 @@ config ETH0_PHY_DP83848C
config ETH0_PHY_TJA1100
bool "NXP TJA1100 PHY"
select ARCH_PHY_100BASE_T1
-
+
config ETH0_PHY_TJA1101
bool "NXP TJA1101 PHY"
select ARCH_PHY_100BASE_T1
@@ -436,7 +436,7 @@ config ETH1_PHY_DP83848C
config ETH1_PHY_TJA1100
bool "NXP TJA1100 PHY"
select ARCH_PHY_100BASE_T1
-
+
config ETH1_PHY_TJA1101
bool "NXP TJA1101 PHY"
select ARCH_PHY_100BASE_T1