run: remove vanished kernel/platform specifier

This commit is contained in:
Stefan Kalkowski 2017-01-03 13:17:41 +01:00 committed by Norman Feske
parent fa834e34eb
commit fc273f3840
38 changed files with 77 additions and 78 deletions

View File

@ -1,4 +1,4 @@
assert_spec okl4_x86 assert_spec okl4
build "core init" build "core init"

View File

@ -5,14 +5,12 @@
# #
if { if {
![have_spec hw_arndale] && ![have_spec arndale] &&
![have_spec hw_wand_quad] && ![have_spec wand_quad] &&
![have_spec hw_panda] && ![have_spec panda] &&
![have_spec foc_x86_32] && ![have_spec x86_32] &&
![have_spec foc_x86_64] && ![have_spec x86_64] &&
![have_spec foc_panda] && ![have_spec foc] &&
![have_spec foc_arndale] &&
![have_spec foc_odroid_x2] &&
![have_spec nova] ![have_spec nova]
} { } {
puts "Platform is unsupported." puts "Platform is unsupported."

View File

@ -36,12 +36,12 @@ if {[have_include "power_on/qemu"]} {
# pbxa9 - hw does not support multiple CPUs # pbxa9 - hw does not support multiple CPUs
if {[have_spec pbxa9]} { set want_cpus 1 } if {[have_spec pbxa9]} { set want_cpus 1 }
# kernels only using one CPU even if more are configured # kernels only using one CPU even if more are configured
if {[have_spec okl4]} { set want_cpus 1 } if {[have_spec okl4]} { set want_cpus 1 }
if {[have_spec pistachio]} { set want_cpus 1 } if {[have_spec pistachio]} { set want_cpus 1 }
if {[have_spec fiasco]} { set want_cpus 1 } if {[have_spec fiasco]} { set want_cpus 1 }
if {[have_spec hw_x86_64]} { set want_cpus 1 } if {([have_spec x86_64] && [have_spec hw])} { set want_cpus 1 }
if {[have_spec hw_zynq]} { set want_cpus 1 } if {[have_spec zynq]} { set want_cpus 1 }
if {[have_spec sel4]} { set want_cpus 1 } if {[have_spec sel4]} { set want_cpus 1 }
append qemu_args " -nographic -m 64 -smp $want_cpus,cores=$want_cpus " append qemu_args " -nographic -m 64 -smp $want_cpus,cores=$want_cpus "
} }

View File

@ -22,11 +22,11 @@ proc append_platform_drv_build_components {} {
proc append_platform_drv_boot_modules {} { proc append_platform_drv_boot_modules {} {
global boot_modules global boot_modules
lappend_if [have_platform_drv] boot_modules platform_drv lappend_if [have_platform_drv] boot_modules platform_drv
lappend_if [have_spec acpi] boot_modules acpi_drv lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec acpi] boot_modules report_rom lappend_if [have_spec acpi] boot_modules report_rom
lappend_if [have_spec nova] boot_modules device_pd lappend_if [have_spec nova] boot_modules device_pd
lappend_if [have_spec hw_x86_64_muen] boot_modules acpi lappend_if [have_spec muen] boot_modules acpi
} }
proc platform_drv_policy {} { proc platform_drv_policy {} {
@ -61,7 +61,7 @@ proc platform_drv_add_routing {} {
} }
proc platform_drv_config_config {} { proc platform_drv_config_config {} {
if {[have_spec acpi] || [have_spec arm] || [have_spec hw_x86_64_muen]} { if {[have_spec acpi] || [have_spec arm] || [have_spec muen]} {
return { return {
<config>} <config>}
} }

View File

@ -27,7 +27,7 @@ append qemu_args "-nographic -m 64"
run_genode_until {.*--- end of sub-rm test ---.*} 10 run_genode_until {.*--- end of sub-rm test ---.*} 10
if [have_spec linux_x86_32] { if {([have_spec linux] && [have_spec x86_32])} {
set maps [exec cat /proc/[exec pidof test-sub_rm]/maps] set maps [exec cat /proc/[exec pidof test-sub_rm]/maps]
puts "\nmemory map after test completion follows:\n" puts "\nmemory map after test completion follows:\n"

View File

@ -1,5 +1,5 @@
set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]]] set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]]]
requires_installation_of lynx requires_installation_of lynx

View File

@ -1,5 +1,5 @@
set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]]] set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]]]
# #
# Build # Build

View File

