michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests/boards/samples: fixup after sdmmc driver relocation

Browse source 
Fixup configuration.
Remove obsolete SDHC SPI configuration.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-02-24 00:31:55 +01:00 • committed by Carles Cufí
commit 5070186f63
23 changed files with 33 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/degu_evk/Kconfig.defconfig
View file

@ -36,7 +36,7 @@ config UART_SHELL_ON_DEV_NAME
endif # USB
if DISK_ACCESS_FLASH
if DISK_DRIVER_FLASH
config DISK_FLASH_DEV_NAME
default "NRF_FLASH_DRV_NAME"
@ -56,6 +56,6 @@ config DISK_FLASH_ERASE_ALIGNMENT
config DISK_VOLUME_SIZE
default 0x8000
endif # DISK_ACCESS_FLASH
endif # DISK_DRIVER_FLASH
endif # BOARD_DEGU_EVK

4
boards/nios2/altera_max10/Kconfig.defconfig
View file

@ -15,7 +15,7 @@ if SOC_FLASH_NIOS2_QSPI
config SOC_FLASH_NIOS2_QSPI_DEV_NAME
default "NIOS2_QSPI_FLASH"
if DISK_ACCESS_FLASH
if DISK_DRIVER_FLASH
config DISK_FLASH_DEV_NAME
default SOC_FLASH_NIOS2_QSPI_DEV_NAME
@ -35,7 +35,7 @@ config DISK_FLASH_ERASE_ALIGNMENT
config DISK_VOLUME_SIZE
default 0x4000000
endif # DISK_ACCESS_FLASH
endif # DISK_DRIVER_FLASH
endif # SOC_FLASH_NIOS2_QSPI

7
boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig
View file

@ -71,11 +71,4 @@ endif # LVGL
endif # DISPLAY
if DISK_ACCESS_SDHC
config DISK_ACCESS_SPI_SDHC
default y
endif # DISK_ACCESS_SDHC
endif # SHIELD_ADAFRUIT_2_8_TFT_TOUCH_V2

5
boards/shields/v2c_daplink/Kconfig.defconfig
View file

@ -10,10 +10,7 @@ if DISK_ACCESS
config SPI
default y
config DISK_ACCESS_SDHC
default y
config DISK_ACCESS_SPI_SDHC
config DISK_DRIVER_SDMMC
default y
endif # DISK_ACCESS

7
boards/shields/waveshare_epaper/Kconfig.defconfig
View file

@ -61,11 +61,4 @@ endif # LVGL
endif # DISPLAY
if DISK_ACCESS_SDHC
config DISK_ACCESS_SPI_SDHC
default y
endif # DISK_ACCESS_SDHC
endif # SHIELD_WAVESHARE_EPAPER_GDEH02

2
samples/subsys/fs/fat_fs/boards/mimxrt1050_evk.conf
View file

@ -1 +1 @@
CONFIG_DISK_ACCESS_SDHC=y
CONFIG_DISK_DRIVER_SDMMC=y

2
samples/subsys/fs/fat_fs/boards/mimxrt1060_evk.conf
View file

@ -1 +1 @@
CONFIG_DISK_ACCESS_SDHC=y
CONFIG_DISK_DRIVER_SDMMC=y

2
samples/subsys/fs/fat_fs/boards/mimxrt1064_evk.conf
View file

@ -1 +1 @@
CONFIG_DISK_ACCESS_SDHC=y
CONFIG_DISK_DRIVER_SDMMC=y

2
samples/subsys/fs/fat_fs/boards/mm_swiftio.conf
View file

@ -1 +1 @@
CONFIG_DISK_ACCESS_SDHC=y
CONFIG_DISK_DRIVER_SDMMC=y

3
samples/subsys/fs/fat_fs/boards/nrf52840_blip.conf
View file

@ -1,3 +1,2 @@
CONFIG_DISK_ACCESS_SDHC=y
CONFIG_DISK_ACCESS_SPI_SDHC=y
CONFIG_DISK_DRIVER_SDMMC=y
CONFIG_SPI=y

