diff options
Diffstat (limited to 'src/flash/nor')
-rw-r--r-- | src/flash/nor/cfi.h | 6 | ||||
-rw-r--r-- | src/flash/nor/core.h | 6 | ||||
-rw-r--r-- | src/flash/nor/driver.h | 6 | ||||
-rw-r--r-- | src/flash/nor/imp.h | 6 | ||||
-rw-r--r-- | src/flash/nor/non_cfi.h | 6 | ||||
-rw-r--r-- | src/flash/nor/ocl.h | 6 | ||||
-rw-r--r-- | src/flash/nor/spi.h | 5 |
7 files changed, 23 insertions, 18 deletions
diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h index 953b7bae..1eb65f90 100644 --- a/src/flash/nor/cfi.h +++ b/src/flash/nor/cfi.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef CFI_H -#define CFI_H +#ifndef OPENOCD_FLASH_NOR_CFI_H +#define OPENOCD_FLASH_NOR_CFI_H #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */ #define CFI_STATUS_POLL_MASK_DQ6_DQ7 0xC0 /* DQ6..DQ7 */ @@ -159,4 +159,4 @@ struct cfi_fixup { #define CFI_MFR_ANY 0xffff #define CFI_ID_ANY 0xffff -#endif /* CFI_H */ +#endif /* OPENOCD_FLASH_NOR_CFI_H */ diff --git a/src/flash/nor/core.h b/src/flash/nor/core.h index 5d5d06c6..929ebdbe 100644 --- a/src/flash/nor/core.h +++ b/src/flash/nor/core.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NOR_CORE_H -#define FLASH_NOR_CORE_H +#ifndef OPENOCD_FLASH_NOR_CORE_H +#define OPENOCD_FLASH_NOR_CORE_H #include <flash/common.h> @@ -206,4 +206,4 @@ struct flash_bank *get_flash_bank_by_num_noprobe(int num); int get_flash_bank_by_addr(struct target *target, uint32_t addr, bool check, struct flash_bank **result_bank); -#endif /* FLASH_NOR_CORE_H */ +#endif /* OPENOCD_FLASH_NOR_CORE_H */ diff --git a/src/flash/nor/driver.h b/src/flash/nor/driver.h index 729c5eb2..0ae4d8e2 100644 --- a/src/flash/nor/driver.h +++ b/src/flash/nor/driver.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NOR_DRIVER_H -#define FLASH_NOR_DRIVER_H +#ifndef OPENOCD_FLASH_NOR_DRIVER_H +#define OPENOCD_FLASH_NOR_DRIVER_H struct flash_bank; @@ -221,4 +221,4 @@ struct flash_driver { */ struct flash_driver *flash_driver_find_by_name(const char *name); -#endif /* FLASH_NOR_DRIVER_H */ +#endif /* OPENOCD_FLASH_NOR_DRIVER_H */ diff --git a/src/flash/nor/imp.h b/src/flash/nor/imp.h index db2dc735..87475a39 100644 --- a/src/flash/nor/imp.h +++ b/src/flash/nor/imp.h @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef FLASH_NOR_IMP_H -#define FLASH_NOR_IMP_H +#ifndef OPENOCD_FLASH_NOR_IMP_H +#define OPENOCD_FLASH_NOR_IMP_H /* this is an internal header */ #include "core.h" @@ -46,4 +46,4 @@ int flash_driver_read(struct flash_bank *bank, int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock); -#endif /* FLASH_NOR_IMP_H */ +#endif /* OPENOCD_FLASH_NOR_IMP_H */ diff --git a/src/flash/nor/non_cfi.h b/src/flash/nor/non_cfi.h index ead9820a..c411cb88 100644 --- a/src/flash/nor/non_cfi.h +++ b/src/flash/nor/non_cfi.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef NON_CFI_H -#define NON_CFI_H +#ifndef OPENOCD_FLASH_NOR_NON_CFI_H +#define OPENOCD_FLASH_NOR_NON_CFI_H struct non_cfi { uint16_t mfr; @@ -33,4 +33,4 @@ struct non_cfi { void cfi_fixup_non_cfi(struct flash_bank *bank); -#endif /* NON_CFI_H */ +#endif /* OPENOCD_FLASH_NOR_NON_CFI_H */ diff --git a/src/flash/nor/ocl.h b/src/flash/nor/ocl.h index f57e2885..3e83f76c 100644 --- a/src/flash/nor/ocl.h +++ b/src/flash/nor/ocl.h @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#ifndef OCL_H -#define OCL_H +#ifndef OPENOCD_FLASH_NOR_OCL_H +#define OPENOCD_FLASH_NOR_OCL_H /* command/response mask */ #define OCL_CMD_MASK 0xFFFF0000L @@ -36,4 +36,4 @@ #define OCL_CHKS_INIT 0xC100CD0CL -#endif /* OCL_H */ +#endif /* OPENOCD_FLASH_NOR_OCL_H */ diff --git a/src/flash/nor/spi.h b/src/flash/nor/spi.h index 73ec17e5..a1849983 100644 --- a/src/flash/nor/spi.h +++ b/src/flash/nor/spi.h @@ -19,6 +19,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ +#ifndef OPENOCD_FLASH_NOR_SPI_H +#define OPENOCD_FLASH_NOR_SPI_H + /* data structure to maintain flash ids from different vendors */ struct flash_device { char *name; @@ -54,3 +57,5 @@ extern const struct flash_device flash_devices[]; #define SPIFLASH_PAGE_PROGRAM 0x02 /* Page Program */ #define SPIFLASH_FAST_READ 0x0B /* Fast Read */ #define SPIFLASH_READ 0x03 /* Normal Read */ + +#endif /* OPENOCD_FLASH_NOR_SPI_H */ |