Change in coreboot[master]: soc/amd/picasso:Add psp_verstage components to amdfw binary

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Martin Roth (Code Review)

14 Jun 2020 14 Jun '20

5:36 p.m.

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

soc/amd/picasso:Add psp_verstage components to amdfw binary

This adds the psp_verstage userspace application and the location of the shared memory area to the amdfw binary tables.

BUG=b:158124527 TEST=Build & boot psp_verstage on trembyle

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 --- M src/soc/amd/picasso/Makefile.inc 1 file changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/42380/1

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 783b9a4..8e14d9d 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -239,6 +239,18 @@ PSP_UCODE_FILE2=$(FIRMWARE_LOCATE)/UcodePatch_PCO_B0.bin PSP_UCODE_FILE3=$(FIRMWARE_LOCATE)/UcodePatch_RV2_A0.bin

+# type = 0x6B - PSP Shared memory location +ifneq ($(CONFIG_PSP_SHAREDMEM_SIZE),0x0) +PSP_SHAREDMEM_SIZE=$(CONFIG_PSP_SHAREDMEM_SIZE) +_PSP_SHAREDMEM_BASE=$(shell grep -ir _vboot2_work $(obj)/cbfs/$(CONFIG_CBFS_PREFIX)/bootblock.map | cut -f1 -d' ') +PSP_SHAREDMEM_BASE=$(shell printf "0x%x" $(_PSP_SHAREDMEM_BASE)) +endif + +# type = 0x52 - PSP Bootloader Userspace Application (verstage) +ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) +PSP_VERSTAGE_FILE=$(obj)/psp_verstage.bin +endif + # type = 0xb - See #55758 (NDA) for bit definitions. PSP_SOFTFUSE_BITS += 28

@@ -281,6 +293,7 @@ OPT_ABL6_FILE=$(call add_opt_prefix, $(PSP_ABL6_FILE), --abl-image) OPT_ABL7_FILE=$(call add_opt_prefix, $(PSP_ABL7_FILE), --abl-image) OPT_WHITELIST_FILE=$(call add_opt_prefix, $(PSP_WHITELIST_FILE), --whitelist) +OPT_VERSTAGE_FILE=$(call add_opt_prefix, $(PSP_VERSTAGE_FILE), --verstage)

