From f3e6f584f12dbde9ba9806ed4a412db0524d438c Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 4 Dec 2009 16:40:19 -0800 Subject: [PATCH] remove flash.h from tree Remove the now vestigial header from the tree, replacing a few references with --- src/flash/Makefile.am | 1 - src/flash/flash.h | 33 --------------------------------- src/flash/nor/at91sam7.h | 2 -- src/flash/nor/avrf.h | 2 -- src/flash/nor/cfi.h | 2 -- src/flash/nor/lpc2000.h | 2 -- src/flash/nor/lpc288x.h | 2 -- src/flash/nor/non_cfi.c | 3 ++- src/flash/nor/non_cfi.h | 2 -- src/flash/nor/pic32mx.h | 2 -- src/flash/nor/stellaris.h | 2 -- src/flash/nor/stm32x.h | 2 -- src/flash/nor/str7x.h | 2 -- src/flash/nor/str9x.h | 2 -- src/flash/nor/str9xpec.h | 2 -- src/flash/nor/tms470.h | 2 -- src/openocd.c | 2 +- src/server/gdb_server.c | 2 +- 18 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 src/flash/flash.h diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index b5cd52603..ba44adb38 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 056e1ae62..000000000 --- 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 - -#endif /* FLASH_H */ diff --git a/src/flash/nor/at91sam7.h b/src/flash/nor/at91sam7.h index 807787941..eb3543373 100644 --- a/src/flash/nor/at91sam7.h +++ b/src/flash/nor/at91sam7.h @@ -23,8 +23,6 @@ #ifndef AT91SAM7_H #define AT91SAM7_H -#include - struct at91sam7_flash_bank { /* chip id register */ diff --git a/src/flash/nor/avrf.h b/src/flash/nor/avrf.h index 0f270e6f4..1a69e8629 100644 --- a/src/flash/nor/avrf.h +++ b/src/flash/nor/avrf.h @@ -20,8 +20,6 @@ #ifndef AVRF_H #define AVRF_H -#include - struct avrf_type { char name[15]; diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h index 565a2b6cf..fa717dc81 100644 --- a/src/flash/nor/cfi.h +++ b/src/flash/nor/cfi.h @@ -20,8 +20,6 @@ #ifndef CFI_H #define CFI_H -#include - #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 30be30482..f1f90e701 100644 --- a/src/flash/nor/lpc2000.h +++ b/src/flash/nor/lpc2000.h @@ -23,8 +23,6 @@ #ifndef LPC2000_H #define LPC2000_H -#include - typedef enum { lpc2000_v1, diff --git a/src/flash/nor/lpc288x.h b/src/flash/nor/lpc288x.h index 06f634ab8..cd5fb7346 100644 --- a/src/flash/nor/lpc288x.h +++ b/src/flash/nor/lpc288x.h @@ -21,8 +21,6 @@ #ifndef lpc288x_H #define lpc288x_H -#include - 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 f98b10801..7e73afa1c 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 cc6004e82..021933356 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 - struct non_cfi { uint16_t mfr; diff --git a/src/flash/nor/pic32mx.h b/src/flash/nor/pic32mx.h index b33e83174..b3bdad29a 100644 --- a/src/flash/nor/pic32mx.h +++ b/src/flash/nor/pic32mx.h @@ -26,8 +26,6 @@ #ifndef PIC32MX_H #define PIC32MX_H -#include - struct pic32mx_flash_bank { struct working_area *write_algorithm; diff --git a/src/flash/nor/stellaris.h b/src/flash/nor/stellaris.h index 85b709cc6..a5f04e48f 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 - struct stellaris_flash_bank { /* chip id register */ diff --git a/src/flash/nor/stm32x.h b/src/flash/nor/stm32x.h index b6e00edc3..fcf895c60 100644 --- a/src/flash/nor/stm32x.h +++ b/src/flash/nor/stm32x.h @@ -23,8 +23,6 @@ #ifndef STM32X_H #define STM32X_H -#include - struct stm32x_options { uint16_t RDP; diff --git a/src/flash/nor/str7x.h b/src/flash/nor/str7x.h index 4daafb7d1..77dfee6d3 100644 --- a/src/flash/nor/str7x.h +++ b/src/flash/nor/str7x.h @@ -23,8 +23,6 @@ #ifndef STR7X_H #define STR7X_H -#include - struct str7x_flash_bank { uint32_t *sector_bits; diff --git a/src/flash/nor/str9x.h b/src/flash/nor/str9x.h index 29adecfae..ba5386fcb 100644 --- a/src/flash/nor/str9x.h +++ b/src/flash/nor/str9x.h @@ -23,8 +23,6 @@ #ifndef STR9X_H #define STR9X_H -#include - struct str9x_flash_bank { uint32_t *sector_bits; diff --git a/src/flash/nor/str9xpec.h b/src/flash/nor/str9xpec.h index cb2ac7807..6eecd8a67 100644 --- a/src/flash/nor/str9xpec.h +++ b/src/flash/nor/str9xpec.h @@ -23,8 +23,6 @@ #ifndef STR9XPEC_H #define STR9XPEC_H -#include -#include struct str9xpec_flash_controller { diff --git a/src/flash/nor/tms470.h b/src/flash/nor/tms470.h index b2fea1b17..ecbfad8f4 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 - struct tms470_flash_bank { unsigned ordinal; diff --git a/src/openocd.c b/src/openocd.c index b6dc010e5..e500ba608 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 21cd0fed9..f9cca99f3 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -31,7 +31,7 @@ #include #include #include "server.h" -#include +#include #include "gdb_server.h" #include #include