qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 19:43:09 +02:00
Code

x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs on alix2 and others (thx, russell)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34126 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-11-09 10:19:51 +00:00
parent 7b9dfebde4
commit 81d8280c93
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/x86/image/Makefile
View File

@ -9,13 +9,20 @@ include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin 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
GRUB2_MODULES_ISO = at_keyboard biosdisk boot chain configfile iso9660 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_TERMINALS =
GRUB_SERIAL_CONFIG = GRUB_SERIAL_CONFIG =
GRUB_TERMINAL_CONFIG = GRUB_TERMINAL_CONFIG =
GRUB_CONSOLE_CMDLINE = 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),) ifneq ($(CONFIG_X86_GRUB_CONSOLE),)
GRUB_CONSOLE_CMDLINE += console=tty0 GRUB_CONSOLE_CMDLINE += console=tty0
GRUB_TERMINALS += console GRUB_TERMINALS += console