move nor drivers to src/flash/nor

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

37 files changed, 56 insertions, 50 deletions

diff --git a/configure.in b/configure.in
index 3680cac5..7b2b4af3 100644
--- 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 353fcf16..54a5116e 100644
--- 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
index 00000000..d2d99981
--- /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
index 643705ca..643705ca 100644
--- a/src/flash/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
diff --git a/src/flash/at91sam3.c b/src/flash/nor/at91sam3.c
index be17a5f8..be17a5f8 100644
--- a/src/flash/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
diff --git a/src/flash/at91sam3.h b/src/flash/nor/at91sam3.h
index 4fa7f467..4fa7f467 100644
--- a/src/flash/at91sam3.h
+++ b/src/flash/nor/at91sam3.h
diff --git a/src/flash/at91sam7.c b/src/flash/nor/at91sam7.c
index f9b87bab..f9b87bab 100644
--- a/src/flash/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
diff --git a/src/flash/at91sam7.h b/src/flash/nor/at91sam7.h
index 45106869..45106869 100644
--- a/src/flash/at91sam7.h
+++ b/src/flash/nor/at91sam7.h
diff --git a/src/flash/avrf.c b/src/flash/nor/avrf.c
index 687dd4b5..687dd4b5 100644
--- a/src/flash/avrf.c
+++ b/src/flash/nor/avrf.c
diff --git a/src/flash/avrf.h b/src/flash/nor/avrf.h
index e75d9d7e..e75d9d7e 100644
--- a/src/flash/avrf.h
+++ b/src/flash/nor/avrf.h
diff --git a/src/flash/cfi.c b/src/flash/nor/cfi.c
index 6dbffb9e..6dbffb9e 100644
--- a/src/flash/cfi.c
+++ b/src/flash/nor/cfi.c
diff --git a/src/flash/cfi.h b/src/flash/nor/cfi.h
index d55fd34e..d55fd34e 100644
--- a/src/flash/cfi.h
+++ b/src/flash/nor/cfi.h
diff --git a/src/flash/ecos.c b/src/flash/nor/ecos.c
index 7a0b26f3..7a0b26f3 100644
--- a/src/flash/ecos.c
+++ b/src/flash/nor/ecos.c
diff --git a/src/flash/faux.c b/src/flash/nor/faux.c
index caec2c79..caec2c79 100644
--- a/src/flash/faux.c
+++ b/src/flash/nor/faux.c
diff --git a/src/flash/lpc2000.c b/src/flash/nor/lpc2000.c
index 418b5b03..418b5b03 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
diff --git a/src/flash/lpc2000.h b/src/flash/nor/lpc2000.h
index 08e278a3..08e278a3 100644
--- a/src/flash/lpc2000.h
+++ b/src/flash/nor/lpc2000.h
diff --git a/src/flash/lpc288x.c b/src/flash/nor/lpc288x.c
index 446fc9da..446fc9da 100644
--- a/src/flash/lpc288x.c
+++ b/src/flash/nor/lpc288x.c
diff --git a/src/flash/lpc288x.h b/src/flash/nor/lpc288x.h
index 5a71ee08..5a71ee08 100644
--- a/src/flash/lpc288x.h
+++ b/src/flash/nor/lpc288x.h
diff --git a/src/flash/lpc2900.c b/src/flash/nor/lpc2900.c
index 81e2def4..81e2def4 100644
--- a/src/flash/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
diff --git a/src/flash/non_cfi.c b/src/flash/nor/non_cfi.c
index f98b1080..f98b1080 100644
--- a/src/flash/non_cfi.c
+++ b/src/flash/nor/non_cfi.c
diff --git a/src/flash/non_cfi.h b/src/flash/nor/non_cfi.h
index 44c92db4..44c92db4 100644
--- a/src/flash/non_cfi.h
+++ b/src/flash/nor/non_cfi.h
diff --git a/src/flash/ocl.c b/src/flash/nor/ocl.c
index 388395f0..388395f0 100644
--- a/src/flash/ocl.c
+++ b/src/flash/nor/ocl.c
diff --git a/src/flash/ocl.h b/src/flash/nor/ocl.h
index d5c430be..d5c430be 100644
--- a/src/flash/ocl.h
+++ b/src/flash/nor/ocl.h
diff --git a/src/flash/pic32mx.c b/src/flash/nor/pic32mx.c
index 9bb6c97e..9bb6c97e 100644
--- a/src/flash/pic32mx.c
+++ b/src/flash/nor/pic32mx.c
diff --git a/src/flash/pic32mx.h b/src/flash/nor/pic32mx.h
index 92f40c2e..92f40c2e 100644
--- a/src/flash/pic32mx.h
+++ b/src/flash/nor/pic32mx.h
diff --git a/src/flash/stellaris.c b/src/flash/nor/stellaris.c
index 771f0a71..771f0a71 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/nor/stellaris.c
diff --git a/src/flash/stellaris.h b/src/flash/nor/stellaris.h
index 949a346d..949a346d 100644
--- a/src/flash/stellaris.h
+++ b/src/flash/nor/stellaris.h
diff --git a/src/flash/stm32x.c b/src/flash/nor/stm32x.c
index 2f51aa55..2f51aa55 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/nor/stm32x.c
diff --git a/src/flash/stm32x.h b/src/flash/nor/stm32x.h
index 6cd047e1..6cd047e1 100644
--- a/src/flash/stm32x.h
+++ b/src/flash/nor/stm32x.h
diff --git a/src/flash/str7x.c b/src/flash/nor/str7x.c
index 7edffac9..7edffac9 100644
--- a/src/flash/str7x.c
+++ b/src/flash/nor/str7x.c
diff --git a/src/flash/str7x.h b/src/flash/nor/str7x.h
index 81af0f1e..81af0f1e 100644
--- a/src/flash/str7x.h
+++ b/src/flash/nor/str7x.h
diff --git a/src/flash/str9x.c b/src/flash/nor/str9x.c
index 98f15e75..98f15e75 100644
--- a/src/flash/str9x.c
+++ b/src/flash/nor/str9x.c
diff --git a/src/flash/str9x.h b/src/flash/nor/str9x.h
index c9d5152f..c9d5152f 100644
--- a/src/flash/str9x.h
+++ b/src/flash/nor/str9x.h
diff --git a/src/flash/str9xpec.c b/src/flash/nor/str9xpec.c
index 96e12596..96e12596 100644
--- a/src/flash/str9xpec.c
+++ b/src/flash/nor/str9xpec.c
diff --git a/src/flash/str9xpec.h b/src/flash/nor/str9xpec.h
index 1c8d41b1..1c8d41b1 100644
--- a/src/flash/str9xpec.h
+++ b/src/flash/nor/str9xpec.h
diff --git a/src/flash/tms470.c b/src/flash/nor/tms470.c
index 59659346..59659346 100644
--- a/src/flash/tms470.c
+++ b/src/flash/nor/tms470.c
diff --git a/src/flash/tms470.h b/src/flash/nor/tms470.h
index f275e510..f275e510 100644
--- a/src/flash/tms470.h
+++ b/src/flash/nor/tms470.h