summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-05 12:54:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-05 12:54:00 +0100
commitf48a3ede4e7b99a0a58262a88b632ee01d7d3a0a (patch)
tree9b6573cc0659613763a749a1ae0d316ec05eb0b8 /target
parentb52a881b03cdd926ec06ccaca7b4d7d63fc3cb8c (diff)
fix networking support in vexpress emulation, new style is not working here.
Diffstat (limited to 'target')
-rw-r--r--target/arm/Makefile2
-rw-r--r--target/arm/kernel/qemu-arm-vexpress-a95
2 files changed, 1 insertions, 6 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 4e07cd664..e2194f1d3 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -24,7 +24,7 @@ NET:=-net user -net nic,model=smc91c111
endif
ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
MACH:=vexpress-a9
-NET:=-cpu cortex-a9 -device lan9118,netdev=adk0 -netdev user,id=adk0
+NET:=-cpu cortex-a9 -net user -net nic,model=lan9118
endif
kernel-install:
diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9
index 3d741c115..b6535116a 100644
--- a/target/arm/kernel/qemu-arm-vexpress-a9
+++ b/target/arm/kernel/qemu-arm-vexpress-a9
@@ -21,8 +21,3 @@ CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMSC911X=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_I2C_VERSATILE=y
-CONFIG_SENSORS_VEXPRESS=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_VEXPRESS=y