Merge branch 'memtest86plus-merge' of kragle/libreboot into master

5 files changed, 139 insertions, 0 deletions

diff --git a/projects/memtest86plus/configs/install b/projects/memtest86plus/configs/install
new file mode 100644
index 00000000..4092a417
--- /dev/null
+++ b/projects/memtest86plus/configs/install
@@ -0,0 +1 @@
+memtest:memtest.elf
diff --git a/projects/memtest86plus/configs/revision b/projects/memtest86plus/configs/revision
new file mode 100644
index 00000000..e16bc904
--- /dev/null
+++ b/projects/memtest86plus/configs/revision
@@ -0,0 +1 @@
+1fa69864d4c0aa46bb3ebd7feb966c882fb81a84
diff --git a/projects/memtest86plus/configs/targets b/projects/memtest86plus/configs/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/memtest86plus/configs/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/memtest86plus/memtest86plus b/projects/memtest86plus/memtest86plus
new file mode 100755
index 00000000..d443447c
--- /dev/null
+++ b/projects/memtest86plus/memtest86plus
@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
+#
+# 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 3 of the License, or
+# (at your option) any later version.
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+arguments() {
+	project_arguments_targets "${project}" "$@"
+}
+
+usage() {
+	project_usage_actions "${project}"
+	project_usage_arguments "${project}" "$@"
+}
+
+download() {
+	local repository="${project}"
+
+	project_download_git "${project}" "${repository}" 'https://review.coreboot.org/memtest86plus.git' "$@"
+}
+
+download_check() {
+	local repository="${project}"
+
+	project_download_check_git "${project}" "${repository}" "$@"
+}
+
+extract() {
+	local repository="${project}"
+
+	project_extract "${project}" "$@"
+}
+
+extract_check() {
+	local repository="${project}"
+
+	project_extract_check "${project}" "$@"
+}
+
+update() {
+	local repository="${project}"
+
+	project_update_git "${project}" "${repository}" "$@"
+}
+
+update_check() {
+	local repository="${project}"
+
+	project_update_check_git "${project}" "${repository}" "$@"
+}
+
+build() {
+	local repository="${project}"
+
+	project_sources_directory_missing_empty_error "${project}" "${repository}" "$@"
+
+	if git_project_check "${repository}"; then
+		git_project_checkout "${project}" "${repository}" "$@"
+	fi
+
+	local sources_path="$(project_sources_path "${project}" "${repository}" "$@")"
+
+	local build_path="$(project_build_path "${project}" "$@")"
+
+	mkdir -p "${build_path}"
+	make -C "${sources_path}" -j"${TASKS}"
+	cp "${sources_path}/memtest" "${build_path}"
+	make -C "${sources_path}" 'clean'
+}
+
+build_check() {
+	project_build_check "${project}" "$@"
+}
+
+install() {
+	project_install "${project}" "$@"
+}
+
+install_check() {
+	project_install_check "${project}" "$@"
+}
+
+release() {
+	local repository="${project}"
+
+	project_release_install_archive "${project}" "${TOOLS}" "$@"
+	project_release_sources_git "${project}" "${repository}" "$@"
+}
+
+release_check() {
+	local repository="memtest86plus"
+
+	project_release_install_archive_check "${project}" "${TOOLS}" "$@"
+	project_release_check_sources_git "${project}" "${repository}" "$@"
+}
+
+clean() {
+	project_clean "${project}" "$@"
+}
diff --git a/projects/memtest86plus/patches/0001-turn-on-beep-mode.patch b/projects/memtest86plus/patches/0001-turn-on-beep-mode.patch
new file mode 100644
index 00000000..0ad3bc3f
--- /dev/null
+++ b/projects/memtest86plus/patches/0001-turn-on-beep-mode.patch
@@ -0,0 +1,25 @@
+From f8e0c94b546cdba083f33efd062334822240a12b Mon Sep 17 00:00:00 2001
+From: Andrew Robbins <contact@andrewrobbins.info>
+Date: Fri, 30 Jun 2017 01:42:23 -0400
+Subject: [PATCH] turn on beep mode
+
+---
+ config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.h b/config.h
+index 102250d..8a36fd2 100644
+--- a/config.h
++++ b/config.h
+@@ -20,7 +20,7 @@
+ 
+ /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */
+ #ifndef BEEP_MODE
+-#define BEEP_MODE 0
++#define BEEP_MODE 1
+ #endif
+ 
+ /* BEEP_END_NO_ERROR - Beep at end of each pass without error. Default off, Change to 1 to enable */
+-- 
+1.9.1
+