From c78efd44281d00fca1c95948361fcc1a67e056f1 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Tue, 24 Feb 2015 14:53:15 +0100 Subject: [PATCH] odroid_xu: prevent tests with sd/platform/ahci/fb Drivers like SD-Card, platform, AHCI, and framebuffer are specified as Exynos5 compliant. But they are at least not compliant with Odroid-XU although this is Exynos5. Thus, prevent tests that rely on such drivers when building for hw_odoid_xu. Furthermore, make previous Arndale regulator/consts.h, uart_defs.h, and some Board_base enums available to all Exynos5 builds to enable at least building the drivers. Fixes #1419 --- .../platform/arndale/drivers/board_base.h | 9 ----- .../include/platform_exynos5/board_base.h | 9 +++++ repos/base/mk/spec-platform_arndale.mk | 1 + repos/base/mk/spec-platform_odroid_xu.mk | 1 + repos/base/run/affinity.run | 16 +++++--- repos/gems/run/decorator_stress.run | 37 +++++++++++-------- repos/gems/run/http_blk.run | 7 +++- repos/gems/run/wm.run | 35 ++++++++++-------- repos/libports/run/libc_block.run | 4 +- repos/libports/run/libc_ffat_fs.run | 4 +- repos/libports/run/libc_filesystem_test.inc | 7 +++- repos/libports/run/lwip.run | 4 +- repos/libports/run/network_test.inc | 27 ++++++++------ repos/libports/run/qt5_textedit.run | 7 +++- repos/libports/run/test-ping_client.run | 21 +++++++---- repos/libports/run/test-ping_server.run | 21 +++++++---- .../{arndale => exynos5}/regulator/consts.h | 8 ++-- .../platform/{arndale => exynos5}/uart_defs.h | 8 ++-- repos/os/run/ahci.run | 22 +++++------ repos/os/run/ahci_bench.run | 4 +- repos/os/run/demo.run | 37 +++++++++++-------- repos/os/run/framebuffer.run | 23 +++++++----- repos/os/run/network_test_nic.inc | 30 +++++++-------- repos/ports-foc/run/l4linux.run | 2 +- repos/ports-foc/run/l4linux_ahci_bench.run | 2 +- repos/ports/run/genode_org.run | 7 +++- repos/ports/run/netperf.inc | 7 +++- repos/ports/run/noux_net_netcat.run | 4 +- repos/qt4/run/textedit.run | 9 ++++- 29 files changed, 221 insertions(+), 152 deletions(-) rename repos/os/include/platform/{arndale => exynos5}/regulator/consts.h (89%) rename repos/os/include/platform/{arndale => exynos5}/uart_defs.h (80%) diff --git a/repos/base/include/platform/arndale/drivers/board_base.h b/repos/base/include/platform/arndale/drivers/board_base.h index 85ebb206a..415649dcd 100644 --- a/repos/base/include/platform/arndale/drivers/board_base.h +++ b/repos/base/include/platform/arndale/drivers/board_base.h @@ -38,15 +38,6 @@ namespace Genode USB_HOST20_IRQ = 103, USB_DRD30_IRQ = 104, - /* SATA/AHCI */ - SATA_IRQ = 147, - - /* I2C */ - I2C_HDMI_IRQ = 96, - - /* SD card */ - SDMMC0_IRQ = 107, - /* UART */ UART_2_CLOCK = 100000000, diff --git a/repos/base/include/platform_exynos5/board_base.h b/repos/base/include/platform_exynos5/board_base.h index 8564c3871..595c281a8 100644 --- a/repos/base/include/platform_exynos5/board_base.h +++ b/repos/base/include/platform_exynos5/board_base.h @@ -71,6 +71,15 @@ class Genode::Exynos5 /* hardware name of the primary processor */ PRIMARY_MPIDR_AFF_0 = 0, + + /* SATA/AHCI */ + SATA_IRQ = 147, + + /* SD card */ + SDMMC0_IRQ = 107, + + /* I2C */ + I2C_HDMI_IRQ = 96, }; }; diff --git a/repos/base/mk/spec-platform_arndale.mk b/repos/base/mk/spec-platform_arndale.mk index 93fbf5b1a..f1dbf44f5 100644 --- a/repos/base/mk/spec-platform_arndale.mk +++ b/repos/base/mk/spec-platform_arndale.mk @@ -9,6 +9,7 @@ SPECS += exynos5 cortex_a15 framebuffer usb # add repository relative paths REP_INC_DIR += include/platform/arndale +REP_INC_DIR += include/platform/exynos5 # include implied specs include $(call select_from_repositories,mk/spec-cortex_a15.mk) diff --git a/repos/base/mk/spec-platform_odroid_xu.mk b/repos/base/mk/spec-platform_odroid_xu.mk index a96c173d5..1bdf384fe 100644 --- a/repos/base/mk/spec-platform_odroid_xu.mk +++ b/repos/base/mk/spec-platform_odroid_xu.mk @@ -9,6 +9,7 @@ SPECS += exynos5 cortex_a15 # add repository relative paths REP_INC_DIR += include/platform/odroid_xu +REP_INC_DIR += include/platform/exynos5 # include implied specs include $(call select_from_repositories,mk/spec-cortex_a15.mk) diff --git a/repos/base/run/affinity.run b/repos/base/run/affinity.run index d95d6d8b1..dd949a220 100644 --- a/repos/base/run/affinity.run +++ b/repos/base/run/affinity.run @@ -5,8 +5,14 @@ # if { - ![have_spec hw_arndale] && - ([have_spec platform_pbxa9] || (![have_spec nova] && ![have_spec foc])) + ![have_spec hw_arndale] && + ![have_spec foc_x86_32] && + ![have_spec foc_x86_64] && + ![have_spec foc_imx53] && + ![have_spec foc_vea9x4] && + ![have_spec foc_panda] && + ![have_spec foc_arndale] && + ![have_spec nova] } { puts "Platform is unsupported." exit 0 @@ -15,7 +21,7 @@ if { set build_components { core init test/affinity } -lappend_if [have_spec exynos5] build_components drivers/platform +lappend_if [have_spec platform_arndale] build_components drivers/platform build $build_components @@ -37,7 +43,7 @@ set config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { @@ -53,7 +59,7 @@ install_config $config set boot_modules { core init test-affinity } -lappend_if [have_spec exynos5] boot_modules platform_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv build_boot_image $boot_modules diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run index 2998690b2..cfc6e49e2 100644 --- a/repos/gems/run/decorator_stress.run +++ b/repos/gems/run/decorator_stress.run @@ -2,6 +2,11 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components { core init drivers/timer @@ -11,11 +16,11 @@ set build_components { drivers/framebuffer drivers/pci drivers/input } -lappend_if [have_spec usb] build_components drivers/usb -lappend_if [have_spec gpio] build_components drivers/gpio -lappend_if [have_spec imx53] build_components drivers/platform -lappend_if [have_spec exynos5] build_components drivers/platform -lappend_if [have_spec platform_rpi] build_components drivers/platform +lappend_if [have_spec usb] build_components drivers/usb +lappend_if [have_spec gpio] build_components drivers/gpio +lappend_if [have_spec imx53] build_components drivers/platform +lappend_if [have_spec platform_arndale] build_components drivers/platform +lappend_if [have_spec platform_rpi] build_components drivers/platform build $build_components @@ -72,7 +77,7 @@ append_if [have_spec gpio] config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { @@ -175,16 +180,16 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec usb] boot_modules usb_drv -lappend_if [have_spec gpio] boot_modules gpio_drv -lappend_if [have_spec imx53] boot_modules platform_drv -lappend_if [have_spec exynos5] boot_modules platform_drv -lappend_if [have_spec platform_rpi] boot_modules platform_drv -lappend_if [have_spec imx53] boot_modules input_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec gpio] boot_modules gpio_drv +lappend_if [have_spec imx53] boot_modules platform_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv +lappend_if [have_spec platform_rpi] boot_modules platform_drv +lappend_if [have_spec imx53] boot_modules input_drv build_boot_image $boot_modules diff --git a/repos/gems/run/http_blk.run b/repos/gems/run/http_blk.run index 74cab207d..144c5d347 100644 --- a/repos/gems/run/http_blk.run +++ b/repos/gems/run/http_blk.run @@ -4,7 +4,12 @@ # \date 2013-11-29 # -set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5] || [have_spec platform_rpi]] +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] set use_nic_driver [expr !$use_usb_driver && ![have_spec platform_imx53]] set use_platform_driver [expr [have_spec platform_arndale] || [have_spec platform_imx53] || [have_spec platform_rpi]] diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index a9347a6bf..25e43df0b 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -2,6 +2,9 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script not supported on this platform."; exit 0 } + set build_components { core init drivers/timer @@ -14,11 +17,11 @@ set build_components { server/nit_fb } -lappend_if [have_spec usb] build_components drivers/usb -lappend_if [have_spec gpio] build_components drivers/gpio -lappend_if [have_spec imx53] build_components drivers/platform -lappend_if [have_spec exynos5] build_components drivers/platform -lappend_if [have_spec platform_rpi] build_components drivers/platform +lappend_if [have_spec usb] build_components drivers/usb +lappend_if [have_spec gpio] build_components drivers/gpio +lappend_if [have_spec imx53] build_components drivers/platform +lappend_if [have_spec platform_arndale] build_components drivers/platform +lappend_if [have_spec platform_rpi] build_components drivers/platform build $build_components @@ -75,7 +78,7 @@ append_if [have_spec gpio] config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { @@ -238,16 +241,16 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec usb] boot_modules usb_drv -lappend_if [have_spec gpio] boot_modules gpio_drv -lappend_if [have_spec imx53] boot_modules platform_drv -lappend_if [have_spec exynos5] boot_modules platform_drv -lappend_if [have_spec platform_rpi] boot_modules platform_drv -lappend_if [have_spec imx53] boot_modules input_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec gpio] boot_modules gpio_drv +lappend_if [have_spec imx53] boot_modules platform_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv +lappend_if [have_spec platform_rpi] boot_modules platform_drv +lappend_if [have_spec imx53] boot_modules input_drv build_boot_image $boot_modules diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index a47061825..b7e860170 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -1,7 +1,7 @@ -set use_sd_card_drv [expr [have_spec omap4] || [have_spec exynos5] || [have_spec pl180]] +set use_sd_card_drv [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec pl180]] set use_atapi_drv [have_spec x86] -if {[have_spec linux]} { +if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { puts "Run script does not support this platform"; exit } if {[expr [have_spec 64bit] && $use_atapi_drv]} { diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run index ef5cea7e5..fd31f7019 100644 --- a/repos/libports/run/libc_ffat_fs.run +++ b/repos/libports/run/libc_ffat_fs.run @@ -4,13 +4,13 @@ # \date 2012-07-03 # -set use_sd_card_drv [expr [have_spec omap4] || [have_spec exynos5] || [have_spec pl180]] +set use_sd_card_drv [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec pl180]] set use_atapi_drv [have_spec x86] if {[catch { exec which mkfs.vfat } ]} { puts stderr "Error: mkfs.vfat not installed, aborting test"; exit } -if {[have_spec linux]} { +if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { puts "Run script does not support this platform"; exit } # diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index 9e26026ea..e9e1ede5b 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -4,8 +4,13 @@ # \date 2011-05-27 # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + # use SD on ARM -set use_sd_card_drv [expr [have_spec omap4] || [have_spec exynos5] || [have_spec pl180]] +set use_sd_card_drv [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec pl180]] # use ATAPI on x86 (deprecated) #set use_atapi_drv [have_spec x86] diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 103a991f5..b54818612 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -19,8 +19,8 @@ # TODO: Add support for Linux via user-level networking (using the # tun/tap proxy driver at os/src/drivers/nic/linux) # -set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5] || [have_spec platform_rpi]] -set use_nic_driver [expr !$use_usb_driver && ![have_spec platform_imx53] && ![have_spec linux]] +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] +set use_nic_driver [expr !$use_usb_driver && ![have_spec platform_imx53] && ![have_spec hw_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 } diff --git a/repos/libports/run/network_test.inc b/repos/libports/run/network_test.inc index 568d15b90..06f64f29d 100644 --- a/repos/libports/run/network_test.inc +++ b/repos/libports/run/network_test.inc @@ -10,6 +10,11 @@ set packet_payload_size 10 set packet_count 1000000 +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + # # Build # @@ -22,8 +27,8 @@ set build_components { lappend_if $use_nic_bridge build_components server/nic_bridge -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/platform -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] build_components drivers/platform +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] build_components drivers/usb lappend_if [have_spec acpi] build_components drivers/acpi lappend_if [have_spec pci] build_components drivers/pci/device_pd lappend_if [have_spec pci] build_components drivers/pci @@ -65,9 +70,9 @@ append_if $use_nic_bridge config { } -append_if [expr $use_nic_bridge && ([have_spec omap4] || [have_spec exynos5])] config { +append_if [expr $use_nic_bridge && ([have_spec omap4] || [have_spec platform_arndale])] config { } -append_if [expr $use_nic_bridge && (![have_spec omap4] && ![have_spec exynos5])] config { +append_if [expr $use_nic_bridge && (![have_spec omap4] && ![have_spec platform_arndale])] config { } append_if $use_nic_bridge config { @@ -93,13 +98,13 @@ append config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { } -append_if [expr [have_spec omap4] || [have_spec exynos5]] config { +append_if [expr [have_spec omap4] || [have_spec platform_arndale]] config { @@ -111,7 +116,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config { } -append_if [expr ![have_spec omap4] && ![have_spec exynos5]] config { +append_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] config { @@ -160,10 +165,10 @@ lappend boot_modules $test_server_name # platform-specific modules lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec acpi] boot_modules acpi_drv -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv -lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] boot_modules usb_drv +lappend_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] boot_modules nic_drv lappend_if [have_spec nova] boot_modules pci_device_pd -lappend_if [have_spec exynos5] boot_modules platform_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv build_boot_image $boot_modules @@ -226,7 +231,7 @@ set test_result "$milliseconds ms. payload ($target_packet_size Byte): $payload_ puts "\nTest succeeded in $test_result." # disconnect from server system -if {[expr [have_spec omap4] || [have_spec exynos5]]} { +if {[expr [have_spec omap4] || [have_spec platform_arndale]]} { send -i $server_spawn_id "\x01\x18" ;# Ctrl-A Ctrl-X } diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index dc40837fd..1b6bc6e7f 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -4,13 +4,18 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components [qt5_build_components feature] append build_components { app/qt5/examples/textedit } -set use_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]] +set use_sd_card_driver [expr [have_spec omap4] || [have_spec platform_arndale]] lappend_if $use_sd_card_driver build_components drivers/sd_card lappend_if [have_spec pci] build_components drivers/atapi diff --git a/repos/libports/run/test-ping_client.run b/repos/libports/run/test-ping_client.run index 69fc7a4db..1ea1ebb99 100644 --- a/repos/libports/run/test-ping_client.run +++ b/repos/libports/run/test-ping_client.run @@ -8,13 +8,18 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components { core init drivers/pci drivers/timer drivers/nic test/lwip/pingpong/client } -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] build_components drivers/usb lappend_if [have_spec platform_arndale] build_components drivers/platform lappend_if [have_spec gpio] build_components drivers/gpio @@ -62,7 +67,7 @@ append_if [have_spec gpio] config { } -append_if [expr [have_spec omap4] || [have_spec exynos5]] config { +append_if [expr [have_spec omap4] || [have_spec platform_arndale]] config { @@ -73,7 +78,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config { } -append_if [expr ![have_spec omap4] && ![have_spec exynos5]] config { +append_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] config { @@ -138,11 +143,11 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv -lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv -lappend_if [have_spec platform_arndale] boot_modules platform_drv -lappend_if [have_spec gpio] boot_modules gpio_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] boot_modules usb_drv +lappend_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] boot_modules nic_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv +lappend_if [have_spec gpio] boot_modules gpio_drv build_boot_image $boot_modules diff --git a/repos/libports/run/test-ping_server.run b/repos/libports/run/test-ping_server.run index a5c4235e7..5962820b8 100644 --- a/repos/libports/run/test-ping_server.run +++ b/repos/libports/run/test-ping_server.run @@ -8,13 +8,18 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components { core init drivers/pci drivers/timer drivers/nic test/lwip/pingpong/server } -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] build_components drivers/usb lappend_if [have_spec platform_arndale] build_components drivers/platform lappend_if [have_spec gpio] build_components drivers/gpio @@ -71,7 +76,7 @@ append_if [have_spec gpio] config { } -append_if [expr [have_spec omap4] || [have_spec exynos5]] config { +append_if [expr [have_spec omap4] || [have_spec platform_arndale]] config { @@ -82,7 +87,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config { } -append_if [expr ![have_spec omap4] && ![have_spec exynos5]] config { +append_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] config { @@ -112,11 +117,11 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv -lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv -lappend_if [have_spec platform_arndale] boot_modules platform_drv -lappend_if [have_spec gpio] boot_modules gpio_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] boot_modules usb_drv +lappend_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] boot_modules nic_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv +lappend_if [have_spec gpio] boot_modules gpio_drv build_boot_image $boot_modules diff --git a/repos/os/include/platform/arndale/regulator/consts.h b/repos/os/include/platform/exynos5/regulator/consts.h similarity index 89% rename from repos/os/include/platform/arndale/regulator/consts.h rename to repos/os/include/platform/exynos5/regulator/consts.h index 26231e327..afe0f5782 100644 --- a/repos/os/include/platform/arndale/regulator/consts.h +++ b/repos/os/include/platform/exynos5/regulator/consts.h @@ -1,5 +1,5 @@ /* - * \brief Regulator definitions for Arndale + * \brief Regulator definitions for Exynos5 * \author Stefan Kalkowski * \date 2013-06-13 */ @@ -11,8 +11,8 @@ * under the terms of the GNU General Public License version 2. */ -#ifndef _INCLUDE__PLATFORM__ARNDALE__REGULATOR__CONSTS_H_ -#define _INCLUDE__PLATFORM__ARNDALE__REGULATOR__CONSTS_H_ +#ifndef _INCLUDE__PLATFORM__EXYNOS5__REGULATOR__CONSTS_H_ +#define _INCLUDE__PLATFORM__EXYNOS5__REGULATOR__CONSTS_H_ #include @@ -83,4 +83,4 @@ namespace Regulator { }; } -#endif /* _INCLUDE__PLATFORM__ARNDALE__REGULATOR__CONSTS_H_ */ +#endif /* _INCLUDE__PLATFORM__EXYNOS5__REGULATOR__CONSTS_H_ */ diff --git a/repos/os/include/platform/arndale/uart_defs.h b/repos/os/include/platform/exynos5/uart_defs.h similarity index 80% rename from repos/os/include/platform/arndale/uart_defs.h rename to repos/os/include/platform/exynos5/uart_defs.h index 61eac15e4..4c50c65b9 100644 --- a/repos/os/include/platform/arndale/uart_defs.h +++ b/repos/os/include/platform/exynos5/uart_defs.h @@ -11,10 +11,10 @@ * under the terms of the GNU General Public License version 2. */ -#ifndef _INCLUDE__PLATFORM__ARNDALE__UART_DEFS_H_ -#define _INCLUDE__PLATFORM__ARNDALE__UART_DEFS_H_ +#ifndef _INCLUDE__PLATFORM__EXYNOS5__UART_DEFS_H_ +#define _INCLUDE__PLATFORM__EXYNOS5__UART_DEFS_H_ -#include +#include enum { /** Number of UARTs */ @@ -34,4 +34,4 @@ static struct Exynos_uart_cfg { { Genode::Board_base::UART_2_MMIO_BASE, 4096, Genode::Board_base::UART_2_IRQ }, }; -#endif /* _INCLUDE__PLATFORM__ARNDALE__UART_DEFS_H_ */ +#endif /* _INCLUDE__PLATFORM__EXYNOS5__UART_DEFS_H_ */ diff --git a/repos/os/run/ahci.run b/repos/os/run/ahci.run index 97caf2829..c30925e6c 100644 --- a/repos/os/run/ahci.run +++ b/repos/os/run/ahci.run @@ -1,5 +1,5 @@ -if {![have_spec x86] && ![have_spec exynos5]} { - puts "\nThe AHCI driver supports x86 architecture and exynos5 only\n" +if {![have_spec x86] && ![have_spec platform_arndale]} { + puts "\nThe AHCI driver supports x86 architecture and Arndale only\n" exit 0 } @@ -9,10 +9,10 @@ if {![have_spec x86] && ![have_spec exynos5]} { set build_components { core init drivers/timer drivers/ahci test/blk/cli } -lappend_if [have_spec acpi] build_components drivers/acpi -lappend_if [have_spec pci] build_components drivers/pci -lappend_if [have_spec pci] build_components drivers/pci/device_pd -lappend_if [have_spec exynos5] build_components drivers/platform +lappend_if [have_spec acpi] build_components drivers/acpi +lappend_if [have_spec pci] build_components drivers/pci +lappend_if [have_spec pci] build_components drivers/pci/device_pd +lappend_if [have_spec platform_arndale] build_components drivers/platform build $build_components @@ -41,7 +41,7 @@ set config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { @@ -110,10 +110,10 @@ install_config $config set boot_modules { core init timer ahci test-blk-cli } -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec acpi] boot_modules acpi_drv -lappend_if [have_spec nova] boot_modules pci_device_pd -lappend_if [have_spec exynos5] boot_modules platform_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec acpi] boot_modules acpi_drv +lappend_if [have_spec nova] boot_modules pci_device_pd +lappend_if [have_spec platform_arndale] boot_modules platform_drv build_boot_image $boot_modules diff --git a/repos/os/run/ahci_bench.run b/repos/os/run/ahci_bench.run index 378809db6..cc67e7ba8 100644 --- a/repos/os/run/ahci_bench.run +++ b/repos/os/run/ahci_bench.run @@ -9,8 +9,8 @@ set layer 0 # driver-internal benchmark is special -if {[expr ($layer == 0)] && ![have_spec exynos5]} { - puts "Driver-internal benchmark (layer 0) only supported on exynos5." +if {[expr ($layer == 0)] && ![have_spec platform_arndale]} { + puts "Driver-internal benchmark (layer 0) only supported on Arndale." exit 0 } diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index 007cbebcb..1301601f2 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -2,6 +2,11 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components { core init drivers/timer @@ -12,11 +17,11 @@ set build_components { server/report_rom } -lappend_if [have_spec usb] build_components drivers/usb -lappend_if [have_spec gpio] build_components drivers/gpio -lappend_if [have_spec imx53] build_components drivers/platform -lappend_if [have_spec exynos5] build_components drivers/platform -lappend_if [have_spec platform_rpi] build_components drivers/platform +lappend_if [have_spec usb] build_components drivers/usb +lappend_if [have_spec gpio] build_components drivers/gpio +lappend_if [have_spec imx53] build_components drivers/platform +lappend_if [have_spec platform_arndale] build_components drivers/platform +lappend_if [have_spec platform_rpi] build_components drivers/platform build $build_components @@ -73,7 +78,7 @@ append_if [have_spec gpio] config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { @@ -202,16 +207,16 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec usb] boot_modules usb_drv -lappend_if [have_spec gpio] boot_modules gpio_drv -lappend_if [have_spec imx53] boot_modules platform_drv -lappend_if [have_spec exynos5] boot_modules platform_drv -lappend_if [have_spec platform_rpi] boot_modules platform_drv -lappend_if [have_spec imx53] boot_modules input_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec usb] boot_modules usb_drv +lappend_if [have_spec gpio] boot_modules gpio_drv +lappend_if [have_spec imx53] boot_modules platform_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv +lappend_if [have_spec platform_rpi] boot_modules platform_drv +lappend_if [have_spec imx53] boot_modules input_drv build_boot_image $boot_modules diff --git a/repos/os/run/framebuffer.run b/repos/os/run/framebuffer.run index 87f874ee6..da6507373 100644 --- a/repos/os/run/framebuffer.run +++ b/repos/os/run/framebuffer.run @@ -2,11 +2,14 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script not supported for this platform."; exit 0 } + set build_components { core init test/framebuffer drivers/framebuffer drivers/timer } -lappend_if [have_spec pci] build_components drivers/pci -lappend_if [have_spec acpi] build_components drivers/acpi -lappend_if [have_spec exynos5] build_components drivers/platform +lappend_if [have_spec pci] build_components drivers/pci +lappend_if [have_spec acpi] build_components drivers/acpi +lappend_if [have_spec platform_arndale] build_components drivers/platform build $build_components @@ -75,7 +78,7 @@ append_if [have_spec framebuffer] config { } -append_if [have_spec exynos5] config { +append_if [have_spec platform_arndale] config { @@ -100,12 +103,12 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec sdl] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec nova] boot_modules pci_device_pd -lappend_if [have_spec acpi] boot_modules acpi_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec exynos5] boot_modules platform_drv +lappend_if [have_spec sdl] boot_modules fb_sdl +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec nova] boot_modules pci_device_pd +lappend_if [have_spec acpi] boot_modules acpi_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if [have_spec platform_arndale] boot_modules platform_drv build_boot_image $boot_modules diff --git a/repos/os/run/network_test_nic.inc b/repos/os/run/network_test_nic.inc index 3e8b18649..0843722fb 100644 --- a/repos/os/run/network_test_nic.inc +++ b/repos/os/run/network_test_nic.inc @@ -4,8 +4,8 @@ # \date 2013-03-26 # -if {[have_spec linux]} { - puts "Run script does not support Linux."; exit 0 } +if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { + puts "Run script not supported for this platform."; exit 0 } # # Build @@ -16,8 +16,8 @@ set build_components { drivers/pci drivers/timer drivers/nic } -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb_net_stat +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] build_components drivers/usb +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] build_components drivers/usb_net_stat lappend_if [have_spec acpi] build_components drivers/acpi lappend_if [have_spec pci] build_components drivers/pci/device_pd lappend_if [have_spec x86] build_components drivers/nic_stat @@ -28,13 +28,13 @@ lappend_if $use_nic_bridge build_components server/nic_bridge # # Choose network driver # -if {[expr $use_nic_client && ([have_spec omap4] || [have_spec exynos5])]} { +if {[expr $use_nic_client && ([have_spec omap4] || [have_spec platform_arndale])]} { set network_driver "usb_drv" } -if {[expr !$use_nic_client && ([have_spec omap4] || [have_spec exynos5])]} { +if {[expr !$use_nic_client && ([have_spec omap4] || [have_spec platform_arndale])]} { set network_driver "usb_drv_net_stat" } -if {[expr $use_nic_client && ![have_spec omap4] && ![have_spec exynos5]]} { +if {[expr $use_nic_client && ![have_spec omap4] && ![have_spec platform_arndale]]} { set network_driver "nic_drv" } -if {[expr !$use_nic_client && ![have_spec omap4] && ![have_spec exynos5]]} { +if {[expr !$use_nic_client && ![have_spec omap4] && ![have_spec platform_arndale]]} { set network_driver "nic_drv_stat" } build $build_components @@ -68,7 +68,7 @@ set config { } -append_if [expr [have_spec omap4] || [have_spec exynos5]] config " +append_if [expr [have_spec omap4] || [have_spec platform_arndale]] config " @@ -79,7 +79,7 @@ append_if [expr [have_spec omap4] || [have_spec exynos5]] config " " -append_if [expr ![have_spec omap4] && ![have_spec exynos5]] config " +append_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] config " @@ -151,10 +151,10 @@ lappend_if $use_nic_bridge boot_modules nic_bridge # platform-specific modules lappend_if [have_spec acpi] boot_modules acpi_drv lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv -lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv_net_stat -lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv -lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv_stat +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] boot_modules usb_drv +lappend_if [expr [have_spec omap4] || [have_spec platform_arndale]] boot_modules usb_drv_net_stat +lappend_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] boot_modules nic_drv +lappend_if [expr ![have_spec omap4] && ![have_spec platform_arndale]] boot_modules nic_drv_stat lappend_if [have_spec nova] boot_modules pci_device_pd build_boot_image $boot_modules @@ -177,7 +177,7 @@ if {![regexp cap_net_raw $cap_rights]} { # Execute test case # -if {[expr [have_spec omap4] || [have_spec exynos5]]} { +if {[expr [have_spec omap4] || [have_spec platform_arndale]]} { run_genode_until {announces service "Nic"} 30 set serial_id $spawn_id diff --git a/repos/ports-foc/run/l4linux.run b/repos/ports-foc/run/l4linux.run index 0a0fa0513..057790990 100644 --- a/repos/ports-foc/run/l4linux.run +++ b/repos/ports-foc/run/l4linux.run @@ -12,7 +12,7 @@ set build_components { drivers/framebuffer l4linux } -set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]] +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale]] set use_nic_driver [expr !$use_usb_driver && [expr [have_spec lan9118] || [have_spec x86]]] set use_platform_drv [expr [have_spec platform_arndale] || [have_spec platform_imx53]] diff --git a/repos/ports-foc/run/l4linux_ahci_bench.run b/repos/ports-foc/run/l4linux_ahci_bench.run index 1a8941b52..b9785929a 100644 --- a/repos/ports-foc/run/l4linux_ahci_bench.run +++ b/repos/ports-foc/run/l4linux_ahci_bench.run @@ -5,7 +5,7 @@ set interpose_part_blk 0 assert_spec foc -assert_spec exynos5 +assert_spec arndale # # build diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 34bd5b9db..0569cb6c2 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -9,13 +9,18 @@ # browser to http://localhost:5555 # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components { core init drivers/timer app/lighttpd } -set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5] || [have_spec platform_rpi]] +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] set use_nic_driver [expr !$use_usb_driver] set use_platform_driver [expr [have_spec platform_arndale] || [have_spec platform_imx53] || [have_spec platform_rpi]] diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 01dd0f9d4..dddc441eb 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -9,7 +9,12 @@ if {[have_include "power_on/qemu"]} { exit } -set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5] || [have_spec platform_rpi]] +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] set use_nic_driver [expr !$use_usb_driver && ![have_spec platform_imx53] && !$use_wifi_driver] set use_platform_driver [expr [have_spec platform_arndale] || [have_spec platform_imx53] || [have_spec platform_rpi]] diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index df863c7e5..e1eb2430d 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 exynos5] || [have_spec platform_rpi]] -set use_nic_driver [expr !$use_usb_driver && ![have_spec platform_imx53] && ![have_spec linux]] +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] +set use_nic_driver [expr !$use_usb_driver && ![have_spec platform_imx53] && ![have_spec linux] && ![have_spec hw_odroid_xu]] set use_platform_drv [expr [have_spec platform_arndale] || [have_spec platform_imx53] || [have_spec platform_rpi]] if {[expr !$use_usb_driver && !$use_nic_driver]} { diff --git a/repos/qt4/run/textedit.run b/repos/qt4/run/textedit.run index 3363e7b69..fa7fd700c 100644 --- a/repos/qt4/run/textedit.run +++ b/repos/qt4/run/textedit.run @@ -2,6 +2,11 @@ # Build # +if {[have_spec hw_odroid_xu]} { + puts "Run script does not support this platform." + exit 0 +} + set build_components { core init @@ -11,8 +16,8 @@ set build_components { app/examples/textedit } -set use_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]] -set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5] || [have_spec platform_rpi]] +set use_sd_card_driver [expr [have_spec omap4] || [have_spec platform_arndale]] +set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] lappend_if $use_sd_card_driver build_components drivers/sd_card lappend_if $use_usb_driver build_components drivers/usb