xserver minor cleanings and commit of fbdev driver

PATCH Applied Andrea Adami 2 participants 7 messages Jan 5, 2012 – Jan 9, 2012

Share & tools

Andrea Adami

author

2012-01-05 23:55 UTC #0 lore raw

cover xserver minor cleanings and commit of fbdev driver

Andrea Adami (2):
x11-common: remove extraneous BSP customizations
xorg-driver: add xf86-video-fbdev from meta-openembedded

 .../x11-common/x11-common/etc/X11/Xserver          |   24 --------------------
 .../xorg-driver/xf86-video-fbdev_0.4.2.bb          |    8 ++++++
 2 files changed, 8 insertions(+), 24 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-01-05 23:55 UTC #1 lore raw

PATCH 1/2 x11-common: remove extraneous BSP customizations

Signed-off-by Andrea Adami <[email protected]>

---
 .../x11-common/x11-common/etc/X11/Xserver          |   24 --------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +0 ~~-24~~

index 57923e6..cea733e 100644
@@ -18,14 +18,6 @@ fi
 
 . /etc/profile
 
-module_id() {
-    ## used to read from assets, but sometimes assets is corrupted
-    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
-    ## used to read from /proc/hal/model, but that is removed in 2.6
-    # echo ' iPAQ' `cat /proc/hal/model`
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
 ARGS=" -br -pn"
 
 if [ "$XSERVER" != "/usr/bin/Xorg" ]; then

@@ -44,22 +36,6 @@ if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
           ARGS="$ARGS -mouse tslib"
         fi
 
-        # start off server in conventional location.
-        case `module_id` in
-                "Generic OMAP1510/1610/1710")
-                        ARGS="$ARGS -mouse /dev/input/event0" ;;
-                "Compulab CM-x270")
-                        #modprobe mbxfb
-                        #ARGS="$ARGS -fb /dev/fb1"
-                        ;;
-                "Nokia N800")
-                        ARGS="$ARGS -mouse tslib" ;;
-                "Nokia 770")
-                        ARGS="$ARGS -mouse tslib" ;;
-                *)
-                        ;;
-        esac
-
         ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
 
         if [ ! -z "$DISPLAY_DPI" ]; then

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-01-06 23:44 UTC #2 lore raw

Re: [PATCH 1/2] x11-common: remove extraneous BSP customizations

Quoted 46 lines · Andrea Adami

Signed-off-by Andrea Adami <[email protected]>
---
.../x11-common/x11-common/etc/X11/Xserver | 24 --------------------
 1 files changed, 0 insertions(+), 24 deletions(-)
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +0 -0
index 57923e6..cea733e 100644
@@ -18,14 +18,6 @@ fi
 
. /etc/profile
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +0 -8
-module_id() {
-    ## used to read from assets, but sometimes assets is corrupted
-    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
-    ## used to read from /proc/hal/model, but that is removed in 2.6
-    # echo ' iPAQ' `cat /proc/hal/model`
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
ARGS=" -br -pn"
if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +0 -0
@@ -44,22 +36,6 @@ if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
ARGS="$ARGS -mouse tslib"
fi
- # start off server in conventional location.
- case module_id in
- "Generic OMAP1510/1610/1710")
- ARGS="$ARGS -mouse /dev/input/event0" ;;
- "Compulab CM-x270")
- #modprobe mbxfb
- #ARGS="$ARGS -fb /dev/fb1"
- ;;
- "Nokia N800")
- ARGS="$ARGS -mouse tslib" ;;
- "Nokia 770")
- ARGS="$ARGS -mouse tslib" ;;
- *)
- ;;
- esac
-
ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"

Quoted 4 lines

if [ ! -z "$DISPLAY_DPI" ]; then
--
1.7.3.4

please ignore

Andrea

Andrea Adami

author

2012-01-05 23:55 UTC #3 lore raw

PATCH 2/2 xorg-driver: add xf86-video-fbdev from meta-openembedded

In reply to Andrea Adami

Signed-off-by Andrea Adami <[email protected]>

---
 .../xorg-driver/xf86-video-fbdev_0.4.2.bb          |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb

meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb new file +8 -0

new file mode 100644
index 0000000..a3a4796
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
+
+DESCRIPTION = "X.Org X server -- fbdev display driver"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
+SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"

Signature · 1 line

1.7.3.4

Andrea Adami

author

2012-01-06 23:45 UTC #4 lore raw

Re: [PATCH 2/2] xorg-driver: add xf86-video-fbdev from meta-openembedded

Quoted 21 lines · Andrea Adami

Signed-off-by Andrea Adami <[email protected]>
---
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb new file +8 -1
new file mode 100644
index 0000000..a3a4796
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
+
+DESCRIPTION = "X.Org X server -- fbdev display driver"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
+SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"
--

Quoted 2 lines

1.7.3.4

please ignore

Andrea

Andrea Adami

author

2012-01-06 23:44 UTC #5 lore raw

In reply to Andrea Adami

Quoted 4 lines · Andrea Adami

Andrea Adami (2):
x11-common: remove extraneous BSP customizations
xorg-driver: add xf86-video-fbdev from meta-openembedded

Quoted 8 lines

.../x11-common/x11-common/etc/X11/Xserver | 24 -------------------- .../xorg-driver/xf86-video-fbdev_0.4.2.bb | 8 ++++++
 2 files changed, 8 insertions(+), 24 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
--
1.7.3.4

please ignore

Andrea

Saul Wold

Applied

2012-01-09 05:39 UTC #6 lore raw

In reply to Andrea Adami

Quoted 9 lines · Andrea Adami

Andrea Adami (2):
x11-common: remove extraneous BSP customizations
xorg-driver: add xf86-video-fbdev from meta-openembedded
  .../x11-common/x11-common/etc/X11/Xserver          |   24 --------------------
  .../xorg-driver/xf86-video-fbdev_0.4.2.bb          |    8 ++++++
  2 files changed, 8 insertions(+), 24 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb

Merged into OE-Core

Thanks
Sau!