From: "Justin M. Forbes" jforbes@fedoraproject.org

Hi,

As part of the ongoing rebase effort, the following configuration options need to be reviewed.

As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy.

If the value for a file that is added should be changed, please reply with a better option.

CONFIG_BCM54140_PHY:

Support the Broadcom BCM54140 Quad SGMII/QSGMII PHY.

This driver also supports the hardware monitoring of this PHY and exposes voltage and temperature sensors.

Symbol: BCM54140_PHY [=n] Type : tristate Defined at drivers/net/phy/Kconfig:357 Prompt: Broadcom BCM54140 PHY Depends on: NETDEVICES [=y] && PHYLIB [=y] && (HWMON [=y] || HWMON [=y]=n) Location: -> Device Drivers -> Network device support (NETDEVICES [=y]) -> PHY Device support and infrastructure (PHYLIB [=y]) Selects: BCM_NET_PHYLIB [=m]

---

CONFIG_MDIO_IPQ4019:

This driver supports the MDIO interface found in Qualcomm IPQ40xx series Soc-s.

Symbol: MDIO_IPQ4019 [=n] Type : tristate Defined at drivers/net/phy/Kconfig:160 Prompt: Qualcomm IPQ4019 MDIO interface support Depends on: NETDEVICES [=y] && MDIO_DEVICE [=y] && MDIO_BUS [=y] && HAS_IOMEM [=y] && OF_MDIO [=y] Location: -> Device Drivers -> Network device support (NETDEVICES [=y]) -> MDIO bus device drivers (MDIO_DEVICE [=y])

---

Signed-off-by: Justin M. Forbes jforbes@fedoraproject.org --- .../common/generic/CONFIG_BCM54140_PHY | 1 + .../common/generic/CONFIG_MDIO_IPQ4019 | 1 + .../generic/CONFIG_BCM54140_PHY | 21 ------------------- .../generic/CONFIG_MDIO_IPQ4019 | 18 ---------------- 4 files changed, 2 insertions(+), 39 deletions(-) create mode 100644 redhat/configs/common/generic/CONFIG_BCM54140_PHY create mode 100644 redhat/configs/common/generic/CONFIG_MDIO_IPQ4019 delete mode 100644 redhat/configs/pending-common/generic/CONFIG_BCM54140_PHY delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MDIO_IPQ4019

diff --git a/redhat/configs/common/generic/CONFIG_BCM54140_PHY b/redhat/configs/common/generic/CONFIG_BCM54140_PHY new file mode 100644 index 000000000000..ebd2ac9225ca --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_BCM54140_PHY @@ -0,0 +1 @@ +# CONFIG_BCM54140_PHY is not set diff --git a/redhat/configs/common/generic/CONFIG_MDIO_IPQ4019 b/redhat/configs/common/generic/CONFIG_MDIO_IPQ4019 new file mode 100644 index 000000000000..7bdf4704b651 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_MDIO_IPQ4019 @@ -0,0 +1 @@ +# CONFIG_MDIO_IPQ4019 is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_BCM54140_PHY b/redhat/configs/pending-common/generic/CONFIG_BCM54140_PHY deleted file mode 100644 index f86e00bfb361..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_BCM54140_PHY +++ /dev/null @@ -1,21 +0,0 @@ -# CONFIG_BCM54140_PHY: -# -# Support the Broadcom BCM54140 Quad SGMII/QSGMII PHY. -# -# This driver also supports the hardware monitoring of this PHY and -# exposes voltage and temperature sensors. -# -# Symbol: BCM54140_PHY [=n] -# Type : tristate -# Defined at drivers/net/phy/Kconfig:357 -# Prompt: Broadcom BCM54140 PHY -# Depends on: NETDEVICES [=y] && PHYLIB [=y] && (HWMON [=y] || HWMON [=y]=n) -# Location: -# -> Device Drivers -# -> Network device support (NETDEVICES [=y]) -# -> PHY Device support and infrastructure (PHYLIB [=y]) -# Selects: BCM_NET_PHYLIB [=m] -# -# -# -# CONFIG_BCM54140_PHY is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_MDIO_IPQ4019 b/redhat/configs/pending-common/generic/CONFIG_MDIO_IPQ4019 deleted file mode 100644 index e7792d132188..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_MDIO_IPQ4019 +++ /dev/null @@ -1,18 +0,0 @@ -# CONFIG_MDIO_IPQ4019: -# -# This driver supports the MDIO interface found in Qualcomm -# IPQ40xx series Soc-s. -# -# Symbol: MDIO_IPQ4019 [=n] -# Type : tristate -# Defined at drivers/net/phy/Kconfig:160 -# Prompt: Qualcomm IPQ4019 MDIO interface support -# Depends on: NETDEVICES [=y] && MDIO_DEVICE [=y] && MDIO_BUS [=y] && HAS_IOMEM [=y] && OF_MDIO [=y] -# Location: -# -> Device Drivers -# -> Network device support (NETDEVICES [=y]) -# -> MDIO bus device drivers (MDIO_DEVICE [=y]) -# -# -# -# CONFIG_MDIO_IPQ4019 is not set