Bill XIE has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34977 )
Change subject: security/vboot: Boot to Recovery Mode if no RW slot present
......................................................................
security/vboot: Boot to Recovery Mode if no RW slot present
Currently, even if there is no RW slot present, vboot will still try
to find one to boot, result in an infinite boot loop.
This change explicitly allows a coreboot build with vboot but without
RW slot to make use of vboot only for measured boot, by performing
"Recovery mode" boot, with stages and payloads in the RO slot.
Change-Id: Ica98afd6aeb5328515df0c11e974cc9b3e8cdde1
Signed-off-by: Bill XIE <persmule(a)hardenedlinux.org>
---
M src/security/vboot/vboot_logic.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/34977/1
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index 7f00df5..48fd6db 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -347,7 +347,9 @@
"Initializing measured boot mode failed!");
}
- if (get_recovery_mode_switch()) {
+ /* Boot to Recovery Mode if no RW slot present */
+ if (!CONFIG(VBOOT_SLOTS_RW_A) ||
+ get_recovery_mode_switch()) {
ctx.flags |= VB2_CONTEXT_FORCE_RECOVERY_MODE;
if (CONFIG(VBOOT_DISABLE_DEV_ON_RECOVERY))
ctx.flags |= VB2_CONTEXT_DISABLE_DEVELOPER_MODE;
--
To view, visit https://review.coreboot.org/c/coreboot/+/34977
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ica98afd6aeb5328515df0c11e974cc9b3e8cdde1
Gerrit-Change-Number: 34977
Gerrit-PatchSet: 1
Gerrit-Owner: Bill XIE <persmule(a)hardenedlinux.org>
Gerrit-MessageType: newchange
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36370 )
Change subject: drivers/intel/fsp1_1: Drop unused function
......................................................................
drivers/intel/fsp1_1: Drop unused function
Change-Id: Ide336fb900360c446bffcc5ca31bf51e7746cae1
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/drivers/intel/fsp1_1/fsp_util.c
M src/drivers/intel/fsp1_1/include/fsp/util.h
2 files changed, 0 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/36370/1
diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c
index 2889f3f..f2c8a4d 100644
--- a/src/drivers/intel/fsp1_1/fsp_util.c
+++ b/src/drivers/intel/fsp1_1/fsp_util.c
@@ -280,10 +280,3 @@
}
}
}
-
-__attribute__((cdecl)) size_t fsp_write_line(uint8_t *buffer,
- size_t number_of_bytes)
-{
- console_write_line(buffer, number_of_bytes);
- return number_of_bytes;
-}
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h
index dca6d56..73b156f 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/util.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h
@@ -96,15 +96,6 @@
void *get_next_guid_hob(const EFI_GUID *guid, const void *hob_start);
void *get_first_guid_hob(const EFI_GUID *guid);
-/*
- * Writes number_of_bytes data bytes from buffer to the console.
- * The number of bytes actually written to the console is returned.
- *
- * If number_of_bytes is zero, don't output any data but instead wait until
- * the console has output all data, then return 0.
- */
-__attribute__((cdecl)) size_t fsp_write_line(uint8_t *buffer,
- size_t number_of_bytes);
asmlinkage void chipset_teardown_car_main(void);
--
To view, visit https://review.coreboot.org/c/coreboot/+/36370
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ide336fb900360c446bffcc5ca31bf51e7746cae1
Gerrit-Change-Number: 36370
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange
Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36301 )
Change subject: Doc/mb/gigabyte/ga-h61m-s2pv: Correct IFD section
......................................................................
Doc/mb/gigabyte/ga-h61m-s2pv: Correct IFD section
Change-Id: Ic94dd7381e9a107081011d083286d27005148557
Signed-off-by: Angel Pons <th3fanbus(a)gmail.com>
---
M Documentation/mainboard/gigabyte/ga-h61m-s2pv.md
1 file changed, 7 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/36301/1
diff --git a/Documentation/mainboard/gigabyte/ga-h61m-s2pv.md b/Documentation/mainboard/gigabyte/ga-h61m-s2pv.md
index 06c0ff7..501f38d 100644
--- a/Documentation/mainboard/gigabyte/ga-h61m-s2pv.md
+++ b/Documentation/mainboard/gigabyte/ga-h61m-s2pv.md
@@ -39,27 +39,22 @@
The original IFD defines the BIOS region as the whole flash chip. While this is
not an issue if flashing a complete image, it confuses flashrom and trashes the
-flash chip's contents when using the --ifd option. However, this can be easily
-fixed by reading the IFD with flashrom, editing the correct values into it with
-ifdtool and then reflashing it.
-
-Create a layout.txt with the following contents:
+flash chip's contents when using the `--ifd` option. A possible workaround is
+to create a `layout.txt` file with a non-overlapping BIOS region:
00000000:00000fff fd
00180000:003fffff bios
00001000:0017ffff me
-After that, simply run:
+After that, use flashrom with the new layout file. For example, to backup the
+BIOS region and then flash a `coreboot.rom` to it, do:
```bash
-sudo flashrom -p internal --ifd -i fd -r ifd.rom
-ifdtool -n layout.txt ifd.rom
-sudo flashrom -p internal --ifd -i fd -w ifd.rom.new
+sudo flashrom -p internal -l layout.txt -i bios -r backup.rom
+sudo flashrom -p internal -l layout.txt -i bios -w coreboot.rom
```
-After flashing, power cycle the computer to ensure the new IFD is being used.
-If only a reboot is done, the old IFD layout is still seen by flashrom, even if
-the IFD on the flash chip is correctly defining the new region layout.
+Modifying the
## Technology
--
To view, visit https://review.coreboot.org/c/coreboot/+/36301
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic94dd7381e9a107081011d083286d27005148557
Gerrit-Change-Number: 36301
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-MessageType: newchange