diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc index 506fd3e9b..038d51b4c 100644 --- a/repos/base/run/platform_drv.inc +++ b/repos/base/run/platform_drv.inc @@ -87,6 +87,18 @@ proc acpi_drv_name { } { return acpi_drv } +## +# Return name of the gpio driver +# +proc gpio_drv { } { + if {[have_spec rpi]} { return rpi_gpio_drv } + if {[have_spec omap4]} { return omap4_gpio_drv } + if {[have_spec imx53]} { return imx53_gpio_drv } + if {[have_spec imx6]} { return imx6_gpio_drv } + if {[have_spec exynos4]} { return exynos4_gpio_drv } + return no_gpio_drv_available +} + proc platform_drv_build_components {} { set drv_build_components "" lappend_if [have_platform_drv] drv_build_components drivers/platform diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 5c2694684..77d42833e 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -75,10 +75,6 @@ append_platform_drv_build_components build $build_components -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 } - return gpio_drv } - create_boot_directory # diff --git a/repos/dde_linux/run/usb_hid_raw.run b/repos/dde_linux/run/usb_hid_raw.run index 71f150975..a42ce3af1 100644 --- a/repos/dde_linux/run/usb_hid_raw.run +++ b/repos/dde_linux/run/usb_hid_raw.run @@ -78,10 +78,6 @@ append_platform_drv_build_components build $build_components -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 } - return gpio_drv } - create_boot_directory # diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run index 71c4e564c..0b8bb7e00 100644 --- a/repos/dde_linux/run/usb_hid_reconnect.run +++ b/repos/dde_linux/run/usb_hid_reconnect.run @@ -36,10 +36,6 @@ append_platform_drv_build_components build $build_components -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 } - return gpio_drv } - create_boot_directory # diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index efda07ef7..476deb089 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -26,10 +26,6 @@ append_platform_drv_build_components build $build_components -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 } - return gpio_drv } - create_boot_directory # diff --git a/repos/dde_linux/run/usb_rndis.run b/repos/dde_linux/run/usb_rndis.run index 64bb8087c..5016261b6 100644 --- a/repos/dde_linux/run/usb_rndis.run +++ b/repos/dde_linux/run/usb_rndis.run @@ -16,10 +16,6 @@ set build_components { lib/vfs/lwip } -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 } - return gpio_drv } - source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components diff --git a/repos/dde_linux/run/usb_storage.run b/repos/dde_linux/run/usb_storage.run index 7f2c5ace8..c6cff2126 100644 --- a/repos/dde_linux/run/usb_storage.run +++ b/repos/dde_linux/run/usb_storage.run @@ -16,10 +16,6 @@ set build_components { lappend_if [have_spec gpio] build_components drivers/gpio -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 } - return gpio_drv } - source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components diff --git a/repos/dde_linux/run/usb_terminal.run b/repos/dde_linux/run/usb_terminal.run index a383e30c0..5eac87b91 100644 --- a/repos/dde_linux/run/usb_terminal.run +++ b/repos/dde_linux/run/usb_terminal.run @@ -11,10 +11,6 @@ if {[have_include power_on/qemu]} { set usb_raw_device $::env(USB_RAW_DEVICE) } -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 } - return gpio_drv } - # # Build # diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run index d52c725ef..d04135bce 100644 --- a/repos/gems/run/cpu_load_display.run +++ b/repos/gems/run/cpu_load_display.run @@ -17,10 +17,6 @@ set build_components { app/pointer } -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 } - return gpio_drv } - source ${genode_dir}/repos/base/run/platform_drv.inc lappend_if [need_usb_hid] build_components drivers/usb diff --git a/repos/gems/run/mirage_pretty.run b/repos/gems/run/mirage_pretty.run index d5bad6036..25e6900c3 100644 --- a/repos/gems/run/mirage_pretty.run +++ b/repos/gems/run/mirage_pretty.run @@ -42,10 +42,6 @@ append_platform_drv_build_components lappend_if [expr {[nic_drv_binary] == "nic_drv"}] build_components drivers/nic lappend_if [expr {[nic_drv_binary] == "usb_drv"}] build_components drivers/usb -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 } - return gpio_drv } - lappend_if [have_spec gpio] build_components drivers/gpio build $build_components diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index e329a0369..4c3322a52 100644 --- a/repos/libports/run/fetchurl.inc +++ b/repos/libports/run/fetchurl.inc @@ -17,10 +17,6 @@ set build_components { server/report_rom } -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 } - return gpio_drv } - lappend_if [have_spec gpio] build_components drivers/gpio source ${genode_dir}/repos/base/run/platform_drv.inc diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 1f870455e..8eb52120b 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -43,10 +43,6 @@ set build_components { lappend_if $use_usb_driver build_components drivers/usb lappend_if [have_spec gpio] build_components drivers/gpio -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 } - return gpio_drv } - source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components diff --git a/repos/libports/run/mirage_net.run b/repos/libports/run/mirage_net.run index 82536feab..3bdf85579 100644 --- a/repos/libports/run/mirage_net.run +++ b/repos/libports/run/mirage_net.run @@ -37,10 +37,6 @@ append_platform_drv_build_components lappend_if [expr {[nic_drv_binary] == "nic_drv"}] build_components drivers/nic lappend_if [expr {[nic_drv_binary] == "usb_drv"}] build_components drivers/usb -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 } - return gpio_drv } - lappend_if [have_spec gpio] build_components drivers/gpio build $build_components diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc index c9df986ad..9c48763aa 100644 --- a/repos/libports/run/qt5_drivers.inc +++ b/repos/libports/run/qt5_drivers.inc @@ -108,10 +108,6 @@ proc drivers_build_components { feature_arg } { return $build_components } -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 } - return gpio_drv } - # # Configuration # diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 46dc3733c..de28fdee1 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -31,10 +31,6 @@ set build_components { test/smartcard } -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 } - return gpio_drv } - lappend_if [have_spec gpio] build_components drivers/gpio source ${genode_dir}/repos/base/run/platform_drv.inc diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index 22cabd1b8..4de8a649a 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -20,10 +20,6 @@ set build_components { server/report_rom server/rom_filter } -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 } - return gpio_drv } - source ${genode_dir}/repos/base/run/platform_drv.inc lappend_if [need_usb_hid] build_components drivers/usb diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index 3b6052e3b..71266151c 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -27,10 +27,6 @@ create_boot_directory # Generate config # -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 } - return gpio_drv } - append config { diff --git a/repos/os/run/gpio_drv.run b/repos/os/run/gpio_drv.run index 2348c3c0d..d94ba3ae4 100644 --- a/repos/os/run/gpio_drv.run +++ b/repos/os/run/gpio_drv.run @@ -12,10 +12,6 @@ set build_components { test/gpio_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 } - return gpio_drv } - build $build_components create_boot_directory diff --git a/repos/os/run/gpio_led.run b/repos/os/run/gpio_led.run index a6d6d9a51..05a771a78 100644 --- a/repos/os/run/gpio_led.run +++ b/repos/os/run/gpio_led.run @@ -12,10 +12,6 @@ set build_components { test/gpio_led } -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 } - return gpio_drv } - build $build_components create_boot_directory diff --git a/repos/os/run/gpio_signal.run b/repos/os/run/gpio_signal.run index e5861fe44..d13b13b0b 100644 --- a/repos/os/run/gpio_signal.run +++ b/repos/os/run/gpio_signal.run @@ -12,10 +12,6 @@ set build_components { test/gpio_signal } -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 } - return gpio_drv } - build $build_components create_boot_directory diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run index 9611ab1a4..e0cb29ea9 100644 --- a/repos/os/run/nic_router_flood.run +++ b/repos/os/run/nic_router_flood.run @@ -25,10 +25,6 @@ set build_components { server/dynamic_rom } -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 } - return gpio_drv } - lappend_if [have_spec gpio] build_components drivers/gpio source ${genode_dir}/repos/base/run/platform_drv.inc diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index db152792d..44543af09 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -11,11 +11,6 @@ set build_components { app/ping } -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 } - return gpio_drv } - - lappend_if [have_spec gpio] build_components drivers/gpio if {[have_spec foc] || [have_spec odroid_xu] || [have_spec linux] || diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index 96c58acd7..3f0885445 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -12,11 +12,6 @@ set build_components { app/ping } -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 } - return gpio_drv } - - lappend_if [have_spec gpio] build_components drivers/gpio if {[have_spec foc] || [have_spec odroid_xu] || [have_spec linux] || diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 27ec8faf1..7bdb83f1b 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -137,7 +137,7 @@ set config { } append_if $trusted_led config { - + @@ -258,7 +258,7 @@ if { $mmc_rootfs } { } cd .. -lappend_if $trusted_led boot_modules gpio_drv +lappend_if $trusted_led boot_modules imx53_gpio_drv build_boot_image [join $boot_modules " "] diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index 14eb7d069..350408f08 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -13,10 +13,6 @@ set build_components { test/block/bench } -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 } - return gpio_drv } - lappend_if [have_spec gpio] build_components drivers/gpio source ${genode_dir}/repos/base/run/platform_drv.inc diff --git a/repos/os/src/drivers/gpio/spec/exynos4/target.mk b/repos/os/src/drivers/gpio/spec/exynos4/target.mk index 9295565cc..c368f3430 100644 --- a/repos/os/src/drivers/gpio/spec/exynos4/target.mk +++ b/repos/os/src/drivers/gpio/spec/exynos4/target.mk @@ -1,5 +1,5 @@ -TARGET = gpio_drv -REQUIRES = exynos4 +TARGET = exynos4_gpio_drv +REQUIRES = arm_v7 SRC_CC = main.cc LIBS = base INC_DIR += $(PRG_DIR) diff --git a/repos/os/src/drivers/gpio/spec/imx53/target.mk b/repos/os/src/drivers/gpio/spec/imx53/target.mk index 54b51e63f..b06311ea9 100644 --- a/repos/os/src/drivers/gpio/spec/imx53/target.mk +++ b/repos/os/src/drivers/gpio/spec/imx53/target.mk @@ -1,5 +1,5 @@ -TARGET = gpio_drv -REQUIRES = imx53 +TARGET = imx53_gpio_drv +REQUIRES = arm_v7 SRC_CC = main.cc LIBS = base INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/gpio/spec/imx diff --git a/repos/os/src/drivers/gpio/spec/imx6/target.mk b/repos/os/src/drivers/gpio/spec/imx6/target.mk index b8c830ac1..8e2a24232 100644 --- a/repos/os/src/drivers/gpio/spec/imx6/target.mk +++ b/repos/os/src/drivers/gpio/spec/imx6/target.mk @@ -1,5 +1,5 @@ -TARGET = gpio_drv -REQUIRES = imx6 +TARGET = imx6_gpio_drv +REQUIRES = arm_v7 SRC_CC = main.cc LIBS = base INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/gpio/spec/imx diff --git a/repos/os/src/drivers/gpio/spec/omap4/target.mk b/repos/os/src/drivers/gpio/spec/omap4/target.mk index 7261be576..2a253dddb 100644 --- a/repos/os/src/drivers/gpio/spec/omap4/target.mk +++ b/repos/os/src/drivers/gpio/spec/omap4/target.mk @@ -1,5 +1,5 @@ -TARGET = gpio_drv -REQUIRES = omap4 +TARGET = omap4_gpio_drv +REQUIRES = arm_v7 SRC_CC = main.cc LIBS = base INC_DIR += $(PRG_DIR) diff --git a/repos/os/src/drivers/gpio/spec/rpi/driver.h b/repos/os/src/drivers/gpio/spec/rpi/driver.h index 6a61008b1..d3e2a06a7 100644 --- a/repos/os/src/drivers/gpio/spec/rpi/driver.h +++ b/repos/os/src/drivers/gpio/spec/rpi/driver.h @@ -24,7 +24,6 @@ #include /* local includes */ -#include #include static int verbose = 1; @@ -35,7 +34,10 @@ class Gpio::Rpi_driver : public Driver { private: - enum { MAX_PINS = 54 }; + enum { + IRQ = 49, + MAX_PINS = 54, + }; Reg _reg; Genode::Irq_connection _irq; @@ -52,10 +54,10 @@ class Gpio::Rpi_driver : public Driver }); } - Rpi_driver(Genode::Env &env) + Rpi_driver(Genode::Env &env, unsigned irq_offset) : _reg(env, Rpi::GPIO_CONTROLLER_BASE, 0, Rpi::GPIO_CONTROLLER_SIZE), - _irq(env, IRQ), + _irq(env, IRQ + irq_offset), _dispatcher(env.ep(), *this, &Rpi_driver::_handle), _async(false) { diff --git a/repos/os/src/drivers/gpio/spec/rpi/foc/irq.h b/repos/os/src/drivers/gpio/spec/rpi/foc/irq.h deleted file mode 100644 index 9a2774a6d..000000000 --- a/repos/os/src/drivers/gpio/spec/rpi/foc/irq.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * \brief GPIO interrupt number - * \author Reinier Millo Sánchez - * \date 2015-07-27 - */ - -/* - * Copyright (C) 2015-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#ifndef _DRIVERS__GPIO__SPEC__RPI__SPEC__FOC__IRQ_H_ -#define _DRIVERS__GPIO__SPEC__RPI__SPEC__FOC__IRQ_H_ - -namespace Gpio { enum { IRQ = 49 }; } - -#endif /* _DRIVERS__GPIO__SPEC__RPI__SPEC__FOC__IRQ_H_ */ diff --git a/repos/os/src/drivers/gpio/spec/rpi/foc/target.mk b/repos/os/src/drivers/gpio/spec/rpi/foc/target.mk deleted file mode 100644 index e49f9ef18..000000000 --- a/repos/os/src/drivers/gpio/spec/rpi/foc/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = foc_gpio_drv -REQUIRES = rpi -SRC_CC += main.cc -LIBS = base -INC_DIR += $(PRG_DIR) $(PRG_DIR)/.. - -vpath main.cc $(PRG_DIR)/.. diff --git a/repos/os/src/drivers/gpio/spec/rpi/hw/irq.h b/repos/os/src/drivers/gpio/spec/rpi/hw/irq.h deleted file mode 100644 index 8d05ce43b..000000000 --- a/repos/os/src/drivers/gpio/spec/rpi/hw/irq.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * \brief GPIO interrupt number - * \author Reinier Millo Sánchez - * \date 2015-07-27 - */ - -/* - * Copyright (C) 2015-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#ifndef _DRIVERS__GPIO__SPEC__RPI__SPEC__HW__IRQ_H_ -#define _DRIVERS__GPIO__SPEC__RPI__SPEC__HW__IRQ_H_ - -/* Genode includes */ -#include - -namespace Gpio -{ - enum { IRQ = Rpi::GPU_IRQ_BASE + 49 }; -} - -#endif /* _DRIVERS__GPIO__SPEC__RPI__SPEC__HW__IRQ_H_ */ diff --git a/repos/os/src/drivers/gpio/spec/rpi/hw/target.mk b/repos/os/src/drivers/gpio/spec/rpi/hw/target.mk deleted file mode 100644 index 7aa018f88..000000000 --- a/repos/os/src/drivers/gpio/spec/rpi/hw/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = hw_gpio_drv -REQUIRES = rpi -SRC_CC += main.cc -LIBS = base -INC_DIR += $(PRG_DIR) $(PRG_DIR)/.. - -vpath main.cc $(PRG_DIR)/.. diff --git a/repos/os/src/drivers/gpio/spec/rpi/main.cc b/repos/os/src/drivers/gpio/spec/rpi/main.cc index 82088c654..56e7df36f 100644 --- a/repos/os/src/drivers/gpio/spec/rpi/main.cc +++ b/repos/os/src/drivers/gpio/spec/rpi/main.cc @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -27,7 +28,14 @@ Gpio::Rpi_driver& Gpio::Rpi_driver::factory(Genode::Env &env) { - static Rpi_driver driver(env); + unsigned irq_offset = 0; + static Genode::Attached_rom_dataspace rom { env, "platform_info" }; + try { + String<32> kernel_name = + rom.xml().sub_node("kernel").attribute_value("name", String<32>()); + if (kernel_name == "hw") irq_offset += Rpi::GPU_IRQ_BASE; + } catch (...) { } + static Rpi_driver driver(env, irq_offset); return driver; } diff --git a/repos/os/src/drivers/gpio/spec/rpi/target.mk b/repos/os/src/drivers/gpio/spec/rpi/target.mk new file mode 100644 index 000000000..7b8a36753 --- /dev/null +++ b/repos/os/src/drivers/gpio/spec/rpi/target.mk @@ -0,0 +1,7 @@ +TARGET = rpi_gpio_drv +REQUIRES = arm_v6 +SRC_CC += main.cc +LIBS = base +INC_DIR += $(PRG_DIR) + +vpath main.cc $(PRG_DIR) diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index a58bd535f..f0bb52d3d 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -30,10 +30,6 @@ lappend_if $use_usb_driver build_components drivers/usb lappend_if $use_nic_driver build_components drivers/nic lappend_if [have_spec gpio] build_components drivers/gpio -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 } - return gpio_drv } - source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index a809c6b34..655e07e71 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -5,10 +5,6 @@ # \date 2013-04-18 # -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 } - return gpio_drv } - if {[expr $use_nic_bridge && $use_nic_router]} { puts "Cannot test with both NIC bridge and NIC router."; exit 0