From f08b8c96402cd2b1e939f1babbc002d630fbf274 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 19 Aug 2011 00:37:08 -0400 Subject: 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 --- meta-yocto/conf/machine/atom-pc.conf | 1 + meta-yocto/conf/machine/mpc8315e-rdb.conf | 4 +++- meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'meta-yocto') 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 \ KERNEL_IMAGETYPE = "bzImage" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.0%" #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 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" MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.0%" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" + #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 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" SRCREV_machine_mpc8315e-rdb = "5d3c0b06071abd663c7790df141060ae462660a9" SRCREV_machine_beagleboard = "32631d785b0b907e5c14435ef7531ed041ab8c64" -# COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" # COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" # COMPATIBLE_MACHINE_beagleboard = "beagleboard" -# COMPATIBLE_MACHINE_atom-pc = "atom-pc" +COMPATIBLE_MACHINE_atom-pc = "atom-pc" -- cgit v1.2.3-54-g00ecf