mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-11 05:52:36 +02:00
Leah Rowe
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 763c811b82b631ab85e64e150ec70df76b57fd91 Mon Sep 17 00:00:00 2001
|
|
From: Leah Rowe <leah@libreboot.org>
|
|
Date: Fri, 20 Feb 2026 01:23:32 +0000
|
|
Subject: [PATCH 46/51] util/ifdtool: option to allow region override
|
|
|
|
Signed-off-by: Leah Rowe <leah@libreboot.org>
|
|
---
|
|
util/ifdtool/ifdtool.c | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
|
|
index 2a5365efe7..c5c3570e6a 100644
|
|
--- a/util/ifdtool/ifdtool.c
|
|
+++ b/util/ifdtool/ifdtool.c
|
|
@@ -78,6 +78,8 @@ static unsigned int max_regions = 0;
|
|
static int selected_chip = 0;
|
|
static int platform = -1;
|
|
|
|
+static int ignore_region_override = 0;
|
|
+
|
|
static const struct region_name region_names[MAX_REGIONS] = {
|
|
{ "Flash Descriptor", "fd", "flashregion_0_flashdescriptor.bin", "SI_DESC" },
|
|
{ "BIOS", "bios", "flashregion_1_bios.bin", "SI_BIOS" },
|
|
@@ -2094,7 +2096,9 @@ static void new_layout(const char *filename, char *image, int size,
|
|
}
|
|
|
|
for (j = i + 1; j < max_regions; j++) {
|
|
- if (regions_collide(&new_regions[i], &new_regions[j])) {
|
|
+ if (ignore_region_override) {
|
|
+ printf("Ignoring region overlap by user's will.\n");
|
|
+ } else if (regions_collide(&new_regions[i], &new_regions[j])) {
|
|
fprintf(stderr, "Regions would overlap:\n");
|
|
|
|
/* See which string is longer and make sure we pad the shorter one */
|
|
@@ -2107,6 +2111,7 @@ static void new_layout(const char *filename, char *image, int size,
|
|
new_regions[i].base, new_regions[i].limit);
|
|
fprintf(stderr, " %*s : %x-%x\n", padding, region_name(j),
|
|
new_regions[j].base, new_regions[j].limit);
|
|
+
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
@@ -2363,10 +2368,11 @@ int main(int argc, char *argv[])
|
|
{"newvalue", 1, NULL, 'V'},
|
|
{"topswapsize", 1, NULL, 'T'},
|
|
{"nuke", 1, NULL, 'N'},
|
|
+ {"ignore-region-overlap", 0, NULL, 'I'},
|
|
{0, 0, 0, 0}
|
|
};
|
|
|
|
- while ((opt = getopt_long(argc, argv, "S:V:df:F:D:C:M:xi:n:O:s:p:T:elrugEcvth?",
|
|
+ while ((opt = getopt_long(argc, argv, "I:S:V:df:F:D:C:M:xi:n:O:s:p:T:elrugEcvth?",
|
|
long_options, &option_index)) != EOF) {
|
|
switch (opt) {
|
|
case 'd':
|
|
@@ -2610,6 +2616,9 @@ int main(int argc, char *argv[])
|
|
}
|
|
mode_nuke = 1;
|
|
break;
|
|
+ case 'I':
|
|
+ ignore_region_override = 1;
|
|
+ break;
|
|
case 'v':
|
|
print_version();
|
|
exit(EXIT_SUCCESS);
|
|
--
|
|
2.47.3
|
|
|