summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf2
-rw-r--r--meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 5447998c4e..99e34e8445 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
12 12
13KERNEL_IMAGETYPE = "bzImage" 13KERNEL_IMAGETYPE = "bzImage"
14 14
15PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-stable" 15PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
16#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 16#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
17PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 17PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
18PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 18PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
index e4aa7fd97a..3f2d795a52 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend
@@ -9,4 +9,4 @@ SRCREV_machine_routerstationpro = "95ca94d2e71ca2db6822a37a7f575fa79c3d05d0"
9SRCREV_machine_mpc8315e-rdb = "53c800c244e73d81d2832f6da306eeae3b09e5dc" 9SRCREV_machine_mpc8315e-rdb = "53c800c244e73d81d2832f6da306eeae3b09e5dc"
10SRCREV_machine_beagleboard = "b906f358fd404a1e74a961f25079274e0d933ee1" 10SRCREV_machine_beagleboard = "b906f358fd404a1e74a961f25079274e0d933ee1"
11 11
12COMPATIBLE_MACHINE = "(mpc8315e-rdb|routerstationpro|beagleboard)" 12COMPATIBLE_MACHINE = "(mpc8315e-rdb|routerstationpro|beagleboard|atom-pc)"