move nand drivers to src/flash/nand/

Moves NAND drivers to src/flash/nand/.
Adds src/flash/nand/Makefile.am.
Builds libocdflashnand.la.

diff --git a/configure.in b/configure.in
index dbddcb2bd6cdc074f274e709d4efa923ed6e9d1a..3680cac52e4daf173e7d1a0211d0deb8c44c6627 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1122,6 +1122,7 @@ AC_OUTPUT(dnl
     src/target/Makefile dnl
     src/server/Makefile dnl
     src/flash/Makefile 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
   )
     src/pld/Makefile dnl
     doc/Makefile dnl
   )

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 94cc86e5c7efab0913c5f9094565416fc90c14ed..353fcf1650a0eb88efddad55e39db5fc9161ae8c 100644 (file)
--- 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 \
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/helper \
        -I$(top_srcdir)/src/jtag \


@@ -10,6 +13,9 @@ libflash_la_SOURCES = \
        $(NAND_SRCS) \
        mflash.c
 
        $(NAND_SRCS) \
        mflash.c
 

+libflash_la_LIBADD = \
+       $(top_builddir)/src/flash/nand/libocdflashnand.la
+

 FLASH_SRCS = \
        common.c \
        cfi.c \
 FLASH_SRCS = \
        common.c \
        cfi.c \


@@ -40,22 +46,8 @@ NAND_SRCS = \
        arm_nandio.c \
        nand_ecc.c \
        nand_ecc_kw.c \
        arm_nandio.c \
        nand_ecc.c \
        nand_ecc_kw.c \

-       $(NAND_DEVICES_SRCS) \

        nand.c
 
        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 \
 noinst_HEADERS = \
        arm_nandio.h \
        at91sam7.h \


@@ -66,9 +58,7 @@ noinst_HEADERS = \
        flash.h \
        lpc2000.h \
        lpc288x.h \
        flash.h \
        lpc2000.h \
        lpc288x.h \

-       lpc3180_nand_controller.h \

        mflash.h \
        mflash.h \

-       mx3_nand.h \

        non_cfi.h \
        nand.h \
        ocl.h \
        non_cfi.h \
        nand.h \
        ocl.h \


@@ -78,9 +68,7 @@ noinst_HEADERS = \
        str7x.h \
        str9x.h \
        str9xpec.h \
        str7x.h \
        str9x.h \
        str9xpec.h \

-       tms470.h \
-       s3c24xx_nand.h \
-       s3c24xx_regs_nand.h
+       tms470.h

 
 EXTRA_DIST = startup.tcl
 
 
 EXTRA_DIST = startup.tcl
 

diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
new file mode 100644 (file)
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 146c84382d0769862038b2067920e374442cfef2..031e6b1d7dcea52b77c17a7cf25d1fcda6f36668 100644 (file)
--- a/src/flash/lpc3180_nand_controller.c
+++ b/src/flash/nand/lpc3180.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "lpc3180_nand_controller.h"
+#include "lpc3180.h"

 #include "nand.h"
 
 static int lpc3180_reset(struct nand_device *nand);
 #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 1dc4fcbc4654a7411ccf575ac97e75d9f386fffd..21577a6e9334ff8841abf078359ffcfef1a56847 100644 (file)
--- 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 "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";
 
 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 ca50c99445adcf7471200de29792765650af79c3..3c391bce10453e862a8471db5d2948dbb6a5b54c 100644 (file)
--- a/src/flash/s3c2410_nand.c
+++ b/src/flash/nand/s3c2410.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "s3c24xx_nand.h"
+#include "s3c24xx.h"

 
 NAND_DEVICE_COMMAND_HANDLER(s3c2410_nand_device_command)
 {
 
 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 acc6d993f61cbdd16261f733ebc638cd184df82d..5784305314f161b70583cd2176df0794169c3092 100644 (file)
--- a/src/flash/s3c2412_nand.c
+++ b/src/flash/nand/s3c2412.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "s3c24xx_nand.h"
+#include "s3c24xx.h"

 
 NAND_DEVICE_COMMAND_HANDLER(s3c2412_nand_device_command)
 {
 
 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 556f6f1e89b960af560360689cf0d1f62932ad47..d1a421e3cf243d4467fad89f5bbd76170976fac5 100644 (file)
--- a/src/flash/s3c2440_nand.c
+++ b/src/flash/nand/s3c2440.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "s3c24xx_nand.h"
+#include "s3c24xx.h"

 
 
 NAND_DEVICE_COMMAND_HANDLER(s3c2440_nand_device_command)
 
 
 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 311bb6977c8fb0b8399939dfd3d28311c5f8e5da..d3414771fb77b7e057cc47455a79b78231ce18d4 100644 (file)
--- a/src/flash/s3c2443_nand.c
+++ b/src/flash/nand/s3c2443.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "s3c24xx_nand.h"
+#include "s3c24xx.h"

 
 
 NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)
 
 
 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 1a2ece7215ed3ff508d0a6b861b7186d61cb69fc..d305b221a58c30f2b6436bd4a26302eb09052222 100644 (file)
--- a/src/flash/s3c24xx_nand.c
+++ b/src/flash/nand/s3c24xx.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "s3c24xx_nand.h"
+#include "s3c24xx.h"

 
 
 S3C24XX_DEVICE_COMMAND()
 
 
 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 fad33a0c4dd84e029431a18312d920a510ba5715..38057b2707cacef88c96733e72ae2931cb24d320 100644 (file)
--- a/src/flash/s3c24xx_nand.h
+++ b/src/flash/nand/s3c24xx.h
@@ -28,7 +28,7 @@
  */
 
 #include "nand.h"
  */
 
 #include "nand.h"

-#include "s3c24xx_regs_nand.h"
+#include "s3c24xx_regs.h"

 
 struct s3c24xx_nand_controller
 {
 
 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