RFC: memory regions from devicetree & explicit code locations #33656
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright (c) 2021, Commonwealth Scientific and Industrial Research | ||
| * Organisation (CSIRO) ABN 41 687 119 230. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| &flash0 { | ||
| partitions { | ||
| boot_partition: partition@0 { | ||
| label = "mcuboot"; | ||
| reg = <0x000000000 0x0000C000>; | ||
| }; | ||
| slot0_partition: partition@c000 { | ||
| label = "image-0"; | ||
| reg = <0x0000C000 0x00067000>; | ||
| }; | ||
| slot1_partition: partition@73000 { | ||
| label = "image-1"; | ||
| reg = <0x00073000 0x00067000>; | ||
| }; | ||
| scratch_partition: partition@da000 { | ||
| label = "image-scratch"; | ||
| reg = <0x000da000 0x0001e000>; | ||
| }; | ||
| }; | ||
| }; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * Copyright (c) 2021, Commonwealth Scientific and Industrial Research | ||
| * Organisation (CSIRO) ABN 41 687 119 230. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| #include <mcuboot_partitions.dtsi> | ||
|
|
||
| / { | ||
| chosen { | ||
| zephyr,code-partition = &boot_partition; | ||
| }; | ||
| }; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright (c) 2021, Commonwealth Scientific and Industrial Research | ||
| * Organisation (CSIRO) ABN 41 687 119 230. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| / { | ||
| chosen { | ||
| zephyr,code-partition = &code_partition; | ||
| }; | ||
| }; | ||
|
|
||
| &flash0 { | ||
|
|
||
| partitions { | ||
| code_partition: partition@0 { | ||
| label = "code"; | ||
| reg = <0x000000000 0x000f8000>; | ||
| }; | ||
| }; | ||
| }; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| CONFIG_BOOTLOADER_MCUBOOT=y |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * Copyright (c) 2021, Commonwealth Scientific and Industrial Research | ||
| * Organisation (CSIRO) ABN 41 687 119 230. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| #include <mcuboot_partitions.dtsi> | ||
|
|
||
| / { | ||
| chosen { | ||
| zephyr,code-partition = &slot0_partition; | ||
| }; | ||
| }; |
This file contains 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 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 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Copyright (c) 2021, Commonwealth Scientific and Industrial Research | ||
| * Organisation (CSIRO) ABN 41 687 119 230. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Generate memory regions from devicetree partitions. | ||
| * Partitions are only considered if they exist under chosen/zephyr,flash. | ||
| */ | ||
|
|
||
| /* Partitions under chosen/zephyr,flash */ | ||
| #define _CHOSEN_PARTITIONS(p) UTIL_CAT(DT_CHOSEN(p), _S_partitions) | ||
|
|
||
| /* Declare a memory region */ | ||
| #define _REGION_DECLARE(node) DT_LABEL(node) (rx) : \ | ||
| ORIGIN = DT_REG_ADDR(node), \ | ||
| LENGTH = DT_REG_SIZE(node) | ||
|
|
||
| /* Apply a macro to a partition list, if it exists */ | ||
| #define _FLASH_PARITIONS_APPLY(p, f) \ | ||
| COND_CODE_1(DT_NODE_EXISTS(p), (DT_FOREACH_CHILD(p, f)), ()) | ||
|
|
||
| /* Apply a macro to a node, if it is 'okay' */ | ||
| #define _OKAY_NODE_APPLY(n, f) \ | ||
| COND_CODE_1(DT_NODE_HAS_STATUS(n, okay), (f(n)), ()) | ||
|
|
||
| /* Execution partition */ | ||
| #define DT_CODE_PARITION() DT_LABEL(DT_CHOSEN(zephyr_code_partition)) | ||
|
|
||
| /** | ||
| * @brief Generate region definitions for all devicetree linker regions | ||
| */ | ||
| #define DT_REGIONS_FROM_CHOSEN_FLASH(chosen_flash) \ | ||
| _FLASH_PARITIONS_APPLY(_CHOSEN_PARTITIONS(chosen_flash), \ | ||
| _REGION_DECLARE) | ||
|
|
||
| /** | ||
| * @brief Generate a region definition from an enabled devicetree node | ||
| */ | ||
| #define DT_REGION_FROM_NODE(node) \ | ||
| COND_CODE_1(DT_NODE_EXISTS(node), \ | ||
| (_OKAY_NODE_APPLY(node, _REGION_DECLARE)), \ | ||
| ()) |
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.
CCFG_ADDRis still being used in the code below:causing:
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.
Seems to be corrected in: #34185
So assume this is now pending a rebase after #34185 is merged.