@ -2,7 +2,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script not supported on this platform."; exit 0 } puts "Run script not supported on this platform."; exit 0 }
set build_components { set build_components {

View File

@ -2,7 +2,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -4,7 +4,7 @@
# \date 2013-11-29 # \date 2013-11-29
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -2,7 +2,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script not supported on this platform."; exit 0 } puts "Run script not supported on this platform."; exit 0 }
set build_components { set build_components {

View File

@ -1,7 +1,7 @@
set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec pl180]] set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec pl180]]
set use_ahci_drv [have_spec x86] set use_ahci_drv [have_spec x86]
if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { if {[expr [have_spec linux] || [have_spec odroid_xu]]} {
puts "Run script does not support this platform"; exit } puts "Run script does not support this platform"; exit }
if {![have_include power_on/qemu]} { if {![have_include power_on/qemu]} {

View File

@ -8,7 +8,7 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec
set use_ahci_drv [have_spec x86] set use_ahci_drv [have_spec x86]
set mkfs [check_installed mkfs.vfat] set mkfs [check_installed mkfs.vfat]
if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { if {[expr [have_spec linux] || [have_spec odroid_xu]]} {
puts "Run script does not support this platform"; exit } puts "Run script does not support this platform"; exit }
# #

View File

@ -4,7 +4,7 @@
# \date 2011-05-27 # \date 2011-05-27
# #
if {[have_spec hw_odroid_xu] || [have_spec hw_zynq]} { if {[have_spec odroid_xu] || [have_spec zynq]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -21,7 +21,7 @@
# #
set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]] set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]]
if {[expr !$use_usb_driver && !$use_nic_driver]} { if {[expr !$use_usb_driver && !$use_nic_driver]} {
puts "\n Run script is not supported on this platform. \n"; exit 0 } puts "\n Run script is not supported on this platform. \n"; exit 0 }

View File

