From: Christian Lamparter <chunkeey@gmail.com>
Date: Thu, 28 Feb 2019 14:43:49 +0000 (+0100)
Subject: x86: fix geode image builds redux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c70ac7be484cdcb31e76ac802fb629dad4456e4;p=openwrt%2Fstaging%2Fstintel.git

x86: fix geode image builds redux

This patch adds more disabled DRM config symbols from the
x86' config to the generic target configs. The existing
symbols in the x86' configs are kept for now, until we
know whenever we want to remove such symbols or not
(see Github PR #1831, #1825, #1828).

THis patch also contains a squashed patch from
Daniel Engberg <daniel.engberg.lists@pyret.net> titled
"kernel: Fix config for 4.14" which fixes a duplicated line
added by: commit 8bdc241d01eb ("x86: fix geode image builds")

Fixes: 8bdc241d01eb ("x86: fix geode image builds")
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 36b621fb31..cabdd9d01d 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -1151,7 +1151,7 @@ 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_I915 is not set
 # CONFIG_DRM_AMDGPU is not set
 # CONFIG_DRM_AMDGPU_CIK is not set
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
@@ -1173,6 +1173,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_EXYNOS is not set
 # CONFIG_DRM_FBDEV_EMULATION is not set
 # CONFIG_DRM_FSL_DCU is not set
+# CONFIG_DRM_GMA500 is not set
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -1207,6 +1208,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_PL111 is not set
 # CONFIG_DRM_QXL is not set
 # CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_RADEON_USERPTR is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_SIL_SII8620 is not set
@@ -1220,6 +1222,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_VBOXVIDEO is not set
 # CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DST_CACHE is not set
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index df075b299a..288c2c5836 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -777,6 +777,8 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHASH_STATS is not set
+# CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
@@ -1211,7 +1213,13 @@ CONFIG_DOUBLEFAULT=y
 CONFIG_DQL=y
 # CONFIG_DRAGONRISE_FF is not set
 # CONFIG_DRM is not set
+# CONFIG_DRM_I915 is not set
 # CONFIG_DRM_AMDGPU is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+# CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_USERPTR is not set
+# CONFIG_DRM_AMD_ACP is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_ARMADA is not set
@@ -1230,6 +1238,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_FBDEV_EMULATION is not set
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 # CONFIG_DRM_FSL_DCU is not set
+# CONFIG_DRM_GMA500 is not set
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -1284,6 +1293,7 @@ CONFIG_DQL=y
 # CONFIG_DRM_VBOXVIDEO is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
+# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DRM_XEN is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set