diff --git a/samples/boards/nrf52/mesh/onoff-app/CMakeLists.txt b/samples/boards/nrf/mesh/onoff-app/CMakeLists.txt similarity index 100% rename from samples/boards/nrf52/mesh/onoff-app/CMakeLists.txt rename to samples/boards/nrf/mesh/onoff-app/CMakeLists.txt diff --git a/samples/boards/nrf52/mesh/onoff-app/README.rst b/samples/boards/nrf/mesh/onoff-app/README.rst similarity index 96% rename from samples/boards/nrf52/mesh/onoff-app/README.rst rename to samples/boards/nrf/mesh/onoff-app/README.rst index 0089913429d..a7b270c65b6 100644 --- a/samples/boards/nrf52/mesh/onoff-app/README.rst +++ b/samples/boards/nrf/mesh/onoff-app/README.rst @@ -43,13 +43,13 @@ likely also run on the nrf52_pca10040 board. Building and Running ******************** -This sample can be found under :zephyr_file:`samples/boards/nrf52/mesh/onoff-app` in the +This sample can be found under :zephyr_file:`samples/boards/nrf/mesh/onoff-app` in the Zephyr tree. The following commands build the application. .. zephyr-app-commands:: - :zephyr-app: samples/boards/nrf52/mesh/onoff-app + :zephyr-app: samples/boards/nrf/mesh/onoff-app :board: nrf52840_pca10056 :goals: build flash :compact: diff --git a/samples/boards/nrf52/mesh/onoff-app/prj.conf b/samples/boards/nrf/mesh/onoff-app/prj.conf similarity index 100% rename from samples/boards/nrf52/mesh/onoff-app/prj.conf rename to samples/boards/nrf/mesh/onoff-app/prj.conf diff --git a/samples/boards/nrf52/mesh/onoff-app/sample.yaml b/samples/boards/nrf/mesh/onoff-app/sample.yaml similarity index 100% rename from samples/boards/nrf52/mesh/onoff-app/sample.yaml rename to samples/boards/nrf/mesh/onoff-app/sample.yaml diff --git a/samples/boards/nrf52/mesh/onoff-app/src/main.c b/samples/boards/nrf/mesh/onoff-app/src/main.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff-app/src/main.c rename to samples/boards/nrf/mesh/onoff-app/src/main.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/CMakeLists.txt diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/README.rst b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst similarity index 95% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/README.rst rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst index b9f5f27562f..935b0e1ba0b 100644 --- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/README.rst +++ b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/README.rst @@ -60,13 +60,13 @@ likely also run on the nrf52_pca10040 board. Building and Running ******************** -This sample can be found under :zephyr_file:`samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app` in the +This sample can be found under :zephyr_file:`samples/boards/nrf/mesh/onoff_level_lighting_vnd_app` in the Zephyr tree. The following commands build the application. .. zephyr-app-commands:: - :zephyr-app: samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app + :zephyr-app: samples/boards/nrf/mesh/onoff_level_lighting_vnd_app :board: nrf52840_pca10056 :goals: build flash :compact: diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/prj.conf b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/prj.conf rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj.conf diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/prj_smp_svr.conf b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj_smp_svr.conf similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/prj_smp_svr.conf rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/prj_smp_svr.conf diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/sample.yaml b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/sample.yaml similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/sample.yaml rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/sample.yaml diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/app_gpio.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/common.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/common.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/common.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/common.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/main.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/main.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/ble_mesh.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/no_transition_work_handler.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/smp_svr.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/smp_svr.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/smp_svr.h diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/storage.c b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.c similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/storage.c rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.c diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/storage.h b/samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.h similarity index 100% rename from samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/storage.h rename to samples/boards/nrf/mesh/onoff_level_lighting_vnd_app/src/storage.h diff --git a/samples/boards/nrf91/nrfx/CMakeLists.txt b/samples/boards/nrf/nrfx/CMakeLists.txt similarity index 100% rename from samples/boards/nrf91/nrfx/CMakeLists.txt rename to samples/boards/nrf/nrfx/CMakeLists.txt diff --git a/samples/boards/nrf91/nrfx/README.rst b/samples/boards/nrf/nrfx/README.rst similarity index 92% rename from samples/boards/nrf91/nrfx/README.rst rename to samples/boards/nrf/nrfx/README.rst index a3923f2c2e9..10dac32a84a 100644 --- a/samples/boards/nrf91/nrfx/README.rst +++ b/samples/boards/nrf/nrfx/README.rst @@ -28,12 +28,12 @@ This sample has been tested on the NordicSemiconductor nRF9160 DK (nrf9160_pca10 Building and Running ******************** -The code can be found in :zephyr_file:`samples/boards/nrf91/nrfx`. +The code can be found in :zephyr_file:`samples/boards/nrf/nrfx`. To build and flash the application: .. zephyr-app-commands:: - :zephyr-app: samples/boards/nrf91/nrfx + :zephyr-app: samples/boards/nrf/nrfx :board: nrf9160_pca10090 :goals: build flash :compact: diff --git a/samples/boards/nrf91/nrfx/prj.conf b/samples/boards/nrf/nrfx/prj.conf similarity index 100% rename from samples/boards/nrf91/nrfx/prj.conf rename to samples/boards/nrf/nrfx/prj.conf diff --git a/samples/boards/nrf91/nrfx/sample.yaml b/samples/boards/nrf/nrfx/sample.yaml similarity index 100% rename from samples/boards/nrf91/nrfx/sample.yaml rename to samples/boards/nrf/nrfx/sample.yaml diff --git a/samples/boards/nrf91/nrfx/src/main.c b/samples/boards/nrf/nrfx/src/main.c similarity index 100% rename from samples/boards/nrf91/nrfx/src/main.c rename to samples/boards/nrf/nrfx/src/main.c diff --git a/samples/boards/nrf52/power_mgr/CMakeLists.txt b/samples/boards/nrf/power_mgr/CMakeLists.txt similarity index 100% rename from samples/boards/nrf52/power_mgr/CMakeLists.txt rename to samples/boards/nrf/power_mgr/CMakeLists.txt diff --git a/samples/boards/nrf52/power_mgr/Kconfig b/samples/boards/nrf/power_mgr/Kconfig similarity index 100% rename from samples/boards/nrf52/power_mgr/Kconfig rename to samples/boards/nrf/power_mgr/Kconfig diff --git a/samples/boards/nrf52/power_mgr/README.rst b/samples/boards/nrf/power_mgr/README.rst similarity index 98% rename from samples/boards/nrf52/power_mgr/README.rst rename to samples/boards/nrf/power_mgr/README.rst index 3a908999c45..33a84ed60c3 100644 --- a/samples/boards/nrf52/power_mgr/README.rst +++ b/samples/boards/nrf/power_mgr/README.rst @@ -39,7 +39,7 @@ Building, Flashing and Running ****************************** .. zephyr-app-commands:: - :zephyr-app: samples/boards/nrf52/power_mgr + :zephyr-app: samples/boards/nrf/power_mgr :board: nrf52_pca10040 :goals: build flash :compact: diff --git a/samples/boards/nrf52/power_mgr/prj.conf b/samples/boards/nrf/power_mgr/prj.conf similarity index 100% rename from samples/boards/nrf52/power_mgr/prj.conf rename to samples/boards/nrf/power_mgr/prj.conf diff --git a/samples/boards/nrf52/power_mgr/prj_tickless.conf b/samples/boards/nrf/power_mgr/prj_tickless.conf similarity index 100% rename from samples/boards/nrf52/power_mgr/prj_tickless.conf rename to samples/boards/nrf/power_mgr/prj_tickless.conf diff --git a/samples/boards/nrf52/power_mgr/sample.yaml b/samples/boards/nrf/power_mgr/sample.yaml similarity index 100% rename from samples/boards/nrf52/power_mgr/sample.yaml rename to samples/boards/nrf/power_mgr/sample.yaml diff --git a/samples/boards/nrf52/power_mgr/src/main.c b/samples/boards/nrf/power_mgr/src/main.c similarity index 100% rename from samples/boards/nrf52/power_mgr/src/main.c rename to samples/boards/nrf/power_mgr/src/main.c diff --git a/samples/boards/nrf52/power_mgr/src/power.c b/samples/boards/nrf/power_mgr/src/power.c similarity index 100% rename from samples/boards/nrf52/power_mgr/src/power.c rename to samples/boards/nrf/power_mgr/src/power.c diff --git a/samples/boards/nrf52/power_mgr/src/sample.h b/samples/boards/nrf/power_mgr/src/sample.h similarity index 100% rename from samples/boards/nrf52/power_mgr/src/sample.h rename to samples/boards/nrf/power_mgr/src/sample.h