diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2010-09-04 00:37:14 -0400 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-09-06 16:15:31 +0100 |
commit | fea28c22f47b8e60e4e41c336950fbb4f6b1231b (patch) | |
tree | 9a0d929a1ff5e65a46398584cf710160c4b950d1 /meta/recipes-kernel | |
parent | e359e25dc73ca496d1bac49ac4d68a7c18bd7d8a (diff) | |
download | poky-fea28c22f47b8e60e4e41c336950fbb4f6b1231b.tar.gz |
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.patch | 35 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg | 10 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-wrs_git.bb | 5 |
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 a78629c85c..0000000000 --- a/meta/recipes-kernel/linux/linux-wrs/connect-size.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Increase the connector message size to avoid message to long errors from | ||
2 | uvesafb as per the below dmesg fragment: | ||
3 | |||
4 | uvesafb: Bochs/Plex86 Developers, Bochs/Plex86 VBE Adapter, $Id$, OEM: Bochs/Plex86 VBE(C) 2003 http://savannah.nongnu.org/projects/vgabios/, VBE v2.0 | ||
5 | uvesafb: no monitor limits have been set, default refresh rate will be used | ||
6 | uvesafb: scrolling: redraw | ||
7 | uvesafb: framebuffer at 0xe0000000, mapped to 0xffffc90000080000, using 8192k, total 8192k | ||
8 | fb0: VESA VGA frame buffer device | ||
9 | uvesafb: message too long (57808), can't execute task | ||
10 | uvesafb: VBE get state call failed (eax=0x4f04, err=-7) | ||
11 | udev: starting version 158 | ||
12 | EXT3-fs (hda): using internal journal | ||
13 | uvesafb: message too long (57808), can't execute task | ||
14 | uvesafb: VBE get state call failed (eax=0x4f04, err=-7) | ||
15 | uvesafb: message too long (57808), can't execute task | ||
16 | uvesafb: VBE get state call failed (eax=0x4f04, err=-7) | ||
17 | uvesafb: message too long (57808), can't execute task | ||
18 | uvesafb: VBE get state call failed (eax=0x4f04, err=-7) | ||
19 | |||
20 | JL 13/0/10 | ||
21 | |||
22 | Index: linux/include/linux/connector.h | ||
23 | =================================================================== | ||
24 | --- linux.orig/include/linux/connector.h 2010-08-13 13:16:28.000000000 +0100 | ||
25 | +++ linux/include/linux/connector.h 2010-08-13 13:18:29.507791929 +0100 | ||
26 | @@ -48,7 +48,8 @@ | ||
27 | /* | ||
28 | * Maximum connector's message size. | ||
29 | */ | ||
30 | -#define CONNECTOR_MAX_MSG_SIZE 16384 | ||
31 | +//#define CONNECTOR_MAX_MSG_SIZE 16384 | ||
32 | +#define CONNECTOR_MAX_MSG_SIZE 65536 | ||
33 | |||
34 | /* | ||
35 | * 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 df3fbe32d0..0000000000 --- a/meta/recipes-kernel/linux/linux-wrs/qemux86-64.cfg +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | CONFIG_AGP=y | ||
2 | CONFIG_DRM=y | ||
3 | CONFIG_FB=y | ||
4 | CONFIG_FB_MODE_HELPERS=y | ||
5 | CONFIG_CONNECTOR=y | ||
6 | CONFIG_FB_UVESA=m | ||
7 | CONFIG_INPUT_TABLET=y | ||
8 | CONFIG_TABLET_USB_WACOM=y | ||
9 | CONFIG_INPUT_EVDEV=y | ||
10 | CONFIG_E1000=y | ||
diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb index eaa8e4447d..44640dee20 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}" | |||
13 | SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \ | 13 | SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${WRMACHINE}-${LINUX_KERNEL_TYPE};name=machine \ |
14 | git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" | 14 | git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" |
15 | 15 | ||
16 | SRC_URI_append_qemux86-64 = "\ | ||
17 | file://connect-size.patch \ | ||
18 | file://qemux86-64.cfg" | ||
19 | |||
20 | |||
21 | WRMACHINE = "${MACHINE}" | 16 | WRMACHINE = "${MACHINE}" |
22 | WRMACHINE_qemux86 = "common_pc" | 17 | WRMACHINE_qemux86 = "common_pc" |
23 | WRMACHINE_qemux86-64 = "common_pc_64" | 18 | WRMACHINE_qemux86-64 = "common_pc_64" |