From f1f8d9a6c9b1fd35d79627b568faa2409f13311f Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Wed, 17 Nov 2010 21:12:37 +0800 Subject: [PATCH] FLASH/NOR: Remove useless file stellaris.h Signed-off-by: Antonio Borneo --- src/flash/nor/Makefile.am | 1 - src/flash/nor/stellaris.c | 86 +++++++++++++++++++++++++++++- src/flash/nor/stellaris.h | 107 -------------------------------------- 3 files changed, 85 insertions(+), 109 deletions(-) delete mode 100644 src/flash/nor/stellaris.h diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index ee8d993ceb..e7a84246c9 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -39,7 +39,6 @@ noinst_HEADERS = \ imp.h \ non_cfi.h \ ocl.h \ - stellaris.h \ stm32x.h \ str7x.h \ str9x.h \ diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 069ee8c1c1..12ea15b209 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -29,16 +29,100 @@ #endif #include "imp.h" -#include "stellaris.h" #include #include #define DID0_VER(did0) ((did0 >> 28)&0x07) +/* STELLARIS control registers */ +#define SCB_BASE 0x400FE000 +#define DID0 0x000 +#define DID1 0x004 +#define DC0 0x008 +#define DC1 0x010 +#define DC2 0x014 +#define DC3 0x018 +#define DC4 0x01C + +#define RIS 0x050 +#define RCC 0x060 +#define PLLCFG 0x064 +#define RCC2 0x070 +#define NVMSTAT 0x1a0 + +/* "legacy" flash memory protection registers (64KB max) */ +#define FMPRE 0x130 +#define FMPPE 0x134 + +/* new flash memory protection registers (for more than 64KB) */ +#define FMPRE0 0x200 /* PRE1 = PRE0 + 4, etc */ +#define FMPPE0 0x400 /* PPE1 = PPE0 + 4, etc */ + +#define USECRL 0x140 + +#define FLASH_CONTROL_BASE 0x400FD000 +#define FLASH_FMA (FLASH_CONTROL_BASE | 0x000) +#define FLASH_FMD (FLASH_CONTROL_BASE | 0x004) +#define FLASH_FMC (FLASH_CONTROL_BASE | 0x008) +#define FLASH_CRIS (FLASH_CONTROL_BASE | 0x00C) +#define FLASH_CIM (FLASH_CONTROL_BASE | 0x010) +#define FLASH_MISC (FLASH_CONTROL_BASE | 0x014) + +#define AMISC 1 +#define PMISC 2 + +#define AMASK 1 +#define PMASK 2 + +/* Flash Controller Command bits */ +#define FMC_WRKEY (0xA442 << 16) +#define FMC_COMT (1 << 3) +#define FMC_MERASE (1 << 2) +#define FMC_ERASE (1 << 1) +#define FMC_WRITE (1 << 0) + +/* STELLARIS constants */ + +/* values to write in FMA to commit write-"once" values */ +#define FLASH_FMA_PRE(x) (2 * (x)) /* for FMPPREx */ +#define FLASH_FMA_PPE(x) (2 * (x) + 1) /* for FMPPPEx */ + + static void stellaris_read_clock_info(struct flash_bank *bank); static int stellaris_mass_erase(struct flash_bank *bank); +struct stellaris_flash_bank +{ + /* chip id register */ + uint32_t did0; + uint32_t did1; + uint32_t dc0; + uint32_t dc1; + + char * target_name; + + uint32_t sramsiz; + uint32_t flshsz; + /* flash geometry */ + uint32_t num_pages; + uint32_t pagesize; + uint32_t pages_in_lockregion; + + /* nv memory bits */ + uint16_t num_lockbits; + + /* main clock status */ + uint32_t rcc; + uint32_t rcc2; + uint8_t mck_valid; + uint8_t xtal_mask; + uint32_t iosc_freq; + uint32_t mck_freq; + const char *iosc_desc; + const char *mck_desc; +}; + static struct { uint32_t partno; char *partname; diff --git a/src/flash/nor/stellaris.h b/src/flash/nor/stellaris.h deleted file mode 100644 index a469323505..0000000000 --- a/src/flash/nor/stellaris.h +++ /dev/null @@ -1,107 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006 by Magnus Lundin * - * lundin@mlu.mine.nu * - * * - * 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 STELLARIS_FLASH_H -#define STELLARIS_FLASH_H - -struct stellaris_flash_bank -{ - /* chip id register */ - uint32_t did0; - uint32_t did1; - uint32_t dc0; - uint32_t dc1; - - char * target_name; - - uint32_t sramsiz; - uint32_t flshsz; - /* flash geometry */ - uint32_t num_pages; - uint32_t pagesize; - uint32_t pages_in_lockregion; - - /* nv memory bits */ - uint16_t num_lockbits; - - /* main clock status */ - uint32_t rcc; - uint32_t rcc2; - uint8_t mck_valid; - uint8_t xtal_mask; - uint32_t iosc_freq; - uint32_t mck_freq; - const char *iosc_desc; - const char *mck_desc; -}; - -/* STELLARIS control registers */ -#define SCB_BASE 0x400FE000 -#define DID0 0x000 -#define DID1 0x004 -#define DC0 0x008 -#define DC1 0x010 -#define DC2 0x014 -#define DC3 0x018 -#define DC4 0x01C - -#define RIS 0x050 -#define RCC 0x060 -#define PLLCFG 0x064 -#define RCC2 0x070 -#define NVMSTAT 0x1a0 - -/* "legacy" flash memory protection registers (64KB max) */ -#define FMPRE 0x130 -#define FMPPE 0x134 - -/* new flash memory protection registers (for more than 64KB) */ -#define FMPRE0 0x200 /* PRE1 = PRE0 + 4, etc */ -#define FMPPE0 0x400 /* PPE1 = PPE0 + 4, etc */ - -#define USECRL 0x140 - -#define FLASH_CONTROL_BASE 0x400FD000 -#define FLASH_FMA (FLASH_CONTROL_BASE | 0x000) -#define FLASH_FMD (FLASH_CONTROL_BASE | 0x004) -#define FLASH_FMC (FLASH_CONTROL_BASE | 0x008) -#define FLASH_CRIS (FLASH_CONTROL_BASE | 0x00C) -#define FLASH_CIM (FLASH_CONTROL_BASE | 0x010) -#define FLASH_MISC (FLASH_CONTROL_BASE | 0x014) - -#define AMISC 1 -#define PMISC 2 - -#define AMASK 1 -#define PMASK 2 - -/* Flash Controller Command bits */ -#define FMC_WRKEY (0xA442 << 16) -#define FMC_COMT (1 << 3) -#define FMC_MERASE (1 << 2) -#define FMC_ERASE (1 << 1) -#define FMC_WRITE (1 << 0) - -/* STELLARIS constants */ - -/* values to write in FMA to commit write-"once" values */ -#define FLASH_FMA_PRE(x) (2 * (x)) /* for FMPPREx */ -#define FLASH_FMA_PPE(x) (2 * (x) + 1) /* for FMPPPEx */ - -#endif /* STELLARIS_H */ -- 2.30.2