diff --git a/ports/run/seoul-disc.run b/ports/run/seoul-disc.run
index 47be57288..e26001aff 100644
--- a/ports/run/seoul-disc.run
+++ b/ports/run/seoul-disc.run
@@ -19,6 +19,8 @@ set use_usb 0
set use_fancy_stuff 0
+set memory_vmm_vm "128M"
+
source ${genode_dir}/ports/run/seoul.inc
if {[is_qemu_available]} {
diff --git a/ports/run/seoul-fancy.run b/ports/run/seoul-fancy.run
index 995f53509..94fca9784 100644
--- a/ports/run/seoul-fancy.run
+++ b/ports/run/seoul-fancy.run
@@ -2,6 +2,7 @@
# \brief Example for using Vancouver on Genode
# \author Norman Feske
# \author Markus Partheymueller
+# \author Alexander Boettcher
# \date 2011-11-21
#
# This run script starts the Vancouver VMM booting the multiboot modules
@@ -21,6 +22,9 @@ set use_usb 0
set use_fancy_stuff 1
+set memory_init "288M"
+set memory_vmm_vm "128M"
+
set multiboot_files {
@@ -28,6 +32,7 @@ set multiboot_files {
}
set guest_os_binaries { munich bzImage-3.1 tc-browser.gz }
+set sha1_os_binaries { 7ecb4ba634a0ecfa6429418ea73490d6f65afead 6b2ef2c5bf16db3ebcbe33ce134e4e0a96944f82 51aa53eb494b71d65f7fe3eb05e52af4616878bd}
#
# Download demo kernel, image and
@@ -38,6 +43,7 @@ set uri "http://genode.org/files/seoul"
foreach binary $guest_os_binaries {
if {![file exists bin/$binary]} {
puts "Download file bin/$binary"
+ exec mkdir -p bin
exec >& /dev/null wget -c -O bin/$binary $uri/$binary
}
}
diff --git a/ports/run/seoul-net.run b/ports/run/seoul-net.run
index eb7d86e8d..1dba369e3 100644
--- a/ports/run/seoul-net.run
+++ b/ports/run/seoul-net.run
@@ -19,6 +19,8 @@ set use_usb 0
set use_fancy_stuff 0
+set memory_vmm_vm "128M"
+
set multiboot_files {
@@ -26,6 +28,7 @@ set multiboot_files {
}
set guest_os_binaries { munich bzImage-3.1 tc-net.gz}
+set sha1_os_binaries { 7ecb4ba634a0ecfa6429418ea73490d6f65afead 6b2ef2c5bf16db3ebcbe33ce134e4e0a96944f82 201deb4bd18fb07f3d0b5495b948ba622ff98e4b}
#
# Download demo kernel, image and
@@ -35,6 +38,7 @@ set uri "http://genode.org/files/seoul"
foreach binary $guest_os_binaries {
if {![file exists bin/$binary]} {
+ exec mkdir -p bin
puts "Download file bin/$binary"
exec >& /dev/null wget -c -O bin/$binary $uri/$binary
}
diff --git a/ports/run/seoul.inc b/ports/run/seoul.inc
index e3b5e50fd..6594c5772 100644
--- a/ports/run/seoul.inc
+++ b/ports/run/seoul.inc
@@ -222,8 +222,10 @@ append config {
if {!$use_fancy_stuff} {
append config {
-
-
+ }
+append config "
+ "
+append config {
}
append_if [expr $use_nic_session && $use_nic_bridge] config {
@@ -239,6 +241,15 @@ append config {
}
}
+append_if $use_usb config {
+
+
+
+
+
+
+ }
+
append_if $use_fancy_stuff config {
@@ -249,32 +260,28 @@ append_if $use_fancy_stuff config {
-
-
+
- }
-
-append_if $use_usb config {
-
-
-
-
-
-
}
append config {
}
+#
# Generate Launchpad config file
-set launchpad_cfg_fd [open "bin/launchpad-config" w]
-puts $launchpad_cfg_fd {
- 288Minit
+#
+if {$use_fancy_stuff} {
+ set launchpad_cfg_fd [open "bin/launchpad-config" w]
+
+ puts $launchpad_cfg_fd "
+ $memory_initinit"
+
+ puts $launchpad_cfg_fd {
@@ -321,10 +328,10 @@ puts $launchpad_cfg_fd {
-
-}
-close $launchpad_cfg_fd
-
+ }
+ puts $launchpad_cfg_fd {}
+ close $launchpad_cfg_fd
+}
install_config $config
@@ -364,11 +371,21 @@ lappend_if $use_fancy_stuff boot_modules launchpad-config
if {$use_multiboot} {
set guest_os_binary_missing 0
+ set binary_counter 0
foreach binary $guest_os_binaries {
if {![file exists bin/$binary]} {
puts stderr "Error: guest OS binary \"bin/$binary\" does not exist"
set guest_os_binary_missing 1
}
+
+ set sha1 [exec sha1sum bin/$binary]
+ set sha1 [regexp -inline {[0-9a-h]+} $sha1]
+ if {[string compare $sha1 [lindex $sha1_os_binaries $binary_counter]]} {
+ puts "SHA1 sum of binary does not match with expected one - abort"
+ puts "$binary $sha1 != [lindex $sha1_os_binaries $binary_counter]"
+ set guest_os_binary_missing 1
+ }
+ incr binary_counter 1
}
if {$guest_os_binary_missing} { exit 1 }
@@ -376,4 +393,8 @@ if {$use_multiboot} {
append boot_modules $guest_os_binaries
}
+if {$use_usb} {
+ append qemu_args " -usb -usbdevice mouse -usbdevice keyboard "
+}
+
build_boot_image $boot_modules