From a4d9f84daa3c1d5195daf4e85cdc5d2fc1a98d5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 23:07:55 +0100 Subject: disable block driver for qemu emulators, can be activated via menuconfig --- target/config/Config.in.runtime | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'target/config/Config.in.runtime') diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 7848a25ce..cb0929822 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -159,14 +159,14 @@ depends on ADK_SIMPLE_NETWORK_CONFIG choice prompt "Type" - default SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC - -config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC - bool "NIC / DHCP" + default SIMPLE_NETWORK_CONFIG_ETH0_TYPE_MANUAL config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL bool "NIC / manual IP" +config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC + bool "NIC / DHCP" + config SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP bool "Bridge with IP" @@ -180,7 +180,7 @@ endchoice config SIMPLE_NETWORK_CONFIG_ETH0_IP depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP string "eth0 IP Address" - default "192.168.1.2" + default "10.0.2.15" config SIMPLE_NETWORK_CONFIG_ETH0_NM depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP @@ -190,7 +190,7 @@ config SIMPLE_NETWORK_CONFIG_ETH0_NM config SIMPLE_NETWORK_CONFIG_ETH0_GW depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL string "eth0 Gateway" - default "192.168.1.1" + default "10.0.2.2" config SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE depends on SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE || SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP @@ -282,7 +282,7 @@ depends on ADK_SIMPLE_NETWORK_CONFIG config SIMPLE_NETWORK_CONFIG_RESOLV string "Nameserver" - default "192.168.1.1" + default "10.0.2.3" endmenu -- cgit v1.2.3