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

Commit 72b2224e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable ARCH_MSM8940 config for msm8940"

parents 945dd28c 5a5f4c6e

arch/arm/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ CONFIG_ARCH_QCOM=y 
CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_MSM8940=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM429=y

# CONFIG_VDSO is not set
@@ -348,6 +349,7 @@ CONFIG_SLIMBUS_MSM_NGD=y 
CONFIG_SPMI=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_MSM8940=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

arch/arm/configs/msm8937_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ CONFIG_ARCH_QCOM=y 
CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_MSM8940=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM429=y

# CONFIG_VDSO is not set
@@ -354,6 +355,7 @@ CONFIG_SLIMBUS_MSM_NGD=y 
CONFIG_SPMI=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_MSM8940=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

arch/arm64/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_PARTITION_ADVANCED=y 
# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8940=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_SDM429=y
@@ -346,6 +347,7 @@ CONFIG_SLIMBUS_MSM_NGD=y 
CONFIG_SPMI=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_MSM8940=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

arch/arm64/configs/msm8937_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ CONFIG_PARTITION_ADVANCED=y 
# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8940=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_SDM429=y
@@ -353,6 +354,7 @@ CONFIG_SLIMBUS_MSM_NGD=y 
CONFIG_SPMI=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_MSM8940=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y