x11-common: Fix unusable serial console

The serial console port is basicly unusable in images containing X. Login works fine, but at the shell prompt only one out of N input characters (N usually between 2 and 10) gets through to the shell. dbus-launch (running as "dbus-launch --sh-syntax --exit-with-session") is also reading from /dev/console and "eating" the missing characters. As soon as I stop the Xserver ("sh /etc/init.d/xserver-nodm stop") the serial console starts wroking fine (because dbus-launch is not running any more). This patch addresses the problem. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
tslib: 32bit big endian support
2026-03-16 12:19:40 +01:00 · 2011-03-18 16:41:25 +00:00 · 2011-02-22 14:50:41 -08:00 · 2011-02-22 14:50:41 -08:00 · 2011-02-22 14:11:33 -08:00 · 2011-02-10 11:50:20 -08:00
10 changed files with 106 additions and 22 deletions
--- a/meta/conf/machine/mpc8315e-rdb.conf
+++ b/meta/conf/machine/mpc8315e-rdb.conf
@@ -14,3 +14,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"

 PREFERRED_PROVIDER_virtual/kernel = "linux-wrs"
+
+UBOOT_ENTRYPOINT = "0x00000000"
--- a/meta/recipes-bsp/formfactor/files/qemumips/machconfig
+++ b/meta/recipes-bsp/formfactor/files/qemumips/machconfig
@@ -1,5 +1,5 @@
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=0
+HAVE_TOUCHSCREEN=1
+HAVE_KEYBOARD=1
 
 DISPLAY_CAN_ROTATE=0
 DISPLAY_ORIENTATION=0
--- a/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop
+++ b/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Connection Manager
-Comment=Connection Manager applet
-Icon=stock_internet
-Exec=connman-applet
-Terminal=false
-Type=Application
-Categories=Network;GTK;
-
--- a/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
+++ b/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
@@ -0,0 +1,42 @@
+diff -ruN connman-gnome-0.5-orig/po/POTFILES.in connman-gnome-0.5/po/POTFILES.in
+--- connman-gnome-0.5-orig/po/POTFILES.in	2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/po/POTFILES.in	2010-12-17 10:27:17.000000000 +0800
+@@ -4,4 +4,3 @@
+ properties/advanced.c
+ properties/ethernet.c
+ properties/wifi.c
+-properties/connman-properties.desktop.in
+diff -ruN connman-gnome-0.5-orig/properties/Makefile.am connman-gnome-0.5/properties/Makefile.am
+--- connman-gnome-0.5-orig/properties/Makefile.am	2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/properties/Makefile.am	2010-12-17 10:27:09.000000000 +0800
+@@ -17,16 +17,6 @@
+ 
+ INCLUDES = -I$(top_srcdir)/common
+ 
+-desktopdir = $(datadir)/applications
+-
+-desktop_in_files = connman-properties.desktop.in
+-
+-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+-
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-CLEANFILES = $(desktop_DATA)
+-
+-EXTRA_DIST = $(desktop_in_files)
+-
+ MAINTAINERCLEANFILES = Makefile.in
+diff -ruN connman-gnome-0.5-orig/properties/connman-properties.desktop.in connman-gnome-0.5/properties/connman-properties.desktop.in
+--- connman-gnome-0.5-orig/properties/connman-properties.desktop.in	2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/properties/connman-properties.desktop.in	1970-01-01 08:00:00.000000000 +0800
+@@ -1,10 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-_Name=Connection Management
+-_Comment=Configure connection management
+-Icon=stock_internet
+-Exec=connman-properties
+-Terminal=false
+-Type=Application
+-Categories=Settings;
+-OnlyShowIn=GNOME;
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,17 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                    file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
                    file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
 DEPENDS = "gtk+ dbus"
-PR = "r1"
+PR = "r2"

 RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy"

 SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
           file://connman-gnome.patch \
-           file://connman-applet.desktop"
+           file://remove-connman-property-desktop-file.patch"

 inherit autotools gtk-icon-cache
