summaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/Makefile.am1
-rw-r--r--src/flash/flash.h33
-rw-r--r--src/flash/nor/at91sam7.h2
-rw-r--r--src/flash/nor/avrf.h2
-rw-r--r--src/flash/nor/cfi.h2
-rw-r--r--src/flash/nor/lpc2000.h2
-rw-r--r--src/flash/nor/lpc288x.h2
-rw-r--r--src/flash/nor/non_cfi.c3
-rw-r--r--src/flash/nor/non_cfi.h2
-rw-r--r--src/flash/nor/pic32mx.h2
-rw-r--r--src/flash/nor/stellaris.h2
-rw-r--r--src/flash/nor/stm32x.h2
-rw-r--r--src/flash/nor/str7x.h2
-rw-r--r--src/flash/nor/str9x.h2
-rw-r--r--src/flash/nor/str9xpec.h2
-rw-r--r--src/flash/nor/tms470.h2
16 files changed, 2 insertions, 61 deletions
diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index b5cd5260..ba44adb3 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -22,7 +22,6 @@ libflash_la_LIBADD = \
noinst_HEADERS = \
arm_nandio.h \
common.h \
- flash.h \
mflash.h \
nand.h
diff --git a/src/flash/flash.h b/src/flash/flash.h
deleted file mode 100644
index 056e1ae6..00000000
--- a/src/flash/flash.h
+++ /dev/null
@@ -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 */
diff --git a/src/flash/nor/at91sam7.h b/src/flash/nor/at91sam7.h
index 80778794..eb354337 100644
--- a/src/flash/nor/at91sam7.h
+++ b/src/flash/nor/at91sam7.h
@@ -23,8 +23,6 @@
#ifndef AT91SAM7_H
#define AT91SAM7_H
-#include <flash/flash.h>
-
struct at91sam7_flash_bank
{
/* chip id register */
diff --git a/src/flash/nor/avrf.h b/src/flash/nor/avrf.h
index 0f270e6f..1a69e862 100644
--- a/src/flash/nor/avrf.h
+++ b/src/flash/nor/avrf.h
@@ -20,8 +20,6 @@
#ifndef AVRF_H
#define AVRF_H
-#include <helper/types.h>
-
struct avrf_type
{
char name[15];
diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h
index 565a2b6c..fa717dc8 100644
--- a/src/flash/nor/cfi.h
+++ b/src/flash/nor/cfi.h
@@ -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 */
diff --git a/src/flash/nor/lpc2000.h b/src/flash/nor/lpc2000.h
index 30be3048..f1f90e70 100644
--- a/src/flash/nor/lpc2000.h
+++ b/src/flash/nor/lpc2000.h
@@ -23,8 +23,6 @@
#ifndef LPC2000_H
#define LPC2000_H
-#include <flash/flash.h>
-
typedef enum
{
lpc2000_v1,
diff --git a/src/flash/nor/lpc288x.h b/src/flash/nor/lpc288x.h
index 06f634ab..cd5fb734 100644
--- a/src/flash/nor/lpc288x.h
+++ b/src/flash/nor/lpc288x.h
@@ -21,8 +21,6 @@
#ifndef lpc288x_H
#define lpc288x_H
-#include <flash/flash.h>
-
struct lpc288x_flash_bank
{
uint32_t working_area;
diff --git a/src/flash/nor/non_cfi.c b/src/flash/nor/non_cfi.c
index f98b1080..7e73afa1 100644
--- a/src/flash/nor/non_cfi.c
+++ b/src/flash/nor/non_cfi.c
@@ -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
diff --git a/src/flash/nor/non_cfi.h b/src/flash/nor/non_cfi.h
index cc6004e8..02193335 100644
--- a/src/flash/nor/non_cfi.h
+++ b/src/flash/nor/non_cfi.h
@@ -20,8 +20,6 @@
#ifndef NON_CFI_H
#define NON_CFI_H
-#include <flash/flash.h>
-
struct non_cfi
{
uint16_t mfr;
diff --git a/src/flash/nor/pic32mx.h b/src/flash/nor/pic32mx.h
index b33e8317..b3bdad29 100644
--- a/src/flash/nor/pic32mx.h
+++ b/src/flash/nor/pic32mx.h
@@ -26,8 +26,6 @@
#ifndef PIC32MX_H
#define PIC32MX_H
-#include <flash/flash.h>
-
struct pic32mx_flash_bank
{
struct working_area *write_algorithm;
diff --git a/src/flash/nor/stellaris.h b/src/flash/nor/stellaris.h
index 85b709cc..a5f04e48 100644
--- a/src/flash/nor/stellaris.h
+++ b/src/flash/nor/stellaris.h
@@ -20,8 +20,6 @@
#ifndef STELLARIS_FLASH_H
#define STELLARIS_FLASH_H
-#include <flash/flash.h>
-
struct stellaris_flash_bank
{
/* chip id register */
diff --git a/src/flash/nor/stm32x.h b/src/flash/nor/stm32x.h
index b6e00edc..fcf895c6 100644
--- a/src/flash/nor/stm32x.h
+++ b/src/flash/nor/stm32x.h
@@ -23,8 +23,6 @@
#ifndef STM32X_H
#define STM32X_H
-#include <flash/flash.h>
-
struct stm32x_options
{
uint16_t RDP;
diff --git a/src/flash/nor/str7x.h b/src/flash/nor/str7x.h
index 4daafb7d..77dfee6d 100644
--- a/src/flash/nor/str7x.h
+++ b/src/flash/nor/str7x.h
@@ -23,8 +23,6 @@
#ifndef STR7X_H
#define STR7X_H
-#include <flash/flash.h>
-
struct str7x_flash_bank
{
uint32_t *sector_bits;
diff --git a/src/flash/nor/str9x.h b/src/flash/nor/str9x.h
index 29adecfa..ba5386fc 100644
--- a/src/flash/nor/str9x.h
+++ b/src/flash/nor/str9x.h
@@ -23,8 +23,6 @@
#ifndef STR9X_H
#define STR9X_H
-#include <flash/flash.h>
-
struct str9x_flash_bank
{
uint32_t *sector_bits;
diff --git a/src/flash/nor/str9xpec.h b/src/flash/nor/str9xpec.h
index cb2ac780..6eecd8a6 100644
--- a/src/flash/nor/str9xpec.h
+++ b/src/flash/nor/str9xpec.h
@@ -23,8 +23,6 @@
#ifndef STR9XPEC_H
#define STR9XPEC_H
-#include <flash/flash.h>
-#include <jtag/jtag.h>
struct str9xpec_flash_controller
{
diff --git a/src/flash/nor/tms470.h b/src/flash/nor/tms470.h
index b2fea1b1..ecbfad8f 100644
--- a/src/flash/nor/tms470.h
+++ b/src/flash/nor/tms470.h
@@ -20,8 +20,6 @@
#ifndef TMS470_DOT_H
#define TMS470_DOT_H
-#include <flash/flash.h>
-
struct tms470_flash_bank
{
unsigned ordinal;
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-23 17:16:39 +0000