diff options
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 12 | ||||
| -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 |
4 files changed, 6 insertions, 56 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 62d0b27298..cafa790c2a 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -69,12 +69,12 @@ SRCREV_pn-libxi ??= "d0326fe8cdbb08d4f52d79fd3fd4e1b2a0951d5e" SRCREV_pn-libzypp = "4494797d5b0369365b1af63921de45b197ead64f" SRCREV_pn-linux-openmoko ??= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78" SRCREV_pn-linux-omap3-pm ??= "totallybroken" -SRCREV_pn-linux-wrs_machine_qemuarm ??= "4aa0da110cecac871b4ac8de9f4281568d6612a1" -SRCREV_pn-linux-wrs_machine_qemumips ??= "cd7b3ac28fdc54334a0fa85c97bab6923008d4d2" -SRCREV_pn-linux-wrs_machine_qemuppc ??= "fb84ff9572bf75531aa379e1ec26727a85187b70" -SRCREV_pn-linux-wrs_machine_qemux86 ??= "556a48976cbcc80adc6126e83d009b1826e59a7f" -SRCREV_pn-linux-wrs_machine_qemux86-64 ??= "556a48976cbcc80adc6126e83d009b1826e59a7f" -SRCREV_pn-linux-wrs_meta ??= "a7fd16db16aa37296d5cef8db9707cacc084131d" +SRCREV_pn-linux-wrs_machine_qemuarm ??= "62b5ac5dc508a740fcd4cee432a6c12d0e366389" +SRCREV_pn-linux-wrs_machine_qemumips ??= "5f497ac2e497cdf8bcd5ca7023ab44660fd35197" +SRCREV_pn-linux-wrs_machine_qemuppc ??= "52f2e29cd24831c424c251c7f06234ef72047fdb" +SRCREV_pn-linux-wrs_machine_qemux86 ??= "701c502be984c38e242beca0e8e69903d9ead6b4" +SRCREV_pn-linux-wrs_machine_qemux86-64 ??= "701c502be984c38e242beca0e8e69903d9ead6b4" +SRCREV_pn-linux-wrs_meta ??= "4294840a21f3c65b4b005dcc606728e684a1e613" 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/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 @@ -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 df3fbe32d0..0000000000 --- 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 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}" 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" |