From 14845403c48eab89e964da6178e1569418e344eb Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk <66371704+kkasperczyk-no@users.noreply.github.com> Date: Thu, 14 Apr 2022 09:15:29 +0200 Subject: [PATCH] [nrfconnect] Fixed using Kconfig.features options (#17313) Kconfig.features is currently sourced after Kconfig.defaults, so the default values from Kconfig.defaults are used and features cannot modify it. Removed Kconfig.features to be sourced before Kconfig.defaults. --- examples/all-clusters-app/nrfconnect/Kconfig | 2 +- examples/light-switch-app/nrfconnect/Kconfig | 2 +- examples/lighting-app/nrfconnect/Kconfig | 2 +- examples/lock-app/nrfconnect/Kconfig | 2 +- examples/pigweed-app/nrfconnect/Kconfig | 2 +- examples/pump-app/nrfconnect/Kconfig | 2 +- examples/pump-controller-app/nrfconnect/Kconfig | 2 +- examples/shell/nrfconnect/Kconfig | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/all-clusters-app/nrfconnect/Kconfig b/examples/all-clusters-app/nrfconnect/Kconfig index 176fd68f573c21..9fcdb41ab33208 100644 --- a/examples/all-clusters-app/nrfconnect/Kconfig +++ b/examples/all-clusters-app/nrfconnect/Kconfig @@ -22,6 +22,6 @@ config STATE_LEDS Use LEDs to render the current state of the device such as the progress of commissioning of the device into a network or the factory reset initiation. -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/light-switch-app/nrfconnect/Kconfig b/examples/light-switch-app/nrfconnect/Kconfig index 59e94a75c47b31..8b4d87b0a956f0 100644 --- a/examples/light-switch-app/nrfconnect/Kconfig +++ b/examples/light-switch-app/nrfconnect/Kconfig @@ -23,6 +23,6 @@ config STATE_LEDS the device into a network or the factory reset initiation. Note that setting this option to 'n' does not disable the LED indicating the state of the simulated bolt. -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/lighting-app/nrfconnect/Kconfig b/examples/lighting-app/nrfconnect/Kconfig index d862fc1d2ace52..94a99f971ac195 100644 --- a/examples/lighting-app/nrfconnect/Kconfig +++ b/examples/lighting-app/nrfconnect/Kconfig @@ -15,6 +15,6 @@ # mainmenu "Matter nRF Connect Lighting Example Application" -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/lock-app/nrfconnect/Kconfig b/examples/lock-app/nrfconnect/Kconfig index ccf45058d8fca3..ddfeff16127be7 100644 --- a/examples/lock-app/nrfconnect/Kconfig +++ b/examples/lock-app/nrfconnect/Kconfig @@ -23,6 +23,6 @@ config STATE_LEDS the device into a network or the factory reset initiation. Note that setting this option to 'n' does not disable the LED indicating the state of the simulated bolt. -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/pigweed-app/nrfconnect/Kconfig b/examples/pigweed-app/nrfconnect/Kconfig index d862fc1d2ace52..94a99f971ac195 100644 --- a/examples/pigweed-app/nrfconnect/Kconfig +++ b/examples/pigweed-app/nrfconnect/Kconfig @@ -15,6 +15,6 @@ # mainmenu "Matter nRF Connect Lighting Example Application" -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/pump-app/nrfconnect/Kconfig b/examples/pump-app/nrfconnect/Kconfig index d862fc1d2ace52..94a99f971ac195 100644 --- a/examples/pump-app/nrfconnect/Kconfig +++ b/examples/pump-app/nrfconnect/Kconfig @@ -15,6 +15,6 @@ # mainmenu "Matter nRF Connect Lighting Example Application" -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/pump-controller-app/nrfconnect/Kconfig b/examples/pump-controller-app/nrfconnect/Kconfig index d862fc1d2ace52..94a99f971ac195 100644 --- a/examples/pump-controller-app/nrfconnect/Kconfig +++ b/examples/pump-controller-app/nrfconnect/Kconfig @@ -15,6 +15,6 @@ # mainmenu "Matter nRF Connect Lighting Example Application" -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr" diff --git a/examples/shell/nrfconnect/Kconfig b/examples/shell/nrfconnect/Kconfig index d862fc1d2ace52..94a99f971ac195 100644 --- a/examples/shell/nrfconnect/Kconfig +++ b/examples/shell/nrfconnect/Kconfig @@ -15,6 +15,6 @@ # mainmenu "Matter nRF Connect Lighting Example Application" -rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" rsource "../../../config/nrfconnect/chip-module/Kconfig.features" +rsource "../../../config/nrfconnect/chip-module/Kconfig.defaults" source "Kconfig.zephyr"