boards: mimxrt1060_evk: Convert to variants

Convert qspi and hyperflash to variants instead of revisions by popular
demand.

And convert evkb into a revision instead of a different board.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-10-07 12:35:09 -05:00 committed by Benjamin Cabé
parent 0cdb35d978
commit 8ed80ddb37
67 changed files with 91 additions and 74 deletions

View file

@ -12,7 +12,7 @@ endif()
if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(CONFIG_BOARD_MIMXRT1060_EVKB)
if(${BOARD_REVISION} STREQUAL "B")
set(FLASH_CONF evkbmimxrt1060_flexspi_nor_config.c)
set(BOARD_NAME evkbmimxrt1060)
elseif(CONFIG_DT_HAS_NXP_IMX_FLEXSPI_NOR_ENABLED)

View file

@ -3,7 +3,7 @@
# Copyright 2018,2023 NXP
# SPDX-License-Identifier: Apache-2.0
if BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB
if BOARD_MIMXRT1060_EVK
config DEVICE_CONFIGURATION_DATA
default y
@ -25,4 +25,4 @@ endif # ETH_MCUX
endif # NETWORKING
endif # BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB
endif # BOARD_MIMXRT1060_EVK

View file

@ -1,5 +0,0 @@
# Copyright 2024 NXP
# SPDX-License-Identifier: Apache-2.0
config BOARD_MIMXRT1060_EVKB
select SOC_PART_NUMBER_MIMXRT1062DVL6A

View file

@ -4,13 +4,19 @@
# 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 mimxrt1060_evk:\n"
"mimxrt1060_evk/mimxrt1062/qspi or mimxrt1060_evk/mimxrt1062/hyperflash\n")
endif()
board_runner_args(pyocd "--target=mimxrt1060")
board_runner_args(jlink "--device=MIMXRT1062xxx6A")
board_runner_args(linkserver "--device=MIMXRT1062xxxxA:EVK-MIMXRT1060")
if (("${BOARD_REVISION}" STREQUAL "qspi") OR CONFIG_BOARD_MIMXRT1060_EVKB)
if(("${BOARD_QUALIFIERS}" MATCHES "qspi") OR ("${BOARD_REVISION}" STREQUAL "B"))
board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI")
elseif ("${BOARD_REVISION}" STREQUAL "hyperflash")
elseif ("${BOARD_QUALIFIERS}" MATCHES "hyperflash")
board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=HyperFlash")
endif()

View file

@ -2,16 +2,14 @@ boards:
- name: mimxrt1060_evk
full_name: MIMXRT1060-EVK
vendor: nxp
socs:
- name: mimxrt1062
variants:
- name: "qspi"
- name: "hyperflash"
revision:
format: "custom"
default: "qspi"
format: "letter"
default: "A"
revisions:
- name: "qspi"
- name: "hyperflash"
socs:
- name: mimxrt1062
- name: mimxrt1060_evkb
full_name: MIMXRT1060-EVKB
vendor: nxp
socs:
- name: mimxrt1062
- name: "A"
- name: "B"

View file

@ -150,7 +150,7 @@ already supported, which can also be re-used on this mimxrt1060_evk board:
+-----------+------------+-------------------------------------+
The default configuration can be found in
:zephyr_file:`boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig`
:zephyr_file:`boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_defconfig`
Other hardware features are not currently supported by the port.
@ -316,6 +316,19 @@ The MIMXRT1060 SoC has eight UARTs. ``LPUART1`` is configured for the console,
``LPUART3`` for the Bluetooth Host Controller Interface (BT HCI), and the
remaining are not used.
Board Targets
*************
This board has two variants that can be targeted,
depending on which flash to set as ``zephyr,flash``:
* ``mimxrt1060_evk/mimxrt1062/qspi`` is the default variant for the out of box
setup of the board using the qspi flash.
* ``mimxrt1060_evk/mimxrt1062/hyperflash`` is for a board that has been reworked to use the
hyperflash instead of the qspi flash.
* This board also has two revisions, the EVKA and EVKB. EVKA is the default target for this board.
To target EVKB, the board target string would become ``mimxrt1060_evk@B//qspi``, for example.
Programming and Debugging
*************************
@ -376,7 +389,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: mimxrt1060_evk
:board: mimxrt1060_evk//qspi
:goals: flash
Open a serial terminal, reset the board (press the SW9 button), and you should
@ -385,7 +398,7 @@ see the following message in the terminal:
.. code-block:: console
***** Booting Zephyr OS v1.14.0-rc1 *****
Hello World! mimxrt1060_evk
Hello World! mimxrt1060_evk//qspi
Debugging
=========
@ -394,7 +407,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
.. zephyr-app-commands::
:zephyr-app: samples/hello_world
:board: mimxrt1060_evk
:board: mimxrt1060_evk//qspi
:goals: debug
Open a serial terminal, step through the application in your debugger, and you
@ -403,7 +416,7 @@ should see the following message in the terminal:
.. code-block:: console
***** Booting Zephyr OS v1.14.0-rc1 *****
Hello World! mimxrt1060_evk
Hello World! mimxrt1060_evk//qspi
Troubleshooting
===============

