summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-10-14 14:55:51 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-14 20:12:04 +0100
commit95fb69bb24a918e048f3c87ebe289e731a4aab6f (patch)
tree4adcdffad4f0dac9b15e51009775fe541d5582af
parent9a2ae44380a5ef81fb099075af99351db06a3252 (diff)
downloadopenembedded-core-95fb69bb24a918e048f3c87ebe289e731a4aab6f.tar.gz
openembedded-core-95fb69bb24a918e048f3c87ebe289e731a4aab6f.tar.bz2
openembedded-core-95fb69bb24a918e048f3c87ebe289e731a4aab6f.zip
emenlow: add 8250 serial options
The emenlow didn't have the default 8250 serial ports. Including the common serial config fragment fixes this problem. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 939b72eb71..d65c028050 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -92,7 +92,7 @@ SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26
SRCREV_machine_pn-linux-wrs_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b"
SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26"
-SRCREV_meta_pn-linux-wrs ?= "5bdc73232e78e962595e238abf325b09e6e4b541"
+SRCREV_meta_pn-linux-wrs ?= "a940e976d8f108b974f51b98bb1220d2dd548ac4"
SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0"
SRCREV_pn-matchbox-config-gtk ??= "2081"
SRCREV_pn-matchbox-desktop-sato ??= "76"
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index 93285f2768..2459b79c89 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -28,7 +28,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|route
LINUX_VERSION = "v2.6.34"
LINUX_VERSION_EXTENSION = "-wr-${LINUX_KERNEL_TYPE}"
-PR = "r11"
+PR = "r12"
S = "${WORKDIR}/linux"
B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build"