From 50e92b9f7e911d327b9d5d271e40b519ed6eb47c Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 3 May 2013 15:02:21 +0200
Subject: Add support for wildcards in REQUIRED_KERNEL_MODULES Load drm kernel
 modules in stage31's init

---
 remote/rootfs/rootfs-stage31/data/init           |  6 ++++++
 remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 18 ++----------------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index a9c0435c..93df822c 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -25,6 +25,12 @@ mount -n -t tmpfs -o 'mode=755' run "/run"
 echo "/sbin/mdev" > /proc/sys/kernel/hotplug
 # read graphic and network adaptor configuration (without proprietary drivers yet)
 
+# TODO: must ugly hack ever... needs to be improved when we add prop drivers
+for DRM in /lib/modules/*/kernel/drivers/gpu/drm/*.ko /lib/modules/*/kernel/drivers/gpu/drm/*/*.ko; do
+	echo "Trying to load module $DRM"
+	insmod "$DRM"
+done
+
 # read kernel command line for debugging switch
 DEBUG=0
 read KCL < /proc/cmdline
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index 788ff8b3..b39895e2 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -4,22 +4,8 @@ REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
 				kernel/drivers/video/via/viafb.ko
         	               	kernel/drivers/acpi/video.ko
                 	       	kernel/drivers/ssb/ssb.ko
-	                       	kernel/drivers/gpu/drm/ttm/ttm.ko
-        	               	kernel/drivers/gpu/drm/via/via.ko
-                	       	kernel/drivers/gpu/drm/drm.ko
-                       	       	kernel/drivers/gpu/drm/tdfx/tdfx.ko
-	                       	kernel/drivers/gpu/drm/nouveau/nouveau.ko
-	                       	kernel/drivers/gpu/drm/savage/savage.ko
-				kernel/drivers/gpu/drm/radeon/radeon.ko
-				kernel/drivers/gpu/drm/drm_kms_helper.ko
-				kernel/drivers/gpu/drm/i810/i810.ko
-				kernel/drivers/gpu/drm/i2c/ch7006.ko
-				kernel/drivers/gpu/drm/i2c/sil164.ko
-				kernel/drivers/gpu/drm/sis/sis.ko
-				kernel/drivers/gpu/drm/mga/mga.ko
-				kernel/drivers/gpu/drm/i915/i915.ko
-				kernel/drivers/gpu/drm/r128/r128.ko
-				kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
+	                       	kernel/drivers/gpu/drm/drm*.ko
+	                       	kernel/drivers/gpu/drm/*/*.ko
 				kernel/drivers/i2c/algos/i2c-algo-bit.ko
 				kernel/drivers/i2c/i2c-core.ko
 				kernel/drivers/usb/usb-common.ko
-- 
cgit v1.2.3-55-g7522