Skip to content

Commit 98dbd7c

Browse files
author
Neeraj Deshpande
committed
Westeros package update.
1 parent b501e3a commit 98dbd7c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff -ruN westeros.orig/drm/westeros-gl/westeros-gl.c westeros/drm/westeros-gl/westeros-gl.c
22
--- westeros.orig/drm/westeros-gl/westeros-gl.c 2021-06-04 21:14:52.000000000 +0530
3-
+++ westeros/drm/westeros-gl/westeros-gl.c 2021-06-15 17:43:35.947397519 +0530
3+
+++ westeros/drm/westeros-gl/westeros-gl.c 2021-06-16 19:17:32.871680695 +0530
44
@@ -65,7 +65,7 @@
55
#define TRACE3(...) INT_TRACE3(__VA_ARGS__, "")
66
#define FRAME(...) INT_FRAME(__VA_ARGS__, "")
77

88
-#define DEFAULT_CARD "/dev/dri/card0"
9-
+#define DEFAULT_CARD "/dev/dri/card1"
9+
+// #define DEFAULT_CARD "/dev/dri/card0"
1010
#ifdef WESTEROS_PLATFORM_QEMUX86
1111
#define DEFAULT_MODE_WIDTH (1280)
1212
#define DEFAULT_MODE_HEIGHT (1024)

package/westeros-soc/westeros-soc.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ else ifeq ($(BR2_PACKAGE_HAS_NEXUS),y)
3636
WESTEROS_SOC_SUBDIR = brcm
3737
WESTEROS_SOC_DEPENDENCIES += wayland-egl-bnxs bcm-refsw
3838
else ifeq ($(BR2_PACKAGE_LIBDRM),y)
39-
WESTEROS_SOC_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include/libdrm"
39+
ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y)
40+
WESTEROS_DRM_CARD=/dev/dri/card1
41+
else
42+
WESTEROS_DRM_CARD=/dev/dri/card0
43+
endif
44+
WESTEROS_SOC_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -DDEFAULT_CARD=\\\"$(WESTEROS_DRM_CARD)\\\" -I $(STAGING_DIR)/usr/include/libdrm"
4045
WESTEROS_SOC_SUBDIR = drm
4146
WESTEROS_SOC_DEPENDENCIES += libdrm
4247
endif

0 commit comments

Comments
 (0)