Merge pull request #7196 from theotherjimmy/no-double-header

Tools: Remove second header when every bl config param is used

Author: adbridge

tools/config/__init__.py

@@ -650,7 +650,7 @@ def _generate_bootloader_build(self, rom_start, rom_size):
             new_size = Config._align_floor(start + new_size, self.sectors) - start
             yield Region("application", start, new_size, True, None)
             start += new_size
-            if self.target.header_format:
+            if self.target.header_format and not self.target.bootloader_img:
                 if self.target.header_offset:
                     start = self._assign_new_offset(
                         rom_start, start, self.target.header_offset, "header")