@ -10,7 +10,7 @@ set udp_up_to_down_1 1
set udp_down_to_up_1 1 set udp_down_to_up_1 1
set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_riscv] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]] set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec riscv] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]]
set nic_driver "nic_drv" set nic_driver "nic_drv"
if ($use_usb_driver) { if ($use_usb_driver) {

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -8,7 +8,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -8,7 +8,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -11,8 +11,10 @@ if {[have_include "power_on/qemu"]} {
append qemu_args "-nographic -m 128" append qemu_args "-nographic -m 128"
} else { } else {
# foc is really slow on native hardware executing this test - limit rounds # foc is really slow on native hardware executing this test - limit rounds
if {[have_spec foc_x86_32]} { set rounds 6 } if {[have_spec foc]} {
if {[have_spec foc_x86_64]} { set rounds 6 } if {[have_spec x86_32]} { set rounds 6 }
if {[have_spec x86_64]} { set rounds 6 }
}
} }
# prevent hitting the socket-descriptor limit on Linux # prevent hitting the socket-descriptor limit on Linux

View File

@ -152,7 +152,7 @@ proc check_counter { name opt cnt total_cnt } {
# Zynq is currently tested merely in Qemu and most likely because of # Zynq is currently tested merely in Qemu and most likely because of
# that, the results are less precise. # that, the results are less precise.
# #
if {[have_spec zynq_qemu]} { set tol 0.03 } if {[have_spec zynq]} { set tol 0.03 }
# #
# FIXME: There is no reasonable explanation by now why the test results # FIXME: There is no reasonable explanation by now why the test results
@ -163,8 +163,8 @@ proc check_counter { name opt cnt total_cnt } {
# * switching off SMP # * switching off SMP
# * double-checking the speed of userland and kernel timers # * double-checking the speed of userland and kernel timers
# #
if {[have_spec hw_odroid_xu]} { set tol 0.04 } if {[have_spec odroid_xu]} { set tol 0.04 }
if {[have_spec hw_arndale]} { set tol 0.04 } if {[have_spec arndale]} { set tol 0.04 }
if {[expr $total_cnt != 0]} { set is [expr double($cnt) / $total_cnt ] } if {[expr $total_cnt != 0]} { set is [expr double($cnt) / $total_cnt ] }

View File

@ -1,4 +1,5 @@
assert_spec foc_arndale assert_spec foc
assert_spec arndale
# #
# Build # Build

View File

@ -2,7 +2,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -2,7 +2,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script not supported for this platform."; exit 0 } puts "Run script not supported for this platform."; exit 0 }
set build_components { core init test/fb_bench drivers/framebuffer drivers/timer } set build_components { core init test/fb_bench drivers/framebuffer drivers/timer }

View File

@ -2,7 +2,7 @@
# Build # Build
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script not supported for this platform."; exit 0 } puts "Run script not supported for this platform."; exit 0 }
set build_components { core init test/framebuffer drivers/framebuffer drivers/timer } set build_components { core init test/framebuffer drivers/framebuffer drivers/timer }

View File

@ -17,7 +17,7 @@
# ! export TARGET_DEV=/dev/sdX # empty boot medium # ! export TARGET_DEV=/dev/sdX # empty boot medium
# ! export TARGET_MNT=/mnt # where to mount the boot medium # ! export TARGET_MNT=/mnt # where to mount the boot medium
# ! export GENODE_DIR=/path/genode # root of the Genode sources # ! export GENODE_DIR=/path/genode # root of the Genode sources
# ! export BUILD_DIR=/path/build/hw_usb_armory # Genode build directory # ! export BUILD_DIR=/path/build/usb_armory # Genode build directory
# #
# :Format microSD card: # :Format microSD card:
# #
@ -30,8 +30,8 @@
# :Install bootloader: # :Install bootloader:
# #
# ! cd $GENODE_DIR # ! cd $GENODE_DIR
# ! ./tool/create_uboot hw_usb_armory # ! ./tool/create_uboot usb_armory
# ! sudo dd if=contrib/uboot/build/hw_usb_armory/mmc_img of=$TARGET_DEV bs=1K seek=1 conv=fsync # ! sudo dd if=contrib/uboot/build/usb_armory/mmc_img of=$TARGET_DEV bs=1K seek=1 conv=fsync
# #
# :Install Genode: # :Install Genode:
# #
@ -90,9 +90,9 @@ assert_spec imx53
assert_spec trustzone assert_spec trustzone
# determine platform specific configuration # determine platform specific configuration
set trusted_led [have_spec hw_usb_armory] set trusted_led [have_spec usb_armory]
set inversepath_linux [have_spec hw_usb_armory] set inversepath_linux [have_spec usb_armory]
set freescale_linux [have_spec hw_imx53_qsb_tz] set freescale_linux [have_spec imx53_qsb]
set initrd_rootfs $freescale_linux set initrd_rootfs $freescale_linux
set mmc_rootfs $inversepath_linux set mmc_rootfs $inversepath_linux
set dtb $inversepath_linux set dtb $inversepath_linux

View File

@ -4,7 +4,8 @@
# \date 2015-06-25 # \date 2015-06-25
# #
assert_spec hw_arndale assert_spec hw
assert_spec arndale
set build_components { set build_components {
core init core init

View File

@ -6,8 +6,7 @@
assert_spec foc assert_spec foc
assert_spec 32bit assert_spec 32bit
assert_spec arndale
assert_spec foc_arndale
set ip [check_installed ip] set ip [check_installed ip]
set wget [check_installed wget] set wget [check_installed wget]

View File

@ -9,7 +9,7 @@
# browser to http://localhost:5555 # browser to http://localhost:5555
# #
if {[have_spec hw_odroid_xu]} { if {[have_spec odroid_xu]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -12,7 +12,7 @@ if {[expr [have_include "power_on/qemu"] && !$force_qemu]} {
exit exit
} }
if {[have_spec hw_odroid_xu] || [have_spec hw_wand_quad]} { if {[have_spec odroid_xu] || [have_spec wand_quad]} {
puts "Run script does not support this platform." puts "Run script does not support this platform."
exit 0 exit 0
} }

View File

@ -1,5 +1,5 @@
set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]]
set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec linux] && ![have_spec hw_odroid_xu] && ![have_spec hw_wand_quad]] set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec linux] && ![have_spec odroid_xu] && ![have_spec wand_quad]]
if {[expr !$use_usb_driver && !$use_nic_driver || [expr [have_include "power_on/qemu"] && [have_spec zynq]]]} { if {[expr !$use_usb_driver && !$use_nic_driver || [expr [have_include "power_on/qemu"] && [have_spec zynq]]]} {
puts "\n Run script is not supported on this platform. \n"; exit 0 } puts "\n Run script is not supported on this platform. \n"; exit 0 }

View File

