X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=config%2FConfig-images.in;h=a60dd5078a0d8d7841e4eb54504aac7662bdf151;hp=eca2d75b01386dbc3dc68a68ea3c8f4c2479ac6e;hb=b7933a47bb8ef485fe503425a817780905372068;hpb=bdeda10f1cc45c7399c0033161c1f5382c5607f8

diff --git a/config/Config-images.in b/config/Config-images.in
index eca2d75b01..a60dd5078a 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -186,7 +186,7 @@ menu "Target Images"
 
 	config GRUB_IMAGES
 		bool "Build GRUB images (Linux x86 or x86_64 host only)"
-		depends on TARGET_x86_64 || (TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc))
+		depends on TARGET_x86_64 || (TARGET_x86 && !TARGET_x86_rdc)
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		select PACKAGE_grub2
 		default y
@@ -206,10 +206,9 @@ menu "Target Images"
 	config GRUB_BAUDRATE
 		int "Serial port baud rate"
 		depends on 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 || TARGET_x86_kvm_guest
-		default 38400
+		default 38400 if TARGET_x86_generic
+		default 38400 if TARGET_x86_geode
+		default 115200
 
 	config GRUB_BOOTOPTS
 		string "Extra kernel boot options"
@@ -241,7 +240,7 @@ menu "Target Images"
 
 	config TARGET_IMAGES_PAD
 		bool "Pad images to filesystem size (for JFFS2)"
-		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		depends on GRUB_IMAGES
 
 	config TARGET_IMAGES_GZIP
 		bool "GZip images"
@@ -254,7 +253,7 @@ menu "Target Images"
 
 	config TARGET_KERNEL_PARTSIZE
 		int "Kernel partition size (in MB)"
-		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		depends on GRUB_IMAGES
 		default 4
 
 	config TARGET_ROOTFS_PARTSIZE
@@ -266,12 +265,11 @@ menu "Target Images"
 
 	config TARGET_ROOTFS_PARTNAME
 		string "Root partition on target device"
-		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
-		default "/dev/xvda2" if TARGET_x86_xen_domu
-		default "/dev/sda2" if ! TARGET_x86_xen_domu
+		depends on GRUB_IMAGES
 		help
-		  The root partition on the final device.  If you don't know,
-		  you probably want the default (/dev/sda2).
+		  Override the root partition on the final device. If left empty,
+		  it will be mounted by PARTUUID which makes the kernel find the
+		  appropriate disk automatically.
 
 
 	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL