Kconfig: spi_nor: Remove Erase configuration from Kconfig

Configuration of Erase command is specified in DTS. Hence the corresponding changes in Kconfig are removed. Signed-off-by: Rajavardhan Gundi <[email protected]>
dagar · Jan 17, 2019 · f5b60ee · f5b60ee
1 parent 74895bc
commit f5b60ee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 32 deletions.
diff --git a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
@@ -167,10 +167,6 @@ config SPI_NOR_PAGE_SIZE
 config SPI_NOR_SECTOR_SIZE
 	default 4096
 
-choice SPI_NOR_BLOCK_ERASE_SIZE
-	default SPI_NOR_BLOCK_ERASE_64K
-endchoice
-
 config FLASH_HAS_PAGE_LAYOUT
 	def_bool y
 

diff --git a/drivers/flash/Kconfig.nor b/drivers/flash/Kconfig.nor
@@ -39,25 +39,4 @@ config SPI_NOR_SECTOR_SIZE
 	help
 	This option specifies sector size of SPI flash
 
-choice SPI_NOR_BLOCK_ERASE_SIZE
-prompt "Select Block size for erasing"
-
-config SPI_NOR_BLOCK_ERASE_32K
-	bool "Select 32K block erase"
-	help
-	This Enables 32K Block erase
-
-config SPI_NOR_BLOCK_ERASE_64K
-	bool "Select 64K block erase"
-	help
-	This Enables 64K Block erase
-
-endchoice
-
-config SPI_NOR_BLOCK_ERASE_SIZE
-	int
-	default 2 if SPI_NOR_BLOCK_ERASE_32K
-	default 4 if SPI_NOR_BLOCK_ERASE_64K
-	help
-	This option specifies block size of SPI flash
 endif # SPI_NOR
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
@@ -26,9 +26,6 @@
 #define MASK_32K 0x7FFF
 #define MASK_64K 0xFFFF
 
-#define BLOCK_ERASE_32K BIT(1)
-#define BLOCK_ERASE_64K BIT(2)
-
 #define SPI_NOR_MAX_ADDR_WIDTH 4
 #define SECTORS_COUNT (KB(CONFIG_FLASH_SIZE) / CONFIG_SPI_NOR_SECTOR_SIZE)
 
@@ -275,14 +272,16 @@ static int spi_nor_erase(struct device *dev, off_t addr, size_t size)
 			/* chip erase */
 			spi_nor_cmd_write(dev, SPI_NOR_CMD_CE);
 			size -= (params->sector_size * params->n_sectors);
-		} else if ((params->flag & BLOCK_ERASE_64K) && (size >= SZ_64K)
+		} else if ((FLASH_ERASE_BLOCK_SIZE == SZ_64K)
+			  && (size >= SZ_64K)
 			  && ((addr & MASK_64K) == 0)) {
 			/* 64 KiB block erase */
 			spi_nor_cmd_addr_write(dev, SPI_NOR_CMD_BE, addr,
 			NULL, 0);
 			addr += SZ_64K;
 			size -= SZ_64K;
-		} else if ((params->flag & BLOCK_ERASE_32K) && (size >= SZ_32K)
+		} else if ((FLASH_ERASE_BLOCK_SIZE == SZ_32K)
+			  && (size >= SZ_32K)
 			  && ((addr & MASK_32K) == 0)) {
 			/* 32 KiB block erase */
 			spi_nor_cmd_addr_write(dev, SPI_NOR_CMD_BE_32K, addr,
@@ -412,7 +411,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,
-	SECTORS_COUNT, CONFIG_SPI_NOR_BLOCK_ERASE_SIZE,
+	SECTORS_COUNT,
 };
 
 static struct spi_nor_data spi_nor_memory_data;

diff --git 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 flag;
 };
 
 /* Status register bits */