From ad99688853d31a041abbb0193e28c58e8d7aa47c Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Tue, 10 Apr 2018 11:46:45 +0200
Subject: [PATCH] imx53_qsb: enable automated network tests

Fix #2749
---
 repos/base/run/platform_drv.inc     | 14 +++++++++++++-
 repos/libports/run/lwip.run         |  3 ++-
 repos/ports/run/netperf.inc         |  3 ++-
 repos/ports/run/noux_net_netcat.run |  3 ++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc
index 9bd5fdd3a..275eeacc6 100644
--- a/repos/base/run/platform_drv.inc
+++ b/repos/base/run/platform_drv.inc
@@ -36,11 +36,23 @@ proc need_usb_hid { } {
 proc nic_drv_binary { } {
 	if {[have_spec linux]} { return linux_nic_drv }
 	if {[have_spec omap4] || [have_spec arndale] || [have_spec rpi]} { return usb_drv }
-	if {!([have_spec imx53] || [have_spec riscv] || [have_spec odroid_xu])} { return nic_drv }
+	if {!([have_spec riscv] || [have_spec odroid_xu])} { return nic_drv }
 	return no_nic_drv_available
 }
 
 
+##
+# Return configuration for NIC driver
+#
+proc nic_drv_config { } {
+	if {[have_spec imx53]} {
+		return "<config><card type=\"fsl,imx25-fec\" mii=\"rmii\" irq=\"87\" mmio=\"0x63fec000\"/></config>" }
+	if {[have_spec wand_quad]} {
+		return "<config><card type=\"fsl,imx6q-fec\" mii=\"rgmii\" irq=\"150\" mmio=\"0x2188000\"/></config>" }
+	return ""
+}
+
+
 ##
 # Return name of the audio driver binary
 #
diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run
index 5844cec4d..075fd60d2 100644
--- a/repos/libports/run/lwip.run
+++ b/repos/libports/run/lwip.run
@@ -21,7 +21,7 @@
 #
 
 set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
-set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux]]
+set use_nic_driver [expr !$use_usb_driver && ![have_spec odroid_xu] && ![have_spec linux]]
 
 if {[expr !$use_usb_driver && !$use_nic_driver]} {
 	puts "\n Run script is not supported on this platform. \n"; exit 0 }
@@ -108,6 +108,7 @@ append_if $use_nic_driver config {
 	<start name="nic_drv" caps="130">
 		<resource name="RAM" quantum="20M"/>
 		<provides><service name="Nic"/></provides>
+		} [nic_drv_config] {
 	</start>}
 
 append config {
diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc
index 6a2d5c025..1f06eef13 100644
--- a/repos/ports/run/netperf.inc
+++ b/repos/ports/run/netperf.inc
@@ -27,7 +27,7 @@ if {[have_spec odroid_xu]} {
 if {![info exists use_usb_driver]} {
 	set use_usb_driver      [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
 }
-set use_nic_driver      [expr !$use_usb_driver && ![have_spec imx53] && !$use_wifi_driver]
+set use_nic_driver      [expr !$use_usb_driver && !$use_wifi_driver]
 
 if {[expr !$use_usb_driver && !$use_nic_driver && !$use_wifi_driver]} {
 	puts "Run script is not supported on this platform.";
@@ -223,6 +223,7 @@ append_if $use_nic_driver config {
 		<binary name="} [nic_drv_binary] {"/>
 		<resource name="RAM" quantum="20M"/>
 		<provides><service name="Nic"/></provides>
+		} [nic_drv_config] {
 	</start>}
 
 append_if $use_wifi_driver config {
diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run
index eccbb7bd8..ee72dc566 100644
--- a/repos/ports/run/noux_net_netcat.run
+++ b/repos/ports/run/noux_net_netcat.run
@@ -1,5 +1,5 @@
 set use_usb_driver   [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
-set use_nic_driver   [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec linux] && ![have_spec odroid_xu]]
+set use_nic_driver   [expr !$use_usb_driver && ![have_spec linux] && ![have_spec odroid_xu]]
 
 if {[expr !$use_usb_driver && !$use_nic_driver || [expr [have_include "power_on/qemu"] && [have_spec zynq]]]} {
 	puts "\n Run script is not supported on this platform. \n"; exit 0 }
@@ -117,6 +117,7 @@ append_if $use_nic_driver config {
 	<start name="nic_drv" caps="130">
 		<resource name="RAM" quantum="20M"/>
 		<provides> <service name="Nic"/> </provides>
+		} [nic_drv_config] {
 	</start>}
 
 append_if [have_spec gpio] config "