Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
mb/amd/padmelon: Use Prairie Falcon configuration
While Merlin Falcon binaries are not available, make it explicit that it's compiling for Prairie Falcon (it was being surreptitious about it).
Board Padmelon accepts 3 different SOC, just changing some resistors (soldered or not): Brown Falcon, Prairie Falcon and Merlin Falcon. Code for Brown Falcon is not currently available.
BUG=None TEST=Build with prairie falcon.
Change-Id: I1663e4403a32a7d626dd2fa06763f18f4230457e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/mainboard/amd/padmelon/Kconfig 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/36824/1
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig index 3d8efb1..5179ca7 100644 --- a/src/mainboard/amd/padmelon/Kconfig +++ b/src/mainboard/amd/padmelon/Kconfig @@ -17,7 +17,7 @@
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select SOC_AMD_MERLINFALCON + select SOC_AMD_PRAIRIEFALCON select BOARD_ROMSIZE_KB_8192 select DRIVERS_I2C_GENERIC select DRIVERS_PS2_KEYBOARD
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... PS1, Line 20: select SOC_AMD_PRAIRIEFALCON Why not make this a choice instead, since the board can support multiple APUs?
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... PS1, Line 20: select SOC_AMD_PRAIRIEFALCON
Why not make this a choice instead, since the board can support multiple APUs?
I could, provided I don't add Brown Falcon as a possible choice because I don't have the code written for it. I suppose that if I found the correct binaries and select them, it should work... but I would need a Padmelon with Brown Falcon in order to try it.
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... PS1, Line 20: select SOC_AMD_PRAIRIEFALCON
I could, provided I don't add Brown Falcon as a possible choice because I don't have the code writte […]
Obviously only choices for supported technologies.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/1/src/mainboard/amd/padmelon/... PS1, Line 20: select SOC_AMD_PRAIRIEFALCON
Obviously only choices for supported technologies.
Done
Hello Marshall Dawson, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36824
to look at the new patch set (#2).
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
mb/amd/padmelon: Use Prairie Falcon configuration
While Merlin Falcon binaries are not available, make it explicit that it's compiling for Prairie Falcon (it was being surreptitious about it).
Board Padmelon accepts 3 different SOC, just changing some resistors (soldered or not): Brown Falcon, Prairie Falcon and Merlin Falcon. Code for Brown Falcon is not currently available.
BUG=None TEST=Build with prairie falcon.
Change-Id: I1663e4403a32a7d626dd2fa06763f18f4230457e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/mainboard/amd/padmelon/Kconfig 1 file changed, 28 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/36824/2
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 18: choice PADMELON_SOC This whole change should move below BOARD_SPECIFIC_OPTIONS. My recommendation would be after the part number.
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 30: if PADMELON_MERLIN_FALCON : config SOC_AMD_MERLINFALCON : bool : default y : help : AMD Merlin Falcon FP4 support : endif : : if PADMELON_PRAIRIE_FALCON : config SOC_AMD_PRAIRIEFALCON : bool : default y : help : AMD Prairie Falcon FP4 support : endif I believe this should work instead.
config PADMELON_SOC bool select SOC_AMD_MERLINFALCON if PADMELON_MERLIN_FALCON select SOC_AMD_PRAIRIEFALCON if PADMELON_PRAIRIE_FALCON
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 18: choice PADMELON_SOC
This whole change should move below BOARD_SPECIFIC_OPTIONS. […]
Will do.
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 30: if PADMELON_MERLIN_FALCON : config SOC_AMD_MERLINFALCON : bool : default y : help : AMD Merlin Falcon FP4 support : endif : : if PADMELON_PRAIRIE_FALCON : config SOC_AMD_PRAIRIEFALCON : bool : default y : help : AMD Prairie Falcon FP4 support : endif
I believe this should work instead. […]
Will try, if works will use.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 18: choice PADMELON_SOC
Will do.
Done
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 30: if PADMELON_MERLIN_FALCON : config SOC_AMD_MERLINFALCON : bool : default y : help : AMD Merlin Falcon FP4 support : endif : : if PADMELON_PRAIRIE_FALCON : config SOC_AMD_PRAIRIEFALCON : bool : default y : help : AMD Prairie Falcon FP4 support : endif
Will try, if works will use.
Need a name different from choice to work...
Hello Marshall Dawson, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36824
to look at the new patch set (#3).
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
mb/amd/padmelon: Use Prairie Falcon configuration
While Merlin Falcon binaries are not available, make it explicit that it's compiling for Prairie Falcon (it was being surreptitious about it).
Board Padmelon accepts 3 different SOC, just changing some resistors (soldered or not): Brown Falcon, Prairie Falcon and Merlin Falcon. Code for Brown Falcon is not currently available.
BUG=None TEST=Build with prairie falcon.
Change-Id: I1663e4403a32a7d626dd2fa06763f18f4230457e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/mainboard/amd/padmelon/Kconfig 1 file changed, 17 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/36824/3
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 3: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... File src/mainboard/amd/padmelon/Kconfig:
https://review.coreboot.org/c/coreboot/+/36824/2/src/mainboard/amd/padmelon/... PS2, Line 30: if PADMELON_MERLIN_FALCON : config SOC_AMD_MERLINFALCON : bool : default y : help : AMD Merlin Falcon FP4 support : endif : : if PADMELON_PRAIRIE_FALCON : config SOC_AMD_PRAIRIEFALCON : bool : default y : help : AMD Prairie Falcon FP4 support : endif
Need a name different from choice to work...
Yes, you're right. I was just typing something out and accidentally came up with the same name. I like what you chose.
Hello Marshall Dawson, build bot (Jenkins), Martin Roth, Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36824
to look at the new patch set (#4).
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
mb/amd/padmelon: Use Prairie Falcon configuration
While Merlin Falcon binaries are not available, make it explicit that it's compiling for Prairie Falcon (it was being surreptitious about it).
Board Padmelon accepts 3 different SOC, just changing some resistors (soldered or not): Brown Falcon, Prairie Falcon and Merlin Falcon. Code for Brown Falcon is not currently available.
BUG=None TEST=Build with prairie falcon.
Change-Id: I1663e4403a32a7d626dd2fa06763f18f4230457e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/mainboard/amd/padmelon/Kconfig 1 file changed, 17 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/36824/4
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 4:
Ping... Marshall, I have rebased this after your code as you asked. Would you please approve it again?
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
Patch Set 4: Code-Review+2
Sure. You'd said your directory was missing before. I believe it was the blobs from CB:33615, and by selecting USE_BLOBS, you may have changed your 3rdparty/blobs ref.
Can you also approve the ST/BR blobs in the stack of CB:37119 if they look good to you? You're welcome to also do the PCO 1.0.0.6 if you want.
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36824 )
Change subject: mb/amd/padmelon: Use Prairie Falcon configuration ......................................................................
mb/amd/padmelon: Use Prairie Falcon configuration
While Merlin Falcon binaries are not available, make it explicit that it's compiling for Prairie Falcon (it was being surreptitious about it).
Board Padmelon accepts 3 different SOC, just changing some resistors (soldered or not): Brown Falcon, Prairie Falcon and Merlin Falcon. Code for Brown Falcon is not currently available.
BUG=None TEST=Build with prairie falcon.
Change-Id: I1663e4403a32a7d626dd2fa06763f18f4230457e Signed-off-by: Richard Spiegel richard.spiegel@silverbackltd.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/36824 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/mainboard/amd/padmelon/Kconfig 1 file changed, 17 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig index 1be3a62..e9d2acb 100644 --- a/src/mainboard/amd/padmelon/Kconfig +++ b/src/mainboard/amd/padmelon/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select SOC_AMD_STONEYRIDGE - select AMD_APU_MERLINFALCON select AMD_APU_PKG_FP4 select BOARD_ROMSIZE_KB_8192 select DRIVERS_I2C_GENERIC @@ -43,6 +42,23 @@ string default "Padmelon"
+choice PADMELON_SOC + prompt "SOC used in padmelon board" + default PADMELON_MERLIN_FALCON + +config PADMELON_MERLIN_FALCON + bool "Merlin Falcon" + +config PADMELON_PRAIRIE_FALCON + bool "Prairie Falcon" + +endchoice + +config PADMELON_SOC_IN_USE + def_bool y + select AMD_APU_MERLINFALCON if PADMELON_MERLIN_FALCON + select AMD_APU_PRAIRIEFALCON if PADMELON_PRAIRIE_FALCON + config HAVE_S3_SUPPORT bool default n