Fix network on some i.MX6 devices (rhbz 1628209)

20 files changed, 55 insertions, 53 deletions

diff --git a/configs/fedora/generic/CONFIG_FIXED_PHY b/configs/fedora/generic/CONFIG_FIXED_PHY
index 89309ed1e..80379efd3 100644
--- a/configs/fedora/generic/CONFIG_FIXED_PHY
+++ b/configs/fedora/generic/CONFIG_FIXED_PHY
@@ -1 +1 @@
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
diff --git a/configs/fedora/generic/CONFIG_MDIO_DEVICE b/configs/fedora/generic/CONFIG_MDIO_DEVICE
index 67ac6bad8..07444b0be 100644
--- a/configs/fedora/generic/CONFIG_MDIO_DEVICE
+++ b/configs/fedora/generic/CONFIG_MDIO_DEVICE
@@ -1 +1 @@
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
diff --git a/configs/fedora/generic/CONFIG_PHYLIB b/configs/fedora/generic/CONFIG_PHYLIB
index 9ecd6c079..64ef52233 100644
--- a/configs/fedora/generic/CONFIG_PHYLIB
+++ b/configs/fedora/generic/CONFIG_PHYLIB
@@ -1 +1 @@
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
diff --git a/configs/fedora/generic/arm/CONFIG_OF_MDIO b/configs/fedora/generic/arm/CONFIG_OF_MDIO
index e022a134b..cbdf2ee2f 100644
--- a/configs/fedora/generic/arm/CONFIG_OF_MDIO
+++ b/configs/fedora/generic/arm/CONFIG_OF_MDIO
@@ -1 +1 @@
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
diff --git a/configs/fedora/generic/s390x/CONFIG_MDIO_DEVICE b/configs/fedora/generic/s390x/CONFIG_MDIO_DEVICE
deleted file mode 100644
index 67ac6bad8..000000000
--- a/configs/fedora/generic/s390x/CONFIG_MDIO_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_DEVICE=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 09ccc8c0d..3458857ae 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1826,7 +1826,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3190,7 +3190,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
@@ -4234,7 +4234,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4421,7 +4421,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HISI_INNO_USB2=m
 CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 82e40e175..a8687b586 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1808,7 +1808,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3169,7 +3169,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_I2C=m
@@ -4212,7 +4212,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4399,7 +4399,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HISI_INNO_USB2=m
 CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 163aeeec2..75d85449a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1937,7 +1937,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3357,7 +3357,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4448,7 +4448,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4675,7 +4675,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 199cd0b59..000bde442 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1841,7 +1841,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3211,7 +3211,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4264,7 +4264,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4454,7 +4454,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6d3ad2e86..479d6723b 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1823,7 +1823,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3190,7 +3190,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4242,7 +4242,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4432,7 +4432,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index efd8d437d..248dd836b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1919,7 +1919,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3336,7 +3336,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4426,7 +4426,7 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4653,7 +4653,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index e92945cfb..a3ccc2dcf 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1670,7 +1670,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3076,7 +3076,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4262,7 +4262,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 2c9bd6f53..af381922c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1649,7 +1649,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3053,7 +3053,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4239,7 +4239,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2946b79a5..310eae7e8 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1532,7 +1532,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2849,7 +2849,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3977,7 +3977,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 16e84c592..0c8630f15 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1511,7 +1511,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2825,7 +2825,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3952,7 +3952,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index d45722973..3e3120961 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1517,7 +1517,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2793,7 +2793,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3911,7 +3911,7 @@ CONFIG_PFAULT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b3f07400a..87006a6c5 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1496,7 +1496,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2769,7 +2769,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3886,7 +3886,7 @@ CONFIG_PFAULT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 01facd8a7..eb22f60e5 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1713,7 +1713,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3126,7 +3126,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4305,7 +4305,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 479a3b905..0126755af 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1692,7 +1692,7 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -3103,7 +3103,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -4282,7 +4282,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
diff --git a/kernel.spec b/kernel.spec
index da00ea0bf..b33606f8e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1887,6 +1887,9 @@ fi
 #
 #
 %changelog
+* Sat Oct 20 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix network on some i.MX6 devices (rhbz 1628209)
+
 * Fri Oct 19 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc8.git4.1
 - Linux v4.19-rc8-95-g91b15613ce7f
 - Enable pinctrl-cannonlake (rhbz 1641057)