diff --git a/README.md b/README.md index 94c8824b..df1945ca 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ automating much of the coreboot image creation and customization. Secondly, the project produces documentation aimed at non-technical users. Thirdly, the project attempts to provide excellent user support via IRC. -Libreboot already comes with a payload (GRUB), flashrom and other +Libreboot already comes with a payload (GRUB), flashprog and other needed parts. Everything is fully integrated, in a way where most of the complicated steps that are otherwise required, are instead done for the user in advance. diff --git a/config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch b/config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch deleted file mode 100644 index f8cf4be2..00000000 --- a/config/flashrom/patches/0001-fix-implicit-typecast-fixes-build-error.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2d3124cf3c6c2e2de351fcafc572b19565b1d2a5 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 24 Dec 2023 08:52:55 +0000 -Subject: [PATCH 1/1] fix implicit typecast (fixes build error) - -typecasting an enum as (unsigned) should be safe - -Change-Id: Ib9d00d39020fef255eb4276bcc7d85c9973caed1 -Signed-off-by: Leah Rowe ---- - libflashrom.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libflashrom.c b/libflashrom.c -index 0dec22ee..fb7d22a8 100644 ---- a/libflashrom.c -+++ b/libflashrom.c -@@ -188,7 +188,7 @@ struct flashrom_board_info *flashrom_supported_boards(void) - for (; i < boards_known_size; ++i) { - supported_boards[i].vendor = binfo[i].vendor; - supported_boards[i].name = binfo[i].name; -- supported_boards[i].working = binfo[i].working; -+ supported_boards[i].working = (unsigned) binfo[i].working; - } - } else { - msg_gerr("Memory allocation error!\n"); -@@ -226,7 +226,7 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) - supported_chipsets[i].chipset = chipset[i].device_name; - supported_chipsets[i].vendor_id = chipset[i].vendor_id; - supported_chipsets[i].chipset_id = chipset[i].device_id; -- supported_chipsets[i].status = chipset[i].status; -+ supported_chipsets[i].status = (unsigned) chipset[i].status; - } - } else { - msg_gerr("Memory allocation error!\n"); --- -2.39.2 - diff --git a/util/dell-flash-unlock/README.md b/util/dell-flash-unlock/README.md index f7b6ae33..9c7d292c 100644 --- a/util/dell-flash-unlock/README.md +++ b/util/dell-flash-unlock/README.md @@ -1,6 +1,6 @@ # Dell Laptop Internal Flashing -This utility allows you to use flashrom's internal programmer to program the +This utility allows you to use flashprog's internal programmer to program the entire BIOS flash chip from software while still running the original Dell BIOS, which normally restricts software writes to the flash chip. It seems like this works on any Dell laptop that has an EC similar to the SMSC MEC5035 on the @@ -55,7 +55,7 @@ please test the utility and report whether or not it actually works for you. for the first time, which will tell the EC to set the descriptor override on the next boot. Then you will need to shut down the system, after which the system will automatically boot up. You should then re-run the utility to - disable SMM, after which you can run flashrom. Finally, you should run the + disable SMM, after which you can run flashprog. Finally, you should run the utility a third time to reenable SMM so that shutdown works properly afterwards. - On 1st Generation Intel Core systems such as the E6410 and newer, run the @@ -78,7 +78,7 @@ each region of the flash, which are enforced by the chipset. On the Latitude E6400, the host has read-only access to the IFD, no access to the ME region, and read-write access to the PD, GBE, and BIOS regions. In order -for flashrom to write to the entire flash internally, the host needs full +for flashprog to write to the entire flash internally, the host needs full permissions to all of these regions. Since the IFD is read only, we cannot change these permissions unless we directly access the chip using an external programmer, which defeats the purpose of internal flashing. @@ -107,7 +107,7 @@ that the BIOSWE bit was never set to 1. Unfortunately, the BLE bit cannot be set back to 0 once it is set to 1, so this functionality cannot be disabled after it is first enabled by the BIOS. -Older versions of the E6400 BIOS did not set the BLE bit, allowing flashrom to +Older versions of the E6400 BIOS did not set the BLE bit, allowing flashprog to flash the entire flash chip internally after only setting the descriptor override. However, more recent versions do set it, so we may have hit a dead end unless we force downgrade to an older version (though there is a more