diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-17 00:59:41 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-17 00:59:41 +0000 |
| commit | 9ce3d383310a6e40f9f822a887982ce368a09aba (patch) | |
| tree | 72951c376053b1212f6996252074d2e18ea561f5 /target/linux/x86/image/Config.in | |
| parent | 0499a7715936f6e3cd589aea4e2ab559380e9c00 (diff) | |
| download | upstream-9ce3d383310a6e40f9f822a887982ce368a09aba.tar.gz upstream-9ce3d383310a6e40f9f822a887982ce368a09aba.tar.bz2 upstream-9ce3d383310a6e40f9f822a887982ce368a09aba.zip | |
- clean up menu.lst template - make grub usage of vt0 selectable in menuconfig - choose appropriate default baudrate for soekris devices - fix generation of grub menu for iso images
SVN-Revision: 19681
Diffstat (limited to 'target/linux/x86/image/Config.in')
| -rw-r--r-- | target/linux/x86/image/Config.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index d52ae0c070..9d17f37b63 100644 --- a/target/linux/x86/image/Config.in +++ b/target/linux/x86/image/Config.in @@ -2,14 +2,21 @@ config X86_GRUB_IMAGES bool "Build GRUB images (Linux x86 or x86_64 host only)" depends TARGET_x86 && !TARGET_x86_olpc depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO - select PACKAGE_grub + select PACKAGE_grub default y config X86_GRUB_IMAGES_PAD - bool "Pad GRUB images to filesystem size (for JFFS2)" - depends X86_GRUB_IMAGES + bool "Pad GRUB images to filesystem size (for JFFS2)" + depends X86_GRUB_IMAGES config X86_GRUB_CONSOLE + bool + depends X86_GRUB_IMAGES + prompt "Use Console Terminal (in addition to Serial)" + default n if TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx + default y if ! (TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx) + +config X86_GRUB_SERIAL string prompt "Serial port device" depends X86_GRUB_IMAGES @@ -19,7 +26,8 @@ config X86_GRUB_CONSOLE config X86_GRUB_BAUDRATE int "Serial port baud rate" depends X86_GRUB_IMAGES - default 38400 + default 19200 if TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx + default 38400 if ! (TARGET_x86_generic_Soekris48xx || TARGET_x86_generic_Soekris45xx) config X86_GRUB_KERNELPART int "Kernel partition size (in MB)" |