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>
2009-12-04 16:40:19 -08:00
parent ae6374e25d
commit f3e6f584f1
18 changed files with 4 additions and 63 deletions
--- 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 */
--- 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];
--- 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 */

--- 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,
--- 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;
--- 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
--- 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;
--- 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;
--- 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 */
--- 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;
--- 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;
--- 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;
--- 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
 {
--- 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;