summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-08-26 20:50:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-27 10:55:08 +0100
commitad8836134e92ee90526f6638b29c760999d5035e (patch)
tree576f72fc2ca405a8053aff50b377245e10b89fa7
parent36fc237ad7aaf7097698caaa2a19e49731eb1a21 (diff)
downloadpoky-ad8836134e92ee90526f6638b29c760999d5035e.tar.gz
meta-yocto-bsp/genericx86: Update kernel, branch, KMACHINE, and SRCREV
For the genericx86 machine: o Update the PREFERRED_VERSION for linux-yocto to 3.10 o Change the KBRANCH to common-pc/base o Change the SRCREV to the HEAD o Change the KMACHINE to a valid linux-yocto BSP name (From meta-yocto rev: d26bfd7bf908d9ad622c1298c918ebf1db216e98) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/genericx86.conf2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend6
2 files changed, 5 insertions, 3 deletions
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index 042f20623f..ff5cbc9cc8 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -10,7 +10,7 @@ MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa"
10KERNEL_IMAGETYPE = "bzImage" 10KERNEL_IMAGETYPE = "bzImage"
11 11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.8%" 13PREFERRED_VERSION_linux-yocto ?= "3.10%"
14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
15XSERVER ?= "xserver-xorg \ 15XSERVER ?= "xserver-xorg \
16 xserver-xorg-extension-glx \ 16 xserver-xorg-extension-glx \
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 1ac014edc0..9639a56505 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,11 +1,13 @@
1KBRANCH_atom-pc = "standard/common-pc/atom-pc" 1KBRANCH_atom-pc = "standard/common-pc/atom-pc"
2KBRANCH_genericx86 = "standard/common-pc/atom-pc" 2KBRANCH_genericx86 = "standard/common-pc/base"
3KBRANCH_routerstationpro = "standard/routerstationpro" 3KBRANCH_routerstationpro = "standard/routerstationpro"
4KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" 4KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
5KBRANCH_beagleboard = "standard/beagleboard" 5KBRANCH_beagleboard = "standard/beagleboard"
6 6
7KMACHINE_genericx86 ?= "common-pc"
8
7SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" 9SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
8SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 10SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
9SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" 11SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79"
10SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" 12SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a"
11SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" 13SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"