Skip to content

Commit a3f71f1

Browse files
marekmatejnashif
marekmatej
authored and
nashif
committed
boards: espressif: Use default partition tables
Include the predefined partition table in the Espressif boards. Signed-off-by: Marek Matej <[email protected]>
1 parent 7ad79a8 commit a3f71f1

27 files changed

+21
-945
lines changed

‎boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/dts-v1/;
77

88
#include <espressif/esp32/esp32_appcpu.dtsi>
9+
#include <espressif/partitions_0x1000_amp.dtsi>
910

1011
/ {
1112
model = "Espressif ESP32-DevkitC APPCPU";
@@ -25,42 +26,3 @@
2526
&trng0 {
2627
status = "okay";
2728
};
28-
29-
&flash0 {
30-
status = "okay";
31-
partitions {
32-
compatible = "fixed-partitions";
33-
#address-cells = <1>;
34-
#size-cells = <1>;
35-
36-
/* Reserve 60kB for the bootloader */
37-
boot_partition: partition@1000 {
38-
label = "mcuboot";
39-
reg = <0x00001000 0x0000F000>;
40-
read-only;
41-
};
42-
43-
/* Reserve 1024kB for the application in slot 0 */
44-
slot0_partition: partition@10000 {
45-
label = "image-0";
46-
reg = <0x00010000 0x00100000>;
47-
};
48-
49-
/* Reserve 1024kB for the application in slot 1 */
50-
slot1_partition: partition@110000 {
51-
label = "image-1";
52-
reg = <0x00110000 0x00100000>;
53-
};
54-
55-
/* Reserve 256kB for the scratch partition */
56-
scratch_partition: partition@210000 {
57-
label = "image-scratch";
58-
reg = <0x00210000 0x00040000>;
59-
};
60-
61-
storage_partition: partition@250000 {
62-
label = "storage";
63-
reg = <0x00250000 0x00006000>;
64-
};
65-
};
66-
};

‎boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "esp32_devkitc_wroom-pinctrl.dtsi"
1010
#include <zephyr/dt-bindings/input/input-event-codes.h>
1111
#include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
12+
#include <espressif/partitions_0x1000_amp.dtsi>
1213

1314
/ {
1415
model = "Espressif ESP32-DevkitC PROCPU";
@@ -128,45 +129,6 @@
128129
status = "disabled";
129130
};
130131

131-
&flash0 {
132-
status = "okay";
133-
partitions {
134-
compatible = "fixed-partitions";
135-
#address-cells = <1>;
136-
#size-cells = <1>;
137-
138-
/* Reserve 60kB for the bootloader */
139-
boot_partition: partition@1000 {
140-
label = "mcuboot";
141-
reg = <0x00001000 0x0000F000>;
142-
read-only;
143-
};
144-
145-
/* Reserve 1024kB for the application in slot 0 */
146-
slot0_partition: partition@10000 {
147-
label = "image-0";
148-
reg = <0x00010000 0x00100000>;
149-
};
150-
151-
/* Reserve 1024kB for the application in slot 1 */
152-
slot1_partition: partition@110000 {
153-
label = "image-1";
154-
reg = <0x00110000 0x00100000>;
155-
};
156-
157-
/* Reserve 256kB for the scratch partition */
158-
scratch_partition: partition@210000 {
159-
label = "image-scratch";
160-
reg = <0x00210000 0x00040000>;
161-
};
162-
163-
storage_partition: partition@250000 {
164-
label = "storage";
165-
reg = <0x00250000 0x00006000>;
166-
};
167-
};
168-
};
169-
170132
&esp32_bt_hci {
171133
status = "okay";
172134
};

‎boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/dts-v1/;
77

88
#include <espressif/esp32/esp32_appcpu.dtsi>
9+
#include <espressif/partitions_0x1000_amp.dtsi>
910

1011
/ {
1112
model = "Espressif ESP32-DevkitC WROVER-E APPCPU";
@@ -25,42 +26,3 @@
2526
&trng0 {
2627
status = "okay";
2728
};
28-
29-
&flash0 {
30-
status = "okay";
31-
partitions {
32-
compatible = "fixed-partitions";
33-
#address-cells = <1>;
34-
#size-cells = <1>;
35-
36-
/* Reserve 60kB for the bootloader */
37-
boot_partition: partition@1000 {
38-
label = "mcuboot";
39-
reg = <0x00001000 0x0000F000>;
40-
read-only;
41-
};
42-
43-
/* Reserve 1024kB for the application in slot 0 */
44-
slot0_partition: partition@10000 {
45-
label = "image-0";
46-
reg = <0x00010000 0x00100000>;
47-
};
48-
49-
/* Reserve 1024kB for the application in slot 1 */
50-
slot1_partition: partition@110000 {
51-
label = "image-1";
52-
reg = <0x00110000 0x00100000>;
53-
};
54-
55-
/* Reserve 256kB for the scratch partition */
56-
scratch_partition: partition@210000 {
57-
label = "image-scratch";
58-
reg = <0x00210000 0x00040000>;
59-
};
60-
61-
storage_partition: partition@250000 {
62-
label = "storage";
63-
reg = <0x00250000 0x00006000>;
64-
};
65-
};
66-
};

‎boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "esp32_devkitc_wrover-pinctrl.dtsi"
1010
#include <zephyr/dt-bindings/input/input-event-codes.h>
1111
#include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
12+
#include <espressif/partitions_0x1000_default.dtsi>
1213

1314
/ {
1415
model = "Espressif ESP32-DevkitC WROVER-E PROCPU";
@@ -124,45 +125,6 @@
124125
status = "okay";
125126
};
126127

127-
&flash0 {
128-
status = "okay";
129-
partitions {
130-
compatible = "fixed-partitions";
131-
#address-cells = <1>;
132-
#size-cells = <1>;
133-
134-
/* Reserve 60kB for the bootloader */
135-
boot_partition: partition@1000 {
136-
label = "mcuboot";
137-
reg = <0x00001000 0x0000F000>;
138-
read-only;
139-
};
140-
141-
/* Reserve 1024kB for the application in slot 0 */
142-
slot0_partition: partition@10000 {
143-
label = "image-0";
144-
reg = <0x00010000 0x00100000>;
145-
};
146-
147-
/* Reserve 1024kB for the application in slot 1 */
148-
slot1_partition: partition@110000 {
149-
label = "image-1";
150-
reg = <0x00110000 0x00100000>;
151-
};
152-
153-
/* Reserve 256kB for the scratch partition */
154-
scratch_partition: partition@210000 {
155-
label = "image-scratch";
156-
reg = <0x00210000 0x00040000>;
157-
};
158-
159-
storage_partition: partition@250000 {
160-
label = "storage";
161-
reg = <0x00250000 0x00006000>;
162-
};
163-
};
164-
};
165-
166128
&esp32_bt_hci {
167129
status = "okay";
168130
};

‎boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/dts-v1/;
77

88
#include <espressif/esp32/esp32_appcpu.dtsi>
9+
#include <espressif/partitions_0x1000_amp.dtsi>
910

1011
/ {
1112
model = "Espressif ESP32-Ethernet-Kit APPCPU";
@@ -25,42 +26,3 @@
2526
&trng0 {
2627
status = "okay";
2728
};
28-
29-
&flash0 {
30-
status = "okay";
31-
partitions {
32-
compatible = "fixed-partitions";
33-
#address-cells = <1>;
34-
#size-cells = <1>;
35-
36-
/* Reserve 60kB for the bootloader */
37-
boot_partition: partition@1000 {
38-
label = "mcuboot";
39-
reg = <0x00001000 0x0000F000>;
40-
read-only;
41-
};
42-
43-
/* Reserve 1024kB for the application in slot 0 */
44-
slot0_partition: partition@10000 {
45-
label = "image-0";
46-
reg = <0x00010000 0x00100000>;
47-
};
48-
49-
/* Reserve 1024kB for the application in slot 1 */
50-
slot1_partition: partition@110000 {
51-
label = "image-1";
52-
reg = <0x00110000 0x00100000>;
53-
};
54-
55-
/* Reserve 256kB for the scratch partition */
56-
scratch_partition: partition@210000 {
57-
label = "image-scratch";
58-
reg = <0x00210000 0x00040000>;
59-
};
60-
61-
storage_partition: partition@250000 {
62-
label = "storage";
63-
reg = <0x00250000 0x00006000>;
64-
};
65-
};
66-
};

‎boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <espressif/esp32/esp32_wrover_e_n4r8.dtsi>
99
#include "esp32_ethernet_kit-pinctrl.dtsi"
10+
#include <espressif/partitions_0x1000_default.dtsi>
1011

1112
/ {
1213
model = "Espressif ESP32-Ethernet-Kit PROCPU";
@@ -70,45 +71,6 @@
7071
status = "okay";
7172
};
7273

73-
&flash0 {
74-
status = "okay";
75-
partitions {
76-
compatible = "fixed-partitions";
77-
#address-cells = <1>;
78-
#size-cells = <1>;
79-
80-
/* Reserve 60kB for the bootloader */
81-
boot_partition: partition@1000 {
82-
label = "mcuboot";
83-
reg = <0x00001000 0x0000F000>;
84-
read-only;
85-
};
86-
87-
/* Reserve 1024kB for the application in slot 0 */
88-
slot0_partition: partition@10000 {
89-
label = "image-0";
90-
reg = <0x00010000 0x00100000>;
91-
};
92-
93-
/* Reserve 1024kB for the application in slot 1 */
94-
slot1_partition: partition@110000 {
95-
label = "image-1";
96-
reg = <0x00110000 0x00100000>;
97-
};
98-
99-
/* Reserve 256kB for the scratch partition */
100-
scratch_partition: partition@210000 {
101-
label = "image-scratch";
102-
reg = <0x00210000 0x00040000>;
103-
};
104-
105-
storage_partition: partition@250000 {
106-
label = "storage";
107-
reg = <0x00250000 0x00006000>;
108-
};
109-
};
110-
};
111-
11274
&mdio {
11375
pinctrl-0 = <&mdio_default>;
11476
pinctrl-names = "default";

‎boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <espressif/esp32c3/esp32c3_wroom_n4.dtsi>
1010
#include "esp32c3_devkitc-pinctrl.dtsi"
1111
#include <zephyr/dt-bindings/input/input-event-codes.h>
12+
#include <espressif/partitions_0x0_default.dtsi>
1213

1314
/ {
1415
model = "Espressif ESP32C3-DevkitC";
@@ -93,45 +94,6 @@
9394
pinctrl-names = "default";
9495
};
9596

96-
&flash0 {
97-
status = "okay";
98-
partitions {
99-
compatible = "fixed-partitions";
100-
#address-cells = <1>;
101-
#size-cells = <1>;
102-
103-
/* Reserve 60kB for the bootloader */
104-
boot_partition: partition@0 {
105-
label = "mcuboot";
106-
reg = <0x00000000 0x0000F000>;
107-
read-only;
108-
};
109-
110-
/* Reserve 1024kB for the application in slot 0 */
111-
slot0_partition: partition@10000 {
112-
label = "image-0";
113-
reg = <0x00010000 0x00100000>;
114-
};
115-
116-
/* Reserve 1024kB for the application in slot 1 */
117-
slot1_partition: partition@110000 {
118-
label = "image-1";
119-
reg = <0x00110000 0x00100000>;
120-
};
121-
122-
/* Reserve 256kB for the scratch partition */
123-
scratch_partition: partition@210000 {
124-
label = "image-scratch";
125-
reg = <0x00210000 0x00040000>;
126-
};
127-
128-
storage_partition: partition@250000 {
129-
label = "storage";
130-
reg = <0x00250000 0x00006000>;
131-
};
132-
};
133-
};
134-
13597
&esp32_bt_hci {
13698
status = "okay";
13799
};

0 commit comments

Comments
 (0)