diff --git a/doc/build/snippets/writing.rst b/doc/build/snippets/writing.rst index 7f0fb4a04716e..e26e4bdcbebfa 100644 --- a/doc/build/snippets/writing.rst +++ b/doc/build/snippets/writing.rst @@ -67,7 +67,7 @@ The build system looks for snippets in these places: #. In directories configured by the :makevar:`SNIPPET_ROOT` CMake variable. This always includes the zephyr repository (so - :zephyr_file:`snippets/` is always a source of snippets) and the + :zephyr_file:`snippets/generic/` is always a source of snippets) and the application source directory (so :file:`/snippets` is also). Additional directories can be added manually at CMake time. diff --git a/doc/services/shell/index.rst b/doc/services/shell/index.rst index 8181d406da456..a589d5cc4d996 100644 --- a/doc/services/shell/index.rst +++ b/doc/services/shell/index.rst @@ -92,8 +92,8 @@ to your build: Details on the configuration settings are captured in the following files: -- :zephyr_file:`snippets/cdc-acm-console/cdc-acm-console.conf`. -- :zephyr_file:`snippets/cdc-acm-console/cdc-acm-console.overlay`. +- :zephyr_file:`snippets/generic/cdc-acm-console/cdc-acm-console.conf`. +- :zephyr_file:`snippets/generic/cdc-acm-console/cdc-acm-console.overlay`. Bluetooth LE (NUS) ================== @@ -107,8 +107,8 @@ to your build: Details on the configuration settings are captured in the following files: -- :zephyr_file:`snippets/nus-console/nus-console.conf`. -- :zephyr_file:`snippets/nus-console/nus-console.overlay`. +- :zephyr_file:`snippets/generic/nus-console/nus-console.conf`. +- :zephyr_file:`snippets/generic/nus-console/nus-console.overlay`. Segger RTT ========== diff --git a/scripts/snippets.py b/scripts/snippets.py index d725f08891e0a..2c0dc69571fca 100644 --- a/scripts/snippets.py +++ b/scripts/snippets.py @@ -213,7 +213,7 @@ def parse_args(): parser.add_argument('--snippet', dest='snippets', default=[], action='append', help='''a SNIPPET element; may be given multiple times''') - parser.add_argument('--cmake-out', type=Path, + parser.add_argument('--cmake-out', type=Path, required=True, help='''file to write cmake output to; include() this file after calling this script''') parser.add_argument('--sysbuild', action="store_true", diff --git a/snippets/bt-ll-sw-split/README.rst b/snippets/generic/bt-ll-sw-split/README.rst similarity index 100% rename from snippets/bt-ll-sw-split/README.rst rename to snippets/generic/bt-ll-sw-split/README.rst diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.conf b/snippets/generic/bt-ll-sw-split/bt-ll-sw-split.conf similarity index 100% rename from snippets/bt-ll-sw-split/bt-ll-sw-split.conf rename to snippets/generic/bt-ll-sw-split/bt-ll-sw-split.conf diff --git a/snippets/bt-ll-sw-split/bt-ll-sw-split.overlay b/snippets/generic/bt-ll-sw-split/bt-ll-sw-split.overlay similarity index 100% rename from snippets/bt-ll-sw-split/bt-ll-sw-split.overlay rename to snippets/generic/bt-ll-sw-split/bt-ll-sw-split.overlay diff --git a/snippets/bt-ll-sw-split/snippet.yml b/snippets/generic/bt-ll-sw-split/snippet.yml similarity index 100% rename from snippets/bt-ll-sw-split/snippet.yml rename to snippets/generic/bt-ll-sw-split/snippet.yml diff --git a/snippets/cdc-acm-console/README.rst b/snippets/generic/cdc-acm-console/README.rst similarity index 100% rename from snippets/cdc-acm-console/README.rst rename to snippets/generic/cdc-acm-console/README.rst diff --git a/snippets/cdc-acm-console/cdc-acm-console.conf b/snippets/generic/cdc-acm-console/cdc-acm-console.conf similarity index 100% rename from snippets/cdc-acm-console/cdc-acm-console.conf rename to snippets/generic/cdc-acm-console/cdc-acm-console.conf diff --git a/snippets/cdc-acm-console/cdc-acm-console.overlay b/snippets/generic/cdc-acm-console/cdc-acm-console.overlay similarity index 100% rename from snippets/cdc-acm-console/cdc-acm-console.overlay rename to snippets/generic/cdc-acm-console/cdc-acm-console.overlay diff --git a/snippets/cdc-acm-console/snippet.yml b/snippets/generic/cdc-acm-console/snippet.yml similarity index 100% rename from snippets/cdc-acm-console/snippet.yml rename to snippets/generic/cdc-acm-console/snippet.yml diff --git a/snippets/hci-uart-native-sim/README.rst b/snippets/generic/hci-uart-native-sim/README.rst similarity index 100% rename from snippets/hci-uart-native-sim/README.rst rename to snippets/generic/hci-uart-native-sim/README.rst diff --git a/snippets/hci-uart-native-sim/hci-uart-native-sim.conf b/snippets/generic/hci-uart-native-sim/hci-uart-native-sim.conf similarity index 100% rename from snippets/hci-uart-native-sim/hci-uart-native-sim.conf rename to snippets/generic/hci-uart-native-sim/hci-uart-native-sim.conf diff --git a/snippets/hci-uart-native-sim/hci-uart-native-sim.overlay b/snippets/generic/hci-uart-native-sim/hci-uart-native-sim.overlay similarity index 100% rename from snippets/hci-uart-native-sim/hci-uart-native-sim.overlay rename to snippets/generic/hci-uart-native-sim/hci-uart-native-sim.overlay diff --git a/snippets/hci-uart-native-sim/snippet.yml b/snippets/generic/hci-uart-native-sim/snippet.yml similarity index 100% rename from snippets/hci-uart-native-sim/snippet.yml rename to snippets/generic/hci-uart-native-sim/snippet.yml diff --git a/snippets/nus-console/README.rst b/snippets/generic/nus-console/README.rst similarity index 100% rename from snippets/nus-console/README.rst rename to snippets/generic/nus-console/README.rst diff --git a/snippets/nus-console/nus-console.conf b/snippets/generic/nus-console/nus-console.conf similarity index 100% rename from snippets/nus-console/nus-console.conf rename to snippets/generic/nus-console/nus-console.conf diff --git a/snippets/nus-console/nus-console.overlay b/snippets/generic/nus-console/nus-console.overlay similarity index 100% rename from snippets/nus-console/nus-console.overlay rename to snippets/generic/nus-console/nus-console.overlay diff --git a/snippets/nus-console/snippet.yml b/snippets/generic/nus-console/snippet.yml similarity index 100% rename from snippets/nus-console/snippet.yml rename to snippets/generic/nus-console/snippet.yml diff --git a/snippets/ram-console/README.rst b/snippets/generic/ram-console/README.rst similarity index 100% rename from snippets/ram-console/README.rst rename to snippets/generic/ram-console/README.rst diff --git a/snippets/ram-console/boards/imx8mm_evk_mimx8mm6_a53.overlay b/snippets/generic/ram-console/boards/imx8mm_evk_mimx8mm6_a53.overlay similarity index 100% rename from snippets/ram-console/boards/imx8mm_evk_mimx8mm6_a53.overlay rename to snippets/generic/ram-console/boards/imx8mm_evk_mimx8mm6_a53.overlay diff --git a/snippets/ram-console/boards/imx8mn_evk_mimx8mn6_a53.overlay b/snippets/generic/ram-console/boards/imx8mn_evk_mimx8mn6_a53.overlay similarity index 100% rename from snippets/ram-console/boards/imx8mn_evk_mimx8mn6_a53.overlay rename to snippets/generic/ram-console/boards/imx8mn_evk_mimx8mn6_a53.overlay diff --git a/snippets/ram-console/boards/imx8mp_evk_mimx8ml8_a53.overlay b/snippets/generic/ram-console/boards/imx8mp_evk_mimx8ml8_a53.overlay similarity index 100% rename from snippets/ram-console/boards/imx8mp_evk_mimx8ml8_a53.overlay rename to snippets/generic/ram-console/boards/imx8mp_evk_mimx8ml8_a53.overlay diff --git a/snippets/ram-console/boards/imx93_evk_mimx9352_a55.overlay b/snippets/generic/ram-console/boards/imx93_evk_mimx9352_a55.overlay similarity index 100% rename from snippets/ram-console/boards/imx93_evk_mimx9352_a55.overlay rename to snippets/generic/ram-console/boards/imx93_evk_mimx9352_a55.overlay diff --git a/snippets/ram-console/ram-console.conf b/snippets/generic/ram-console/ram-console.conf similarity index 100% rename from snippets/ram-console/ram-console.conf rename to snippets/generic/ram-console/ram-console.conf diff --git a/snippets/ram-console/snippet.yml b/snippets/generic/ram-console/snippet.yml similarity index 100% rename from snippets/ram-console/snippet.yml rename to snippets/generic/ram-console/snippet.yml diff --git a/snippets/ram-tracing/README.rst b/snippets/generic/ram-tracing/README.rst similarity index 100% rename from snippets/ram-tracing/README.rst rename to snippets/generic/ram-tracing/README.rst diff --git a/snippets/ram-tracing/ram-tracing.conf b/snippets/generic/ram-tracing/ram-tracing.conf similarity index 100% rename from snippets/ram-tracing/ram-tracing.conf rename to snippets/generic/ram-tracing/ram-tracing.conf diff --git a/snippets/ram-tracing/snippet.yml b/snippets/generic/ram-tracing/snippet.yml similarity index 100% rename from snippets/ram-tracing/snippet.yml rename to snippets/generic/ram-tracing/snippet.yml diff --git a/snippets/rtt-console/README.rst b/snippets/generic/rtt-console/README.rst similarity index 100% rename from snippets/rtt-console/README.rst rename to snippets/generic/rtt-console/README.rst diff --git a/snippets/rtt-console/rtt-console.conf b/snippets/generic/rtt-console/rtt-console.conf similarity index 100% rename from snippets/rtt-console/rtt-console.conf rename to snippets/generic/rtt-console/rtt-console.conf diff --git a/snippets/rtt-console/snippet.yml b/snippets/generic/rtt-console/snippet.yml similarity index 100% rename from snippets/rtt-console/snippet.yml rename to snippets/generic/rtt-console/snippet.yml diff --git a/snippets/rtt-tracing/README.rst b/snippets/generic/rtt-tracing/README.rst similarity index 100% rename from snippets/rtt-tracing/README.rst rename to snippets/generic/rtt-tracing/README.rst diff --git a/snippets/rtt-tracing/rtt-tracing.conf b/snippets/generic/rtt-tracing/rtt-tracing.conf similarity index 100% rename from snippets/rtt-tracing/rtt-tracing.conf rename to snippets/generic/rtt-tracing/rtt-tracing.conf diff --git a/snippets/rtt-tracing/snippet.yml b/snippets/generic/rtt-tracing/snippet.yml similarity index 100% rename from snippets/rtt-tracing/snippet.yml rename to snippets/generic/rtt-tracing/snippet.yml diff --git a/snippets/serial-console/README.rst b/snippets/generic/serial-console/README.rst similarity index 100% rename from snippets/serial-console/README.rst rename to snippets/generic/serial-console/README.rst diff --git a/snippets/serial-console/serial-console.conf b/snippets/generic/serial-console/serial-console.conf similarity index 100% rename from snippets/serial-console/serial-console.conf rename to snippets/generic/serial-console/serial-console.conf diff --git a/snippets/serial-console/snippet.yml b/snippets/generic/serial-console/snippet.yml similarity index 100% rename from snippets/serial-console/snippet.yml rename to snippets/generic/serial-console/snippet.yml diff --git a/snippets/usbip-native-sim/README.rst b/snippets/generic/usbip-native-sim/README.rst similarity index 100% rename from snippets/usbip-native-sim/README.rst rename to snippets/generic/usbip-native-sim/README.rst diff --git a/snippets/usbip-native-sim/snippet.yml b/snippets/generic/usbip-native-sim/snippet.yml similarity index 100% rename from snippets/usbip-native-sim/snippet.yml rename to snippets/generic/usbip-native-sim/snippet.yml diff --git a/snippets/usbip-native-sim/usbip-native-sim.conf b/snippets/generic/usbip-native-sim/usbip-native-sim.conf similarity index 100% rename from snippets/usbip-native-sim/usbip-native-sim.conf rename to snippets/generic/usbip-native-sim/usbip-native-sim.conf diff --git a/snippets/usbip-native-sim/usbip-native-sim.overlay b/snippets/generic/usbip-native-sim/usbip-native-sim.overlay similarity index 100% rename from snippets/usbip-native-sim/usbip-native-sim.overlay rename to snippets/generic/usbip-native-sim/usbip-native-sim.overlay diff --git a/snippets/video-sw-generator/README.rst b/snippets/generic/video-sw-generator/README.rst similarity index 100% rename from snippets/video-sw-generator/README.rst rename to snippets/generic/video-sw-generator/README.rst diff --git a/snippets/video-sw-generator/snippet.yml b/snippets/generic/video-sw-generator/snippet.yml similarity index 100% rename from snippets/video-sw-generator/snippet.yml rename to snippets/generic/video-sw-generator/snippet.yml diff --git a/snippets/video-sw-generator/video-sw-generator.overlay b/snippets/generic/video-sw-generator/video-sw-generator.overlay similarity index 100% rename from snippets/video-sw-generator/video-sw-generator.overlay rename to snippets/generic/video-sw-generator/video-sw-generator.overlay diff --git a/snippets/wifi-credentials/README.rst b/snippets/generic/wifi-credentials/README.rst similarity index 100% rename from snippets/wifi-credentials/README.rst rename to snippets/generic/wifi-credentials/README.rst diff --git a/snippets/wifi-credentials/snippet.yml b/snippets/generic/wifi-credentials/snippet.yml similarity index 100% rename from snippets/wifi-credentials/snippet.yml rename to snippets/generic/wifi-credentials/snippet.yml diff --git a/snippets/wifi-credentials/wifi-credentials.conf b/snippets/generic/wifi-credentials/wifi-credentials.conf similarity index 100% rename from snippets/wifi-credentials/wifi-credentials.conf rename to snippets/generic/wifi-credentials/wifi-credentials.conf diff --git a/snippets/wifi-enterprise/README.rst b/snippets/generic/wifi-enterprise/README.rst similarity index 100% rename from snippets/wifi-enterprise/README.rst rename to snippets/generic/wifi-enterprise/README.rst diff --git a/snippets/wifi-enterprise/snippet.yml b/snippets/generic/wifi-enterprise/snippet.yml similarity index 100% rename from snippets/wifi-enterprise/snippet.yml rename to snippets/generic/wifi-enterprise/snippet.yml diff --git a/snippets/wifi-enterprise/wifi-enterprise.conf b/snippets/generic/wifi-enterprise/wifi-enterprise.conf similarity index 100% rename from snippets/wifi-enterprise/wifi-enterprise.conf rename to snippets/generic/wifi-enterprise/wifi-enterprise.conf diff --git a/snippets/wifi-ip/README.rst b/snippets/generic/wifi-ip/README.rst similarity index 100% rename from snippets/wifi-ip/README.rst rename to snippets/generic/wifi-ip/README.rst diff --git a/snippets/wifi-ip/snippet.yml b/snippets/generic/wifi-ip/snippet.yml similarity index 100% rename from snippets/wifi-ip/snippet.yml rename to snippets/generic/wifi-ip/snippet.yml diff --git a/snippets/wifi-ip/wifi-ip.conf b/snippets/generic/wifi-ip/wifi-ip.conf similarity index 100% rename from snippets/wifi-ip/wifi-ip.conf rename to snippets/generic/wifi-ip/wifi-ip.conf diff --git a/snippets/wifi-ipv4/README.rst b/snippets/generic/wifi-ipv4/README.rst similarity index 100% rename from snippets/wifi-ipv4/README.rst rename to snippets/generic/wifi-ipv4/README.rst diff --git a/snippets/wifi-ipv4/snippet.yml b/snippets/generic/wifi-ipv4/snippet.yml similarity index 100% rename from snippets/wifi-ipv4/snippet.yml rename to snippets/generic/wifi-ipv4/snippet.yml diff --git a/snippets/wifi-ipv4/wifi-ipv4.conf b/snippets/generic/wifi-ipv4/wifi-ipv4.conf similarity index 100% rename from snippets/wifi-ipv4/wifi-ipv4.conf rename to snippets/generic/wifi-ipv4/wifi-ipv4.conf diff --git a/snippets/wifi-ipv6/README.rst b/snippets/generic/wifi-ipv6/README.rst similarity index 100% rename from snippets/wifi-ipv6/README.rst rename to snippets/generic/wifi-ipv6/README.rst diff --git a/snippets/wifi-ipv6/snippet.yml b/snippets/generic/wifi-ipv6/snippet.yml similarity index 100% rename from snippets/wifi-ipv6/snippet.yml rename to snippets/generic/wifi-ipv6/snippet.yml diff --git a/snippets/wifi-ipv6/wifi-ipv6.conf b/snippets/generic/wifi-ipv6/wifi-ipv6.conf similarity index 100% rename from snippets/wifi-ipv6/wifi-ipv6.conf rename to snippets/generic/wifi-ipv6/wifi-ipv6.conf diff --git a/snippets/xen_dom0/README.rst b/snippets/generic/xen_dom0/README.rst similarity index 98% rename from snippets/xen_dom0/README.rst rename to snippets/generic/xen_dom0/README.rst index b9a83452dcb61..c57e8ad88e24e 100644 --- a/snippets/xen_dom0/README.rst +++ b/snippets/generic/xen_dom0/README.rst @@ -29,7 +29,7 @@ For example: QEMU example with Xen *********************** -Overlay for qemu_cortex_a53 board, that is present in :zephyr_file:`snippets/xen_dom0/boards/` +Overlay for qemu_cortex_a53 board, that is present in :zephyr_file:`snippets/generic/xen_dom0/boards/` directory of this snippet is QEMU Xen control domain example. To run such setup, you need to: diff --git a/snippets/xen_dom0/boards/qemu_cortex_a53.overlay b/snippets/generic/xen_dom0/boards/qemu_cortex_a53.overlay similarity index 100% rename from snippets/xen_dom0/boards/qemu_cortex_a53.overlay rename to snippets/generic/xen_dom0/boards/qemu_cortex_a53.overlay diff --git a/snippets/xen_dom0/boards/rcar_h3ulcb_r8a77951_a57.overlay b/snippets/generic/xen_dom0/boards/rcar_h3ulcb_r8a77951_a57.overlay similarity index 100% rename from snippets/xen_dom0/boards/rcar_h3ulcb_r8a77951_a57.overlay rename to snippets/generic/xen_dom0/boards/rcar_h3ulcb_r8a77951_a57.overlay diff --git a/snippets/xen_dom0/boards/rcar_salvator_xs.overlay b/snippets/generic/xen_dom0/boards/rcar_salvator_xs.overlay similarity index 100% rename from snippets/xen_dom0/boards/rcar_salvator_xs.overlay rename to snippets/generic/xen_dom0/boards/rcar_salvator_xs.overlay diff --git a/snippets/xen_dom0/boards/rcar_spider_s4_r8a779f0_a55.overlay b/snippets/generic/xen_dom0/boards/rcar_spider_s4_r8a779f0_a55.overlay similarity index 100% rename from snippets/xen_dom0/boards/rcar_spider_s4_r8a779f0_a55.overlay rename to snippets/generic/xen_dom0/boards/rcar_spider_s4_r8a779f0_a55.overlay diff --git a/snippets/xen_dom0/snippet.yml b/snippets/generic/xen_dom0/snippet.yml similarity index 100% rename from snippets/xen_dom0/snippet.yml rename to snippets/generic/xen_dom0/snippet.yml diff --git a/snippets/xen_dom0/xen_dom0.conf b/snippets/generic/xen_dom0/xen_dom0.conf similarity index 100% rename from snippets/xen_dom0/xen_dom0.conf rename to snippets/generic/xen_dom0/xen_dom0.conf diff --git a/snippets/xen_dom0/xen_dom0.overlay b/snippets/generic/xen_dom0/xen_dom0.overlay similarity index 100% rename from snippets/xen_dom0/xen_dom0.overlay rename to snippets/generic/xen_dom0/xen_dom0.overlay diff --git a/snippets/nordic-flpr-xip/README.rst b/snippets/nordic/nordic-flpr-xip/README.rst similarity index 100% rename from snippets/nordic-flpr-xip/README.rst rename to snippets/nordic/nordic-flpr-xip/README.rst diff --git a/snippets/nordic-flpr-xip/nordic-flpr-xip.overlay b/snippets/nordic/nordic-flpr-xip/nordic-flpr-xip.overlay similarity index 100% rename from snippets/nordic-flpr-xip/nordic-flpr-xip.overlay rename to snippets/nordic/nordic-flpr-xip/nordic-flpr-xip.overlay diff --git a/snippets/nordic-flpr-xip/snippet.yml b/snippets/nordic/nordic-flpr-xip/snippet.yml similarity index 100% rename from snippets/nordic-flpr-xip/snippet.yml rename to snippets/nordic/nordic-flpr-xip/snippet.yml diff --git a/snippets/nordic-flpr-xip/soc/nrf54h20_cpuapp.overlay b/snippets/nordic/nordic-flpr-xip/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr-xip/soc/nrf54h20_cpuapp.overlay rename to snippets/nordic/nordic-flpr-xip/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-flpr-xip/soc/nrf54l15_cpuapp.overlay b/snippets/nordic/nordic-flpr-xip/soc/nrf54l15_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr-xip/soc/nrf54l15_cpuapp.overlay rename to snippets/nordic/nordic-flpr-xip/soc/nrf54l15_cpuapp.overlay diff --git a/snippets/nordic-flpr/README.rst b/snippets/nordic/nordic-flpr/README.rst similarity index 100% rename from snippets/nordic-flpr/README.rst rename to snippets/nordic/nordic-flpr/README.rst diff --git a/snippets/nordic-flpr/nordic-flpr.overlay b/snippets/nordic/nordic-flpr/nordic-flpr.overlay similarity index 100% rename from snippets/nordic-flpr/nordic-flpr.overlay rename to snippets/nordic/nordic-flpr/nordic-flpr.overlay diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic/nordic-flpr/snippet.yml similarity index 100% rename from snippets/nordic-flpr/snippet.yml rename to snippets/nordic/nordic-flpr/snippet.yml diff --git a/snippets/nordic-flpr/soc/nrf54h20_cpuapp.overlay b/snippets/nordic/nordic-flpr/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr/soc/nrf54h20_cpuapp.overlay rename to snippets/nordic/nordic-flpr/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-flpr/soc/nrf54l15_cpuapp.overlay b/snippets/nordic/nordic-flpr/soc/nrf54l15_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr/soc/nrf54l15_cpuapp.overlay rename to snippets/nordic/nordic-flpr/soc/nrf54l15_cpuapp.overlay diff --git a/snippets/nordic-flpr/soc/nrf54lm20a_cpuapp.overlay b/snippets/nordic/nordic-flpr/soc/nrf54lm20a_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr/soc/nrf54lm20a_cpuapp.overlay rename to snippets/nordic/nordic-flpr/soc/nrf54lm20a_cpuapp.overlay diff --git a/snippets/nordic-log-stm-dict/README.rst b/snippets/nordic/nordic-log-stm-dict/README.rst similarity index 100% rename from snippets/nordic-log-stm-dict/README.rst rename to snippets/nordic/nordic-log-stm-dict/README.rst diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay b/snippets/nordic/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay rename to snippets/nordic/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay b/snippets/nordic/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay similarity index 100% rename from snippets/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay rename to snippets/nordic/nordic-log-stm-dict/boards/nrf54h20_cpurad.overlay diff --git a/snippets/nordic-log-stm-dict/log_stm_dict.conf b/snippets/nordic/nordic-log-stm-dict/log_stm_dict.conf similarity index 100% rename from snippets/nordic-log-stm-dict/log_stm_dict.conf rename to snippets/nordic/nordic-log-stm-dict/log_stm_dict.conf diff --git a/snippets/nordic-log-stm-dict/snippet.yml b/snippets/nordic/nordic-log-stm-dict/snippet.yml similarity index 100% rename from snippets/nordic-log-stm-dict/snippet.yml rename to snippets/nordic/nordic-log-stm-dict/snippet.yml diff --git a/snippets/nordic-log-stm/README.rst b/snippets/nordic/nordic-log-stm/README.rst similarity index 100% rename from snippets/nordic-log-stm/README.rst rename to snippets/nordic/nordic-log-stm/README.rst diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay b/snippets/nordic/nordic-log-stm/boards/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay rename to snippets/nordic/nordic-log-stm/boards/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay b/snippets/nordic/nordic-log-stm/boards/nrf54h20_cpurad.overlay similarity index 100% rename from snippets/nordic-log-stm/boards/nrf54h20_cpurad.overlay rename to snippets/nordic/nordic-log-stm/boards/nrf54h20_cpurad.overlay diff --git a/snippets/nordic-log-stm/log_stm.conf b/snippets/nordic/nordic-log-stm/log_stm.conf similarity index 100% rename from snippets/nordic-log-stm/log_stm.conf rename to snippets/nordic/nordic-log-stm/log_stm.conf diff --git a/snippets/nordic-log-stm/snippet.yml b/snippets/nordic/nordic-log-stm/snippet.yml similarity index 100% rename from snippets/nordic-log-stm/snippet.yml rename to snippets/nordic/nordic-log-stm/snippet.yml diff --git a/snippets/nordic-ppr-xip/README.rst b/snippets/nordic/nordic-ppr-xip/README.rst similarity index 100% rename from snippets/nordic-ppr-xip/README.rst rename to snippets/nordic/nordic-ppr-xip/README.rst diff --git a/snippets/nordic-ppr-xip/nordic-ppr-xip.overlay b/snippets/nordic/nordic-ppr-xip/nordic-ppr-xip.overlay similarity index 100% rename from snippets/nordic-ppr-xip/nordic-ppr-xip.overlay rename to snippets/nordic/nordic-ppr-xip/nordic-ppr-xip.overlay diff --git a/snippets/nordic-ppr-xip/snippet.yml b/snippets/nordic/nordic-ppr-xip/snippet.yml similarity index 100% rename from snippets/nordic-ppr-xip/snippet.yml rename to snippets/nordic/nordic-ppr-xip/snippet.yml diff --git a/snippets/nordic-ppr-xip/soc/nrf54h20_cpuapp.overlay b/snippets/nordic/nordic-ppr-xip/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr-xip/soc/nrf54h20_cpuapp.overlay rename to snippets/nordic/nordic-ppr-xip/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-ppr-xip/soc/nrf9280_cpuapp.overlay b/snippets/nordic/nordic-ppr-xip/soc/nrf9280_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr-xip/soc/nrf9280_cpuapp.overlay rename to snippets/nordic/nordic-ppr-xip/soc/nrf9280_cpuapp.overlay diff --git a/snippets/nordic-ppr/README.rst b/snippets/nordic/nordic-ppr/README.rst similarity index 100% rename from snippets/nordic-ppr/README.rst rename to snippets/nordic/nordic-ppr/README.rst diff --git a/snippets/nordic-ppr/nordic-ppr.overlay b/snippets/nordic/nordic-ppr/nordic-ppr.overlay similarity index 100% rename from snippets/nordic-ppr/nordic-ppr.overlay rename to snippets/nordic/nordic-ppr/nordic-ppr.overlay diff --git a/snippets/nordic-ppr/snippet.yml b/snippets/nordic/nordic-ppr/snippet.yml similarity index 100% rename from snippets/nordic-ppr/snippet.yml rename to snippets/nordic/nordic-ppr/snippet.yml diff --git a/snippets/nordic-ppr/soc/nrf54h20_cpuapp.overlay b/snippets/nordic/nordic-ppr/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr/soc/nrf54h20_cpuapp.overlay rename to snippets/nordic/nordic-ppr/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-ppr/soc/nrf9280_cpuapp.overlay b/snippets/nordic/nordic-ppr/soc/nrf9280_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr/soc/nrf9280_cpuapp.overlay rename to snippets/nordic/nordic-ppr/soc/nrf9280_cpuapp.overlay diff --git a/snippets/silabs-pti/README.rst b/snippets/silabs/silabs-pti/README.rst similarity index 100% rename from snippets/silabs-pti/README.rst rename to snippets/silabs/silabs-pti/README.rst diff --git a/snippets/silabs-pti/pti.conf b/snippets/silabs/silabs-pti/pti.conf similarity index 100% rename from snippets/silabs-pti/pti.conf rename to snippets/silabs/silabs-pti/pti.conf diff --git a/snippets/silabs-pti/pti.overlay b/snippets/silabs/silabs-pti/pti.overlay similarity index 100% rename from snippets/silabs-pti/pti.overlay rename to snippets/silabs/silabs-pti/pti.overlay diff --git a/snippets/silabs-pti/snippet.yml b/snippets/silabs/silabs-pti/snippet.yml similarity index 100% rename from snippets/silabs-pti/snippet.yml rename to snippets/silabs/silabs-pti/snippet.yml