diff options
author | Stefan Roese <sr@denx.de> | 2007-12-29 08:23:11 (GMT) |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-12-29 08:23:11 (GMT) |
commit | feaa43f3a8f465cbf01ffa1b23b6b52431819a52 (patch) | |
tree | 3ee393d421c72a882d27b1de5978a2a9befce062 /include/flash.h | |
parent | 8697e6a19b10f514511b6a9c86de88bd108c4f8d (diff) | |
parent | e174ac34adf5d5653df12bc3cf19c52063a71269 (diff) | |
download | u-boot-fsl-qoriq-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.tar.xz |
Merge branch 'for-1.3.2-ver2'
Conflicts:
cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/flash.h')
-rw-r--r-- | include/flash.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/flash.h b/include/flash.h index b0bf733..2ed1e20 100644 --- a/include/flash.h +++ b/include/flash.h @@ -52,6 +52,9 @@ typedef struct { ushort ext_addr; /* extended query table address */ ushort cfi_version; /* cfi version */ ushort cfi_offset; /* offset for cfi query */ + ulong addr_unlock1; /* unlock address 1 for AMD flash roms */ + ulong addr_unlock2; /* unlock address 2 for AMD flash roms */ + const char *name; /* human-readable name */ #endif } flash_info_t; @@ -77,6 +80,7 @@ typedef struct { #define FLASH_CFI_X8 0x00 #define FLASH_CFI_X16 0x01 #define FLASH_CFI_X8X16 0x02 +#define FLASH_CFI_X16X32 0x05 /* convert between bit value and numeric value */ #define CFI_FLASH_SHIFT_WIDTH 3 @@ -101,6 +105,13 @@ extern void flash_read_user_serial(flash_info_t * info, void * buffer, int offse extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int offset, int len); #endif /* CFG_FLASH_PROTECTION */ +#ifdef CONFIG_FLASH_CFI_LEGACY +extern ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info); +extern int jedec_flash_match(flash_info_t *info, ulong base); +#define CFI_CMDSET_AMD_LEGACY 0xFFF0 +#endif + + /*----------------------------------------------------------------------- * return codes from flash_write(): */ |