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:
(5 comments)
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Kconfig File src/soc/amd/stoneyridge/Kconfig:
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Kconfig@26 PS2, Line 26: _FP4 You could drop the FP4 designation just like in 00660F01. The FT4 Infrastructure Roadmap says it's Models 70-7F, i.e. there's no Merlin Falcon / Carrizo (Models 60-6F) in an FT4. We've never claimed support for AM4 with this family, although it might work with a different PI build. And FWIW if we assumed additional possibilities for supporting additional families/infrastructures, I'd probably start rethinking the options in this file.
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Kconfig@83 PS2, Line 83: config CPU_SPECIFIC_OPTIONS
More like 90%. […]
Is there any difference besides SOC_AMD_PSP_SELECTABLE_SMU_FW? For that, duplicate the item from common/block/psp/Kconfig to this file. Remove the select from the list and use 'if' to change the default to y when building ST. Then remove this block, of course.
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Kconfig@201 PS2, Line 201: 00660F01/VBIOS.bin I would go ahead and duplicate VBIOS.bin into the merlinfalcon directory. The hope is to deprecate the nb//00660F01 once you're done.
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 You changed the filenames from their originals? I thought everything was CZ/BR/ST.
https://review.coreboot.org/#/c/33621/2/src/soc/amd/stoneyridge/Makefile.inc... PS2, Line 239: ifeq ($(CONFIG_SOC_AMD_MERLINFALCON_FP4),y) Is this all so that you can remove --combo-capable? I didn't notice any other differences. Just make an OPT_ assignment for that above and don't create unique sections here.