Made some alignments after refactor

kkasperczyk-no · Apr 7, 2022 · a857c06 · a857c06
1 parent 015237b
commit a857c06
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 27 deletions.
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -104,7 +104,7 @@ jobs:
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               timeout-minutes: 10
               run: |
-                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle_nrf52840 -DCONFIG_CHIP_ROTATING_DEVICE_ID=y
+                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle_nrf52840 -DCONF_FILE=prj_no_dfu.conf -DCONFIG_CHIP_ROTATING_DEVICE_ID=y
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dongle_nrf52840 lighting-app \
                     examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
@@ -113,7 +113,7 @@ jobs:
               if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
               timeout-minutes: 20
               run: |
-                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=../../rpc.overlay
+                  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nrfconnect nrf52840dk_nrf52840+rpc lighting-app \
                     examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \

diff --git a/examples/all-clusters-app/nrfconnect/README.md b/examples/all-clusters-app/nrfconnect/README.md
@@ -294,11 +294,11 @@ To build for the low-power configuration, run the following command with
 _build-target_ replaced with the build target name of the Nordic Semiconductor's
 kit you own (for example `nrf52840dk_nrf52840`):
 
-    $ west build -b build-target -- -DOVERLAY_CONFIG=../../overlay-low_power.conf
+    $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf
 
 For example, use the following command for `nrf52840dk_nrf52840`:
 
-    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=../../overlay-low_power.conf
+    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf
 
 ### Building with Device Firmware Upgrade support
 
@@ -324,8 +324,7 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
 #### Changing bootloader configuration
 
 To change the default MCUboot configuration, edit the `prj.conf` file located in the
-`configuration/build-target/child_image/mcuboot` directory (_build-target_ is your board
-name, for example `nrf52840dk_nrf52840`).
+`child_image/mcuboot` directory.
 
 #### Changing flash memory settings
 

diff --git a/examples/light-switch-app/nrfconnect/README.md b/examples/light-switch-app/nrfconnect/README.md
@@ -462,11 +462,11 @@ To build for the low-power configuration, run the following command with
 _build-target_ replaced with the build target name of the Nordic Semiconductor's
 kit you own (for example `nrf52840dk_nrf52840`):
 
-    $ west build -b build-target -- -DOVERLAY_CONFIG=../../overlay-low_power.conf
+    $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf
 
 For example, use the following command for `nrf52840dk_nrf52840`:
 
-    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=../../overlay-low_power.conf
+    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf
 
 ### Building with Device Firmware Upgrade support
 
@@ -496,8 +496,7 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
 #### Changing bootloader configuration
 
 To change the default MCUboot configuration, edit the `prj.conf` file located in the
-`configuration/build-target/child_image/mcuboot` directory (_build-target_ is your board
-name, for example `nrf52840dk_nrf52840`).
+`child_image/mcuboot` directory.
 
 Make sure to keep the configuration consistent with changes made to the
 application configuration. This is necessary for the configuration to work, as

diff --git a/examples/lighting-app/nrfconnect/README.md b/examples/lighting-app/nrfconnect/README.md
@@ -405,7 +405,7 @@ host computer. To build the example with the RPC server, run the following
 command with _build-target_ replaced with the build target name of the Nordic
 Semiconductor's kit you own:
 
-    $ west build -b build-target -- -DOVERLAY_CONFIG=../../rpc.overlay
+    $ west build -b build-target -- -DOVERLAY_CONFIG=rpc.overlay
 
 ### Building with Device Firmware Upgrade support
 
@@ -438,8 +438,7 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
 #### Changing bootloader configuration
 
 To change the default MCUboot configuration, edit the `prj.conf` file located in the
-`configuration/build-target/child_image/mcuboot` directory (_build-target_ is your board
-name, for example `nrf52840dk_nrf52840`).
+`child_image/mcuboot` directory.
 
 Make sure to keep the configuration consistent with changes made to the
 application configuration. This is necessary for the configuration to work, as
@@ -498,12 +497,13 @@ depending on the selected board:
 
 -   debug -- Debug version of the application - can be used to enable additional
     features for verifying the application behavior, such as logs or
-    command-line shell.
+    command-line shell. It can be used only for the nRF52840 DK and nRF5340 DK, as
+    those platforms have DFU enabled by default.
 -   release -- Release version of the application - can be used to enable only
     the necessary application functionalities to optimize its performance.
+    It can be used only for the nRF52840 DK and nRF5340 DK, as those platforms have DFU enabled by default.
 -   no_dfu -- Debug version of the application without Device Firmware Upgrade
