diff --git a/run/chuck.run b/run/chuck.run index e5e1b30..0a6cc04 100644 --- a/run/chuck.run +++ b/run/chuck.run @@ -27,6 +27,7 @@ create_boot_directory append config { + @@ -34,7 +35,6 @@ append config { - diff --git a/run/chuck_keyboard.run b/run/chuck_keyboard.run index 0b20029..88cac96 100644 --- a/run/chuck_keyboard.run +++ b/run/chuck_keyboard.run @@ -30,6 +30,7 @@ create_boot_directory append config { + @@ -37,7 +38,6 @@ append config { - @@ -59,7 +59,6 @@ append_if [have_spec ps2] config { - @@ -75,7 +74,6 @@ append_if [have_spec sdl] config { - diff --git a/run/chuck_mouse.run b/run/chuck_mouse.run index 8bc37e6..28c984a 100644 --- a/run/chuck_mouse.run +++ b/run/chuck_mouse.run @@ -30,6 +30,7 @@ create_boot_directory append config { + @@ -37,7 +38,6 @@ append config { - @@ -59,7 +59,6 @@ append_if [have_spec ps2] config { - @@ -75,7 +74,6 @@ append_if [have_spec sdl] config { - diff --git a/run/log_fader.run b/run/log_fader.run index 6da395e..13377f3 100644 --- a/run/log_fader.run +++ b/run/log_fader.run @@ -47,7 +47,6 @@ append config { - @@ -59,6 +58,7 @@ append config { + diff --git a/run/rom_verify.run b/run/rom_verify.run index 4514e0a..aa9792c 100644 --- a/run/rom_verify.run +++ b/run/rom_verify.run @@ -20,17 +20,17 @@ set test_digest [lindex [exec $sha256sum bin/test-log] 0] append config { + - - - + + + - - - + + diff --git a/run/tyrian.run b/run/tyrian.run index 412fee3..6776333 100644 --- a/run/tyrian.run +++ b/run/tyrian.run @@ -1,8 +1,3 @@ -# -# OpenTyrian crashes without the proper framebuferr resolution, -# so run it in nit_fb. -# - # # Build # @@ -14,8 +9,6 @@ set build_components { drivers/input drivers/input/dummy drivers/timer - server/nit_fb - server/nitpicker app/opentyrian } @@ -41,6 +34,7 @@ create_boot_directory append config { + @@ -49,7 +43,6 @@ append config { - @@ -60,16 +53,30 @@ append config { append_platform_drv_config +append_if [have_spec sdl] config { + + + + + + + + + + } + append_if [have_spec vesa] config { + } append_if [have_spec pl11x] config { + } append_if [have_spec ps2] config { @@ -84,61 +91,22 @@ append config { + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + } @@ -152,17 +120,16 @@ install_config $config file copy -force app/opentyrian/tyrian.tar bin # generic modules -set boot_modules { +append boot_modules { core init - audio_drv +} [audio_drv_binary] { dummy_input_drv ld.lib.so libc.lib.so libm.lib.so libpng.lib.so - nitpicker - nit_fb pthread.lib.so + posix.lib.so sdl.lib.so sdl_net.lib.so stdcxx.lib.so @@ -171,6 +138,7 @@ set boot_modules { } # platform-specific modules +lappend_if [have_spec linux] boot_modules fb_sdl lappend_if [have_spec vesa] boot_modules fb_drv lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec pl11x] boot_modules fb_drv