Browse Source

remove flash.h from tree

Remove the now vestigial <flash/flash.h> header from the tree,
replacing a few references with <flash/nor/core.h>
tags/v0.4.0-rc1
Zachary T Welch 12 years ago
parent
commit
f3e6f584f1
18 changed files with 4 additions and 63 deletions
  1. +0
    -1
      src/flash/Makefile.am
  2. +0
    -33
      src/flash/flash.h
  3. +0
    -2
      src/flash/nor/at91sam7.h
  4. +0
    -2
      src/flash/nor/avrf.h
  5. +0
    -2
      src/flash/nor/cfi.h
  6. +0
    -2
      src/flash/nor/lpc2000.h
  7. +0
    -2
      src/flash/nor/lpc288x.h
  8. +2
    -1
      src/flash/nor/non_cfi.c
  9. +0
    -2
      src/flash/nor/non_cfi.h
  10. +0
    -2
      src/flash/nor/pic32mx.h
  11. +0
    -2
      src/flash/nor/stellaris.h
  12. +0
    -2
      src/flash/nor/stm32x.h
  13. +0
    -2
      src/flash/nor/str7x.h
  14. +0
    -2
      src/flash/nor/str9x.h
  15. +0
    -2
      src/flash/nor/str9xpec.h
  16. +0
    -2
      src/flash/nor/tms470.h
  17. +1
    -1
      src/openocd.c
  18. +1
    -1
      src/server/gdb_server.c

+ 0
- 1
src/flash/Makefile.am View File

@@ -22,7 +22,6 @@ libflash_la_LIBADD = \
noinst_HEADERS = \
arm_nandio.h \
common.h \
flash.h \
mflash.h \
nand.h



+ 0
- 33
src/flash/flash.h View File

@@ -1,33 +0,0 @@
/***************************************************************************
* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
* Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008 by Spencer Oliver *
* spen@spen-soft.co.uk *
* *
* 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 FLASH_H
#define FLASH_H

// this file will be removed

#include <flash/nor/core.h>

#endif /* FLASH_H */

+ 0
- 2
src/flash/nor/at91sam7.h View File

@@ -23,8 +23,6 @@
#ifndef AT91SAM7_H
#define AT91SAM7_H

#include <flash/flash.h>

struct at91sam7_flash_bank
{
/* chip id register */


+ 0
- 2
src/flash/nor/avrf.h View File

@@ -20,8 +20,6 @@
#ifndef AVRF_H
#define AVRF_H

#include <helper/types.h>

struct avrf_type
{
char name[15];


+ 0
- 2
src/flash/nor/cfi.h View File

@@ -20,8 +20,6 @@
#ifndef CFI_H
#define CFI_H

#include <flash/flash.h>

#define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
#define CFI_STATUS_POLL_MASK_DQ6_DQ7 0xC0 /* DQ6..DQ7 */



+ 0
- 2
src/flash/nor/lpc2000.h View File

@@ -23,8 +23,6 @@
#ifndef LPC2000_H
#define LPC2000_H

#include <flash/flash.h>

typedef enum
{
lpc2000_v1,


+ 0
- 2
src/flash/nor/lpc288x.h View File

@@ -21,8 +21,6 @@
#ifndef lpc288x_H
#define lpc288x_H

#include <flash/flash.h>

struct lpc288x_flash_bank
{
uint32_t working_area;


+ 2
- 1
src/flash/nor/non_cfi.c View File

@@ -23,8 +23,9 @@
#include "config.h"
#endif

#include "non_cfi.h"
#include "imp.h"
#include "cfi.h"
#include "non_cfi.h"


#define KB 1024


+ 0
- 2
src/flash/nor/non_cfi.h View File

@@ -20,8 +20,6 @@
#ifndef NON_CFI_H
#define NON_CFI_H

#include <flash/flash.h>

struct non_cfi
{
uint16_t mfr;


+ 0
- 2
src/flash/nor/pic32mx.h View File

@@ -26,8 +26,6 @@
#ifndef PIC32MX_H
#define PIC32MX_H

#include <flash/flash.h>

struct pic32mx_flash_bank
{
struct working_area *write_algorithm;


+ 0
- 2
src/flash/nor/stellaris.h View File

@@ -20,8 +20,6 @@
#ifndef STELLARIS_FLASH_H
#define STELLARIS_FLASH_H

#include <flash/flash.h>

struct stellaris_flash_bank
{
/* chip id register */


+ 0
- 2
src/flash/nor/stm32x.h View File

@@ -23,8 +23,6 @@
#ifndef STM32X_H
#define STM32X_H

#include <flash/flash.h>

struct stm32x_options
{
uint16_t RDP;


+ 0
- 2
src/flash/nor/str7x.h View File

@@ -23,8 +23,6 @@
#ifndef STR7X_H
#define STR7X_H

#include <flash/flash.h>

struct str7x_flash_bank
{
uint32_t *sector_bits;


+ 0
- 2
src/flash/nor/str9x.h View File

@@ -23,8 +23,6 @@
#ifndef STR9X_H
#define STR9X_H

#include <flash/flash.h>

struct str9x_flash_bank
{
uint32_t *sector_bits;


+ 0
- 2
src/flash/nor/str9xpec.h View File

@@ -23,8 +23,6 @@
#ifndef STR9XPEC_H
#define STR9XPEC_H

#include <flash/flash.h>
#include <jtag/jtag.h>

struct str9xpec_flash_controller
{


+ 0
- 2
src/flash/nor/tms470.h View File

@@ -20,8 +20,6 @@
#ifndef TMS470_DOT_H
#define TMS470_DOT_H

#include <flash/flash.h>

struct tms470_flash_bank
{
unsigned ordinal;


+ 1
- 1
src/openocd.c View File

@@ -34,7 +34,7 @@
#include <helper/configuration.h>
#include <xsvf/xsvf.h>
#include <svf/svf.h>
#include <flash/flash.h>
#include <flash/nor/core.h>
#include <flash/nand.h>
#include <pld/pld.h>
#include <flash/mflash.h>


+ 1
- 1
src/server/gdb_server.c View File

@@ -31,7 +31,7 @@
#include <target/target_request.h>
#include <target/register.h>
#include "server.h"
#include <flash/flash.h>
#include <flash/nor/core.h>
#include "gdb_server.h"
#include <target/image.h>
#include <jtag/jtag.h>


Loading…
Cancel
Save