From 31d583c713a5d5307ac2319f03ce753a234b6570 Mon Sep 17 00:00:00 2001 From: Nicolai Glud Date: Wed, 22 Sep 2021 18:39:49 +0200 Subject: [PATCH] boards: arm: imx rt: changes to flash driver Kconfig selecting flash driver is now a choice. Signed-off-by: Nicolai Glud --- boards/arm/mimxrt1020_evk/Kconfig.defconfig | 1 + boards/arm/mimxrt1024_evk/Kconfig.defconfig | 1 + boards/arm/mimxrt1050_evk/Kconfig.defconfig | 12 ++++++++++++ boards/arm/mimxrt1060_evk/Kconfig.defconfig | 10 ++++++++-- boards/arm/mimxrt1064_evk/Kconfig.defconfig | 1 + boards/arm/mimxrt685_evk/Kconfig.defconfig | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/boards/arm/mimxrt1020_evk/Kconfig.defconfig b/boards/arm/mimxrt1020_evk/Kconfig.defconfig index a877d43833b..90969f84e5e 100644 --- a/boards/arm/mimxrt1020_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1020_evk/Kconfig.defconfig @@ -20,6 +20,7 @@ config FLASH_MCUX_FLEXSPI_NOR config FLASH_MCUX_FLEXSPI_XIP default y if FLASH && BOARD_MIMXRT1020_EVK + depends on MEMC_MCUX_FLEXSPI if NETWORKING diff --git a/boards/arm/mimxrt1024_evk/Kconfig.defconfig b/boards/arm/mimxrt1024_evk/Kconfig.defconfig index 98e1d767469..1cb39eb00d1 100644 --- a/boards/arm/mimxrt1024_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1024_evk/Kconfig.defconfig @@ -17,6 +17,7 @@ config FLASH_MCUX_FLEXSPI_NOR config FLASH_MCUX_FLEXSPI_XIP default y if FLASH + depends on MEMC_MCUX_FLEXSPI if NETWORKING diff --git a/boards/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/arm/mimxrt1050_evk/Kconfig.defconfig index 7c11e898794..135e4a2f718 100644 --- a/boards/arm/mimxrt1050_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1050_evk/Kconfig.defconfig @@ -15,6 +15,18 @@ endchoice config DISK_DRIVER_SDMMC default y if DISK_DRIVERS +config FLASH_MCUX_FLEXSPI_HYPERFLASH + default y if FLASH && BOARD_MIMXRT1050_EVK + default n if FLASH && BOARD_MIMXRT1050_EVK_QSPI + +config FLASH_MCUX_FLEXSPI_NOR + default y if FLASH && BOARD_MIMXRT1050_EVK_QSPI + default n if FLASH && BOARD_MIMXRT1050_EVK + +config FLASH_MCUX_FLEXSPI_XIP + default y if FLASH + depends on MEMC_MCUX_FLEXSPI + config I2C default y if KSCAN diff --git a/boards/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/arm/mimxrt1060_evk/Kconfig.defconfig index 5e59aa575ea..83333fffec4 100644 --- a/boards/arm/mimxrt1060_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1060_evk/Kconfig.defconfig @@ -17,10 +17,16 @@ config DISK_DRIVER_SDMMC default y if DISK_DRIVERS config FLASH_MCUX_FLEXSPI_NOR - default y if FLASH && BOARD_MIMXRT1060_EVK + default y if BOARD_MIMXRT1060_EVK + default n if BOARD_MIMXRT1060_EVK_HYPERFLASH + +config FLASH_MCUX_FLEXSPI_HYPERFLASH + default y if BOARD_MIMXRT1060_EVK_HYPERFLASH + default n if BOARD_MIMXRT1060_EVK config FLASH_MCUX_FLEXSPI_XIP - default y if FLASH && BOARD_MIMXRT1060_EVK + default y if FLASH + depends on MEMC_MCUX_FLEXSPI config I2C default y if KSCAN diff --git a/boards/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/arm/mimxrt1064_evk/Kconfig.defconfig index 5f64fb0213d..27e0cc3b65f 100644 --- a/boards/arm/mimxrt1064_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt1064_evk/Kconfig.defconfig @@ -20,6 +20,7 @@ config FLASH_MCUX_FLEXSPI_NOR config FLASH_MCUX_FLEXSPI_XIP default y if FLASH + depends on MEMC_MCUX_FLEXSPI config I2C default y if KSCAN diff --git a/boards/arm/mimxrt685_evk/Kconfig.defconfig b/boards/arm/mimxrt685_evk/Kconfig.defconfig index 13b5e7e5323..81db4d2804f 100644 --- a/boards/arm/mimxrt685_evk/Kconfig.defconfig +++ b/boards/arm/mimxrt685_evk/Kconfig.defconfig @@ -19,6 +19,7 @@ config FLASH_MCUX_FLEXSPI_MX25UM51345G config FLASH_MCUX_FLEXSPI_XIP default y if FLASH + depends on MEMC_MCUX_FLEXSPI choice FLASH_MCUX_FLEXSPI_XIP_MEM_TARGET default FLASH_MCUX_FLEXSPI_XIP_MEM_SRAM