diff --git a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig index 1406848c82c..0f4a4eb4690 100644 --- a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig +++ b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig @@ -73,9 +73,6 @@ config SPI_NOR_SECTOR_SIZE config SPI_NOR_SECTORS default 1024 -config SPI_NOR_BLOCK_SIZE - default 65536 - choice SPI_NOR_BLOCK_ERASE_SIZE default SPI_NOR_BLOCK_ERASE_64K endchoice diff --git a/drivers/flash/Kconfig.nor b/drivers/flash/Kconfig.nor index f7f68a99aff..ee9913c5341 100644 --- a/drivers/flash/Kconfig.nor +++ b/drivers/flash/Kconfig.nor @@ -46,12 +46,6 @@ config SPI_NOR_SECTORS This option specifies number of sector present 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 prompt "Select Block size for erasing" diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c index e1db70bb8fc..c0fd6c33467 100644 --- a/drivers/flash/spi_nor.c +++ b/drivers/flash/spi_nor.c @@ -397,8 +397,7 @@ static const struct flash_driver_api spi_nor_api = { static const struct spi_nor_config flash_id = { JEDEC_ID(CONFIG_SPI_NOR_JEDEC_ID), CONFIG_SPI_NOR_PAGE_SIZE, CONFIG_SPI_NOR_SECTOR_SIZE, - CONFIG_SPI_NOR_SECTORS, CONFIG_SPI_NOR_BLOCK_SIZE, - CONFIG_SPI_NOR_BLOCK_ERASE_SIZE, + CONFIG_SPI_NOR_SECTORS, CONFIG_SPI_NOR_BLOCK_ERASE_SIZE, }; static struct spi_nor_data spi_nor_memory_data; diff --git a/drivers/flash/spi_nor.h b/drivers/flash/spi_nor.h index 434b0095990..33e8c0c0228 100644 --- a/drivers/flash/spi_nor.h +++ b/drivers/flash/spi_nor.h @@ -16,7 +16,6 @@ struct spi_nor_config { u32_t page_size; u32_t sector_size; u32_t n_sectors; - u32_t block_size; u32_t flag; };