Resync new repository with old repo r5166

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5154 42af7a65-404d-4744-a932-0658087f49c3

drivers/mtd/Kconfig

@@ -36,19 +36,19 @@ config AT45DB_PWRSAVE
 	bool "enables power save"
 	default n
 	depends on MTD_AT45DB
-	
+
 config MTD_MP25P
-	bool "SPI-based M25P1 falsh"
+	bool "SPI-based M25P FLASH"
 	default n
 	select SPI
 
 config MP25P_SPIMODE
-	int "mp25p spi mode"
+	int "MP25P SPI mode"
 	default 0
 	depends on MTD_MP25P
 
 config MP25P_MANUFACTURER
-	hex "mp25p manufacturers ID"
+	hex "MP25P manufacturers ID"
 	default 0x20
 	depends on MTD_MP25P
 	---help---
@@ -66,3 +66,68 @@ config MTD_RAMTRON
 config MTD_RAM
 	bool "Memory bus ram"
 	default n
+
+config MTD_SST25
+	bool "SPI-based SST25 FLASH"
+	default n
+	select SPI
+
+config SST25_SPIMODE
+	int "SST25 SPI Mode"
+	default 0
+	depends on MTD_SST25
+
+config SST25_SPIFREQUENCY
+	int "SST25 SPI Frequency"
+	default 20000000
+	depends on MTD_SST25
+
+config SST25_READONLY
+	bool "SST25 Read-Only FLASH"
+	default n
+	depends on MTD_SST25
+
+config SST25_SECTOR512
+	bool "Simulate 512 byte Erase Blocks"
+	default n
+	depends on MTD_SST25
+
+config SST25_SLOWWRITE
+	bool
+	default y
+	depends on MTD_SST25
+
+config SST25_SLOWREAD
+	bool
+	default n
+	depends on MTD_SST25
+
+config MTD_W25
+	bool "SPI-based W25 FLASH"
+	default n
+	select SPI
+
+config W25_SPIMODE
+	int "W25 SPI Mode"
+	default 0
+	depends on MTD_W25
+
+config W25_SPIFREQUENCY
+	int "W25 SPI Frequency"
+	default 20000000
+	depends on MTD_W25
+
+config W25_READONLY
+	bool "W25 Read-Only FLASH"
+	default n
+	depends on MTD_W25
+
+config W25_SECTOR512
+	bool "Simulate 512 byte Erase Blocks"
+	default n
+	depends on MTD_W25
+
+config W25_SLOWREAD
+	bool
+	default n
+	depends on MTD_W25

drivers/mtd/Make.defs

@@ -47,6 +47,10 @@ ifeq ($(CONFIG_MTD_SST25),y)
 CSRCS += sst25.c
 endif
 
+ifeq ($(CONFIG_MTD_W25),y)
+CSRCS += w25.c
+endif
+
 # Include MTD driver support
 
 DEPPATH += --dep-path mtd

drivers/mtd/sst25.c

@@ -1,5 +1,5 @@
 /************************************************************************************
- * drivers/mtd/m25px.c
+ * drivers/mtd/sst25.c
  * Driver for SPI-based SST25 FLASH.
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.