enable start-stop-daemon by default, i want to use this to clean up a few init script...

[openwrt/openwrt.git] / target / linux / atheros-2.6 / files / drivers / mtd / devices / spiflash.h

diff --git a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.h b/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.h
index e543e040fd3ca930a053646c9bd1cc2e200a30aa..2553c6f50f8a9ba62452b6493638a743c912e7da 100644 (file)
--- a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.h
+++ b/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.h
@@ -17,23 +17,11 @@
 #define FLASH_2MB  2
 #define FLASH_4MB  3
 #define FLASH_8MB  4
-#define MAX_FLASH  5
+#define FLASH_16MB 5
+#define MAX_FLASH  6
 
 #define STM_PAGE_SIZE           256
 
-#define SPI_WRITE_ENABLE    0
-#define SPI_WRITE_DISABLE   1
-#define SPI_RD_STATUS       2
-#define SPI_WR_STATUS       3
-#define SPI_RD_DATA         4
-#define SPI_FAST_RD_DATA    5
-#define SPI_PAGE_PROGRAM    6
-#define SPI_SECTOR_ERASE    7
-#define SPI_BULK_ERASE      8
-#define SPI_DEEP_PWRDOWN    9
-#define SPI_RD_SIG          10
-#define SPI_MAX_OPCODES     11
-
 #define SFI_WRITE_BUFFER_SIZE   4
 #define SFI_FLASH_ADDR_MASK     0x00ffffff
 
@@ -57,6 +45,11 @@
 #define STM_M25P64_SECTOR_COUNT 128
 #define STM_M25P64_SECTOR_SIZE  0x10000
 
+#define STM_128MBIT_SIGNATURE   0x17
+#define STM_M25P128_BYTE_COUNT   16777216
+#define STM_M25P128_SECTOR_COUNT 256
+#define STM_M25P128_SECTOR_SIZE  0x10000
+
 #define STM_1MB_BYTE_COUNT   STM_M25P80_BYTE_COUNT
 #define STM_1MB_SECTOR_COUNT STM_M25P80_SECTOR_COUNT
 #define STM_1MB_SECTOR_SIZE  STM_M25P80_SECTOR_SIZE
@@ -69,6 +62,9 @@
 #define STM_8MB_BYTE_COUNT   STM_M25P64_BYTE_COUNT
 #define STM_8MB_SECTOR_COUNT STM_M25P64_SECTOR_COUNT
 #define STM_8MB_SECTOR_SIZE  STM_M25P64_SECTOR_SIZE
+#define STM_16MB_BYTE_COUNT   STM_M25P128_BYTE_COUNT
+#define STM_16MB_SECTOR_COUNT STM_M25P128_SECTOR_COUNT
+#define STM_16MB_SECTOR_SIZE  STM_M25P128_SECTOR_SIZE
 
 /*
  * ST Microelectronics Opcodes for Serial Flash