michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: spi_nor: Remove unused block_size parameter

Browse source 
Only page and sector size is used by the driver.

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>
This commit is contained in:
Rajavardhan Gundi 2018-12-01 18:10:38 +05:30 • committed by Anas Nashif
commit 7765c1adaf
4 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/xtensa/intel_s1000_crb/Kconfig.defconfig
View file

@ -73,9 +73,6 @@ config SPI_NOR_SECTOR_SIZE
config SPI_NOR_SECTORS config SPI_NOR_SECTORS
default 1024 default 1024
config SPI_NOR_BLOCK_SIZE
default 65536
choice SPI_NOR_BLOCK_ERASE_SIZE choice SPI_NOR_BLOCK_ERASE_SIZE
default SPI_NOR_BLOCK_ERASE_64K default SPI_NOR_BLOCK_ERASE_64K
endchoice endchoice

6
drivers/flash/Kconfig.nor
View file

@ -46,12 +46,6 @@ config SPI_NOR_SECTORS
This option specifies number of sector present This option specifies number of sector present
in SPI flash in SPI flash
config SPI_NOR_BLOCK_SIZE
int "Block size of SPI flash"
default 0
help
This option specifies block size of SPI flash
choice SPI_NOR_BLOCK_ERASE_SIZE choice SPI_NOR_BLOCK_ERASE_SIZE
prompt "Select Block size for erasing" prompt "Select Block size for erasing"

3
drivers/flash/spi_nor.c
View file

@ -397,8 +397,7 @@ static const struct flash_driver_api spi_nor_api = {
static const struct spi_nor_config flash_id = { static const struct spi_nor_config flash_id = {
JEDEC_ID(CONFIG_SPI_NOR_JEDEC_ID), JEDEC_ID(CONFIG_SPI_NOR_JEDEC_ID),
CONFIG_SPI_NOR_PAGE_SIZE, CONFIG_SPI_NOR_SECTOR_SIZE, CONFIG_SPI_NOR_PAGE_SIZE, CONFIG_SPI_NOR_SECTOR_SIZE,
CONFIG_SPI_NOR_SECTORS, CONFIG_SPI_NOR_BLOCK_SIZE, CONFIG_SPI_NOR_SECTORS, CONFIG_SPI_NOR_BLOCK_ERASE_SIZE,
CONFIG_SPI_NOR_BLOCK_ERASE_SIZE,
}; };
static struct spi_nor_data spi_nor_memory_data; static struct spi_nor_data spi_nor_memory_data;

1
drivers/flash/spi_nor.h
View file

@ -16,7 +16,6 @@ struct spi_nor_config {
u32_t page_size; u32_t page_size;
u32_t sector_size; u32_t sector_size;
u32_t n_sectors; u32_t n_sectors;
u32_t block_size;
u32_t flag; u32_t flag;
}; };