Skip to content

Commit b26fca4

Browse files
jfischer-nocarlescufi
authored andcommitted
drivers: flashdisk: remove all DISK_FLASH* Kconfig options
Remove all obsolete DISK_FLASH* Kconfig options. Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no> Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no>
1 parent 050e74e commit b26fca4

File tree

7 files changed

+0
-123
lines changed

7 files changed

+0
-123
lines changed

boards/arm/degu_evk/Kconfig.defconfig

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,4 @@ config UART_LINE_CTRL
2121

2222
endif # USB_DEVICE_STACK
2323

24-
if DISK_DRIVER_FLASH
25-
26-
config DISK_FLASH_DEV_NAME
27-
default "NRF_FLASH_DRV_NAME"
28-
29-
config DISK_FLASH_START
30-
default 0xf8000
31-
32-
config DISK_FLASH_MAX_RW_SIZE
33-
default 4
34-
35-
config DISK_ERASE_BLOCK_SIZE
36-
default 0x1000
37-
38-
config DISK_FLASH_ERASE_ALIGNMENT
39-
default 0x1000
40-
41-
config DISK_VOLUME_SIZE
42-
default 0x8000
43-
44-
endif # DISK_DRIVER_FLASH
45-
4624
endif # BOARD_DEGU_EVK

boards/nios2/altera_max10/Kconfig.defconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,6 @@ if SOC_FLASH_NIOS2_QSPI
1414

1515
if DISK_DRIVER_FLASH
1616

17-
config DISK_FLASH_DEV_NAME
18-
default "n25q512ax3@0"
19-
20-
config DISK_FLASH_START
21-
default 0x0
22-
23-
config DISK_FLASH_MAX_RW_SIZE
24-
default 256
25-
26-
config DISK_ERASE_BLOCK_SIZE
27-
default 0x10000
28-
29-
config DISK_FLASH_ERASE_ALIGNMENT
30-
default 0x10000
31-
32-
config DISK_VOLUME_SIZE
33-
default 0x4000000
34-
3517
endif # DISK_DRIVER_FLASH
3618

3719
endif # SOC_FLASH_NIOS2_QSPI

drivers/disk/Kconfig.flash

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,52 +9,6 @@ config DISK_DRIVER_FLASH
99
Flash device is used for the file system.
1010

1111
if DISK_DRIVER_FLASH
12-
13-
config DISK_FLASH_VOLUME_NAME
14-
string "Flash mount point or drive name"
15-
default "NAND"
16-
help
17-
Disk name as per file system naming guidelines.
18-
19-
config DISK_FLASH_DEV_NAME
20-
string "Flash device name to be used as storage backend"
21-
22-
config DISK_FLASH_START
23-
hex "Flash device start address in hex"
24-
help
25-
This is start address of the flash to be used as storage backend.
26-
27-
config DISK_FLASH_MAX_RW_SIZE
28-
int "Flash device max read-write size in decimal"
29-
help
30-
This is the maximum number of bytes that the
31-
flash_write API can accept per invocation.
32-
API.
33-
34-
config DISK_FLASH_ERASE_ALIGNMENT
35-
hex "Flash device erase alignment in hex"
36-
help
37-
This is the start address alignment required by
38-
the flash component.
39-
40-
config DISK_ERASE_BLOCK_SIZE
41-
hex "Flash device erasable block size in hex"
42-
help
43-
This is typically the minimum block size that
44-
is erased at one time in flash storage.
45-
Typically it is equal to the flash memory page size.
46-
47-
config DISK_FLASH_SECTOR_SIZE
48-
int "Flash device sector size"
49-
default 512
50-
help
51-
This is the file system sector size in bytes.
52-
53-
config DISK_VOLUME_SIZE
54-
hex "Flash device volume size in hex"
55-
help
56-
This is the file system volume size in bytes.
57-
5812
module = FLASHDISK
5913
module-str = flashdisk
6014
source "subsys/logging/Kconfig.template.log_config"

samples/subsys/usb/mass/Kconfig

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ config FLASH_MAP
6161
config FLASH_PAGE_LAYOUT
6262
default y
6363

64-
config DISK_FLASH_START
65-
default 0x0
66-
6764
config FLASH_LOG_LEVEL
6865
default 3
6966

@@ -72,22 +69,6 @@ if NORDIC_QSPI_NOR
7269
config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
7370
default 4096
7471

75-
config DISK_FLASH_DEV_NAME
76-
default "MX25R64" if "$(dt_nodelabel_enabled,mx25r64)"
77-
default "GD25Q16" if "$(dt_nodelabel_enabled,gd25q16)"
78-
79-
config DISK_VOLUME_SIZE
80-
default 0x20000
81-
82-
config DISK_FLASH_MAX_RW_SIZE
83-
default 4096
84-
85-
config DISK_FLASH_ERASE_ALIGNMENT
86-
default 0x1000
87-
88-
config DISK_ERASE_BLOCK_SIZE
89-
default 0x1000
90-
9172
endif # NORDIC_QSPI_NOR
9273

9374
endif # DISK_DRIVER_FLASH

tests/subsys/fs/fat_fs_api/prj_lfn.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@ CONFIG_LOG=y
33
CONFIG_FAT_FILESYSTEM_ELM=y
44
CONFIG_FS_FATFS_LFN=y
55
CONFIG_DISK_DRIVER_FLASH=y
6-
CONFIG_DISK_FLASH_DEV_NAME="flash-controller@0"
7-
CONFIG_DISK_FLASH_START=0
8-
CONFIG_DISK_FLASH_MAX_RW_SIZE=256
9-
CONFIG_DISK_ERASE_BLOCK_SIZE=0x1000
10-
CONFIG_DISK_FLASH_ERASE_ALIGNMENT=0x1000
11-
CONFIG_DISK_VOLUME_SIZE=0x200000
126
CONFIG_ZTEST=y
137
CONFIG_ZTEST_NEW_API=y

tests/subsys/fs/fat_fs_api/prj_native_posix.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,5 @@ CONFIG_FILE_SYSTEM=y
22
CONFIG_LOG=y
33
CONFIG_FAT_FILESYSTEM_ELM=y
44
CONFIG_DISK_DRIVER_FLASH=y
5-
CONFIG_DISK_FLASH_DEV_NAME="flash-controller@0"
6-
CONFIG_DISK_FLASH_START=0
7-
CONFIG_DISK_FLASH_MAX_RW_SIZE=256
8-
CONFIG_DISK_ERASE_BLOCK_SIZE=0x1000
9-
CONFIG_DISK_FLASH_ERASE_ALIGNMENT=0x1000
10-
CONFIG_DISK_VOLUME_SIZE=0x200000
115
CONFIG_ZTEST=y
126
CONFIG_ZTEST_NEW_API=y

tests/subsys/fs/fat_fs_api/prj_native_posix_64.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,5 @@ CONFIG_FILE_SYSTEM=y
22
CONFIG_LOG=y
33
CONFIG_FAT_FILESYSTEM_ELM=y
44
CONFIG_DISK_DRIVER_FLASH=y
5-
CONFIG_DISK_FLASH_DEV_NAME="flash-controller@0"
6-
CONFIG_DISK_FLASH_START=0
7-
CONFIG_DISK_FLASH_MAX_RW_SIZE=256
8-
CONFIG_DISK_ERASE_BLOCK_SIZE=0x1000
9-
CONFIG_DISK_FLASH_ERASE_ALIGNMENT=0x1000
10-
CONFIG_DISK_VOLUME_SIZE=0x200000
115
CONFIG_ZTEST=y
126
CONFIG_ZTEST_NEW_API=y

0 commit comments

Comments
 (0)