summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-01-07 13:44:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 13:50:38 +0000
commit1a277565b738ef0a920eb960c78f553051166934 (patch)
tree14e0b37ef924e267381e9715f1d5bba7094aa145
parent8ef71c065c4b4ba4c6e6056add9cc6693c215243 (diff)
downloadpoky-1a277565b738ef0a920eb960c78f553051166934.tar.gz
xserver-xorg: add AArch64 support
Launchpad bug: https://bugs.launchpad.net/linaro-aarch64/+bug/1092128 (From OE-Core rev: aa2d9049a9a0f73123bf3d7e9221552ff49dab8a) Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch64
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb1
2 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
new file mode 100644
index 0000000000..8a4f3e33fe
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.13.1/aarch64.patch
@@ -0,0 +1,64 @@
1Subject: Add AArch64 support to xserver-xorg
2Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
3
4lnx_video.c parts are not existing in 1.14 branch.
5
6Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
7
8http://patchwork.freedesktop.org/patch/12785/
9
10Upstream-status: Pending
11
12---
13 hw/xfree86/os-support/linux/lnx_video.c | 4 ++--
14 include/servermd.h | 7 +++++++
15 2 files changed, 9 insertions(+), 2 deletions(-)
16
17--- xorg-server-1.13.1.orig/hw/xfree86/os-support/linux/lnx_video.c
18+++ xorg-server-1.13.1/hw/xfree86/os-support/linux/lnx_video.c
19@@ -509,11 +509,11 @@ xf86EnableIO(void)
20 return FALSE;
21 }
22 #endif
23 }
24 close(fd);
25-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
26+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
27 if (ioperm(0, 1024, 1) || iopl(3)) {
28 if (errno == ENODEV)
29 ErrorF("xf86EnableIOPorts: no I/O ports found\n");
30 else
31 FatalError("xf86EnableIOPorts: failed to set IOPL"
32@@ -538,11 +538,11 @@ xf86DisableIO(void)
33 if (!ExtendedEnabled)
34 return;
35 #if defined(__powerpc__)
36 munmap(ioBase, 0x20000);
37 ioBase = NULL;
38-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
39+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
40 iopl(0);
41 ioperm(0, 1024, 0);
42 #endif
43 ExtendedEnabled = FALSE;
44
45--- xorg-server-1.13.1.orig/include/servermd.h
46+++ xorg-server-1.13.1/include/servermd.h
47@@ -243,10 +243,17 @@ SOFTWARE.
48 #define BITMAP_BIT_ORDER LSBFirst
49 #define GLYPHPADBYTES 4
50 /* ???? */
51 #endif /* AMD64 */
52
53+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64)
54+#define IMAGE_BYTE_ORDER MSBFirst
55+#define BITMAP_BIT_ORDER MSBFirst
56+#define GLYPHPADBYTES 4
57+/* ???? */
58+#endif /* AArch64 */
59+
60 #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \
61 defined(__alpha__) || defined(__alpha) || \
62 defined(__i386__) || \
63 defined(__s390x__) || defined(__s390__)
64
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb
index d6c63b904e..50b3117da5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bb
@@ -4,6 +4,7 @@ require xserver-xorg.inc
4SRC_URI += "file://crosscompile.patch \ 4SRC_URI += "file://crosscompile.patch \
5 file://fix_open_max_preprocessor_error.patch \ 5 file://fix_open_max_preprocessor_error.patch \
6 file://mips64-compiler.patch \ 6 file://mips64-compiler.patch \
7 file://aarch64.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "a13d8876e3e804189392119638a07a1f" 10SRC_URI[md5sum] = "a13d8876e3e804189392119638a07a1f"