From da3bcb392e852214b0dda878f6161c8f1e8d15f3 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 4 Dec 2009 21:38:13 -0800 Subject: [PATCH] move remaining nand helper files Move remaining NAND implementation files into src/flash/nand/. --- src/flash/Makefile.am | 4 ---- src/flash/nand/Makefile.am | 4 ++++ src/flash/{arm_nandio.c => nand/arm_io.c} | 2 +- src/flash/{arm_nandio.h => nand/arm_io.h} | 0 src/flash/nand/davinci.c | 2 +- src/flash/{nand_ecc.c => nand/ecc.c} | 2 +- src/flash/{nand_ecc_kw.c => nand/ecc_kw.c} | 4 +--- src/flash/nand/orion.c | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) rename src/flash/{arm_nandio.c => nand/arm_io.c} (99%) rename src/flash/{arm_nandio.h => nand/arm_io.h} (100%) rename src/flash/{nand_ecc.c => nand/ecc.c} (99%) rename src/flash/{nand_ecc_kw.c => nand/ecc_kw.c} (99%) diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 2144ff2dc..f8d708838 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 3885a7b91..667ef8fdf 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 similarity index 99% rename from src/flash/arm_nandio.c rename to src/flash/nand/arm_io.c index 67619d545..cc565dcbc 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 #include 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 66770737c..0152b4d93 100644 --- a/src/flash/nand/davinci.c +++ b/src/flash/nand/davinci.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include +#include "arm_io.h" 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 7aa1519dd..1e103d002 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 /* * 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 a809b3229..55273c58f 100644 --- a/src/flash/nand_ecc_kw.c +++ b/src/flash/nand/ecc_kw.c @@ -20,9 +20,7 @@ #include "config.h" #endif -#include -#include "nand.h" - +#include /***************************************************************************** * 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 b124deee6..4b174da35 100644 --- a/src/flash/nand/orion.c +++ b/src/flash/nand/orion.c @@ -26,7 +26,7 @@ #include "config.h" #endif -#include +#include "arm_io.h" #include