mtd/drivers/mtd/nand Kconfig,1.27,1.28 nandsim.c,1.9,1.10
Artem Bityuckiy
dedekind at infradead.org
Mon May 23 06:12:13 EDT 2005
Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv21066/drivers/mtd/nand
Modified Files:
Kconfig nandsim.c
Log Message:
Nandsim uses several module parameters for specifying what chip to
simulate. Some default values are in the source itself. It's much
convenient to have them in Kconfig so you don't need to specify module
parameters every time you load it.
Signed-off-by: Patrik Kluba, <pajko at kukac.halom.u-szeged.hu>
Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/Kconfig,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Kconfig 23 May 2005 08:50:46 -0000 1.27
+++ Kconfig 23 May 2005 10:12:10 -0000 1.28
@@ -192,15 +192,90 @@
load time (assuming you build diskonchip as a module) with the module
parameter "inftl_bbt_write=1".
- config MTD_NAND_SHARPSL
+config MTD_NAND_SHARPSL
bool "Support for NAND Flash on Sharp SL Series (C7xx + others)"
depends on MTD_NAND && ARCH_PXA
- config MTD_NAND_NANDSIM
+config MTD_NAND_NANDSIM
tristate "Support for NAND Flash Simulator"
depends on m && MTD_NAND && MTD_PARTITIONS
help
The simulator may simulate verious NAND flash chips for the
MTD nand layer.
+config MTD_NAND_NANDSIM_FIRST_ID
+ hex "First ID byte"
+ range 0x00 0xff
+ default 0x98
+ depends on MTD_NAND_NANDSIM
+ help
+ The fist byte returned by NAND Flash 'read ID' command (manufaturer ID).
+
+config MTD_NAND_NANDSIM_SECOND_ID
+ hex "Second ID byte"
+ range 0x00 0xff
+ default 0x39
+ depends on MTD_NAND_NANDSIM
+ help
+ The second byte returned by NAND Flash 'read ID' command (chip ID).
+
+config MTD_NAND_NANDSIM_THIRD_ID
+ hex "Third ID byte"
+ range 0x00 0xff
+ default 0xff
+ depends on MTD_NAND_NANDSIM
+ help
+ The third byte returned by NAND Flash 'read ID' command.
+
+config MTD_NAND_NANDSIM_FOURTH_ID
+ hex "Fourth ID byte"
+ range 0x00 0xff
+ default 0xff
+ depends on MTD_NAND_NANDSIM
+ help
+ The fourth byte returned by NAND Flash 'read ID' command.
+
+config MTD_NAND_NANDSIM_DEBUG
+ bool "NAND Simulator debugging"
+ depends on MTD_NAND_NANDSIM
+ help
+ Only helful for tracking problems.
+
+config MTD_NAND_NANDSIM_LOG
+ bool "NAND Simulator logging"
+ depends on MTD_NAND_NANDSIM
+ help
+ Logs the track of NAND read/write/erase commands.
+
+config MTD_NAND_NANDSIM_DELAY
+ bool "Emulate NAND chip delays using busy-wait cycles"
+ default n
+ depends on MTD_NAND_NANDSIM
+
+config MTD_NAND_NANDSIM_ACCESS_DELAY
+ int "Access delay (microiseconds)"
+ default 25
+ depends on MTD_NAND_NANDSIM_DELAY
+
+config MTD_NAND_NANDSIM_PROGRAM_DELAY
+ int "Program delay (microseconds)"
+ default 200
+ depends on MTD_NAND_NANDSIM_DELAY
+
+config MTD_NAND_NANDSIM_ERASE_DELAY
+ int "Erase delay (milliseconds)"
+ default 2
+ depends on MTD_NAND_NANDSIM_DELAY
+
+config MTD_NAND_NANDSIM_OUTPUT_CYCLE
+ int "Word output (from flash) cicle time (nanodeconds)"
+ default 40
+ depends on MTD_NAND_NANDSIM_DELAY
+
+
+config MTD_NAND_NANDSIM_INPUT_CYCLE
+ int "Word input (to flash) time (nanodeconds)"
+ default 50
+ depends on MTD_NAND_NANDSIM_DELAY
+
endmenu
Index: nandsim.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nandsim.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nandsim.c 23 May 2005 08:50:46 -0000 1.9
+++ nandsim.c 23 May 2005 10:12:10 -0000 1.10
@@ -38,63 +38,76 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/delay.h>
+
#ifdef CONFIG_NS_ABS_POS
#include <asm/io.h>
#endif
+#define CONFIG_NANDSIM_FIRST_ID_BYTE CONFIG_MTD_NAND_NANDSIM_FIRST_ID
+#define CONFIG_NANDSIM_SECOND_ID_BYTE CONFIG_MTD_NAND_NANDSIM_SECOND_ID
+#define CONFIG_NANDSIM_THIRD_ID_BYTE CONFIG_MTD_NAND_NANDSIM_THIRD_ID
+#define CONFIG_NANDSIM_FOURTH_ID_BYTE CONFIG_MTD_NAND_NANDSIM_FOURTH_ID
-/* Default simulator parameters values */
-#if !defined(CONFIG_NANDSIM_FIRST_ID_BYTE) || \
- !defined(CONFIG_NANDSIM_SECOND_ID_BYTE) || \
- !defined(CONFIG_NANDSIM_THIRD_ID_BYTE) || \
- !defined(CONFIG_NANDSIM_FOURTH_ID_BYTE)
-#define CONFIG_NANDSIM_FIRST_ID_BYTE 0x98
-#define CONFIG_NANDSIM_SECOND_ID_BYTE 0x39
-#define CONFIG_NANDSIM_THIRD_ID_BYTE 0xFF /* No byte */
-#define CONFIG_NANDSIM_FOURTH_ID_BYTE 0xFF /* No byte */
+#ifndef CONFIG_MTD_NAND_NANDSIM_ACCESS_DELAY
+# define CONFIG_MTD_NAND_NANDSIM_ACCESS_DELAY 25
#endif
-#ifndef CONFIG_NANDSIM_ACCESS_DELAY
-#define CONFIG_NANDSIM_ACCESS_DELAY 25
-#endif
-#ifndef CONFIG_NANDSIM_PROGRAMM_DELAY
-#define CONFIG_NANDSIM_PROGRAMM_DELAY 200
+#ifndef CONFIG_MTD_NAND_NANDSIM_PROGRAM_DELAY
+# define CONFIG_MTD_NAND_NANDSIM_PROGRAM_DELAY 200
#endif
-#ifndef CONFIG_NANDSIM_ERASE_DELAY
-#define CONFIG_NANDSIM_ERASE_DELAY 2
+
+#ifndef CONFIG_MTD_NAND_NANDSIM_ERASE_DELAY
+# define CONFIG_MTD_NAND_NANDSIM_ERASE_DELAY 2
#endif
-#ifndef CONFIG_NANDSIM_OUTPUT_CYCLE
-#define CONFIG_NANDSIM_OUTPUT_CYCLE 40
+
+#ifndef CONFIG_MTD_NAND_NANDSIM_OUTPUT_CYCLE
+# define CONFIG_MTD_NAND_NANDSIM_OUTPUT_CYCLE 40
#endif
-#ifndef CONFIG_NANDSIM_INPUT_CYCLE
-#define CONFIG_NANDSIM_INPUT_CYCLE 50
+
+#ifndef CONFIG_MTD_NAND_NANDSIM_INPUT_CYCLE
+# define CONFIG_MTD_NAND_NANDSIM_INPUT_CYCLE 50
#endif
-#ifndef CONFIG_NANDSIM_BUS_WIDTH
-#define CONFIG_NANDSIM_BUS_WIDTH 8
+
+#ifdef CONFIG_MTD_NAND_NANDSIM_16BIT_BUS
+# define CONFIG_NANDSIM_BUS_WIDTH 16
+#else
+# define CONFIG_NANDSIM_BUS_WIDTH 8
#endif
-#ifndef CONFIG_NANDSIM_DO_DELAYS
-#define CONFIG_NANDSIM_DO_DELAYS 0
+
+#ifndef CONFIG_MTD_NAND_NANDSIM_DELAY
+# define CONFIG_MTD_NAND_NANDSIM_DELAY 0
+#else
+# undef CONFIG_MTD_NAND_NANDSIM_DELAY
+# define CONFIG_MTD_NAND_NANDSIM_DELAY 1
#endif
-#ifndef CONFIG_NANDSIM_LOG
-#define CONFIG_NANDSIM_LOG 0
+
+#ifndef CONFIG_MTD_NAND_NANDSIM_LOG
+# define CONFIG_MTD_NAND_NANDSIM_LOG 0
+#else
+# undef CONFIG_MTD_NAND_NANDSIM_LOG
+# define CONFIG_MTD_NAND_NANDSIM_LOG 1
#endif
-#ifndef CONFIG_NANDSIM_DBG
-#define CONFIG_NANDSIM_DBG 0
+
+#ifndef CONFIG_MTD_NAND_NANDSIM_DEBUG
+# define CONFIG_MTD_NAND_NANDSIM_DEBUG 0
+#else
+# undef CONFIG_MTD_NAND_NANDSIM_DEBUG
+# define CONFIG_MTD_NAND_NANDSIM_DEBUG 1
#endif
static uint first_id_byte = CONFIG_NANDSIM_FIRST_ID_BYTE;
static uint second_id_byte = CONFIG_NANDSIM_SECOND_ID_BYTE;
static uint third_id_byte = CONFIG_NANDSIM_THIRD_ID_BYTE;
static uint fourth_id_byte = CONFIG_NANDSIM_FOURTH_ID_BYTE;
-static uint access_delay = CONFIG_NANDSIM_ACCESS_DELAY;
-static uint programm_delay = CONFIG_NANDSIM_PROGRAMM_DELAY;
-static uint erase_delay = CONFIG_NANDSIM_ERASE_DELAY;
-static uint output_cycle = CONFIG_NANDSIM_OUTPUT_CYCLE;
-static uint input_cycle = CONFIG_NANDSIM_INPUT_CYCLE;
+static uint access_delay = CONFIG_MTD_NAND_NANDSIM_ACCESS_DELAY;
+static uint programm_delay = CONFIG_MTD_NAND_NANDSIM_PROGRAM_DELAY;
+static uint erase_delay = CONFIG_MTD_NAND_NANDSIM_ERASE_DELAY;
+static uint output_cycle = CONFIG_MTD_NAND_NANDSIM_OUTPUT_CYCLE;
+static uint input_cycle = CONFIG_MTD_NAND_NANDSIM_INPUT_CYCLE;
static uint bus_width = CONFIG_NANDSIM_BUS_WIDTH;
-static uint do_delays = CONFIG_NANDSIM_DO_DELAYS;
-static uint log = CONFIG_NANDSIM_LOG;
-static uint dbg = CONFIG_NANDSIM_DBG;
+static uint do_delays = CONFIG_MTD_NAND_NANDSIM_DELAY;
+static uint log = CONFIG_MTD_NAND_NANDSIM_LOG;
+static uint dbg = CONFIG_MTD_NAND_NANDSIM_DEBUG;
module_param(first_id_byte, uint, 0400);
module_param(second_id_byte, uint, 0400);
More information about the linux-mtd-cvs
mailing list