Tim Wawrzynczak has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: deltaur: Split up chromeos.fmd ......................................................................
deltaur: Split up chromeos.fmd
Deltan will use the GbE region, whereas deltaur will not. Therefore, split up the FMD file into two, one of which has the GbE region, and the other where the SI_ME region uses up that space.
BUG=b:150165131 TEST=emerge-deltaur coreboot chromeos-bootimage and use ifdtool -p tgl -t image-delta{ur,n}.bin to make sure FMAP aligns with IFWI
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: Ib93d5ba7f8dbf273ba7c1163022661ede1f44ab4 --- M src/mainboard/google/deltaur/Kconfig A src/mainboard/google/deltaur/chromeos-gbe.fmd M src/mainboard/google/deltaur/chromeos.fmd 3 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/40501/1
diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index cd4646c..74c8201 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -43,6 +43,11 @@ hex default 0x50
+config FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-gbe.fmd" if BOARD_GOOGLE_DELTAN + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_GOOGLE_DELTAUR + config OVERRIDE_DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/google/deltaur/chromeos-gbe.fmd b/src/mainboard/google/deltaur/chromeos-gbe.fmd new file mode 100644 index 0000000..9b6fec3 --- /dev/null +++ b/src/mainboard/google/deltaur/chromeos-gbe.fmd @@ -0,0 +1,49 @@ +FLASH@0xfe000000 0x2000000 { + SI_ALL@0x0 0x606000 { + SI_DESC@0x0 0x1000 + SI_EC@0x1000 0x100000 + SI_GBE(PRESERVE)@0x101000 0x2000 + SI_ME@0x103000 0x4ff000 + SI_PDR(PRESERVE)@0x602000 0x4000 + } + SI_BIOS@0x606000 0x19fa000 { + RW_DIAG@0x0 0x10ca000 { + RW_LEGACY(CBFS)@0x0 0x10ba000 + DIAG_NVRAM@0x10ba000 0x10000 + } + RW_SECTION_A@0x10ca000 0x280000 { + VBLOCK_A@0x0 0x10000 + FW_MAIN_A(CBFS)@0x10000 0x26ffc0 + RW_FWID_A@0x27ffc0 0x40 + } + RW_SECTION_B@0x134a000 0x280000 { + VBLOCK_B@0x0 0x10000 + FW_MAIN_B(CBFS)@0x10000 0x26ffc0 + RW_FWID_B@0x27ffc0 0x40 + } + RW_MISC@0x15ca000 0x30000 { + UNIFIED_MRC_CACHE@0x0 0x20000 { + RECOVERY_MRC_CACHE@0x0 0x10000 + RW_MRC_CACHE@0x10000 0x10000 + } + RW_ELOG(PRESERVE)@0x20000 0x4000 + RW_SHARED@0x24000 0x4000 { + SHARED_DATA@0x0 0x2000 + VBLOCK_DEV@0x2000 0x2000 + } + RW_VPD(PRESERVE)@0x28000 0x2000 + RW_NVRAM(PRESERVE)@0x2a000 0x6000 + } + WP_RO@0x15fa000 0x400000 { + RO_VPD(PRESERVE)@0x0 0x4000 + RO_UNUSED@0x4000 0xc000 + RO_SECTION@0x10000 0x3f0000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x3ec000 + } + } + } +} diff --git a/src/mainboard/google/deltaur/chromeos.fmd b/src/mainboard/google/deltaur/chromeos.fmd index 9b6fec3..bbec112 100644 --- a/src/mainboard/google/deltaur/chromeos.fmd +++ b/src/mainboard/google/deltaur/chromeos.fmd @@ -2,8 +2,7 @@ SI_ALL@0x0 0x606000 { SI_DESC@0x0 0x1000 SI_EC@0x1000 0x100000 - SI_GBE(PRESERVE)@0x101000 0x2000 - SI_ME@0x103000 0x4ff000 + SI_ME@0x101000 0x501000 SI_PDR(PRESERVE)@0x602000 0x4000 } SI_BIOS@0x606000 0x19fa000 {
EricR Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: deltaur: Split up chromeos.fmd ......................................................................
Patch Set 1:
LGTM, but this will add little complexity of ME re-packing and coreboot-private files. GBE region is no harm if we add it but not use it. Like Arcada doesn't have onboard LAN but we still add GBE for it.
EricR Lai has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: deltaur: Split up chromeos.fmd ......................................................................
Patch Set 1: Code-Review+2
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: deltaur: Split up chromeos.fmd ......................................................................
Patch Set 1:
(4 comments)
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@7 PS1, Line 7: deltaur: Split up chromeos.fmd I’d describe the change in the summary, and not how it’s accomplished. Maybe:
mb/google/deltaur/variant/deltaur: Remove GbE FMAP region
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@7 PS1, Line 7: deltaur mb/google/…
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@9 PS1, Line 9: Deltan will use the GbE region, whereas deltaur will not. Why doesn’t it need the GbE region?
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@15 PS1, Line 15: and use ifdtool -p tgl -t image-delta{ur,n}.bin to make sure FMAP aligns with IFWI Please wrap the line after 72/75 characters.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: deltaur: Split up chromeos.fmd ......................................................................
Patch Set 1: Code-Review+1
(2 comments)
Patch Set 1:
LGTM, but this will add little complexity of ME re-packing and coreboot-private files. GBE region is no harm if we add it but not use it. Like Arcada doesn't have onboard LAN but we still add GBE for it.
Agreed, that could be a bit troublesome.
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@7 PS1, Line 7: deltaur: Split up chromeos.fmd
I’d describe the change in the summary, and not how it’s accomplished. Maybe: […]
That would be incorrect, though. The GbE region is not removed, the fmap is split into two in order to have both possibilities. This is needed as future variants may or may not use GbE.
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@9 PS1, Line 9: Deltan will use the GbE region, whereas deltaur will not.
Why doesn’t it need the GbE region?
Most likely, design considerations. Not every board uses the Intel GbE controller inside the PCH.
Hello Bora Guvendik, build bot (Jenkins), Anil Kumar K, Selma Bensaid, Angel Pons, Varun Joshi, EricR Lai,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40501
to look at the new patch set (#2).
Change subject: mb/google/deltaur: Add chromeos-gbe.fmd ......................................................................
mb/google/deltaur: Add chromeos-gbe.fmd
Deltan will be using the integrated Intel GbE for LAN functionality. Deltaur will not have a LAN port, and so does not need the GbE region. This patch adds a new FMAP descriptor file which explicitly supports the GbE region (chromeos-gbe.fmd), and removes the GbE region from chromeos.fmd. Deltan is then assigned chromeos-gbe.fmd, and Deltaur is assigned chromeos.fmd.
BUG=b:150165131 TEST=emerge-deltaur coreboot chromeos-bootimage and use ifdtool -p tgl -t image-delta{ur,n}.bin to make sure FMAP aligns with IFWI
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: Ib93d5ba7f8dbf273ba7c1163022661ede1f44ab4 --- M src/mainboard/google/deltaur/Kconfig A src/mainboard/google/deltaur/chromeos-gbe.fmd M src/mainboard/google/deltaur/chromeos.fmd 3 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/40501/2
Hello Bora Guvendik, build bot (Jenkins), Anil Kumar K, Selma Bensaid, Angel Pons, Varun Joshi, EricR Lai,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40501
to look at the new patch set (#3).
Change subject: mb/google/deltaur: Remove GbE FMAP region ......................................................................
mb/google/deltaur: Remove GbE FMAP region
Deltan will be using the integrated Intel GbE for LAN functionality. Deltaur will not have a LAN port, and so does not need the GbE region. This patch adds a new FMAP descriptor file which explicitly supports the GbE region (chromeos-gbe.fmd), and removes the GbE region from chromeos.fmd. Deltan is then assigned chromeos-gbe.fmd, and Deltaur is assigned chromeos.fmd.
BUG=b:150165131 TEST=emerge-deltaur coreboot chromeos-bootimage and use ifdtool -p tgl -t image-delta{ur,n}.bin to make sure FMAP aligns with IFWI
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: Ib93d5ba7f8dbf273ba7c1163022661ede1f44ab4 --- M src/mainboard/google/deltaur/Kconfig A src/mainboard/google/deltaur/chromeos-gbe.fmd M src/mainboard/google/deltaur/chromeos.fmd 3 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/40501/3
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: mb/google/deltaur: Remove GbE FMAP region ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@7 PS1, Line 7: deltaur
mb/google/…
Done
https://review.coreboot.org/c/coreboot/+/40501/1//COMMIT_MSG@15 PS1, Line 15: and use ifdtool -p tgl -t image-delta{ur,n}.bin to make sure FMAP aligns with IFWI
Please wrap the line after 72/75 characters.
Done
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40501 )
Change subject: mb/google/deltaur: Remove GbE FMAP region ......................................................................
mb/google/deltaur: Remove GbE FMAP region
Deltan will be using the integrated Intel GbE for LAN functionality. Deltaur will not have a LAN port, and so does not need the GbE region. This patch adds a new FMAP descriptor file which explicitly supports the GbE region (chromeos-gbe.fmd), and removes the GbE region from chromeos.fmd. Deltan is then assigned chromeos-gbe.fmd, and Deltaur is assigned chromeos.fmd.
BUG=b:150165131 TEST=emerge-deltaur coreboot chromeos-bootimage and use ifdtool -p tgl -t image-delta{ur,n}.bin to make sure FMAP aligns with IFWI
Signed-off-by: Tim Wawrzynczak twawrzynczak@chromium.org Change-Id: Ib93d5ba7f8dbf273ba7c1163022661ede1f44ab4 Reviewed-on: https://review.coreboot.org/c/coreboot/+/40501 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: EricR Lai ericr_lai@compal.corp-partner.google.com Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/google/deltaur/Kconfig A src/mainboard/google/deltaur/chromeos-gbe.fmd M src/mainboard/google/deltaur/chromeos.fmd 3 files changed, 55 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, but someone else must approve EricR Lai: Looks good to me, approved
diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index cd4646c..74c8201 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -43,6 +43,11 @@ hex default 0x50
+config FMDFILE + string + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-gbe.fmd" if BOARD_GOOGLE_DELTAN + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_GOOGLE_DELTAUR + config OVERRIDE_DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/google/deltaur/chromeos-gbe.fmd b/src/mainboard/google/deltaur/chromeos-gbe.fmd new file mode 100644 index 0000000..9b6fec3 --- /dev/null +++ b/src/mainboard/google/deltaur/chromeos-gbe.fmd @@ -0,0 +1,49 @@ +FLASH@0xfe000000 0x2000000 { + SI_ALL@0x0 0x606000 { + SI_DESC@0x0 0x1000 + SI_EC@0x1000 0x100000 + SI_GBE(PRESERVE)@0x101000 0x2000 + SI_ME@0x103000 0x4ff000 + SI_PDR(PRESERVE)@0x602000 0x4000 + } + SI_BIOS@0x606000 0x19fa000 { + RW_DIAG@0x0 0x10ca000 { + RW_LEGACY(CBFS)@0x0 0x10ba000 + DIAG_NVRAM@0x10ba000 0x10000 + } + RW_SECTION_A@0x10ca000 0x280000 { + VBLOCK_A@0x0 0x10000 + FW_MAIN_A(CBFS)@0x10000 0x26ffc0 + RW_FWID_A@0x27ffc0 0x40 + } + RW_SECTION_B@0x134a000 0x280000 { + VBLOCK_B@0x0 0x10000 + FW_MAIN_B(CBFS)@0x10000 0x26ffc0 + RW_FWID_B@0x27ffc0 0x40 + } + RW_MISC@0x15ca000 0x30000 { + UNIFIED_MRC_CACHE@0x0 0x20000 { + RECOVERY_MRC_CACHE@0x0 0x10000 + RW_MRC_CACHE@0x10000 0x10000 + } + RW_ELOG(PRESERVE)@0x20000 0x4000 + RW_SHARED@0x24000 0x4000 { + SHARED_DATA@0x0 0x2000 + VBLOCK_DEV@0x2000 0x2000 + } + RW_VPD(PRESERVE)@0x28000 0x2000 + RW_NVRAM(PRESERVE)@0x2a000 0x6000 + } + WP_RO@0x15fa000 0x400000 { + RO_VPD(PRESERVE)@0x0 0x4000 + RO_UNUSED@0x4000 0xc000 + RO_SECTION@0x10000 0x3f0000 { + FMAP@0x0 0x800 + RO_FRID@0x800 0x40 + RO_FRID_PAD@0x840 0x7c0 + GBB@0x1000 0x3000 + COREBOOT(CBFS)@0x4000 0x3ec000 + } + } + } +} diff --git a/src/mainboard/google/deltaur/chromeos.fmd b/src/mainboard/google/deltaur/chromeos.fmd index 9b6fec3..bbec112 100644 --- a/src/mainboard/google/deltaur/chromeos.fmd +++ b/src/mainboard/google/deltaur/chromeos.fmd @@ -2,8 +2,7 @@ SI_ALL@0x0 0x606000 { SI_DESC@0x0 0x1000 SI_EC@0x1000 0x100000 - SI_GBE(PRESERVE)@0x101000 0x2000 - SI_ME@0x103000 0x4ff000 + SI_ME@0x101000 0x501000 SI_PDR(PRESERVE)@0x602000 0x4000 } SI_BIOS@0x606000 0x19fa000 {
-
Angel Pons (Code Review) -
EricR Lai (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)
-
Tim Wawrzynczak (Code Review)