-
-do_install_append() {
-	install -d ${D}${datadir}/applications/
-	install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
-}
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -11,6 +11,7 @@ early_setup() {
    mount -t proc proc /proc
    mount -t sysfs sysfs /sys
    udevd --daemon
+    /sbin/udevadm trigger --action=add
 }

 read_args() {
--- a/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
+++ b/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 030-32bitBE-support.dpatch by Neil Williams <codehelp@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: See bug #496759 - being tested upstream for 32bit BE devices
+
+@DPATCH@
+diff -urNad tslib-1.0~/plugins/input-raw.c tslib-1.0/plugins/input-raw.c
+--- tslib-1.0~/plugins/input-raw.c	2008-12-09 10:56:47.000000000 +0000
+++ tslib-1.0/plugins/input-raw.c	2008-12-09 11:05:41.000000000 +0000
+@@ -44,25 +44,33 @@
+ 	int	using_syn;
+ };
+ 
+#define BITS_PER_LONG	(sizeof(long) * 8)
+#ifndef EV_CNT
+#define EV_CNT	(EV_MAX+1)
+#endif
+#ifndef ABS_CNT
+#define ABS_CNT	(ABS_MAX+1)
+#endif
+
+ static int check_fd(struct tslib_input *i)
+ {
+ 	struct tsdev *ts = i->module.dev;
+ 	int version;
+-	u_int32_t bit;
+-	u_int64_t absbit;
+	unsigned long bit[EV_CNT / BITS_PER_LONG + 1];
+	unsigned long absbit[ABS_MAX / BITS_PER_LONG + 1];
+ 
+ 	if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) &&
+ 		(version == EV_VERSION) &&
+-		(ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit) * 8), &bit) >= 0) &&
+-		(bit & (1 << EV_ABS)) &&
+-		(ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) &&
+-		(absbit & (1 << ABS_X)) &&
+-		(absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) {
+		(ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit)), bit) >= 0) &&
+		(bit[0] & (1 << EV_ABS)) &&
+		(ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
+		(absbit[0] & (1 << ABS_X)) &&
+		(absbit[0] & (1 << ABS_Y)) && (absbit[0] & (1 << ABS_PRESSURE)))) {
+ 		fprintf(stderr, "selected device is not a touchscreen I understand\n");
+ 		return -1;
+ 	}
+ 
+-	if (bit & (1 << EV_SYN))
+	if (bit[0] & (1 << EV_SYN))
+ 		i->using_syn = 1;
+ 
+ 	return 0;
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"

-PR = "r15"
+PR = "r16"

 SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
           file://fix_version.patch;patch=1 \
@@ -16,6 +16,8 @@ SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
           file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
+SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1"
+

 inherit autotools pkgconfig

--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
@@ -2,7 +2,7 @@

 if [ -x /usr/bin/dbus-launch ]; then
    # As this is the X session script, always start a new DBus session.
-    eval `dbus-launch --sh-syntax --exit-with-session`
+    eval `dbus-launch --sh-syntax --exit-with-session </dev/null`
    echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
 fi

--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPLv2"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
-PR = "r38"
+PR = "r39"

 SRC_URI = "file://etc"
 S = ${WORKDIR}
Author	SHA1	Message	Date
Wolfgang Denk	0d3591db9c	x11-common: Fix unusable serial console The serial console port is basicly unusable in images containing X. Login works fine, but at the shell prompt only one out of N input characters (N usually between 2 and 10) gets through to the shell. dbus-launch (running as "dbus-launch --sh-syntax --exit-with-session") is also reading from /dev/console and "eating" the missing characters. As soon as I stop the Xserver ("sh /etc/init.d/xserver-nodm stop") the serial console starts wroking fine (because dbus-launch is not running any more). This patch addresses the problem. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-03-18 16:41:25 +00:00
J. Aaron Gamble	753f79806b	tslib: 32bit big endian support Fixes [BUGID #394] patch added from: https://launchpad.net/ubuntu/+source/tslib/1.0-7 Enables wacom tablet/touchscreen support on qemumips Signed-off-by: J. Aaron Gamble <john.gamble@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>	2011-02-22 14:50:41 -08:00
Bruce Ashfield	50ece536ae	mpc8315e-rdb: set UBOOT_ENTRYPOINT Fixes [BUGID #685] Although not used if the in kernel uImage is booted, it is a good idea to set the UBOOT_ENTRYPOINT just as the other uImage based boards do. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>	2011-02-22 14:50:41 -08:00
Dongxiao Xu	fdcda41c5e	connman-gnome: Remove the applet and properties desktop icons Remove the applet and properties desktop icons, since the connman-properties program should be invoked by tool bar, while connman-applet is launched by autostart. This fixes [BUGID #683] for laverne build, which is similar as Bug 506. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>	2011-02-22 14:11:33 -08:00
Saul Wold	6ceab2c76d	formafactor: Fix qemumips machconfig to reflect update kernel fixes [BUGID #682 ] Signed-off-by: Saul Wold <sgw@linux.intel.com>	2011-02-10 11:50:20 -08:00
Tom Zanussi	0b8fcb95dd	init-live.sh: add 'coldplug' udev trigger Fixes [BUGID #693] The init-live.sh script starts udevd in init-live.sh:early_setup(), but doesn't account for the possibility that the root device may have already been registered by the kernel before udevd starts up. If the device is detected after udevd starts up, everything's fine - udevd gets the 'add' uevent for the device, the root image shows up at e.g. /media/sda/rootfs.img, and the boot continues. If however the device is detected before udevd starts up, udevd misses the 'add' uevent and the root image never shows up, causing it to stay in the 'waiting for removable media' loop forever. The 'udevadm trigger' command is meant to be used to avoid this situation, but init-live.sh doesn't use it. Furthermore, since the default was changed in udev 152 from 'add' to 'change', the command needs to explicity name 'add' as the action. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>	2011-02-09 14:14:01 -06:00