summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf1
-rw-r--r--meta-yocto/conf/machine/mpc8315e-rdb.conf4
-rw-r--r--meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend4
3 files changed, 6 insertions, 3 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index a0a8104249..da795cd430 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -11,6 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
11KERNEL_IMAGETYPE = "bzImage" 11KERNEL_IMAGETYPE = "bzImage"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto ?= "3.0%"
14#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 15#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
15PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
16PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index c237609a75..d67dc18cf0 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -11,7 +11,9 @@ SERIAL_CONSOLE = "115200 ttyS0"
11 11
12MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 12MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
13 13
14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 14PREFERRED_VERSION_linux-yocto ?= "3.0%"
15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
16
15#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 17#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 18PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
17XSERVER = "xserver-kdrive-fbdev" 19XSERVER = "xserver-kdrive-fbdev"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index ef580a52a2..e224d80824 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -9,7 +9,7 @@ SRCREV_machine_routerstationpro = "fd6d538850a28413e3c4867b905c56039773df3a"
9SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9" 9SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9"
10SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64" 10SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64"
11 11
12# COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" 12COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
13# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" 13# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
14# COMPATIBLE_MACHINE_beagleboard = "beagleboard" 14# COMPATIBLE_MACHINE_beagleboard = "beagleboard"
15# COMPATIBLE_MACHINE_atom-pc = "atom-pc" 15COMPATIBLE_MACHINE_atom-pc = "atom-pc"