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>

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index b5cd52603e0a7b0d47f8473b02692ab9edc37ba1..ba44adb3846a36c42feee244157456df5bcde96e 100644 (file)
--- 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 (file)
index 056e1ae..0000000
--- 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 8077879416358554dd0d664673333961a811e55e..eb35433739f15a3be18223b31e733dae6162d76f 100644 (file)
--- 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 0f270e6f487775316d50c18940159e28887f8f88..1a69e86292fb3b2bba54d563a84f5b8370da2b0e 100644 (file)
--- 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 565a2b6cf64878a27230fcba64ed2b8edf20024a..fa717dc815ccdb50c5d6f1c603426a3cc149083f 100644 (file)
--- 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 30be3048222e7bf9871e91705836ddd6bcfa96b9..f1f90e70143ab72f7e3388fc235ff33608a67946 100644 (file)
--- 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 06f634ab89f2e6a55d31c24292688dee97883d83..cd5fb734675c5f759d8226d1237bc7a6cfab30ad 100644 (file)
--- 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 f98b108014c621232c38b54cd583e50bb94014d2..7e73afa1c9ae8a4713ab6eda795acb0b3935760e 100644 (file)
--- 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 cc6004e82221ef3d326086a400c6e5d7f4bf95ba..021933356d294186f9b3cb844328ec09490eafc2 100644 (file)
--- 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 b33e8317482f18e1565e17b254a6f831b350642f..b3bdad29a5b7df655ce56e3a693924bb33b6df58 100644 (file)
--- 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 85b709cc69f9c91df3c6286563e02c66dd1864a9..a5f04e48fe05cd84a5464f3cfaad954fb8d4fa39 100644 (file)
--- 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 b6e00edc3752e4f58517b9cea55fe0e734462393..fcf895c60ca93d3df51861e07ca3d60f1e1fb8bd 100644 (file)
--- 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 4daafb7d13782d7786d9b9f74265aa05ca6232fc..77dfee6d32c91509d3e34b42250314d9c58722c2 100644 (file)
--- 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 29adecfae794eb5543173057eee375662db12738..ba5386fcbb0497a2279fd780a92fa1d61e43b7b7 100644 (file)
--- 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 cb2ac7807bc10e682c131301bfa9959059065aba..6eecd8a6770553f342c75b4b4735109368ca5323 100644 (file)
--- 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 b2fea1b1762b0ffb569982c9f8b40e13fae1de78..ecbfad8f48071d93f36a7f8f680f62c13b3155d5 100644 (file)
--- 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;

diff --git a/src/openocd.c b/src/openocd.c
index b6dc010e5844f3f27a4239ce19d3a7390db62db9..e500ba6081a9182dbea9d91127e77ea28411e8f3 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -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>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 21cd0fed9f050cfa798665fa7518bd2dcfa556a5..f9cca99f37e0ad24a8d4e37c261427ad77636f09 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -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>