X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fx86%2Fimage%2FConfig.in;h=653aa61eff1f1f5e58f36eb58d08fa3574421247;hb=48e426d185cde9337ec788ac46a93468f3c0c47e;hp=ea3a13460a5924e7eeeffd97a758e8a1eb62338b;hpb=8176b71781fbe40680d5815a6d9a55237a157526;p=openwrt.git

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index ea3a13460a..653aa61eff 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -17,27 +17,27 @@ config X86_GRUB_IMAGES
 	bool "Build GRUB images (Linux x86 or x86_64 host only)"
 	depends TARGET_x86 && !TARGET_x86_olpc
 	depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
-	select PACKAGE_grub
+	select PACKAGE_grub2
 	default y
 
 config X86_GRUB_CONSOLE
 	bool "Use Console Terminal (in addition to Serial)"
 	depends X86_GRUB_IMAGES
-	default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos)
+	default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
 	default y
 
 config X86_GRUB_SERIAL
 	string "Serial port device"
 	depends X86_GRUB_IMAGES
-	default "hvc0" if (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
-	default "ttyS0" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+	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 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
 	default 38400 if TARGET_x86_alix2
-	default 115200 if TARGET_x86_geos
+	default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
 	default 38400
 
 config X86_GRUB_BOOTOPTS
@@ -73,15 +73,16 @@ config OLPC_BOOTSCRIPT_IMAGES
 	bool "Build images with bootscript"
 	depends TARGET_x86_olpc
 	depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+	default TARGET_x86_olpc
 
 
 config TARGET_IMAGES_PAD
 	bool "Pad images to filesystem size (for JFFS2)"
 	depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
-	default y
 
 config TARGET_IMAGES_GZIP
 	bool "GZip images"
+	depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
 	default y
 
 config TARGET_KERNEL_PARTSIZE