View file

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

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
identifier: mimxrt1060_evk@hyperflash
identifier: mimxrt1060_evk/mimxrt1062/hyperflash
name: NXP MIMXRT1060-EVK-HYPERFLASH
type: mcu
arch: arm

View file

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

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
identifier: mimxrt1060_evk
identifier: mimxrt1060_evk/mimxrt1062/qspi
name: NXP MIMXRT1060-EVK
type: mcu
arch: arm

View file

@ -4,9 +4,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include "mimxrt1060_evk.dts"
#include "mimxrt1060_evk_mimxrt1062_qspi.overlay"
/* FLEXPWM not routed to LED on this EVK */
&flexpwm2_pwm3 {
status = "disabled";

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
identifier: mimxrt1060_evkb
identifier: mimxrt1060_evk@B/mimxrt1062/qspi
name: NXP MIMXRT1060-EVKB
type: mcu
arch: arm

View file

@ -0,0 +1,12 @@
#
# Copyright (c) 2018, 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

View file

@ -1,9 +0,0 @@
if (NOT DEFINED BOARD_REVISION)
set(BOARD_REVISION "qspi")
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")
elseif (BOARD_REVISION STREQUAL "hyperflash" AND CONFIG_BOARD_MIMXRT1060_EVKB)
message(FATAL_ERROR "hyperflash not supported on RT1060 EVKB")
endif()
endif()

View file

@ -17,7 +17,7 @@ tests:
platform_allow:
- mimxrt1020_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- frdm_k64f
tags: bluetooth
extra_args: SHIELD=frdm_kw41z

View file

@ -6,7 +6,7 @@ tests:
sample.boards.mimxrt1060_evk.system_off:
build_only: true
platform_allow:
- mimxrt1060_evk
- mimxrt1060_evkb
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1060_evk@B/mimxrt1062/qspi
integration_platforms:
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi

View file

@ -61,7 +61,7 @@ tests:
sample.display.rk043fn02h_ct:
platform_allow:
- mimxrt1064_evk
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1040_evk
integration_platforms:

View file

@ -31,6 +31,6 @@ To build and flash the application:
.. zephyr-app-commands::
:zephyr-app: samples/drivers/i2s/output
:board: mimxrt1060_evkb
:board: mimxrt1060_evk@B
:goals: build flash
:compact:

View file

@ -75,7 +75,7 @@ tests:
samples.subsys.display.lvgl.rk043fn66hs_ctg:
platform_allow:
- mimxrt1064_evk
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1040_evk
integration_platforms:
@ -88,7 +88,7 @@ tests:
samples.subsys.display.lvgl.rk043fn02h_ct:
platform_allow:
- mimxrt1064_evk
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1040_evk
integration_platforms:

View file

@ -12,7 +12,7 @@ tests:
- particle_xenon
- disco_l475_iot1
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1064_evk
- qemu_x86
- native_sim

View file

@ -75,7 +75,7 @@ tests:
- mimxrt1024_evk
- mimxrt1040_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1062_fmurt6
- mimxrt1064_evk
- mimxrt1160_evk/mimxrt1166/cm7
@ -133,7 +133,7 @@ tests:
- mimxrt1024_evk
- mimxrt1040_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1062_fmurt6
- mimxrt1064_evk
- mimxrt1160_evk/mimxrt1166/cm7
@ -147,7 +147,7 @@ tests:
- mg100
integration_platforms:
- nrf52840dk/nrf52840
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1064_evk
sample.mcumgr.smp_svr.shell_mgmt:
extra_args: EXTRA_CONF_FILE="overlay-shell-mgmt.conf"

View file

@ -10,7 +10,7 @@ tests:
sample.filesystem.shell:
platform_allow:
- reel_board
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mr_canhubk3
- native_sim
integration_platforms:

View file

@ -21,7 +21,7 @@ tests:
- stm32f723e_disco
- nucleo_f413zh
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
harness: console
harness_config:
type: one_line

View file

@ -8,6 +8,7 @@ common:
- mimxrt1010_evk
- mimxrt1020_evk
- mimxrt1015_evk
- mimxrt1060_evk/mimxrt1062/qspi
- sam4l_ek
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1050_evk/mimxrt1052/qspi

View file

@ -13,7 +13,7 @@ common:
- stm32f723e_disco
- nucleo_f413zh
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
tests:
sample.usbd.hid-keyboard:
tags: usb

View file

@ -22,7 +22,7 @@ tests:
- stm32f723e_disco
- nucleo_f413zh
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
extra_args:
- CONF_FILE="usbd_next_prj.conf"
- EXTRA_DTC_OVERLAY_FILE="usbd_next.overlay"

View file

@ -29,7 +29,7 @@ tests:
- stm32f723e_disco
- nucleo_f413zh
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
extra_args:
- CONF_FILE="usbd_next_prj.conf"
- EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"

View file

@ -10,7 +10,7 @@ tests:
- nrf54h20dk/nrf54h20/cpuapp
- frdm_k64f
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
harness: keyboard
tags: usb
sample.usbh.shell:

View file

@ -11,5 +11,5 @@ tests:
- stm32f723e_disco
- nucleo_f413zh
- mimxrt685_evk/mimxrt685s/cm33
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
harness: TBD

View file

@ -8,7 +8,7 @@ tests:
extra_configs:
- CONFIG_RELOCATE_TO_ITCM=y
platform_allow:
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
application_development.code_relocation_kinetis:
filter: CONFIG_CPU_HAS_NXP_SYSMPU
arch_allow: arm

View file

@ -32,7 +32,7 @@ tests:
- mimxrt1024_evk
- mimxrt1040_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1062_fmurt6
- mimxrt1064_evk
- mimxrt1160_evk/mimxrt1166/cm7

View file

@ -10,7 +10,7 @@ tests:
- CONFIG_DISK_DRIVER_SDMMC=y
tags: mcux
integration_platforms:
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1064_evk
drivers.disk.ram:

View file

@ -10,7 +10,7 @@ tests:
- mimxrt595_evk/mimxrt595s/cm33
- mimxrt1010_evk
- mimxrt1050_evk/mimxrt1052/hyperflash
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1064_evk
- mimxrt1160_evk/mimxrt1166/cm7
- mimxrt1170_evk/mimxrt1176/cm7

View file

@ -8,7 +8,7 @@ tests:
- intel_adsp/cavs25
- frdm_k64f
- mimxrt1010_evk
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- lpcxpresso55s36
- native_sim
- native_sim/native/64

View file

@ -39,7 +39,7 @@ tests:
or dt_label_with_parent_compat_enabled("storage_partition", "nordic,owned-partitions")))
integration_platforms:
- qemu_x86
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
drivers.flash.common.no_explicit_erase:
platform_allow:
- nrf54l15dk/nrf54l05/cpuapp

