Skip to content

Commit 3fc19a0

Browse files
nordicjmrlubos
authored andcommitted
cmake/doc/samples/scripts/tests: Fix references to invalid Kconfigs
Fixes references to invalid Kconfigs Signed-off-by: Jamie McCrae <[email protected]>
1 parent df1fb98 commit 3fc19a0

File tree

6 files changed

+19
-6
lines changed

6 files changed

+19
-6
lines changed

cmake/sysbuild/partition_manager.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ foreach(d APP ${PM_DOMAINS})
539539
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_RRAM)
540540
elseif(${image_name}_CONFIG_SOC_SERIES_NRF71X)
541541
set(soc_nvs_controller mram_controller)
542-
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_MRAMC)
542+
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_MRAM)
543543
else()
544544
set(soc_nvs_controller flash_controller)
545545
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF)

doc/nrf/libraries/caf/settings_loader.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ After each module that sets a bit in the :c:func:`get_req_modules` function is i
4848
File system as settings backend
4949
===============================
5050

51-
If the settings backend is a file system (set with the :kconfig:option:`CONFIG_SETTINGS_FS` Kconfig option), make sure that the application mounts the file system before the Zephyr settings subsystem is initialized.
51+
If the settings backend is a file system (set with the :kconfig:option:`CONFIG_SETTINGS_FILE` Kconfig option), make sure that the application mounts the file system before the Zephyr settings subsystem is initialized.
5252
The CAF settings loader module calls the :c:func:`settings_subsys_init` initialization function during the system boot with the ``APPLICATION`` level and the initialization priority set by the :kconfig:option:`CONFIG_APPLICATION_INIT_PRIORITY` Kconfig option.
5353

5454
Implementation details

samples/pmic/native/npm2100_fuel_gauge/README.rst

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,21 @@ This sample allows the calculation of state of charge from a battery connected t
2525

2626
Battery models for Alkaline AA (1S and 2S configuration), AAA (1S and 2S configuration), LR44, and Lithium-manganese dioxide coin cell CR2032 batteries are included.
2727
You can change the active battery model using a shell command, as illustrated in `Testing`_.
28-
You can also change the battery model at compile time using the :kconfig:option:`CONFIG_BATTERY_MODEL` Kconfig option.
28+
You can also change the battery model at compile time by selecting the type of battery via Kconfig:
29+
30+
+-------------------------------------------------------+-------------------------------------------+
31+
| :kconfig:option:`CONFIG_BATTERY_MODEL_ALKALINE_AA` | Alkaline AA battery model |
32+
+-------------------------------------------------------+-------------------------------------------+
33+
| :kconfig:option:`CONFIG_BATTERY_MODEL_ALKALINE_AAA` | Alkaline AAA battery model |
34+
+-------------------------------------------------------+-------------------------------------------+
35+
| :kconfig:option:`CONFIG_BATTERY_MODEL_ALKALINE_2SAA` | 2x alkaline AA battery (in series) model |
36+
+-------------------------------------------------------+-------------------------------------------+
37+
| :kconfig:option:`CONFIG_BATTERY_MODEL_ALKALINE_2SAAA` | 2x alkaline AAA battery (in series) model |
38+
+-------------------------------------------------------+-------------------------------------------+
39+
| :kconfig:option:`CONFIG_BATTERY_MODEL_ALKALINE_LR44` | Alkaline LR44 coin cell model |
40+
+-------------------------------------------------------+-------------------------------------------+
41+
| :kconfig:option:`CONFIG_BATTERY_MODEL_LITHIUM_CR2032` | Lithium CR2032 coin cell |
42+
+-------------------------------------------------------+-------------------------------------------+
2943

3044
.. _npm2100_fuel_gauge_wiring:
3145

samples/zephyr/drivers/spi_flash/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ common:
1717
- "Data read matches data written. Good!!"
1818
tests:
1919
sample.drivers.spi.flash.sqspi:
20-
filter: CONFIG_MSPI_SQSPI and dt_compat_enabled("jedec,mspi-nor")
20+
filter: CONFIG_MSPI_NRF_SQSPI and dt_compat_enabled("jedec,mspi-nor")
2121
platform_allow:
2222
- nrf54l15dk/nrf54l15/cpuapp
2323
integration_platforms:

scripts/partition_manager/partition_manager.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ For external regions, ``DEFAULT_DRIVER_KCONFIG`` within :file:`partition_manager
569569
Out-of-tree drivers can select this value to attest that they provide support for the external flash.
570570
This is a hidden option and can be selected only by an external driver or a Kconfig option.
571571

572-
This option is automatically set when :kconfig:option:`CONFIG_NRF_QSPI_NOR` or :kconfig:option:`CONFIG_SPI_NOR` is enabled.
572+
This option is automatically set when :kconfig:option:`CONFIG_NORDIC_QSPI_NOR` or :kconfig:option:`CONFIG_SPI_NOR` is enabled.
573573
If the application provides the driver in an unusual way, this option can be overridden by setting :kconfig:option:`CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK` in the application configuration.
574574

575575
As partition manager does not know if partitions are used at runtime, consider the following:

tests/lib/pdn/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ add_compile_definitions(CONFIG_PDN_ESM_TIMEOUT=1000)
2828
add_compile_definitions(CONFIG_PDN_DEFAULTS_OVERRIDE)
2929
add_compile_definitions(CONFIG_PDN_DEFAULT_APN="apn0")
3030
add_compile_definitions(CONFIG_PDN_DEFAULT_FAM=2)
31-
add_compile_definitions(CONFIG_PDN_DYNAMIC_INFO_AT_BUF_SIZE=512)

0 commit comments

Comments
 (0)