projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtd-utils: merge ubi/nand-utils into one package
[librecmc/librecmc.git]
/
config
/
Config-images.in
diff --git
a/config/Config-images.in
b/config/Config-images.in
index 5c2e79e41e4f8940c83b1ceec211fe2c32ed1f40..958bda4227872648c3f2e19c15623d6b932ca8cb 100644
(file)
--- 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)"
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
depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
select PACKAGE_grub2
default y
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
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"
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)"
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"
config TARGET_IMAGES_GZIP
bool "GZip images"
@@
-254,7
+253,7
@@
menu "Target Images"
config TARGET_KERNEL_PARTSIZE
int "Kernel partition size (in MB)"
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
default 4
config TARGET_ROOTFS_PARTSIZE
@@
-266,9
+265,7
@@
menu "Target Images"
config TARGET_ROOTFS_PARTNAME
string "Root partition on target device"
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 && ! TARGET_x86_xen_domu
+ depends on GRUB_IMAGES
help
Override the root partition on the final device. If left empty,
it will be mounted by PARTUUID which makes the kernel find the
help
Override the root partition on the final device. If left empty,
it will be mounted by PARTUUID which makes the kernel find the