michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: nxp: Consolidate ROM RAMLOADER config

Browse source 
Consolidate the ROM RAMLOADER config to be in one place,
add a new Kconfig file to be included by the SOCs with the feature.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-08-12 15:06:57 -05:00 • committed by Alberto Escolar
commit b00d881398
5 changed files with 25 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

21
soc/nxp/common/Kconfig.rom_loader Normal file
View file

@ -0,0 +1,21 @@
# Copyright 2024 NXP
# SPDX-License-Identifier: Apache-2.0
config NXP_FLEXSPI_ROM_RAMLOADER
bool "Create output image that NXP ROM can load from FlexSPI to ram"
select BUILD_OUTPUT_HEX
depends on !FLASH_MCUX_FLEXSPI_XIP
help
Builds an output image that the BootROM can load from the
FlexSPI boot device into RAM region. The image will be loaded
from FLEXSPI into the region specified by `zephyr,flash` node.
if NXP_FLEXSPI_ROM_RAMLOADER
FLASH_CHOSEN := zephyr,flash
FLASH_BASE := $(dt_chosen_reg_addr_hex,$(FLASH_CHOSEN))
FLEXSPI_BASE := $(dt_nodelabel_reg_addr_hex,flexspi,1)
config BUILD_OUTPUT_ADJUST_LMA
default "$(FLEXSPI_BASE) - $(FLASH_BASE)"
endif # NXP_FLEXSPI_ROM_RAMLOADER

19
soc/nxp/imxrt/Kconfig
View file

@ -25,6 +25,8 @@ config NXP_IMXRT_BOOT_HEADER
if NXP_IMXRT_BOOT_HEADER if NXP_IMXRT_BOOT_HEADER
rsource "../common/Kconfig.rom_loader"
choice BOOT_DEVICE choice BOOT_DEVICE
prompt "Boot device" prompt "Boot device"
default BOOT_FLEXSPI_NOR default BOOT_FLEXSPI_NOR
@ -103,23 +105,6 @@ config NXP_IMX_EXTERNAL_SDRAM
an MPU region will be defined to disable cached access to the an MPU region will be defined to disable cached access to the
SDRAM memory space. SDRAM memory space.
config NXP_IMX_RT_ROM_RAMLOADER
depends on !FLASH_MCUX_FLEXSPI_XIP && NXP_IMXRT_BOOT_HEADER
# Required so that debugger will load image to correct offset
select BUILD_OUTPUT_HEX
bool "Create output image that IMX RT ROM can load from FlexSPI to ram"
help
Builds an output image that the IMX RT BootROM can load from the
FlexSPI boot device into RAM region. The image will be loaded
from FLEXSPI into the region specified by `zephyr,flash` node.
# Setup LMA adjustment if using the RAMLOADER feature of ROM
FLASH_CHOSEN := zephyr,flash
FLASH_BASE := $(dt_chosen_reg_addr_hex,$(FLASH_CHOSEN))
FLEXSPI_BASE := $(dt_node_reg_addr_hex,/soc/spi@402a8000,1)
config BUILD_OUTPUT_ADJUST_LMA
default "$(FLEXSPI_BASE) - $(FLASH_BASE)" if NXP_IMX_RT_ROM_RAMLOADER
config SECOND_CORE_MCUX config SECOND_CORE_MCUX
bool "Dual core operation on the RT11xx series" bool "Dual core operation on the RT11xx series"
depends on SOC_SERIES_IMXRT11XX depends on SOC_SERIES_IMXRT11XX

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

@ -28,13 +28,6 @@ config NUM_IRQS
config ZTEST_NO_YIELD config ZTEST_NO_YIELD
default y if (ZTEST && PM) default y if (ZTEST && PM)
# Setup LMA adjustment if using the RAMLOADER feature of ROM
FLASH_CHOSEN := zephyr,flash
FLASH_BASE := $(dt_chosen_reg_addr_hex,$(FLASH_CHOSEN))
FLEXSPI_BASE := $(dt_node_reg_addr_hex,/soc/spi@134000,1)
config BUILD_OUTPUT_ADJUST_LMA
default "$(FLEXSPI_BASE) - $(FLASH_BASE)" if NXP_IMX_RT_ROM_RAMLOADER
# #
# MBEDTLS is larger but much faster than TinyCrypt so choose wisely # MBEDTLS is larger but much faster than TinyCrypt so choose wisely
# #

12
soc/nxp/rw/Kconfig
View file

@ -29,6 +29,8 @@ menuconfig NXP_RW6XX_BOOT_HEADER
if NXP_RW6XX_BOOT_HEADER if NXP_RW6XX_BOOT_HEADER
rsource "../common/Kconfig.rom_loader"
config FLASH_CONFIG_OFFSET config FLASH_CONFIG_OFFSET
hex "Flash config data offset" hex "Flash config data offset"
default 0x400 default 0x400
@ -49,14 +51,4 @@ endif # NXP_RW6XX_BOOT_HEADER
rsource "../common/Kconfig.flexspi_xip" rsource "../common/Kconfig.flexspi_xip"
config NXP_RW_ROM_RAMLOADER
depends on !FLASH_MCUX_FLEXSPI_XIP
# Required so that debugger will load image to correct offset
select BUILD_OUTPUT_HEX
bool "Create output image that RW ROM can load from FlexSPI to ram"
help
Builds an output image that the RW BootROM can load from the
FlexSPI boot device into RAM region. The image will be loaded
from FLEXSPI into the region specified by `zephyr,flash` node.
endif # SOC_SERIES_RW6XX endif # SOC_SERIES_RW6XX

15
soc/nxp/rw/Kconfig.defconfig
View file

@ -23,21 +23,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
endif # CORTEX_M_SYSTICK endif # CORTEX_M_SYSTICK
# The base address is determined from the zephyr,flash node with the following
# precedence:
# FlexSPI base address (if flash node is on a FlexSPI bus)
# node reg property (used for memory regions such as SRAM)
if NXP_RW_ROM_RAMLOADER
DT_CHOSEN_Z_FLASH := zephyr,flash
FLASH_BASE := $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
FLEXSPI_BASE := $(dt_node_reg_addr_hex,/soc/spi@134000,1)
config BUILD_OUTPUT_ADJUST_LMA
default "$(FLEXSPI_BASE) - $(FLASH_BASE)"
endif # NXP_RW_ROM_RAMLOADER
if BT if BT
config FLASH config FLASH