From e5b730e01fd22fcca5f97882d630fc8ec64bf895 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Fri, 21 Jun 2024 02:05:10 +0200 Subject: [PATCH 1/4] ubxlib: remove deprecated Kconfigs This commit updates in-tree code for the U-Blox library to use CONFIG_CPP instead of CONFIG_CPLUSPLUS, which is deprecated for more than 3 releases. Signed-off-by: Stephan Linz --- modules/ubxlib/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ubxlib/Kconfig b/modules/ubxlib/Kconfig index 4b932572b0..3233e8b47a 100644 --- a/modules/ubxlib/Kconfig +++ b/modules/ubxlib/Kconfig @@ -86,7 +86,7 @@ config UBXLIB_TEST bool "Compile the ubxlib tests" select TEST select IRQ_OFFLOAD - select CPLUSPLUS + select CPP default n help The self contained ubxlib tests are only useful for From 339572dcbd5463c87c1b8b987c4487accf0ca604 Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Fri, 21 Jun 2024 01:37:05 +0200 Subject: [PATCH 2/4] boards: magpie_f777ni: remove deprecated Kconfigs These clock selection Kconfigs should have been deprecated for more than 2 releases, remove them: - CONFIG_COUNTER_RTC_STM32_CLOCK_SRC - CONFIG_COUNTER_RTC_STM32_CLOCK_LSE Instead favor of device tree secondary domain clock. This fixes following exemplary build error message since Zephyr commit 88c96f7986d408fae48cb538d8144c0aa985edb1: warning: (defined at /.../boards/tiac/magpie_f777ni/Kconfig.defconfig:9) defined without a prompt warning: the default selection COUNTER_RTC_STM32_CLOCK_LSE (undefined) of (defined at /.../boards/tiac/magpie_f777ni/Kconfig.defconfig:9) is not contained in the choice error: Aborting due to Kconfig warnings Signed-off-by: Stephan Linz --- boards/tiac/magpie_f777ni/Kconfig.defconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/boards/tiac/magpie_f777ni/Kconfig.defconfig b/boards/tiac/magpie_f777ni/Kconfig.defconfig index a6411e5d8a..2e86788c3e 100644 --- a/boards/tiac/magpie_f777ni/Kconfig.defconfig +++ b/boards/tiac/magpie_f777ni/Kconfig.defconfig @@ -6,11 +6,6 @@ if BOARD_MAGPIE_F777NI -choice COUNTER_RTC_STM32_CLOCK_SRC - default COUNTER_RTC_STM32_CLOCK_LSE - depends on COUNTER -endchoice - choice RNG_GENERATOR_CHOICE default ENTROPY_DEVICE_RANDOM_GENERATOR depends on ENTROPY_GENERATOR From c71e3c688e140e5d7bedcf9e4b09fd6806e0b9dc Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Fri, 21 Jun 2024 01:01:39 +0200 Subject: [PATCH 3/4] samples: ubx_gnss: remove deprecated Kconfigs The following Kconfigs have been deprecated for more than 2 releases, remove them: - CONFIG_MINIMAL_LIBC_MALLOC Instead the new generic Kconfigs will used: - CONFIG_COMMON_LIBC_MALLOC This fixes following exemplary build error message since Zephyr commit c22c98e51033379347cd8c681db34cf7afd33e57: /.../workspace/bridle/samples/ubx_gnss/prj.conf:31: warning: attempt to assign the value 'n' to the undefined symbol MINIMAL_LIBC_MALLOC error: Aborting due to Kconfig warnings Signed-off-by: Stephan Linz --- samples/ubx_gnss/prj.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ubx_gnss/prj.conf b/samples/ubx_gnss/prj.conf index 9de99a1c48..7fabb1a7be 100644 --- a/samples/ubx_gnss/prj.conf +++ b/samples/ubx_gnss/prj.conf @@ -28,7 +28,7 @@ CONFIG_UBXLIB_GNSS=y # Libc CONFIG_MINIMAL_LIBC=y -CONFIG_MINIMAL_LIBC_MALLOC=n +CONFIG_COMMON_LIBC_MALLOC=n # Memory CONFIG_MAIN_STACK_SIZE=8192 From 04ca985005752b16482a3abd230eb6c2a595814f Mon Sep 17 00:00:00 2001 From: Stephan Linz Date: Fri, 21 Jun 2024 01:02:12 +0200 Subject: [PATCH 4/4] samples: ubx_gnss: update board identifier to HWMv2 The documentation still shows the outdated board names. These have now been changed to the new HW model v2 board terminology. Signed-off-by: Stephan Linz --- samples/ubx_gnss/README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/ubx_gnss/README.rst b/samples/ubx_gnss/README.rst index 00f3298b9d..00431daf10 100644 --- a/samples/ubx_gnss/README.rst +++ b/samples/ubx_gnss/README.rst @@ -63,7 +63,7 @@ Build and flash for different boards .. zephyr-app-commands:: :zephyr-app: bridle/samples/ubx_gnss - :board: nrf9160dk_nrf9160 + :board: nrf9160dk/nrf9160 :build-dir: nrf9160dk_nrf9160-ubx_gnss :west-args: -p :goals: flash @@ -73,7 +73,7 @@ Build and flash for different boards .. zephyr-app-commands:: :zephyr-app: bridle/samples/ubx_gnss - :board: nrf52840dk_nrf52840 + :board: nrf52840dk/nrf52840 :build-dir: nrf52840dk_nrf52840-ubx_gnss :west-args: -p :goals: flash @@ -113,7 +113,7 @@ Build and flash for different boards .. zephyr-app-commands:: :zephyr-app: bridle/samples/ubx_gnss - :board: mimxrt1170_evkb_cm7 + :board: mimxrt1170_evk@B/mimxrt1176/cm7 :build-dir: mimxrt1170_evkb_cm7-ubx_gnss :west-args: -p :flash-args: -r pyocd