From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 21 Mar 2017 07:21:34 +0000 (+0100)
Subject: kernel: move disabling DRM symbols to the config file
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e41e1e6a2a46d3a75676be7dee7f11a47c95e9bf;p=openwrt%2Fstaging%2Fluka.git

kernel: move disabling DRM symbols to the config file

This is the standard way we handle this. Please note (it seems) I could
drop few symbols as they are hidden under (disabled) DRM_LEGACY now.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
index f70a5653c6..a93c0b89f2 100644
--- a/package/kernel/linux/modules/video.mk
+++ b/package/kernel/linux/modules/video.mk
@@ -187,39 +187,7 @@ define KernelPackage/drm
   TITLE:=Direct Rendering Manager (DRM) support
   HIDDEN:=1
   DEPENDS:=+kmod-dma-buf +kmod-i2c-core
-  KCONFIG:=CONFIG_DRM \
-	CONFIG_DRM_FBDEV_EMULATION=n \
-	CONFIG_DRM_LOAD_EDID_FIRMWARE=n \
-	CONFIG_DRM_IMX=n \
-	CONFIG_DRM_PTN3460=n \
-	CONFIG_DRM_PS8622=n \
-	CONFIG_DRM_TDFX=n \
-	CONFIG_DRM_R128=n \
-	CONFIG_DRM_RADEON=n \
-	CONFIG_DRM_AMDGPU=n \
-	CONFIG_DRM_NOUVEAU=n \
-	CONFIG_DRM_MGA=n \
-	CONFIG_DRM_VIA=n \
-	CONFIG_DRM_SAVAGE=n \
-	CONFIG_DRM_VGEM=n \
-	CONFIG_DRM_EXYNOS=n \
-	CONFIG_DRM_VMWGFX=n \
-	CONFIG_DRM_UDL=n \
-	CONFIG_DRM_AST=n \
-	CONFIG_DRM_MGAG200=n \
-	CONFIG_DRM_CIRRUS_QEMU=n \
-	CONFIG_DRM_ARMADA=n \
-	CONFIG_DRM_TILCDC=n \
-	CONFIG_DRM_QXL=n \
-	CONFIG_DRM_BOCHS=n \
-	CONFIG_DRM_FSL_DCU=n \
-	CONFIG_DRM_STI=n \
-	CONFIG_DRM_NXP_PTN3460=n \
-	CONFIG_DRM_PARADE_PS8622=n \
-	CONFIG_DRM_I2C_ADV7511=n \
-	CONFIG_DRM_I2C_CH7006=n \
-	CONFIG_DRM_I2C_SIL164=n \
-	CONFIG_DRM_I2C_NXP_TDA998X=n
+  KCONFIG:=CONFIG_DRM
   FILES:=$(LINUX_DIR)/drivers/gpu/drm/drm.ko
   AUTOLOAD:=$(call AutoLoad,05,drm)
 endef
diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9
index 594961df8d..47ad0893f3 100644
--- a/target/linux/generic/config-4.9
+++ b/target/linux/generic/config-4.9
@@ -1055,17 +1055,40 @@ CONFIG_DOUBLEFAULT=y
 CONFIG_DQL=y
 # CONFIG_DRAGONRISE_FF is not set
 # CONFIG_DRM is not set
+# CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_BOCHS is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_ETNAVIV is not set
+# CONFIG_DRM_EXYNOS is not set
+# CONFIG_DRM_FBDEV_EMULATION is not set
+# CONFIG_DRM_FSL_DCU is not set
 # CONFIG_DRM_HDLCD is not set
+# CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_LEGACY is not set
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_OMAP is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_STI is not set
+# CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_VGEM is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DST_CACHE is not set