Compare commits

...

11 Commits

Author SHA1 Message Date
David Leach e3ed029b55 boards: nxp: mimxrt1060: Disable pwmleds for Rev B/C boards 20 hours ago
Johann Fischer 56b359b8f5 drivers: udc_dwc2: do not throw error when FIFO settings can be reused 20 hours ago
Benjamin Cabé 732785aefa doc: develop: gsg: consolidate python3 install instructions for ubuntu 20 hours ago
Benjamin Cabé 6ddf0f48e7 doc: develop: gsg: move from ubuntu 20.04 to 22.04 as minimum version 20 hours ago
Armando Visconti 0d7c751bad drivers/sensor: lis2dux12: add 'return' if data has to be dropped 20 hours ago
Armando Visconti df1832e32d drivers/sensor: lsm6dsv16x: add 'return' if data has to be dropped 20 hours ago
Armando Visconti 79c098a9d9 drivers/sensors: st: fix Null pointer dereferences 20 hours ago
Armando Visconti 1d8bd6bd53 drivers/sensor: lis2dux12: fix uninitialized variable fifo_mode 20 hours ago
Armando Visconti 5792a429c8 drivers/sensor: lsm6dsv16x: fix unreachable code in decoder_decode() 20 hours ago
Jamie McCrae efdd2a8ff2 west.yml: MCUboot synchronization from upstream 21 hours ago
Jamie McCrae 85d4ebcf51 soc: nordic: ironside: Fix bleeding config 21 hours ago
  1. 7
      boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay
  2. 5
      boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.overlay
  3. 26
      doc/develop/getting_started/index.rst
  4. 8
      drivers/sensor/st/lis2dux12/lis2dux12_api.c
  5. 7
      drivers/sensor/st/lis2dux12/lis2dux12_rtio_stream.c
  6. 8
      drivers/sensor/st/lis2dux12/lis2duxs12_api.c
  7. 2
      drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.c
  8. 7
      drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio_stream.c
  9. 21
      drivers/usb/udc/udc_dwc2.c
  10. 2
      soc/nordic/CMakeLists.txt
  11. 3
      soc/nordic/ironside/CMakeLists.txt
  12. 3
      soc/nordic/nrf54h/soc.c
  13. 2
      west.yml

7
boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay

@ -4,6 +4,13 @@ @@ -4,6 +4,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
/ {
/* FLEXPWM not routed to LED on this EVK */
pwmleds {
status = "disabled";
};
};
/* FLEXPWM not routed to LED on this EVK */
&flexpwm2_pwm3 {
status = "disabled";

5
boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_C.overlay

@ -9,6 +9,11 @@ @@ -9,6 +9,11 @@
i2s-codec-tx = &sai1;
i2s-tx = &sai1;
};
/* FLEXPWM not routed to LED on this EVK */
pwmleds {
status = "disabled";
};
};
/* FLEXPWM not routed to LED on this EVK */

26
doc/develop/getting_started/index.rst

@ -22,7 +22,7 @@ Click the operating system you are using. @@ -22,7 +22,7 @@ Click the operating system you are using.
.. group-tab:: Ubuntu
This guide covers Ubuntu version 20.04 LTS and later.
This guide covers Ubuntu version 22.04 LTS and later.
If you are using a different Linux distribution see :ref:`installation_linux`.
.. code-block:: bash
@ -73,27 +73,13 @@ The current minimum required version for the main dependencies are: @@ -73,27 +73,13 @@ The current minimum required version for the main dependencies are:
.. _install_dependencies_ubuntu:
#. If using an Ubuntu version older than 22.04, it is necessary to add extra
repositories to meet the minimum required versions for the main
dependencies listed above. In that case, download, inspect and execute
the Kitware archive script to add the Kitware APT repository to your
sources list.
A detailed explanation of ``kitware-archive.sh`` can be found here
`kitware third-party apt repository <https://apt.kitware.com/>`_:
.. code-block:: bash
wget https://apt.kitware.com/kitware-archive.sh
sudo bash kitware-archive.sh
#. Use ``apt`` to install the required dependencies:
.. code-block:: bash
sudo apt install --no-install-recommends git cmake ninja-build gperf \
ccache dfu-util device-tree-compiler wget \
python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \
make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1
ccache dfu-util device-tree-compiler wget python3-dev python3-venv python3-tk \
xz-utils file make gcc gcc-multilib g++-multilib libsdl2-dev libmagic1
.. note::
@ -217,12 +203,6 @@ chosen. You'll also install Zephyr's additional Python dependencies in a @@ -217,12 +203,6 @@ chosen. You'll also install Zephyr's additional Python dependencies in a
.. group-tab:: Ubuntu
#. Use ``apt`` to install Python ``venv`` package:
.. code-block:: bash
sudo apt install python3-venv
#. Create a new virtual environment:
.. code-block:: bash

