aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/recipes-kernel/linux/files/drm.cfg1
-rw-r--r--common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend27
-rw-r--r--meta-amdfalconx86/conf/machine/amdfalconx86.conf2
-rw-r--r--meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend10
4 files changed, 39 insertions, 1 deletions
diff --git a/common/recipes-kernel/linux/files/drm.cfg b/common/recipes-kernel/linux/files/drm.cfg
index 854be317..b6a52201 100644
--- a/common/recipes-kernel/linux/files/drm.cfg
+++ b/common/recipes-kernel/linux/files/drm.cfg
@@ -3,3 +3,4 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_TTM=m
+# CONFIG_DRM_CIRRUS_QEMU is not set
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
new file mode 100644
index 00000000..1bbabbae
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
@@ -0,0 +1,27 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+PR := "${INC_PR}.1"
+
+KBRANCH_amdx86 ?= "standard/preempt-rt/base"
+KMACHINE_amdx86 ?= "common-pc-64"
+
+SRCREV_machine_amdx86 ?= "76a02384d86df7b7499755f1650b5299740f5473"
+SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa"
+LINUX_VERSION_amdx86 ?= "4.4.20"
+
+SRC_URI_append_amdx86 += " \
+ file://logo.cfg \
+ file://console.cfg \
+ file://drm.cfg \
+ file://sound.cfg \
+ file://hid.cfg \
+ file://enable-imc.cfg \
+ file://efi-partition.cfg \
+ file://usb-serial.cfg \
+ file://wifi-drivers.cfg \
+ file://disable-intel-graphics.cfg \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \
+ ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \
+"
+
+KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc"
diff --git a/meta-amdfalconx86/conf/machine/amdfalconx86.conf b/meta-amdfalconx86/conf/machine/amdfalconx86.conf
index 475c5ff0..17caf723 100644
--- a/meta-amdfalconx86/conf/machine/amdfalconx86.conf
+++ b/meta-amdfalconx86/conf/machine/amdfalconx86.conf
@@ -4,7 +4,7 @@
#@DESCRIPTION: Machine configuration for amdfalconx86 systems
PREFERRED_PROVIDER_virtual/kernel ?= "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "linux-yocto-rt", "linux-yocto", d)}"
-#PREFERRED_VERSION_linux-yocto-rt ?= "4.1%"
+PREFERRED_VERSION_linux-yocto-rt ?= "4.4%"
PREFERRED_VERSION_linux-yocto ?= "4.4%"
PREFERRED_VERSION_libdrm = "2.4.66"
diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
new file mode 100644
index 00000000..cabde7a6
--- /dev/null
+++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append_amdfalconx86 += "file://amdfalconx86-user-features.scc \
+ file://amdfalconx86-user-patches.scc \
+ file://amdfalconx86.cfg \
+ file://amdfalconx86-user-config.cfg \
+ file://amdfalconx86-extra-config.cfg \
+"
+
+COMPATIBLE_MACHINE_amdfalconx86 = "amdfalconx86"