From a3f71f13bfb3992f5f0cd1d9c84dc89009c61008 Mon Sep 17 00:00:00 2001 From: Marek Matej Date: Mon, 12 Aug 2024 19:50:33 +0200 Subject: [PATCH] boards: espressif: Use default partition tables Include the predefined partition table in the Espressif boards. Signed-off-by: Marek Matej --- .../esp32_devkitc_wroom_appcpu.dts | 40 +----------------- .../esp32_devkitc_wroom_procpu.dts | 40 +----------------- .../esp32_devkitc_wrover_appcpu.dts | 40 +----------------- .../esp32_devkitc_wrover_procpu.dts | 40 +----------------- .../esp32_ethernet_kit_appcpu.dts | 40 +----------------- .../esp32_ethernet_kit_procpu.dts | 40 +----------------- .../esp32c3_devkitc/esp32c3_devkitc.dts | 40 +----------------- .../esp32c3_devkitm/esp32c3_devkitm.dts | 40 +----------------- .../espressif/esp32c3_rust/esp32c3_rust.dts | 40 +----------------- .../esp32c6_devkitc/esp32c6_devkitc.dts | 40 +----------------- .../esp32s2_devkitc/esp32s2_devkitc.dts | 42 +------------------ .../espressif/esp32s2_saola/esp32s2_saola.dts | 42 +------------------ .../esp32s3_devkitc_appcpu.dts | 41 +----------------- .../esp32s3_devkitc_procpu.dts | 40 +----------------- .../esp32s3_devkitm_appcpu.dts | 41 +----------------- .../esp32s3_devkitm_procpu.dts | 40 +----------------- .../esp8684_devkitm/esp8684_devkitm.dts | 40 +----------------- .../esp_wrover_kit/esp_wrover_kit_appcpu.dts | 40 +----------------- .../esp_wrover_kit/esp_wrover_kit_procpu.dts | 40 +----------------- .../boards/esp32_devkitc_wroom_procpu.overlay | 25 ----------- .../esp32_devkitc_wrover_procpu.overlay | 25 ----------- .../boards/esp32s2_saola.overlay | 25 ----------- .../boards/esp32s3_devkitm_procpu.overlay | 25 ----------- .../boards/esp32s3_luatos_core_procpu.overlay | 25 ----------- .../esp32s3_luatos_core_procpu_usb.overlay | 25 ----------- .../boards/yd_esp32_procpu.overlay | 25 ----------- .../coredump_backends/socs/esp32c3.overlay | 25 ----------- 27 files changed, 21 insertions(+), 945 deletions(-) delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32s2_saola.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm_procpu.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu_usb.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/yd_esp32_procpu.overlay delete mode 100644 tests/subsys/debug/coredump_backends/socs/esp32c3.overlay diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts index ae7a2e1e7f6..e86ffdb90bf 100644 --- a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts +++ b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include / { model = "Espressif ESP32-DevkitC APPCPU"; @@ -25,42 +26,3 @@ &trng0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts index 37a117d80db..fb3075c028e 100644 --- a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts +++ b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts @@ -9,6 +9,7 @@ #include "esp32_devkitc_wroom-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32-DevkitC PROCPU"; @@ -128,45 +129,6 @@ status = "disabled"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts index 42c30a1079c..81078114c97 100644 --- a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts +++ b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include / { model = "Espressif ESP32-DevkitC WROVER-E APPCPU"; @@ -25,42 +26,3 @@ &trng0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts index f6ad45109c3..df8e3c019fc 100644 --- a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts +++ b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts @@ -9,6 +9,7 @@ #include "esp32_devkitc_wrover-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32-DevkitC WROVER-E PROCPU"; @@ -124,45 +125,6 @@ status = "okay"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts index eb613c2cc06..24b4fd8271f 100644 --- a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include / { model = "Espressif ESP32-Ethernet-Kit APPCPU"; @@ -25,42 +26,3 @@ &trng0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts index 124fa29df4e..61838ea748a 100644 --- a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts @@ -7,6 +7,7 @@ #include #include "esp32_ethernet_kit-pinctrl.dtsi" +#include / { model = "Espressif ESP32-Ethernet-Kit PROCPU"; @@ -70,45 +71,6 @@ status = "okay"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &mdio { pinctrl-0 = <&mdio_default>; pinctrl-names = "default"; diff --git a/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts b/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts index 50803e38940..c009ccb0d0a 100644 --- a/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts +++ b/boards/espressif/esp32c3_devkitc/esp32c3_devkitc.dts @@ -9,6 +9,7 @@ #include #include "esp32c3_devkitc-pinctrl.dtsi" #include +#include / { model = "Espressif ESP32C3-DevkitC"; @@ -93,45 +94,6 @@ pinctrl-names = "default"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts index af958283e78..3cc7c5218de 100644 --- a/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts +++ b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts @@ -9,6 +9,7 @@ #include #include "esp32c3_devkitm-pinctrl.dtsi" #include +#include / { model = "Espressif ESP32C3-DevkitM"; @@ -99,45 +100,6 @@ pinctrl-names = "default"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/boards/espressif/esp32c3_rust/esp32c3_rust.dts b/boards/espressif/esp32c3_rust/esp32c3_rust.dts index 88f405e8b4d..5d397f3e1c9 100644 --- a/boards/espressif/esp32c3_rust/esp32c3_rust.dts +++ b/boards/espressif/esp32c3_rust/esp32c3_rust.dts @@ -10,6 +10,7 @@ #include "esp32c3_rust-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32C3-RUST"; @@ -127,42 +128,3 @@ &esp32_bt_hci { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts index 528174a4d65..a00de99e2b5 100644 --- a/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts +++ b/boards/espressif/esp32c6_devkitc/esp32c6_devkitc.dts @@ -9,6 +9,7 @@ #include #include "esp32c6_devkitc-pinctrl.dtsi" #include +#include / { model = "esp32c6_devkitc"; @@ -63,42 +64,3 @@ &wdt0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts index f2c9d8cd3c9..9038cea4a1e 100644 --- a/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts +++ b/boards/espressif/esp32s2_devkitc/esp32s2_devkitc.dts @@ -10,6 +10,7 @@ #include "esp32s2_devkitc-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32S2_DevKitC"; @@ -115,47 +116,6 @@ pinctrl-names = "default"; }; - -&flash0 { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &wdt0 { status = "okay"; }; diff --git a/boards/espressif/esp32s2_saola/esp32s2_saola.dts b/boards/espressif/esp32s2_saola/esp32s2_saola.dts index b204efab94b..c97108951ab 100644 --- a/boards/espressif/esp32s2_saola/esp32s2_saola.dts +++ b/boards/espressif/esp32s2_saola/esp32s2_saola.dts @@ -10,6 +10,7 @@ #include "esp32s2_saola-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32S2-Saola"; @@ -115,47 +116,6 @@ pinctrl-names = "default"; }; - -&flash0 { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &wdt0 { status = "okay"; }; diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts index 886aae05270..cddc827b4e3 100644 --- a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts +++ b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts @@ -6,6 +6,8 @@ /dts-v1/; #include +#include + / { model = "Espressif ESP32S3-DevkitC APPCPU"; compatible = "espressif,esp32s3"; @@ -24,42 +26,3 @@ &ipm0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 64kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x00010000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts index 39afa2acb6c..cae78713f81 100644 --- a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts +++ b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts @@ -9,6 +9,7 @@ #include "esp32s3_devkitc-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32S3-DevkitC PROCPU"; @@ -143,45 +144,6 @@ status = "okay"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 64kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x00010000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts index 8a259eb99be..0a758507c3f 100644 --- a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts +++ b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts @@ -6,6 +6,8 @@ /dts-v1/; #include +#include + / { model = "Espressif ESP32S3-DevkitM APPCPU"; compatible = "espressif,esp32s3"; @@ -24,42 +26,3 @@ &ipm0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 64kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x00010000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts index 81ef3754186..d168e97fe60 100644 --- a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts +++ b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts @@ -9,6 +9,7 @@ #include "esp32s3_devkitm-pinctrl.dtsi" #include #include +#include / { model = "Espressif ESP32S3-DevkitM PROCPU"; @@ -143,45 +144,6 @@ status = "disabled"; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 64kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x00010000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts b/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts index e5f82c7c2c0..0b52a3d2b86 100644 --- a/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts +++ b/boards/espressif/esp8684_devkitm/esp8684_devkitm.dts @@ -9,6 +9,7 @@ #include #include "esp8684_devkitm-pinctrl.dtsi" #include +#include / { model = "Espressif ESP8684-DevkitM"; @@ -59,42 +60,3 @@ &timer0 { status = "disabled"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.dts b/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.dts index ee3321726f2..154857f15e9 100644 --- a/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.dts +++ b/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include / { model = "Espressif ESP32-Wrover-Kit APPCPU"; @@ -25,42 +26,3 @@ &trng0 { status = "okay"; }; - -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts index 5edfe4f761c..a19aa040a46 100644 --- a/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts +++ b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts @@ -7,6 +7,7 @@ #include #include "esp_wrover_kit-pinctrl.dtsi" +#include / { model = "Espressif ESP32-Wrover-Kit PROCPU"; @@ -206,45 +207,6 @@ }; }; -&flash0 { - status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* Reserve 60kB for the bootloader */ - boot_partition: partition@1000 { - label = "mcuboot"; - reg = <0x00001000 0x0000F000>; - read-only; - }; - - /* Reserve 1024kB for the application in slot 0 */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 0x00100000>; - }; - - /* Reserve 1024kB for the application in slot 1 */ - slot1_partition: partition@110000 { - label = "image-1"; - reg = <0x00110000 0x00100000>; - }; - - /* Reserve 256kB for the scratch partition */ - scratch_partition: partition@210000 { - label = "image-scratch"; - reg = <0x00210000 0x00040000>; - }; - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00006000>; - }; - }; -}; - &esp32_bt_hci { status = "okay"; }; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay b/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay b/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s2_saola.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s2_saola.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32s2_saola.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm_procpu.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm_procpu.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm_procpu.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu_usb.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu_usb.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu_usb.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/yd_esp32_procpu.overlay b/tests/subsys/debug/coredump_backends/boards/yd_esp32_procpu.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/yd_esp32_procpu.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/socs/esp32c3.overlay b/tests/subsys/debug/coredump_backends/socs/esp32c3.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/socs/esp32c3.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -};