move nor drivers to src/flash/nor

Moves NOR flash drivers to 'src/flash/nor/'.
Adds 'src/flash/nor/Makefile.am'.
Builds 'libocdflashnor.la'.

diff --git a/configure.in b/configure.in
index 3680cac52e4daf173e7d1a0211d0deb8c44c6627..7b2b4af3da099b09bf6735a420014bde3f9991bd 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/flash/nor/Makefile dnl
     src/flash/nand/Makefile dnl
     src/pld/Makefile dnl
     doc/Makefile dnl

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 353fcf1650a0eb88efddad55e39db5fc9161ae8c..54a5116ee8f8991b6a4a4fef6d096a58b8d2a200 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+       nor \
        nand
 
 AM_CPPFLAGS = \
@@ -9,66 +10,24 @@ AM_CPPFLAGS = \
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
-       $(FLASH_SRCS) \
-       $(NAND_SRCS) \
-       mflash.c
-
-libflash_la_LIBADD = \
-       $(top_builddir)/src/flash/nand/libocdflashnand.la
-
-FLASH_SRCS = \
        common.c \
-       cfi.c \
-       non_cfi.c \
-       faux.c \
-       $(FLASH_DEVICES_SRCS) \
-       flash.c
-
-FLASH_DEVICES_SRCS = \
-       aduc702x.c \
-       at91sam3.c \
-       at91sam7.c \
-       avrf.c \
-       ecos.c \
-       lpc2000.c \
-       lpc288x.c \
-       lpc2900.c \
-       ocl.c \
-       pic32mx.c \
-       stellaris.c \
-       stm32x.c \
-       str7x.c \
-       str9x.c \
-       str9xpec.c \
-       tms470.c
-
-NAND_SRCS = \
+       flash.c \
        arm_nandio.c \
        nand_ecc.c \
        nand_ecc_kw.c \
-       nand.c
+       nand.c \
+       mflash.c
+
+libflash_la_LIBADD = \
+       $(top_builddir)/src/flash/nor/libocdflashnor.la \
+       $(top_builddir)/src/flash/nand/libocdflashnand.la
 
 noinst_HEADERS = \
        arm_nandio.h \
-       at91sam7.h \
-       at91sam3.h \
-       avrf.h \
-       cfi.h \
        common.h \
        flash.h \
-       lpc2000.h \
-       lpc288x.h \
        mflash.h \
-       non_cfi.h \
-       nand.h \
-       ocl.h \
-       pic32mx.h \
-       stellaris.h \
-       stm32x.h \
-       str7x.h \
-       str9x.h \
-       str9xpec.h \
-       tms470.h
+       nand.h
 
 EXTRA_DIST = startup.tcl
 

diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
new file mode 100644 (file)
index 0000000..d2d9998
--- /dev/null
+++ b/src/flash/nor/Makefile.am
@@ -0,0 +1,46 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/helper \
+       -I$(top_srcdir)/src/jtag \
+       -I$(top_srcdir)/src/flash \
+       -I$(top_srcdir)/src/target
+
+noinst_LTLIBRARIES = libocdflashnor.la
+libocdflashnor_la_SOURCES = \
+       aduc702x.c \
+       at91sam3.c \
+       at91sam7.c \
+       avrf.c \
+       cfi.c \
+       ecos.c \
+       faux.c \
+       lpc2000.c \
+       lpc288x.c \
+       lpc2900.c \
+       non_cfi.c \
+       ocl.c \
+       pic32mx.c \
+       stellaris.c \
+       stm32x.c \
+       str7x.c \
+       str9x.c \
+       str9xpec.c \
+       tms470.c
+
+noinst_HEADERS = \
+       at91sam7.h \
+       at91sam3.h \
+       avrf.h \
+       cfi.h \
+       lpc2000.h \
+       lpc288x.h \
+       non_cfi.h \
+       ocl.h \
+       pic32mx.h \
+       stellaris.h \
+       stm32x.h \
+       str7x.h \
+       str9x.h \
+       str9xpec.h \
+       tms470.h
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

diff --git a/src/flash/aduc702x.c b/src/flash/nor/aduc702x.c
similarity index 100%
rename from src/flash/aduc702x.c
rename to src/flash/nor/aduc702x.c

diff --git a/src/flash/at91sam3.c b/src/flash/nor/at91sam3.c
similarity index 100%
rename from src/flash/at91sam3.c
rename to src/flash/nor/at91sam3.c

diff --git a/src/flash/at91sam3.h b/src/flash/nor/at91sam3.h
similarity index 100%
rename from src/flash/at91sam3.h
rename to src/flash/nor/at91sam3.h

diff --git a/src/flash/at91sam7.c b/src/flash/nor/at91sam7.c
similarity index 100%
rename from src/flash/at91sam7.c
rename to src/flash/nor/at91sam7.c

diff --git a/src/flash/at91sam7.h b/src/flash/nor/at91sam7.h
similarity index 100%
rename from src/flash/at91sam7.h
rename to src/flash/nor/at91sam7.h

diff --git a/src/flash/avrf.c b/src/flash/nor/avrf.c
similarity index 100%
rename from src/flash/avrf.c
rename to src/flash/nor/avrf.c

