Changeset 34126


Ignore:
Timestamp:
2012-11-09T11:19:51+01:00 (5 years ago)
Author:
nbd
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/target/linux/x86/image/Makefile

    r33779 r34126  
    1010export PATH=$(TARGET_PATH):/sbin 
    1111 
    12 GRUB2_MODULES = at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga 
    13 GRUB2_MODULES_ISO = at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga 
     12GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga 
     13GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga 
    1414GRUB_TERMINALS = 
    1515GRUB_SERIAL_CONFIG = 
    1616GRUB_TERMINAL_CONFIG = 
    1717GRUB_CONSOLE_CMDLINE = 
     18 
     19USE_ATKBD = generic kvm_guest 
     20 
     21ifneq ($(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget))),) 
     22  GRUB2_MODULES += at_keyboard 
     23  GRUB2_MODULES_ISO += at_keyboard 
     24endif 
    1825 
    1926ifneq ($(CONFIG_X86_GRUB_CONSOLE),) 
Note: See TracChangeset for help on using the changeset viewer.