Moves NAND drivers to src/flash/nand/. Adds src/flash/nand/Makefile.am. Builds libocdflashnand.la.
Signed-off-by: Zachary T Welch <[email protected]> --- configure.in | 1 + src/flash/Makefile.am | 26 +++++-------------- src/flash/nand/Makefile.am | 27 ++++++++++++++++++++ src/flash/{davinci_nand.c => nand/davinci.c} | 0 .../{lpc3180_nand_controller.c => nand/lpc3180.c} | 2 +- .../{lpc3180_nand_controller.h => nand/lpc3180.h} | 0 src/flash/{mx3_nand.c => nand/mx3.c} | 2 +- src/flash/{mx3_nand.h => nand/mx3.h} | 0 src/flash/{nonce_nand.c => nand/nonce.c} | 0 src/flash/{orion_nand.c => nand/orion.c} | 0 src/flash/{s3c2410_nand.c => nand/s3c2410.c} | 2 +- src/flash/{s3c2412_nand.c => nand/s3c2412.c} | 2 +- src/flash/{s3c2440_nand.c => nand/s3c2440.c} | 2 +- src/flash/{s3c2443_nand.c => nand/s3c2443.c} | 2 +- src/flash/{s3c24xx_nand.c => nand/s3c24xx.c} | 2 +- src/flash/{s3c24xx_nand.h => nand/s3c24xx.h} | 2 +- .../{s3c24xx_regs_nand.h => nand/s3c24xx_regs.h} | 0 17 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 src/flash/nand/Makefile.am rename src/flash/{davinci_nand.c => nand/davinci.c} (100%) rename src/flash/{lpc3180_nand_controller.c => nand/lpc3180.c} (99%) rename src/flash/{lpc3180_nand_controller.h => nand/lpc3180.h} (100%) rename src/flash/{mx3_nand.c => nand/mx3.c} (99%) rename src/flash/{mx3_nand.h => nand/mx3.h} (100%) rename src/flash/{nonce_nand.c => nand/nonce.c} (100%) rename src/flash/{orion_nand.c => nand/orion.c} (100%) rename src/flash/{s3c2410_nand.c => nand/s3c2410.c} (99%) rename src/flash/{s3c2412_nand.c => nand/s3c2412.c} (99%) rename src/flash/{s3c2440_nand.c => nand/s3c2440.c} (99%) rename src/flash/{s3c2443_nand.c => nand/s3c2443.c} (99%) rename src/flash/{s3c24xx_nand.c => nand/s3c24xx.c} (99%) rename src/flash/{s3c24xx_nand.h => nand/s3c24xx.h} (99%) rename src/flash/{s3c24xx_regs_nand.h => nand/s3c24xx_regs.h} (100%) diff --git a/configure.in b/configure.in index 9cb2b0f..0b304b5 100644 --- a/configure.in +++ b/configure.in @@ -1121,6 +1121,7 @@ AC_OUTPUT(dnl src/target/Makefile dnl src/server/Makefile dnl src/flash/Makefile dnl + src/flash/nand/Makefile dnl src/pld/Makefile dnl doc/Makefile dnl ) diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 94cc86e..353fcf1 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -1,3 +1,6 @@ +SUBDIRS = \ + nand + AM_CPPFLAGS = \ -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag \ @@ -10,6 +13,9 @@ libflash_la_SOURCES = \ $(NAND_SRCS) \ mflash.c +libflash_la_LIBADD = \ + $(top_builddir)/src/flash/nand/libocdflashnand.la + FLASH_SRCS = \ common.c \ cfi.c \ @@ -40,22 +46,8 @@ NAND_SRCS = \ arm_nandio.c \ nand_ecc.c \ nand_ecc_kw.c \ - $(NAND_DEVICES_SRCS) \ nand.c -NAND_DEVICES_SRCS = \ - nonce_nand.c \ - davinci_nand.c \ - lpc3180_nand_controller.c \ - mx3_nand.c \ - orion_nand.c \ - s3c24xx_nand.c \ - s3c2410_nand.c \ - s3c2412_nand.c \ - s3c2440_nand.c \ - s3c2443_nand.c - - noinst_HEADERS = \ arm_nandio.h \ at91sam7.h \ @@ -66,9 +58,7 @@ noinst_HEADERS = \ flash.h \ lpc2000.h \ lpc288x.h \ - lpc3180_nand_controller.h \ mflash.h \ - mx3_nand.h \ non_cfi.h \ nand.h \ ocl.h \ @@ -78,9 +68,7 @@ noinst_HEADERS = \ str7x.h \ str9x.h \ str9xpec.h \ - tms470.h \ - s3c24xx_nand.h \ - s3c24xx_regs_nand.h + tms470.h EXTRA_DIST = startup.tcl diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am new file mode 100644 index 0000000..e95717e --- /dev/null +++ b/src/flash/nand/Makefile.am @@ -0,0 +1,27 @@ +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/flash \ + -I$(top_srcdir)/src/helper \ + -I$(top_srcdir)/src/jtag \ + -I$(top_srcdir)/src/target + +noinst_LTLIBRARIES = libocdflashnand.la + +libocdflashnand_la_SOURCES = \ + nonce.c \ + davinci.c \ + lpc3180.c \ + mx3.c \ + orion.c \ + s3c24xx.c \ + s3c2410.c \ + s3c2412.c \ + s3c2440.c \ + s3c2443.c + +noinst_HEADERS = \ + lpc3180.h \ + mx3.h \ + s3c24xx.h \ + s3c24xx_regs.h + +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in diff --git a/src/flash/davinci_nand.c b/src/flash/nand/davinci.c similarity index 100% rename from src/flash/davinci_nand.c rename to src/flash/nand/davinci.c diff --git a/src/flash/lpc3180_nand_controller.c b/src/flash/nand/lpc3180.c similarity index 99% rename from src/flash/lpc3180_nand_controller.c rename to src/flash/nand/lpc3180.c index 146c843..031e6b1 100644 --- a/src/flash/lpc3180_nand_controller.c +++ b/src/flash/nand/lpc3180.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include "lpc3180_nand_controller.h" +#include "lpc3180.h" #include "nand.h" static int lpc3180_reset(struct nand_device *nand); diff --git a/src/flash/lpc3180_nand_controller.h b/src/flash/nand/lpc3180.h similarity index 100% rename from src/flash/lpc3180_nand_controller.h rename to src/flash/nand/lpc3180.h diff --git a/src/flash/mx3_nand.c b/src/flash/nand/mx3.c similarity index 99% rename from src/flash/mx3_nand.c rename to src/flash/nand/mx3.c index 1dc4fcb..21577a6 100644 --- a/src/flash/mx3_nand.c +++ b/src/flash/nand/mx3.c @@ -35,7 +35,7 @@ get_next_halfword_from_sram_buffer() not tested #include "config.h" #endif -#include "mx3_nand.h" +#include "mx3.h" static const char target_not_halted_err_msg[] = "target must be halted to use mx3 NAND flash controller"; diff --git a/src/flash/mx3_nand.h b/src/flash/nand/mx3.h similarity index 100% rename from src/flash/mx3_nand.h rename to src/flash/nand/mx3.h diff --git a/src/flash/nonce_nand.c b/src/flash/nand/nonce.c similarity index 100% rename from src/flash/nonce_nand.c rename to src/flash/nand/nonce.c diff --git a/src/flash/orion_nand.c b/src/flash/nand/orion.c similarity index 100% rename from src/flash/orion_nand.c rename to src/flash/nand/orion.c diff --git a/src/flash/s3c2410_nand.c b/src/flash/nand/s3c2410.c similarity index 99% rename from src/flash/s3c2410_nand.c rename to src/flash/nand/s3c2410.c index ca50c99..3c391bc 100644 --- a/src/flash/s3c2410_nand.c +++ b/src/flash/nand/s3c2410.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "s3c24xx_nand.h" +#include "s3c24xx.h" NAND_DEVICE_COMMAND_HANDLER(s3c2410_nand_device_command) { diff --git a/src/flash/s3c2412_nand.c b/src/flash/nand/s3c2412.c similarity index 99% rename from src/flash/s3c2412_nand.c rename to src/flash/nand/s3c2412.c index acc6d99..5784305 100644 --- a/src/flash/s3c2412_nand.c +++ b/src/flash/nand/s3c2412.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "s3c24xx_nand.h" +#include "s3c24xx.h" NAND_DEVICE_COMMAND_HANDLER(s3c2412_nand_device_command) { diff --git a/src/flash/s3c2440_nand.c b/src/flash/nand/s3c2440.c similarity index 99% rename from src/flash/s3c2440_nand.c rename to src/flash/nand/s3c2440.c index 556f6f1..d1a421e 100644 --- a/src/flash/s3c2440_nand.c +++ b/src/flash/nand/s3c2440.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "s3c24xx_nand.h" +#include "s3c24xx.h" NAND_DEVICE_COMMAND_HANDLER(s3c2440_nand_device_command) diff --git a/src/flash/s3c2443_nand.c b/src/flash/nand/s3c2443.c similarity index 99% rename from src/flash/s3c2443_nand.c rename to src/flash/nand/s3c2443.c index 311bb69..d341477 100644 --- a/src/flash/s3c2443_nand.c +++ b/src/flash/nand/s3c2443.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "s3c24xx_nand.h" +#include "s3c24xx.h" NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command) diff --git a/src/flash/s3c24xx_nand.c b/src/flash/nand/s3c24xx.c similarity index 99% rename from src/flash/s3c24xx_nand.c rename to src/flash/nand/s3c24xx.c index 1a2ece7..d305b22 100644 --- a/src/flash/s3c24xx_nand.c +++ b/src/flash/nand/s3c24xx.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "s3c24xx_nand.h" +#include "s3c24xx.h" S3C24XX_DEVICE_COMMAND() diff --git a/src/flash/s3c24xx_nand.h b/src/flash/nand/s3c24xx.h similarity index 99% rename from src/flash/s3c24xx_nand.h rename to src/flash/nand/s3c24xx.h index fad33a0..38057b2 100644 --- a/src/flash/s3c24xx_nand.h +++ b/src/flash/nand/s3c24xx.h @@ -28,7 +28,7 @@ */ #include "nand.h" -#include "s3c24xx_regs_nand.h" +#include "s3c24xx_regs.h" struct s3c24xx_nand_controller { diff --git a/src/flash/s3c24xx_regs_nand.h b/src/flash/nand/s3c24xx_regs.h similarity index 100% rename from src/flash/s3c24xx_regs_nand.h rename to src/flash/nand/s3c24xx_regs.h -- 1.6.4.4 _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
