X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ea8823c99319e5c11b975d14c95b487d25ec0f3f..fb4e18d48b8f23f8e532d38550fe0c5d11cae500:/target/linux/x86/image/Config.in diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index 9dd7ae587..9d17f37b6 100644 --- a/target/linux/x86/image/Config.in +++ b/target/linux/x86/image/Config.in @@ -1,18 +1,33 @@ config X86_GRUB_IMAGES bool "Build GRUB images (Linux x86 or x86_64 host only)" - depends TARGET_x86_generic + 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 + default "hvc0" if TARGET_x86_xen_domu + default "ttyS0" if ! TARGET_x86_xen_domu 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)" @@ -22,16 +37,17 @@ config X86_GRUB_KERNELPART config X86_GRUB_ROOTPART string prompt "Root partition on target device" if X86_GRUB_IMAGES - default "/dev/hda2" if LINUX_2_6_28 - default "/dev/sda2" + default "/dev/xvda2" if TARGET_x86_xen_domu + default "/dev/sda2" if ! TARGET_x86_xen_domu help The root partition on the final device. If you don't know, - you probably want the default (/dev/hda2). + you probably want the default (/dev/sda2). config X86_GRUB_BOOTOPTS string prompt "Extra kernel boot options" if X86_GRUB_IMAGES - default "" + default "xencons=hvc" if TARGET_x86_xen_domu + default "" if ! TARGET_x86_xen_domu help If you don't know, just leave it blank.