UBUNTU: [Config] arm64: snapdragon: DRM_MSM=m

BugLink: https://bugs.launchpad.net/bugs/1797154
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index b22966aac36bc73744f3500527b4686b0b096611..c5d0543da1abd07f11e84fa62091ba74464438c8 100644 (file)
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -8,7 +8,6 @@ CONFIG_COMMON_CLK_QCOM=m
 CONFIG_DRM=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_MSM=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_FOPS=m
@@ -34,7 +33,6 @@ CONFIG_QCOM_CLK_SMD_RPM=m
 # CONFIG_QCOM_CPR is not set
 CONFIG_QCOM_HIDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM=m

diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index 28179ca69d946d70477998f1d846ce733e61235b..56b7a6a251b09b4667c83c2580b93237c79a069e 100644 (file)
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -8,7 +8,6 @@ CONFIG_COMMON_CLK_QCOM=y
 CONFIG_DRM=y
 CONFIG_DRM_I2C_ADV7511=y
 CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_MSM=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
@@ -34,7 +33,6 @@ CONFIG_QCOM_CLK_SMD_RPM=y
 CONFIG_QCOM_CPR=y
 CONFIG_QCOM_HIDMA=y
 CONFIG_QCOM_HIDMA_MGMT=y
-CONFIG_QCOM_MDT_LOADER=y
 CONFIG_QCOM_QFPROM=y
 CONFIG_QCOM_SMD_RPM=y
 CONFIG_QCOM_SMEM=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b7530fab51c94f816bcab131ec77ba28148c78cf..a70ee7792851cd7d7e5477057f2fa05961a248d7 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -93,7 +93,6 @@ CONFIG_DNET=m
 CONFIG_DRM=m
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_MSM=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
@@ -363,7 +362,6 @@ CONFIG_QCOM_CLK_SMD_RPM=m
 # CONFIG_QCOM_CPR is not set
 CONFIG_QCOM_HIDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d3aee2bb6d855df89c78557aeb8bbb9dc4eb3d76..8abb899baf9eeb3497bb45d683784b7f38bd2e9e 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2321,6 +2321,7 @@ CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
@@ -7026,6 +7027,7 @@ CONFIG_QCOM_IOMMU=y
 CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
+CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PM=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 # CONFIG_QCOM_Q6V5_PIL is not set