diff options
| -rw-r--r-- | baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH (renamed from baseconfig/arm/armv7/CONFIG_DWMAC_DWC_QOS_ETH) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_DWMAC_GENERIC (renamed from baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_DWMAC_IPQ806X | 1 | ||||
| -rw-r--r-- | baseconfig/arm/CONFIG_STMMAC_PLATFORM (renamed from baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM) | 0 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB | 2 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X | 1 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 9 | ||||
| -rw-r--r-- | kernel-aarch64.config | 9 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 1 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
15 files changed, 21 insertions, 12 deletions
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_DWC_QOS_ETH b/baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH index 6ed7a8e38..6ed7a8e38 100644 --- a/baseconfig/arm/armv7/CONFIG_DWMAC_DWC_QOS_ETH +++ b/baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC b/baseconfig/arm/CONFIG_DWMAC_GENERIC index fe2550e2b..fe2550e2b 100644 --- a/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC +++ b/baseconfig/arm/CONFIG_DWMAC_GENERIC diff --git a/baseconfig/arm/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/CONFIG_DWMAC_IPQ806X deleted file mode 100644 index ce2bf0c43..000000000 --- a/baseconfig/arm/CONFIG_DWMAC_IPQ806X +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DWMAC_IPQ806X is not set diff --git a/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM b/baseconfig/arm/CONFIG_STMMAC_PLATFORM index 2ad238de4..2ad238de4 100644 --- a/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM +++ b/baseconfig/arm/CONFIG_STMMAC_PLATFORM diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X new file mode 100644 index 000000000..49177a6db --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X @@ -0,0 +1 @@ +CONFIG_DWMAC_IPQ806X=m diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI b/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI new file mode 100644 index 000000000..254fc7d8a --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI @@ -0,0 +1 @@ +CONFIG_DWMAC_SUNXI=m diff --git a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB b/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB index a6a26dd17..f619228c3 100644 --- a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB +++ b/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB @@ -1 +1 @@ -# CONFIG_PHY_SUN4I_USB is not set +CONFIG_PHY_SUN4I_USB=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X new file mode 100644 index 000000000..49177a6db --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X @@ -0,0 +1 @@ +CONFIG_DWMAC_IPQ806X=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4dbc0a011..7e11c1125 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1374,10 +1374,13 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_IPQ806X is not set +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SUN8I=m +CONFIG_DWMAC_SUNXI=m CONFIG_DW_WATCHDOG=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y @@ -3901,7 +3904,7 @@ CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set -# CONFIG_PHY_SUN4I_USB is not set +CONFIG_PHY_SUN4I_USB=m # CONFIG_PHY_SUN9I_USB is not set CONFIG_PHY_TEGRA_XUSB=m # CONFIG_PHY_TUSB1210 is not set @@ -5230,7 +5233,7 @@ CONFIG_STK3310=m # CONFIG_STM is not set CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PCI is not set -# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PLATFORM=m # CONFIG_STM_SOURCE_CONSOLE is not set CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c4890585e..b19f66426 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1364,10 +1364,13 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_IPQ806X is not set +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SUN8I=m +CONFIG_DWMAC_SUNXI=m CONFIG_DW_WATCHDOG=m CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_FTRACE=y @@ -3880,7 +3883,7 @@ CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set -# CONFIG_PHY_SUN4I_USB is not set +CONFIG_PHY_SUN4I_USB=m # CONFIG_PHY_SUN9I_USB is not set CONFIG_PHY_TEGRA_XUSB=m # CONFIG_PHY_TUSB1210 is not set @@ -5207,7 +5210,7 @@ CONFIG_STK3310=m # CONFIG_STM is not set CONFIG_STMMAC_ETH=m # CONFIG_STMMAC_PCI is not set -# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PLATFORM=m # CONFIG_STM_SOURCE_CONSOLE is not set CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 973ed27a4..6cf55ccfb 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1497,7 +1497,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=m -# CONFIG_DWMAC_IPQ806X is not set +CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_STI=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4c5aa2b7d..0e747cbe1 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1420,7 +1420,6 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=m -# CONFIG_DWMAC_IPQ806X is not set CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SUN8I=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 09b617d19..8a0655100 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1410,7 +1410,6 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=m -# CONFIG_DWMAC_IPQ806X is not set CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SUN8I=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 145b4fcb4..a6b115722 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1487,7 +1487,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DWMAC_DWC_QOS_ETH is not set CONFIG_DWMAC_GENERIC=m -# CONFIG_DWMAC_IPQ806X is not set +CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_STI=m diff --git a/kernel.spec b/kernel.spec index fb9ab714e..19a8ad150 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2169,6 +2169,9 @@ fi # # %changelog +* Tue Apr 4 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Update AllWinner configs + * Tue Apr 04 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc5.git1.1 - Linux v4.11-rc5-11-g08e4e0d |