zynq: restructure nic_drv spec structure

The zynq nic_drv also depends on hw, we therefore adapted the folder
structure for clarity. Also renamed the binary to 'zynq_nic_drv' to
prevent conflicts and to allow removing the cadence_gem spec.

Issue #3179

repos/base/mk/spec/zynq_qemu.mk

@@ -1,7 +1,7 @@
 #
 # Pull in CPU specifics
 #
-SPECS += zynq cadence_gem
+SPECS += zynq
 
 REP_INC_DIR += include/spec/zynq_qemu
 

repos/base/run/platform_drv.inc

@@ -50,6 +50,7 @@ proc usb_host_drv_binary { } {
 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 zynq]} { return zynq_nic_drv }
 	if {!([have_spec riscv] || [have_spec odroid_xu])} { return nic_drv }
 	return no_nic_drv_available
 }

repos/gems/run/mirage_pretty.run

@@ -159,7 +159,7 @@ build_boot_image $boot_modules
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/libports/run/fetchurl.inc

@@ -131,7 +131,7 @@ append qemu_args " -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/libports/run/lwip.run

@@ -151,7 +151,7 @@ append qemu_args "  -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/libports/run/mirage_net.run

@@ -114,7 +114,7 @@ append qemu_args " -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/libports/run/nic_bridge.run

@@ -189,7 +189,7 @@ append qemu_args "  -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/libports/run/nic_bridge_lighttpd.run

@@ -160,7 +160,7 @@ append qemu_args " -nographic -serial mon:stdio "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/libports/run/qt5_drivers.inc

@@ -41,7 +41,7 @@ proc use_input_filter { feature_arg } {
 proc use_nic_drv { feature_arg } {
 	upvar $feature_arg feature
 	return [expr {[info exists feature(Nic)] &&
-	              ([have_spec cadence_gem] ||
+	              ([have_spec zynq] ||
 	               [have_spec lan9118] ||
 	               [have_spec linux] ||
 	               [have_spec x86])}]

repos/os/run/nic_router_flood.run

@@ -249,7 +249,7 @@ append qemu_args " -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/os/run/ping.run

@@ -155,7 +155,7 @@ append qemu_args " -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/os/run/ping_nic_router.run

@@ -271,7 +271,7 @@ append qemu_args " -nographic "
 proc qemu_nic_model {} {
 	if [have_spec x86]         { return e1000 }
 	if [have_spec lan9118]     { return lan9118 }
-	if [have_spec cadence_gem] { return cadence_gem }
+	if [have_spec zynq]        { return cadence_gem }
 	return nic_model_missing
 }
 

repos/os/src/drivers/nic/spec/zynq/hw/target.mk

@@ -1,5 +1,5 @@
-REQUIRES = cadence_gem
+REQUIRES = hw
-TARGET   = nic_drv
+TARGET   = zynq_nic_drv
 SRC_CC   = main.cc
 LIBS     = base syscall-hw
 INC_DIR += $(PRG_DIR)