diff options
| author | Matt Housh <jaeger@crux.ninja> | 2015-10-20 08:14:48 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.ninja> | 2015-10-20 08:14:48 -0500 |
| commit | e7364b214b4569fb7bd7dcbc5a13d118a9581014 (patch) | |
| tree | f7e7d1983b600385bc0af68fe750013abf26edb0 | |
| parent | c19189fc2f826a69c7c053946899b3f5c155232c (diff) | |
| download | iso-e7364b214b4569fb7bd7dcbc5a13d118a9581014.tar.gz iso-e7364b214b4569fb7bd7dcbc5a13d118a9581014.tar.xz | |
Switched CONFIG_USB_HID to builtin for better USB keyboard support during boot
| -rwxr-xr-x | initramfs/init | 2 | ||||
| -rw-r--r-- | initramfs/initramfs.lst | 3 | ||||
| -rw-r--r-- | kernel/linux-4.1.8.config | 4 | ||||
| -rw-r--r-- | kernel/linux-4.1.8.defconfig | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/initramfs/init b/initramfs/init index 8c5c9a6..c052816 100755 --- a/initramfs/init +++ b/initramfs/init @@ -232,7 +232,7 @@ then # USB load_usb_modules() { echo -e -n "${BOLD}${BLUE}USB${NORM}" - for mod in usb-storage usbhid + for mod in usb-storage do if [ ! -z "$DEBUG" ] then diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst index a998324..a7871c9 100644 --- a/initramfs/initramfs.lst +++ b/initramfs/initramfs.lst @@ -25,7 +25,6 @@ dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/block 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid 755 0 0 -dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/usbhid 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/class 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/core 755 0 0 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/host 755 0 0 @@ -81,8 +80,6 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/block/virtio_blk.ko ../kernel/ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/cdrom/cdrom.ko ../kernel/linux-#KERNEL_VERSION#/drivers/cdrom/cdrom.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/class/cdc-acm.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/class/cdc-acm.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/storage/usb-storage.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/storage/usb-storage.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/usbhid/usbhid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/usbhid/usbhid.ko 644 0 0 -file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/hid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/hid.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/hid-logitech-dj.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/hid-logitech-dj.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-core.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-core.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-ohci.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-ohci.ko 644 0 0 diff --git a/kernel/linux-4.1.8.config b/kernel/linux-4.1.8.config index dbfbcd2..dfaa409 100644 --- a/kernel/linux-4.1.8.config +++ b/kernel/linux-4.1.8.config @@ -2066,7 +2066,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # # HID support # -CONFIG_HID=m +CONFIG_HID=y # CONFIG_HID_BATTERY_STRENGTH is not set CONFIG_HIDRAW=y # CONFIG_UHID is not set @@ -2146,7 +2146,7 @@ CONFIG_HID_MONTEREY=m # # USB HID support # -CONFIG_USB_HID=m +CONFIG_USB_HID=y # CONFIG_HID_PID is not set # CONFIG_USB_HIDDEV is not set diff --git a/kernel/linux-4.1.8.defconfig b/kernel/linux-4.1.8.defconfig index be1977f..41085d2 100644 --- a/kernel/linux-4.1.8.defconfig +++ b/kernel/linux-4.1.8.defconfig @@ -2146,7 +2146,7 @@ CONFIG_HID_MONTEREY=y # # USB HID support # -CONFIG_USB_HID=m +CONFIG_USB_HID=y # CONFIG_HID_PID is not set # CONFIG_USB_HIDDEV is not set |