From c83239eabc3b09273294a013c4dcb84f09ab0241 Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.huber@secunet.com>
Date: Wed, 5 Oct 2016 17:46:49 +0200
Subject: Hook up libhwbase in ramstage

It's hidden behind a configuration option `CONFIG_RAMSTAGE_LIBHWBASE`.

This also adds some glue code to use the coreboot console for debug
output and our monotonic timer framework as timer backend.

v2: Also update 3rdparty/libhwbase to the latest master commit.

Change-Id: I8e8d50271b46aac1141f95ab55ad323ac0889a8d
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/16951
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
---
 src/lib/Makefile.inc      | 10 ++++++++++
 src/lib/gnat/Makefile.inc |  2 +-
 src/lib/hw-time-timer.adb | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/hw-time-timer.adb

(limited to 'src/lib')

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 36591adbb6..ddade2be1c 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -269,3 +269,13 @@ $(objcbfs)/%.debug.rmod: $(objcbfs)/%.debug | $(RMODTOOL)
 
 $(obj)/%.elf.rmod: $(obj)/%.elf | $(RMODTOOL)
 	$(RMODTOOL) -i $< -o $@
+
+ifeq ($(CONFIG_RAMSTAGE_LIBHWBASE),y)
+
+$(call add-special-class,hw)
+hw-handler = $(eval ramstage-srcs += $$(addprefix $(1),$(2)))
+subdirs-y += ../../3rdparty/libhwbase
+
+ramstage-$(CONFIG_HAVE_MONOTONIC_TIMER) += hw-time-timer.adb
+
+endif # CONFIG_RAMSTAGE_LIBHWBASE
diff --git a/src/lib/gnat/Makefile.inc b/src/lib/gnat/Makefile.inc
index 394c838842..9c68624947 100644
--- a/src/lib/gnat/Makefile.inc
+++ b/src/lib/gnat/Makefile.inc
@@ -62,5 +62,5 @@ $(foreach arch,$(standard-archs), \
 	$(eval $(call libgnat-template,$(arch))))
 
 ifeq ($(CONFIG_RAMSTAGE_ADA),y)
-ramstage-libs += $$(obj)/libgnat-$(ARCH-ramstage-y)/libgnat.a
+ramstage-libs += $(obj)/libgnat-$(ARCH-ramstage-y)/libgnat.a
 endif
diff --git a/src/lib/hw-time-timer.adb b/src/lib/hw-time-timer.adb
new file mode 100644
index 0000000000..643cc98610
--- /dev/null
+++ b/src/lib/hw-time-timer.adb
@@ -0,0 +1,48 @@
+--
+-- This file is part of the coreboot project.
+--
+-- Copyright (C) 2016 secunet Security Networks AG
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; version 2 of the License.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+
+with Interfaces.C;
+
+package body HW.Time.Timer
+   with Refined_State => (Timer_State => null,
+                          Abstract_Time => null)
+is
+
+   procedure Timer_Monotonic_Get (MT : out Interfaces.C.long);
+   pragma Import (C, Timer_Monotonic_Get, "timer_monotonic_get");
+
+   function Raw_Value_Min return T
+   with
+      SPARK_Mode => Off
+   is
+      Microseconds : Interfaces.C.long;
+   begin
+      Timer_Monotonic_Get (Microseconds);
+      return T (Microseconds);
+   end Raw_Value_Min;
+
+   function Raw_Value_Max return T
+   is
+   begin
+      return Raw_Value_Min + 1;
+   end Raw_Value_Max;
+
+   function Hz return T
+   is
+   begin
+      return 1_000_000;
+   end Hz;
+
+end HW.Time.Timer;
-- 
cgit v1.2.3