-    feature support - can be used only for the nRF52840 DK and nRF5340 DK, as
-    those platforms have DFU enabled by default.
+    feature support - can be used for the nRF52840 DK, nRF5340 DK and nRF52840 Dongle.
 
 For more information, see the
 [Configuring nRF Connect SDK examples](../../../docs/guides/nrfconnect_examples_configuration.md)

diff --git a/...nnect/boards/nrf52840dongle_nrf52840.conf → ...oards/nrf52840dongle_nrf52840_no_dfu.conf b/...nnect/boards/nrf52840dongle_nrf52840.conf → ...oards/nrf52840dongle_nrf52840_no_dfu.conf
diff --git a/examples/lock-app/nrfconnect/README.md b/examples/lock-app/nrfconnect/README.md
@@ -391,11 +391,11 @@ To build for the low-power configuration, run the following command with
 _build-target_ replaced with the build target name of the Nordic Semiconductor's
 kit you own (for example `nrf52840dk_nrf52840`):
 
-    $ west build -b build-target -- -DOVERLAY_CONFIG=../../overlay-low_power.conf
+    $ west build -b build-target -- -DOVERLAY_CONFIG=overlay-low_power.conf
 
 For example, use the following command for `nrf52840dk_nrf52840`:
 
-    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=../../overlay-low_power.conf
+    $ west build -b nrf52840dk_nrf52840 -- -DOVERLAY_CONFIG=overlay-low_power.conf
 
 ### Building with Device Firmware Upgrade support
 
@@ -425,8 +425,7 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
 #### Changing bootloader configuration
 
 To change the default MCUboot configuration, edit the `prj.conf` file located in the
-`configuration/build-target/child_image/mcuboot` directory (_build-target_ is your board
-name, for example `nrf52840dk_nrf52840`).
+`child_image/mcuboot` directory.
 
 Make sure to keep the configuration consistent with changes made to the
 application configuration. This is necessary for the configuration to work, as

diff --git a/examples/pump-app/nrfconnect/README.md b/examples/pump-app/nrfconnect/README.md
@@ -405,8 +405,7 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
 #### Changing bootloader configuration
 
 To change the default MCUboot configuration, edit the `prj.conf` file located in the
-`configuration/build-target/child_image/mcuboot` directory (_build-target_ is your board
-name, for example `nrf52840dk_nrf52840`).
+`child_image/mcuboot` directory.
 
 Make sure to keep the configuration consistent with changes made to the
 application configuration. This is necessary for the configuration to work, as

diff --git a/examples/pump-controller-app/nrfconnect/README.md b/examples/pump-controller-app/nrfconnect/README.md
@@ -405,8 +405,7 @@ Semiconductor kit you are using (for example `nrf52840dk_nrf52840`):
 #### Changing bootloader configuration
 
 To change the default MCUboot configuration, edit the `prj.conf` file located in the
-`configuration/build-target/child_image/mcuboot` directory (_build-target_ is your board
-name, for example `nrf52840dk_nrf52840`).
+`child_image/mcuboot` directory.
 
 Make sure to keep the configuration consistent with changes made to the
 application configuration. This is necessary for the configuration to work, as

diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py
@@ -146,7 +146,7 @@ def generate(self):
 
             overlays = []
             if self.enable_rpcs:
-                overlays.append("-DOVERLAY_CONFIG=../../rpc.overlay")
+                overlays.append("-DOVERLAY_CONFIG=rpc.overlay")
 
             cmd = '''
 source "$ZEPHYR_BASE/zephyr-env.sh";

diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt
@@ -826,7 +826,7 @@ west build --cmake-only -d {out}/nrf-nrf52840dk-light -b nrf52840dk_nrf52840 {ro
 # Generating nrf-nrf52840dk-light-rpc
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
-west build --cmake-only -d {out}/nrf-nrf52840dk-light-rpc -b nrf52840dk_nrf52840 {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=../../rpc.overlay'
+west build --cmake-only -d {out}/nrf-nrf52840dk-light-rpc -b nrf52840dk_nrf52840 {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=rpc.overlay'
 
 # Generating nrf-nrf52840dk-lock
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
@@ -861,7 +861,7 @@ west build --cmake-only -d {out}/nrf-nrf5340dk-light -b nrf5340dk_nrf5340_cpuapp
 # Generating nrf-nrf5340dk-light-rpc
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";
 export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR";
-west build --cmake-only -d {out}/nrf-nrf5340dk-light-rpc -b nrf5340dk_nrf5340_cpuapp {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=../../rpc.overlay'
+west build --cmake-only -d {out}/nrf-nrf5340dk-light-rpc -b nrf5340dk_nrf5340_cpuapp {root}/examples/lighting-app/nrfconnect -- -DOVERLAY_CONFIG=rpc.overlay'
 
 # Generating nrf-nrf5340dk-lock
 bash -c 'source "$ZEPHYR_BASE/zephyr-env.sh";