Config: fix bootloader config errors - propagate errors #12059
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -894,63 +894,56 @@ def _add_all_regions(self, region_list, active_region_name): | |
| def add_regions(self): | ||
| """Add regions to the build profile, if there are any. | ||
| """ | ||
|
|
||
| if not getattr(self.target, "bootloader_supported", False): | ||
|
There was a problem hiding this comment. I would rather encode the default behaviour in There was a problem hiding this comment. This is how it is done in regions(). Do you suggest to have target method to return if bootloader is supported and add_regions() would not even be called if not? |
||
| return | ||
|
There was a problem hiding this comment. This is the addition for #12007 . The rest was approved already. |
||
|
|
||
| if self.config.has_regions: | ||
| regions = list(self.config.regions) | ||
| regions.sort(key=lambda x: x.start) | ||
| self.notify.info("Using ROM region%s %s in this build." % ( | ||
| "s" if len(regions) > 1 else "", | ||
| ", ".join(r.name for r in regions) | ||
| )) | ||
| self._add_all_regions(regions, "MBED_APP") | ||
|
|
||
| if self.config.has_ram_regions: | ||
| regions = list(self.config.ram_regions) | ||
| self.notify.info("Using RAM region%s %s in this build." % ( | ||
| "s" if len(regions) > 1 else "", | ||
| ", ".join(r.name for r in regions) | ||
| )) | ||
| self._add_all_regions(regions, None) | ||
|
|
||
| Region = namedtuple("Region", "name start size") | ||
|
|
||
|
|
||
| # Add all available ROM regions to build profile | ||
| if not getattr(self.target, "static_memory_defines", False): | ||
| raise ConfigException() | ||
| rom_available_regions = self.config.get_all_active_memories( | ||
| ROM_ALL_MEMORIES | ||
| ) | ||
| for key, value in rom_available_regions.items(): | ||
| rom_start, rom_size = value | ||
| self._add_defines_from_region( | ||
| Region("MBED_" + key, rom_start, rom_size), | ||
| True, | ||
| suffixes=["_START", "_SIZE"] | ||
| ) | ||
| # Add all available RAM regions to build profile | ||
| if not getattr(self.target, "static_memory_defines", False): | ||
| raise ConfigException() | ||
| ram_available_regions = self.config.get_all_active_memories( | ||
| RAM_ALL_MEMORIES | ||
| ) | ||
| for key, value in ram_available_regions.items(): | ||
| ram_start, ram_size = value | ||
| self._add_defines_from_region( | ||
| Region("MBED_" + key, ram_start, ram_size), | ||
| True, | ||
| suffixes=["_START", "_SIZE"] | ||
| ) | ||
|
|
||
| STACK_PARAM = "target.boot-stack-size" | ||
| TFM_LVL_PARAM = "tfm.level" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1
But as I am a copy paste expert... you need to update also stm32f746xg.icf, stm32f767xi.icf, and stm32f769xi.icf...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how come they don't fail the build? will check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a copy paste expert!