Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge: Change default locations for blobs ......................................................................
soc/amd/stoneyridge: Change default locations for blobs
Set the default location strings to point to the 3rdparty/amd_blobs files.
Change-Id: I5426b8de2501ba55843efc1cda4b03bc3768f8cb Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/soc/amd/stoneyridge/Kconfig M src/vendorcode/amd/pi/Kconfig 2 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/37222/1
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index c477e03..2fe3ef7 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -177,8 +177,8 @@ config VGA_BIOS_FILE string default "" if !USE_AMD_BLOBS - default "3rdparty/blobs/soc/amd/merlinfalcon/VBIOS.bin" if AMD_APU_MERLINFALCON - default "3rdparty/blobs/soc/amd/stoneyridge/VBIOS.bin" + default "3rdparty/amd_blobs/stoneyridge/CarrizoGenericVbios.bin" if AMD_APU_MERLINFALCON + default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin"
config S3_VGA_ROM_RUN bool @@ -218,7 +218,7 @@ config STONEYRIDGE_XHCI_FWM_FILE string "XHCI firmware path and filename" default "" if !USE_AMD_BLOBS - default "3rdparty/blobs/soc/amd/stoneyridge/xhci.bin" + default "3rdparty/amd_blobs/stoneyridge/xhci.bin" depends on STONEYRIDGE_XHCI_FWM
config STONEYRIDGE_GEC_FWM_FILE @@ -228,8 +228,8 @@ config AMD_PUBKEY_FILE string "AMD public Key" default "" if !USE_AMD_BLOBS - default "3rdparty/blobs/soc/amd/merlinfalcon/PSP/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON - default "3rdparty/blobs/soc/amd/stoneyridge/PSP/AmdPubKeyST.bin" + default "3rdparty/amd_blobs/stoneyridge/PSP/CZ/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON + default "3rdparty/amd_blobs/stoneyridge/PSP/ST/AmdPubKeyST.bin"
config STONEYRIDGE_SATA_MODE int "SATA Mode" diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index 0605563..9f5d94d 100644 --- a/src/vendorcode/amd/pi/Kconfig +++ b/src/vendorcode/amd/pi/Kconfig @@ -44,10 +44,10 @@ 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/$(CONFIG_AMD_SOC_PACKAGE)/AGESA_CZ_FP4.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES - default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && !HAVE_MERLINFALCON_BINARIES - default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 - default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 + default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES + default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON + default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 + default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01 help Specify the binary file to use for AMD platform initialization.
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37222
to look at the new patch set (#2).
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
soc/amd/stoneyridge|vc: Change default locations for blobs
Set the default location strings to point to the 3rdparty/amd_blobs files.
Change-Id: I5426b8de2501ba55843efc1cda4b03bc3768f8cb Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/soc/amd/stoneyridge/Kconfig M src/vendorcode/amd/pi/Kconfig 2 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/37222/2
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
Patch Set 2: Code-Review+2
Working separately from a downloaded amd_blobs (as tar), I got to similar results (except for the package, which I missed).
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
soc/amd/stoneyridge|vc: Change default locations for blobs
Set the default location strings to point to the 3rdparty/amd_blobs files.
Change-Id: I5426b8de2501ba55843efc1cda4b03bc3768f8cb Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/37222 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Richard Spiegel richard.spiegel@silverbackltd.com --- M src/soc/amd/stoneyridge/Kconfig M src/vendorcode/amd/pi/Kconfig 2 files changed, 9 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Richard Spiegel: Looks good to me, approved
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index a5607b4..0a3e77d 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -175,8 +175,8 @@ config VGA_BIOS_FILE string default "" if !USE_AMD_BLOBS - default "3rdparty/blobs/soc/amd/merlinfalcon/VBIOS.bin" if AMD_APU_MERLINFALCON - default "3rdparty/blobs/soc/amd/stoneyridge/VBIOS.bin" + default "3rdparty/amd_blobs/stoneyridge/CarrizoGenericVbios.bin" if AMD_APU_MERLINFALCON + default "3rdparty/amd_blobs/stoneyridge/StoneyGenericVbios.bin"
config S3_VGA_ROM_RUN bool @@ -216,7 +216,7 @@ config STONEYRIDGE_XHCI_FWM_FILE string "XHCI firmware path and filename" default "" if !USE_AMD_BLOBS - default "3rdparty/blobs/soc/amd/stoneyridge/xhci.bin" + default "3rdparty/amd_blobs/stoneyridge/xhci.bin" depends on STONEYRIDGE_XHCI_FWM
config STONEYRIDGE_GEC_FWM_FILE @@ -226,8 +226,8 @@ config AMD_PUBKEY_FILE string "AMD public Key" default "" if !USE_AMD_BLOBS - default "3rdparty/blobs/soc/amd/merlinfalcon/PSP/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON - default "3rdparty/blobs/soc/amd/stoneyridge/PSP/AmdPubKeyST.bin" + default "3rdparty/amd_blobs/stoneyridge/PSP/CZ/AmdPubKeyCZ.bin" if AMD_APU_MERLINFALCON + default "3rdparty/amd_blobs/stoneyridge/PSP/ST/AmdPubKeyST.bin"
config STONEYRIDGE_SATA_MODE int "SATA Mode" diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index 73fe4f2..acf8497 100644 --- a/src/vendorcode/amd/pi/Kconfig +++ b/src/vendorcode/amd/pi/Kconfig @@ -44,10 +44,10 @@ 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/$(CONFIG_AMD_SOC_PACKAGE)/AGESA_CZ_FP4.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES && USE_AMD_BLOBS - default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && !HAVE_MERLINFALCON_BINARIES && USE_AMD_BLOBS - default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 && USE_AMD_BLOBS - default "3rdparty/blobs/pi/amd/00670F00/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 && USE_AMD_BLOBS + default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && HAVE_MERLINFALCON_BINARIES && USE_AMD_BLOBS + default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && USE_AMD_BLOBS + default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FP4 && USE_AMD_BLOBS + default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_STONEYRIDGE_FT4 && USE_AMD_BLOBS default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01 help Specify the binary file to use for AMD platform initialization.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
Patch Set 3:
Looks like this was merged too early before the submodule update that makes the files available in 3rdparty/amd_blobs/.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
Patch Set 3:
Patch Set 3:
Looks like this was merged too early before the submodule update that makes the files available in 3rdparty/amd_blobs/.
Because there's another change that makes it build without the blobs, which generates a very specific warning message without breaking the build. A simple Kconfig inclusion after the blobs become available than includes the blobs.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
Patch Set 3:
Looks like this was merged too early before the submodule update that makes the files available in 3rdparty/amd_blobs/.
Because there's another change that makes it build without the blobs, which generates a very specific warning message without breaking the build. A simple Kconfig inclusion after the blobs become available than includes the blobs.
It's still a regression. Before this change the default paths were pointing to existing files, now they don't.
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
Patch Set 3:
Patch Set 3:
Looks like this was merged too early before the submodule update that makes the files available in 3rdparty/amd_blobs/.
Because there's another change that makes it build without the blobs, which generates a very specific warning message without breaking the build. A simple Kconfig inclusion after the blobs become available than includes the blobs.
It's still a regression. Before this change the default paths were pointing to existing files, now they don't.
That's intentional, it has to do with new license. It forces the user to read the license before activating the build variable in Kconfig. Once it's activated, the build process downloads it from a separate repository, same as seabios.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37222 )
Change subject: soc/amd/stoneyridge|vc: Change default locations for blobs ......................................................................
Patch Set 3:
Looks like this was merged too early before the submodule update that makes the files available in 3rdparty/amd_blobs/.
Because there's another change that makes it build without the blobs, which generates a very specific warning message without breaking the build. A simple Kconfig inclusion after the blobs become available than includes the blobs.
It's still a regression. Before this change the default paths were pointing to existing files, now they don't.
That's intentional, it has to do with new license. It forces the user to read the license before activating the build variable in Kconfig. Once it's activated, the build process downloads it from a separate repository, same as seabios.
Can you please read the top quote again. We are talking past each other. I know exactly what you are doing and merely pointed out that the files are not available *yet*. It seems somebody forgot to update the submodule pointer.
-
Marshall Dawson (Code Review) -
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)
-
Richard Spiegel (Code Review)