diff --git a/repos/libports/run/nic_dump.run b/repos/libports/run/nic_dump.run index 48dc364145..5918c634de 100644 --- a/repos/libports/run/nic_dump.run +++ b/repos/libports/run/nic_dump.run @@ -44,8 +44,6 @@ append config { - } [gpio_drv_config] { - } [nic_drv_config] { } [platform_drv_config] { @@ -53,6 +51,11 @@ append config { + + + + + @@ -122,7 +125,7 @@ append config { - + diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc index 54805a848e..2213bb0361 100644 --- a/repos/libports/run/nic_router.inc +++ b/repos/libports/run/nic_router.inc @@ -1,67 +1,9 @@ source ${genode_dir}/repos/base/run/platform_drv.inc -proc nic_drv { } { - if {[nic_drv_binary] == "usb_drv"} { return usb_drv } - if {[nic_drv_binary] == ""} { return "" } - return nic_drv -} - -proc gpio_drv { } { - if {[have_spec rpi] && [have_spec hw]} { return hw_gpio_drv } - if {[have_spec rpi] && [have_spec foc]} { return foc_gpio_drv } - if {[have_spec gpio]} { return gpio_drv } -} - -if {[nic_drv] == ""} { - puts "\n Run script is not supported on this platform. \n"; exit 0 } - -proc nic_drv_build { } { - if {[nic_drv] == "nic_drv"} { return drivers/nic } - if {[nic_drv] == "usb_drv"} { return drivers/usb } -} - -proc gpio_drv_build { } { if {[gpio_drv] != ""} { return drivers/gpio } } - set targets "core init drivers/timer server/nic_router server/nic_bridge test/lwip/http_srv_static test/lwip/http_clnt test/lwip/udp - [nic_drv_build] [gpio_drv_build] [platform_drv_build_components]" - -proc gpio_drv_config { } { - if {[have_spec gpio]} { - append result { - - - - } - return $result - } -} - -proc nic_drv_config { } { - if {[nic_drv] == "nic_drv"} { - append result { - - - - - } - return $result - } - if {[nic_drv] == "usb_drv"} { - append result { - - - - - - - - - } - return $result - } -} + server/nic_loopback [platform_drv_build_components]" proc client_bin { prot } { if {$prot == "udp"} { return "test-lwip-udp-client" } @@ -110,13 +52,8 @@ proc server_config { name prot ip_addr gateway netmask nic port } { } set boot_modules " - core init timer nic_router nic_bridge ld.lib.so libc.lib.so libm.lib.so - lwip.lib.so posix.lib.so [client_bin udp] [server_bin udp] - [client_bin http] [server_bin http] [nic_drv_binary] [gpio_drv] - [platform_drv_boot_modules]" + core init timer nic_router nic_bridge nic_loopback ld.lib.so + libc.lib.so lwip.lib.so [client_bin udp] [server_bin udp] + [client_bin http] [server_bin http] [platform_drv_boot_modules]" -proc nic_qemu_args { } { - if {[have_spec x86]} { return "-net nic,model=e1000" } - if {[have_spec lan9118]} { return "-net nic,model=lan9118" } } - -append qemu_args "-nographic -net user [nic_qemu_args]" +append qemu_args "-nographic " diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index 2822af5f14..44cb03a9e2 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -190,8 +190,6 @@ append config { - } [gpio_drv_config] { - } [nic_drv_config] { } [platform_drv_config] { @@ -200,6 +198,11 @@ append config { + + + + + @@ -250,7 +253,7 @@ append config { - +