aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/recipes-kernel/linux/linux-yocto-common_4.4.inc5
-rw-r--r--meta-amdfalconx86/recipes-kernel/linux/files/amdfalconx86-extra-config.cfg1
2 files changed, 5 insertions, 1 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-common_4.4.inc b/common/recipes-kernel/linux/linux-yocto-common_4.4.inc
index 6089f7db..91d5023a 100644
--- a/common/recipes-kernel/linux/linux-yocto-common_4.4.inc
+++ b/common/recipes-kernel/linux/linux-yocto-common_4.4.inc
@@ -23,3 +23,8 @@ SRC_URI_append_amdx86 += " \
"
KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc"
+
+do_validate_branches_append() {
+ # Drop a config generating spurious warnings
+ sed -i '/CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT/d' ${WORKDIR}/${KMETA}/features/i915/i915.cfg
+}
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/amdfalconx86-extra-config.cfg b/meta-amdfalconx86/recipes-kernel/linux/files/amdfalconx86-extra-config.cfg
index dc775ba8..a6c1de08 100644
--- a/meta-amdfalconx86/recipes-kernel/linux/files/amdfalconx86-extra-config.cfg
+++ b/meta-amdfalconx86/recipes-kernel/linux/files/amdfalconx86-extra-config.cfg
@@ -75,7 +75,6 @@ CONFIG_NF_NAT_H323=m
# CONFIG_NF_REJECT_IPV6 is not set
# CONFIG_NF_LOG_IPV6 is not set
CONFIG_TIPC_MEDIA_UDP=y
-# CONFIG_6LOWPAN is not set
# CONFIG_NET_ACT_VLAN is not set
# CONFIG_NET_ACT_BPF is not set
# CONFIG_NET_ACT_CONNMARK is not set