Commit d9dc604a authored by Zachary T Welch's avatar Zachary T Welch
Browse files

remove target.h from flash.h

The flash.h header does not require the target.h header file, but
its implementation source files do.  Move it to flash/nor/imp.h.
parent 1527272f
......@@ -27,7 +27,6 @@
#define FLASH_H
#include <flash/common.h>
#include <target/target.h>
struct image;
......
......@@ -23,11 +23,11 @@
#include "config.h"
#endif
#include <flash/flash.h>
#include <target/armv4_5.h>
#include "imp.h"
#include <helper/binarybuffer.h>
#include <helper/time_support.h>
#include <target/algorithm.h>
#include <target/armv4_5.h>
static int aduc702x_build_sector_list(struct flash_bank *bank);
......
......@@ -57,13 +57,9 @@
#endif
#include <stdio.h>
#include <string.h>
#include <stddef.h>
#include <helper/types.h>
#include <flash/flash.h>
#include <helper/membuf.h>
#include "imp.h"
#include "at91sam3.h"
#include <helper/membuf.h>
#include <helper/time_support.h>
#define REG_NAME_WIDTH (12)
......
......@@ -49,6 +49,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "at91sam7.h"
#include <helper/binarybuffer.h>
......
......@@ -21,9 +21,9 @@
#include "config.h"
#endif
#include "imp.h"
#include "avrf.h"
#include <target/avrt.h>
#include <flash/flash.h>
/* AVR_JTAG_Instructions */
......
......@@ -23,6 +23,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "cfi.h"
#include "non_cfi.h"
#include <target/armv4_5.h>
......
......@@ -21,10 +21,10 @@
#include "config.h"
#endif
#include <flash/flash.h>
#include "imp.h"
#include <target/embeddedice.h>
#include <target/image.h>
#include <target/algorithm.h>
#include <target/image.h>
#if 0
......
......@@ -21,7 +21,7 @@
#include "config.h"
#endif
#include <flash/flash.h>
#include "imp.h"
#include <target/image.h>
#include "hello.h"
......
......@@ -21,6 +21,10 @@
// this is an internal header
#include "core.h"
// common flash internals
#include <flash/common.h>
// almost all drivers will need this file
#include <target/target.h>
/**
* Adds a new NOR bank to the global list of banks.
......
......@@ -25,10 +25,11 @@
#include "config.h"
#endif
#include "imp.h"
#include "lpc2000.h"
#include <target/armv7m.h>
#include <helper/binarybuffer.h>
#include <target/algorithm.h>
#include <target/armv7m.h>
/* flash programming support for NXP LPC17xx and LPC2xxx devices
......
......@@ -31,6 +31,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "lpc288x.h"
#include <helper/binarybuffer.h>
......
......@@ -23,11 +23,11 @@
#endif
#include <target/image.h>
#include <flash/flash.h>
#include "imp.h"
#include <helper/binarybuffer.h>
#include <target/armv4_5.h>
#include <target/algorithm.h>
#include <target/armv4_5.h>
#include <target/image.h>
/* 1024 bytes */
......
......@@ -21,8 +21,8 @@
#include "config.h"
#endif
#include "imp.h"
#include "ocl.h"
#include <flash/flash.h>
#include <target/embeddedice.h>
......
......@@ -27,6 +27,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "pic32mx.h"
#include <target/mips32.h>
......
......@@ -28,10 +28,11 @@
#include "config.h"
#endif
#include "imp.h"
#include "stellaris.h"
#include <target/armv7m.h>
#include <helper/binarybuffer.h>
#include <target/algorithm.h>
#include <target/armv7m.h>
#define DID0_VER(did0) ((did0 >> 28)&0x07)
......
......@@ -24,10 +24,11 @@
#include "config.h"
#endif
#include "imp.h"
#include "stm32x.h"
#include <target/armv7m.h>
#include <helper/binarybuffer.h>
#include <target/algorithm.h>
#include <target/armv7m.h>
static int stm32x_mass_erase(struct flash_bank *bank);
......
......@@ -24,6 +24,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "str7x.h"
#include <target/armv4_5.h>
#include <helper/binarybuffer.h>
......
......@@ -27,6 +27,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "str9x.h"
#include <target/arm966e.h>
#include <target/algorithm.h>
......
......@@ -24,6 +24,7 @@
#include "config.h"
#endif
#include "imp.h"
#include "str9xpec.h"
#include <target/arm7_9_common.h>
......
......@@ -22,6 +22,7 @@
#endif
#include "tms470.h"
#include "imp.h"
/* ----------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment