mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-18 03:43:46 +02:00
Leah Rowe
42068f7ce1
Riku's mSATA patch for HP8300USDT was merged upstream, so the patch has been dropped from lbmk because it is contained within this new coreboot revision. Signed-off-by: Leah Rowe <leah@libreboot.org>
206 lines
7.4 KiB
Diff
206 lines
7.4 KiB
Diff
From 38c76afbea4abfed2976bfbe10977e41f21665b0 Mon Sep 17 00:00:00 2001
|
|
From: Leah Rowe <leah@libreboot.org>
|
|
Date: Sun, 19 Feb 2023 18:21:43 +0000
|
|
Subject: [PATCH 15/22] util/ifdtool: add --nuke flag (all 0xFF on region)
|
|
|
|
When this option is used, the region's contents are overwritten
|
|
with all ones (0xFF).
|
|
|
|
Example:
|
|
|
|
./ifdtool --nuke gbe coreboot.rom
|
|
./ifdtool --nuke bios coreboot.com
|
|
./ifdtool --nuke me coreboot.com
|
|
|
|
Rebased since the last revision update in lbmk.
|
|
|
|
Signed-off-by: Leah Rowe <leah@libreboot.org>
|
|
---
|
|
util/ifdtool/ifdtool.c | 114 ++++++++++++++++++++++++++++++-----------
|
|
1 file changed, 83 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
|
|
index ddbc0fb91b..7af9235ae3 100644
|
|
--- a/util/ifdtool/ifdtool.c
|
|
+++ b/util/ifdtool/ifdtool.c
|
|
@@ -1847,6 +1847,7 @@ static void print_usage(const char *name)
|
|
" wbg - Wellsburg\n"
|
|
" -S | --setpchstrap Write a PCH strap\n"
|
|
" -V | --newvalue The new value to write into PCH strap specified by -S\n"
|
|
+ " -N | --nuke <region> Overwrite the specified region with 0xFF (all ones)\n"
|
|
" -v | --version: print the version\n"
|
|
" -h | --help: print this help\n\n"
|
|
"<region> is one of Descriptor, BIOS, ME, GbE, Platform Data, Secondary BIOS, "
|
|
@@ -1854,6 +1855,60 @@ static void print_usage(const char *name)
|
|
"\n");
|
|
}
|
|
|
|
+static int
|
|
+get_region_type_string(const char *region_type_string)
|
|
+{
|
|
+ if (!strcasecmp("Descriptor", region_type_string))
|
|
+ return 0;
|
|
+ else if (!strcasecmp("BIOS", region_type_string))
|
|
+ return 1;
|
|
+ else if (!strcasecmp("ME", region_type_string))
|
|
+ return 2;
|
|
+ else if (!strcasecmp("GbE", region_type_string))
|
|
+ return 3;
|
|
+ else if (!strcasecmp("Platform Data", region_type_string))
|
|
+ return 4;
|
|
+ else if (!strcasecmp("Device Exp1", region_type_string))
|
|
+ return 5;
|
|
+ else if (!strcasecmp("Secondary BIOS", region_type_string))
|
|
+ return 6;
|
|
+ else if (!strcasecmp("Reserved", region_type_string))
|
|
+ return 7;
|
|
+ else if (!strcasecmp("EC", region_type_string))
|
|
+ return 8;
|
|
+ else if (!strcasecmp("Device Exp2", region_type_string))
|
|
+ return 9;
|
|
+ else if (!strcasecmp("IE", region_type_string))
|
|
+ return 10;
|
|
+ else if (!strcasecmp("10GbE_0", region_type_string))
|
|
+ return 11;
|
|
+ else if (!strcasecmp("10GbE_1", region_type_string))
|
|
+ return 12;
|
|
+ else if (!strcasecmp("PTT", region_type_string))
|
|
+ return 15;
|
|
+ return -1;
|
|
+}
|
|
+
|
|
+static void
|
|
+nuke(const char *filename, char *image, int size, int region_type)
|
|
+{
|
|
+ int i;
|
|
+ struct region region;
|
|
+ const struct frba *frba = find_frba(image, size);
|
|
+ if (!frba)
|
|
+ exit(EXIT_FAILURE);
|
|
+
|
|
+ region = get_region(frba, region_type);
|
|
+ if (region.size > 0) {
|
|
+ for (i = region.base; i <= region.limit; i++) {
|
|
+ if ((i + 1) > (size))
|
|
+ break;
|
|
+ image[i] = 0xFF;
|
|
+ }
|
|
+ write_image(filename, image, size);
|
|
+ }
|
|
+}
|
|
+
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int opt, option_index = 0;
|
|
@@ -1861,6 +1916,7 @@ int main(int argc, char *argv[])
|
|
int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0, mode_validate = 0;
|
|
int mode_layout = 0, mode_newlayout = 0, mode_density = 0, mode_setstrap = 0;
|
|
int mode_read = 0, mode_altmedisable = 0, altmedisable = 0, mode_fmap_template = 0;
|
|
+ int mode_nuke = 0;
|
|
char *region_type_string = NULL, *region_fname = NULL;
|
|
const char *layout_fname = NULL;
|
|
char *new_filename = NULL;
|
|
@@ -1892,6 +1948,7 @@ int main(int argc, char *argv[])
|
|
{"validate", 0, NULL, 't'},
|
|
{"setpchstrap", 1, NULL, 'S'},
|
|
{"newvalue", 1, NULL, 'V'},
|
|
+ {"nuke", 1, NULL, 'N'},
|
|
{0, 0, 0, 0}
|
|
};
|
|
|
|
@@ -1941,35 +1998,8 @@ int main(int argc, char *argv[])
|
|
region_fname++;
|
|
// Descriptor, BIOS, ME, GbE, Platform
|
|
// valid type?
|
|
- if (!strcasecmp("Descriptor", region_type_string))
|
|
- region_type = 0;
|
|
- else if (!strcasecmp("BIOS", region_type_string))
|
|
- region_type = 1;
|
|
- else if (!strcasecmp("ME", region_type_string))
|
|
- region_type = 2;
|
|
- else if (!strcasecmp("GbE", region_type_string))
|
|
- region_type = 3;
|
|
- else if (!strcasecmp("Platform Data", region_type_string))
|
|
- region_type = 4;
|
|
- else if (!strcasecmp("Device Exp1", region_type_string))
|
|
- region_type = 5;
|
|
- else if (!strcasecmp("Secondary BIOS", region_type_string))
|
|
- region_type = 6;
|
|
- else if (!strcasecmp("Reserved", region_type_string))
|
|
- region_type = 7;
|
|
- else if (!strcasecmp("EC", region_type_string))
|
|
- region_type = 8;
|
|
- else if (!strcasecmp("Device Exp2", region_type_string))
|
|
- region_type = 9;
|
|
- else if (!strcasecmp("IE", region_type_string))
|
|
- region_type = 10;
|
|
- else if (!strcasecmp("10GbE_0", region_type_string))
|
|
- region_type = 11;
|
|
- else if (!strcasecmp("10GbE_1", region_type_string))
|
|
- region_type = 12;
|
|
- else if (!strcasecmp("PTT", region_type_string))
|
|
- region_type = 15;
|
|
- if (region_type == -1) {
|
|
+ if ((region_type =
|
|
+ get_region_type_string(region_type_string)) == -1) {
|
|
fprintf(stderr, "No such region type: '%s'\n\n",
|
|
region_type_string);
|
|
fprintf(stderr, "run '%s -h' for usage\n", argv[0]);
|
|
@@ -2135,6 +2165,22 @@ int main(int argc, char *argv[])
|
|
case 't':
|
|
mode_validate = 1;
|
|
break;
|
|
+ case 'N':
|
|
+ region_type_string = strdup(optarg);
|
|
+ if (!region_type_string) {
|
|
+ fprintf(stderr, "No region specified\n");
|
|
+ print_usage(argv[0]);
|
|
+ exit(EXIT_FAILURE);
|
|
+ }
|
|
+ if ((region_type =
|
|
+ get_region_type_string(region_type_string)) == -1) {
|
|
+ fprintf(stderr, "No such region type: '%s'\n\n",
|
|
+ region_type_string);
|
|
+ print_usage(argv[0]);
|
|
+ exit(EXIT_FAILURE);
|
|
+ }
|
|
+ mode_nuke = 1;
|
|
+ break;
|
|
case 'v':
|
|
print_version();
|
|
exit(EXIT_SUCCESS);
|
|
@@ -2150,7 +2196,8 @@ int main(int argc, char *argv[])
|
|
|
|
if ((mode_dump + mode_layout + mode_fmap_template + mode_extract + mode_inject +
|
|
mode_setstrap + mode_newlayout + (mode_spifreq | mode_em100 |
|
|
- mode_unlocked | mode_locked) + mode_altmedisable + mode_validate) > 1) {
|
|
+ mode_unlocked | mode_locked) + mode_altmedisable + mode_validate +
|
|
+ mode_nuke) > 1) {
|
|
fprintf(stderr, "You may not specify more than one mode.\n\n");
|
|
fprintf(stderr, "run '%s -h' for usage\n", argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
@@ -2158,7 +2205,8 @@ int main(int argc, char *argv[])
|
|
|
|
if ((mode_dump + mode_layout + mode_fmap_template + mode_extract + mode_inject +
|
|
mode_setstrap + mode_newlayout + mode_spifreq + mode_em100 +
|
|
- mode_locked + mode_unlocked + mode_density + mode_altmedisable + mode_validate) == 0) {
|
|
+ mode_locked + mode_unlocked + mode_density + mode_altmedisable +
|
|
+ mode_validate + mode_nuke) == 0) {
|
|
fprintf(stderr, "You need to specify a mode.\n\n");
|
|
fprintf(stderr, "run '%s -h' for usage\n", argv[0]);
|
|
exit(EXIT_FAILURE);
|
|
@@ -2262,6 +2310,10 @@ int main(int argc, char *argv[])
|
|
write_image(new_filename, image, size);
|
|
}
|
|
|
|
+ if (mode_nuke) {
|
|
+ nuke(new_filename, image, size, region_type);
|
|
+ }
|
|
+
|
|
if (mode_altmedisable) {
|
|
struct fpsba *fpsba = find_fpsba(image, size);
|
|
struct fmsba *fmsba = find_fmsba(image, size);
|
|
--
|
|
2.39.2
|
|
|