move nor drivers to src/flash/nor
authorZachary T Welch <zw@superlucidity.net>
Wed, 2 Dec 2009 23:54:15 +0000 (15:54 -0800)
committerZachary T Welch <zw@superlucidity.net>
Thu, 3 Dec 2009 07:27:09 +0000 (23:27 -0800)
Moves NOR flash drivers to 'src/flash/nor/'.
Adds 'src/flash/nor/Makefile.am'.
Builds 'libocdflashnor.la'.

37 files changed:
configure.in
src/flash/Makefile.am
src/flash/nor/Makefile.am [new file with mode: 0644]
src/flash/nor/aduc702x.c [moved from src/flash/aduc702x.c with 100% similarity]
src/flash/nor/at91sam3.c [moved from src/flash/at91sam3.c with 100% similarity]
src/flash/nor/at91sam3.h [moved from src/flash/at91sam3.h with 100% similarity]
src/flash/nor/at91sam7.c [moved from src/flash/at91sam7.c with 100% similarity]
src/flash/nor/at91sam7.h [moved from src/flash/at91sam7.h with 100% similarity]
src/flash/nor/avrf.c [moved from src/flash/avrf.c with 100% similarity]
src/flash/nor/avrf.h [moved from src/flash/avrf.h with 100% similarity]
src/flash/nor/cfi.c [moved from src/flash/cfi.c with 100% similarity]
src/flash/nor/cfi.h [moved from src/flash/cfi.h with 100% similarity]
src/flash/nor/ecos.c [moved from src/flash/ecos.c with 100% similarity]
src/flash/nor/faux.c [moved from src/flash/faux.c with 100% similarity]
src/flash/nor/lpc2000.c [moved from src/flash/lpc2000.c with 100% similarity]
src/flash/nor/lpc2000.h [moved from src/flash/lpc2000.h with 100% similarity]
src/flash/nor/lpc288x.c [moved from src/flash/lpc288x.c with 100% similarity]
src/flash/nor/lpc288x.h [moved from src/flash/lpc288x.h with 100% similarity]
src/flash/nor/lpc2900.c [moved from src/flash/lpc2900.c with 100% similarity]
src/flash/nor/non_cfi.c [moved from src/flash/non_cfi.c with 100% similarity]
src/flash/nor/non_cfi.h [moved from src/flash/non_cfi.h with 100% similarity]
src/flash/nor/ocl.c [moved from src/flash/ocl.c with 100% similarity]
src/flash/nor/ocl.h [moved from src/flash/ocl.h with 100% similarity]
src/flash/nor/pic32mx.c [moved from src/flash/pic32mx.c with 100% similarity]
src/flash/nor/pic32mx.h [moved from src/flash/pic32mx.h with 100% similarity]
src/flash/nor/stellaris.c [moved from src/flash/stellaris.c with 100% similarity]
src/flash/nor/stellaris.h [moved from src/flash/stellaris.h with 100% similarity]
src/flash/nor/stm32x.c [moved from src/flash/stm32x.c with 100% similarity]
src/flash/nor/stm32x.h [moved from src/flash/stm32x.h with 100% similarity]
src/flash/nor/str7x.c [moved from src/flash/str7x.c with 100% similarity]
src/flash/nor/str7x.h [moved from src/flash/str7x.h with 100% similarity]
src/flash/nor/str9x.c [moved from src/flash/str9x.c with 100% similarity]
src/flash/nor/str9x.h [moved from src/flash/str9x.h with 100% similarity]
src/flash/nor/str9xpec.c [moved from src/flash/str9xpec.c with 100% similarity]
src/flash/nor/str9xpec.h [moved from src/flash/str9xpec.h with 100% similarity]
src/flash/nor/tms470.c [moved from src/flash/tms470.c with 100% similarity]
src/flash/nor/tms470.h [moved from src/flash/tms470.h with 100% similarity]

index 3680cac..7b2b4af 100644 (file)
@@ -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
index 353fcf1..54a5116 100644 (file)
@@ -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
@@ -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
similarity index 100%
rename from src/flash/avrf.c
rename to src/flash/nor/avrf.c
similarity index 100%
rename from src/flash/avrf.h
rename to src/flash/nor/avrf.h
similarity index 100%
rename from src/flash/cfi.c
rename to src/flash/nor/cfi.c
similarity index 100%
rename from src/flash/cfi.h
rename to src/flash/nor/cfi.h
similarity index 100%
rename from src/flash/ecos.c
rename to src/flash/nor/ecos.c
similarity index 100%
rename from src/flash/faux.c
rename to src/flash/nor/faux.c
similarity index 100%
rename from src/flash/lpc2000.c
rename to src/flash/nor/lpc2000.c
similarity index 100%
rename from src/flash/lpc2000.h
rename to src/flash/nor/lpc2000.h
similarity index 100%
rename from src/flash/lpc288x.c
rename to src/flash/nor/lpc288x.c
similarity index 100%
rename from src/flash/lpc288x.h
rename to src/flash/nor/lpc288x.h
similarity index 100%
rename from src/flash/lpc2900.c
rename to src/flash/nor/lpc2900.c
similarity index 100%
rename from src/flash/non_cfi.c
rename to src/flash/nor/non_cfi.c
similarity index 100%
rename from src/flash/non_cfi.h
rename to src/flash/nor/non_cfi.h
similarity index 100%
rename from src/flash/ocl.c
rename to src/flash/nor/ocl.c
similarity index 100%
rename from src/flash/ocl.h
rename to src/flash/nor/ocl.h
similarity index 100%
rename from src/flash/pic32mx.c
rename to src/flash/nor/pic32mx.c
similarity index 100%
rename from src/flash/pic32mx.h
rename to src/flash/nor/pic32mx.h
similarity index 100%
rename from src/flash/stm32x.c
rename to src/flash/nor/stm32x.c
similarity index 100%
rename from src/flash/stm32x.h
rename to src/flash/nor/stm32x.h
similarity index 100%
rename from src/flash/str7x.c
rename to src/flash/nor/str7x.c
similarity index 100%
rename from src/flash/str7x.h
rename to src/flash/nor/str7x.h
similarity index 100%
rename from src/flash/str9x.c
rename to src/flash/nor/str9x.c
similarity index 100%
rename from src/flash/str9x.h
rename to src/flash/nor/str9x.h
similarity index 100%
rename from src/flash/tms470.c
rename to src/flash/nor/tms470.c
similarity index 100%
rename from src/flash/tms470.h
rename to src/flash/nor/tms470.h