From 548872ce8e84fe10d52417acab9b3cf886821386 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 18 Mar 2023 00:36:27 +0000
Subject: haswell boards: use libre mrc.bin replacement

courtesy of Angel Pons from the coreboot project

this uses the following patch set from gerrit, as yet
unmerged (in coreboot master) on this date:

    https://review.coreboot.org/c/coreboot/+/64198/5

logic for downloading mrc blobs has been deleted from
lbmk, as this is now completely obsolete (for haswell
boards)

if other platforms are added later that need mrc.bin,
then logic will be re-added again for that
---
 resources/scripts/blobs/download | 9 ---------
 resources/scripts/blobs/extract  | 5 -----
 resources/scripts/blobs/inject   | 5 -----
 3 files changed, 19 deletions(-)

(limited to 'resources/scripts/blobs')

diff --git a/resources/scripts/blobs/download b/resources/scripts/blobs/download
index 3c185477..d8e55568 100755
--- a/resources/scripts/blobs/download
+++ b/resources/scripts/blobs/download
@@ -19,9 +19,6 @@ Download_needed(){
 			*ME*)
 				Extract_me || _failed="${_failed} me"
 				;;
-			*MRC*)
-				./download mrc || _failed="${_failed} mrc"
-				;;
 	esac
 	done
 	
@@ -95,12 +92,6 @@ 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 9080207e..64cff653 100755
--- a/resources/scripts/blobs/extract
+++ b/resources/scripts/blobs/extract
@@ -48,11 +48,6 @@ 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 125a5481..0839c68a 100755
--- a/resources/scripts/blobs/inject
+++ b/resources/scripts/blobs/inject
@@ -75,11 +75,6 @@ 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