diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 10:56:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-06 10:56:26 +0100 |
| commit | 0988b9eedebea9e005d3920da0f13ecabf339763 (patch) | |
| tree | dbb75500caa7905ae8d7128690362ff831ad7a15 /target | |
| parent | 8f60440edc30c41982916877253f73f348a12026 (diff) | |
| parent | 1e34c444c13235ee24867d96a796a047705695c1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 2 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-vexpress-a9 | 5 |
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 |