diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-11-09 10:19:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-11-09 10:19:51 +0000 |
| commit | 0a9e05fb0ede4ea14abba9cd7dd73cbade70785f (patch) | |
| tree | e6362b69949a7f7944081cdecf5bcba14ebc6bc1 /target/linux/x86/image | |
| parent | 502661f685844105159a0e02e5141db1cfb48db0 (diff) | |
| download | upstream-0a9e05fb0ede4ea14abba9cd7dd73cbade70785f.tar.gz upstream-0a9e05fb0ede4ea14abba9cd7dd73cbade70785f.tar.bz2 upstream-0a9e05fb0ede4ea14abba9cd7dd73cbade70785f.zip | |
x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs on alix2 and others (thx, russell)
SVN-Revision: 34126
Diffstat (limited to 'target/linux/x86/image')
| -rw-r--r-- | target/linux/x86/image/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 399ce3c7d3..a5f7722518 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -9,13 +9,20 @@ 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_ISO = at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga +GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga +GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga GRUB_TERMINALS = GRUB_SERIAL_CONFIG = GRUB_TERMINAL_CONFIG = GRUB_CONSOLE_CMDLINE = +USE_ATKBD = generic kvm_guest + +ifneq ($(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget))),) + GRUB2_MODULES += at_keyboard + GRUB2_MODULES_ISO += at_keyboard +endif + ifneq ($(CONFIG_X86_GRUB_CONSOLE),) GRUB_CONSOLE_CMDLINE += console=tty0 GRUB_TERMINALS += console |