summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/atom-pc.conf2
-rw-r--r--meta/conf/machine/beagleboard.conf2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/mpc8315e-rdb.conf2
-rw-r--r--meta/conf/machine/routerstationpro.conf2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/atom-pc.conf b/meta/conf/machine/atom-pc.conf
index 61d3d943ab..7ca952a0a2 100644
--- a/meta/conf/machine/atom-pc.conf
+++ b/meta/conf/machine/atom-pc.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
13 13
14KERNEL_IMAGETYPE = "bzImage" 14KERNEL_IMAGETYPE = "bzImage"
15 15
16PREFERRED_PROVIDER_virtual/kernel ?= "linux-wrs" 16PREFERRED_PROVIDER_virtual/kernel ?= "linux-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"
19PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 19PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf
index d44b7aaf60..657bd366ca 100644
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta/conf/machine/beagleboard.conf
@@ -22,7 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
22# Guesswork 22# Guesswork
23SERIAL_CONSOLE = "115200 ttyS2" 23SERIAL_CONSOLE = "115200 ttyS2"
24 24
25PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" 25PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
26 26
27KERNEL_IMAGETYPE = "uImage" 27KERNEL_IMAGETYPE = "uImage"
28 28
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 1ef639f90e..1b1b8881c6 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -15,6 +15,6 @@ IMAGE_ROOTFS_SIZE_ext3 ?= "280000"
15RDEPENDS_kernel-base = "" 15RDEPENDS_kernel-base = ""
16 16
17# Use a common kernel recipe for all QEMU machines 17# Use a common kernel recipe for all QEMU machines
18PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" 18PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
19 19
20EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" 20EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta/conf/machine/mpc8315e-rdb.conf
index e42a9f2a1a..334118668a 100644
--- a/meta/conf/machine/mpc8315e-rdb.conf
+++ b/meta/conf/machine/mpc8315e-rdb.conf
@@ -13,4 +13,4 @@ SERIAL_CONSOLE = "115200 ttyS0"
13 13
14MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 14MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
15 15
16PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" 16PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
diff --git a/meta/conf/machine/routerstationpro.conf b/meta/conf/machine/routerstationpro.conf
index ecacc9b873..485ee3c124 100644
--- a/meta/conf/machine/routerstationpro.conf
+++ b/meta/conf/machine/routerstationpro.conf
@@ -12,7 +12,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \
12KERNEL_IMAGETYPE = "vmlinux" 12KERNEL_IMAGETYPE = "vmlinux"
13KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 13KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
14 14
15PREFERRED_PROVIDER_virtual/kernel = "linux-wrs" 15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
16 16
17SERIAL_CONSOLE = "115200 ttyS0" 17SERIAL_CONSOLE = "115200 ttyS0"
18 18