diff options
| author | wdenk | 2004-02-08 22:55:38 +0000 |
|---|---|---|
| committer | wdenk | 2004-02-08 22:55:38 +0000 |
| commit | 5653fc335a450fa46d89989e1afe5e8bb9a0a52e (patch) | |
| tree | e0429de78cb5c69f7fbd4fe7b84a19b1152809ce /include | |
| parent | f6e20fc6ca5a45316f94743d8b60dce4d9766bc8 (diff) | |
* Patch by Yuli Barcohen, 26 Jan 2004:
Allow bzip2 compression for small memory footprint boards
* Patch by Brad Kemp, 21 Jan 2004:
Add support for CFI flash driver for both the Intel and the AMD
command sets.
* Patch by Travis Sawyer, 20 Jan 2004:
Fix pci bridge auto enumeration of sibling p2p bridges.
* Patch by Tolunay Orkun, 12 Jan 2004:
Add some delays as needed for Intel LXT971A PHY support
* Patches by Stephan Linz, 09 Jan 2004:
- avoid warning: unused variable `piop' in board/altera/common/sevenseg.c
- make DK1C20 board configuration related to ASMI conform to
documentation
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/DK1C20.h | 4 | ||||
| -rw-r--r-- | include/flash.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h index 92c8e517eb7..f3570512e2a 100644 --- a/include/configs/DK1C20.h +++ b/include/configs/DK1C20.h @@ -647,8 +647,8 @@ * ASMI is for Cyclone devices only and only works when the configuration * is loaded via JTAG or ASMI. Please see doc/README.dk1c20 for details. *----------------------------------------------------------------------*/ -#define CONFIG_NIOS_ASMI /* Enable ASMI */ -#define CFG_NIOS_ASMIBASE 0x00920b00 /* ASMI base address */ +#define CONFIG_NIOS_ASMI /* Enable ASMI */ +#define CFG_NIOS_ASMIBASE CFG_NIOS_CPU_ASMI0 /* ASMI base address */ /*------------------------------------------------------------------------ * COMMANDS diff --git a/include/flash.h b/include/flash.h index 8f20887e4b9..0cfc76d32c6 100644 --- a/include/flash.h +++ b/include/flash.h @@ -42,7 +42,8 @@ typedef struct { ulong erase_blk_tout; /* maximum block erase timeout */ ulong write_tout; /* maximum write timeout */ ulong buffer_write_tout; /* maximum buffer write timeout */ - + ushort vendor; /* the primary vendor id */ + ushort cmd_reset; /* Vendor specific reset command */ #endif } flash_info_t; @@ -61,6 +62,8 @@ typedef struct { #define FLASH_CFI_BY32 0x04 #define FLASH_CFI_BY64 0x08 +/* convert between bit value and numeric value */ +#define CFI_FLASH_SHIFT_WIDTH 3 /* Prototypes */ extern unsigned long flash_init (void); @@ -78,6 +81,8 @@ extern int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt); /* board/?/flash.c */ #if defined(CFG_FLASH_PROTECTION) extern int flash_real_protect(flash_info_t *info, long sector, int prot); +extern void flash_read_user_serial(flash_info_t * info, void * buffer, int offset, int len); +extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int offset, int len); #endif /* CFG_FLASH_PROTECTION */ /*----------------------------------------------------------------------- |