Frans Hendriks has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disabled USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Signed-off-by: Frans Hendriks fhendriks@eltan.com
Tested on Facebook FBG1701 Signed-off-by: Frans Hendriks fhendriks@eltan.com
Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 45 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/1
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig index d86458f..d6d2a27 100644 --- a/src/mainboard/facebook/fbg1701/Kconfig +++ b/src/mainboard/facebook/fbg1701/Kconfig @@ -20,7 +20,18 @@ select DISABLE_HPET select INTEL_GMA_HAVE_VBT select HAVE_SPD_IN_CBFS - select USE_VENDORCODE_ELTAN + +config USE_VENDORCODE_ELTAN + depends on !VBOOT + default y + +config VBOOT_VBNV_CMOS + depends on VBOOT + default y + +config VBOOT_SLOTS_RW_AB + depends on VBOOT + default n
config ONBOARD_SAMSUNG_MEM bool "Onboard memory manufacturer Samsung" @@ -88,4 +99,16 @@ bool default n
+config FMDFILE + depends on VBOOT + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rw.fmd" + +config RW_REGION_ONLY + depends on VBOOT + default "%/payload logo.bmp %/ramstage vbt.bin %/dsdt.aml config %/postcar" + +config RO_REGION_ONLY + depends on VBOOT + default "spd.bin fsp.bin cpu_microcode_blob.bin" + endif # BOARD_FACEBOOK_FBG1701 diff --git a/src/mainboard/facebook/fbg1701/vboot-rw.fmd b/src/mainboard/facebook/fbg1701/vboot-rw.fmd new file mode 100644 index 0000000..51ee470 --- /dev/null +++ b/src/mainboard/facebook/fbg1701/vboot-rw.fmd @@ -0,0 +1,21 @@ +FLASH 8M { + SI_BIOS@0x200000 0x600000 { + MISC_RW@0x0 0x08000 { + RW_MRC_CACHE@0 0x08000 + } + RW_SECTION_A@0x08000 0x578000 { + VBLOCK_A@0x0 0x10000 + RW_FWID_A@0x10000 0x40 + FW_MAIN_A(CBFS)@0x10040 0x567FC0 + } + WP_RO@0x580000 0x080000 { + RO_SECTION@0x0000 0x80000 { + FMAP@0x0 0x400 + RO_FRID@0xA00 0x40 + RO_FRID_PAD@0xA40 0x5c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x07B000 + } + } + } +}
Hello build bot (Jenkins), Michał Żygowski, Patrick Rudolph, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46219
to look at the new patch set (#2).
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 49 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... PS2, Line 103: depends on VBOOT I'd avoid the `depends on` clause for this, so that a fmap can be used even when VBOOT is not enabled.
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... PS2, Line 103: depends on VBOOT
I'd avoid the `depends on` clause for this, so that a fmap can be used even when VBOOT is not enable […]
I will update 'depends on' to !USE_VENDORCODE_ELTAN.
Hello build bot (Jenkins), Michał Żygowski, Patrick Rudolph, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46219
to look at the new patch set (#3).
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 49 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/3
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... PS2, Line 103: depends on VBOOT
I will update 'depends on' to !USE_VENDORCODE_ELTAN.
updated
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 3: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... PS2, Line 103: depends on VBOOT
updated
Ugh, my apologies. I forgot to suggest what I wanted to do:
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rw.fmd" if VBOOT
Hello build bot (Jenkins), Michał Żygowski, Patrick Rudolph, Angel Pons, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46219
to look at the new patch set (#4).
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 48 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/4
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/2/src/mainboard/facebook/fbg1... PS2, Line 103: depends on VBOOT
Ugh, my apologies. I forgot to suggest what I wanted to do: […]
You're right with your suggestion. Upload new patchset
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 4: Code-Review+2
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 4: Code-Review+2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/4/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/4/src/mainboard/facebook/fbg1... PS4, Line 32: config VBOOT_SLOTS_RW_AB : depends on VBOOT : default n Maybe set VBOOT_SLOTS_RW_A to y? At least that is what I think you're trying to do with that fmap setup.
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/4/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/4/src/mainboard/facebook/fbg1... PS4, Line 32: config VBOOT_SLOTS_RW_AB : depends on VBOOT : default n
Maybe set VBOOT_SLOTS_RW_A to y? At least that is what I think you're trying to do with that fmap se […]
Right. Need to enable VBOOT_SLOTS_RW_A.
Will check and provide updated patchset.
Hello build bot (Jenkins), Michał Żygowski, Patrick Rudolph, Angel Pons, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46219
to look at the new patch set (#5).
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 52 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/5
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/4/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/4/src/mainboard/facebook/fbg1... PS4, Line 32: config VBOOT_SLOTS_RW_AB : depends on VBOOT : default n
Right. Need to enable VBOOT_SLOTS_RW_A. […]
Done
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 5: Code-Review+2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... PS5, Line 28: config VBOOT_VBNV_CMOS : depends on VBOOT : default y : : config VBOOT_SLOTS_RW_A : depends on VBOOT : default y : : config VBOOT_NO_BOARD_SUPPORT : depends on VBOOT : default y : : config VBOOT_ENABLE_CBFS_FALLBACK : depends on VBOOT : default y nit: Maybe put all the things you need with vboot under
if VBOOT ... endif
That allows for less boilerplate.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 5: Code-Review+1
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... PS5, Line 28: config VBOOT_VBNV_CMOS : depends on VBOOT : default y : : config VBOOT_SLOTS_RW_A : depends on VBOOT : default y : : config VBOOT_NO_BOARD_SUPPORT : depends on VBOOT : default y : : config VBOOT_ENABLE_CBFS_FALLBACK : depends on VBOOT : default y
nit: Maybe put all the things you need with vboot under […]
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... PS5, Line 28: config VBOOT_VBNV_CMOS : depends on VBOOT : default y : : config VBOOT_SLOTS_RW_A : depends on VBOOT : default y : : config VBOOT_NO_BOARD_SUPPORT : depends on VBOOT : default y : : config VBOOT_ENABLE_CBFS_FALLBACK : depends on VBOOT : default y
Done
Forgot to push updated change?
Hello build bot (Jenkins), Michał Żygowski, Patrick Rudolph, Angel Pons, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46219
to look at the new patch set (#6).
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig 1 file changed, 29 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/6
Hello build bot (Jenkins), Michał Żygowski, Patrick Rudolph, Angel Pons, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46219
to look at the new patch set (#7).
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 50 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/46219/7
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... File src/mainboard/facebook/fbg1701/Kconfig:
https://review.coreboot.org/c/coreboot/+/46219/5/src/mainboard/facebook/fbg1... PS5, Line 28: config VBOOT_VBNV_CMOS : depends on VBOOT : default y : : config VBOOT_SLOTS_RW_A : depends on VBOOT : default y : : config VBOOT_NO_BOARD_SUPPORT : depends on VBOOT : default y : : config VBOOT_ENABLE_CBFS_FALLBACK : depends on VBOOT : default y
Forgot to push updated change?
Just pushed update.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 7: Code-Review+2
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
Patch Set 7: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46219 )
Change subject: mb/facebook/fbg1701: Add VBOOT support ......................................................................
mb/facebook/fbg1701: Add VBOOT support
Add VBOOT support.
Disable USE_VENDOR_ELTAN when VBOOT is enabled. Add FMD file and split binary into RW and RO region settings.
Tested on Facebook FBG1701
Signed-off-by: Frans Hendriks fhendriks@eltan.com Change-Id: I641bca58c0f7c81d5742235c8b2c184d13c00c55 Reviewed-on: https://review.coreboot.org/c/coreboot/+/46219 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Wim Vervoorn wvervoorn@eltan.com --- M src/mainboard/facebook/fbg1701/Kconfig A src/mainboard/facebook/fbg1701/vboot-rw.fmd 2 files changed, 50 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Wim Vervoorn: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig index 0f23ed2..4110337 100644 --- a/src/mainboard/facebook/fbg1701/Kconfig +++ b/src/mainboard/facebook/fbg1701/Kconfig @@ -20,7 +20,35 @@ select DISABLE_HPET select INTEL_GMA_HAVE_VBT select HAVE_SPD_IN_CBFS - select USE_VENDORCODE_ELTAN + +config USE_VENDORCODE_ELTAN + depends on !VBOOT + default y + +if VBOOT + +config VBOOT_VBNV_CMOS + default y + +config VBOOT_SLOTS_RW_A + default y + +config VBOOT_NO_BOARD_SUPPORT + default y + +config VBOOT_ENABLE_CBFS_FALLBACK + default y + +config FMDFILE + default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rw.fmd" + +config RW_REGION_ONLY + default "%/payload logo.bmp %/ramstage vbt.bin %/dsdt.aml config %/postcar" + +config RO_REGION_ONLY + default "spd.bin fsp.bin cpu_microcode_blob.bin" + +endif # VBOOT
config ONBOARD_SAMSUNG_MEM bool "Onboard memory manufacturer Samsung" diff --git a/src/mainboard/facebook/fbg1701/vboot-rw.fmd b/src/mainboard/facebook/fbg1701/vboot-rw.fmd new file mode 100644 index 0000000..51ee470 --- /dev/null +++ b/src/mainboard/facebook/fbg1701/vboot-rw.fmd @@ -0,0 +1,21 @@ +FLASH 8M { + SI_BIOS@0x200000 0x600000 { + MISC_RW@0x0 0x08000 { + RW_MRC_CACHE@0 0x08000 + } + RW_SECTION_A@0x08000 0x578000 { + VBLOCK_A@0x0 0x10000 + RW_FWID_A@0x10000 0x40 + FW_MAIN_A(CBFS)@0x10040 0x567FC0 + } + WP_RO@0x580000 0x080000 { + RO_SECTION@0x0000 0x80000 { + FMAP@0x0 0x400 + RO_FRID@0xA00 0x40 + RO_FRID_PAD@0xA40 0x5c0 + GBB@0x1000 0x4000 + COREBOOT(CBFS)@0x5000 0x07B000 + } + } + } +}
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)
-
Frans Hendriks (Code Review)
-
Patrick Georgi (Code Review)
-
Wim Vervoorn (Code Review)