Message ID | 1432948272-23804-1-git-send-email-mathieu@codeaurora.org |
---|---|
State | Accepted |
Headers | show |
Hi, On Sat, May 30, 2015 at 3:11 AM, Mathieu Olivari <mathieu@codeaurora.org> wrote: > Ethernet GMAC is built-in the SoC, so there is no need to enable it as a > module. We'll just assume we need it. That's what is done for other > platform where this driver is used so it'll make things more consistent. > > Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> > --- > target/linux/ipq806x/Makefile | 2 +- > target/linux/ipq806x/config-3.18 | 10 ++++++++-- > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile > index da841a6..b6ddfe2 100644 > --- a/target/linux/ipq806x/Makefile > +++ b/target/linux/ipq806x/Makefile > @@ -15,7 +15,7 @@ KERNELNAME:=zImage Image dtbs > > include $(INCLUDE_DIR)/target.mk > DEFAULT_PACKAGES += \ > - kmod-leds-gpio kmod-gpio-button-hotplug kmod-stmmac swconfig \ > + kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ > kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform > > > diff --git a/target/linux/ipq806x/config-3.18 b/target/linux/ipq806x/config-3.18 > index 396c6e3..4d3b884 100644 > --- a/target/linux/ipq806x/config-3.18 > +++ b/target/linux/ipq806x/config-3.18 > @@ -121,6 +121,7 @@ CONFIG_DMA_ENGINE=y > CONFIG_DMA_OF=y > CONFIG_DMA_VIRTUAL_CHANNELS=y > CONFIG_DTC=y > +CONFIG_DWMAC_IPQ806X=y > # CONFIG_DW_DMAC_CORE is not set > # CONFIG_DW_DMAC_PCI is not set > CONFIG_DYNAMIC_DEBUG=y > @@ -212,7 +213,6 @@ CONFIG_I2C_CHARDEV=y > CONFIG_I2C_COMPAT=y > CONFIG_I2C_HELPER_AUTO=y > CONFIG_I2C_QUP=y > -# CONFIG_IEEE802154 is not set > CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_INITRAMFS_SOURCE="" > @@ -243,7 +243,6 @@ CONFIG_MFD_SYSCON=y > CONFIG_MIGHT_HAVE_CACHE_L2X0=y > CONFIG_MIGHT_HAVE_PCI=y > CONFIG_MIGRATION=y > -# CONFIG_MMC_SDHCI_MSM is not set > CONFIG_MODULES_USE_ELF_REL=y > CONFIG_MSM_GCC_8660=y > CONFIG_MSM_GCC_8960=y > @@ -261,6 +260,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y > CONFIG_NEED_DMA_MAP_STATE=y > CONFIG_NEON=y > CONFIG_NET_FLOW_LIMIT=y > +CONFIG_NET_PTP_CLASSIFY=y > CONFIG_NET_VENDOR_WIZNET=y > CONFIG_NO_BOOTMEM=y > CONFIG_NO_HZ=y > @@ -319,12 +319,14 @@ CONFIG_POWER_RESET=y > CONFIG_POWER_RESET_MSM=y > # CONFIG_POWER_RESET_SYSCON is not set > CONFIG_POWER_SUPPLY=y > +CONFIG_PPS=y > CONFIG_PREEMPT=y > CONFIG_PREEMPT_COUNT=y > # CONFIG_PREEMPT_NONE is not set > CONFIG_PREEMPT_RCU=y > CONFIG_PRINTK_TIME=y > CONFIG_PROC_PAGE_MONITOR=y > +CONFIG_PTP_1588_CLOCK=y > CONFIG_QCOM_BAM_DMA=y > CONFIG_QCOM_GSBI=y > CONFIG_QCOM_HFPLL=y > @@ -366,6 +368,10 @@ CONFIG_SPI_MASTER=y > CONFIG_SPI_QUP=y > CONFIG_SPMI=y > CONFIG_SPMI_MSM_PMIC_ARB=y > +# CONFIG_STMMAC_DA is not set The kmod version had this enabled - is this change intentional? Jonas
On 30/05/2015 10:51, Jonas Gorski wrote: > Hi, > > On Sat, May 30, 2015 at 3:11 AM, Mathieu Olivari <mathieu@codeaurora.org> wrote: >> Ethernet GMAC is built-in the SoC, so there is no need to enable it as a >> module. We'll just assume we need it. That's what is done for other >> platform where this driver is used so it'll make things more consistent. >> ... >> @@ -366,6 +368,10 @@ CONFIG_SPI_MASTER=y >> CONFIG_SPI_QUP=y >> CONFIG_SPMI=y >> CONFIG_SPMI_MSM_PMIC_ARB=y >> +# CONFIG_STMMAC_DA is not set > > The kmod version had this enabled - is this change intentional? > > > Jonas > config STMMAC_DA bool "STMMAC DMA arbitration scheme" default n ---help--- Selecting this option, rx has priority over Tx (only for Giga Ethernet device). By default, the DMA arbitration scheme is based on Round-robin (rx:tx priority is 1:1). to me this option sounds like it should be off.
diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index da841a6..b6ddfe2 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -15,7 +15,7 @@ KERNELNAME:=zImage Image dtbs include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ - kmod-leds-gpio kmod-gpio-button-hotplug kmod-stmmac swconfig \ + kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform diff --git a/target/linux/ipq806x/config-3.18 b/target/linux/ipq806x/config-3.18 index 396c6e3..4d3b884 100644 --- a/target/linux/ipq806x/config-3.18 +++ b/target/linux/ipq806x/config-3.18 @@ -121,6 +121,7 @@ CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DTC=y +CONFIG_DWMAC_IPQ806X=y # CONFIG_DW_DMAC_CORE is not set # CONFIG_DW_DMAC_PCI is not set CONFIG_DYNAMIC_DEBUG=y @@ -212,7 +213,6 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_COMPAT=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_QUP=y -# CONFIG_IEEE802154 is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_INITRAMFS_SOURCE="" @@ -243,7 +243,6 @@ CONFIG_MFD_SYSCON=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y -# CONFIG_MMC_SDHCI_MSM is not set CONFIG_MODULES_USE_ELF_REL=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_GCC_8960=y @@ -261,6 +260,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y CONFIG_NET_FLOW_LIMIT=y +CONFIG_NET_PTP_CLASSIFY=y CONFIG_NET_VENDOR_WIZNET=y CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ=y @@ -319,12 +319,14 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_MSM=y # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_SUPPLY=y +CONFIG_PPS=y CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_RCU=y CONFIG_PRINTK_TIME=y CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PTP_1588_CLOCK=y CONFIG_QCOM_BAM_DMA=y CONFIG_QCOM_GSBI=y CONFIG_QCOM_HFPLL=y @@ -366,6 +368,10 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_QUP=y CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_DEBUG_FS=y +CONFIG_STMMAC_ETH=y +CONFIG_STMMAC_PLATFORM=y CONFIG_STOP_MACHINE=y # CONFIG_STRIP_ASM_SYMS is not set CONFIG_SUSPEND=y
Ethernet GMAC is built-in the SoC, so there is no need to enable it as a module. We'll just assume we need it. That's what is done for other platform where this driver is used so it'll make things more consistent. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> --- target/linux/ipq806x/Makefile | 2 +- target/linux/ipq806x/config-3.18 | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-)