From 95144b9548a976e22b94875277c3c955498109b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Thu, 27 Feb 2025 11:12:16 +0100 Subject: [PATCH] samples: basic: blinky: Extend upstream sample MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add sample that reuses source code from "original" sample that existing in the upstream Zephyr. Extend sample with configuration that uses emulated GPIO instead of "ordinary" GPIO. Remove Twister alt-config for upstream sample. Signed-off-by: Sebastian Głąb --- CODEOWNERS | 2 +- samples/basic/blinky/CMakeLists.txt | 11 +++++++++++ samples/basic/blinky/README.txt | 3 +++ .../boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay | 9 +++++++++ samples/basic/blinky/prj.conf | 1 + .../samples => samples}/basic/blinky/sample.yaml | 12 ++++-------- 6 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 samples/basic/blinky/CMakeLists.txt create mode 100644 samples/basic/blinky/README.txt create mode 100644 samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay create mode 100644 samples/basic/blinky/prj.conf rename {scripts/twister/alt/zephyr/samples => samples}/basic/blinky/sample.yaml (86%) diff --git a/CODEOWNERS b/CODEOWNERS index 4f90e84ff105..ff41b0bc4210 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -439,6 +439,7 @@ /samples/CMakeLists.txt @nrfconnect/ncs-co-build-system /samples/app_event_manager/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel /samples/app_event_manager_profiler_tracer/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel +/samples/basic/blinky/ @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus /samples/benchmarks/coremark/ @nrfconnect/ncs-si-bluebagel /samples/bluetooth/nrf_auraconfig/ @nrfconnect/ncs-audio /samples/bluetooth/central_and_peripheral_hr/ @nrfconnect/ncs-si-muffin @@ -703,7 +704,6 @@ /scripts/partition_manager/*.rst @nrfconnect/ncs-aurora-doc /scripts/shell/ble_console/**/*.rst @nrfconnect/ncs-doc-leads /scripts/west_commands/sbom/*.rst @nrfconnect/ncs-si-muffin-doc -/scripts/twister/alt/zephyr/samples/basic/ @nrfconnect/ncs-ll-ursus /scripts/twister/alt/zephyr/samples/sensor/ @nrfconnect/ncs-low-level-test /scripts/twister/alt/zephyr/tests/drivers/ @nrfconnect/ncs-low-level-test diff --git a/samples/basic/blinky/CMakeLists.txt b/samples/basic/blinky/CMakeLists.txt new file mode 100644 index 000000000000..faa8e6d981c4 --- /dev/null +++ b/samples/basic/blinky/CMakeLists.txt @@ -0,0 +1,11 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +cmake_minimum_required(VERSION 3.20.0) +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +project(blinky) + +target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/basic/blinky/src/main.c) diff --git a/samples/basic/blinky/README.txt b/samples/basic/blinky/README.txt new file mode 100644 index 000000000000..7165d27c7be7 --- /dev/null +++ b/samples/basic/blinky/README.txt @@ -0,0 +1,3 @@ +This sample extends the same-named Zephyr sample to verify it with Nordic development kits. + +Source code and basic configuration files can be found in the corresponding folder structure in zephyr/samples/basic/blinky. diff --git a/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay new file mode 100644 index 000000000000..a7f4e8730bed --- /dev/null +++ b/samples/basic/blinky/boards/nrf54l15dk_nrf54l15_cpuapp_egpio.overlay @@ -0,0 +1,9 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&led0 { + gpios = <&egpio 9 GPIO_ACTIVE_HIGH>; +}; diff --git a/samples/basic/blinky/prj.conf b/samples/basic/blinky/prj.conf new file mode 100644 index 000000000000..91c3c15b37d1 --- /dev/null +++ b/samples/basic/blinky/prj.conf @@ -0,0 +1 @@ +CONFIG_GPIO=y diff --git a/scripts/twister/alt/zephyr/samples/basic/blinky/sample.yaml b/samples/basic/blinky/sample.yaml similarity index 86% rename from scripts/twister/alt/zephyr/samples/basic/blinky/sample.yaml rename to samples/basic/blinky/sample.yaml index 7f310bc7ec81..18d1f4777a5c 100644 --- a/scripts/twister/alt/zephyr/samples/basic/blinky/sample.yaml +++ b/samples/basic/blinky/sample.yaml @@ -4,15 +4,11 @@ common: tags: - LED - gpio + - ci_tests_drivers_sdp depends_on: gpio tests: - sample.basic.blinky: - filter: dt_enabled_alias_with_parent_compat("led0", "gpio-leds") - harness: led - integration_platforms: - - frdm_k64f - sample.basic.blinky.sdp.gpio.icmsg: + nrf.extended.sample.basic.blinky.sdp.gpio.icmsg: sysbuild: true platform_allow: - nrf54l15dk/nrf54l15/cpuapp @@ -32,7 +28,7 @@ tests: - "LED state: ON" - "LED state: OFF" - sample.basic.blinky.sdp.gpio.mbox: + nrf.extended.sample.basic.blinky.sdp.gpio.mbox: sysbuild: true platform_allow: - nrf54l15dk/nrf54l15/cpuapp @@ -52,7 +48,7 @@ tests: - "LED state: ON" - "LED state: OFF" - sample.basic.blinky.sdp.gpio.icbmsg: + nrf.extended.sample.basic.blinky.sdp.gpio.icbmsg: sysbuild: true platform_allow: - nrf54l15dk/nrf54l15/cpuapp