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

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

Merge "defconfig: sa2150p-nand: Enable STMMAC driver"

parents 8ba92afc cd883925

arch/arm64/configs/vendor/sa2150p-nand-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -238,6 +238,9 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

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
@@ -280,7 +283,6 @@ CONFIG_SPMI=y 
CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_QCS405=y

CONFIG_FRAGMENTED_GPIO_ADDRESS_SPACE=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

arch/arm64/configs/vendor/sa2150p-nand_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -238,6 +238,9 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

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
@@ -282,7 +285,6 @@ CONFIG_SPMI=y 
CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_QCS405=y

CONFIG_FRAGMENTED_GPIO_ADDRESS_SPACE=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y