summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-03-11 06:43:02 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-03-11 06:43:02 -0600
commit343fde141c89fb6c1289c8d656408845fa56a319 (patch)
tree191b0f6d9624a8fe7b38dac175977749ef5ed719
parent5ade6effcf9d2f7ab9dfa1ab8ceb991a0f50de0b (diff)
downloadmkinitfs-343fde141c89fb6c1289c8d656408845fa56a319.tar.bz2
mkinitfs-343fde141c89fb6c1289c8d656408845fa56a319.tar.xz
add KMS feature
-rw-r--r--Makefile2
-rw-r--r--files.d/kms1
-rwxr-xr-xinitramfs-init.in8
-rw-r--r--mkinitfs.conf2
-rw-r--r--modules.d/kms5
5 files changed, 17 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 50ff241..f0cae0a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ CONF_FILES := mkinitfs.conf \
modules.d/floppy \
modules.d/gfs2 \
modules.d/jfs \
+ modules.d/kms \
modules.d/lvm \
modules.d/ocfs2 \
modules.d/raid \
@@ -30,6 +31,7 @@ CONF_FILES := mkinitfs.conf \
modules.d/xfs \
files.d/bootchart \
files.d/base \
+ files.d/kms \
files.d/lvm
SCRIPTS := $(SBIN_FILES) initramfs-init
diff --git a/files.d/kms b/files.d/kms
new file mode 100644
index 0000000..9d198b2
--- /dev/null
+++ b/files.d/kms
@@ -0,0 +1 @@
+lib/firmware/radeon/*.bin
diff --git a/initramfs-init.in b/initramfs-init.in
index dca8087..6da7575 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -288,6 +288,14 @@ scan_drivers
scan_drivers
eend 0
+ebegin "Setting up KMS framebuffer"
+if [ -d /lib/modules/`uname -r`/kernel/drivers/gpu ]; then
+ modprobe -q radeon modeset=1 &>/dev/null
+ modprobe -q i915 modeset=1 &>/dev/nll
+ modprobe -q fbcon &>/dev/null
+fi
+eend 0
+
# check if root=... was set
if [ -n "$KOPT_root" ]; then
if [ "$SINGLEMODE" = "yes" ]; then
diff --git a/mkinitfs.conf b/mkinitfs.conf
index d92d6bf..d5b3e5e 100644
--- a/mkinitfs.conf
+++ b/mkinitfs.conf
@@ -1,2 +1,2 @@
# run mkinitfs -L for a list of available features
-features="ata base bootchart cdrom cramfs ext2 ext3 ext4 floppy raid scsi usb virtio"
+features="ata base bootchart cdrom cramfs ext2 ext3 ext4 floppy kms raid scsi usb virtio"
diff --git a/modules.d/kms b/modules.d/kms
new file mode 100644
index 0000000..8806aab
--- /dev/null
+++ b/modules.d/kms
@@ -0,0 +1,5 @@
+kernel/drivers/char/agp
+kernel/drivers/gpu
+kernel/drivers/i2c
+kernel/drivers/video
+kernel/arch/x86/video/fbdev.ko