X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Folpc%2Fimage%2FConfig.in;h=27bbb961a40e91d754898c56bbee4743db1c4f41;hb=868b2c94fae2a838cceee8122e31e3c7b0b2170c;hp=6252ae6d1feb96aad3d951a351e0decb2f9f6ae2;hpb=6a244cf2e8b86fd790bd6443721da90dcaabd33b;p=openwrt-10.03%2F.git

diff --git a/target/linux/olpc/image/Config.in b/target/linux/olpc/image/Config.in
index 6252ae6d1..27bbb961a 100644
--- a/target/linux/olpc/image/Config.in
+++ b/target/linux/olpc/image/Config.in
@@ -1,35 +1,23 @@
-config OLPC_GRUB_IMAGES
-    bool "Build GRUB images"
+config OLPC_BOOTSCRIPT_IMAGES
+    bool "Build images with bootscript"
     depends TARGET_olpc
     depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
-	select PACKAGE_grub
     default y
 
-config OLPC_GRUB_IMAGES_PAD
-	bool "Pad GRUB images to filesystem size (for JFFS2)"
-	depends OLPC_GRUB_IMAGES
+config OLPC_BOOTSCRIPT_IMAGES_PAD
+	bool "Pad bootscript images to filesystem size (for JFFS2)"
+	depends OLPC_BOOTSCRIPT_IMAGES
 
-config OLPC_GRUB_BAUDRATE
-    int "Serial port baud rate"
-    depends OLPC_GRUB_IMAGES
-    default 38400
-
-config OLPC_GRUB_KERNELPART
+config OLPC_BOOTSCRIPT_KERNELPART
     int "Kernel partition size (in MB)"
-    depends OLPC_GRUB_IMAGES
+    depends OLPC_BOOTSCRIPT_IMAGES
     default 4
 
-config OLPC_GRUB_ROOTPART
+config OLPC_BOOTSCRIPT_ROOTPART
     string
-    prompt "Root partition on target device" if OLPC_GRUB_IMAGES
-    default "/dev/hda2"
+    prompt "Root partition on target device" if OLPC_BOOTSCRIPT_IMAGES
+    default "/dev/sda2"
     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 OLPC_GRUB_BOOTOPTS
-    string
-    prompt "Extra kernel boot options" if OLPC_GRUB_IMAGES
-    default ""
-    help
-        If you don't know, just leave it blank.