Merge branch 'main' into fix-nrf-1447

Author: de-nordic

boards/native/nrf_bsim/doc/nrf52_bsim.rst

@@ -171,6 +171,33 @@ Run them with ``-help`` for more information.
 You can find more information about how to run BabbleSim simulations in
 `this BabbleSim example <https://babblesim.github.io/example_2g4.html>`_.
 
+Running an application using the console
+========================================
+
+Some applications require the use of a console to interact with the user.
+These applications typically enable :kconfig:option:`CONFIG_CONSOLE_SUBSYS` and :kconfig:option:`CONFIG_CONSOLE_GETCHAR`.
+The UART console is disabled by default for BabbleSim boards, to enable it simply add the snippet :ref:`snippet-uart-console`.
+
+.. code-block:: console
+
+   west build -S serial-console [...]
+
+To view the output and interact with the application the user needs to connect a terminal to this pseudoterminal.
+
+.. code-block:: console
+
+   # Automatically attach to the terminal
+   ./build/zephyr/zephyr.exe --uart<uart_id>_pty_attach
+   # Use a custom command to attach to the terminal, for example 'xterm -e screen %s &'
+   ./build/zephyr/zephyr.exe --uart<uart_id>_attach_cmd=<cmd>
+   # Use a custom way to connect to the pseudoterminal
+   ./build/zephyr/zephyr.exe --uart<uart_id>_pty --uart_pty_wait
+   minicom -D /dev/pts/<pts_id>
+
+The command line option ``--uart_list`` prints out the mapping between ``uart_id`` and the UART peripherals.
+The overlay files describes which UART peripheral is being used as the console output.
+
+For more details about attaching to the UART output, refer to the output of the ``-help`` option of the executable.
 
 C library choice
 ****************

boards/native/nrf_bsim/doc/nrf54l15bsim.rst

@@ -40,6 +40,7 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * AAR (Accelerated Address Resolver)
 * CCM (AES CCM mode encryption)
 * CLOCK (Clock control)
+* CRACEN (Crypto Accelerator Engine)
 * DPPI (Distributed Programmable Peripheral Interconnect)
 * ECB (AES electronic codebook mode encryption)
 * EGU (Event Generator Unit)
@@ -49,7 +50,6 @@ This boards include models of some of the nRF54L15 SOC peripherals:
 * PPIB (PPI Bridge)
 * RADIO
 * RRAMC (Resistive RAM Controller)
-* RTC (Real Time Counter)
 * TEMP (Temperature sensor)
 * TIMER
 * UARTE (UART with Easy DMA)

boards/native/nrf_bsim/irq_handler.c

@@ -278,6 +278,11 @@ void posix_isr_declare(unsigned int irq_p, int flags, void isr_p(const void *),
  */
 void posix_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 {
+	if (irq >= NHW_INTCTRL_MAX_INTLINES) {
+		bs_trace_error_time_line("Attempted to configure not existent interrupt %u\n",
+					 irq);
+		return;
+	}
 	hw_irq_ctrl_prio_set(CONFIG_NATIVE_SIMULATOR_MCU_N, irq, prio);
 }
 

boards/native/nrf_bsim/nrf52_bsim.dts

@@ -36,6 +36,7 @@
 	chosen {
 		zephyr,ieee802154 = &ieee802154;
 		zephyr,flash = &flash0;
+		zephyr,console = &uart0;
 		/* UART used by the BT controller UART HCI driver by default: */
 		zephyr,bt-c2h-uart = &uart1;
 	};

boards/native/nrf_bsim/nrf52_bsim_defconfig

@@ -3,4 +3,3 @@
 
 CONFIG_CONSOLE=y
 CONFIG_NO_OPTIMIZATIONS=y
-CONFIG_LOG_BACKEND_UART=n

boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts

@@ -39,6 +39,7 @@
 	};
 
 	chosen {
+		zephyr,console = &uart0;
 		zephyr,entropy = &rng_hci;
 		zephyr,flash = &flash0;
 		zephyr,bt-hci = &bt_hci_ipc0;

boards/native/nrf_bsim/nrf54l15bsim_nrf54l15_cpuapp.dts

@@ -15,6 +15,7 @@
 	compatible = "bsim,nrf54l15-bsim-nrf54l15-cpuapp", "bsim,nrf54";
 
 	chosen {
+		zephyr,console = &uart20;
 		zephyr,entropy = &rng;
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;

boards/nordic/nrf54l09pdk/Kconfig.defconfig

@@ -9,9 +9,6 @@ config BT_CTLR
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	default y
-
 config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
 	default y
 

boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi

@@ -27,6 +27,11 @@
 	status = "okay";
 };
 
+&hfpll {
+	/* For now use 64 MHz clock for CPU and fast peripherals. */
+	clock-frequency = <DT_FREQ_M(64)>;
+};
+
 &lfxo {
 	load-capacitors = "internal";
 	load-capacitance-femtofarad = <15500>;

boards/nordic/nrf54l20pdk/Kconfig.defconfig

@@ -6,9 +6,6 @@ if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-config SOC_NRF54LX_SKIP_CLOCK_CONFIG
-	default y
-
 config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
 	default y