From 26973bd0549c47f53e51161d94cf52389e2dda42 Mon Sep 17 00:00:00 2001 From: Marcin Szymczyk Date: Mon, 28 Oct 2024 15:46:12 +0100 Subject: [PATCH] snippets: nordic-*: support custom boards Apply overlays for custom boards, based on already supported SoCs. Fixes #77639. Signed-off-by: Marcin Szymczyk --- snippets/nordic-flpr-xip/snippet.yml | 8 ++++---- .../nrf54h20_cpuapp.overlay} | 0 .../nrf54l15_cpuapp.overlay} | 0 snippets/nordic-flpr/snippet.yml | 8 ++++---- .../nrf54h20_cpuapp.overlay} | 0 .../nrf54l15_cpuapp.overlay} | 0 snippets/nordic-ppr-xip/snippet.yml | 8 ++++---- .../nrf54h20_cpuapp.overlay} | 0 .../nrf9280_cpuapp.overlay} | 0 snippets/nordic-ppr/snippet.yml | 8 ++++---- .../nrf54h20_cpuapp.overlay} | 0 .../nrf9280_cpuapp.overlay} | 0 12 files changed, 16 insertions(+), 16 deletions(-) rename snippets/nordic-flpr-xip/{boards/nrf54h20dk_nrf54h20_cpuapp.overlay => soc/nrf54h20_cpuapp.overlay} (100%) rename snippets/nordic-flpr-xip/{boards/nrf54l15dk_nrf54l15_cpuapp.overlay => soc/nrf54l15_cpuapp.overlay} (100%) rename snippets/nordic-flpr/{boards/nrf54h20dk_nrf54h20_cpuapp.overlay => soc/nrf54h20_cpuapp.overlay} (100%) rename snippets/nordic-flpr/{boards/nrf54l15dk_nrf54l15_cpuapp.overlay => soc/nrf54l15_cpuapp.overlay} (100%) rename snippets/nordic-ppr-xip/{boards/nrf54h20dk_nrf54h20_cpuapp.overlay => soc/nrf54h20_cpuapp.overlay} (100%) rename snippets/nordic-ppr-xip/{boards/nrf9280pdk_nrf9280_cpuapp.overlay => soc/nrf9280_cpuapp.overlay} (100%) rename snippets/nordic-ppr/{boards/nrf54h20dk_nrf54h20_cpuapp.overlay => soc/nrf54h20_cpuapp.overlay} (100%) rename snippets/nordic-ppr/{boards/nrf9280pdk_nrf9280_cpuapp.overlay => soc/nrf9280_cpuapp.overlay} (100%) diff --git a/snippets/nordic-flpr-xip/snippet.yml b/snippets/nordic-flpr-xip/snippet.yml index 921b186b039..8ddfd71e530 100644 --- a/snippets/nordic-flpr-xip/snippet.yml +++ b/snippets/nordic-flpr-xip/snippet.yml @@ -3,9 +3,9 @@ append: EXTRA_DTC_OVERLAY_FILE: nordic-flpr-xip.overlay boards: - nrf54l15dk/nrf54l15/cpuapp: + /.*/nrf54l15/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay - nrf54h20dk/nrf54h20/cpuapp: + EXTRA_DTC_OVERLAY_FILE: soc/nrf54l15_cpuapp.overlay + /.*/nrf54h20/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay + EXTRA_DTC_OVERLAY_FILE: soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-flpr-xip/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/snippets/nordic-flpr-xip/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr-xip/boards/nrf54h20dk_nrf54h20_cpuapp.overlay rename to snippets/nordic-flpr-xip/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-flpr-xip/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/snippets/nordic-flpr-xip/soc/nrf54l15_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr-xip/boards/nrf54l15dk_nrf54l15_cpuapp.overlay rename to snippets/nordic-flpr-xip/soc/nrf54l15_cpuapp.overlay diff --git a/snippets/nordic-flpr/snippet.yml b/snippets/nordic-flpr/snippet.yml index 17f99b8400f..f7578eccaac 100644 --- a/snippets/nordic-flpr/snippet.yml +++ b/snippets/nordic-flpr/snippet.yml @@ -3,9 +3,9 @@ append: EXTRA_DTC_OVERLAY_FILE: nordic-flpr.overlay boards: - nrf54l15dk/nrf54l15/cpuapp: + /.*/nrf54l15/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay - nrf54h20dk/nrf54h20/cpuapp: + EXTRA_DTC_OVERLAY_FILE: soc/nrf54l15_cpuapp.overlay + /.*/nrf54h20/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay + EXTRA_DTC_OVERLAY_FILE: soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-flpr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/snippets/nordic-flpr/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay rename to snippets/nordic-flpr/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-flpr/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/snippets/nordic-flpr/soc/nrf54l15_cpuapp.overlay similarity index 100% rename from snippets/nordic-flpr/boards/nrf54l15dk_nrf54l15_cpuapp.overlay rename to snippets/nordic-flpr/soc/nrf54l15_cpuapp.overlay diff --git a/snippets/nordic-ppr-xip/snippet.yml b/snippets/nordic-ppr-xip/snippet.yml index 09b42719c47..f24101052e5 100644 --- a/snippets/nordic-ppr-xip/snippet.yml +++ b/snippets/nordic-ppr-xip/snippet.yml @@ -3,9 +3,9 @@ append: EXTRA_DTC_OVERLAY_FILE: nordic-ppr-xip.overlay boards: - nrf54h20dk/nrf54h20/cpuapp: + /.*/nrf54h20/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay - nrf9280pdk/nrf9280/cpuapp: + EXTRA_DTC_OVERLAY_FILE: soc/nrf54h20_cpuapp.overlay + /.*/nrf9280/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf9280pdk_nrf9280_cpuapp.overlay + EXTRA_DTC_OVERLAY_FILE: soc/nrf9280_cpuapp.overlay diff --git a/snippets/nordic-ppr-xip/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/snippets/nordic-ppr-xip/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr-xip/boards/nrf54h20dk_nrf54h20_cpuapp.overlay rename to snippets/nordic-ppr-xip/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-ppr-xip/boards/nrf9280pdk_nrf9280_cpuapp.overlay b/snippets/nordic-ppr-xip/soc/nrf9280_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr-xip/boards/nrf9280pdk_nrf9280_cpuapp.overlay rename to snippets/nordic-ppr-xip/soc/nrf9280_cpuapp.overlay diff --git a/snippets/nordic-ppr/snippet.yml b/snippets/nordic-ppr/snippet.yml index 48caac253a8..160bd876c29 100644 --- a/snippets/nordic-ppr/snippet.yml +++ b/snippets/nordic-ppr/snippet.yml @@ -3,9 +3,9 @@ append: EXTRA_DTC_OVERLAY_FILE: nordic-ppr.overlay boards: - nrf54h20dk/nrf54h20/cpuapp: + /.*/nrf54h20/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf54h20dk_nrf54h20_cpuapp.overlay - nrf9280pdk/nrf9280/cpuapp: + EXTRA_DTC_OVERLAY_FILE: soc/nrf54h20_cpuapp.overlay + /.*/nrf9280/cpuapp/: append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf9280pdk_nrf9280_cpuapp.overlay + EXTRA_DTC_OVERLAY_FILE: soc/nrf9280_cpuapp.overlay diff --git a/snippets/nordic-ppr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/snippets/nordic-ppr/soc/nrf54h20_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay rename to snippets/nordic-ppr/soc/nrf54h20_cpuapp.overlay diff --git a/snippets/nordic-ppr/boards/nrf9280pdk_nrf9280_cpuapp.overlay b/snippets/nordic-ppr/soc/nrf9280_cpuapp.overlay similarity index 100% rename from snippets/nordic-ppr/boards/nrf9280pdk_nrf9280_cpuapp.overlay rename to snippets/nordic-ppr/soc/nrf9280_cpuapp.overlay