diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-11-09 11:16:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-11-09 11:16:53 +0000 |
| commit | 0145d4578ad5270502ebc5151d1a6b24a5fa57e2 (patch) | |
| tree | 131a607e6bd0687dc8f9c063124c0b2ffe7e6bf8 /target | |
| parent | 08f87a51838bf0fb932a53daad06c3aa28ed3bce (diff) | |
| download | upstream-0145d4578ad5270502ebc5151d1a6b24a5fa57e2.tar.gz upstream-0145d4578ad5270502ebc5151d1a6b24a5fa57e2.tar.bz2 upstream-0145d4578ad5270502ebc5151d1a6b24a5fa57e2.zip | |
x86: backport grub2 at_keyboard handling from r34126 and r34127
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34128 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/x86/image/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 547f0839fd..13da511ed4 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin -GRUB2_MODULES = at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga +GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga GRUB_TERMINALS = GRUB_SERIAL_CONFIG = GRUB_TERMINAL_CONFIG = @@ -20,6 +20,12 @@ ifneq ($(CONFIG_X86_GRUB_CONSOLE),) GRUB_TERMINALS += console endif +USE_ATKBD = generic kvm_guest + +ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget)))),) + GRUB2_MODULES += at_keyboard +endif + ifneq ($(CONFIG_X86_GRUB_SERIAL),) GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8 GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 |