Browse Source

move nand drivers to src/flash/nand/

Moves NAND drivers to src/flash/nand/.
Adds src/flash/nand/Makefile.am.
Builds libocdflashnand.la.
tags/v0.4.0-rc1
Zachary T Welch 11 years ago
parent
commit
e1ec02bb05
17 changed files with 43 additions and 27 deletions
  1. +1
    -0
      configure.in
  2. +7
    -19
      src/flash/Makefile.am
  3. +27
    -0
      src/flash/nand/Makefile.am
  4. +0
    -0
      src/flash/nand/davinci.c
  5. +1
    -1
      src/flash/nand/lpc3180.c
  6. +0
    -0
      src/flash/nand/lpc3180.h
  7. +1
    -1
      src/flash/nand/mx3.c
  8. +0
    -0
      src/flash/nand/mx3.h
  9. +0
    -0
      src/flash/nand/nonce.c
  10. +0
    -0
      src/flash/nand/orion.c
  11. +1
    -1
      src/flash/nand/s3c2410.c
  12. +1
    -1
      src/flash/nand/s3c2412.c
  13. +1
    -1
      src/flash/nand/s3c2440.c
  14. +1
    -1
      src/flash/nand/s3c2443.c
  15. +1
    -1
      src/flash/nand/s3c24xx.c
  16. +1
    -1
      src/flash/nand/s3c24xx.h
  17. +0
    -0
      src/flash/nand/s3c24xx_regs.h

+ 1
- 0
configure.in View File

@@ -1122,6 +1122,7 @@ AC_OUTPUT(dnl
src/target/Makefile dnl
src/server/Makefile dnl
src/flash/Makefile dnl
src/flash/nand/Makefile dnl
src/pld/Makefile dnl
doc/Makefile dnl
)

+ 7
- 19
src/flash/Makefile.am View File

@@ -1,3 +1,6 @@
SUBDIRS = \
nand

AM_CPPFLAGS = \
-I$(top_srcdir)/src/helper \
-I$(top_srcdir)/src/jtag \
@@ -10,6 +13,9 @@ libflash_la_SOURCES = \
$(NAND_SRCS) \
mflash.c

libflash_la_LIBADD = \
$(top_builddir)/src/flash/nand/libocdflashnand.la

FLASH_SRCS = \
common.c \
cfi.c \
@@ -40,22 +46,8 @@ NAND_SRCS = \
arm_nandio.c \
nand_ecc.c \
nand_ecc_kw.c \
$(NAND_DEVICES_SRCS) \
nand.c

NAND_DEVICES_SRCS = \
nonce_nand.c \
davinci_nand.c \
lpc3180_nand_controller.c \
mx3_nand.c \
orion_nand.c \
s3c24xx_nand.c \
s3c2410_nand.c \
s3c2412_nand.c \
s3c2440_nand.c \
s3c2443_nand.c


noinst_HEADERS = \
arm_nandio.h \
at91sam7.h \
@@ -66,9 +58,7 @@ noinst_HEADERS = \
flash.h \
lpc2000.h \
lpc288x.h \
lpc3180_nand_controller.h \
mflash.h \
mx3_nand.h \
non_cfi.h \
nand.h \
ocl.h \
@@ -78,9 +68,7 @@ noinst_HEADERS = \
str7x.h \
str9x.h \
str9xpec.h \
tms470.h \
s3c24xx_nand.h \
s3c24xx_regs_nand.h
tms470.h

EXTRA_DIST = startup.tcl



+ 27
- 0
src/flash/nand/Makefile.am View File

@@ -0,0 +1,27 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/flash \
-I$(top_srcdir)/src/helper \
-I$(top_srcdir)/src/jtag \
-I$(top_srcdir)/src/target

noinst_LTLIBRARIES = libocdflashnand.la

libocdflashnand_la_SOURCES = \
nonce.c \
davinci.c \
lpc3180.c \
mx3.c \
orion.c \
s3c24xx.c \
s3c2410.c \
s3c2412.c \
s3c2440.c \
s3c2443.c

noinst_HEADERS = \
lpc3180.h \
mx3.h \
s3c24xx.h \
s3c24xx_regs.h

MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

src/flash/davinci_nand.c → src/flash/nand/davinci.c View File


src/flash/lpc3180_nand_controller.c → src/flash/nand/lpc3180.c View File

@@ -21,7 +21,7 @@
#include "config.h"
#endif

#include "lpc3180_nand_controller.h"
#include "lpc3180.h"
#include "nand.h"

static int lpc3180_reset(struct nand_device *nand);

src/flash/lpc3180_nand_controller.h → src/flash/nand/lpc3180.h View File


src/flash/mx3_nand.c → src/flash/nand/mx3.c View File

@@ -35,7 +35,7 @@ get_next_halfword_from_sram_buffer() not tested
#include "config.h"
#endif

#include "mx3_nand.h"
#include "mx3.h"

static const char target_not_halted_err_msg[] =
"target must be halted to use mx3 NAND flash controller";

src/flash/mx3_nand.h → src/flash/nand/mx3.h View File


src/flash/nonce_nand.c → src/flash/nand/nonce.c View File


src/flash/orion_nand.c → src/flash/nand/orion.c View File


src/flash/s3c2410_nand.c → src/flash/nand/s3c2410.c View File

@@ -28,7 +28,7 @@
#include "config.h"
#endif

#include "s3c24xx_nand.h"
#include "s3c24xx.h"

NAND_DEVICE_COMMAND_HANDLER(s3c2410_nand_device_command)
{

src/flash/s3c2412_nand.c → src/flash/nand/s3c2412.c View File

@@ -28,7 +28,7 @@
#include "config.h"
#endif

#include "s3c24xx_nand.h"
#include "s3c24xx.h"

NAND_DEVICE_COMMAND_HANDLER(s3c2412_nand_device_command)
{

src/flash/s3c2440_nand.c → src/flash/nand/s3c2440.c View File

@@ -28,7 +28,7 @@
#include "config.h"
#endif

#include "s3c24xx_nand.h"
#include "s3c24xx.h"


NAND_DEVICE_COMMAND_HANDLER(s3c2440_nand_device_command)

src/flash/s3c2443_nand.c → src/flash/nand/s3c2443.c View File

@@ -28,7 +28,7 @@
#include "config.h"
#endif

#include "s3c24xx_nand.h"
#include "s3c24xx.h"


NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)

src/flash/s3c24xx_nand.c → src/flash/nand/s3c24xx.c View File

@@ -28,7 +28,7 @@
#include "config.h"
#endif

#include "s3c24xx_nand.h"
#include "s3c24xx.h"


S3C24XX_DEVICE_COMMAND()

src/flash/s3c24xx_nand.h → src/flash/nand/s3c24xx.h View File

@@ -28,7 +28,7 @@
*/

#include "nand.h"
#include "s3c24xx_regs_nand.h"
#include "s3c24xx_regs.h"

struct s3c24xx_nand_controller
{

src/flash/s3c24xx_regs_nand.h → src/flash/nand/s3c24xx_regs.h View File


Loading…
Cancel
Save