diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 1be31a05e00..33d1dfeb7b0 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -483,7 +483,9 @@ class Entry(object): if self.offset_unset: self.Raise('No offset set with offset-unset: should another ' 'entry provide this correct offset?') - self.offset = tools.align(offset, self.align) + elif self.offset > offset: + offset = self.offset + self.offset = tools.align(offset, self.align) needed = self.pad_before + self.contents_size + self.pad_after needed = tools.align(needed, self.align_size) size = self.size