diff options
-rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86.conf | 2 | ||||
-rw-r--r-- | meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend | 6 |
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" | |||
10 | KERNEL_IMAGETYPE = "bzImage" | 10 | KERNEL_IMAGETYPE = "bzImage" |
11 | 11 | ||
12 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 12 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
13 | PREFERRED_VERSION_linux-yocto ?= "3.8%" | 13 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
14 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 14 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
15 | XSERVER ?= "xserver-xorg \ | 15 | XSERVER ?= "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 @@ | |||
1 | KBRANCH_atom-pc = "standard/common-pc/atom-pc" | 1 | KBRANCH_atom-pc = "standard/common-pc/atom-pc" |
2 | KBRANCH_genericx86 = "standard/common-pc/atom-pc" | 2 | KBRANCH_genericx86 = "standard/common-pc/base" |
3 | KBRANCH_routerstationpro = "standard/routerstationpro" | 3 | KBRANCH_routerstationpro = "standard/routerstationpro" |
4 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" | 4 | KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" |
5 | KBRANCH_beagleboard = "standard/beagleboard" | 5 | KBRANCH_beagleboard = "standard/beagleboard" |
6 | 6 | ||
7 | KMACHINE_genericx86 ?= "common-pc" | ||
8 | |||
7 | SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | 9 | SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" |
8 | SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" | 10 | SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" |
9 | SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" | 11 | SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" |
10 | SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" | 12 | SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" |
11 | SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" | 13 | SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" |