Skip to content

Commit b70e761

Browse files
decsnyjhedberg
decsny
authored and
jhedberg
committed
modules: hal_nxp: Remove HAS_MCUX_FLEXSPI/SEMC
Remove these legacy kconfig, not necessary. The DT already has the bindings and nodes required to represent if there is a FlexSPI and/or SEMC. Signed-off-by: Declan Snyder <[email protected]>
1 parent 5e3a432 commit b70e761

File tree

8 files changed

+9
-28
lines changed

8 files changed

+9
-28
lines changed

‎drivers/flash/Kconfig.mcux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ choice FLASH_LOG_LEVEL_CHOICE
117117
default FLASH_LOG_LEVEL_OFF if FLASH_MCUX_FLEXSPI_XIP
118118
endchoice
119119

120-
endif # HAS_MCUX_FLEXSPI
120+
endif # DT_HAS_NXP_IMX_FLEXSPI_ENABLED

‎modules/hal_nxp/mcux/Kconfig.mcux

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ config HAS_MCUX_CACHE
2323
help
2424
Set if the L1 or L2 cache is present in the SoC.
2525

26-
config HAS_MCUX_FLEXSPI
27-
bool
28-
help
29-
Set if the flexible SPI (FlexSPI) module is present in the SoC.
30-
31-
config HAS_MCUX_SEMC
32-
bool
33-
help
34-
Set if the smart external memory controller (SEMC) module is present
35-
in the SoC.
36-
3726
config HAS_MCUX_SIM
3827
bool
3928
help

‎soc/nxp/imxrt/Kconfig

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,25 @@ config BOOT_XSPI_NOR
4242
bool "XPI serial NOR"
4343
depends on DT_HAS_NXP_XSPI_ENABLED
4444

45+
FLEXSPI_COMPAT := nxp,imx-flexspi
46+
4547
config BOOT_FLEXSPI_NOR
4648
bool "FlexSPI serial NOR"
47-
depends on HAS_MCUX_FLEXSPI
49+
depends on $(dt_has_compat,$(FLEXSPI_COMPAT))
4850

4951
config BOOT_FLEXSPI_NAND
5052
bool "FlexSPI serial NAND"
51-
depends on HAS_MCUX_FLEXSPI
53+
depends on $(dt_has_compat,$(FLEXSPI_COMPAT))
54+
55+
SEMC_COMPAT := nxp,imx-semc
5256

5357
config BOOT_SEMC_NOR
5458
bool "SEMC parallel NOR"
55-
depends on HAS_MCUX_SEMC
59+
depends on $(dt_has_compat, $(SEMC_COMPAT))
5660

5761
config BOOT_SEMC_NAND
5862
bool "SEMC parallel NAND"
59-
depends on HAS_MCUX_SEMC
63+
depends on $(dt_has_compat, $(SEMC_COMPAT))
6064

6165
endchoice # BOOT_DEVICE
6266

‎soc/nxp/imxrt/imxrt10xx/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ config SOC_SERIES_IMXRT10XX
1111
select CLOCK_CONTROL
1212
select HAS_MCUX
1313
select HAS_MCUX_CACHE
14-
select HAS_MCUX_FLEXSPI
1514
select HAS_SWO
1615
select HAS_PM
1716
select SOC_RESET_HOOK
@@ -29,35 +28,29 @@ config SOC_MIMXRT1015
2928
select CPU_HAS_ARM_MPU
3029

3130
config SOC_MIMXRT1021
32-
select HAS_MCUX_SEMC
3331
select CPU_HAS_FPU_DOUBLE_PRECISION
3432
select CPU_HAS_ARM_MPU
3533

3634
config SOC_MIMXRT1024
37-
select HAS_MCUX_SEMC
3835
select CPU_HAS_FPU_DOUBLE_PRECISION
3936
select CPU_HAS_ARM_MPU
4037
select HAS_MCUX_SRC
4138

4239
config SOC_MIMXRT1042
43-
select HAS_MCUX_SEMC
4440
select CPU_HAS_FPU_DOUBLE_PRECISION
4541
select CPU_HAS_ARM_MPU
4642

4743
config SOC_MIMXRT1052
48-
select HAS_MCUX_SEMC
4944
select CPU_HAS_FPU_DOUBLE_PRECISION
5045
select CPU_HAS_ARM_MPU
5146
select HAS_MCUX_SRC
5247

5348
config SOC_MIMXRT1062
54-
select HAS_MCUX_SEMC
5549
select CPU_HAS_FPU_DOUBLE_PRECISION
5650
select CPU_HAS_ARM_MPU
5751
select HAS_MCUX_SRC
5852

5953
config SOC_MIMXRT1064
60-
select HAS_MCUX_SEMC
6154
select HAS_MCUX_SRC
6255
select CPU_HAS_FPU_DOUBLE_PRECISION
6356
select CPU_HAS_ARM_MPU

‎soc/nxp/imxrt/imxrt118x/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ config SOC_SERIES_IMXRT118X
2020
select CPU_HAS_FPU
2121
select CPU_HAS_FPU_DOUBLE_PRECISION if SOC_MIMXRT1189_CM7
2222
select HAS_SWO
23-
select HAS_MCUX_FLEXSPI
2423
select SOC_EARLY_INIT_HOOK
2524

2625
config SOC_MIMXRT1189_CM33

‎soc/nxp/imxrt/imxrt11xx/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ config SOC_SERIES_IMXRT11XX
99
select CLOCK_CONTROL
1010
select HAS_MCUX_CACHE
1111
select HAS_MCUX
12-
select HAS_MCUX_SEMC
13-
select HAS_MCUX_FLEXSPI
1412
select CPU_HAS_ARM_MPU
1513
select CPU_HAS_ICACHE if CPU_CORTEX_M7
1614
select CPU_HAS_DCACHE if CPU_CORTEX_M7

‎soc/nxp/imxrt/imxrt5xx/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ config SOC_MIMXRT595S_CM33
1717
select ARM_TRUSTZONE_M
1818
select CPU_CORTEX_M_HAS_SYSTICK
1919
select HAS_MCUX
20-
select HAS_MCUX_FLEXSPI
2120
select HAS_MCUX_CACHE
2221
select SOC_EARLY_INIT_HOOK
2322

‎soc/nxp/imxrt/imxrt6xx/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ config SOC_MIMXRT685S_CM33
1515
select ARM_TRUSTZONE_M
1616
select CPU_CORTEX_M_HAS_SYSTICK
1717
select HAS_MCUX
18-
select HAS_MCUX_FLEXSPI
1918
select HAS_MCUX_CACHE
2019
select INIT_SYS_PLL
2120
select SOC_EARLY_INIT_HOOK

0 commit comments

Comments
 (0)