3
samples/subsys/fs/fat_fs/boards/olimexino_stm32.conf
View file

@ -1,3 +1,2 @@
CONFIG_DISK_ACCESS_SDHC=y
CONFIG_DISK_ACCESS_SPI_SDHC=y
CONFIG_DISK_DRIVER_SDMMC=y
CONFIG_SPI=y

2
samples/subsys/usb/cdc_acm/overlay-composite-cdc-msc.conf
View file

@ -7,4 +7,4 @@ CONFIG_USB_MASS_STORAGE=y
CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
#RAM DISK
CONFIG_DISK_ACCESS_RAM=y
CONFIG_DISK_DRIVER_RAM=y

2
samples/subsys/usb/mass/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(mass)
if((NOT CONFIG_DISK_ACCESS_FLASH) AND (NOT CONFIG_DISK_ACCESS_RAM))
if((NOT CONFIG_DISK_DRIVER_FLASH) AND (NOT CONFIG_DISK_DRIVER_RAM))
message( FATAL_ERROR "No disk access settings detected." )
endif()

16
samples/subsys/usb/mass/Kconfig
View file

@ -17,23 +17,23 @@ choice
config APP_MSC_STORAGE_NONE
bool "Use RAM disk as block device"
imply DISK_ACCESS_RAM
imply DISK_DRIVER_RAM
config APP_MSC_STORAGE_RAM
bool "Use RAM disk and FAT file system"
imply DISK_ACCESS_RAM
imply DISK_DRIVER_RAM
imply FILE_SYSTEM
imply FAT_FILESYSTEM_ELM
config APP_MSC_STORAGE_FLASH_FATFS
bool "Use FLASH disk and FAT file system"
imply DISK_ACCESS_FLASH
imply DISK_DRIVER_FLASH
imply FILE_SYSTEM
imply FAT_FILESYSTEM_ELM
config APP_MSC_STORAGE_FLASH_LITTLEFS
bool "Use FLASH disk and LittleFS"
imply DISK_ACCESS_FLASH
imply DISK_DRIVER_FLASH
imply FILE_SYSTEM
imply FILE_SYSTEM_LITTLEFS
@ -43,10 +43,10 @@ config DISK_RAM_VOLUME_SIZE
default 32 if APP_MSC_STORAGE_NONE
config MASS_STORAGE_DISK_NAME
default "NAND" if DISK_ACCESS_FLASH
default "RAM" if DISK_ACCESS_RAM
default "NAND" if DISK_DRIVER_FLASH
default "RAM" if DISK_DRIVER_RAM
if DISK_ACCESS_FLASH
if DISK_DRIVER_FLASH
config FLASH_MAP
default y
@ -88,6 +88,6 @@ config DISK_ERASE_BLOCK_SIZE
endif # NORDIC_QSPI_NOR
endif # DISK_ACCESS_FLASH
endif # DISK_DRIVER_FLASH
source "Kconfig.zephyr"

8
samples/subsys/usb/mass/src/main.c
View file

