diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-12-04 21:38:13 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-12-04 21:47:47 -0800 |
| commit | da3bcb392e852214b0dda878f6161c8f1e8d15f3 (patch) | |
| tree | 74ca2bf2d50a4264d96e270fe1ccff5883c6b0c5 /src/flash | |
| parent | 747d6f22868dd87cb54341cc22d9eb3687039735 (diff) | |
| download | openocd+libswd-da3bcb392e852214b0dda878f6161c8f1e8d15f3.tar.gz openocd+libswd-da3bcb392e852214b0dda878f6161c8f1e8d15f3.tar.bz2 openocd+libswd-da3bcb392e852214b0dda878f6161c8f1e8d15f3.tar.xz openocd+libswd-da3bcb392e852214b0dda878f6161c8f1e8d15f3.zip | |
move remaining nand helper files
Move remaining NAND implementation files into src/flash/nand/.
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/Makefile.am | 4 | ||||
| -rw-r--r-- | src/flash/nand/Makefile.am | 4 | ||||
| -rw-r--r-- | src/flash/nand/arm_io.c (renamed from src/flash/arm_nandio.c) | 2 | ||||
| -rw-r--r-- | src/flash/nand/arm_io.h (renamed from src/flash/arm_nandio.h) | 0 | ||||
| -rw-r--r-- | src/flash/nand/davinci.c | 2 | ||||
| -rw-r--r-- | src/flash/nand/ecc.c (renamed from src/flash/nand_ecc.c) | 2 | ||||
| -rw-r--r-- | src/flash/nand/ecc_kw.c (renamed from src/flash/nand_ecc_kw.c) | 4 | ||||
| -rw-r--r-- | src/flash/nand/orion.c | 2 |
8 files changed, 9 insertions, 11 deletions
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 2144ff2d..f8d70883 100644 --- 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 \ - 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 diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am index 3885a7b9..667ef8fd 100644 --- 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 = \ + 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 \ diff --git a/src/flash/arm_nandio.c b/src/flash/nand/arm_io.c index 67619d54..cc565dcb 100644 --- a/src/flash/arm_nandio.c +++ b/src/flash/nand/arm_io.c @@ -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> diff --git a/src/flash/arm_nandio.h b/src/flash/nand/arm_io.h index d3504f43..d3504f43 100644 --- a/src/flash/arm_nandio.h +++ b/src/flash/nand/arm_io.h diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c index 66770737..0152b4d9 100644 --- a/src/flash/nand/davinci.c +++ b/src/flash/nand/davinci.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include <flash/arm_nandio.h> +#include "arm_io.h" enum ecc { diff --git a/src/flash/nand_ecc.c b/src/flash/nand/ecc.c index 7aa1519d..1e103d00 100644 --- a/src/flash/nand_ecc.c +++ b/src/flash/nand/ecc.c @@ -41,7 +41,7 @@ #include "config.h" #endif -#include "nand.h" +#include <flash/nand.h> /* * Pre-calculated 256-way 1 byte column parity diff --git a/src/flash/nand_ecc_kw.c b/src/flash/nand/ecc_kw.c index a809b322..55273c58 100644 --- a/src/flash/nand_ecc_kw.c +++ b/src/flash/nand/ecc_kw.c @@ -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. diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c index b124deee..4b174da3 100644 --- a/src/flash/nand/orion.c +++ b/src/flash/nand/orion.c @@ -26,7 +26,7 @@ #include "config.h" #endif -#include <flash/arm_nandio.h> +#include "arm_io.h" #include <target/armv4_5.h> |