diff --git a/src/flash/avrf.h b/src/flash/nor/avrf.h
similarity index 100%
rename from src/flash/avrf.h
rename to src/flash/nor/avrf.h

diff --git a/src/flash/cfi.c b/src/flash/nor/cfi.c
similarity index 100%
rename from src/flash/cfi.c
rename to src/flash/nor/cfi.c

diff --git a/src/flash/cfi.h b/src/flash/nor/cfi.h
similarity index 100%
rename from src/flash/cfi.h
rename to src/flash/nor/cfi.h

diff --git a/src/flash/ecos.c b/src/flash/nor/ecos.c
similarity index 100%
rename from src/flash/ecos.c
rename to src/flash/nor/ecos.c

diff --git a/src/flash/faux.c b/src/flash/nor/faux.c
similarity index 100%
rename from src/flash/faux.c
rename to src/flash/nor/faux.c

diff --git a/src/flash/lpc2000.c b/src/flash/nor/lpc2000.c
similarity index 100%
rename from src/flash/lpc2000.c
rename to src/flash/nor/lpc2000.c

diff --git a/src/flash/lpc2000.h b/src/flash/nor/lpc2000.h
similarity index 100%
rename from src/flash/lpc2000.h
rename to src/flash/nor/lpc2000.h

diff --git a/src/flash/lpc288x.c b/src/flash/nor/lpc288x.c
similarity index 100%
rename from src/flash/lpc288x.c
rename to src/flash/nor/lpc288x.c

diff --git a/src/flash/lpc288x.h b/src/flash/nor/lpc288x.h
similarity index 100%
rename from src/flash/lpc288x.h
rename to src/flash/nor/lpc288x.h

diff --git a/src/flash/lpc2900.c b/src/flash/nor/lpc2900.c
similarity index 100%
rename from src/flash/lpc2900.c
rename to src/flash/nor/lpc2900.c

diff --git a/src/flash/non_cfi.c b/src/flash/nor/non_cfi.c
similarity index 100%
rename from src/flash/non_cfi.c
rename to src/flash/nor/non_cfi.c

diff --git a/src/flash/non_cfi.h b/src/flash/nor/non_cfi.h
similarity index 100%
rename from src/flash/non_cfi.h
rename to src/flash/nor/non_cfi.h

diff --git a/src/flash/ocl.c b/src/flash/nor/ocl.c
similarity index 100%
rename from src/flash/ocl.c
rename to src/flash/nor/ocl.c

diff --git a/src/flash/ocl.h b/src/flash/nor/ocl.h
similarity index 100%
rename from src/flash/ocl.h
rename to src/flash/nor/ocl.h

diff --git a/src/flash/pic32mx.c b/src/flash/nor/pic32mx.c
similarity index 100%
rename from src/flash/pic32mx.c
rename to src/flash/nor/pic32mx.c

diff --git a/src/flash/pic32mx.h b/src/flash/nor/pic32mx.h
similarity index 100%
rename from src/flash/pic32mx.h
rename to src/flash/nor/pic32mx.h

diff --git a/src/flash/stellaris.c b/src/flash/nor/stellaris.c
similarity index 100%
rename from src/flash/stellaris.c
rename to src/flash/nor/stellaris.c

diff --git a/src/flash/stellaris.h b/src/flash/nor/stellaris.h
similarity index 100%
rename from src/flash/stellaris.h
rename to src/flash/nor/stellaris.h

diff --git a/src/flash/stm32x.c b/src/flash/nor/stm32x.c
similarity index 100%
rename from src/flash/stm32x.c
rename to src/flash/nor/stm32x.c

diff --git a/src/flash/stm32x.h b/src/flash/nor/stm32x.h
similarity index 100%
rename from src/flash/stm32x.h
rename to src/flash/nor/stm32x.h

diff --git a/src/flash/str7x.c b/src/flash/nor/str7x.c
similarity index 100%
rename from src/flash/str7x.c
rename to src/flash/nor/str7x.c

diff --git a/src/flash/str7x.h b/src/flash/nor/str7x.h
similarity index 100%
rename from src/flash/str7x.h
rename to src/flash/nor/str7x.h

diff --git a/src/flash/str9x.c b/src/flash/nor/str9x.c
similarity index 100%
rename from src/flash/str9x.c
rename to src/flash/nor/str9x.c

diff --git a/src/flash/str9x.h b/src/flash/nor/str9x.h
similarity index 100%
rename from src/flash/str9x.h
rename to src/flash/nor/str9x.h

diff --git a/src/flash/str9xpec.c b/src/flash/nor/str9xpec.c
similarity index 100%
rename from src/flash/str9xpec.c
rename to src/flash/nor/str9xpec.c

diff --git a/src/flash/str9xpec.h b/src/flash/nor/str9xpec.h
similarity index 100%
rename from src/flash/str9xpec.h
rename to src/flash/nor/str9xpec.h

diff --git a/src/flash/tms470.c b/src/flash/nor/tms470.c
similarity index 100%
rename from src/flash/tms470.c
rename to src/flash/nor/tms470.c

diff --git a/src/flash/tms470.h b/src/flash/nor/tms470.h
similarity index 100%
rename from src/flash/tms470.h
rename to src/flash/nor/tms470.h