Patch set updated for coreboot: 7e7d3de Introduce halt()

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7605

-gerrit

commit 7e7d3de3f66b7353e32c4e84ff17b35650a3c236
Author: Patrick Georgi 
Date:   Fri Nov 28 22:00:22 2014 +0100

Introduce halt()

It's a portable and generic way to halt the system.
    Useful when waiting for the platform to reset.

Change-Id: Ie07f3333d294a4d3e982cbc2ab9014c94b39fce0
    Signed-off-by: Patrick Georgi 
---
 src/include/halt.h   | 34 ++++++++++++++++++++++++++++++++++
 src/lib/Makefile.inc |  3 +++
 src/lib/halt.c       | 30 ++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)

diff --git a/src/include/halt.h b/src/include/halt.h
new file mode 100644
index 0000000..b7983ef
--- /dev/null
+++ b/src/include/halt.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 The ChromiumOS Authors
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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; either 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __HALT_H__
+#define __HALT_H__
+
+#ifdef __ROMCC__
+#include <lib/halt.c>
+#else
+/**
+ * halt the system reliably
+ */
+void __attribute__((noreturn)) halt(void);
+#endif /* __ROMCC__ */
+#endif /* __HALT_H__ */
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 55e0d6d..6250459 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -104,6 +104,9 @@ $(obj)/lib/version.smm.o : $(obj)/build.h
 romstage-y += bootmode.c
 ramstage-y += bootmode.c

+romstage-y += halt.c
+ramstage-y += halt.c
+
 ifeq ($(CONFIG_RELOCATABLE_MODULES),y)
 ramstage-y += rmodule.c
 romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c
diff --git a/src/lib/halt.c b/src/lib/halt.c
new file mode 100644
index 0000000..dd8d00e
--- /dev/null
+++ b/src/lib/halt.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2014 The ChromiumOS Authors
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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; either 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <arch/hlt.h>
+#include <halt.h>
+
+void halt(void) __attribute__((noreturn)) {
+	while (1) {
+		hlt();
+	}
+}