diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 66e92f55975..572b4bdc4c9 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3693,7 +3693,7 @@ NXP Platforms (S32): - drivers/misc/*nxp_s32*/ - dts/bindings/*/nxp,s32* - dts/arm/nxp/*s32* - - samples/boards/nxp_s32/ + - samples/boards/nxp/s32/ - include/zephyr/dt-bindings/*/nxp-s32* - include/zephyr/dt-bindings/*/nxp_s32* - include/zephyr/drivers/*/*nxp_s32* diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py index eebf0fe749b..09f3d1f84d1 100644 --- a/doc/_scripts/redirects.py +++ b/doc/_scripts/redirects.py @@ -225,6 +225,9 @@ REDIRECTS = [ ('samples/boards/esp32/spiram_test/README', 'samples/boards/espressif/spiram_test/README'), ('samples/boards/esp32/wifi_apsta_mode/README', 'samples/boards/espressif/wifi_apsta_mode/README'), ('samples/boards/esp32/xt_wdt/README', 'samples/boards/espressif/xt_wdt/README'), + ('samples/boards/mimxrt1060_evk/system_off/README', 'samples/boards/nxp/mimxrt1060_evk/system_off/README'), + ('samples/boards/mimxrt1170_evk_cm7/magic_addr/README', 'samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/README'), + ('samples/boards/mimxrt595_evk/system_off/README', 'samples/boards/nxp/mimxrt595_evk/system_off/README'), ('samples/boards/nrf/battery/README', 'samples/boards/nordic/battery/README'), ('samples/boards/nrf/clock_skew/README', 'samples/boards/nordic/clock_skew/README'), ('samples/boards/nrf/dynamic_pinctrl/README', 'samples/boards/nordic/dynamic_pinctrl/README'), @@ -236,6 +239,7 @@ REDIRECTS = [ ('samples/boards/nrf/nrfx/README', 'samples/boards/nordic/nrfx/README'), ('samples/boards/nrf/nrfx_prs/README', 'samples/boards/nordic/nrfx_prs/README'), ('samples/boards/nrf/system_off/README', 'samples/boards/nordic/system_off/README'), + ('samples/boards/nxp_s32/netc/README', 'samples/boards/nxp/s32/netc/README'), ('samples/drivers/adc/README', 'samples/drivers/adc/adc_dt/README'), ('samples/drivers/kscan_touch', 'samples/subsys/input/input'), ('samples/drivers/led_apa102/README', 'samples/drivers/led_strip/README'), diff --git a/samples/boards/mimxrt1060_evk/system_off/CMakeLists.txt b/samples/boards/nxp/mimxrt1060_evk/system_off/CMakeLists.txt similarity index 100% rename from samples/boards/mimxrt1060_evk/system_off/CMakeLists.txt rename to samples/boards/nxp/mimxrt1060_evk/system_off/CMakeLists.txt diff --git a/samples/boards/mimxrt1060_evk/system_off/Kconfig b/samples/boards/nxp/mimxrt1060_evk/system_off/Kconfig similarity index 100% rename from samples/boards/mimxrt1060_evk/system_off/Kconfig rename to samples/boards/nxp/mimxrt1060_evk/system_off/Kconfig diff --git a/samples/boards/mimxrt1060_evk/system_off/README.rst b/samples/boards/nxp/mimxrt1060_evk/system_off/README.rst similarity index 95% rename from samples/boards/mimxrt1060_evk/system_off/README.rst rename to samples/boards/nxp/mimxrt1060_evk/system_off/README.rst index a0cf8819c07..09e1a583153 100644 --- a/samples/boards/mimxrt1060_evk/system_off/README.rst +++ b/samples/boards/nxp/mimxrt1060_evk/system_off/README.rst @@ -24,7 +24,7 @@ Building, Flashing and Running ****************************** .. zephyr-app-commands:: - :zephyr-app: samples/boards/mimxrt1060_evk/system_off + :zephyr-app: samples/boards/nxp/mimxrt1060_evk/system_off :board: mimxrt1060_evk :goals: build flash :compact: diff --git a/samples/boards/mimxrt1060_evk/system_off/prj.conf b/samples/boards/nxp/mimxrt1060_evk/system_off/prj.conf similarity index 100% rename from samples/boards/mimxrt1060_evk/system_off/prj.conf rename to samples/boards/nxp/mimxrt1060_evk/system_off/prj.conf diff --git a/samples/boards/mimxrt1060_evk/system_off/sample.yaml b/samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml similarity index 100% rename from samples/boards/mimxrt1060_evk/system_off/sample.yaml rename to samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml diff --git a/samples/boards/mimxrt1060_evk/system_off/src/main.c b/samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c similarity index 100% rename from samples/boards/mimxrt1060_evk/system_off/src/main.c rename to samples/boards/nxp/mimxrt1060_evk/system_off/src/main.c diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/CMakeLists.txt b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/CMakeLists.txt similarity index 100% rename from samples/boards/mimxrt1170_evk_cm7/magic_addr/CMakeLists.txt rename to samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/CMakeLists.txt diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/README.rst b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/README.rst similarity index 100% rename from samples/boards/mimxrt1170_evk_cm7/magic_addr/README.rst rename to samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/README.rst diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/prj.conf b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/prj.conf similarity index 100% rename from samples/boards/mimxrt1170_evk_cm7/magic_addr/prj.conf rename to samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/prj.conf diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/sample.yaml b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/sample.yaml similarity index 100% rename from samples/boards/mimxrt1170_evk_cm7/magic_addr/sample.yaml rename to samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/sample.yaml diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/src/main.c b/samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/src/main.c similarity index 100% rename from samples/boards/mimxrt1170_evk_cm7/magic_addr/src/main.c rename to samples/boards/nxp/mimxrt1170_evk_cm7/magic_addr/src/main.c diff --git a/samples/boards/mimxrt595_evk/system_off/CMakeLists.txt b/samples/boards/nxp/mimxrt595_evk/system_off/CMakeLists.txt similarity index 100% rename from samples/boards/mimxrt595_evk/system_off/CMakeLists.txt rename to samples/boards/nxp/mimxrt595_evk/system_off/CMakeLists.txt diff --git a/samples/boards/mimxrt595_evk/system_off/Kconfig b/samples/boards/nxp/mimxrt595_evk/system_off/Kconfig similarity index 100% rename from samples/boards/mimxrt595_evk/system_off/Kconfig rename to samples/boards/nxp/mimxrt595_evk/system_off/Kconfig diff --git a/samples/boards/mimxrt595_evk/system_off/README.rst b/samples/boards/nxp/mimxrt595_evk/system_off/README.rst similarity index 98% rename from samples/boards/mimxrt595_evk/system_off/README.rst rename to samples/boards/nxp/mimxrt595_evk/system_off/README.rst index edec7a0b104..606d550af47 100644 --- a/samples/boards/mimxrt595_evk/system_off/README.rst +++ b/samples/boards/nxp/mimxrt595_evk/system_off/README.rst @@ -22,7 +22,7 @@ Building, Flashing and Running ****************************** .. zephyr-app-commands:: - :zephyr-app: samples/boards/mimxrt595_evk/system_off + :zephyr-app: samples/boards/nxp/mimxrt595_evk/system_off :board: mimxrt595_evk/mimxrt595s/cm33 :goals: build flash :compact: diff --git a/samples/boards/mimxrt595_evk/system_off/app.overlay b/samples/boards/nxp/mimxrt595_evk/system_off/app.overlay similarity index 100% rename from samples/boards/mimxrt595_evk/system_off/app.overlay rename to samples/boards/nxp/mimxrt595_evk/system_off/app.overlay diff --git a/samples/boards/mimxrt595_evk/system_off/prj.conf b/samples/boards/nxp/mimxrt595_evk/system_off/prj.conf similarity index 100% rename from samples/boards/mimxrt595_evk/system_off/prj.conf rename to samples/boards/nxp/mimxrt595_evk/system_off/prj.conf diff --git a/samples/boards/mimxrt595_evk/system_off/sample.yaml b/samples/boards/nxp/mimxrt595_evk/system_off/sample.yaml similarity index 100% rename from samples/boards/mimxrt595_evk/system_off/sample.yaml rename to samples/boards/nxp/mimxrt595_evk/system_off/sample.yaml diff --git a/samples/boards/mimxrt595_evk/system_off/src/main.c b/samples/boards/nxp/mimxrt595_evk/system_off/src/main.c similarity index 100% rename from samples/boards/mimxrt595_evk/system_off/src/main.c rename to samples/boards/nxp/mimxrt595_evk/system_off/src/main.c diff --git a/samples/boards/nxp_s32/netc/CMakeLists.txt b/samples/boards/nxp/s32/netc/CMakeLists.txt similarity index 100% rename from samples/boards/nxp_s32/netc/CMakeLists.txt rename to samples/boards/nxp/s32/netc/CMakeLists.txt diff --git a/samples/boards/nxp_s32/netc/Kconfig b/samples/boards/nxp/s32/netc/Kconfig similarity index 100% rename from samples/boards/nxp_s32/netc/Kconfig rename to samples/boards/nxp/s32/netc/Kconfig diff --git a/samples/boards/nxp_s32/netc/README.rst b/samples/boards/nxp/s32/netc/README.rst similarity index 98% rename from samples/boards/nxp_s32/netc/README.rst rename to samples/boards/nxp/s32/netc/README.rst index f8dca18f3be..86854260f1a 100644 --- a/samples/boards/nxp_s32/netc/README.rst +++ b/samples/boards/nxp/s32/netc/README.rst @@ -35,7 +35,7 @@ Building and Running To build and run the sample application for use-case 1: .. zephyr-app-commands:: - :zephyr-app: samples/boards/nxp_s32/netc + :zephyr-app: samples/boards/nxp/s32/netc :board: s32z2xxdc2/s32z270/rtu0 :goals: build flash @@ -58,7 +58,7 @@ Once started, you should see the network interface details, for example: To build and run the sample application for use-case 2: .. zephyr-app-commands:: - :zephyr-app: samples/boards/nxp_s32/netc + :zephyr-app: samples/boards/nxp/s32/netc :board: s32z2xxdc2/s32z270/rtu0 :goals: build flash :gen-args: -DDTC_OVERLAY_FILE="./vsi-and-psi.overlay" diff --git a/samples/boards/nxp_s32/netc/prj.conf b/samples/boards/nxp/s32/netc/prj.conf similarity index 100% rename from samples/boards/nxp_s32/netc/prj.conf rename to samples/boards/nxp/s32/netc/prj.conf diff --git a/samples/boards/nxp_s32/netc/sample.yaml b/samples/boards/nxp/s32/netc/sample.yaml similarity index 100% rename from samples/boards/nxp_s32/netc/sample.yaml rename to samples/boards/nxp/s32/netc/sample.yaml diff --git a/samples/boards/nxp_s32/netc/src/main.c b/samples/boards/nxp/s32/netc/src/main.c similarity index 100% rename from samples/boards/nxp_s32/netc/src/main.c rename to samples/boards/nxp/s32/netc/src/main.c diff --git a/samples/boards/nxp_s32/netc/vsi-and-psi.overlay b/samples/boards/nxp/s32/netc/vsi-and-psi.overlay similarity index 100% rename from samples/boards/nxp_s32/netc/vsi-and-psi.overlay rename to samples/boards/nxp/s32/netc/vsi-and-psi.overlay