]> git.sur5r.net Git - openocd/commitdiff
FLASH/NOR: Remove useless file at91sam7.h
authorAntonio Borneo <borneo.antonio@gmail.com>
Wed, 17 Nov 2010 02:53:30 +0000 (10:53 +0800)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 17 Nov 2010 07:55:39 +0000 (08:55 +0100)
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
src/flash/nor/Makefile.am
src/flash/nor/at91sam7.c
src/flash/nor/at91sam7.h [deleted file]

index 242fb791548ac62af84fefb423f15ca111478406..b008d759d423f05ad2b04a2d532b5700b522f38b 100644 (file)
@@ -33,7 +33,6 @@ NOR_DRIVERS = \
        virtual.c
 
 noinst_HEADERS = \
-       at91sam7.h \
        avrf.h \
        core.h \
        cfi.h \
index 3a809e250dc884e55f40bc2358c97272a877a167..3fabe478d683612faf2936cb53196b8e4cce9906 100644 (file)
 #endif
 
 #include "imp.h"
-#include "at91sam7.h"
 #include <helper/binarybuffer.h>
 
+
+/* AT91SAM7 control registers */
+#define DBGU_CIDR                      0xFFFFF240
+#define CKGR_MCFR                      0xFFFFFC24
+#define CKGR_MOR                       0xFFFFFC20
+#define CKGR_MCFR_MAINRDY      0x10000
+#define CKGR_PLLR                      0xFFFFFC2c
+#define CKGR_PLLR_DIV          0xff
+#define CKGR_PLLR_MUL          0x07ff0000
+#define PMC_MCKR                       0xFFFFFC30
+#define PMC_MCKR_CSS           0x03
+#define PMC_MCKR_PRES          0x1c
+
+/* Flash Controller Commands */
+#define WP             0x01
+#define SLB            0x02
+#define WPL            0x03
+#define CLB            0x04
+#define EA             0x08
+#define SGPB   0x0B
+#define CGPB   0x0D
+#define SSB            0x0F
+
+/* MC_FSR bit definitions */
+#define MC_FSR_FRDY                    1
+#define MC_FSR_EOL                     2
+
+/* AT91SAM7 constants */
+#define RC_FREQ                                32000
+
+/* Flash timing modes */
+#define FMR_TIMING_NONE                0
+#define FMR_TIMING_NVBITS      1
+#define FMR_TIMING_FLASH       2
+
+/* Flash size constants */
+#define FLASH_SIZE_8KB         1
+#define FLASH_SIZE_16KB                2
+#define FLASH_SIZE_32KB                3
+#define FLASH_SIZE_64KB                5
+#define FLASH_SIZE_128KB       7
+#define FLASH_SIZE_256KB       9
+#define FLASH_SIZE_512KB       10
+#define FLASH_SIZE_1024KB      12
+#define FLASH_SIZE_2048KB      14
+
+
 static int at91sam7_protect_check(struct flash_bank *bank);
 static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 
@@ -67,6 +113,50 @@ static uint32_t MC_FSR[4] = { 0xFFFFFF68, 0xFFFFFF78, 0xFFFFFF88, 0xFFFFFF98 };
 
 static char * EPROC[8]= {"Unknown","ARM946-E","ARM7TDMI","Unknown","ARM920T","ARM926EJ-S","Unknown","Unknown"};
 
