[coreboot-gerrit] Change in coreboot[master]: intel/common/firmware: Add config to specify me_cleaner arguments

[Youness Alaoui (Code Review)]

Youness Alaoui has uploaded this change for review. ( https://review.coreboot.org/26497


Change subject: intel/common/firmware: Add config to specify me_cleaner arguments
......................................................................

intel/common/firmware: Add config to specify me_cleaner arguments

Having the ME stripping integrated in coreboot is great, but useless
if you can't specify the -S option (to set HAP bit) or other custom
options you might need (such as '-w MFS' for librems).

This commit adds a config option to specify the me_cleaner arguments.
In the Makefile, the quotes around the config variables are removed but
escaped characters are not unescaped.

Change-Id: I7c39533ac07f517c1d652f1fb907be99eb62b836
Signed-off-by: Youness Alaoui <youness.alaoui at puri.sm>
---
M src/southbridge/intel/common/firmware/Kconfig
M src/southbridge/intel/common/firmware/Makefile.inc
2 files changed, 15 insertions(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/26497/1

diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index fd6a523..a0f8274 100644
--- a/src/southbridge/intel/common/firmware/Kconfig
+++ b/src/southbridge/intel/common/firmware/Kconfig
@@ -100,6 +100,20 @@
 
 	  If unsure, say N.
 
+config ME_CLEANER_ARGUMENTS
+	string "Optional arguments to pass to me_cleaner for ME stripping"
+	depends on USE_ME_CLEANER
+	default ""
+	help
+	  The me_cleaner tool can take additional arguments such as -S to enable
+	  the HAP/AltMeDisable bit, or -w to whitelist specific partitions, etc..
+	  Be careful with using quotes in your arguments here, as a
+	  -w "MFS"
+	  argument will result with me_cleaner receiving :
+	  -w \"MFS\"
+	  and since no partition is named "MFS" (including quotes), it won't find
+	  it and won't whitelist it.
+
 comment "Please test the modified ME/TXE firmware and coreboot in two steps"
 	depends on USE_ME_CLEANER
 
diff --git a/src/southbridge/intel/common/firmware/Makefile.inc b/src/southbridge/intel/common/firmware/Makefile.inc
index d6e6296..c2ebd13 100644
--- a/src/southbridge/intel/common/firmware/Makefile.inc
+++ b/src/southbridge/intel/common/firmware/Makefile.inc
@@ -63,7 +63,7 @@
 endif
 ifeq ($(CONFIG_USE_ME_CLEANER),y)
 	printf "    ME_CLEANER coreboot.pre\n"
-	util/me_cleaner/me_cleaner.py $(obj)/coreboot.pre > \
+	util/me_cleaner/me_cleaner.py $(patsubst "%,%,$(patsubst %",%,$(CONFIG_ME_CLEANER_ARGUMENTS))) $(obj)/coreboot.pre > \
 		$(obj)/me_cleaner.log
 endif
 ifeq ($(CONFIG_HAVE_GBE_BIN),y)

-- 
To view, visit https://review.coreboot.org/26497
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c39533ac07f517c1d652f1fb907be99eb62b836
Gerrit-Change-Number: 26497
Gerrit-PatchSet: 1
Gerrit-Owner: Youness Alaoui <snifikino at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180523/58c67131/attachment.html>