@ -13,7 +13,7 @@
LOG_MODULE_REGISTER(main);
#if CONFIG_DISK_ACCESS_FLASH
#if CONFIG_DISK_DRIVER_FLASH
#include <storage/flash_map.h>
#endif
@ -31,7 +31,7 @@ static struct fs_mount_t fs_mnt;
static int setup_flash(struct fs_mount_t *mnt)
{
int rc = 0;
#if CONFIG_DISK_ACCESS_FLASH
#if CONFIG_DISK_DRIVER_FLASH
unsigned int id;
const struct flash_area *pfa;
@ -65,7 +65,7 @@ static int mount_app_fs(struct fs_mount_t *mnt)
mnt->type = FS_FATFS;
mnt->fs_data = &fat_fs;
if (IS_ENABLED(CONFIG_DISK_ACCESS_RAM)) {
if (IS_ENABLED(CONFIG_DISK_DRIVER_RAM)) {
mnt->mnt_point = "/RAM:";
} else {
mnt->mnt_point = "/NAND:";
@ -90,7 +90,7 @@ static void setup_disk(void)
fs_dir_t_init(&dir);
if (IS_ENABLED(CONFIG_DISK_ACCESS_FLASH)) {
if (IS_ENABLED(CONFIG_DISK_DRIVER_FLASH)) {
rc = setup_flash(mp);
if (rc < 0) {
LOG_ERR("Failed to setup flash area");

2
tests/posix/fs/prj.conf
View file

@ -1,7 +1,7 @@
CONFIG_FILE_SYSTEM=y
CONFIG_LOG=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_RAM=y
CONFIG_DISK_DRIVER_RAM=y
CONFIG_DISK_RAM_VOLUME_SIZE=80
CONFIG_POSIX_API=y
CONFIG_POSIX_FS=y

2
tests/subsys/fs/fat_fs_api/prj.conf
View file

@ -1,7 +1,7 @@
CONFIG_FILE_SYSTEM=y
CONFIG_LOG=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_FLASH=y
CONFIG_DISK_DRIVER_FLASH=y
CONFIG_SPI=y
CONFIG_GPIO=y
CONFIG_ZTEST=y

2
tests/subsys/fs/fat_fs_api/prj_lfn.conf
View file

@ -2,7 +2,7 @@ CONFIG_FILE_SYSTEM=y
CONFIG_LOG=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_FS_FATFS_LFN=y
CONFIG_DISK_ACCESS_FLASH=y
CONFIG_DISK_DRIVER_FLASH=y
CONFIG_DISK_FLASH_DEV_NAME="flash_ctrl"
CONFIG_DISK_FLASH_START=0
CONFIG_DISK_FLASH_MAX_RW_SIZE=256

2
tests/subsys/fs/fat_fs_api/prj_native_posix.conf
View file

@ -1,7 +1,7 @@
CONFIG_FILE_SYSTEM=y
CONFIG_LOG=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_FLASH=y
CONFIG_DISK_DRIVER_FLASH=y
CONFIG_DISK_FLASH_DEV_NAME="flash_ctrl"
CONFIG_DISK_FLASH_START=0
CONFIG_DISK_FLASH_MAX_RW_SIZE=256

2
tests/subsys/fs/fat_fs_api/prj_native_posix_64.conf
View file

@ -1,7 +1,7 @@
CONFIG_FILE_SYSTEM=y
CONFIG_LOG=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_FLASH=y
CONFIG_DISK_DRIVER_FLASH=y
CONFIG_DISK_FLASH_DEV_NAME="flash_ctrl"
CONFIG_DISK_FLASH_START=0
CONFIG_DISK_FLASH_MAX_RW_SIZE=256

2
tests/subsys/fs/fat_fs_dual_drive/prj.conf
View file

@ -3,5 +3,5 @@ CONFIG_LOG=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_FS_FATFS_NUM_FILES=8
CONFIG_FS_FATFS_NUM_DIRS=8
CONFIG_DISK_ACCESS_RAM=y
CONFIG_DISK_DRIVER_RAM=y
CONFIG_ZTEST=y

2
tests/subsys/fs/multi-fs/prj.conf
View file

@ -6,7 +6,7 @@ CONFIG_FILE_SYSTEM_LITTLEFS=y
CONFIG_LOG=y
CONFIG_FS_LITTLEFS_FC_HEAP_SIZE=16384
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_RAM=y
CONFIG_DISK_DRIVER_RAM=y
CONFIG_DISK_RAM_VOLUME_SIZE=80
CONFIG_TEST_FLASH_DRIVERS=y
CONFIG_HEAP_MEM_POOL_SIZE=4096

2
tests/subsys/fs/multi-fs/prj_fs_shell.conf
View file

@ -10,7 +10,7 @@ CONFIG_SHELL_BACKEND_DUMMY=y
CONFIG_SHELL_CMD_BUFF_SIZE=90
CONFIG_FILE_SYSTEM_SHELL=y
CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_RAM=y
CONFIG_DISK_DRIVER_RAM=y
CONFIG_DISK_RAM_VOLUME_SIZE=80
CONFIG_TEST_FLASH_DRIVERS=y
CONFIG_HEAP_MEM_POOL_SIZE=1024