summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2018-10-11 18:41:46 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-10-12 07:39:00 +0200
commit1106af35ee9eaded222f9eebf41dde3318d42158 (patch)
treea1a95bb7f1bf90360945515c845d55fb543f6a71
parentbf33df12725bbf2cb88596e5eaacc4e9d70ea619 (diff)
downloadbarebox-1106af35ee9eaded222f9eebf41dde3318d42158.tar.gz
barebox-1106af35ee9eaded222f9eebf41dde3318d42158.tar.xz
environment: Fix overlapping partitions error message
Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Fixes: b234a6da331f ("environment: Do not use environment when overlapping with other partitions") Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/startup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/startup.c b/common/startup.c
index 832d3262fe..5793ea28ac 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -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;
}