Skip to content

Commit 9312187

Browse files
marekmatejmmahadevan108
authored andcommitted
boards: esp32s3: AMP support and fixes
Fix missing flash and code partition. Add missing dts entries and use common partition tables to all related non-Espressif boards, previously ommited. Add uart1 node in pinctrl for APPCPU. Signed-off-by: Marek Matej <[email protected]>
1 parent f3e70fd commit 9312187

29 files changed

+83
-681
lines changed

boards/dptechnics/walter/walter_esp32s3_appcpu.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
zephyr,sram = &sram0;
1717
zephyr,ipc_shm = &shm0;
1818
zephyr,ipc = &ipm0;
19+
zephyr,flash = &flash0;
20+
zephyr,code-partition = &slot0_appcpu_partition;
1921
};
2022
};
2123

boards/espressif/esp32s3_devkitc/esp32s3_devkitc-pinctrl.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@
2020
};
2121
};
2222

23+
uart1_default: uart1_default {
24+
group1 {
25+
pinmux = <UART1_TX_GPIO17>;
26+
output-high;
27+
};
28+
group2 {
29+
pinmux = <UART1_RX_GPIO18>;
30+
bias-pull-up;
31+
};
32+
};
33+
2334
i2c0_default: i2c0_default {
2435
group1 {
2536
pinmux = <I2C0_SDA_GPIO1>,

boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <espressif/esp32s3/esp32s3_appcpu.dtsi>
99
#include <espressif/partitions_0x0_amp.dtsi>
10+
#include "esp32s3_devkitc-pinctrl.dtsi"
1011

1112
/ {
1213
model = "Espressif ESP32S3-DevkitC APPCPU";
@@ -16,6 +17,8 @@
1617
zephyr,sram = &sram0;
1718
zephyr,ipc_shm = &shm0;
1819
zephyr,ipc = &ipm0;
20+
zephyr,flash = &flash0;
21+
zephyr,code-partition = &slot0_appcpu_partition;
1922
};
2023
};
2124

boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
*/
66
/dts-v1/;
77

8-
#include "espressif/esp32s3/esp32s3_wroom_n8.dtsi"
9-
#include "esp32s3_devkitc-pinctrl.dtsi"
8+
#include <espressif/esp32s3/esp32s3_wroom_n8.dtsi>
109
#include <zephyr/dt-bindings/input/input-event-codes.h>
1110
#include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
1211
#include <espressif/partitions_0x0_amp.dtsi>
12+
#include "esp32s3_devkitc-pinctrl.dtsi"
1313

1414
/ {
1515
model = "Espressif ESP32S3-DevkitC PROCPU";

boards/espressif/esp32s3_devkitm/esp32s3_devkitm-pinctrl.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@
2020
};
2121
};
2222

23+
uart1_default: uart1_default {
24+
group1 {
25+
pinmux = <UART1_TX_GPIO17>;
26+
output-high;
27+
};
28+
group2 {
29+
pinmux = <UART1_RX_GPIO18>;
30+
bias-pull-up;
31+
};
32+
};
33+
2334
i2c0_default: i2c0_default {
2435
group1 {
2536
pinmux = <I2C0_SDA_GPIO1>,

boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <espressif/esp32s3/esp32s3_appcpu.dtsi>
99
#include <espressif/partitions_0x0_amp.dtsi>
10+
#include "esp32s3_devkitm-pinctrl.dtsi"
1011

1112
/ {
1213
model = "Espressif ESP32S3-DevkitM APPCPU";
@@ -16,6 +17,8 @@
1617
zephyr,sram = &sram0;
1718
zephyr,ipc_shm = &shm0;
1819
zephyr,ipc = &ipm0;
20+
zephyr,flash = &flash0;
21+
zephyr,code-partition = &slot0_appcpu_partition;
1922
};
2023
};
2124

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
CONFIG_MAIN_STACK_SIZE=2048
4-
CONFIG_CLOCK_CONTROL=y
3+
CONFIG_MAIN_STACK_SIZE=4096

boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts

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

88
#include <espressif/esp32s3/esp32s3_mini_n8.dtsi>
9-
#include "esp32s3_devkitm-pinctrl.dtsi"
109
#include <zephyr/dt-bindings/input/input-event-codes.h>
1110
#include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
1211
#include <espressif/partitions_0x0_amp.dtsi>
12+
#include "esp32s3_devkitm-pinctrl.dtsi"
1313

1414
/ {
1515
model = "Espressif ESP32S3-DevkitM PROCPU";

boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
CONFIG_MAIN_STACK_SIZE=2048
3+
CONFIG_MAIN_STACK_SIZE=4096
44

55
CONFIG_CONSOLE=y
66
CONFIG_SERIAL=y

boards/espressif/esp32s3_eye/esp32s3_eye_appcpu.dts

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
/dts-v1/;
77

88
#include <espressif/esp32s3/esp32s3_appcpu.dtsi>
9+
#include <espressif/partitions_0x0_amp.dtsi>
10+
911
/ {
1012
model = "Espressif ESP32S3-EYE APPCPU";
1113
compatible = "espressif,esp32s3";
@@ -14,6 +16,8 @@
1416
zephyr,sram = &sram0;
1517
zephyr,ipc_shm = &shm0;
1618
zephyr,ipc = &ipm0;
19+
zephyr,flash = &flash0;
20+
zephyr,code-partition = &slot0_appcpu_partition;
1721
};
1822
};
1923

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

0 commit comments

Comments
 (0)