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

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

Merge "defconfig: sa2150p: remove IEEE 802.11 support"

parents aeb8fb7f 92962304

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

+3 −11
Original line number Diff line number Diff line
@@ -204,17 +204,6 @@ CONFIG_QRTR=y 
CONFIG_QRTR_SMD=y

CONFIG_CAN=y

CONFIG_QTI_CAN=y

CONFIG_BT=y

# CONFIG_BT_BREDR is not set

# CONFIG_BT_LE is not set

# CONFIG_BT_DEBUGFS is not set

CONFIG_MSM_BT_POWER=y

CONFIG_CFG80211=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_MAC80211=m

CONFIG_MAC80211_RC_MINSTREL_VHT=y

CONFIG_MAC80211_DEBUGFS=y

CONFIG_RFKILL=y

CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y

CONFIG_DMA_CMA=y

CONFIG_MTD=y
@@ -288,6 +277,7 @@ CONFIG_I2C_MSM_V2=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPMI=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PTP_1588_CLOCK=y
@@ -435,6 +425,7 @@ CONFIG_IIO=y 
CONFIG_QCOM_SPMI_ADC5=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QCOM_KGSL=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y
@@ -492,6 +483,7 @@ CONFIG_HARDENED_USERCOPY=y 
CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_CMAC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm64/configs/vendor/sa2150p-nand_defconfig

+3 −11
Original line number Diff line number Diff line
@@ -210,17 +210,6 @@ CONFIG_QRTR=y 
CONFIG_QRTR_SMD=y

CONFIG_CAN=y

CONFIG_QTI_CAN=y

CONFIG_BT=y

# CONFIG_BT_BREDR is not set

# CONFIG_BT_LE is not set

# CONFIG_BT_DEBUGFS is not set

CONFIG_MSM_BT_POWER=y

CONFIG_CFG80211=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_MAC80211=m

CONFIG_MAC80211_RC_MINSTREL_VHT=y

CONFIG_MAC80211_DEBUGFS=y

CONFIG_RFKILL=y

CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y

CONFIG_DMA_CMA=y

CONFIG_MTD=y
@@ -298,6 +287,7 @@ CONFIG_SPI_QUP=y 
CONFIG_SPI_SPIDEV=y

CONFIG_SPMI=y

CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PTP_1588_CLOCK=y
@@ -452,6 +442,7 @@ CONFIG_IIO=y 
CONFIG_QCOM_SPMI_ADC5=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QCOM_KGSL=y

CONFIG_QTI_MPM=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y
@@ -542,6 +533,7 @@ CONFIG_HARDENED_USERCOPY=y 
CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_CMAC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y