Skip to content

Commit 48214e8

Browse files
decsnycarlescufi
authored andcommitted
soc: rt: Add flash chosen node functionality
Add functionality for changing the code location based on the flash chosen node for RT devices. Remove obsolete Kconfigs that used to be used to set the code location for RT devices. Signed-off-by: Declan Snyder <[email protected]>
1 parent 5704b83 commit 48214e8

File tree

1 file changed

+10
-61
lines changed

1 file changed

+10
-61
lines changed

soc/arm/nxp_imx/rt/Kconfig.defconfig.series

Lines changed: 10 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -75,73 +75,22 @@ config PM_MCUX_PMU
7575

7676
endif # SOC_SERIES_IMX_RT10XX && PM
7777

78-
if CODE_SEMC
78+
DT_CHOSEN_Z_FLASH := zephyr,flash
79+
DT_COMPAT_FLEXSPI := nxp,imx-flexspi
7980

80-
config FLASH_SIZE
81-
default $(dt_node_reg_size_int,/memory@80000000,0,K)
82-
83-
config FLASH_BASE_ADDRESS
84-
default $(dt_node_reg_addr_hex,/memory@80000000)
85-
86-
endif # CODE_SEMC
81+
DT_CHOSEN_FLASH_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_FLASH))
82+
DT_CHOSEN_FLASH_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE))
8783

88-
if CODE_ITCM
89-
90-
config FLASH_SIZE
91-
default $(dt_node_reg_size_int,/soc/flexram@40028000/itcm@0,0,K) if SOC_SERIES_IMX_RT11XX
92-
default $(dt_node_reg_size_int,/soc/flexram@400b0000/itcm@0,0,K) if SOC_SERIES_IMX_RT10XX
84+
DT_FLASH_PARENT_IS_FLEXSPI := $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_FLEXSPI))
85+
DT_FLASH_HAS_SIZE_PROP := $(dt_node_has_prop,$(DT_CHOSEN_FLASH_NODE),size)
9386

9487
config FLASH_BASE_ADDRESS
95-
default $(dt_node_reg_addr_hex,/soc/flexram@40028000/itcm@0) if SOC_SERIES_IMX_RT11XX
96-
default $(dt_node_reg_addr_hex,/soc/flexram@400b0000/itcm@0) if SOC_SERIES_IMX_RT10XX
97-
98-
endif # CODE_ITCM
99-
100-
if CODE_SRAM0
88+
default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),1) \
89+
if $(DT_FLASH_PARENT_IS_FLEXSPI)
10190

10291
config FLASH_SIZE
103-
default $(dt_node_reg_size_int,/soc/memory@1ffe0000,0,K)
104-
105-
config FLASH_BASE_ADDRESS
106-
default $(dt_node_reg_addr_hex,/soc/memory@1ffe0000)
107-
108-
endif # CODE_SRAM0
109-
110-
if CODE_OCRAM
111-
112-
config FLASH_SIZE
113-
default $(dt_node_reg_size_int,/soc/ocram@20200000,0,K)
114-
115-
config FLASH_BASE_ADDRESS
116-
default $(dt_node_reg_addr_hex,/soc/ocram@20200000)
117-
118-
endif # CODE_OCRAM
119-
120-
if CODE_FLEXSPI
121-
122-
config FLASH_SIZE
123-
default $(dt_node_reg_size_int,/soc/spi@400cc000,1,K) if SOC_SERIES_IMX_RT11XX
124-
default $(dt_node_reg_size_int,/soc/spi@400a0000,1,K) if SOC_MIMXRT1011
125-
default $(dt_node_reg_size_int,/soc/spi@402a8000,1,K) if SOC_SERIES_IMX_RT10XX
126-
127-
config FLASH_BASE_ADDRESS
128-
default $(dt_node_reg_addr_hex,/soc/spi@400cc000,1) if SOC_SERIES_IMX_RT11XX
129-
default $(dt_node_reg_addr_hex,/soc/spi@400a0000,1) if SOC_MIMXRT1011
130-
default $(dt_node_reg_addr_hex,/soc/spi@402a8000,1) if SOC_SERIES_IMX_RT10XX
131-
132-
endif # CODE_FLEXSPI
133-
134-
if CODE_FLEXSPI2
135-
136-
config FLASH_SIZE
137-
default $(dt_node_reg_size_int,/soc/spi@400d0000,1,K) if SOC_SERIES_IMX_RT11XX
138-
default $(dt_node_reg_size_int,/soc/spi@402a4000,1,K) if SOC_SERIES_IMX_RT10XX
139-
140-
config FLASH_BASE_ADDRESS
141-
default $(dt_node_reg_addr_hex,/soc/spi@400d0000,1) if SOC_SERIES_IMX_RT11XX
142-
default $(dt_node_reg_addr_hex,/soc/spi@402a4000,1) if SOC_SERIES_IMX_RT10XX
143-
144-
endif # CODE_FLEXSPI2
92+
default $(dt_node_int_prop_int,$(DT_CHOSEN_FLASH_NODE),size,Kb) \
93+
if $(DT_FLASH_HAS_SIZE_PROP)
14594

14695
choice USB_MCUX_CONTROLLER_TYPE
14796
default USB_DC_NXP_EHCI

0 commit comments

Comments
 (0)