adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

boards: mimxrt1050_evk: Switch to variants

Browse source 
Switch from using revisions for hyperflash/qspi to using variants, by
popular demand.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-10-07 10:57:44 -05:00 committed by Benjamin Cabé
parent 8d2a9b3fac
commit 0cdb35d978
34 changed files with 61 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boards/nxp/mimxrt1050_evk/Kconfig.defconfig
View file

@ -10,6 +10,7 @@ config DEVICE_CONFIGURATION_DATA
config NXP_IMX_EXTERNAL_SDRAM
default y
if NETWORKING
config NET_L2_ETHERNET

9
boards/nxp/mimxrt1050_evk/board.cmake
View file

@ -3,10 +3,17 @@
#
# SPDX-License-Identifier: Apache-2.0
#
if(NOT ("${BOARD_QUALIFIERS}" MATCHES "qspi"
OR "${BOARD_QUALIFIERS}" MATCHES "hyperflash"))
message(FATAL_ERROR "Please specify a board flash variant for the mimxrt1050_evk:\n"
"mimxrt1050_evk/mimxrt1052/qspi or mimxrt1050_evk/mimxrt1052/hyperflash\n")
endif()
board_runner_args(jlink "--device=MCIMXRT1052")
board_runner_args(linkserver "--device=MIMXRT1052xxxxB:EVKB-IMXRT1050")
if("${BOARD_REVISION}" STREQUAL "qspi")
if("${BOARD_QUALIFIERS}" MATCHES "qspi")
board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI")
board_runner_args(pyocd "--target=mimxrt1050_quadspi")
board_runner_args(linkserver "--override=/device/memory/3/flash-driver=MIMXRT1050_SFDP_QSPI.cfx")

9
boards/nxp/mimxrt1050_evk/board.yml
View file

@ -4,9 +4,6 @@ board:
vendor: nxp
socs:
- name: mimxrt1052
revision:
format: "custom"
default: "hyperflash"
revisions:
- name: "hyperflash"
- name: "qspi"
variants:
- name: hyperflash
- name: qspi

21
boards/nxp/mimxrt1050_evk/doc/index.rst
View file

@ -138,7 +138,7 @@ already supported, which can also be re-used on this mimxrt1050_evk board:
+-----------+------------+-------------------------------------+
The default configuration can be found in
:zephyr_file:`boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig`
:zephyr_file:`boards/nxp/mimxrt1050_evk/mimxrt1050_evk_hyperflash_defconfig`
Other hardware features are not currently supported by the port.
@ -298,6 +298,17 @@ The RT1050 SoC has two USB OTG (USBOTG) controllers that supports both
device and host functions through its micro USB connectors.
Only USB device function is supported in Zephyr at the moment.
Board Targets
*************
This board has two variants that can be targeted,
depending on which flash to set as ``zephyr,flash``:
* ``mimxrt1050_evk/mimxrt1052/hyperflash`` is the default variant for the out of box
setup of the board using hyperflash.
* ``mimxrt1050_evk/mimxrt1052/qspi`` is for a board that has been reworked to use the
qspi flash instead of hyperflash.
Programming and Debugging
*************************
@ -364,7 +375,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: mimxrt1050_evk
:board: mimxrt1050_evk//hyperflash
:goals: flash
Open a serial terminal, reset the board (press the SW4 button), and you should
@ -373,7 +384,7 @@ see the following message in the terminal:
.. code-block:: console
***** Booting Zephyr OS v1.14.0-rc1 *****
Hello World! mimxrt1050_evk
Hello World! mimxrt1050_evk//hyperflash
Debugging
=========
@ -382,7 +393,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: mimxrt1050_evk
:board: mimxrt1050_evk//hyperflash
:goals: debug
Open a serial terminal, step through the application in your debugger, and you
@ -391,7 +402,7 @@ should see the following message in the terminal:
.. code-block:: console
***** Booting Zephyr OS v1.14.0-rc1 *****
Hello World! mimxrt1050_evk
Hello World! mimxrt1050_evk//hyperflash
Troubleshooting
===============

0
boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts → boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi
View file

0
boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig → boards/nxp/mimxrt1050_evk/mimxrt1050_evk_hyperflash_defconfig
View file

