From 11d8f97845e7d64a87549efe24445bf4c5993a5f Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Fri, 22 Feb 2019 12:00:04 +0100 Subject: [PATCH] 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 | 2 +- repos/base/run/platform_drv.inc | 1 + repos/gems/run/mirage_pretty.run | 2 +- repos/libports/run/fetchurl.inc | 2 +- repos/libports/run/lwip.run | 2 +- repos/libports/run/mirage_net.run | 2 +- repos/libports/run/nic_bridge.run | 2 +- repos/libports/run/nic_bridge_lighttpd.run | 2 +- repos/libports/run/qt5_drivers.inc | 2 +- repos/os/run/nic_router_flood.run | 2 +- repos/os/run/ping.run | 2 +- repos/os/run/ping_nic_router.run | 2 +- .../src/drivers/nic/spec/{gem => zynq/hw}/buffer_descriptor.h | 0 repos/os/src/drivers/nic/spec/{gem => zynq/hw}/cadence_gem.h | 0 repos/os/src/drivers/nic/spec/{gem => zynq/hw}/main.cc | 0 repos/os/src/drivers/nic/spec/{gem => zynq/hw}/marvell_phy.h | 0 repos/os/src/drivers/nic/spec/{gem => zynq/hw}/phyio.h | 0 .../drivers/nic/spec/{gem => zynq/hw}/rx_buffer_descriptor.h | 0 .../os/src/drivers/nic/spec/{gem => zynq/hw}/system_control.h | 0 repos/os/src/drivers/nic/spec/{gem => zynq/hw}/target.mk | 4 ++-- .../drivers/nic/spec/{gem => zynq/hw}/tx_buffer_descriptor.h | 0 21 files changed, 14 insertions(+), 13 deletions(-) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/buffer_descriptor.h (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/cadence_gem.h (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/main.cc (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/marvell_phy.h (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/phyio.h (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/rx_buffer_descriptor.h (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/system_control.h (100%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/target.mk (61%) rename repos/os/src/drivers/nic/spec/{gem => zynq/hw}/tx_buffer_descriptor.h (100%) diff --git a/repos/base/mk/spec/zynq_qemu.mk b/repos/base/mk/spec/zynq_qemu.mk index 75ee033f84..af7f93796b 100644 --- a/repos/base/mk/spec/zynq_qemu.mk +++ b/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 diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc index 1dc4ce8570..294a931af5 100644 --- a/repos/base/run/platform_drv.inc +++ b/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 } diff --git a/repos/gems/run/mirage_pretty.run b/repos/gems/run/mirage_pretty.run index fe42d86c19..d5bad6036a 100644 --- a/repos/gems/run/mirage_pretty.run +++ b/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 } diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index 17dfe7ecab..e329a03692 100644 --- a/repos/libports/run/fetchurl.inc +++ b/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 } diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 85a0cd6afa..7a1a5d4f03 100644 --- a/repos/libports/run/lwip.run +++ b/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 } diff --git a/repos/libports/run/mirage_net.run b/repos/libports/run/mirage_net.run index 9310801832..82536feabe 100644 --- a/repos/libports/run/mirage_net.run +++ b/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 } diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 0db0a6000a..18aec96f41 100644 --- a/repos/libports/run/nic_bridge.run +++ b/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 } diff --git a/repos/libports/run/nic_bridge_lighttpd.run b/repos/libports/run/nic_bridge_lighttpd.run index 6ff16e3e88..613e3a0796 100644 --- a/repos/libports/run/nic_bridge_lighttpd.run +++ b/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 } diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc index f4d9acdf4d..c9df986adb 100644 --- a/repos/libports/run/qt5_drivers.inc +++ b/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])}] diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run index a0192d75f1..9611ab1a4a 100644 --- a/repos/os/run/nic_router_flood.run +++ b/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 } diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index f0b2c06da0..db152792d7 100644 --- a/repos/os/run/ping.run +++ b/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 } diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index aec9143543..96c58acd76 100644 --- a/repos/os/run/ping_nic_router.run +++ b/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 } diff --git a/repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h b/repos/os/src/drivers/nic/spec/zynq/hw/buffer_descriptor.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/buffer_descriptor.h rename to repos/os/src/drivers/nic/spec/zynq/hw/buffer_descriptor.h diff --git a/repos/os/src/drivers/nic/spec/gem/cadence_gem.h b/repos/os/src/drivers/nic/spec/zynq/hw/cadence_gem.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/cadence_gem.h rename to repos/os/src/drivers/nic/spec/zynq/hw/cadence_gem.h diff --git a/repos/os/src/drivers/nic/spec/gem/main.cc b/repos/os/src/drivers/nic/spec/zynq/hw/main.cc similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/main.cc rename to repos/os/src/drivers/nic/spec/zynq/hw/main.cc diff --git a/repos/os/src/drivers/nic/spec/gem/marvell_phy.h b/repos/os/src/drivers/nic/spec/zynq/hw/marvell_phy.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/marvell_phy.h rename to repos/os/src/drivers/nic/spec/zynq/hw/marvell_phy.h diff --git a/repos/os/src/drivers/nic/spec/gem/phyio.h b/repos/os/src/drivers/nic/spec/zynq/hw/phyio.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/phyio.h rename to repos/os/src/drivers/nic/spec/zynq/hw/phyio.h diff --git a/repos/os/src/drivers/nic/spec/gem/rx_buffer_descriptor.h b/repos/os/src/drivers/nic/spec/zynq/hw/rx_buffer_descriptor.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/rx_buffer_descriptor.h rename to repos/os/src/drivers/nic/spec/zynq/hw/rx_buffer_descriptor.h diff --git a/repos/os/src/drivers/nic/spec/gem/system_control.h b/repos/os/src/drivers/nic/spec/zynq/hw/system_control.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/system_control.h rename to repos/os/src/drivers/nic/spec/zynq/hw/system_control.h diff --git a/repos/os/src/drivers/nic/spec/gem/target.mk b/repos/os/src/drivers/nic/spec/zynq/hw/target.mk similarity index 61% rename from repos/os/src/drivers/nic/spec/gem/target.mk rename to repos/os/src/drivers/nic/spec/zynq/hw/target.mk index 48662aadc7..56556738e6 100644 --- a/repos/os/src/drivers/nic/spec/gem/target.mk +++ b/repos/os/src/drivers/nic/spec/zynq/hw/target.mk @@ -1,5 +1,5 @@ -REQUIRES = cadence_gem -TARGET = nic_drv +REQUIRES = hw +TARGET = zynq_nic_drv SRC_CC = main.cc LIBS = base syscall-hw INC_DIR += $(PRG_DIR) diff --git a/repos/os/src/drivers/nic/spec/gem/tx_buffer_descriptor.h b/repos/os/src/drivers/nic/spec/zynq/hw/tx_buffer_descriptor.h similarity index 100% rename from repos/os/src/drivers/nic/spec/gem/tx_buffer_descriptor.h rename to repos/os/src/drivers/nic/spec/zynq/hw/tx_buffer_descriptor.h