Skip to contentSkip to conversation

environment: Fix overlapping partitions error message

PATCH In review Ladislav Michl 2 participants 2 messages Oct 11, 2018 – Oct 12, 2018

lore
Share & tools
lore

Ladislav Michl

author
#0 lore raw

PATCH 1/1 environment: Fix overlapping partitions error message

Signed-off-by Ladislav Michl <[email protected]>
Fixes b234a6da331f ("environment: Do not use environment when

overlapping with other partitions")

---
 common/startup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/startup.c +2 -2
index 832d3262f..5793ea28a 100644
@@ -110,9 +110,9 @@ static int check_overlap(const char *path)
 conflict:
 	pr_err("Environment partition (0x%08llx-0x%08llx) "
 		"overlaps with partition %s (0x%08llx-0x%08llx), not using it\n",
-		cenv->offset, cenv->offset + cenv->offset + cenv->size - 1,
+		cenv->offset, cenv->offset + cenv->size - 1,
 		cpart->name,
-		cpart->offset, cpart->offset + cpart->offset + cpart->size - 1);
+		cpart->offset, cpart->offset + cpart->size - 1);
 
 	return -EINVAL;
 }
Signature · 7 lines
2.19.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw
Quoted 12 lines · Ladislav Michl
Signed-off-by Ladislav Michl <[email protected]>
Fixes b234a6da331f ("environment: Do not use environment when

overlapping with other partitions")

---
 common/startup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/startup.c +0 -0
index 832d3262f..5793ea28a 100644

common/startup.c static int check_overlap(const char *path) · line 115

Quoted 8 lines
common/startup.c +2 -2
@@ -110,9 +110,9 @@ static int check_overlap(const char *path)
 conflict:
 	pr_err("Environment partition (0x%08llx-0x%08llx) "
 		"overlaps with partition %s (0x%08llx-0x%08llx), not using it\n",
-		cenv->offset, cenv->offset + cenv->offset + cenv->size - 1,
+		cenv->offset, cenv->offset + cenv->size - 1,
 		cpart->name,
-		cpart->offset, cpart->offset + cpart->offset + cpart->size - 1);
+		cpart->offset, cpart->offset + cpart->size - 1);

/me pulls over a brown paper bag and applies

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox