Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2358829f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sa515m: Enable STMMAC driver"

parents 36043e28 c955da1a

arch/arm/configs/vendor/sa515m-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -212,7 +212,9 @@ CONFIG_KS8851=y 
CONFIG_RMNET=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_STMMAC_ETH=y

# CONFIG_DWMAC_GENERIC is not set

# CONFIG_DWMAC_IPQ806X is not set

CONFIG_AT803X_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_PPP=y
@@ -250,6 +252,7 @@ CONFIG_SPMI=y 
CONFIG_SLIMBUS=y

CONFIG_PPS=y

CONFIG_PPS_CLIENT_GPIO=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDXPRAIRIE=y

CONFIG_GPIOLIB=y

arch/arm/configs/vendor/sa515m_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -210,7 +210,9 @@ CONFIG_KS8851=y 
CONFIG_RMNET=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_STMMAC_ETH=y

# CONFIG_DWMAC_GENERIC is not set

# CONFIG_DWMAC_IPQ806X is not set

CONFIG_AT803X_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_PPP=y
@@ -250,6 +252,7 @@ CONFIG_SPMI=y 
CONFIG_SLIMBUS=y

CONFIG_PPS=y

CONFIG_PPS_CLIENT_GPIO=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_SDXPRAIRIE=y

CONFIG_GPIOLIB=y