Fix usb_block.run and add to autopilot.list

This commit is contained in:
Christian Helmuth 2023-03-03 11:37:38 +01:00
parent 182ba3a931
commit ea2584e2fb
2 changed files with 18 additions and 5 deletions

View File

@ -1,4 +1,14 @@
set use_qemu [have_include "power_on/qemu"] if {![have_board pc]} {
puts "\nRun script is not supported on this platform.\n";
exit 0
}
if {[get_cmd_switch --autopilot] && ![have_include "power_on/qemu"]} {
puts "\nAutopilot run is not supported on this platform\n"
exit 0
}
proc usb_device_label {} { return "usb-1-2" }
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
@ -9,7 +19,7 @@ import_from_depot [depot_user]/src/[base_src] \
build { app/block_tester } build { app/block_tester }
install_config { append config {
<config verbose="yes"> <config verbose="yes">
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
@ -58,7 +68,7 @@ install_config {
<provides> <service name="Block"/> </provides> <provides> <service name="Block"/> </provides>
<config report="yes" writeable="no"/> <config report="yes" writeable="no"/>
<route> <route>
<service name="Usb"> <child name="usb_drv"/> </service> <service name="Usb"> <child name="usb_drv" label="} [usb_device_label] {"/> </service>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
@ -81,20 +91,22 @@ install_config {
</start> </start>
</config>} </config>}
install_config $config
# #
# Define USB host controller config # Define USB host controller config
# #
set fd [open [run_dir]/genode/usb_host_drv.config w] set fd [open [run_dir]/genode/usb_host_drv.config w]
puts $fd { <config> <default-policy class="0x8"/> </config> } puts $fd { <config> <default-policy class="0x8"/> </config> }
close $fd close $fd
build_boot_image { block_tester } build_boot_image [build_artifacts]
# #
# Execute test case # Execute test case
# #
set disk_image "bin/test.img" set disk_image "bin/test.img"
set cmd "dd if=/dev/zero of=$disk_image bs=1M count=16" set cmd "dd if=/dev/zero of=$disk_image bs=1M count=16"
if {$use_qemu} { if {[have_include "power_on/qemu"]} {
puts "creating disk image:\n$cmd" puts "creating disk image:\n$cmd"
catch { exec sh -c $cmd } catch { exec sh -c $cmd }
} }

View File

@ -74,6 +74,7 @@ timeout_smp
timer_accuracy timer_accuracy
tool_chain_auto tool_chain_auto
tz_vmm tz_vmm
usb_block
usb_hid_raw usb_hid_raw
usb_hid_reconnect usb_hid_reconnect
vbox5_genode_usb_hid_raw vbox5_genode_usb_hid_raw