From b06ec370d1be7b9eafe9f7088dbbe10110c01190 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Wed, 27 Feb 2019 14:13:25 +0100
Subject: [PATCH] Use platform-specific NIC driver in lwip test

Follow-up to "zynq: restructure nic_drv spec structure"

Issue #3179
---
 repos/libports/run/lwip.run                     | 3 ++-
 repos/os/src/drivers/nic/spec/zynq/hw/target.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run
index 7a1a5d4f03..1f870455ec 100644
--- a/repos/libports/run/lwip.run
+++ b/repos/libports/run/lwip.run
@@ -111,6 +111,7 @@ append_platform_drv_config
 
 append_if $use_nic_driver config {
 	<start name="nic_drv" caps="130">
+		<binary name="} [nic_drv_binary] {"/>
 		<resource name="RAM" quantum="20M"/>
 		<provides><service name="Nic"/></provides>
 		} [nic_drv_config] {
@@ -134,7 +135,7 @@ set boot_modules {
 
 # platform-specific modules
 lappend_if $use_usb_driver              boot_modules usb_drv
-lappend_if $use_nic_driver              boot_modules nic_drv
+lappend_if $use_nic_driver              boot_modules [nic_drv_binary]
 lappend_if [have_spec gpio]             boot_modules [gpio_drv]
 
 append_platform_drv_boot_modules
diff --git a/repos/os/src/drivers/nic/spec/zynq/hw/target.mk b/repos/os/src/drivers/nic/spec/zynq/hw/target.mk
index 56556738e6..3e6ebbc77b 100644
--- a/repos/os/src/drivers/nic/spec/zynq/hw/target.mk
+++ b/repos/os/src/drivers/nic/spec/zynq/hw/target.mk
@@ -1,4 +1,4 @@
-REQUIRES = hw
+REQUIRES = hw arm_v7
 TARGET   = zynq_nic_drv
 SRC_CC   = main.cc
 LIBS     = base syscall-hw