diff --git a/boards/nordic/nrf54l09pdk/board.cmake b/boards/nordic/nrf54l09pdk/board.cmake index f2dd60410ed..89977a4cef6 100644 --- a/boards/nordic/nrf54l09pdk/board.cmake +++ b/boards/nordic/nrf54l09pdk/board.cmake @@ -1,9 +1,9 @@ # Copyright (c) 2024 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if (CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP) +if(CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUAPP) board_runner_args(jlink "--device=cortex-m33" "--speed=4000") -elseif (CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR) +elseif(CONFIG_BOARD_NRF54L09PDK_NRF54L09_CPUFLPR) board_runner_args(jlink "--speed=4000") endif() diff --git a/boards/nordic/nrf54l09pdk/board.yml b/boards/nordic/nrf54l09pdk/board.yml index bfa8419dff9..b35f4c1fafe 100644 --- a/boards/nordic/nrf54l09pdk/board.yml +++ b/boards/nordic/nrf54l09pdk/board.yml @@ -4,6 +4,3 @@ board: vendor: nordic socs: - name: nrf54l09 - variants: - - name: xip - cpucluster: cpuflpr diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi index 12b9aff7822..ac08b201f93 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi +++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi @@ -27,6 +27,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts index 3ae2dac9c5d..3a1e3c7dd51 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts +++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.dts @@ -33,7 +33,7 @@ cpuflpr_code_partition: partition@0 { label = "image-0"; - reg = <0x0 DT_SIZE_K(60)>; + reg = <0x0 DT_SIZE_K(48)>; }; }; }; diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml index 47d03bb2ed9..01e5c9ffbee 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml +++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr.yaml @@ -7,8 +7,9 @@ type: mcu arch: riscv toolchain: - zephyr +sysbuild: true ram: 48 -flash: 60 +flash: 48 supported: - counter - gpio diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig index 75f7c4386e3..90cf13bdee5 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig +++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuflpr_defconfig @@ -15,5 +15,3 @@ CONFIG_USE_DT_CODE_PARTITION=y # Execute from SRAM CONFIG_XIP=n - -CONFIG_RISCV_ALWAYS_SWITCH_THROUGH_ECALL=y diff --git a/soc/nordic/nrf54l/Kconfig.soc b/soc/nordic/nrf54l/Kconfig.soc index 80675b0ac37..5fd8260b9bb 100644 --- a/soc/nordic/nrf54l/Kconfig.soc +++ b/soc/nordic/nrf54l/Kconfig.soc @@ -45,7 +45,6 @@ config SOC_NRF54L09_ENGA_CPUFLPR help NRF54L09 ENGA CPUFLPR - config SOC_NRF54L10 bool select SOC_SERIES_NRF54LX diff --git a/soc/nordic/soc.yml b/soc/nordic/soc.yml index 77511827ea7..105ad7d506a 100644 --- a/soc/nordic/soc.yml +++ b/soc/nordic/soc.yml @@ -176,6 +176,7 @@ runners: - nrf54l05/cpuflpr - qualifiers: - nrf54l09/cpuapp + - nrf54l09/cpuflpr - qualifiers: - nrf54l10/cpuapp - nrf54l10/cpuflpr @@ -239,6 +240,7 @@ runners: - nrf54l05/cpuflpr - qualifiers: - nrf54l09/cpuapp + - nrf54l09/cpuflpr - qualifiers: - nrf54l10/cpuapp - nrf54l10/cpuflpr