move remaining nand helper files
authorZachary T Welch <zw@superlucidity.net>
Sat, 5 Dec 2009 05:38:13 +0000 (21:38 -0800)
committerZachary T Welch <zw@superlucidity.net>
Sat, 5 Dec 2009 05:47:47 +0000 (21:47 -0800)
Move remaining NAND implementation files into src/flash/nand/.

src/flash/Makefile.am
src/flash/nand/Makefile.am
src/flash/nand/arm_io.c [moved from src/flash/arm_nandio.c with 99% similarity]
src/flash/nand/arm_io.h [moved from src/flash/arm_nandio.h with 100% similarity]
src/flash/nand/davinci.c
src/flash/nand/ecc.c [moved from src/flash/nand_ecc.c with 99% similarity]
src/flash/nand/ecc_kw.c [moved from src/flash/nand_ecc_kw.c with 99% similarity]
src/flash/nand/orion.c

index 2144ff2..f8d7088 100644 (file)
@@ -9,9 +9,6 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
        common.c \
-       arm_nandio.c \
-       nand_ecc.c \
-       nand_ecc_kw.c \
        mflash.c
 
 libflash_la_LIBADD = \
@@ -19,7 +16,6 @@ libflash_la_LIBADD = \
        $(top_builddir)/src/flash/nand/libocdflashnand.la
 
 noinst_HEADERS = \
-       arm_nandio.h \
        common.h \
        mflash.h \
        nand.h
index 3885a7b..667ef8f 100644 (file)
@@ -3,9 +3,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 noinst_LTLIBRARIES = libocdflashnand.la
 
 libocdflashnand_la_SOURCES = \
+       ecc.c \
+       ecc_kw.c \
        core.c \
        fileio.c \
        tcl.c \
+       arm_io.c \
        $(NAND_DRIVERS) \
        driver.c
 
@@ -22,6 +25,7 @@ NAND_DRIVERS = \
        s3c2443.c
 
 noinst_HEADERS = \
+       arm_io.h \
        lpc3180.h \
        driver.h \
        mx3.h \
similarity index 99%
rename from src/flash/arm_nandio.c
rename to src/flash/nand/arm_io.c
index 67619d5..cc565dc 100644 (file)
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "arm_nandio.h"
+#include "arm_io.h"
 #include <target/armv4_5.h>
 #include <target/algorithm.h>
 
index 6677073..0152b4d 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
-#include <flash/arm_nandio.h>
+#include "arm_io.h"
 
 
 enum ecc {
similarity index 99%
rename from src/flash/nand_ecc.c
rename to src/flash/nand/ecc.c
index 7aa1519..1e103d0 100644 (file)
@@ -41,7 +41,7 @@
 #include "config.h"
 #endif
 
-#include "nand.h"
+#include <flash/nand.h>
 
 /*
  * Pre-calculated 256-way 1 byte column parity
similarity index 99%
rename from src/flash/nand_ecc_kw.c
rename to src/flash/nand/ecc_kw.c
index a809b32..55273c5 100644 (file)
@@ -20,9 +20,7 @@
 #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.
index b124dee..4b174da 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <flash/arm_nandio.h>
+#include "arm_io.h"
 #include <target/armv4_5.h>