Fred Reitberger submitted this change.

View Change



2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: build bot (Jenkins): Verified Fred Reitberger: Looks good to me, approved
amdfwtool: Remove the hints of flag --combo-capable

A few references to "--combo-capable" were left after commit 4bfb36ed68154d8ee6fc77a6b2bf79938cae9e8a

Change-Id: I6f425db2a8b86d7ad928baee6bc7b07e5190ba37
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73281
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M util/amdfwtool/amdfwtool.c
1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index b946a1b..0d5acee 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -122,7 +122,7 @@
*
* Modern generations supporting the combo directories require the
* pointer to be at offset 0x14 of the Embedded Firmware Structure,
- * regardless of the type of directory used. The --combo-capable
+ * regardless of the type of directory used. The --use-combo
* argument enforces this placement.
*
* TODO: Future work may require fully implementing the PSP_COMBO feature.
@@ -189,9 +189,6 @@
printf("--gec <FILE> Add GEC blob\n");

printf("\nPSP options:\n");
- printf("--combo-capable Place PSP directory pointer at Embedded\n");
- printf(" Firmware\n");
- printf(" offset able to support combo directory\n");
printf("--use-combo Use the COMBO layout\n");
printf("--multilevel Generate primary and secondary tables\n");
printf("--nvram <FILE> Add nvram binary\n");

To view, visit change 73281. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I6f425db2a8b86d7ad928baee6bc7b07e5190ba37
Gerrit-Change-Number: 73281
Gerrit-PatchSet: 4
Gerrit-Owner: Bao Zheng <fishbaozi@gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Reviewer: Fred Reitberger <reitbergerfred@gmail.com>
Gerrit-Reviewer: Zheng Bao
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged