Change in coreboot[master]: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout
Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout
CB:44362 ("mb/google/zork: Reorganize chromeos.fmd to increase WP_RO to 8MiB") updated the flash layout which moved RW_SECTION_A and RW_SECTION_B to different addresses than before. PICASSO_FW_A_POSITION and PICASSO_FW_B_POSITION configs need to be updated accordingly to retain the same behavior as before i.e. amdfw_a/b are placed at the start of FW_MAIN_A/B by placing them right after the CBFS header.
This change fixes the value of PICASSO_FW_A_POSITION and PICASSO_FW_B_POSITION to maintain amdfw at the start of RW-A/B CBFS.
BUG=b:161949925
Signed-off-by: Furquan Shaikh furquan@google.com Change-Id: I177fb38af6380c36397d2a72d5ec00965087d528 --- M src/mainboard/google/zork/Kconfig 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/44425/1
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index bf2fe2e..1e1b790 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -129,7 +129,7 @@
config PICASSO_FW_A_POSITION hex - default 0xFF031040 + default 0xFF012040 depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK help Location of the AMD firmware in the RW_A region. This is the @@ -137,7 +137,7 @@
config PICASSO_FW_B_POSITION hex - default 0xFF3CF040 + default 0xFF312040 depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK help Location of the AMD firmware in the RW_B region. This is the
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
Patch Set 1:
cbfstool: /home/coreboot/slave-root/workspace/coreboot-gerrit/util/cbfstool/cbfs_image.c:742: cbfs_add_entry: Assertion `!IS_TOP_ALIGNED_ADDRESS(content_offset)' failed. make[1]: *** [Makefile.inc:1055: /cb-build/coreboot-gerrit.0/chromeos/GOOGLE_DALBOZ/coreboot.pre] Aborted (core dumped)
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
Patch Set 2:
Patch Set 1:
cbfstool: /home/coreboot/slave-root/workspace/coreboot-gerrit/util/cbfstool/cbfs_image.c:742: cbfs_add_entry: Assertion `!IS_TOP_ALIGNED_ADDRESS(content_offset)' failed. make[1]: *** [Makefile.inc:1055: /cb-build/coreboot-gerrit.0/chromeos/GOOGLE_DALBOZ/coreboot.pre] Aborted (core dumped)
Had to rebase to ensure the change had the right parent.
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
Patch Set 2: Code-Review+2
Shelley Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
Patch Set 2:
Submitting this before the 24-hour deadline as it is required to fix a regression in behavior. Also, the change is restricted to zork, so impact is minimal.
Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44425 )
Change subject: mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout ......................................................................
mb/google/zork: Update PICASSO_FW_*_POSITION to match new layout
CB:44362 ("mb/google/zork: Reorganize chromeos.fmd to increase WP_RO to 8MiB") updated the flash layout which moved RW_SECTION_A and RW_SECTION_B to different addresses than before. PICASSO_FW_A_POSITION and PICASSO_FW_B_POSITION configs need to be updated accordingly to retain the same behavior as before i.e. amdfw_a/b are placed at the start of FW_MAIN_A/B by placing them right after the CBFS header.
This change fixes the value of PICASSO_FW_A_POSITION and PICASSO_FW_B_POSITION to maintain amdfw at the start of RW-A/B CBFS.
BUG=b:161949925
Signed-off-by: Furquan Shaikh furquan@google.com Change-Id: I177fb38af6380c36397d2a72d5ec00965087d528 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44425 Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Shelley Chen shchen@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/zork/Kconfig 1 file changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Shelley Chen: Looks good to me, approved
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index bf2fe2e..1e1b790 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -129,7 +129,7 @@
config PICASSO_FW_A_POSITION hex - default 0xFF031040 + default 0xFF012040 depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK help Location of the AMD firmware in the RW_A region. This is the @@ -137,7 +137,7 @@
config PICASSO_FW_B_POSITION hex - default 0xFF3CF040 + default 0xFF312040 depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK help Location of the AMD firmware in the RW_B region. This is the
-
Aaron Durbin (Code Review) -
Furquan Shaikh (Code Review)
-
Shelley Chen (Code Review)