2
boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay → boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.dts
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "mimxrt1050_evk.dtsi"
/ {
chosen {
zephyr,flash-controller = &s26ks512s0;

2
boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml
View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
identifier: mimxrt1050_evk
identifier: mimxrt1050_evk/mimxrt1052/hyperflash
name: NXP MIMXRT1050-EVK
type: mcu
arch: arm

2
boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay → boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.dts
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "mimxrt1050_evk.dtsi"
/ {
chosen {
zephyr,flash-controller = &is25wp064;

2
boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml
View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
identifier: mimxrt1050_evk@qspi
identifier: mimxrt1050_evk/mimxrt1052/qspi
name: NXP MIMXRT1050-EVK-QSPI
type: mcu
arch: arm

12
boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi_defconfig Normal file
View file

@ -0,0 +1,12 @@
#
# Copyright (c) 2017, NXP
#
# SPDX-License-Identifier: Apache-2.0
#
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_GPIO=y
CONFIG_ARM_MPU=y
CONFIG_HW_STACK_PROTECTION=y

7
boards/nxp/mimxrt1050_evk/revision.cmake
View file

@ -1,7 +0,0 @@
if (NOT DEFINED BOARD_REVISION)
set(BOARD_REVISION "hyperflash")
else ()
if (NOT (BOARD_REVISION STREQUAL "hyperflash") AND NOT (BOARD_REVISION STREQUAL "qspi"))
message(FATAL_ERROR "Invalid board revision, ${BOARD_REVISION}, valid revisions are: hyperflash, qspi")
endif()
endif()

2
samples/bluetooth/peripheral_ht/sample.yaml
View file

@ -16,7 +16,7 @@ tests:
harness: bluetooth
platform_allow:
- mimxrt1020_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- frdm_k64f
tags: bluetooth

0
samples/drivers/adc/adc_dt/boards/mimxrt1050_evk.overlay → samples/drivers/adc/adc_dt/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

2
samples/drivers/display/sample.yaml
View file

@ -62,7 +62,7 @@ tests:
platform_allow:
- mimxrt1064_evk
- mimxrt1060_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1040_evk
integration_platforms:
- mimxrt1040_evk

0
samples/drivers/led/led_strip/boards/mimxrt1050_evk.overlay → samples/drivers/led/led_strip/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

2
samples/drivers/led/led_strip/sample.yaml
View file

@ -8,4 +8,4 @@ tests:
harness_config:
fixture: fixture_led_strip
integration_platforms:
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash

0
samples/sensor/die_temp_polling/boards/mimxrt1050_evk.overlay → samples/sensor/die_temp_polling/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

0
samples/sensor/qdec/boards/mimxrt1050_evk.overlay → samples/sensor/qdec/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

4
samples/subsys/display/lvgl/sample.yaml
View file

@ -76,7 +76,7 @@ tests:
platform_allow:
- mimxrt1064_evk
- mimxrt1060_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1040_evk
integration_platforms:
- mimxrt1040_evk
@ -89,7 +89,7 @@ tests:
platform_allow:
- mimxrt1064_evk
- mimxrt1060_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1040_evk
integration_platforms:
- mimxrt1040_evk

4
samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
View file

@ -74,7 +74,7 @@ tests:
- mimxrt1020_evk
- mimxrt1024_evk
- mimxrt1040_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1062_fmurt6
- mimxrt1064_evk
@ -132,7 +132,7 @@ tests:
- mimxrt1020_evk
- mimxrt1024_evk
- mimxrt1040_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1062_fmurt6
- mimxrt1064_evk

2
samples/subsys/tracing/sample.yaml
View file

@ -24,7 +24,7 @@ tests:
sample.tracing.format.sysview:
platform_allow:
- nrf52840dk/nrf52840
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1064_evk
integration_platforms:
- nrf52840dk/nrf52840

7
samples/subsys/usb/dfu/sample.yaml
View file

@ -6,13 +6,12 @@ common:
arch_exclude: posix
platform_exclude:
- mimxrt1010_evk
- mimxrt1050_evk@qspi
- mimxrt1020_evk
- mimxrt1015_evk
- mimxrt1060_evk
- sam4l_ek
- mimxrt1050_evk
- mimxrt1060_evk@hyperflash
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1050_evk/mimxrt1052/qspi
- mimxrt1060_evk/mimxrt1062/hyperflash
- nucleo_f207zg
- teensy40
- teensy41

2
tests/boot/test_mcuboot/testcase.yaml
View file

@ -31,7 +31,7 @@ tests:
- mimxrt1020_evk
- mimxrt1024_evk
- mimxrt1040_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1062_fmurt6
- mimxrt1064_evk

0
tests/drivers/adc/adc_api/boards/mimxrt1050_evk.overlay → tests/drivers/adc/adc_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

2
tests/drivers/disk/disk_access/testcase.yaml
View file

@ -11,7 +11,7 @@ tests:
tags: mcux
integration_platforms:
- mimxrt1060_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1064_evk
drivers.disk.ram:
platform_allow: qemu_x86_64

0
tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk.overlay → tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

0
tests/drivers/dma/chan_link_transfer/boards/mimxrt1050_evk.overlay → tests/drivers/dma/chan_link_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

2
tests/drivers/dma/chan_link_transfer/testcase.yaml
View file

@ -9,7 +9,7 @@ tests:
- frdm_k64f
- mimxrt595_evk/mimxrt595s/cm33
- mimxrt1010_evk
- mimxrt1050_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1064_evk
- mimxrt1160_evk/mimxrt1166/cm7

0
tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk.overlay → tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

0
tests/drivers/gpio/gpio_basic_api/boards/mimxrt1050_evk.overlay → tests/drivers/gpio/gpio_basic_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

0
tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk.overlay → tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

0
tests/drivers/uart/uart_async_api/boards/mimxrt1050_evk.overlay → tests/drivers/uart/uart_async_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
View file

2
tests/drivers/watchdog/wdt_basic_api/testcase.yaml
View file

@ -126,5 +126,5 @@ tests:
- s32z2xxdc2/s32z270/rtu0
drivers.watchdog.mimxrt1050_evk_ti_tps382x:
filter: dt_compat_enabled("ti,tps382x")
platform_allow: mimxrt1050_evk
platform_allow: mimxrt1050_evk/mimxrt1052/hyperflash
extra_args: DTC_OVERLAY_FILE="boards/mimxrt1050_evk_ti_tps382x.overlay"