View file

@ -56,8 +56,8 @@ tests:
- mimxrt595_evk/mimxrt595s/cm33
- mimxrt1020_evk
- mimxrt1040_evk
- mimxrt1060_evk
- mimxrt1060_evkb
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1060_evk@B/mimxrt1062/qspi
- lpcxpresso55s69/lpc55s69/cpu0
- lpcxpresso55s36
drivers.gpio.2pin_arduino_customized:
@ -70,8 +70,8 @@ tests:
- mimxrt595_evk/mimxrt595s/cm33
- mimxrt1020_evk
- mimxrt1040_evk
- mimxrt1060_evk
- mimxrt1060_evkb
- mimxrt1060_evk/mimxrt1062/qspi
- mimxrt1060_evk@B/mimxrt1062/qspi
- lpcxpresso55s69/lpc55s69/cpu0
- lpcxpresso55s36
- nucleo_wb09ke

View file

@ -42,7 +42,7 @@ tests:
- mimxrt1180_evk/mimxrt1189/cm33
- mimxrt1180_evk/mimxrt1189/cm7
- mimxrt1040_evk
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- frdm_ke17z512
- frdm_mcxn236
- frdm_mcxa156

View file

@ -10,9 +10,9 @@ tests:
- drv8424
platform_allow:
- nucleo_f767zi
- mimxrt1060_evkb
- mimxrt1060_evk@B/mimxrt1062/qspi
- native_sim
integration_platforms:
- nucleo_f767zi
- mimxrt1060_evkb
- mimxrt1060_evk@B/mimxrt1062/qspi
- native_sim

View file

@ -6,7 +6,7 @@ common:
- nrf52840dk/nrf52840
- native_sim
- native_sim/native/64
- mimxrt1060_evk
- mimxrt1060_evk/mimxrt1062/qspi
- mr_canhubk3
integration_platforms:
- nrf52840dk/nrf52840