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

soc: nxp: convert iMX6 SoloX core to HWMv2 

Convert iMX6 SoloX core to HWMv2. This port currently only supports the
M4 core (as it did in HWMv1)

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

soc/soc_legacy/arm/nxp_imx/mcimx6x_m4/CMakeLists.txt→soc/nxp/imx/imx6sx/CMakeLists.txt

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

# Copyright (c) 2018, NXP

# Copyright 2018,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/mcimx6x_m4/Kconfig.series→soc/nxp/imx/imx6sx/Kconfig

+9 −8
Changes for soc/nxp/imx/imx6sx/Kconfig: 9 added lines, 8 removed lines.
Original line number Diff line number Diff line 
# i.MX 6SoloX M4 core series



# Copyright (c) 2018, NXP

# Copyright 2024 NXP

# SPDX-License-Identifier: Apache-2.0



config SOC_SERIES_IMX_6X_M4

	bool "i.MX 6SoloX M4 Core Series"

config SOC_SERIES_IMX6SX

	select ARM

	select CPU_CORTEX_M4

	select CPU_CORTEX_M_HAS_DWT

	select HAS_IMX_HAL

	select SOC_FAMILY_IMX

	select CPU_HAS_FPU

	select CPU_HAS_ARM_MPU

	select CLOCK_CONTROL

	help

	  Enable support for M4 core of i.MX 6SoloX MCU series
 


config SOC_MCIMX6X_M4

	select HAS_IMX_HAL

	select HAS_IMX_GPIO

	select HAS_IMX_EPIT

	select HAS_IMX_I2C

	select HAS_IMX_IOMUXC

soc/soc_legacy/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.series→soc/nxp/imx/imx6sx/Kconfig.defconfig

+5 −8
Changes for soc/nxp/imx/imx6sx/Kconfig.defconfig: 5 added lines, 8 removed lines.
Original line number Diff line number Diff line 
# i.MX 6SoloX M4 core series

# i.MX 6SoloX core series



# Copyright (c) 2018, NXP

# Copyright 2018,2024 NXP

# SPDX-License-Identifier: Apache-2.0



if SOC_SERIES_IMX_6X_M4



config SOC_SERIES

	default "mcimx6x_m4"

if SOC_SERIES_IMX6SX



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/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4"

rsource "Kconfig.defconfig.*"



endif # SOC_SERIES_IMX_6X_M4
 
endif # SOC_SERIES_IMX6SX

soc/soc_legacy/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4→soc/nxp/imx/imx6sx/Kconfig.defconfig.mcimx6x_m4

+1 −4
Changes for soc/nxp/imx/imx6sx/Kconfig.defconfig.mcimx6x_m4: 1 added line, 4 removed lines.
Original line number Diff line number Diff line 
# i.MX 6SoloX



# Copyright (c) 2018, NXP

# Copyright 2018,2024 NXP

# SPDX-License-Identifier: Apache-2.0



if SOC_MCIMX6X_M4



config SOC

	default "mcimx6x"



config FPU

	default y

soc/soc_legacy/arm/nxp_imx/mcimx6x_m4/Kconfig.soc→soc/nxp/imx/imx6sx/Kconfig.soc

+19 −21
Changes for soc/nxp/imx/imx6sx/Kconfig.soc: 19 added lines, 21 removed lines.
Original line number Diff line number Diff line 
# i.MX 6SoloX M4 core series

# i.MX 6SoloX core series



# Copyright (c) 2018, NXP

# Copyright 2018,2024 NXP

# SPDX-License-Identifier: Apache-2.0



choice

	prompt "i.MX 6SoloX Selection"

	depends on SOC_SERIES_IMX_6X_M4



config SOC_SERIES_IMX6SX

	bool

	select SOC_FAMILY_NXP_IMX



config SOC_MCIMX6X

	bool

	select SOC_SERIES_IMX6SX



config SOC_MCIMX6X_M4

	bool "SOC_MCIMX6X_M4"

	select HAS_IMX_HAL

	select HAS_IMX_GPIO

	select HAS_IMX_EPIT

	select HAS_IMX_I2C

	select HAS_IMX_IOMUXC

	select SOC_MCIMX6X

	bool

	help

	  NXP iMX6 SoloX M4 core



endchoice

config SOC_SERIES

	default "imx6sx" if SOC_SERIES_IMX6SX



if SOC_SERIES_IMX_6X_M4

config SOC

	default "mcimx6x" if SOC_MCIMX6X



config SOC_PART_NUMBER_MCIMX6X1EVK10AB

	bool
@@ -61,8 +66,7 @@ config SOC_PART_NUMBER_MCIMX6X4EVM10AB 
config SOC_PART_NUMBER_MCIMX6X4EVM10AC

	bool



config SOC_PART_NUMBER_IMX_6X_M4

	string

config SOC_PART_NUMBER

	default "MCIMX6X1EVK10AB" if SOC_PART_NUMBER_MCIMX6X1EVK10AB

	default "MCIMX6X1EVK10AC" if SOC_PART_NUMBER_MCIMX6X1EVK10AC

	default "MCIMX6X3EVK10AB" if SOC_PART_NUMBER_MCIMX6X3EVK10AB
@@ -77,9 +81,3 @@ config SOC_PART_NUMBER_IMX_6X_M4 
	default "MCIMX6X3EVN10AC" if SOC_PART_NUMBER_MCIMX6X3EVN10AC

	default "MCIMX6X4EVM10AB" if SOC_PART_NUMBER_MCIMX6X4EVM10AB

	default "MCIMX6X4EVM10AC" if SOC_PART_NUMBER_MCIMX6X4EVM10AC
 
	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_IMX_6X_M4

CRA Git | Maintained and supported by SUSTech CRA and CCSE