Commit fc835d89 authored by Daniel DeGrasse's avatar Daniel DeGrasse Committed by Jamie
Browse files

soc: nxp: convert iMX7 Dual core to HWMv2 

Convert iMX7 Dual core to HWMv2. As in HWMv1, Only M4 core is supported
by this port.

Signed-off-by: default avatarDaniel DeGrasse <daniel.degrasse@nxp.com>
parent 29ef2f23

soc/soc_legacy/arm/nxp_imx/mcimx7_m4/CMakeLists.txt→soc/nxp/imx/imx7d/CMakeLists.txt

+3 −1
Changes for soc/nxp/imx/imx7d/CMakeLists.txt: 3 added lines, 1 removed line.
Original line number Diff line number Diff line 
#

# Copyright (c) 2017, NXP

# Copyright 2017,2024 NXP

#

# SPDX-License-Identifier: Apache-2.0

#
@@ -9,4 +9,6 @@ zephyr_sources( 
  soc_clk_freq.c

  )



zephyr_include_directories(.)



set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

soc/soc_legacy/arm/nxp_imx/mcimx7_m4/Kconfig.series→soc/nxp/imx/imx7d/Kconfig

+8 −8
Changes for soc/nxp/imx/imx7d/Kconfig: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line 
# iMX7 M4 core series



# Copyright (c) 2017, NXP

# Copyright 2024 NXP

# SPDX-License-Identifier: Apache-2.0



config SOC_SERIES_IMX7_M4

	bool "i.MX7 M4 Core Series"

config SOC_SERIES_IMX7D

	select ARM

	select CPU_CORTEX_M4

	select CPU_CORTEX_M_HAS_DWT

	select SOC_FAMILY_IMX

	select CLOCK_CONTROL

	select CPU_HAS_FPU

	select CPU_HAS_ARM_MPU

	help

	  Enable support for i.MX7 M4 MCU series
 


config SOC_MCIMX7D_M4

	select HAS_IMX_HAL

	select HAS_IMX_GPIO

	select HAS_IMX_I2C

	select HAS_IMX_IOMUXC

soc/soc_legacy/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.series→soc/nxp/imx/imx7d/Kconfig.defconfig

+5 −8
Changes for soc/nxp/imx/imx7d/Kconfig.defconfig: 5 added lines, 8 removed lines.
Original line number Diff line number Diff line 
# iMX7 M4 core series

# iMX7 core series



# Copyright (c) 2017, NXP

# Copyright 2017,2024 NXP

# SPDX-License-Identifier: Apache-2.0



if SOC_SERIES_IMX7_M4



config SOC_SERIES

	default "mcimx7_m4"

if SOC_SERIES_IMX7D



config NUM_IRQS

	# must be >= the highest interrupt number used
@@ -16,6 +13,6 @@ config PINCTRL_IMX 
	default y if HAS_IMX_IOMUXC

	depends on PINCTRL



source "soc/soc_legacy/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4"

rsource "Kconfig.defconfig.*"



endif # SOC_SERIES_IMX7_M4
 
endif # SOC_SERIES_IMX7D

soc/soc_legacy/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4→soc/nxp/imx/imx7d/Kconfig.defconfig.mcimx7d_m4

+3 −6
Changes for soc/nxp/imx/imx7d/Kconfig.defconfig.mcimx7d_m4: 3 added lines, 6 removed lines.
Original line number Diff line number Diff line 
# iMX7 M4 core series



# Copyright (c) 2017, NXP

# Copyright 2017,2024 NXP

# SPDX-License-Identifier: Apache-2.0



if SOC_MCIMX7_M4



config SOC

	default "mcimx7d"

if SOC_MCIMX7D_M4



config SYS_CLOCK_HW_CYCLES_PER_SEC

	default 200000000
@@ -14,4 +11,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC 
config GPIO

	default y



endif # SOC_MCIMX7_M4
 
endif # SOC_MCIMX7D_M4

soc/soc_legacy/arm/nxp_imx/mcimx7_m4/Kconfig.soc→soc/nxp/imx/imx7d/Kconfig.soc

+21 −21
Changes for soc/nxp/imx/imx7d/Kconfig.soc: 21 added lines, 21 removed lines.
Original line number Diff line number Diff line 
# iMX7 M4 core series

# iMX7D core series



# Copyright (c) 2017, NXP

# Copyright 2017,2024 NXP

# SPDX-License-Identifier: Apache-2.0



choice

	prompt "i.MX7 M4 Selection"

	depends on SOC_SERIES_IMX7_M4

config SOC_SERIES_IMX7D

	bool

	select SOC_FAMILY_NXP_IMX

	help

	  Enable support for iMX7D MCU series



config SOC_MCIMX7D

	bool

	select SOC_SERIES_IMX7D



config SOC_MCIMX7_M4

	bool "SOC_MCIMX7_M4"

	select HAS_IMX_HAL

	select HAS_IMX_GPIO

	select HAS_IMX_I2C

	select HAS_IMX_IOMUXC

config SOC_MCIMX7D_M4

	bool

	select SOC_MCIMX7D

	help

	  NXP iMX7 Dual M4 Core



endchoice

config SOC_SERIES

	default "imx7d" if SOC_SERIES_IMX7D



if SOC_MCIMX7_M4

config SOC

	default "mcimx7d" if SOC_MCIMX7D



config SOC_PART_NUMBER_MCIMX7D7DVM10SC

	bool
@@ -27,14 +34,7 @@ config SOC_PART_NUMBER_MCIMX7D5EVM10SC 
config SOC_PART_NUMBER_MCIMX7S3DVK08SA

	bool



config SOC_PART_NUMBER_IMX7_M4

	string

config SOC_PART_NUMBER

	default	"MCIMX7D7DVM10SC" if SOC_PART_NUMBER_MCIMX7D7DVM10SC

	default "MCIMX7D5EVM10SC" if SOC_PART_NUMBER_MCIMX7D5EVM10SC

	default "MCIMX7S3DVK08SA" if SOC_PART_NUMBER_MCIMX7S3DVK08SA
 
	help

	  This string holds the full part number of the SoC. It is a hidden option

	  that you should not set directly. The part number selection choice defines

	  the default value for this string.



endif # SOC_SERIES_IMX7_M4

CRA Git | Maintained and supported by SUSTech CRA and CCSE