summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2010-09-04 00:37:14 -0400
committerJoshua Lock <josh@linux.intel.com>2010-09-06 16:15:31 +0100
commitfea28c22f47b8e60e4e41c336950fbb4f6b1231b (patch)
tree9a0d929a1ff5e65a46398584cf710160c4b950d1 /meta/recipes-kernel
parente359e25dc73ca496d1bac49ac4d68a7c18bd7d8a (diff)
downloadopenembedded-core-fea28c22f47b8e60e4e41c336950fbb4f6b1231b.tar.gz
openembedded-core-fea28c22f47b8e60e4e41c336950fbb4f6b1231b.tar.bz2
openembedded-core-fea28c22f47b8e60e4e41c336950fbb4f6b1231b.tar.xz
openembedded-core-fea28c22f47b8e60e4e41c336950fbb4f6b1231b.zip
kernel/wrs: update SRCREV for v2.6.34.6 + changes
Updating the SRCREVs for the recent port of bug fixes for all boards and the integration of qemux86-64 config and connector changes. Now that the qemux86-64 changes are in tree, we can drop them from the linux-wrs recipe. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-wrs/connect-size.patch35
-rw-r--r--meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg10
-rw-r--r--meta/recipes-kernel/linux/linux-wrs_git.bb5
3 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-kernel/linux/linux-wrs/connect-size.patch b/meta/recipes-kernel/linux/linux-wrs/connect-size.patch
deleted file mode 100644
index a78629c85..000000000
--- a/meta/recipes-kernel/linux/linux-wrs/connect-size.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Increase the connector message size to avoid message to long errors from
-uvesafb as per the below dmesg fragment:
-
-uvesafb: Bochs/Plex86 Developers, Bochs/Plex86 VBE Adapter, $Id$, OEM: Bochs/Plex86 VBE(C) 2003 http://savannah.nongnu.org/projects/vgabios/, VBE v2.0
-uvesafb: no monitor limits have been set, default refresh rate will be used
-uvesafb: scrolling: redraw
-uvesafb: framebuffer at 0xe0000000, mapped to 0xffffc90000080000, using 8192k, total 8192k
-fb0: VESA VGA frame buffer device
-uvesafb: message too long (57808), can't execute task
-uvesafb: VBE get state call failed (eax=0x4f04, err=-7)
-udev: starting version 158
-EXT3-fs (hda): using internal journal
-uvesafb: message too long (57808), can't execute task
-uvesafb: VBE get state call failed (eax=0x4f04, err=-7)
-uvesafb: message too long (57808), can't execute task
-uvesafb: VBE get state call failed (eax=0x4f04, err=-7)
-uvesafb: message too long (57808), can't execute task
-uvesafb: VBE get state call failed (eax=0x4f04, err=-7)
-
-JL 13/0/10
-
-Index: linux/include/linux/connector.h
-===================================================================
---- linux.orig/include/linux/connector.h 2010-08-13 13:16:28.000000000 +0100
-+++ linux/include/linux/connector.h 2010-08-13 13:18:29.507791929 +0100
-@@ -48,7 +48,8 @@
- /*
- * Maximum connector's message size.
- */
--#define CONNECTOR_MAX_MSG_SIZE 16384
-+//#define CONNECTOR_MAX_MSG_SIZE 16384
-+#define CONNECTOR_MAX_MSG_SIZE 65536
-
- /*
- * idx and val are unique identifiers which
diff --git a/meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg b/meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg
deleted file mode 100644
index df3fbe32d..000000000
--- a/meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_AGP=y
-CONFIG_DRM=y
-CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_CONNECTOR=y
-CONFIG_FB_UVESA=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_WACOM=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_E1000=y
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index eaa8e4447..44640dee2 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -13,11 +13,6 @@ PV = "2.6.34+git${SRCPV}"
SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \
git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta"
-SRC_URI_append_qemux86-64 = "\
- file://connect-size.patch \
- file://qemux86-64.cfg"
-
-
WRMACHINE = "${MACHINE}"
WRMACHINE_qemux86 = "common_pc"
WRMACHINE_qemux86-64 = "common_pc_64"