aboutsummaryrefslogtreecommitdiffstats
path: root/meta-emenlow
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2010-12-28 00:42:24 -0600
committerTom Zanussi <tom.zanussi@intel.com>2010-12-28 00:42:24 -0600
commitc14f24a2e9aebaaf2edb005f9480b395a8618acf (patch)
tree550f9294bf02b6ab243c6fa3f8c0ac192235702a /meta-emenlow
parentaf40e14ce335fa689d1a989feba3c02a8c71b7a7 (diff)
downloadmeta-intel-c14f24a2e9aebaaf2edb005f9480b395a8618acf.tar.gz
meta-intel-c14f24a2e9aebaaf2edb005f9480b395a8618acf.tar.bz2
meta-intel-c14f24a2e9aebaaf2edb005f9480b395a8618acf.zip
meta-emenlow: upgrade to master
Upgrade the meta-emenlow BSP to current master. This updates the layer to reflect the naming changes that took place between laverne and the current master, and allows the BSP to be built for master. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow')
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf6
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend (renamed from meta-emenlow/recipes-kernel/linux/linux-wrs_git.bbappend)2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index fab3b4cd..2e20e1ce 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -16,7 +16,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
KERNEL_IMAGETYPE = "bzImage"
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-stable"
#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
@@ -44,5 +44,5 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz"
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
-SRCREV_machine_pn-linux-wrs_emenlow ?= "aae69fdf104b0a9d7b3710f808aac6ab303490f7"
-SRCREV_meta_pn-linux-wrs_emenlow ?= "b67e060194a38c6331da1532bd06446087a42b3b"
+SRCREV_machine_pn-linux-yocto-stable_emenlow = "aae69fdf104b0a9d7b3710f808aac6ab303490f7"
+SRCREV_meta_pn-linux-yocto-stable_emenlow ?= "d1cd5c80ee97e81e130be8c3de3965b770f320d6"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-wrs_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
index ed7e8509..9fa2937d 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-wrs_git.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend
@@ -1,3 +1,3 @@
FILESEXTRAPATHS := "${THISDIR}/${PN}"
COMPATIBLE_MACHINE_emenlow = "emenlow"
-WRMACHINE_emenlow = "emenlow"
+KMACHINE_emenlow = "emenlow"