From 7c8d340ce49881f85668b15736dd73232121daab Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Thu, 31 Aug 2023 19:42:58 +0000 Subject: [PATCH] kernel-5.15, -6.1: drop i8042 modules from shared config This effectively removes i8042 hardware support from aws variants, matching the Amazon Linux upstream configuration for EC2. i8042 is retained for vmware variants, where it's required for the interactive console to accept keyboard input, and for metal variants where it might also be useful in some environments. Signed-off-by: Ben Cressey --- packages/kernel-5.15/config-bottlerocket | 17 ----------------- packages/kernel-5.15/config-bottlerocket-metal | 17 +++++++++++++++++ packages/kernel-5.15/config-bottlerocket-vmware | 16 ++++++++++++++++ packages/kernel-6.1/config-bottlerocket | 17 ----------------- packages/kernel-6.1/config-bottlerocket-metal | 17 +++++++++++++++++ packages/kernel-6.1/config-bottlerocket-vmware | 16 ++++++++++++++++ 6 files changed, 66 insertions(+), 34 deletions(-) diff --git a/packages/kernel-5.15/config-bottlerocket b/packages/kernel-5.15/config-bottlerocket index 15c842581f2..3e963c6ed94 100644 --- a/packages/kernel-5.15/config-bottlerocket +++ b/packages/kernel-5.15/config-bottlerocket @@ -119,23 +119,6 @@ CONFIG_DECOMPRESS_ZSTD=y # CONFIG_MODULE_COMPRESS_NONE is not set CONFIG_MODULE_COMPRESS_XZ=y -# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for -# them before mounting the root device. -CONFIG_SERIO_I8042=m -CONFIG_KEYBOARD_ATKBD=m -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_PS2_ALPS is not set -# CONFIG_MOUSE_PS2_BYD is not set -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set -# CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set -# CONFIG_MOUSE_PS2_CYPRESS is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_PS2_FOCALTECH is not set - # Add virtio drivers for development setups running as guests in qemu CONFIG_VIRTIO_CONSOLE=m CONFIG_HW_RANDOM_VIRTIO=m diff --git a/packages/kernel-5.15/config-bottlerocket-metal b/packages/kernel-5.15/config-bottlerocket-metal index abef8fbaacd..4022b1beb39 100644 --- a/packages/kernel-5.15/config-bottlerocket-metal +++ b/packages/kernel-5.15/config-bottlerocket-metal @@ -126,3 +126,20 @@ CONFIG_SCSI_SMARTPQI=y # Support for virtio scsi boot devices for other cloud providers CONFIG_SCSI_VIRTIO=y + +# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for +# them before mounting the root device. +CONFIG_SERIO_I8042=m +CONFIG_KEYBOARD_ATKBD=m +CONFIG_MOUSE_PS2=m +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_BYD is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set +# CONFIG_MOUSE_PS2_CYPRESS is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_PS2_FOCALTECH is not set diff --git a/packages/kernel-5.15/config-bottlerocket-vmware b/packages/kernel-5.15/config-bottlerocket-vmware index e69de29bb2d..ec1cc1a5418 100644 --- a/packages/kernel-5.15/config-bottlerocket-vmware +++ b/packages/kernel-5.15/config-bottlerocket-vmware @@ -0,0 +1,16 @@ +# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for +# them before mounting the root device. +CONFIG_SERIO_I8042=m +CONFIG_KEYBOARD_ATKBD=m +CONFIG_MOUSE_PS2=m +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_BYD is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set +# CONFIG_MOUSE_PS2_CYPRESS is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_PS2_FOCALTECH is not set diff --git a/packages/kernel-6.1/config-bottlerocket b/packages/kernel-6.1/config-bottlerocket index 809e36e42ae..f95e720c73f 100644 --- a/packages/kernel-6.1/config-bottlerocket +++ b/packages/kernel-6.1/config-bottlerocket @@ -124,23 +124,6 @@ CONFIG_DECOMPRESS_ZSTD=y # CONFIG_MODULE_COMPRESS_NONE is not set CONFIG_MODULE_COMPRESS_XZ=y -# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for -# them before mounting the root device. -CONFIG_SERIO_I8042=m -CONFIG_KEYBOARD_ATKBD=m -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_PS2_ALPS is not set -# CONFIG_MOUSE_PS2_BYD is not set -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set -# CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set -# CONFIG_MOUSE_PS2_CYPRESS is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_PS2_FOCALTECH is not set - # Add virtio drivers for development setups running as guests in qemu CONFIG_VIRTIO_CONSOLE=m CONFIG_HW_RANDOM_VIRTIO=m diff --git a/packages/kernel-6.1/config-bottlerocket-metal b/packages/kernel-6.1/config-bottlerocket-metal index b2f4972cdeb..82831b744e5 100644 --- a/packages/kernel-6.1/config-bottlerocket-metal +++ b/packages/kernel-6.1/config-bottlerocket-metal @@ -124,3 +124,20 @@ CONFIG_SCSI_SMARTPQI=y # Support for virtio scsi boot devices for other cloud providers CONFIG_SCSI_VIRTIO=y + +# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for +# them before mounting the root device. +CONFIG_SERIO_I8042=m +CONFIG_KEYBOARD_ATKBD=m +CONFIG_MOUSE_PS2=m +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_BYD is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set +# CONFIG_MOUSE_PS2_CYPRESS is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_PS2_FOCALTECH is not set diff --git a/packages/kernel-6.1/config-bottlerocket-vmware b/packages/kernel-6.1/config-bottlerocket-vmware index e69de29bb2d..ec1cc1a5418 100644 --- a/packages/kernel-6.1/config-bottlerocket-vmware +++ b/packages/kernel-6.1/config-bottlerocket-vmware @@ -0,0 +1,16 @@ +# Load i8042 controller, keyboard, and mouse as modules, to avoid waiting for +# them before mounting the root device. +CONFIG_SERIO_I8042=m +CONFIG_KEYBOARD_ATKBD=m +CONFIG_MOUSE_PS2=m +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_BYD is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set +# CONFIG_MOUSE_PS2_CYPRESS is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_PS2_FOCALTECH is not set