Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/libhwbase/+/26839 )
Change subject: mutime: Move to common/ ......................................................................
mutime: Move to common/
It's valid SPARK now.
Change-Id: I03bc3fa7d9bea79680888c13679cfd871e772000 Signed-off-by: Nico Huber nico.huber@secunet.com Reviewed-on: https://review.coreboot.org/c/libhwbase/+/26839 Tested-by: Nico Huber nico.h@gmx.de Reviewed-by: Reto Buerki reet@codelabs.ch --- M ada/Makefile.inc M common/Makefile.inc R common/mutime/hw-time-timer.adb 3 files changed, 4 insertions(+), 4 deletions(-)
Approvals: Nico Huber: Verified Reto Buerki: Looks good to me, approved
diff --git a/ada/Makefile.inc b/ada/Makefile.inc index 2dd0c5a..0074725 100644 --- a/ada/Makefile.inc +++ b/ada/Makefile.inc @@ -2,8 +2,4 @@ hw-$(CONFIG_HWBASE_DYNAMIC_MMIO) += dynamic_mmio/hw-mmio_range.adb hw-$(CONFIG_HWBASE_TIMER_CLOCK_GETTIME) += clock_gettime/hw-time-timer.adb
-hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/musinfo/musinfo.ads -hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/muschedinfo/muschedinfo.ads -hw-$(CONFIG_HWBASE_TIMER_MUTIME) += mutime/hw-time-timer.adb - hw-$(CONFIG_HWBASE_POSIX_FILE) += posix/hw-file.adb diff --git a/common/Makefile.inc b/common/Makefile.inc index efdf21d..98b4fbb 100644 --- a/common/Makefile.inc +++ b/common/Makefile.inc @@ -19,6 +19,10 @@ hw-$(CONFIG_HWBASE_LINUX_PCIDEV) += linux/hw-pci-dev.adb hw-$(CONFIG_HWBASE_LINUX_PCIDEV) += hw-pci-dev.ads
+hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/musinfo/musinfo.ads +hw-$(CONFIG_HWBASE_TIMER_MUTIME) += $(muen-common-path)/muschedinfo/muschedinfo.ads +hw-$(CONFIG_HWBASE_TIMER_MUTIME) += mutime/hw-time-timer.adb + hw-config-ads := $(subst //,/,$(call src-to-obj,,$(dir)/hw-config).ads) $(hw-config-ads): $(dir)/hw-config.ads.template $(cnf) printf " GENERATE $(patsubst /%,%,$(subst $(obj)/,,$@))\n" diff --git a/ada/mutime/hw-time-timer.adb b/common/mutime/hw-time-timer.adb similarity index 100% rename from ada/mutime/hw-time-timer.adb rename to common/mutime/hw-time-timer.adb