Wim Vervoorn has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40040 )
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
mb/facebook/monolith: Add fmd files for 6MB BIOS area
The current flash layout requires changes to the descriptor area to create the 9MB BIOS region.
Add fmd files that allow switching to coreboot by only replacing the BIOS region.
BUG=N/A TEST=tested on facebook monolith
Change-Id: I2b003018e245693934202505d7e3891c2f545e6c Signed-off-by: Wim Vervoorn wvervoorn@eltan.com --- A src/mainboard/facebook/monolith/vboot-ro_6mb.fmd A src/mainboard/facebook/monolith/vboot-rw_6mb.fmd 2 files changed, 61 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/40040/1
diff --git a/src/mainboard/facebook/monolith/vboot-ro_6mb.fmd b/src/mainboard/facebook/monolith/vboot-ro_6mb.fmd new file mode 100644 index 0000000..ac1b716 --- /dev/null +++ b/src/mainboard/facebook/monolith/vboot-ro_6mb.fmd @@ -0,0 +1,28 @@ + FLASH 16M { + SI_ALL@0x0 0xA00000 { + SI_DESC@0x0 0x1000 + UNUSED_1@0x1000 0x2000 + SI_ME@0x3000 0x6fd000 + UNUSED_3@0x700000 0x300000 + } + SI_BIOS@0xA00000 0x600000 { + MISC_RW@0x0 0x20000 { + UNIFIED_MRC_CACHE@0x0 0x10000 { + RW_MRC_CACHE@0x00000 0x10000 + } + RW_VPD(PRESERVE)@0x010000 0x2000 + RW_NVRAM(PRESERVE)@0x012000 0x6000 + } + USED_BY_ORG_BIOS(PRESERVE)@0x20000 0x40000 + WP_RO@0x060000 0x5A0000 { + RO_VPD(PRESERVE)@0x00000 0x1000 + RO_SECTION@0x1000 0x59F000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x59A000 + } + } + } +} diff --git a/src/mainboard/facebook/monolith/vboot-rw_6mb.fmd b/src/mainboard/facebook/monolith/vboot-rw_6mb.fmd new file mode 100644 index 0000000..cf254db --- /dev/null +++ b/src/mainboard/facebook/monolith/vboot-rw_6mb.fmd @@ -0,0 +1,33 @@ + FLASH 16M { + SI_ALL@0x0 0xA00000 { + SI_DESC@0x0 0x1000 + UNUSED_1@0x1000 0x2000 + SI_ME@0x3000 0x6fd000 + UNUSED_3@0x700000 0x300000 + } + SI_BIOS@0xA00000 0x600000 { + MISC_RW@0x0 0x20000 { + UNIFIED_MRC_CACHE@0x0 0x10000 { + RW_MRC_CACHE@0x00000 0x10000 + } + RW_VPD(PRESERVE)@0x010000 0x2000 + RW_NVRAM(PRESERVE)@0x012000 0x6000 + } + USED_BY_ORG_BIOS(PRESERVE)@0x20000 0x40000 + RW_SECTION_A@0x60000 0x520000 { + VBLOCK_A@0x0 0x10000 + RW_FWID_A@0x10000 0x40 + FW_MAIN_A(CBFS)@0x10040 0x50FFC0 + } + WP_RO@0x580000 0x080000 { + RO_VPD(PRESERVE)@0x00000 0x1000 + RO_SECTION@0x1000 0x7F000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x07A000 + } + } + } +}
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40040 )
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
Patch Set 1:
(4 comments)
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... File src/mainboard/facebook/monolith/vboot-ro_6mb.fmd:
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 1: FLASH 16M { Correct indent.
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 6: UNUSED_3@0x700000 0x300000 Sequential Numbering? Use UNUSED_2
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... File src/mainboard/facebook/monolith/vboot-rw_6mb.fmd:
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 1: FLASH 16M { Correct indent here also.
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 6: UNUSED_3@0x700000 0x300000 sequencial number: UNUSED_2
Hello build bot (Jenkins), Frans Hendriks,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40040
to look at the new patch set (#2).
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
mb/facebook/monolith: Add fmd files for 6MB BIOS area
The current flash layout requires changes to the descriptor area to create the 9MB BIOS region.
Add fmd files that allow switching to coreboot by only replacing the BIOS region.
BUG=N/A TEST=tested on facebook monolith
Change-Id: I2b003018e245693934202505d7e3891c2f545e6c Signed-off-by: Wim Vervoorn wvervoorn@eltan.com --- A src/mainboard/facebook/monolith/vboot-ro_6mb.fmd A src/mainboard/facebook/monolith/vboot-rw_6mb.fmd 2 files changed, 61 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/40040/2
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40040 )
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
Patch Set 2:
(4 comments)
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... File src/mainboard/facebook/monolith/vboot-ro_6mb.fmd:
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 1: FLASH 16M {
Correct indent.
Done
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 6: UNUSED_3@0x700000 0x300000
Sequential Numbering? Use UNUSED_2
Done
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... File src/mainboard/facebook/monolith/vboot-rw_6mb.fmd:
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 1: FLASH 16M {
Correct indent here also.
Done
https://review.coreboot.org/c/coreboot/+/40040/1/src/mainboard/facebook/mono... PS1, Line 6: UNUSED_3@0x700000 0x300000
sequencial number: UNUSED_2
Done
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40040 )
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40040 )
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
mb/facebook/monolith: Add fmd files for 6MB BIOS area
The current flash layout requires changes to the descriptor area to create the 9MB BIOS region.
Add fmd files that allow switching to coreboot by only replacing the BIOS region.
BUG=N/A TEST=tested on facebook monolith
Change-Id: I2b003018e245693934202505d7e3891c2f545e6c Signed-off-by: Wim Vervoorn wvervoorn@eltan.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/40040 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Frans Hendriks fhendriks@eltan.com --- A src/mainboard/facebook/monolith/vboot-ro_6mb.fmd A src/mainboard/facebook/monolith/vboot-rw_6mb.fmd 2 files changed, 61 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Frans Hendriks: Looks good to me, approved
diff --git a/src/mainboard/facebook/monolith/vboot-ro_6mb.fmd b/src/mainboard/facebook/monolith/vboot-ro_6mb.fmd new file mode 100644 index 0000000..1bf6fb9 --- /dev/null +++ b/src/mainboard/facebook/monolith/vboot-ro_6mb.fmd @@ -0,0 +1,28 @@ +FLASH 16M { + SI_ALL@0x0 0xA00000 { + SI_DESC@0x0 0x1000 + UNUSED_1@0x1000 0x2000 + SI_ME@0x3000 0x6fd000 + UNUSED_2@0x700000 0x300000 + } + SI_BIOS@0xA00000 0x600000 { + MISC_RW@0x0 0x20000 { + UNIFIED_MRC_CACHE@0x0 0x10000 { + RW_MRC_CACHE@0x00000 0x10000 + } + RW_VPD(PRESERVE)@0x010000 0x2000 + RW_NVRAM(PRESERVE)@0x012000 0x6000 + } + USED_BY_ORG_BIOS(PRESERVE)@0x20000 0x40000 + WP_RO@0x060000 0x5A0000 { + RO_VPD(PRESERVE)@0x00000 0x1000 + RO_SECTION@0x1000 0x59F000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x59A000 + } + } + } +} diff --git a/src/mainboard/facebook/monolith/vboot-rw_6mb.fmd b/src/mainboard/facebook/monolith/vboot-rw_6mb.fmd new file mode 100644 index 0000000..e10a576 --- /dev/null +++ b/src/mainboard/facebook/monolith/vboot-rw_6mb.fmd @@ -0,0 +1,33 @@ +FLASH 16M { + SI_ALL@0x0 0xA00000 { + SI_DESC@0x0 0x1000 + UNUSED_1@0x1000 0x2000 + SI_ME@0x3000 0x6fd000 + UNUSED_2@0x700000 0x300000 + } + SI_BIOS@0xA00000 0x600000 { + MISC_RW@0x0 0x20000 { + UNIFIED_MRC_CACHE@0x0 0x10000 { + RW_MRC_CACHE@0x00000 0x10000 + } + RW_VPD(PRESERVE)@0x010000 0x2000 + RW_NVRAM(PRESERVE)@0x012000 0x6000 + } + USED_BY_ORG_BIOS(PRESERVE)@0x20000 0x40000 + RW_SECTION_A@0x60000 0x520000 { + VBLOCK_A@0x0 0x10000 + RW_FWID_A@0x10000 0x40 + FW_MAIN_A(CBFS)@0x10040 0x50FFC0 + } + WP_RO@0x580000 0x080000 { + RO_VPD(PRESERVE)@0x00000 0x1000 + RO_SECTION@0x1000 0x7F000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x07A000 + } + } + } +}
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40040 )
Change subject: mb/facebook/monolith: Add fmd files for 6MB BIOS area ......................................................................
Patch Set 3:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/2312 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2311 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2310
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Frans Hendriks (Code Review)
-
Patrick Georgi (Code Review)
-
Wim Vervoorn (Code Review)