+struct at91sam7_flash_bank
+{
+       /* chip id register */
+       uint32_t cidr;
+       uint16_t cidr_ext;
+       uint16_t cidr_nvptyp;
+       uint16_t cidr_arch;
+       uint16_t cidr_sramsiz;
+       uint16_t cidr_nvpsiz;
+       uint16_t cidr_nvpsiz2;
+       uint16_t cidr_eproc;
+       uint16_t cidr_version;
+       char *target_name;
+
+       /* flash auto-detection */
+       uint8_t  flash_autodetection;
+
+       /* flash geometry */
+       uint16_t pages_per_sector;
+       uint16_t pagesize;
+       uint16_t pages_in_lockregion;
+
+       /* nv memory bits */
+       uint16_t num_lockbits_on;
+       uint16_t lockbits;
+       uint16_t num_nvmbits;
+       uint16_t num_nvmbits_on;
+       uint16_t nvmbits;
+       uint8_t  securitybit;
+
+       /* 0: not init
+        * 1: fmcn for nvbits (1uS)
+        * 2: fmcn for flash (1.5uS) */
+       uint8_t  flashmode;
+
+       /* main clock status */
+       uint8_t  mck_valid;
+       uint32_t mck_freq;
+
+       /* external clock frequency */
+       uint32_t ext_freq;
+
+};
+
 #if 0
 static long SRAMSIZ[16] = {
        -1,
diff --git a/src/flash/nor/at91sam7.h b/src/flash/nor/at91sam7.h
deleted file mode 100644 (file)
index eb35433..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Magnus Lundin                                   *
- *   lundin@mlu.mine.nu                                                    *
- *                                                                         *
- *   Copyright (C) 2006 by Gheorghe Guran (atlas)                          *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef AT91SAM7_H
-#define AT91SAM7_H
-
-struct at91sam7_flash_bank
-{
-       /* chip id register */
-       uint32_t cidr;
-       uint16_t cidr_ext;
-       uint16_t cidr_nvptyp;
-       uint16_t cidr_arch;
-       uint16_t cidr_sramsiz;
-       uint16_t cidr_nvpsiz;
-       uint16_t cidr_nvpsiz2;
-       uint16_t cidr_eproc;
-       uint16_t cidr_version;
-       char *target_name;
-
-       /* flash auto-detection */
-       uint8_t  flash_autodetection;
-
-       /* flash geometry */
-       uint16_t pages_per_sector;
-       uint16_t pagesize;
-       uint16_t pages_in_lockregion;
-
-       /* nv memory bits */
-       uint16_t num_lockbits_on;
-       uint16_t lockbits;
-       uint16_t num_nvmbits;
-       uint16_t num_nvmbits_on;
-       uint16_t nvmbits;
-       uint8_t  securitybit;
-
-       /* 0: not init
-        * 1: fmcn for nvbits (1uS)
-        * 2: fmcn for flash (1.5uS) */
-       uint8_t  flashmode;
-
-       /* main clock status */
-       uint8_t  mck_valid;
-       uint32_t mck_freq;
-
-       /* external clock frequency */
-       uint32_t ext_freq;
-
-};
-
-
-/* AT91SAM7 control registers */
-#define DBGU_CIDR                      0xFFFFF240
-#define CKGR_MCFR                      0xFFFFFC24
-#define CKGR_MOR                       0xFFFFFC20
-#define CKGR_MCFR_MAINRDY      0x10000
-#define CKGR_PLLR                      0xFFFFFC2c
-#define CKGR_PLLR_DIV          0xff
-#define CKGR_PLLR_MUL          0x07ff0000
-#define PMC_MCKR                       0xFFFFFC30
-#define PMC_MCKR_CSS           0x03
-#define PMC_MCKR_PRES          0x1c
-
-/* Flash Controller Commands */
-#define WP             0x01
-#define SLB            0x02
-#define WPL            0x03
-#define CLB            0x04
-#define EA             0x08
-#define SGPB   0x0B
-#define CGPB   0x0D
-#define SSB            0x0F
-
-/* MC_FSR bit definitions */
-#define MC_FSR_FRDY                    1
-#define MC_FSR_EOL                     2
-
-/* AT91SAM7 constants */
-#define RC_FREQ                                32000
-
-/* Flash timing modes */
-#define FMR_TIMING_NONE                0
-#define FMR_TIMING_NVBITS      1
-#define FMR_TIMING_FLASH       2
-
-/* Flash size constants */
-#define FLASH_SIZE_8KB         1
-#define FLASH_SIZE_16KB                2
-#define FLASH_SIZE_32KB                3
-#define FLASH_SIZE_64KB                5
-#define FLASH_SIZE_128KB       7
-#define FLASH_SIZE_256KB       9
-#define FLASH_SIZE_512KB       10
-#define FLASH_SIZE_1024KB      12
-#define FLASH_SIZE_2048KB      14
-
-#endif /* AT91SAM7_H */