From 7962eaeca62784157c75448c0aa0559aab79e95a Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Wed, 22 Jan 2025 11:06:46 -0600 Subject: [PATCH] dts: Move vendor-specific dtsi to dedicated folder Move all the vendor-specific dtsi files that were in dts/common to a new folder under dts/ designated for vendor-specific files, since they are not common at all, except for one vendor. Change MAINTAINERS.yml to reflect the moving of the files. Update migration guide for this change. Signed-off-by: Declan Snyder --- MAINTAINERS.yml | 7 ++----- boards/actinius/icarus/actinius_icarus_common.dtsi | 2 +- boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi | 2 +- boards/actinius/icarus_som/actinius_icarus_som_common.dtsi | 2 +- .../icarus_som_dk/actinius_icarus_som_dk_common.dtsi | 2 +- .../feather/circuitdojo_feather_nrf9160_common.dtsi | 2 +- boards/ct/ctcc/ctcc_nrf9161_common.dtsi | 2 +- boards/innblue/innblue21/innblue21_common.dtsi | 2 +- boards/innblue/innblue22/innblue22_common.dtsi | 2 +- boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts | 2 +- boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts | 2 +- .../nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi | 2 +- .../nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts | 2 +- boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi | 2 +- boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts | 2 +- boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi | 2 +- boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts | 2 +- boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi | 2 +- boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi | 2 +- boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi | 2 +- boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi | 2 +- boards/nordic/thingy53/thingy53_nrf5340_common.dtsi | 2 +- boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts | 2 +- boards/norik/octopus_som/octopus_som_common.dtsi | 2 +- boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts | 2 +- .../panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi | 2 +- .../panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi | 2 +- boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts | 2 +- .../panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts | 2 +- .../raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts | 2 +- .../raytac_mdbt53_db_40_nrf5340_cpunet_common.dts | 2 +- .../raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts | 2 +- .../raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts | 2 +- .../thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi | 2 +- cmake/modules/pre_dt.cmake | 1 + doc/releases/migration-guide-4.2.rst | 7 +++++++ dts/{common => vendor}/amd/versalnet.dtsi | 0 dts/{common => vendor}/broadcom/viper-common.dtsi | 0 dts/{common => vendor}/espressif/partitions_0x0_amp.dtsi | 0 .../espressif/partitions_0x0_amp_16M.dtsi | 0 .../espressif/partitions_0x0_amp_2M.dtsi | 0 .../espressif/partitions_0x0_amp_32M.dtsi | 0 .../espressif/partitions_0x0_amp_4M.dtsi | 0 .../espressif/partitions_0x0_amp_8M.dtsi | 0 .../espressif/partitions_0x0_default.dtsi | 0 .../espressif/partitions_0x0_default_16M.dtsi | 0 .../espressif/partitions_0x0_default_2M.dtsi | 0 .../espressif/partitions_0x0_default_32M.dtsi | 0 .../espressif/partitions_0x0_default_4M.dtsi | 0 .../espressif/partitions_0x0_default_8M.dtsi | 0 .../espressif/partitions_0x1000_amp.dtsi | 0 .../espressif/partitions_0x1000_amp_16M.dtsi | 0 .../espressif/partitions_0x1000_amp_2M.dtsi | 0 .../espressif/partitions_0x1000_amp_32M.dtsi | 0 .../espressif/partitions_0x1000_amp_4M.dtsi | 0 .../espressif/partitions_0x1000_amp_8M.dtsi | 0 .../espressif/partitions_0x1000_default.dtsi | 0 .../espressif/partitions_0x1000_default_16M.dtsi | 0 .../espressif/partitions_0x1000_default_2M.dtsi | 0 .../espressif/partitions_0x1000_default_32M.dtsi | 0 .../espressif/partitions_0x1000_default_4M.dtsi | 0 .../espressif/partitions_0x1000_default_8M.dtsi | 0 dts/{common => vendor}/nordic/nrf52840_partition.dtsi | 0 .../nordic/nrf52840_partition_uf2_sdv6.dtsi | 0 .../nordic/nrf52840_partition_uf2_sdv7.dtsi | 0 .../nordic/nrf5340_cpuapp_partition.dtsi | 0 .../nordic/nrf5340_shared_sram_partition.dtsi | 0 dts/{common => vendor}/nordic/nrf54h20.dtsi | 0 dts/{common => vendor}/nordic/nrf54l05.dtsi | 0 dts/{common => vendor}/nordic/nrf54l09.dtsi | 0 dts/{common => vendor}/nordic/nrf54l10.dtsi | 0 dts/{common => vendor}/nordic/nrf54l15.dtsi | 0 dts/{common => vendor}/nordic/nrf54l20.dtsi | 0 dts/{common => vendor}/nordic/nrf54l_05_10_15.dtsi | 0 dts/{common => vendor}/nordic/nrf91xx_partition.dtsi | 0 dts/{common => vendor}/nordic/nrf9280.dtsi | 0 dts/{common => vendor}/nordic/nrf_common.dtsi | 0 77 files changed, 43 insertions(+), 38 deletions(-) rename dts/{common => vendor}/amd/versalnet.dtsi (100%) rename dts/{common => vendor}/broadcom/viper-common.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_amp.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_amp_16M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_amp_2M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_amp_32M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_amp_4M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_amp_8M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_default.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_default_16M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_default_2M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_default_32M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_default_4M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x0_default_8M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_amp.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_amp_16M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_amp_2M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_amp_32M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_amp_4M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_amp_8M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_default.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_default_16M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_default_2M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_default_32M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_default_4M.dtsi (100%) rename dts/{common => vendor}/espressif/partitions_0x1000_default_8M.dtsi (100%) rename dts/{common => vendor}/nordic/nrf52840_partition.dtsi (100%) rename dts/{common => vendor}/nordic/nrf52840_partition_uf2_sdv6.dtsi (100%) rename dts/{common => vendor}/nordic/nrf52840_partition_uf2_sdv7.dtsi (100%) rename dts/{common => vendor}/nordic/nrf5340_cpuapp_partition.dtsi (100%) rename dts/{common => vendor}/nordic/nrf5340_shared_sram_partition.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54h20.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54l05.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54l09.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54l10.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54l15.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54l20.dtsi (100%) rename dts/{common => vendor}/nordic/nrf54l_05_10_15.dtsi (100%) rename dts/{common => vendor}/nordic/nrf91xx_partition.dtsi (100%) rename dts/{common => vendor}/nordic/nrf9280.dtsi (100%) rename dts/{common => vendor}/nordic/nrf_common.dtsi (100%) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 5300cf3e26f..2597ec3284e 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -955,8 +955,6 @@ Devicetree: - include/zephyr/dt-bindings/dt-util.h - dts/binding-template.yaml - dts/bindings/base/ - files-exclude: - - dts/common/nordic/ labels: - "area: Devicetree" tests: @@ -3522,7 +3520,7 @@ Bouffalolab Platforms: Broadcom Platforms: status: odd fixes files: - - dts/arm/broadcom/ + - dts/*/broadcom/ - soc/brcm/ - boards/brcm/ @@ -4240,8 +4238,7 @@ Espressif Platforms: - drivers/*/*esp32*.c - boards/espressif/ - soc/espressif/ - - dts/xtensa/espressif/ - - dts/riscv/espressif/ + - dts/*/espressif/ - dts/bindings/*/*esp32* - samples/boards/espressif/ - tests/boards/espressif/ diff --git a/boards/actinius/icarus/actinius_icarus_common.dtsi b/boards/actinius/icarus/actinius_icarus_common.dtsi index 39616df663f..b44370babb1 100644 --- a/boards/actinius/icarus/actinius_icarus_common.dtsi +++ b/boards/actinius/icarus/actinius_icarus_common.dtsi @@ -170,4 +170,4 @@ #include "feather_connector.dtsi" /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi b/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi index 4d302d006fb..bd692cdc9ea 100644 --- a/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi +++ b/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi @@ -157,4 +157,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi b/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi index 605b2bdd3e7..99eaab08dd3 100644 --- a/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi +++ b/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi @@ -66,4 +66,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi index f084595540f..c5ff38367b6 100644 --- a/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi +++ b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi @@ -159,4 +159,4 @@ neopixel_spi: &spi1 { #include "arduino_connector.dtsi" /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/circuitdojo/feather/circuitdojo_feather_nrf9160_common.dtsi b/boards/circuitdojo/feather/circuitdojo_feather_nrf9160_common.dtsi index 186f6ef4662..d99760f762c 100644 --- a/boards/circuitdojo/feather/circuitdojo_feather_nrf9160_common.dtsi +++ b/boards/circuitdojo/feather/circuitdojo_feather_nrf9160_common.dtsi @@ -183,4 +183,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/ct/ctcc/ctcc_nrf9161_common.dtsi b/boards/ct/ctcc/ctcc_nrf9161_common.dtsi index 00e53a5262c..38b48f9f5ee 100644 --- a/boards/ct/ctcc/ctcc_nrf9161_common.dtsi +++ b/boards/ct/ctcc/ctcc_nrf9161_common.dtsi @@ -76,4 +76,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/innblue/innblue21/innblue21_common.dtsi b/boards/innblue/innblue21/innblue21_common.dtsi index fbe58ffbe22..6e638823e3e 100644 --- a/boards/innblue/innblue21/innblue21_common.dtsi +++ b/boards/innblue/innblue21/innblue21_common.dtsi @@ -160,4 +160,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/innblue/innblue22/innblue22_common.dtsi b/boards/innblue/innblue22/innblue22_common.dtsi index 6ba2b69bf72..433cc38c7ab 100644 --- a/boards/innblue/innblue22/innblue22_common.dtsi +++ b/boards/innblue/innblue22/innblue22_common.dtsi @@ -163,4 +163,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts index bdcd47f9440..00dc61bc024 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts @@ -132,4 +132,4 @@ /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the * buffer won't be used. */ - #include + #include diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts index 0f098a7dd29..0214d4aa9a6 100644 --- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts +++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts @@ -92,4 +92,4 @@ /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the * buffer won't be used. */ - #include + #include diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi index a607e2e797a..5c2b1545e26 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi @@ -264,5 +264,5 @@ zephyr_udc0: &usbd { }; /* Include default memory partition configuration file */ -#include +#include #include "nrf5340_audio_dk_nrf5340_shared.dtsi" diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts index 05ad7489ef4..15d12185549 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts @@ -86,5 +86,5 @@ arduino_spi: &spi0 { }; /* Include default shared RAM configuration file */ -#include +#include #include "nrf5340_audio_dk_nrf5340_shared.dtsi" diff --git a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi index 6d26411b19e..8af1da7ae1c 100644 --- a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi @@ -172,4 +172,4 @@ zephyr_udc0: &usbd { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts index e9cac8b1b09..0cb1e8db91c 100644 --- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts +++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts @@ -108,4 +108,4 @@ arduino_spi: &spi0 { }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi index 026d64a4016..9029ae078c0 100644 --- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi @@ -247,4 +247,4 @@ zephyr_udc0: &usbd { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts index 929e0440dfa..64b8519fb69 100644 --- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts @@ -182,4 +182,4 @@ arduino_spi: &spi0 { }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi index f0ad4d68ff6..fb012ea8d3d 100644 --- a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi +++ b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi @@ -181,4 +181,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi index 9d23bf6781a..9c59a0e0cf9 100644 --- a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi +++ b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi @@ -223,4 +223,4 @@ arduino_spi: &spi3 { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi index 5abcdae3216..5033dda84c1 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi @@ -226,4 +226,4 @@ arduino_spi: &spi3 { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi index fa733fefe66..1dc9a473cf6 100644 --- a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi +++ b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi @@ -223,4 +223,4 @@ arduino_spi: &spi3 { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi index e7079b16c72..3f2f2d5f060 100644 --- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi +++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi @@ -327,4 +327,4 @@ zephyr_udc0: &usbd { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts index f2482f3d614..6da36791d5e 100644 --- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts +++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts @@ -173,4 +173,4 @@ fem_spi: &spi0 { }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/norik/octopus_som/octopus_som_common.dtsi b/boards/norik/octopus_som/octopus_som_common.dtsi index 538dfa3c0ec..2f7fb529c05 100644 --- a/boards/norik/octopus_som/octopus_som_common.dtsi +++ b/boards/norik/octopus_som/octopus_som_common.dtsi @@ -91,4 +91,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts b/boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts index 81eff2968c3..b4b85e1a019 100644 --- a/boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts +++ b/boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts @@ -20,4 +20,4 @@ }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi b/boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi index ad66cff5c5d..35d5bf72a4b 100644 --- a/boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi +++ b/boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi @@ -271,4 +271,4 @@ zephyr_udc0: &usbd { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi b/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi index 3fcdfba3dbb..5e0f40b8a05 100644 --- a/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi +++ b/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi @@ -204,4 +204,4 @@ arduino_spi: &spi0 { }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts b/boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts index 52deb048576..5432047fd33 100644 --- a/boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts +++ b/boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts @@ -20,4 +20,4 @@ }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts b/boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts index 54e580ffb75..8e7d4c3bdd3 100644 --- a/boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts +++ b/boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts @@ -30,4 +30,4 @@ }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts index 0db7bc0f933..86e5f8f2013 100644 --- a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts +++ b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts @@ -207,4 +207,4 @@ zephyr_udc0: &usbd { }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_common.dts b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_common.dts index c5242550baa..18806c9b1cc 100644 --- a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_common.dts +++ b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_common.dts @@ -57,4 +57,4 @@ }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts index add880e3518..468243a71d5 100644 --- a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts +++ b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts @@ -160,4 +160,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts index c5242550baa..18806c9b1cc 100644 --- a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts +++ b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts @@ -57,4 +57,4 @@ }; /* Include default shared RAM configuration file */ -#include +#include diff --git a/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi index 6408d91af0e..363841f33e7 100644 --- a/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi +++ b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi @@ -183,4 +183,4 @@ }; /* Include default memory partition configuration file */ -#include +#include diff --git a/cmake/modules/pre_dt.cmake b/cmake/modules/pre_dt.cmake index f8e2a80ec56..a9e1dc60e64 100644 --- a/cmake/modules/pre_dt.cmake +++ b/cmake/modules/pre_dt.cmake @@ -71,6 +71,7 @@ function(pre_dt_module_run) include include/zephyr dts/common + dts/vendor ${arch_include} dts ) diff --git a/doc/releases/migration-guide-4.2.rst b/doc/releases/migration-guide-4.2.rst index cf9130dbcd7..d8ef656d51b 100644 --- a/doc/releases/migration-guide-4.2.rst +++ b/doc/releases/migration-guide-4.2.rst @@ -79,6 +79,13 @@ Boards Device Drivers and Devicetree ***************************** +Devicetree +========== + +* Many of the vendor-specific and arch-specific files that were in dts/common have been moved + to more specific locations. Therefore, any dts files which ``#include `` + a file from in the zephyr tree will need to be changed to just ``#include ``. + DAI === diff --git a/dts/common/amd/versalnet.dtsi b/dts/vendor/amd/versalnet.dtsi similarity index 100% rename from dts/common/amd/versalnet.dtsi rename to dts/vendor/amd/versalnet.dtsi diff --git a/dts/common/broadcom/viper-common.dtsi b/dts/vendor/broadcom/viper-common.dtsi similarity index 100% rename from dts/common/broadcom/viper-common.dtsi rename to dts/vendor/broadcom/viper-common.dtsi diff --git a/dts/common/espressif/partitions_0x0_amp.dtsi b/dts/vendor/espressif/partitions_0x0_amp.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_amp.dtsi rename to dts/vendor/espressif/partitions_0x0_amp.dtsi diff --git a/dts/common/espressif/partitions_0x0_amp_16M.dtsi b/dts/vendor/espressif/partitions_0x0_amp_16M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_amp_16M.dtsi rename to dts/vendor/espressif/partitions_0x0_amp_16M.dtsi diff --git a/dts/common/espressif/partitions_0x0_amp_2M.dtsi b/dts/vendor/espressif/partitions_0x0_amp_2M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_amp_2M.dtsi rename to dts/vendor/espressif/partitions_0x0_amp_2M.dtsi diff --git a/dts/common/espressif/partitions_0x0_amp_32M.dtsi b/dts/vendor/espressif/partitions_0x0_amp_32M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_amp_32M.dtsi rename to dts/vendor/espressif/partitions_0x0_amp_32M.dtsi diff --git a/dts/common/espressif/partitions_0x0_amp_4M.dtsi b/dts/vendor/espressif/partitions_0x0_amp_4M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_amp_4M.dtsi rename to dts/vendor/espressif/partitions_0x0_amp_4M.dtsi diff --git a/dts/common/espressif/partitions_0x0_amp_8M.dtsi b/dts/vendor/espressif/partitions_0x0_amp_8M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_amp_8M.dtsi rename to dts/vendor/espressif/partitions_0x0_amp_8M.dtsi diff --git a/dts/common/espressif/partitions_0x0_default.dtsi b/dts/vendor/espressif/partitions_0x0_default.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_default.dtsi rename to dts/vendor/espressif/partitions_0x0_default.dtsi diff --git a/dts/common/espressif/partitions_0x0_default_16M.dtsi b/dts/vendor/espressif/partitions_0x0_default_16M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_default_16M.dtsi rename to dts/vendor/espressif/partitions_0x0_default_16M.dtsi diff --git a/dts/common/espressif/partitions_0x0_default_2M.dtsi b/dts/vendor/espressif/partitions_0x0_default_2M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_default_2M.dtsi rename to dts/vendor/espressif/partitions_0x0_default_2M.dtsi diff --git a/dts/common/espressif/partitions_0x0_default_32M.dtsi b/dts/vendor/espressif/partitions_0x0_default_32M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_default_32M.dtsi rename to dts/vendor/espressif/partitions_0x0_default_32M.dtsi diff --git a/dts/common/espressif/partitions_0x0_default_4M.dtsi b/dts/vendor/espressif/partitions_0x0_default_4M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_default_4M.dtsi rename to dts/vendor/espressif/partitions_0x0_default_4M.dtsi diff --git a/dts/common/espressif/partitions_0x0_default_8M.dtsi b/dts/vendor/espressif/partitions_0x0_default_8M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x0_default_8M.dtsi rename to dts/vendor/espressif/partitions_0x0_default_8M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_amp.dtsi b/dts/vendor/espressif/partitions_0x1000_amp.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_amp.dtsi rename to dts/vendor/espressif/partitions_0x1000_amp.dtsi diff --git a/dts/common/espressif/partitions_0x1000_amp_16M.dtsi b/dts/vendor/espressif/partitions_0x1000_amp_16M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_amp_16M.dtsi rename to dts/vendor/espressif/partitions_0x1000_amp_16M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_amp_2M.dtsi b/dts/vendor/espressif/partitions_0x1000_amp_2M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_amp_2M.dtsi rename to dts/vendor/espressif/partitions_0x1000_amp_2M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_amp_32M.dtsi b/dts/vendor/espressif/partitions_0x1000_amp_32M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_amp_32M.dtsi rename to dts/vendor/espressif/partitions_0x1000_amp_32M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_amp_4M.dtsi b/dts/vendor/espressif/partitions_0x1000_amp_4M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_amp_4M.dtsi rename to dts/vendor/espressif/partitions_0x1000_amp_4M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_amp_8M.dtsi b/dts/vendor/espressif/partitions_0x1000_amp_8M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_amp_8M.dtsi rename to dts/vendor/espressif/partitions_0x1000_amp_8M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_default.dtsi b/dts/vendor/espressif/partitions_0x1000_default.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_default.dtsi rename to dts/vendor/espressif/partitions_0x1000_default.dtsi diff --git a/dts/common/espressif/partitions_0x1000_default_16M.dtsi b/dts/vendor/espressif/partitions_0x1000_default_16M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_default_16M.dtsi rename to dts/vendor/espressif/partitions_0x1000_default_16M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_default_2M.dtsi b/dts/vendor/espressif/partitions_0x1000_default_2M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_default_2M.dtsi rename to dts/vendor/espressif/partitions_0x1000_default_2M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_default_32M.dtsi b/dts/vendor/espressif/partitions_0x1000_default_32M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_default_32M.dtsi rename to dts/vendor/espressif/partitions_0x1000_default_32M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_default_4M.dtsi b/dts/vendor/espressif/partitions_0x1000_default_4M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_default_4M.dtsi rename to dts/vendor/espressif/partitions_0x1000_default_4M.dtsi diff --git a/dts/common/espressif/partitions_0x1000_default_8M.dtsi b/dts/vendor/espressif/partitions_0x1000_default_8M.dtsi similarity index 100% rename from dts/common/espressif/partitions_0x1000_default_8M.dtsi rename to dts/vendor/espressif/partitions_0x1000_default_8M.dtsi diff --git a/dts/common/nordic/nrf52840_partition.dtsi b/dts/vendor/nordic/nrf52840_partition.dtsi similarity index 100% rename from dts/common/nordic/nrf52840_partition.dtsi rename to dts/vendor/nordic/nrf52840_partition.dtsi diff --git a/dts/common/nordic/nrf52840_partition_uf2_sdv6.dtsi b/dts/vendor/nordic/nrf52840_partition_uf2_sdv6.dtsi similarity index 100% rename from dts/common/nordic/nrf52840_partition_uf2_sdv6.dtsi rename to dts/vendor/nordic/nrf52840_partition_uf2_sdv6.dtsi diff --git a/dts/common/nordic/nrf52840_partition_uf2_sdv7.dtsi b/dts/vendor/nordic/nrf52840_partition_uf2_sdv7.dtsi similarity index 100% rename from dts/common/nordic/nrf52840_partition_uf2_sdv7.dtsi rename to dts/vendor/nordic/nrf52840_partition_uf2_sdv7.dtsi diff --git a/dts/common/nordic/nrf5340_cpuapp_partition.dtsi b/dts/vendor/nordic/nrf5340_cpuapp_partition.dtsi similarity index 100% rename from dts/common/nordic/nrf5340_cpuapp_partition.dtsi rename to dts/vendor/nordic/nrf5340_cpuapp_partition.dtsi diff --git a/dts/common/nordic/nrf5340_shared_sram_partition.dtsi b/dts/vendor/nordic/nrf5340_shared_sram_partition.dtsi similarity index 100% rename from dts/common/nordic/nrf5340_shared_sram_partition.dtsi rename to dts/vendor/nordic/nrf5340_shared_sram_partition.dtsi diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/vendor/nordic/nrf54h20.dtsi similarity index 100% rename from dts/common/nordic/nrf54h20.dtsi rename to dts/vendor/nordic/nrf54h20.dtsi diff --git a/dts/common/nordic/nrf54l05.dtsi b/dts/vendor/nordic/nrf54l05.dtsi similarity index 100% rename from dts/common/nordic/nrf54l05.dtsi rename to dts/vendor/nordic/nrf54l05.dtsi diff --git a/dts/common/nordic/nrf54l09.dtsi b/dts/vendor/nordic/nrf54l09.dtsi similarity index 100% rename from dts/common/nordic/nrf54l09.dtsi rename to dts/vendor/nordic/nrf54l09.dtsi diff --git a/dts/common/nordic/nrf54l10.dtsi b/dts/vendor/nordic/nrf54l10.dtsi similarity index 100% rename from dts/common/nordic/nrf54l10.dtsi rename to dts/vendor/nordic/nrf54l10.dtsi diff --git a/dts/common/nordic/nrf54l15.dtsi b/dts/vendor/nordic/nrf54l15.dtsi similarity index 100% rename from dts/common/nordic/nrf54l15.dtsi rename to dts/vendor/nordic/nrf54l15.dtsi diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/vendor/nordic/nrf54l20.dtsi similarity index 100% rename from dts/common/nordic/nrf54l20.dtsi rename to dts/vendor/nordic/nrf54l20.dtsi diff --git a/dts/common/nordic/nrf54l_05_10_15.dtsi b/dts/vendor/nordic/nrf54l_05_10_15.dtsi similarity index 100% rename from dts/common/nordic/nrf54l_05_10_15.dtsi rename to dts/vendor/nordic/nrf54l_05_10_15.dtsi diff --git a/dts/common/nordic/nrf91xx_partition.dtsi b/dts/vendor/nordic/nrf91xx_partition.dtsi similarity index 100% rename from dts/common/nordic/nrf91xx_partition.dtsi rename to dts/vendor/nordic/nrf91xx_partition.dtsi diff --git a/dts/common/nordic/nrf9280.dtsi b/dts/vendor/nordic/nrf9280.dtsi similarity index 100% rename from dts/common/nordic/nrf9280.dtsi rename to dts/vendor/nordic/nrf9280.dtsi diff --git a/dts/common/nordic/nrf_common.dtsi b/dts/vendor/nordic/nrf_common.dtsi similarity index 100% rename from dts/common/nordic/nrf_common.dtsi rename to dts/vendor/nordic/nrf_common.dtsi