From a1480cf1cf0ab8476a82655d164b4dafacdc8ca3 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Tue, 27 Feb 2024 08:23:36 +0000
Subject: [PATCH] maintainers: Fix paths

Updates paths from hwmv2 changes

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 MAINTAINERS.yml | 51 ++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 1fa0a2595a5..40071ebefb9 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -166,7 +166,7 @@ ARM arch:
     - include/zephyr/arch/arm/
     - tests/arch/arm/
     - doc/hardware/arch/arm_cortex_m.rst
-    - boards/qemu/qemu_cortex_m0/
+    - boards/qemu/cortex_m0/
   labels:
     - "area: ARM"
   tests:
@@ -185,8 +185,8 @@ ARM64 arch:
     - include/zephyr/arch/arm64/
     - tests/arch/arm64/
     - dts/arm64/
-    - boards/qemu/qemu_kvm_arm64/
-    - boards/qemu/qemu_cortex_a53/
+    - boards/qemu/kvm_arm64/
+    - boards/qemu/cortex_a53/
   labels:
     - "area: ARM64"
   tests:
@@ -233,7 +233,7 @@ MIPS arch:
   files:
     - arch/mips/
     - include/zephyr/arch/mips/
-    - boards/qemu/qemu_malta/
+    - boards/qemu/malta/
   labels:
     - "area: MIPS"
   tests:
@@ -2011,7 +2011,7 @@ Xen Platform:
     - drivers/xen/
     - arch/arm64/core/xen/
     - soc/xenvm/
-    - boards/xenvm/
+    - boards/xen/
   labels:
     - "area: Xen Platform"
 
@@ -2767,7 +2767,7 @@ NIOS-2 arch:
     - include/zephyr/arch/nios2/
     - tests/boards/altera_max10/
     - boards/qemu/nios2/
-    - boards/altera/altera_max10/
+    - boards/altera/max10/
     - scripts/support/quartus-flash.py
   labels:
     - "area: NIOS2"
@@ -2859,9 +2859,9 @@ RISCV arch:
     - npitre
   files:
     - arch/riscv/
-    - boards/qemu/qemu_riscv*/
+    - boards/qemu/riscv*/
     - boards/sifive/
-    - boards/sparkfun/sparkfun_red_v_things_plus/
+    - boards/sparkfun/red_v_things_plus/
     - dts/bindings/riscv/
     - dts/riscv/
     - include/zephyr/arch/riscv/
@@ -3008,7 +3008,7 @@ SPARC arch:
     - arch/sparc/
     - include/zephyr/arch/sparc/
     - dts/sparc/
-    - boards/qemu/qemu_leon3/
+    - boards/qemu/leon3/
   labels:
     - "area: SPARC"
 
@@ -3083,7 +3083,7 @@ GD32 Platforms:
     - dts/*/gd/
     - dts/bindings/*/*gd32*
     - scripts/west_commands/*/*gd32*
-    - soc/gd_gd32/
+    - soc/gd/gd32/
   labels:
     - "platform: GD32"
   description: >-
@@ -3152,8 +3152,8 @@ Raspberry Pi Pico Platforms:
     - soburi
   files:
     - boards/raspberry_pi/
-    - boards/adafruit/adafruit_kb2040/
-    - boards/sparkfun/sparkfun_pro_micro_rp2040/
+    - boards/adafruit/kb2040/
+    - boards/sparkfun/pro_micro_rp2040/
     - dts/arm/rpi_pico/
     - dts/bindings/*/raspberrypi,pico*
     - drivers/*/*rpi_pico
@@ -3170,8 +3170,8 @@ SiLabs Platforms:
   collaborators:
     - tgorochowik
   files:
-    - soc/arm/silabs_*/
-    - boards/arm/ef*/
+    - soc/silabs/
+    - boards/silabs/
     - dts/arm/silabs/
     - dts/bindings/*/silabs*
     - drivers/*/*_gecko*
@@ -3186,9 +3186,9 @@ Intel Platforms (X86):
     - tbursztyka
     - laurenmurphyx64
   files:
-    - boards/intel/intel_adl/
-    - boards/intel/intel_ehl/
-    - boards/intel/intel_rpl/
+    - boards/intel/adl/
+    - boards/intel/ehl/
+    - boards/intel/rpl/
     - dts/x86/intel/
     - soc/intel/atom/
     - soc/intel/lakemont/
@@ -3214,7 +3214,7 @@ Intel Platforms (Xtensa):
     - jxstelter
     - marcinszkudlinski
   files:
-    - boards/intel/intel_adsp/
+    - boards/intel/adsp/
     - soc/intel/intel_adsp/
     - dts/xtensa/intel/
     - tests/boards/intel_adsp/
@@ -3232,7 +3232,7 @@ Intel Platforms (ISH):
     - teburd
     - likongintel
   files:
-    - boards/intel/intel_ish/
+    - boards/intel/ish/
     - soc/intel/intel_ish/
     - dts/x86/intel/intel_ish*
     - dts/bindings/*/intel,sedi*
@@ -3248,7 +3248,7 @@ Intel Platforms (Agilex):
     - nbalabak
     - teikheng
   files:
-    - boards/intel/intel_socfpga/
+    - boards/intel/socfpga/
     - soc/intel/intel_socfpga/
     - dts/arm64/intel/
     - dts/bindings/*/intel,agilex*
@@ -3433,7 +3433,7 @@ Renesas RA Platforms:
   maintainers:
     - soburi
   files:
-    - boards/arduino/arduino_uno_r4_minima/
+    - boards/arduino/uno_r4_minima/
     - drivers/*/*renesas_ra*
     - dts/arm/renesas/ra/
     - dts/bindings/*/*renesas,ra*
@@ -3609,7 +3609,7 @@ Xilinx Platforms:
     - dts/*/xilinx/
     - dts/bindings/*/*xlnx*
     - include/zephyr/*/*/*xlnx*
-    - soc/arm/xilinx*/
+    - soc/xilinx*/
   labels:
     - "platform: Xilinx"
 
@@ -3621,9 +3621,8 @@ Infineon Platforms:
     - npal-cy
     - talih0
   files:
-    - boards/cypress/cy8ckit_*/
-    - boards/cypress/cy8cproto_*/
-    - boards/cypress/xmc*_relax*/
+    - boards/cypress/
+    - boards/infineon/
     - drivers/*/*ifx_cat1*
     - drivers/*/*xmc*/
     - drivers/*/*xmc*.c
@@ -4588,7 +4587,7 @@ Xtensa arch:
     - arch/xtensa/
     - include/zephyr/arch/xtensa/
     - dts/xtensa/
-    - boards/qemu/qemu_xtensa/
+    - boards/qemu/xtensa/
     - boards/cadence/xt-sim/
     - soc/cadence/dc233c/
     - soc/cadence/xtensa_sample_controller/