From be3d7b7e69189055fbf8b7904336593a03a17ecd Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 18 Mar 2023 15:20:03 +0000
Subject: haswell: re-add mrc.bin in separate board configs

libre mrc on haswell is quite buggy for now, but works in
a limited fashion

this patch re-adds the old configs, but as _mrc for example
t440p_12mb_mrc instead of t440p_12mb

and t440p_12mb (without _mrc) still uses the libre mrc code
---
 resources/scripts/blobs/download | 8 ++++++++
 resources/scripts/blobs/extract  | 5 +++++
 resources/scripts/blobs/inject   | 5 +++++
 3 files changed, 18 insertions(+)

(limited to 'resources/scripts/blobs')

diff --git a/resources/scripts/blobs/download b/resources/scripts/blobs/download
index d8e55568..186755dc 100755
--- a/resources/scripts/blobs/download
+++ b/resources/scripts/blobs/download
@@ -19,6 +19,9 @@ Download_needed(){
 			*ME*)
 				Extract_me || _failed="${_failed} me"
 				;;
+			*MRC*)
+				./download mrc || _failed="${_failed} mrc"
+				;;
 	esac
 	done
 	
@@ -92,6 +95,11 @@ set -- "resources/coreboot/${board}/config/*"
 . ${1} 2>/dev/null
 . "resources/coreboot/${board}/board.cfg"
 
+if [ "${CONFIG_HAVE_MRC}" = "y" ]; then
+	printf 'haswell board detected, downloading mrc\n'
+	needs="${needs} MRC"
+fi
+
 if [ "${CONFIG_HAVE_IFD_BIN}" = "y" ]; then
 	printf 'board needs intel firmware descriptor\n'
 	needs="${needs} IFD"
diff --git a/resources/scripts/blobs/extract b/resources/scripts/blobs/extract
index 64cff653..9080207e 100755
--- a/resources/scripts/blobs/extract
+++ b/resources/scripts/blobs/extract
@@ -48,6 +48,11 @@ Extract_blobs(){
 	. ${1} 2>/dev/null
 	. "resources/coreboot/${board}/board.cfg"
 
+	if [ "$CONFIG_HAVE_MRC" = "y" ]; then
+		printf 'haswell board detected, downloading mrc\n'
+		./download mrc || Fail 'could not download mrc, check network connection'
+	fi
+
 	_me_destination=${CONFIG_ME_BIN_PATH#../../}
 	_gbe_destination=${CONFIG_GBE_BIN_PATH#../../}
 	_ifd_destination=${CONFIG_IFD_BIN_PATH#../../}
diff --git a/resources/scripts/blobs/inject b/resources/scripts/blobs/inject
index 0839c68a..125a5481 100755
--- a/resources/scripts/blobs/inject
+++ b/resources/scripts/blobs/inject
@@ -75,6 +75,11 @@ set -- "resources/coreboot/${board}/config/*"
 . ${1} 2>/dev/null
 . "resources/coreboot/${board}/board.cfg"
 
+	if [ "$CONFIG_HAVE_MRC" = "y" ]; then
+		printf 'adding mrc\n'
+		./coreboot/default/util/cbfstool/cbfstool ${rom} add -f mrc/haswell/mrc.bin -n mrc.bin -t mrc || exit 1
+	fi
+
 	if [ "${CONFIG_HAVE_ME_BIN}" = "y" ]; then
 		_me_location=${CONFIG_ME_BIN_PATH#../../}
 		printf 'adding intel management engine\n'
-- 
cgit v1.2.1