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

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

Merge "Revert "Revert "defconfig: sdm429w: Remove camera modules"""

parents 6a656943 257d45fc

arch/arm/configs/sdm429-bg-perf_defconfig

+3 −28
Original line number Diff line number Diff line
@@ -353,35 +353,9 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_ADSP_SHMEM=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y
@@ -436,6 +410,8 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM_ICE=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y
@@ -493,7 +469,6 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y 
CONFIG_ICNSS=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_AVTIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DCC=y

CONFIG_QTI_RPM_STATS_LOG=y

arch/arm/configs/sdm429-bg_defconfig

+3 −28
Original line number Diff line number Diff line
@@ -360,35 +360,9 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_ADSP_SHMEM=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y
@@ -444,6 +418,8 @@ CONFIG_MMC_SDHCI=y 
CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM_ICE=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y
@@ -507,7 +483,6 @@ CONFIG_MSM_PIL_SSR_GENERIC=y 
CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_AVTIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DCC=y

CONFIG_QTI_RPM_STATS_LOG=y