projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: register WMAC device on the DB120 board
[openwrt.git]
/
target
/
linux
/
x86
/
image
/
Config.in
diff --git
a/target/linux/x86/image/Config.in
b/target/linux/x86/image/Config.in
index
b89980c
..
958e43e
100644
(file)
--- a/
target/linux/x86/image/Config.in
+++ b/
target/linux/x86/image/Config.in
@@
-1,26
+1,27
@@
config X86_GRUB_IMAGES
bool "Build GRUB images (Linux x86 or x86_64 host only)"
depends TARGET_x86 && !TARGET_x86_olpc
config X86_GRUB_IMAGES
bool "Build GRUB images (Linux x86 or x86_64 host only)"
depends TARGET_x86 && !TARGET_x86_olpc
- depends TARGET_ROOTFS_EXT
2
FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+ depends TARGET_ROOTFS_EXT
4
FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
select PACKAGE_grub
default y
config X86_GRUB_CONSOLE
bool "Use Console Terminal (in addition to Serial)"
depends X86_GRUB_IMAGES
select PACKAGE_grub
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)
+ default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
|| TARGET_x86_geos
)
default y
config X86_GRUB_SERIAL
string "Serial port device"
depends X86_GRUB_IMAGES
default y
config X86_GRUB_SERIAL
string "Serial port device"
depends X86_GRUB_IMAGES
- default "hvc0" if
TARGET_x86_xen_domu
- default "ttyS0"
+ default "hvc0" if
(TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+ default "ttyS0"
if ! (TARGET_x86_kvm_guest || 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
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 115200 if TARGET_x86_geos
default 38400
config X86_GRUB_BOOTOPTS
default 38400
config X86_GRUB_BOOTOPTS
@@
-34,25
+35,21
@@
config X86_VDI_IMAGES
bool "Build VirtualBox image files (VDI)"
depends X86_GRUB_IMAGES
depends TARGET_x86_generic
bool "Build VirtualBox image files (VDI)"
depends X86_GRUB_IMAGES
depends TARGET_x86_generic
- depends TARGET_ROOTFS_EXT
2
FS
+ depends TARGET_ROOTFS_EXT
4
FS
select PACKAGE_kmod-pcnet32
select PACKAGE_kmod-pcnet32
- help
- Requires VBoxManage installed on the build system.
config X86_VMDK_IMAGES
bool "Build VMware image files (VMDK)"
depends X86_GRUB_IMAGES
depends TARGET_x86_generic
config X86_VMDK_IMAGES
bool "Build VMware image files (VMDK)"
depends X86_GRUB_IMAGES
depends TARGET_x86_generic
- depends TARGET_ROOTFS_EXT
2
FS
+ depends TARGET_ROOTFS_EXT
4
FS
select PACKAGE_kmod-e1000
select PACKAGE_kmod-e1000
- help
- Requires qemu-img installed on the build system.
config OLPC_BOOTSCRIPT_IMAGES
bool "Build images with bootscript"
depends TARGET_x86_olpc
config OLPC_BOOTSCRIPT_IMAGES
bool "Build images with bootscript"
depends TARGET_x86_olpc
- depends TARGET_ROOTFS_EXT
2
FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+ depends TARGET_ROOTFS_EXT
4
FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
config TARGET_IMAGES_PAD
config TARGET_IMAGES_PAD
@@
-67,8
+64,9
@@
config TARGET_KERNEL_PARTSIZE
config TARGET_ROOTFS_PARTNAME
string "Root partition on target device"
depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
config TARGET_ROOTFS_PARTNAME
string "Root partition on target device"
depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+ default "/dev/vda2" if TARGET_x86_kvm_guest
default "/dev/xvda2" if TARGET_x86_xen_domu
default "/dev/xvda2" if TARGET_x86_xen_domu
- default "/dev/sda2"
+ default "/dev/sda2"
if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
help
The root partition on the final device. If you don't know,
you probably want the default (/dev/sda2).
help
The root partition on the final device. If you don't know,
you probably want the default (/dev/sda2).
This page took
0.024716 seconds
and
4
git commands to generate.