diff --git a/repos/os/lib/mk/spec/fiasco/timer.mk b/repos/os/lib/mk/spec/fiasco/timer.mk deleted file mode 100644 index c0392abb8..000000000 --- a/repos/os/lib/mk/spec/fiasco/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic - -SRC_CC += spec/periodic/time_source.cc spec/fiasco/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/foc/timer.mk b/repos/os/lib/mk/spec/foc/timer.mk deleted file mode 100644 index c0392abb8..000000000 --- a/repos/os/lib/mk/spec/foc/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic - -SRC_CC += spec/periodic/time_source.cc spec/fiasco/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/hw/timer.mk b/repos/os/lib/mk/spec/hw/timer.mk deleted file mode 100644 index 1fe424157..000000000 --- a/repos/os/lib/mk/spec/hw/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/hw - -SRC_CC += spec/hw/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/linux/timer.mk b/repos/os/lib/mk/spec/linux/timer.mk deleted file mode 100644 index 7a809b0d9..000000000 --- a/repos/os/lib/mk/spec/linux/timer.mk +++ /dev/null @@ -1,7 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic - -SRC_CC += spec/periodic/time_source.cc spec/linux/time_source.cc - -LIBS += syscall - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/nova/timer.mk b/repos/os/lib/mk/spec/nova/timer.mk deleted file mode 100644 index efb3dabe4..000000000 --- a/repos/os/lib/mk/spec/nova/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/nova - -SRC_CC += spec/nova/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/okl4_x86/timer.mk b/repos/os/lib/mk/spec/okl4_x86/timer.mk deleted file mode 100644 index 56d5e7214..000000000 --- a/repos/os/lib/mk/spec/okl4_x86/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/pit - -SRC_CC += spec/pit/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/pistachio/timer.mk b/repos/os/lib/mk/spec/pistachio/timer.mk deleted file mode 100644 index 95bfc547e..000000000 --- a/repos/os/lib/mk/spec/pistachio/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic - -SRC_CC += spec/periodic/time_source.cc spec/pistachio/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/lib/mk/spec/sel4_x86_32/timer.mk b/repos/os/lib/mk/spec/sel4_x86_32/timer.mk deleted file mode 100644 index 2bfd262ca..000000000 --- a/repos/os/lib/mk/spec/sel4_x86_32/timer.mk +++ /dev/null @@ -1,5 +0,0 @@ -INC_DIR += $(REP_DIR)/src/drivers/timer/spec/pit - -SRC_CC += spec/pit/time_source.cc - -include $(REP_DIR)/lib/mk/timer.inc diff --git a/repos/os/src/drivers/timer/empty.cc b/repos/os/src/drivers/timer/empty.cc deleted file mode 100644 index 066c1bf82..000000000 --- a/repos/os/src/drivers/timer/empty.cc +++ /dev/null @@ -1,3 +0,0 @@ -/* - * Dummy compilation unit needed to link a valid target. - */ diff --git a/repos/os/src/drivers/timer/fiasco/target.mk b/repos/os/src/drivers/timer/fiasco/target.mk new file mode 100644 index 000000000..fc93431c1 --- /dev/null +++ b/repos/os/src/drivers/timer/fiasco/target.mk @@ -0,0 +1,6 @@ +TARGET = fiasco_timer_drv +REQUIRES = fiasco +INC_DIR += $(REP_DIR)/src/drivers/timer/periodic +SRC_CC += periodic/time_source.cc fiasco/time_source.cc + +include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/spec/fiasco/time_source.cc b/repos/os/src/drivers/timer/fiasco/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/fiasco/time_source.cc rename to repos/os/src/drivers/timer/fiasco/time_source.cc diff --git a/repos/os/src/drivers/timer/foc/target.mk b/repos/os/src/drivers/timer/foc/target.mk new file mode 100644 index 000000000..5de0b4b5d --- /dev/null +++ b/repos/os/src/drivers/timer/foc/target.mk @@ -0,0 +1,6 @@ +TARGET = foc_timer_drv +REQUIRES = foc +INC_DIR += $(REP_DIR)/src/drivers/timer/periodic +SRC_CC += periodic/time_source.cc fiasco/time_source.cc + +include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/hw/target.mk b/repos/os/src/drivers/timer/hw/target.mk new file mode 100644 index 000000000..5ae63888b --- /dev/null +++ b/repos/os/src/drivers/timer/hw/target.mk @@ -0,0 +1,7 @@ +TARGET = hw_timer_drv +REQUIRES = hw +LIBS = syscall-hw +INC_DIR += $(PRG_DIR) +SRC_CC += hw/time_source.cc + +include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/spec/hw/time_source.cc b/repos/os/src/drivers/timer/hw/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/hw/time_source.cc rename to repos/os/src/drivers/timer/hw/time_source.cc diff --git a/repos/os/src/drivers/timer/spec/hw/time_source.h b/repos/os/src/drivers/timer/hw/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/spec/hw/time_source.h rename to repos/os/src/drivers/timer/hw/time_source.h diff --git a/repos/os/src/drivers/timer/linux/target.mk b/repos/os/src/drivers/timer/linux/target.mk new file mode 100644 index 000000000..9aeefc511 --- /dev/null +++ b/repos/os/src/drivers/timer/linux/target.mk @@ -0,0 +1,7 @@ +TARGET = linux_timer_drv +REQUIRES = linux +INC_DIR += $(REP_DIR)/src/drivers/timer/periodic +SRC_CC += periodic/time_source.cc linux/time_source.cc +LIBS += syscall + +include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/spec/linux/time_source.cc b/repos/os/src/drivers/timer/linux/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/linux/time_source.cc rename to repos/os/src/drivers/timer/linux/time_source.cc diff --git a/repos/os/src/drivers/timer/nova/target.mk b/repos/os/src/drivers/timer/nova/target.mk new file mode 100644 index 000000000..5644a06c4 --- /dev/null +++ b/repos/os/src/drivers/timer/nova/target.mk @@ -0,0 +1,6 @@ +TARGET = nova_timer_drv +REQUIRES = nova +INC_DIR += $(REP_DIR)/src/drivers/timer/nova +SRC_CC += nova/time_source.cc + +include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/spec/nova/time_source.cc b/repos/os/src/drivers/timer/nova/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/nova/time_source.cc rename to repos/os/src/drivers/timer/nova/time_source.cc diff --git a/repos/os/src/drivers/timer/spec/nova/time_source.h b/repos/os/src/drivers/timer/nova/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/spec/nova/time_source.h rename to repos/os/src/drivers/timer/nova/time_source.h diff --git a/repos/os/src/drivers/timer/spec/periodic/time_source.cc b/repos/os/src/drivers/timer/periodic/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/periodic/time_source.cc rename to repos/os/src/drivers/timer/periodic/time_source.cc diff --git a/repos/os/src/drivers/timer/spec/periodic/time_source.h b/repos/os/src/drivers/timer/periodic/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/spec/periodic/time_source.h rename to repos/os/src/drivers/timer/periodic/time_source.h diff --git a/repos/os/src/drivers/timer/pistachio/target.mk b/repos/os/src/drivers/timer/pistachio/target.mk new file mode 100644 index 000000000..dc3d7cf8d --- /dev/null +++ b/repos/os/src/drivers/timer/pistachio/target.mk @@ -0,0 +1,8 @@ +TARGET = pistachio_timer_drv +REQUIRES = pistachio +INC_DIR += $(REP_DIR)/src/drivers/timer/include +INC_DIR += $(REP_DIR)/src/drivers/timer/periodic +SRC_CC += periodic/time_source.cc pistachio/time_source.cc main.cc +LIBS += syscall base-pistachio timeout + +vpath %.cc $(REP_DIR)/src/drivers/timer diff --git a/repos/os/src/drivers/timer/spec/pistachio/time_source.cc b/repos/os/src/drivers/timer/pistachio/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/pistachio/time_source.cc rename to repos/os/src/drivers/timer/pistachio/time_source.cc diff --git a/repos/os/src/drivers/timer/pit/target.mk b/repos/os/src/drivers/timer/pit/target.mk new file mode 100644 index 000000000..4ec007462 --- /dev/null +++ b/repos/os/src/drivers/timer/pit/target.mk @@ -0,0 +1,6 @@ +TARGET = pit_timer_drv +REQUIRES = x86 +INC_DIR += $(PRG_DIR) +SRC_CC += time_source.cc + +include $(REP_DIR)/src/drivers/timer/target.inc diff --git a/repos/os/src/drivers/timer/spec/pit/time_source.cc b/repos/os/src/drivers/timer/pit/time_source.cc similarity index 100% rename from repos/os/src/drivers/timer/spec/pit/time_source.cc rename to repos/os/src/drivers/timer/pit/time_source.cc diff --git a/repos/os/src/drivers/timer/spec/pit/time_source.h b/repos/os/src/drivers/timer/pit/time_source.h similarity index 100% rename from repos/os/src/drivers/timer/spec/pit/time_source.h rename to repos/os/src/drivers/timer/pit/time_source.h diff --git a/repos/os/lib/mk/timer.inc b/repos/os/src/drivers/timer/target.inc similarity index 67% rename from repos/os/lib/mk/timer.inc rename to repos/os/src/drivers/timer/target.inc index 6d49f9906..72b8f8e65 100644 --- a/repos/os/lib/mk/timer.inc +++ b/repos/os/src/drivers/timer/target.inc @@ -1,7 +1,5 @@ -SRC_CC += main.cc - -LIBS += base timeout - +SRC_CC += main.cc +LIBS += base timeout INC_DIR += $(REP_DIR)/src/drivers/timer/include vpath %.cc $(REP_DIR)/src/drivers/timer diff --git a/repos/os/src/drivers/timer/target.mk b/repos/os/src/drivers/timer/target.mk deleted file mode 100644 index c4ed3c9a9..000000000 --- a/repos/os/src/drivers/timer/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = timer -LIBS = timer -SRC_CC = empty.cc diff --git a/tool/run/boot_dir/fiasco b/tool/run/boot_dir/fiasco index 79b7a4096..4e68df41c 100644 --- a/tool/run/boot_dir/fiasco +++ b/tool/run/boot_dir/fiasco @@ -1,4 +1,5 @@ proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" } +proc binary_name_timer { } { return "fiasco_timer_drv" } ## diff --git a/tool/run/boot_dir/foc b/tool/run/boot_dir/foc index bbff8c40e..4b8450d18 100644 --- a/tool/run/boot_dir/foc +++ b/tool/run/boot_dir/foc @@ -1,12 +1,5 @@ -# -# \brief Fiasco.OC-specific test-environment supplements -# \author Stefan Kalkowski -# \date 2010-11-22 -# -# This file is meant to be used as '--include' argument for 'tool/run'. -# - proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" } +proc binary_name_timer { } { return "foc_timer_drv" } ## diff --git a/tool/run/boot_dir/hw b/tool/run/boot_dir/hw index 1761a52d5..e686e0267 100644 --- a/tool/run/boot_dir/hw +++ b/tool/run/boot_dir/hw @@ -1,4 +1,5 @@ proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" } +proc binary_name_timer { } { return "hw_timer_drv" } proc run_boot_string { } { return "\nkernel initialized" } diff --git a/tool/run/boot_dir/linux b/tool/run/boot_dir/linux index 7527ec7b3..11088bf1d 100644 --- a/tool/run/boot_dir/linux +++ b/tool/run/boot_dir/linux @@ -1,4 +1,5 @@ proc binary_name_ld_lib_so { } { return "ld-linux.lib.so" } +proc binary_name_timer { } { return "linux_timer_drv" } ## diff --git a/tool/run/boot_dir/nova b/tool/run/boot_dir/nova index 88314a1e2..9aad25886 100644 --- a/tool/run/boot_dir/nova +++ b/tool/run/boot_dir/nova @@ -1,4 +1,5 @@ proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" } +proc binary_name_timer { } { return "nova_timer_drv" } ## diff --git a/tool/run/boot_dir/okl4 b/tool/run/boot_dir/okl4 index e8a63b9c7..ff91e7f61 100644 --- a/tool/run/boot_dir/okl4 +++ b/tool/run/boot_dir/okl4 @@ -1,4 +1,5 @@ proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" } +proc binary_name_timer { } { return "pit_timer_drv" } ## diff --git a/tool/run/boot_dir/pistachio b/tool/run/boot_dir/pistachio index da9a28c48..198520090 100644 --- a/tool/run/boot_dir/pistachio +++ b/tool/run/boot_dir/pistachio @@ -1,12 +1,5 @@ -# -# \brief Pistachio-specific test-environment supplements -# \author Norman Feske -# \date 2010-08-25 -# -# This file is meant to be used as '--include' argument for 'tool/run'. -# - proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" } +proc binary_name_timer { } { return "pistachio_timer_drv" } ## diff --git a/tool/run/boot_dir/sel4 b/tool/run/boot_dir/sel4 index 63123b243..6e72ee59d 100644 --- a/tool/run/boot_dir/sel4 +++ b/tool/run/boot_dir/sel4 @@ -1,9 +1,8 @@ proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" } +proc binary_name_timer { } { return "pit_timer_drv" } -proc run_boot_string { } { return "\n\rStarting node #0" } - - +proc run_boot_string { } { return "\n\rStarting node #0" } proc core_link_address { } { return "0x02000000" }