ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github-tlaurion/enable-optional_usb_keyboard_for_all'

Browse Source 
PR #1838
This commit is contained in:
Jonathon Hall 2024-11-06 08:41:17 -05:00
commit 5aa12437b4
No known key found for this signature in database
GPG Key ID: 1E9C3CA91AE25114
7 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/librem_13v2/librem_13v2.config
View File

@ -27,7 +27,6 @@ CONFIG_HOTPKEY=y
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
CONFIG_MOBILE_TETHERING=y CONFIG_MOBILE_TETHERING=y
export CONFIG_SUPPORT_USB_KEYBOARD=y
export CONFIG_TPM=y export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOTSCRIPT=/bin/gui-init

1
boards/librem_13v4/librem_13v4.config
View File

@ -27,7 +27,6 @@ CONFIG_HOTPKEY=y
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
CONFIG_MOBILE_TETHERING=y CONFIG_MOBILE_TETHERING=y
export CONFIG_SUPPORT_USB_KEYBOARD=y
export CONFIG_TPM=y export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOTSCRIPT=/bin/gui-init

1
boards/librem_14/librem_14.config
View File

@ -27,7 +27,6 @@ CONFIG_LINUX_USB=y
CONFIG_MOBILE_TETHERING=y CONFIG_MOBILE_TETHERING=y
export CONFIG_TPM=y export CONFIG_TPM=y
export CONFIG_SUPPORT_USB_KEYBOARD=y
export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOTSCRIPT=/bin/gui-init
export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_HASH=n

1
boards/librem_15v3/librem_15v3.config
View File

@ -27,7 +27,6 @@ CONFIG_HOTPKEY=y
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
CONFIG_MOBILE_TETHERING=y CONFIG_MOBILE_TETHERING=y
export CONFIG_SUPPORT_USB_KEYBOARD=y
export CONFIG_TPM=y export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOTSCRIPT=/bin/gui-init

1
boards/librem_15v4/librem_15v4.config
View File

@ -28,7 +28,6 @@ CONFIG_HOTPKEY=y
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
CONFIG_MOBILE_TETHERING=y CONFIG_MOBILE_TETHERING=y
export CONFIG_SUPPORT_USB_KEYBOARD=y
export CONFIG_TPM=y export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOTSCRIPT=/bin/gui-init

6
initrd/bin/config-gui.sh
View File

@ -71,12 +71,10 @@ while true; do
) )
# Boards with built-in keyboards can support optional USB keyboards as well. # Boards with built-in keyboards can support optional USB keyboards as well.
# Export CONFIG_SUPPORT_USB_KEYBOARD=y to enable optional support. # Boards that do not have a built-in keyboard/internal keyboard is USB connected export
# Boards that do not have a built-in keyboard export
# CONFIG_USB_KEYBOARD_REQUIRED=y; this hides the config option and ensures # CONFIG_USB_KEYBOARD_REQUIRED=y; this hides the config option and ensures
# USB keyboard support always loads. # USB keyboard support always loads.
[ "$CONFIG_SUPPORT_USB_KEYBOARD" = y ] && [ "$CONFIG_USB_KEYBOARD_REQUIRED" != y ] \ [ "$CONFIG_USB_KEYBOARD_REQUIRED" != y ] && dynamic_config_options+=(
&& dynamic_config_options+=(
'K' " $(get_config_display_action "$CONFIG_USER_USB_KEYBOARD") USB keyboard" 'K' " $(get_config_display_action "$CONFIG_USER_USB_KEYBOARD") USB keyboard"
) )

5
modules/linux
View File

@ -79,6 +79,8 @@ $(INSTALL)/include/linux/limits.h: $(build)/$(linux_base_dir)/.canary
KCONFIG_CONFIG="$(pwd)/$(linux_kconfig)" \ KCONFIG_CONFIG="$(pwd)/$(linux_kconfig)" \
headers_install headers_install
# Inconditional: add USB keyboard support to all boards (linux_modules-y)
linux_modules-y += drivers/hid/usbhid/usbhid.ko
# qemu # qemu
linux_modules-$(CONFIG_LINUX_E1000) += drivers/net/ethernet/intel/e1000/e1000.ko linux_modules-$(CONFIG_LINUX_E1000) += drivers/net/ethernet/intel/e1000/e1000.ko
@ -122,9 +124,6 @@ linux_modules-$(CONFIG_LINUX_USB) += drivers/usb/host/xhci-hcd.ko
linux_modules-$(CONFIG_LINUX_USB) += drivers/usb/host/xhci-pci.ko linux_modules-$(CONFIG_LINUX_USB) += drivers/usb/host/xhci-pci.ko
linux_modules-$(CONFIG_LINUX_USB) += drivers/usb/storage/usb-storage.ko linux_modules-$(CONFIG_LINUX_USB) += drivers/usb/storage/usb-storage.ko
#USB modules when a USB keyboard is defined in board config
linux_modules-$(CONFIG_SUPPORT_USB_KEYBOARD) += drivers/hid/usbhid/usbhid.ko
#USB modules for Mobile USB Tethering (Most Android phones, Librem phone, etc) #USB modules for Mobile USB Tethering (Most Android phones, Librem phone, etc)
linux_modules-$(CONFIG_MOBILE_TETHERING) += drivers/net/mii.ko linux_modules-$(CONFIG_MOBILE_TETHERING) += drivers/net/mii.ko
linux_modules-$(CONFIG_MOBILE_TETHERING) += drivers/net/usb/usbnet.ko linux_modules-$(CONFIG_MOBILE_TETHERING) += drivers/net/usb/usbnet.ko