move remaining nand helper files

Move remaining NAND implementation files into src/flash/nand/.

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 2144ff2dcad22dcd32910d3add58cc13ffba9f52..f8d7088386353ab63001a382a3e242804e2d75bf 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -9,9 +9,6 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
        common.c \
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
        common.c \

-       arm_nandio.c \
-       nand_ecc.c \
-       nand_ecc_kw.c \

        mflash.c
 
 libflash_la_LIBADD = \
        mflash.c
 
 libflash_la_LIBADD = \


@@ -19,7 +16,6 @@ libflash_la_LIBADD = \
        $(top_builddir)/src/flash/nand/libocdflashnand.la
 
 noinst_HEADERS = \
        $(top_builddir)/src/flash/nand/libocdflashnand.la
 
 noinst_HEADERS = \

-       arm_nandio.h \

        common.h \
        mflash.h \
        nand.h
        common.h \
        mflash.h \
        nand.h

diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 3885a7b91102e16522f617960e614e6506e1630c..667ef8fdf71658fbb17eb909aaad282f4a52a998 100644 (file)
--- a/src/flash/nand/Makefile.am
+++ b/src/flash/nand/Makefile.am
@@ -3,9 +3,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 noinst_LTLIBRARIES = libocdflashnand.la
 
 libocdflashnand_la_SOURCES = \
 noinst_LTLIBRARIES = libocdflashnand.la
 
 libocdflashnand_la_SOURCES = \

+       ecc.c \
+       ecc_kw.c \

        core.c \
        fileio.c \
        tcl.c \
        core.c \
        fileio.c \
        tcl.c \

+       arm_io.c \

        $(NAND_DRIVERS) \
        driver.c
 
        $(NAND_DRIVERS) \
        driver.c
 


@@ -22,6 +25,7 @@ NAND_DRIVERS = \
        s3c2443.c
 
 noinst_HEADERS = \
        s3c2443.c
 
 noinst_HEADERS = \

+       arm_io.h \

        lpc3180.h \
        driver.h \
        mx3.h \
        lpc3180.h \
        driver.h \
        mx3.h \

diff --git a/src/flash/arm_nandio.c b/src/flash/nand/arm_io.c
similarity index 99%
rename from src/flash/arm_nandio.c
rename to src/flash/nand/arm_io.c
index 67619d545a3e41376bc500b34f2ada299e11e1ea..cc565dcbc023592214c2f61d7d686878e4012157 100644 (file)
--- a/src/flash/arm_nandio.c
+++ b/src/flash/nand/arm_io.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "arm_nandio.h"
+#include "arm_io.h"

 #include <target/armv4_5.h>
 #include <target/algorithm.h>
 
 #include <target/armv4_5.h>
 #include <target/algorithm.h>
 

diff --git a/src/flash/arm_nandio.h b/src/flash/nand/arm_io.h
similarity index 100%
rename from src/flash/arm_nandio.h
rename to src/flash/nand/arm_io.h

diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c
index 66770737c81051e21af7486e55bc7ac1ce89b6fe..0152b4d93787cff8ee7dd3b09045ed37d514936e 100644 (file)
--- a/src/flash/nand/davinci.c
+++ b/src/flash/nand/davinci.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <flash/arm_nandio.h>
+#include "arm_io.h"

 
 
 enum ecc {
 
 
 enum ecc {

diff --git a/src/flash/nand_ecc.c b/src/flash/nand/ecc.c
similarity index 99%
rename from src/flash/nand_ecc.c
rename to src/flash/nand/ecc.c
index 7aa1519dde8fd07c9b2876f7fe38f6c29824f5f3..1e103d00210a231e2f5cca96c42633f20f90eced 100644 (file)
--- a/src/flash/nand_ecc.c
+++ b/src/flash/nand/ecc.c
@@ -41,7 +41,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "nand.h"
+#include <flash/nand.h>

 
 /*
  * Pre-calculated 256-way 1 byte column parity
 
 /*
  * Pre-calculated 256-way 1 byte column parity

diff --git a/src/flash/nand_ecc_kw.c b/src/flash/nand/ecc_kw.c
similarity index 99%
rename from src/flash/nand_ecc_kw.c
rename to src/flash/nand/ecc_kw.c
index a809b32296601368ebf4d8a3fcaab991c8a7ec18..55273c58f7622e7e0ca2341a9f1de6a2b4a8a968 100644 (file)
--- a/src/flash/nand_ecc_kw.c
+++ b/src/flash/nand/ecc_kw.c
@@ -20,9 +20,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <sys/types.h>
-#include "nand.h"
-
+#include <flash/nand.h>

 
 /*****************************************************************************
  * Arithmetic in GF(2^10) ("F") modulo x^10 + x^3 + 1.
 
 /*****************************************************************************
  * Arithmetic in GF(2^10) ("F") modulo x^10 + x^3 + 1.

diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index b124deee6f086848a787a06a0dd5ae96750c0b77..4b174da35e549a18376318a7aacb609d628b5b83 100644 (file)
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <flash/arm_nandio.h>
+#include "arm_io.h"

 #include <target/armv4_5.h>
 
 
 #include <target/armv4_5.h>