Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33621 )
Change subject: soc/amd/stoneyridge: Add merlinfalcon configuration ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Makefile.inc File src/soc/amd/stoneyridge/Makefile.inc:
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Makefile.inc... PS2, Line 146: MF
Yes, I did, though I could have used CZ. […]
BTW you might want to force the FILE_ variables for the fanless SKUs to be empty assignments. Then add_opt_prefix will generate and empty argument string.
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Makefile.inc... PS2, Line 239: ifeq ($(CONFIG_SOC_AMD_MERLINFALCON_FP4),y)
Could you explain better? Not sure what you are saying here.
Somewhere above, add a variable assignment that depends on the device, e.g.
ifeq ($(FIRMWARE_TYPE),ST) OPT_COMBOCAPABLE=--combo-capable endif
Then replace --combo-capable in the amdfwtool arguments with $(OPT_COMBOCAPABLE).