Skip to content

Commit 4f5cf51

Browse files
SuperHeroAbnerdkalowsk
authored andcommitted
soc: Update code to get flash size from dts
Update the Kconfig to parse the dts. Signed-off-by: Ruijia Wang <[email protected]>
1 parent 9560a96 commit 4f5cf51

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

soc/nxp/common/Kconfig.xspi_xip

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
# Copyright 2024 NXP
1+
# Copyright 2024-2025 NXP
22
# SPDX-License-Identifier: Apache-2.0
33

44
DT_CHOSEN_Z_FLASH := zephyr,flash
55
DT_COMPAT_XSPI := nxp,xspi
66

77
DT_CHOSEN_FLASH_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_FLASH))
8-
DT_CHOSEN_FLASH_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE))
8+
DT_CHOSEN_FLASH_CTRL := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE))
9+
DT_CHOSEN_FLASH_CTRL_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_CTRL))
910

10-
DT_FLASH_PARENT_IS_XSPI := $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_XSPI))
11-
DT_FLASH_HAS_SIZE_PROP := $(dt_node_has_prop,$(DT_CHOSEN_FLASH_NODE),size)
11+
DT_FLASH_CTRL_PARENT_IS_XSPI := $(dt_node_has_compat,$(DT_CHOSEN_FLASH_CTRL_PARENT),$(DT_COMPAT_XSPI))
12+
DT_FLASH_CTRL_HAS_SIZE_PROP := $(dt_node_has_prop,$(DT_CHOSEN_FLASH_CTRL),size)
1213

1314
config FLASH_BASE_ADDRESS
14-
default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),1) \
15-
if $(DT_FLASH_PARENT_IS_XSPI)
15+
default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_CTRL_PARENT),1) \
16+
if $(DT_FLASH_CTRL_PARENT_IS_XSPI)
1617
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
1718

1819
config FLASH_SIZE
19-
default $(dt_node_int_prop_int,$(DT_CHOSEN_FLASH_NODE),size,Kb)
20+
default $(dt_node_int_prop_int,$(DT_CHOSEN_FLASH_CTRL),size,K) \
21+
if $(DT_FLASH_CTRL_HAS_SIZE_PROP)
22+
default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
2023

2124
config FLASH_MCUX_XSPI_XIP
2225
bool
23-
default $(DT_FLASH_PARENT_IS_XSPI)
26+
default $(DT_FLASH_CTRL_PARENT_IS_XSPI)
2427
select XIP
2528
help
2629
Allows the soc to safely initialize the clocks for the

0 commit comments

Comments
 (0)