Skip to content

Commit 3776a35

Browse files
nashifstephanosio
authored andcommitted
Revert "boards: silabs: siwx91x: Expose real layout of the flash"
This reverts commit 53375e9. Some boards are failing with: OverflowError: can't convert negative int to unsigned Signed-off-by: Anas Nashif <[email protected]>
1 parent ee78349 commit 3776a35

File tree

4 files changed

+10
-62
lines changed

4 files changed

+10
-62
lines changed

boards/silabs/radio_boards/siwx917_rb4338a/siwx917_rb4338a.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@
101101
#address-cells = <1>;
102102
#size-cells = <1>;
103103

104-
code_partition: partition@202000 {
105-
reg = <0x00202000 DT_SIZE_K(2008)>;
104+
code_partition: partition@0 {
105+
reg = <0x0000000 DT_SIZE_K(2008)>;
106106
label = "code_partition";
107107
};
108108

109-
storage_partition: partition@3f8000 {
110-
reg = <0x003f8000 DT_SIZE_K(32)>;
109+
storage_partition: partition@1f6000 {
110+
reg = <0x001f6000 DT_SIZE_K(32)>;
111111
label = "storage";
112112
};
113113
};

boards/silabs/radio_boards/siwx917_rb4342a/siwx917_rb4342a.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@
102102
#address-cells = <1>;
103103
#size-cells = <1>;
104104

105-
code_partition: partition@202000 {
106-
reg = <0x00202000 DT_SIZE_K(2008)>;
105+
code_partition: partition@0 {
106+
reg = <0x0000000 DT_SIZE_K(2008)>;
107107
label = "code_partition";
108108
};
109109

110-
storage_partition: partition@3f8000 {
111-
reg = <0x003f8000 DT_SIZE_K(32)>;
110+
storage_partition: partition@1f6000 {
111+
reg = <0x001f6000 DT_SIZE_K(32)>;
112112
label = "storage";
113113
};
114114
};

dts/arm/silabs/siwg917.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
#address-cells = <1>;
110110
#size-cells = <1>;
111111

112-
flash0: flash@8000000 {
112+
flash0: flash@8202000 {
113113
compatible = "soc-nv-flash";
114114
write-block-size = <1>;
115115
erase-block-size = <4096>;

dts/arm/silabs/siwg917m111mgtba.dtsi

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,5 @@
1616
};
1717

1818
&flash0 {
19-
reg = <0x08000000 DT_SIZE_M(8)>;
20-
21-
partitions {
22-
compatible = "fixed-partitions";
23-
#address-cells = <1>;
24-
#size-cells = <1>;
25-
26-
/* See AN1416: SiWx917 SoC Memory Map, 3.1.4 Memory Map (8 MB) */
27-
mbr_nwp_partition: partition@0 {
28-
label = "mbr_nwp";
29-
reg = <0x0000000 DT_SIZE_K(68)>;
30-
};
31-
32-
code_nwp_partition: partition@11000 {
33-
label = "code_nwp";
34-
reg = <0x00011000 DT_SIZE_K(1916)>;
35-
};
36-
37-
mbr_partition: partition@1f0000 {
38-
label = "mbr";
39-
reg = <0x001f0000 DT_SIZE_K(68)>;
40-
};
41-
42-
hdr_partition: partition@201000 {
43-
label = "hdr";
44-
reg = <0x00201000 DT_SIZE_K(4)>;
45-
};
46-
47-
/* 0x00202000-0x00400000: Free space for Zephyr */
48-
49-
ota_swap_partition: partition@400000 {
50-
/* During the upgrade process, this area will be copied to
51-
* 0x011000-0x400000
52-
*/
53-
label = "ota_swap";
54-
reg = <0x00400000 DT_SIZE_K(3900)>;
55-
};
56-
57-
storage_nwp_partition: partition@7cf000 {
58-
label = "storage_nwp";
59-
reg = <0x007cf000 DT_SIZE_K(160)>;
60-
};
61-
62-
storage_shared_partition: partition@7f7000 {
63-
label = "storage_shared";
64-
reg = <0x007f7000 DT_SIZE_K(20)>;
65-
};
66-
67-
backup_bootloader_partition: partition@7fc000 {
68-
label = "backup_bootloader";
69-
reg = <0x007fc000 DT_SIZE_K(16)>;
70-
};
71-
};
19+
reg = <0x08202000 DT_SIZE_K(2048-8)>;
7220
};

0 commit comments

Comments
 (0)