patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

boards: nxp: Rename mimxrt685_evk to mimxrt685_evk_mimxrt685s_cm33

Browse source 
In preparation for adding AMP support for i.MX RT6xx family we need
to rename existing cm33 support files to more specific names.

e.g mimxrt685_evk.dts -> mimxrt685_evk_mimxrt685s_cm33.dts

This will allow us to later add support for Cadence DSP found on i.MX
RT6xx series.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
This commit is contained in:
Daniel Baluta 2024-04-01 13:49:14 +03:00 committed by Fabio Baltieri
parent 68a7057513
commit cffea52fa8
9 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boards/nxp/mimxrt685_evk/CMakeLists.txt
View file

@ -4,11 +4,13 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
if(CONFIG_BOARD_MIMXRT685_EVK_MIMXRT685S_CM33)
zephyr_library() zephyr_library()
zephyr_library_sources(init.c) zephyr_library_sources(init.c)
endif()
if(CONFIG_NXP_IMXRT_BOOT_HEADER) if(CONFIG_NXP_IMXRT_BOOT_HEADER)
if(NOT DEFINED CONFIG_BOARD_MIMXRT685_EVK) if(NOT DEFINED CONFIG_BOARD_MIMXRT685_EVK_MIMXRT685S_CM33)
message(WARNING "It appears you are using the board definition for " message(WARNING "It appears you are using the board definition for "
"the MIMXRT685-EVK, but targeting a custom board. You may need to " "the MIMXRT685-EVK, but targeting a custom board. You may need to "
"update your flash configuration block data") "update your flash configuration block data")

4
boards/nxp/mimxrt685_evk/Kconfig.defconfig
View file

@ -3,7 +3,7 @@
# Copyright 2020, 2024 NXP # Copyright 2020, 2024 NXP
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if BOARD_MIMXRT685_EVK if BOARD_MIMXRT685_EVK_MIMXRT685S_CM33
config NXP_IMXRT_BOOT_HEADER config NXP_IMXRT_BOOT_HEADER
default y if !BOOTLOADER_MCUBOOT default y if !BOOTLOADER_MCUBOOT
@ -26,4 +26,4 @@ config FXOS8700_DRDY_INT1
default y default y
depends on FXOS8700_TRIGGER depends on FXOS8700_TRIGGER
endif # BOARD_MIMXRT685_EVK endif # BOARD_MIMXRT685_EVK_MIMXRT685S_CM33

1
boards/nxp/mimxrt685_evk/Kconfig.mimxrt685_evk
View file

@ -3,3 +3,4 @@
config BOARD_MIMXRT685_EVK config BOARD_MIMXRT685_EVK
select SOC_PART_NUMBER_MIMXRT685SFVKB select SOC_PART_NUMBER_MIMXRT685SFVKB
select SOC_MIMXRT685S_CM33 if BOARD_MIMXRT685_EVK_MIMXRT685S_CM33

0
boards/nxp/mimxrt685_evk/mimxrt685_evk.dts → boards/nxp/mimxrt685_evk/mimxrt685_evk_mimxrt685s_cm33.dts
View file

0
boards/nxp/mimxrt685_evk/mimxrt685_evk.yaml → boards/nxp/mimxrt685_evk/mimxrt685_evk_mimxrt685s_cm33.yaml
View file

0
boards/nxp/mimxrt685_evk/mimxrt685_evk_defconfig → boards/nxp/mimxrt685_evk/mimxrt685_evk_mimxrt685s_cm33_defconfig
View file

2
soc/nxp/imxrt/imxrt6xx/Kconfig
View file

@ -1,7 +1,7 @@
# Copyright 2020, 2024 NXP # Copyright 2020, 2024 NXP
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_IMXRT6XX config SOC_MIMXRT685S_CM33
select ARM select ARM
select CPU_CORTEX_M33 select CPU_CORTEX_M33
select CPU_CORTEX_M_HAS_DWT select CPU_CORTEX_M_HAS_DWT

6
soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig
View file

@ -15,6 +15,10 @@ config SOC_SERIES_IMXRT_6XX
bool bool
default y default y
endif # SOC_SERIES_MIMXRT6XX
if SOC_MIMXRT685S_CM33
config ROM_START_OFFSET config ROM_START_OFFSET
default 0x1200 if NXP_IMXRT_BOOT_HEADER default 0x1200 if NXP_IMXRT_BOOT_HEADER
@ -110,4 +114,4 @@ choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_LPCIP3511 default USB_DC_NXP_LPCIP3511
endchoice endchoice
endif # SOC_SERIES_MIMXRT6XX endif # SOC_MIMXRT685S_CM33

6
soc/nxp/imxrt/imxrt6xx/Kconfig.soc
View file

@ -8,10 +8,14 @@ config SOC_SERIES_IMXRT6XX
config SOC_SERIES config SOC_SERIES
default "imxrt6xx" if SOC_SERIES_IMXRT6XX default "imxrt6xx" if SOC_SERIES_IMXRT6XX
config SOC_MIMXRT685S_CM33 config SOC_MIMXRT685S
bool bool
select SOC_SERIES_IMXRT6XX select SOC_SERIES_IMXRT6XX
config SOC_MIMXRT685S_CM33
bool
select SOC_MIMXRT685S
config SOC config SOC
default "mimxrt685s" if SOC_MIMXRT685S_CM33 default "mimxrt685s" if SOC_MIMXRT685S_CM33