@ -8,6 +8,7 @@ if {[have_include "power_on/qemu"]} {
puts "\nAuto test running on Qemu is not recommended.\n" puts "\nAuto test running on Qemu is not recommended.\n"
exit 0 exit 0
} }
if {[have_spec pistachio] || [have_spec sel4]} { if {[have_spec pistachio] || [have_spec sel4]} {
puts "Platform is unsupported." puts "Platform is unsupported."
exit 0 exit 0
@ -18,24 +19,24 @@ set verbose_mode "no"
set platform_pkgs "" set platform_pkgs ""
set platform_cmds { set platform_cmds {
make core && make core KERNEL=hw &&
exit 234 exit 234
} }
set platform_base_dir "base-hw"
if {[have_spec arm]} { if {[have_spec arm]} {
set platform_base_dir "base-hw"
set noux_boot_timeout 350 set noux_boot_timeout 350
set tool_chain_timeout 600 set tool_chain_timeout 600
if {[have_spec panda]} { if {[have_spec panda]} {
set platform "hw_panda" set platform "panda"
set tool_chain_timeout 1500 set tool_chain_timeout 1500
} }
if {[have_spec arndale]} { if {[have_spec arndale]} {
set platform "hw_arndale" set platform "arndale"
set tool_chain_timeout 1500 set tool_chain_timeout 1500
} }
if {[have_spec pbxa9]} { set platform "hw_pbxa9" } if {[have_spec pbxa9]} { set platform "pbxa9" }
if {![info exists platform]} { if {![info exists platform]} {
puts "\n Run script is not supported on this platform. \n" puts "\n Run script is not supported on this platform. \n"
@ -44,10 +45,9 @@ if {[have_spec arm]} {
} }
if {[have_spec x86]} { if {[have_spec x86]} {
set platform_base_dir "base-hw"
set noux_boot_timeout 100 set noux_boot_timeout 100
set tool_chain_timeout 450 set tool_chain_timeout 450
set platform "hw_x86_64" set platform "x86_64"
if {[have_spec foc]} { if {[have_spec foc]} {
set tool_chain_timeout 850 set tool_chain_timeout 850

View File

@ -4,21 +4,19 @@
# \date 2012-11-26 # \date 2012-11-26
# #
if {![have_spec foc_x86_32]} { assert_spec foc
puts "\nThis run script is currently only supported on the 'foc_x86_32' target platform\n" assert_spec x86_32
exit 0
}
# create a tar archive containing the l4 header files # create a tar archive containing the l4 header files
build core build core
exec tar cfv bin/l4.tar -h --exclude=std_tmpl include l4 exec tar cfv bin/l4.tar -h --exclude=std_tmpl include l4
if {[have_spec x86_32]} { if {[have_spec x86_32]} {
set platform "foc_x86_32" set platform "x86_32"
} }
if {[have_spec x86_64]} { if {[have_spec x86_64]} {
set platform "foc_x86_64" set platform "x86_64"
} }
set platform_base_dir "base-foc" set platform_base_dir "base-foc"

View File

@ -4,7 +4,7 @@
# \date 2012-11-26 # \date 2012-11-26
# #
set platform "nova_x86_32" set platform "x86_32"
set platform_base_dir "base-nova" set platform_base_dir "base-nova"
set platform_pkgs "" set platform_pkgs ""
set platform_cmds "" set platform_cmds ""

View File

@ -62,8 +62,8 @@ if {[have_include "power_on/qemu"]} {
exit 0 exit 0
} }
# Tested for nova and hw_x86_64_muen. # Tested for nova and muen.
if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { if {(![have_spec nova] && ![have_spec muen])} {
puts "Platform is unsupported." puts "Platform is unsupported."
exit 0 exit 0
} }

View File

@ -1,5 +1,5 @@
# Tested for nova and hw_x86_64_muen. # Tested for nova and muen.
if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { if {(![have_spec nova] && ![have_spec muen])} {
puts "Platform is unsupported." puts "Platform is unsupported."
exit 0 exit 0
} }

View File

@ -65,10 +65,10 @@ append_if [expr $use_usb] config {
<resource name="RAM" quantum="7M"/> <resource name="RAM" quantum="7M"/>
<provides><service name="Input"/></provides>} <provides><service name="Input"/></provides>}
append_if [expr $use_usb && ![have_spec hw_x86_64_muen]] config { append_if [expr $use_usb && ![have_spec muen]] config {
<config uhci="yes" ehci="yes" xhci="yes">} <config uhci="yes" ehci="yes" xhci="yes">}
append_if [expr $use_usb && [have_spec hw_x86_64_muen]] config { append_if [expr $use_usb && [have_spec muen]] config {
<config uhci="no" ehci="no" xhci="yes">} <config uhci="no" ehci="no" xhci="yes">}
append_if [expr $use_usb] config { append_if [expr $use_usb] config {

View File

@ -1,4 +1,4 @@
if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { if {(![have_spec nova] && ![have_spec muen])} {
puts "Platform is unsupported." puts "Platform is unsupported."
exit 0 exit 0
} }