diff options
| author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-06-14 14:48:22 +0000 |
|---|---|---|
| committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-06-14 14:48:22 +0000 |
| commit | 09883194f86725f4eae7e6db9eabcf6b3d1511de (patch) | |
| tree | d9dd65b05a8b97aed7cbea16bd04013c02cec59d /src/flash | |
| parent | 53d1f9b2ca5718e4996e9cf3406f857d0ed26df2 (diff) | |
| download | openocd_libswd-09883194f86725f4eae7e6db9eabcf6b3d1511de.tar.gz openocd_libswd-09883194f86725f4eae7e6db9eabcf6b3d1511de.tar.bz2 openocd_libswd-09883194f86725f4eae7e6db9eabcf6b3d1511de.tar.xz openocd_libswd-09883194f86725f4eae7e6db9eabcf6b3d1511de.zip | |
- merged support for Cortex-M3 from cortex-m3 branch (thanks to Magnus Lundin)
git-svn-id: svn://svn.berlios.de/openocd/trunk@170 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/Makefile.am | 4 | ||||
| -rw-r--r-- | src/flash/flash.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 8f99e05e..8d30790b 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes) METASOURCES = AUTO noinst_LIBRARIES = libflash.a -libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c str7x.c str9x.c nand.c lpc3180_nand_controller.c -noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h str7x.h str9x.h nand.h lpc3180_nand_controller.h +libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c str7x.c str9x.c nand.c lpc3180_nand_controller.c stellaris.c +noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h str7x.h str9x.h nand.h lpc3180_nand_controller.h stellaris.h diff --git a/src/flash/flash.c b/src/flash/flash.c index fecb89b7..3c368f3f 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -55,6 +55,7 @@ extern flash_driver_t cfi_flash; extern flash_driver_t at91sam7_flash; extern flash_driver_t str7x_flash; extern flash_driver_t str9x_flash; +extern flash_driver_t stellaris_flash; flash_driver_t *flash_drivers[] = { @@ -63,6 +64,7 @@ flash_driver_t *flash_drivers[] = &at91sam7_flash, &str7x_flash, &str9x_flash, + &stellaris_flash, NULL, }; |