aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/om-gta01.conf10
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf5
-rw-r--r--recipes/xorg-xserver/xserver-xorg-conf_0.1.bb2
3 files changed, 5 insertions, 12 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 1495949e70..ede2a2009e 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -58,15 +58,7 @@ ROOT_FLASH_SIZE = "60"
IMAGE_FSTYPES += "tar.gz jffs2 ubi"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
- --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
- --littleendian --pad \
- -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
- -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \
- mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
- ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
- mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
- ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
# do ubiattach /dev/ubi_ctrl -m 4
# From dmesg:
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
index b77b5527b5..83eaa0cb2e 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
@@ -19,14 +19,14 @@ EndSection
Section "InputDevice"
Identifier "Power Button"
Driver "evdev"
- Option "Device" "/dev/input/event0"
+ Option "Device" "/dev/input/event2"
EndSection
Section "InputDevice"
Identifier "AUX Button"
Driver "evdev"
- Option "Device" "/dev/input/event4"
+ Option "Device" "/dev/input/event0"
EndSection
@@ -34,6 +34,7 @@ Section "InputDevice"
Identifier "Touchscreen"
Driver "evdev"
Option "Device" "/dev/input/event1"
+ Option "SwapAxes" "True"
EndSection
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 1be87b16f4..92cd17302d 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r21"
+PR = "r22"
SRC_URI = "file://xorg.conf"