summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend11
2 files changed, 12 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 840cc1027a..7c10b56c42 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -2,7 +2,7 @@ include conf/machine/include/x86-base.inc
2MACHINE_FEATURES += "wifi efi pcbios" 2MACHINE_FEATURES += "wifi efi pcbios"
3 3
4PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 4PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
5PREFERRED_VERSION_linux-yocto ?= "3.19%" 5PREFERRED_VERSION_linux-yocto ?= "4.1%"
6PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 6PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
7XSERVER ?= "${XSERVER_X86_BASE} \ 7XSERVER ?= "${XSERVER_X86_BASE} \
8 ${XSERVER_X86_EXT} \ 8 ${XSERVER_X86_EXT} \
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
new file mode 100644
index 0000000000..a5fe0e6984
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -0,0 +1,11 @@
1KBRANCH_genericx86 = "standard/base"
2KBRANCH_genericx86-64 = "standard/base"
3
4KMACHINE_genericx86 ?= "common-pc"
5KMACHINE_genericx86-64 ?= "common-pc-64"
6
7SRCREV_machine_genericx86 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
8SRCREV_machine_genericx86-64 ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f"
9
10COMPATIBLE_MACHINE_genericx86 = "genericx86"
11COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"