3 files changed, 67 insertions, 0 deletions
diff --git a/src/include/halt.h b/src/include/halt.h
new file mode 100644
index 0000000000..6b7d753514
--- /dev/null
+++ b/src/include/halt.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 The ChromiumOS Authors
+ *
+ * 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.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 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 55e0d6db03..9dccee6088 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -104,6 +104,11 @@ $(obj)/lib/version.smm.o : $(obj)/build.h
 romstage-y += bootmode.c
 ramstage-y += bootmode.c
 
+bootblock-y += halt.c
+romstage-y += halt.c
+ramstage-y += halt.c
+smm-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 0000000000..edd5f5e915
--- /dev/null
+++ b/src/lib/halt.c
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 The ChromiumOS Authors
+ *
+ * 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.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <arch/hlt.h>
+#include <halt.h>
+
+void halt(void) {
+	while (1) {
+		hlt();
+	}
+}