On Thu, Oct 11, 2018 at 06:41:46PM +0200, Ladislav Michl wrote: > 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(-) > > diff --git a/common/startup.c b/common/startup.c > index 832d3262f..5793ea28a 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);
/me pulls over a brown paper bag and applies Sascha -- 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
