Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33622
Change subject: vendorcode/amd/pi: Add code for merlinfalcon ......................................................................
vendorcode/amd/pi: Add code for merlinfalcon
In preparation to commit code for board padmelon (SOC merlinfalcon), add merlinfalcon specific vendor code.
BUG=b:none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/Kconfig M src/vendorcode/amd/pi/Makefile.inc A src/vendorcode/amd/pi/merlinfalcon/AGESA.h A src/vendorcode/amd/pi/merlinfalcon/AMD.h A src/vendorcode/amd/pi/merlinfalcon/Include/Filecode.h A src/vendorcode/amd/pi/merlinfalcon/Include/PlatformMemoryConfiguration.h A src/vendorcode/amd/pi/merlinfalcon/Include/Topology.h A src/vendorcode/amd/pi/merlinfalcon/Makefile.inc A src/vendorcode/amd/pi/merlinfalcon/Porting.h A src/vendorcode/amd/pi/merlinfalcon/Proc/CPU/Family/cpuFamRegisters.h A src/vendorcode/amd/pi/merlinfalcon/Proc/CPU/Table.h A src/vendorcode/amd/pi/merlinfalcon/Proc/CPU/cpuFamilyTranslation.h A src/vendorcode/amd/pi/merlinfalcon/Proc/CPU/cpuRegisters.h A src/vendorcode/amd/pi/merlinfalcon/Proc/CPU/cpuServices.h A src/vendorcode/amd/pi/merlinfalcon/Proc/CPU/heapManager.h A src/vendorcode/amd/pi/merlinfalcon/Proc/Common/AmdFch.h A src/vendorcode/amd/pi/merlinfalcon/Proc/Fch/Common/FchCommonCfg.h A src/vendorcode/amd/pi/merlinfalcon/Proc/Fch/Fch.h A src/vendorcode/amd/pi/merlinfalcon/Proc/Fch/FchPlatform.h A src/vendorcode/amd/pi/merlinfalcon/agesa_headers.h A src/vendorcode/amd/pi/merlinfalcon/binaryPI/AGESA.c A src/vendorcode/amd/pi/merlinfalcon/binaryPI/OptionsIds.h A src/vendorcode/amd/pi/merlinfalcon/binaryPI/gcccar.inc A src/vendorcode/amd/pi/merlinfalcon/check_for_wrapper.h A src/vendorcode/amd/pi/merlinfalcon/gcc-intrin.h 25 files changed, 15,459 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/1
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Add code for merlinfalcon ......................................................................
Patch Set 2:
Where did these files come from? Since the StoneyPI package is backward compatible and you're building from that code, why not use 00670F00 for this product too?
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Add code for merlinfalcon ......................................................................
Patch Set 2:
Patch Set 2:
Where did these files come from? Since the StoneyPI package is backward compatible and you're building from that code, why not use 00670F00 for this product too?
It's been a while I started, but there was some issue when I tried, just don't remember what. Will write more when I remember (or try again).
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Add code for merlinfalcon ......................................................................
Patch Set 2:
Patch Set 2:
Patch Set 2:
Where did these files come from? Since the StoneyPI package is backward compatible and you're building from that code, why not use 00670F00 for this product too?
It's been a while I started, but there was some issue when I tried, just don't remember what. Will write more when I remember (or try again).
I can't remember and it's gone... whatever it was, it was probably fixed together with something else... so yes, I don't need the new files, just the modified ones.
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Add code for merlinfalcon ......................................................................
Patch Set 2:
Patch Set 2:
Patch Set 2:
Patch Set 2:
Where did these files come from? Since the StoneyPI package is backward compatible and you're building from that code, why not use 00670F00 for this product too?
It's been a while I started, but there was some issue when I tried, just don't remember what. Will write more when I remember (or try again).
I can't remember and it's gone... whatever it was, it was probably fixed together with something else... so yes, I don't need the new files, just the modified ones.
Richard, I believe you're capable of figuring it out... You shouldn't put vendorcode here on behalf of AMD if you can't reproduce the steps. Please try to compare the files with 00670F00, for example, to see if that's where you got them. (I'll repeat my previous question, of course, which is "why not use 00670F00?") In the event you needed to modify what you received from AMD, that needs to be documented _very_ well.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Add code for merlinfalcon ......................................................................
Patch Set 2:
I thought it was clear: I'll use 00670F00. That said, I could ID where did I got merlinfalcon from from, but what would be the point? It might very well be that the only reason I got it was for symmetry. It might have been that I just copied the one used by Marc. I just don't remember, as it was early in the project. The folder vendorcode/amd/pi/merlinfalcon will be eliminated.
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#3).
Change subject: vendorcode/amd/pi: Change Kconfig and Makefile.inc ......................................................................
vendorcode/amd/pi: Change Kconfig and Makefile.inc
In preparation to commit code for board padmelon (SOC merlinfalcon), add merlinfalcon specific vendor code changes.
BUG=b:none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/Kconfig M src/vendorcode/amd/pi/Makefile.inc 2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/3
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Change Kconfig and Makefile.inc ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/#/c/33622/3/src/vendorcode/amd/pi/Makefile.inc File src/vendorcode/amd/pi/Makefile.inc:
https://review.coreboot.org/#/c/33622/3/src/vendorcode/amd/pi/Makefile.inc@3... PS3, Line 32: merlinfalcon I feel like I'm missing something -- PS3 no longer has the merlinfalcon directory here. Sorry if I've goofed it. But of course abuild won't fail on this patch because there's no board to try to build SOC_AMD_MERLINFALCON yet.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Change Kconfig and Makefile.inc ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/#/c/33622/3/src/vendorcode/amd/pi/Makefile.inc File src/vendorcode/amd/pi/Makefile.inc:
https://review.coreboot.org/#/c/33622/3/src/vendorcode/amd/pi/Makefile.inc@3... PS3, Line 32: merlinfalcon
I feel like I'm missing something -- PS3 no longer has the merlinfalcon directory here. […]
You are correct. Will fix.
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#4).
Change subject: vendorcode/amd/pi: Change Kconfig ......................................................................
vendorcode/amd/pi: Change Kconfig
In preparation to commit code for board padmelon (SOC merlinfalcon), add merlinfalcon specific vendor code change.
BUG=b:none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/Kconfig 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/4
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#5).
Change subject: vendorcode/amd/pi: Change Kconfig ......................................................................
vendorcode/amd/pi: Change Kconfig
In preparation to commit code for board padmelon (SOC merlinfalcon), add merlinfalcon specific vendor code change.
BUG=b:none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/5
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Change Kconfig ......................................................................
Patch Set 5: Code-Review+2
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#6).
Change subject: vendorcode/amd/pi: Change Kconfig ......................................................................
vendorcode/amd/pi: Change Kconfig
In preparation to commit code for board padmelon (SOC merlinfalcon), add merlinfalcon specific vendor code change.
BUG=none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/6
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Change Kconfig ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/6//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/33622/6//COMMIT_MSG@7 PS6, Line 7: vendorcode/amd/pi: Change Kconfig That’s quite unspecific. Maybe:
Integrate Merlin Falcon changes in Kconfig
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Change Kconfig ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/6//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/33622/6//COMMIT_MSG@7 PS6, Line 7: vendorcode/amd/pi: Change Kconfig
That’s quite unspecific. Maybe: […]
It was originally specific, than I had to change it because a lot of what I was doing before changed... and I did not thought much... Will change, though not exactly your words.
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#7).
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
vendorcode/amd/pi: Integrate Merlin Falcon as a build option
In preparation to commit code for board padmelon (SOC merlinfalcon), add merlinfalcon specific vendor code change.
BUG=none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/7
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/7/src/vendorcode/amd/pi/Kconf... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/7/src/vendorcode/amd/pi/Kconf... PS7, Line 43: if MERLINFALCON_BINARIES_PRESENT default "3rdparty/blobs/pi/amd/merlinfalcon/FP4/AGESA_CZ_FP4.bin" if SOC_AMD_MERLINFALCON && MERLINFALCON_BINARIES_PRESENT default "3rdparty/blobs/pi/amd/00670F00/FP4/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 || !MERLINFALCON_BINARIES_PRESENT
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/7/src/vendorcode/amd/pi/Kconf... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/7/src/vendorcode/amd/pi/Kconf... PS7, Line 43: if MERLINFALCON_BINARIES_PRESENT
default "3rdparty/blobs/pi/amd/merlinfalcon/FP4/AGESA_CZ_FP4. […]
No need, we already verified that merlinfalcon works well with src/vendorcode/amd/pi/00670F00
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#8).
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
vendorcode/amd/pi: Integrate Merlin Falcon as a build option
Add changes needed to build a project using Merlin Falcon SOC using 00670F00 vendor code, which is backward compatible with Merlin Falcon. Only the AGESA binary image is different then the one used by 00670F00.
BUG=none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/8
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#9).
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
vendorcode/amd/pi: Integrate Merlin Falcon as a build option
Add changes needed to build a project using Merlin Falcon SOC using 00670F00 vendor code, which is backward compatible with Merlin Falcon. Only the AGESA binary image is different then the one used by 00670F00.
BUG=none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/9
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... PS10, Line 48: if SOC_AMD_STONEYRIDGE_FP4 || I think you meant for this to be "if SOC_AMD_STONEYRIDGE_FP4 &&"
Otherwise we're going to get this value for CPU_AMD_PI_00660F01 because it doesn't set HAVE_MERLINFALCON_BINARIES.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... PS10, Line 48: if SOC_AMD_STONEYRIDGE_FP4 ||
I think you meant for this to be "if SOC_AMD_STONEYRIDGE_FP4 &&" […]
If there's no binaries I want 00670F00 AGESA. Though I'm starting to consider doing it differently. The configuration I'm setting when there's no Merlin Falcon binaries are for Prairie Falcon, a valid SOC for padmelon board (I have 2 padmelon boards, one with each SOC). So I'm considering removing "HAVE_MERLINFALCON_BINARIES" and replacing with "SOC_AMD_PRAIRIEFALCON".
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... PS10, Line 48: if SOC_AMD_STONEYRIDGE_FP4 ||
If there's no binaries I want 00670F00 AGESA. Though I'm starting to consider doing it differently. […]
I'm just pointing out that by saying || !HAVE_MERLINFALCON_BINARIES here, that will be the new default for everything other than merlinfalcon, which is wrong.
If you changed it the way I suggested, I'd give this a +2. I don't see any reason to do it differently.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... PS10, Line 48: if SOC_AMD_STONEYRIDGE_FP4 ||
I'm just pointing out that by saying || !HAVE_MERLINFALCON_BINARIES here, that will be the new defau […]
I see your point... if I added anything new below this line there would be a problem. Will change.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... PS10, Line 48: if SOC_AMD_STONEYRIDGE_FP4 ||
I see your point... if I added anything new below this line there would be a problem. Will change.
Actually the mistake is worse... it should be default "3rdparty/blobs/pi/amd/00670F00/FP4/AGESA.bin" if SOC_AMD_MERLINFALCON && !HAVE_MERLINFALCON_BINARIES
Hello Charles Marslett, Marshall Dawson, Paul Menzel, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/33622
to look at the new patch set (#11).
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
vendorcode/amd/pi: Integrate Merlin Falcon as a build option
Add changes needed to build a project using Merlin Falcon SOC using 00670F00 vendor code, which is backward compatible with Merlin Falcon. Only the AGESA binary image is different then the one used by 00670F00.
BUG=none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/33622/11
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 11: Code-Review+2
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
Patch Set 11:
(4 comments)
We're trying something new in gerrit: Before something can be merged now, all remarks have to be marked as resolved.
https://review.coreboot.org/c/coreboot/+/33622/6//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/33622/6//COMMIT_MSG@7 PS6, Line 7: vendorcode/amd/pi: Change Kconfig
It was originally specific, than I had to change it because a lot of what I was doing before changed […]
Done
https://review.coreboot.org/c/coreboot/+/33622/7/src/vendorcode/amd/pi/Kconf... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/7/src/vendorcode/amd/pi/Kconf... PS7, Line 43: if MERLINFALCON_BINARIES_PRESENT
No need, we already verified that merlinfalcon works well with src/vendorcode/amd/pi/00670F00
Done
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... File src/vendorcode/amd/pi/Kconfig:
https://review.coreboot.org/c/coreboot/+/33622/10/src/vendorcode/amd/pi/Kcon... PS10, Line 48: if SOC_AMD_STONEYRIDGE_FP4 ||
Actually the mistake is worse... it should be […]
Done
https://review.coreboot.org/c/coreboot/+/33622/3/src/vendorcode/amd/pi/Makef... File src/vendorcode/amd/pi/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/33622/3/src/vendorcode/amd/pi/Makef... PS3, Line 32: merlinfalcon
You are correct. Will fix.
Done
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33622 )
Change subject: vendorcode/amd/pi: Integrate Merlin Falcon as a build option ......................................................................
vendorcode/amd/pi: Integrate Merlin Falcon as a build option
Add changes needed to build a project using Merlin Falcon SOC using 00670F00 vendor code, which is backward compatible with Merlin Falcon. Only the AGESA binary image is different then the one used by 00670F00.
BUG=none. TEST=Tested later with padmelon board.
Change-Id: Id3341f6a1ef2561a6391d3db8c54f6bdd09b0c0e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/33622 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com --- M src/vendorcode/amd/pi/00670F00/Makefile.inc M src/vendorcode/amd/pi/Kconfig 2 files changed, 5 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved
diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc index 790955a..fef7dff 100644 --- a/src/vendorcode/amd/pi/00670F00/Makefile.inc +++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc @@ -28,7 +28,7 @@ # #*****************************************************************************
-ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y) +ifeq ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y) # AGESA V5 Files
AGESA_ROOT = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH)) diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index f463b7d..08e7cc6 100644 --- a/src/vendorcode/amd/pi/Kconfig +++ b/src/vendorcode/amd/pi/Kconfig @@ -26,12 +26,13 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #
-if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4 +if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE_FP4 || SOC_AMD_STONEYRIDGE_FT4 || SOC_AMD_MERLINFALCON
config AGESA_BINARY_PI_VENDORCODE_PATH string "AGESA PI directory path" default "src/vendorcode/amd/pi/00630F01" if CPU_AMD_PI_00630F01 default "src/vendorcode/amd/pi/00730F01" if CPU_AMD_PI_00730F01 + default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_MERLINFALCON default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_STONEYRIDGE_FP4 default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_STONEYRIDGE_FT4 default "src/vendorcode/amd/pi/00660F01" if CPU_AMD_PI_00660F01 @@ -43,6 +44,8 @@ string "AGESA PI binary file name" default "3rdparty/blobs/pi/amd/00630F01/FP3/AGESA.bin" if CPU_AMD_PI_00630F01 default "3rdparty/blobs/pi/amd/00730F01/FT3b/AGESA.bin" if CPU_AMD_PI_00730F01 + default "3rdparty/blobs/pi/amd/merlinfalcon/FP4/AGESA_CZ_FP4.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES + default "3rdparty/blobs/pi/amd/00670F00/FP4/AGESA.bin" if SOC_AMD_MERLINFALCON && !HAVE_MERLINFALCON_BINARIES default "3rdparty/blobs/pi/amd/00670F00/FP4/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01
-
Marshall Dawson (Code Review) -
Martin Roth (Code Review)
-
Paul Menzel (Code Review)
-
Richard Spiegel (Code Review)