Revert "package/x11r7/xserver_xorg-server: dri needs arm >= v6"
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 22 Mar 2016 21:29:01 +0000 (22:29 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 26 Mar 2016 17:54:25 +0000 (18:54 +0100)
This reverts commit 7bac31ceea1b52986b1773a1bd4841110672f923.

This commit is no longer needed, since libdrm no longer needs arm >=
v6 support thanks to the fix to the CAS implementation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

index 3f6cda726d726392b53f8394ae4c24f7f218279b..617bcbcf04bfbc6c3d30b438a2a2a5b29b0ad0e4 100644 (file)
@@ -130,8 +130,7 @@ else # modular
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
 endif
 
-# libdrm locking macros use armv6+ instructions on arm
-ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER)n$(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5),yn)
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
 XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
 else