michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: imxrt118x: Cleaning up kconfigs

Browse source 
Moving RT118x kconfigs to series level instead of family level,
and cleaning up redundant declarations, and adding missing
HAS_MCUX_FLEXSPI selection.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-08-16 12:03:18 -05:00 • committed by Alberto Escolar
commit e2d3fe91fd
4 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
soc/nxp/imxrt/Kconfig
View file

@ -89,36 +89,14 @@ endchoice # BOOT_DEVICE
config FLEXSPI_CONFIG_BLOCK_OFFSET config FLEXSPI_CONFIG_BLOCK_OFFSET
hex "FlexSPI config block offset" hex "FlexSPI config block offset"
default 0x400 if SOC_SERIES_IMXRT5XX || SOC_SERIES_IMXRT6XX || SOC_MIMXRT1011
default 0x0 if BOOT_FLEXSPI_NOR default 0x0 if BOOT_FLEXSPI_NOR
default 0x400
help help
FlexSPI configuration block consists of parameters regarding specific FlexSPI configuration block consists of parameters regarding specific
flash devices including read command sequence, quad mode enablement flash devices including read command sequence, quad mode enablement
sequence (optional), etc. The boot ROM expects FlexSPI configuration sequence (optional), etc. The boot ROM expects FlexSPI configuration
parameter to be presented in serial nor flash. parameter to be presented in serial nor flash.
config IMAGE_CONTAINER_OFFSET
hex "Image container"
default 0x1000
depends on SOC_SERIES_IMXRT118X
help
Image container is a boot image format that is used by ROM. Container
format consists container header, image arrary entry, signature block
and user program images and data. The boot ROM expects container data
to be saved in external memory.
# Note- This config present the offest between container header and user
# image. If ROM_START_OFFSET changed, you also need to change CONTAINER_USER_IMAGE_OFFSET
# value. CONTAINER_USER_IMAGE_OFFSET = ROM_START_OFFSET - IMAGE_CONTAINER_OFFSET.
config CONTAINER_USER_IMAGE_OFFSET
hex "The offset between container header and user image"
default 0xA000
depends on SOC_SERIES_IMXRT118X
help
The offset between container and user image. IF change the user image
start address, please don't forget to modify CONTAINER_USER_IMAGE_OFFSET
value, this will make ROM could get the user image start address.
config IMAGE_VECTOR_TABLE_OFFSET config IMAGE_VECTOR_TABLE_OFFSET
hex "Image vector table offset" hex "Image vector table offset"
default 0x1000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR default 0x1000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR
@ -193,10 +171,6 @@ config SECOND_CORE_MCUX
generated header specifying the VMA and LMA of each memory section generated header specifying the VMA and LMA of each memory section
to load to load
config FLEXSPI_CONFIG_BLOCK_OFFSET
hex
default 0x400 if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX || SOC_SERIES_IMXRT118X
if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX || SOC_SERIES_IMXRT118X if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX || SOC_SERIES_IMXRT118X
config PM_MCUX_GPC config PM_MCUX_GPC

1
soc/nxp/imxrt/Kconfig.defconfig
View file

@ -15,7 +15,6 @@ config SERIAL_INIT_PRIORITY
config ROM_START_OFFSET config ROM_START_OFFSET
default 0x400 if BOOTLOADER_MCUBOOT default 0x400 if BOOTLOADER_MCUBOOT
default 0xb000 if BOOT_FLEXSPI_NOR && SOC_SERIES_IMXRT118X
default 0x2000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR default 0x2000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR
config PINCTRL_IMX config PINCTRL_IMX

21
soc/nxp/imxrt/imxrt118x/Kconfig
View file

@ -20,6 +20,7 @@ config SOC_SERIES_IMXRT118X
select CPU_HAS_FPU_DOUBLE_PRECISION if SOC_MIMXRT1189_CM7 select CPU_HAS_FPU_DOUBLE_PRECISION if SOC_MIMXRT1189_CM7
select HAS_MCUX_IOMUXC select HAS_MCUX_IOMUXC
select HAS_SWO select HAS_SWO
select HAS_MCUX_FLEXSPI
config SOC_MIMXRT1189_CM33 config SOC_MIMXRT1189_CM33
select CPU_CORTEX_M33 select CPU_CORTEX_M33
@ -29,6 +30,26 @@ config SOC_MIMXRT1189_CM7
if SOC_SERIES_IMXRT118X if SOC_SERIES_IMXRT118X
config IMAGE_CONTAINER_OFFSET
hex "Image container"
default 0x1000
help
Image container is a boot image format that is used by ROM. Container
format consists container header, image arrary entry, signature block
and user program images and data. The boot ROM expects container data
to be saved in external memory.
# Note- This config present the offest between container header and user
# image. If ROM_START_OFFSET changed, you also need to change CONTAINER_USER_IMAGE_OFFSET
# value. CONTAINER_USER_IMAGE_OFFSET = ROM_START_OFFSET - IMAGE_CONTAINER_OFFSET.
config CONTAINER_USER_IMAGE_OFFSET
hex "The offset between container header and user image"
default 0xA000
help
The offset between container and user image. IF change the user image
start address, please don't forget to modify CONTAINER_USER_IMAGE_OFFSET
value, this will make ROM could get the user image start address.
config MCUX_CORE_SUFFIX config MCUX_CORE_SUFFIX
default "_cm7" if SOC_MIMXRT1189_CM7 default "_cm7" if SOC_MIMXRT1189_CM7
default "_cm33" if SOC_MIMXRT1189_CM33 default "_cm33" if SOC_MIMXRT1189_CM33

11
soc/nxp/imxrt/imxrt118x/Kconfig.defconfig
View file

@ -23,12 +23,15 @@ config DCDC_VALUE
config FLEXSPI_CONFIG_BLOCK_OFFSET config FLEXSPI_CONFIG_BLOCK_OFFSET
default 0x400 if BOOT_FLEXSPI_NOR default 0x400 if BOOT_FLEXSPI_NOR
config ROM_START_OFFSET
default 0xb000 if BOOT_FLEXSPI_NOR
if SECOND_CORE_MCUX if SECOND_CORE_MCUX
# RT Boot header is only needed on primary core # RT Boot header is only needed on primary core
config NXP_IMXRT_BOOT_HEADER config NXP_IMXRT_BOOT_HEADER
default y depends on !CPU_CORTEX_M7
depends on !(CPU_CORTEX_M7 || BOOTLOADER_MCUBOOT)
endif endif # SECOND_CORE_MCUX
endif
endif # SOC_SERIES_IMXRT118X