diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-08-19 00:37:08 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-24 18:29:30 -0700 |
commit | f08b8c96402cd2b1e939f1babbc002d630fbf274 (patch) | |
tree | 4d2a60c5290cc3cce620956b4031709cd642a2d1 /meta-yocto | |
parent | 2c8120d4895c1e2539df2226bae5b5f3b914cb07 (diff) | |
download | poky-f08b8c96402cd2b1e939f1babbc002d630fbf274.tar.gz |
meta-yocto: atom-pc/mpc8315e-rdb change preferred version to 3.0
Updating two more yocto hardware reference platforms to use the
3.0 kernel by default.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-yocto')
-rw-r--r-- | meta-yocto/conf/machine/atom-pc.conf | 1 | ||||
-rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf | 4 | ||||
-rw-r--r-- | meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend | 4 |
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 \ | |||
11 | KERNEL_IMAGETYPE = "bzImage" | 11 | KERNEL_IMAGETYPE = "bzImage" |
12 | 12 | ||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
14 | PREFERRED_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" |
15 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | 16 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" |
16 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | 17 | PREFERRED_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 | ||
12 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" | 12 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" |
13 | 13 | ||
14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 14 | PREFERRED_VERSION_linux-yocto ?= "3.0%" |
15 | PREFERRED_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" |
16 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" | 18 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" |
17 | XSERVER = "xserver-kdrive-fbdev" | 19 | XSERVER = "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" | |||
9 | SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9" | 9 | SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9" |
10 | SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64" | 10 | SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64" |
11 | 11 | ||
12 | # COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" | 12 | COMPATIBLE_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" | 15 | COMPATIBLE_MACHINE_atom-pc = "atom-pc" |