Enable Noux for x86_64

Fixes #199.
This commit is contained in:
Christian Prochaska 2012-05-08 16:20:35 +02:00 committed by Norman Feske
parent 13bd859e31
commit beed82bb56
5 changed files with 23 additions and 13 deletions

View File

@ -40,7 +40,7 @@ PWD = $(shell pwd)
# #
# Disable Noux on non-x86 architectures for now # Disable Noux on non-x86 architectures for now
# #
REQUIRES += x86 32bit REQUIRES += x86
# #
# Detect missing preparation of noux package # Detect missing preparation of noux package

View File

@ -1,5 +1,5 @@
if {![have_spec x86_32]} { if {![have_spec x86]} {
puts "\nNoux is supported on the x86_32 architecture only\n" puts "\nNoux is supported on the x86 architecture only\n"
exit 0 exit 0
} }
if {[have_spec linux]} { if {[have_spec linux]} {
@ -34,7 +34,7 @@ install_config {
<any-service> <any-child/> <parent/> </any-service> <any-service> <any-child/> <parent/> </any-service>
</default-route> </default-route>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="512K"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="uart_drv"> <start name="uart_drv">
@ -69,6 +69,11 @@ append qemu_args " -nographic"
append qemu_args " -serial mon:stdio" append qemu_args " -serial mon:stdio"
append qemu_args " -serial file:$noux_output_file" append qemu_args " -serial file:$noux_output_file"
if {[have_spec x86_64]} {
# coreutils.tar is really huge when built for x86_64
append qemu_args " -m 300 "
}
run_genode_until "child exited with exit value 0.*\n" 20 run_genode_until "child exited with exit value 0.*\n" 20
puts "[exec cat $noux_output_file]" puts "[exec cat $noux_output_file]"

View File

@ -1,5 +1,5 @@
if {![have_spec x86_32]} { if {![have_spec x86]} {
puts "\nNoux is supported on the x86_32 architecture only\n" puts "\nNoux is supported on the x86 architecture only\n"
exit 0 exit 0
} }
@ -63,7 +63,7 @@ append config {
<any-service> <any-child/> <parent/> </any-service> <any-service> <any-child/> <parent/> </any-service>
</default-route> </default-route>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="512K"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> } </start> }
@ -143,6 +143,11 @@ lappend_if [have_spec pl11x] boot_modules pl11x_drv
build_boot_image $boot_modules build_boot_image $boot_modules
if {[have_spec x86_64]} {
# bash.tar is really huge when built for x86_64
append qemu_args " -m 300 "
}
run_genode_until forever run_genode_until forever
exec rm bin/bash.tar exec rm bin/bash.tar

View File

@ -1,5 +1,5 @@
if {![have_spec x86_32]} { if {![have_spec x86]} {
puts "\nNoux is supported on the x86_32 architecture only\n" puts "\nNoux is supported on the x86 architecture only\n"
exit 0 exit 0
} }
if {[have_spec linux]} { if {[have_spec linux]} {
@ -33,7 +33,7 @@ install_config {
<any-service> <any-child/> <parent/> </any-service> <any-service> <any-child/> <parent/> </any-service>
</default-route> </default-route>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="512K"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="uart_drv"> <start name="uart_drv">

View File

@ -1,5 +1,5 @@
if {![have_spec x86_32]} { if {![have_spec x86]} {
puts "\nNoux is supported on the x86_32 architecture only\n" puts "\nNoux is supported on the x86 architecture only\n"
exit 0 exit 0
} }
@ -42,7 +42,7 @@ append config {
<any-service> <any-child/> <parent/> </any-service> <any-service> <any-child/> <parent/> </any-service>
</default-route> </default-route>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="512K"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> } </start> }