OPT_PSP_APCB_FILES=$(foreach i, $(shell seq $(words $(PSP_APCB_FILES))), \ $(call add_opt_prefix, $(word $(i), $(PSP_APCB_FILES)), \ @@ -299,6 +312,8 @@ OPT_PSP_PMUD_FILE3=$(call add_opt_prefix, $(PSP_PMUD_FILE3), --subprogram 1 --instance 1 --pmu-data) OPT_PSP_PMUD_FILE4=$(call add_opt_prefix, $(PSP_PMUD_FILE4), --subprogram 1 --instance 4 --pmu-data) OPT_MP2CFG_FILE=$(call add_opt_prefix, $(PSP_MP2CFG_FILE), --mp2-config) +OPT_PSP_SHAREDMEM_BASE=$(call add_opt_prefix, $(PSP_SHAREDMEM_BASE), --sharedmem) +OPT_PSP_SHAREDMEM_SIZE=$(call add_opt_prefix, $(PSP_SHAREDMEM_SIZE), --sharedmem-size)

# Copy prebuild APCBs if they exist $(obj)/APCB_%.bin: $(MAINBOARD_BLOBS_DIR)/APCB_%.bin @@ -376,6 +391,7 @@ $(call_strip_quotes, $(PSP_S0I3_FILE)) \ $(call_strip_quotes, $(PSP_IKEK_FILE)) \ $(call_strip_quotes, $(PSP_SEC_DEBUG_FILE)) \ + $(PSP_VERSTAGE_FILE) \ $$(PSP_APCB_FILES) \ $(AMDFWTOOL) \ $(obj)/fmap.fmd @@ -430,6 +446,9 @@ $(OPT_SEC_DEBUG_FILE) \ --combo-capable \ $(OPT_TOKEN_UNLOCK) \ + $(OPT_VERSTAGE_FILE) \ + $(OPT_PSP_SHAREDMEM_BASE) \ + $(OPT_PSP_SHAREDMEM_SIZE) \ --flashsize $(CONFIG_ROM_SIZE) \ --location $(shell printf "0x%x" $(PICASSO_FWM_POSITION)) \ --output $@

Attachments:

attachment.htm (text/html — 6.0 KB)

Show replies by date

Eric Peers (Code Review)

23 Jun 23 Jun

10:32 a.m.

Eric Peers has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 2: Code-Review+1

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 2 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 23 Jun 2020 16:32:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Martin Roth (Code Review)

24 Jun 24 Jun

10:21 a.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Patrick Georgi, Eric Peers, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42380

to look at the new patch set (#4).

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

soc/amd/picasso:Add psp_verstage components to amdfw binary

This adds the psp_verstage userspace application and the location of the shared memory area to the amdfw binary tables.

BUG=b:158124527 TEST=Build & boot psp_verstage on trembyle

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 --- M src/soc/amd/picasso/Makefile.inc 1 file changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/42380/4

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 4 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Felix Held (Code Review)

2:57 p.m.

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 4: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 4 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 24 Jun 2020 20:57:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Matt Papageorge (Code Review)

3:02 p.m.

Matt Papageorge has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 4: Code-Review+1

Looks good

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 4 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 24 Jun 2020 21:02:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Martin Roth (Code Review)

25 Jun 25 Jun

9:45 a.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Patrick Georgi, Eric Peers, Matt Papageorge, Aaron Durbin, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42380

to look at the new patch set (#5).

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

soc/amd/picasso:Add psp_verstage components to amdfw binary

This adds the psp_verstage userspace application and the location of the shared memory area to the amdfw binary tables.

BUG=b:158124527 TEST=Build & boot psp_verstage on trembyle

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 --- M src/soc/amd/picasso/Makefile.inc 1 file changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/42380/5

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 5 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Matt Papageorge (Code Review)

2:08 p.m.

Matt Papageorge has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 5: Code-Review+1

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 5 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 25 Jun 2020 20:08:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Raul Rangel (Code Review)

2:38 p.m.

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 5: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/42380/5/src/soc/amd/picasso/Makefil... File src/soc/amd/picasso/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/42380/5/src/soc/amd/picasso/Makefil... PS5, Line 253: _PSP_SHAREDMEM_BASE I hope we can remove this with b/154957411

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 5 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 25 Jun 2020 20:38:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Martin Roth (Code Review)

6:05 p.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Patrick Georgi, Eric Peers, Matt Papageorge, Aaron Durbin, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42380

to look at the new patch set (#6).

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

soc/amd/picasso:Add psp_verstage components to amdfw binary

This adds the psp_verstage userspace application and the location of the shared memory area to the amdfw binary tables.

BUG=b:158124527 TEST=Build & boot psp_verstage on trembyle

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 --- M src/soc/amd/picasso/Makefile.inc 1 file changed, 19 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/42380/6

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 6 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Raul Rangel (Code Review)

26 Jun 26 Jun

10:12 a.m.

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 6: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 6 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 26 Jun 2020 16:12:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Matt Papageorge (Code Review)

6 Jul 6 Jul

2:05 p.m.

Matt Papageorge has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

Patch Set 6: Code-Review+1

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 6 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Mon, 06 Jul 2020 20:05:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Martin Roth (Code Review)

8 Jul 8 Jul

1:35 p.m.

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42380 )

Change subject: soc/amd/picasso:Add psp_verstage components to amdfw binary ......................................................................

soc/amd/picasso:Add psp_verstage components to amdfw binary

This adds the psp_verstage userspace application and the location of the shared memory area to the amdfw binary tables.

BUG=b:158124527 TEST=Build & boot psp_verstage on trembyle

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Reviewed-on: https://review.coreboot.org/c/coreboot/+/42380 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Raul Rangel rrangel@chromium.org Reviewed-by: Matt Papageorge matthewpapa07@gmail.com --- M src/soc/amd/picasso/Makefile.inc 1 file changed, 19 insertions(+), 0 deletions(-)

Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved Matt Papageorge: Looks good to me, but someone else must approve

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 9ea770c..dee65b5 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -238,6 +238,18 @@ PSP_UCODE_FILE2=$(FIRMWARE_LOCATE)/UcodePatch_PCO_B0.bin PSP_UCODE_FILE3=$(FIRMWARE_LOCATE)/UcodePatch_RV2_A0.bin

+ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) +# type = 0x6B - PSP Shared memory location +ifneq ($(CONFIG_PSP_SHAREDMEM_SIZE),0x0) +PSP_SHAREDMEM_SIZE=$(CONFIG_PSP_SHAREDMEM_SIZE) +_PSP_SHAREDMEM_BASE=$(shell grep _psp_sharedmem_dram $(obj)/cbfs/$(CONFIG_CBFS_PREFIX)/bootblock.map | cut -f1 -d' ') +PSP_SHAREDMEM_BASE=$(shell printf "0x%s" $(_PSP_SHAREDMEM_BASE)) +endif + +# type = 0x52 - PSP Bootloader Userspace Application (verstage) +PSP_VERSTAGE_FILE=$(obj)/psp_verstage.bin +endif # CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK + # type = 0xb - See #55758 (NDA) for bit definitions. PSP_SOFTFUSE_BITS += 28

@@ -280,6 +292,7 @@ OPT_ABL6_FILE=$(call add_opt_prefix, $(PSP_ABL6_FILE), --abl-image) OPT_ABL7_FILE=$(call add_opt_prefix, $(PSP_ABL7_FILE), --abl-image) OPT_WHITELIST_FILE=$(call add_opt_prefix, $(PSP_WHITELIST_FILE), --whitelist) +OPT_VERSTAGE_FILE=$(call add_opt_prefix, $(PSP_VERSTAGE_FILE), --verstage)

OPT_PSP_APCB_FILES=$(foreach i, $(shell seq $(words $(PSP_APCB_FILES))), \ $(call add_opt_prefix, $(word $(i), $(PSP_APCB_FILES)), \ @@ -298,6 +311,8 @@ OPT_PSP_PMUD_FILE3=$(call add_opt_prefix, $(PSP_PMUD_FILE3), --subprogram 1 --instance 1 --pmu-data) OPT_PSP_PMUD_FILE4=$(call add_opt_prefix, $(PSP_PMUD_FILE4), --subprogram 1 --instance 4 --pmu-data) OPT_MP2CFG_FILE=$(call add_opt_prefix, $(PSP_MP2CFG_FILE), --mp2-config) +OPT_PSP_SHAREDMEM_BASE=$(call add_opt_prefix, $(PSP_SHAREDMEM_BASE), --sharedmem) +OPT_PSP_SHAREDMEM_SIZE=$(call add_opt_prefix, $(PSP_SHAREDMEM_SIZE), --sharedmem-size)

# Copy prebuild APCBs if they exist $(obj)/APCB_%.bin: $(MAINBOARD_BLOBS_DIR)/APCB_%.bin @@ -375,6 +390,7 @@ $(call_strip_quotes, $(PSP_S0I3_FILE)) \ $(call_strip_quotes, $(PSP_IKEK_FILE)) \ $(call_strip_quotes, $(PSP_SEC_DEBUG_FILE)) \ + $(PSP_VERSTAGE_FILE) \ $$(PSP_APCB_FILES) \ $(AMDFWTOOL) \ $(obj)/fmap.fmd @@ -429,6 +445,9 @@ $(OPT_SEC_DEBUG_FILE) \ --combo-capable \ $(OPT_TOKEN_UNLOCK) \ + $(OPT_VERSTAGE_FILE) \ + $(OPT_PSP_SHAREDMEM_BASE) \ + $(OPT_PSP_SHAREDMEM_SIZE) \ --flashsize $(CONFIG_ROM_SIZE) \ --location $(shell printf "0x%x" $(PICASSO_FWM_POSITION)) \ --output $@

-- To view, visit https://review.coreboot.org/c/coreboot/+/42380 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I45309b5998e6e442ff37cf1d2adb8ccfa1b6a619 Gerrit-Change-Number: 42380 Gerrit-PatchSet: 8 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Eric Peers epeers@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Matt Papageorge matthewpapa07@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: merged

1771

days inactive

1795

days old

coreboot-gerrit@coreboot.org

11 comments

5 participants

tags (0)

participants (5)

Eric Peers (Code Review)
Felix Held (Code Review)
Martin Roth (Code Review)
Matt Papageorge (Code Review)
Raul Rangel (Code Review)