8
drivers/sensor/st/lis2dux12/lis2dux12_api.c

@ -151,7 +151,7 @@ static void st_lis2dux12_stream_config_fifo(const struct device *dev, @@ -151,7 +151,7 @@ static void st_lis2dux12_stream_config_fifo(const struct device *dev,
const struct lis2dux12_config *config = dev->config;
stmdev_ctx_t *ctx = (stmdev_ctx_t *)&config->ctx;
lis2dux12_pin_int_route_t pin_int = { 0 };
lis2dux12_fifo_mode_t fifo_mode;
lis2dux12_fifo_mode_t fifo_mode = { 0 };
/* disable FIFO as first thing */
fifo_mode.store = LIS2DUX12_FIFO_1X;
@ -168,6 +168,12 @@ static void st_lis2dux12_stream_config_fifo(const struct device *dev, @@ -168,6 +168,12 @@ static void st_lis2dux12_stream_config_fifo(const struct device *dev,
pin_int.fifo_th = (trig_cfg.int_fifo_th) ? PROPERTY_ENABLE : PROPERTY_DISABLE;
pin_int.fifo_full = (trig_cfg.int_fifo_full) ? PROPERTY_ENABLE : PROPERTY_DISABLE;
if (pin_int.fifo_th) {
fifo_mode.fifo_event = LIS2DUX12_FIFO_EV_WTM;
} else if (pin_int.fifo_full) {
fifo_mode.fifo_event = LIS2DUX12_FIFO_EV_FULL;
}
switch (config->fifo_mode_sel) {
case 0:
fifo_mode.store = LIS2DUX12_FIFO_1X;

7
drivers/sensor/st/lis2dux12/lis2dux12_rtio_stream.c

@ -363,8 +363,9 @@ static void lis2dux12_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe, @@ -363,8 +363,9 @@ static void lis2dux12_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe,
return;
}
if (data_ready->opt == SENSOR_STREAM_DATA_NOP ||
data_ready->opt == SENSOR_STREAM_DATA_DROP) {
if (data_ready != NULL &&
(data_ready->opt == SENSOR_STREAM_DATA_NOP ||
data_ready->opt == SENSOR_STREAM_DATA_DROP)) {
uint8_t *buf;
uint32_t buf_len;
@ -389,6 +390,8 @@ static void lis2dux12_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe, @@ -389,6 +390,8 @@ static void lis2dux12_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe,
rtio_iodev_sqe_ok(lis2dux12->streaming_sqe, 0);
lis2dux12->streaming_sqe = NULL;
gpio_pin_interrupt_configure_dt(irq_gpio, GPIO_INT_EDGE_TO_ACTIVE);
return;
}
/*

8
drivers/sensor/st/lis2dux12/lis2duxs12_api.c

@ -151,7 +151,7 @@ static void st_lis2duxs12_stream_config_fifo(const struct device *dev, @@ -151,7 +151,7 @@ static void st_lis2duxs12_stream_config_fifo(const struct device *dev,
const struct lis2dux12_config *config = dev->config;
stmdev_ctx_t *ctx = (stmdev_ctx_t *)&config->ctx;
lis2duxs12_pin_int_route_t pin_int = { 0 };
lis2duxs12_fifo_mode_t fifo_mode;
lis2duxs12_fifo_mode_t fifo_mode = { 0 };
/* disable FIFO as first thing */
fifo_mode.store = LIS2DUXS12_FIFO_1X;
@ -168,6 +168,12 @@ static void st_lis2duxs12_stream_config_fifo(const struct device *dev, @@ -168,6 +168,12 @@ static void st_lis2duxs12_stream_config_fifo(const struct device *dev,
pin_int.fifo_th = (trig_cfg.int_fifo_th) ? PROPERTY_ENABLE : PROPERTY_DISABLE;
pin_int.fifo_full = (trig_cfg.int_fifo_full) ? PROPERTY_ENABLE : PROPERTY_DISABLE;
if (pin_int.fifo_th) {
fifo_mode.fifo_event = LIS2DUXS12_FIFO_EV_WTM;
} else if (pin_int.fifo_full) {
fifo_mode.fifo_event = LIS2DUXS12_FIFO_EV_FULL;
}
switch (config->fifo_mode_sel) {
case 0:
fifo_mode.store = LIS2DUXS12_FIFO_1X;

2
drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_decoder.c

@ -660,8 +660,6 @@ static int lsm6dsv16x_decoder_decode(const uint8_t *buffer, struct sensor_chan_s @@ -660,8 +660,6 @@ static int lsm6dsv16x_decoder_decode(const uint8_t *buffer, struct sensor_chan_s
if (header->is_fifo) {
return lsm6dsv16x_decode_fifo(buffer, chan_spec, fit, max_count, data_out);
} else {
return lsm6dsv16x_decode_sample(buffer, chan_spec, fit, max_count, data_out);
}
#endif

7
drivers/sensor/st/lsm6dsv16x/lsm6dsv16x_rtio_stream.c

@ -573,8 +573,9 @@ static void lsm6dsv16x_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe @@ -573,8 +573,9 @@ static void lsm6dsv16x_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe
return;
}
if (data_ready->opt == SENSOR_STREAM_DATA_NOP ||
data_ready->opt == SENSOR_STREAM_DATA_DROP) {
if (data_ready != NULL &&
(data_ready->opt == SENSOR_STREAM_DATA_NOP ||
data_ready->opt == SENSOR_STREAM_DATA_DROP)) {
uint8_t *buf;
uint32_t buf_len;
@ -604,6 +605,8 @@ static void lsm6dsv16x_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe @@ -604,6 +605,8 @@ static void lsm6dsv16x_read_status_cb(struct rtio *r, const struct rtio_sqe *sqe
if (!ON_I3C_BUS(config) || (I3C_INT_PIN(config))) {
gpio_pin_interrupt_configure_dt(irq_gpio, GPIO_INT_EDGE_TO_ACTIVE);
}
return;
}
/*

21
drivers/usb/udc/udc_dwc2.c

@ -1328,12 +1328,6 @@ static int dwc2_set_dedicated_fifo(const struct device *dev, @@ -1328,12 +1328,6 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
dwc2_unset_unused_fifo(dev);
}
if (priv->txf_set & ~BIT_MASK(ep_idx)) {
LOG_WRN("Some of the FIFOs higher than %u are set, %lx",
ep_idx, priv->txf_set & ~BIT_MASK(ep_idx));
return -EIO;
}
if ((ep_idx - 1) != 0U) {
txfaddr = dwc2_get_txfdep(dev, ep_idx - 2) +
dwc2_get_txfaddr(dev, ep_idx - 2);
@ -1342,8 +1336,21 @@ static int dwc2_set_dedicated_fifo(const struct device *dev, @@ -1342,8 +1336,21 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
MIN(UDC_DWC2_FIFO0_DEPTH, priv->max_txfifo_depth[0]);
}
if (priv->txf_set & BIT(ep_idx)) {
uint32_t curaddr;
curaddr = dwc2_get_txfaddr(dev, ep_idx - 1);
txfdep = dwc2_get_txfdep(dev, ep_idx - 1);
if (txfaddr != curaddr || reqdep > txfdep) {
LOG_ERR("FIFO%u cannot be reused, new addr 0x%04x depth %u",
ep_idx, txfaddr, reqdep);
return -ENOMEM;
}
} else {
txfdep = reqdep;
}
/* Make sure to not set TxFIFO greater than hardware allows */
txfdep = reqdep;
if (txfdep > priv->max_txfifo_depth[ep_idx]) {
return -ENOMEM;
}

2
soc/nordic/CMakeLists.txt

@ -47,4 +47,4 @@ endif() @@ -47,4 +47,4 @@ endif()
add_subdirectory(${SOC_SERIES})
add_subdirectory(common)
add_subdirectory(ironside)
add_subdirectory_ifdef(CONFIG_NRF_IRONSIDE ironside)

3
soc/nordic/ironside/CMakeLists.txt

@ -2,11 +2,8 @@ @@ -2,11 +2,8 @@
# SPDX-License-Identifier: Apache-2.0
zephyr_include_directories(include)
zephyr_library()
zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CALL call.c)
zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_BOOT_REPORT boot_report.c)
zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CPUCONF_SERVICE cpuconf.c)
zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_UPDATE_SERVICE update.c)

3
soc/nordic/nrf54h/soc.c

@ -22,7 +22,10 @@ @@ -22,7 +22,10 @@
#include <soc/nrfx_coredep.h>
#include <soc_lrcconf.h>
#include <dmm.h>
#if defined(CONFIG_SOC_NRF54H20_CPURAD_ENABLE)
#include <nrf_ironside/cpuconf.h>
#endif
LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);

2
west.yml

@ -310,7 +310,7 @@ manifest: @@ -310,7 +310,7 @@ manifest:
groups:
- crypto
- name: mcuboot
revision: 3430520d7080a8ac3e4b325cfde0ef18837209af
revision: 4eba8087fa606db801455f14d185255bc8c49467
path: bootloader/mcuboot
groups:
- bootloader

Loading…
Cancel
Save