Fix problem with flash_get_size() from CFI driver update
Patch by Stefan Roese, 1 Mar 2006
This commit is contained in:
parent
f6c0068fc1
commit
f18e874ad5
|
@ -2,6 +2,9 @@
|
||||||
Changes since U-Boot 1.1.4:
|
Changes since U-Boot 1.1.4:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
* Fix problem with flash_get_size() from CFI driver update
|
||||||
|
Patch by Stefan Roese, 1 Mar 2006
|
||||||
|
|
||||||
* Convert mcc200 to use common CFI flash driver
|
* Convert mcc200 to use common CFI flash driver
|
||||||
Patch by Stefan Roese, 28 Feb 2006
|
Patch by Stefan Roese, 28 Feb 2006
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,8 @@
|
||||||
|
|
||||||
extern flash_info_t flash_info[]; /* FLASH chips info */
|
extern flash_info_t flash_info[]; /* FLASH chips info */
|
||||||
|
|
||||||
|
ulong flash_get_size (ulong base, int banknum);
|
||||||
|
|
||||||
//###CHD: wenn RAMBOOT gehen wuerde, ....
|
//###CHD: wenn RAMBOOT gehen wuerde, ....
|
||||||
#ifndef CFG_RAMBOOT
|
#ifndef CFG_RAMBOOT
|
||||||
static void sdram_start (int hi_addr)
|
static void sdram_start (int hi_addr)
|
||||||
|
|
|
@ -40,6 +40,7 @@ extern flash_info_t flash_info[]; /* FLASH chips info */
|
||||||
|
|
||||||
void local_bus_init (void);
|
void local_bus_init (void);
|
||||||
long int fixed_sdram (void);
|
long int fixed_sdram (void);
|
||||||
|
ulong flash_get_size (ulong base, int banknum);
|
||||||
|
|
||||||
#ifdef CONFIG_CPM2
|
#ifdef CONFIG_CPM2
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -203,6 +203,7 @@ static int flash_detect_cfi (flash_info_t * info);
|
||||||
static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword);
|
static int flash_write_cfiword (flash_info_t * info, ulong dest, cfiword_t cword);
|
||||||
static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
|
static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
|
||||||
ulong tout, char *prompt);
|
ulong tout, char *prompt);
|
||||||
|
ulong flash_get_size (ulong base, int banknum);
|
||||||
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
|
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
|
||||||
static flash_info_t *flash_get_info(ulong base);
|
static flash_info_t *flash_get_info(ulong base);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -80,7 +80,6 @@ extern void flash_print_info (flash_info_t *);
|
||||||
extern int flash_erase (flash_info_t *, int, int);
|
extern int flash_erase (flash_info_t *, int, int);
|
||||||
extern int flash_sect_erase (ulong addr_first, ulong addr_last);
|
extern int flash_sect_erase (ulong addr_first, ulong addr_last);
|
||||||
extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last);
|
extern int flash_sect_protect (int flag, ulong addr_first, ulong addr_last);
|
||||||
extern ulong flash_get_size (ulong base, int banknum);
|
|
||||||
|
|
||||||
/* common/flash.c */
|
/* common/flash.c */
|
||||||
extern void flash_protect (int flag, ulong from, ulong to, flash_info_t *info);
|
extern void flash_protect (int flag, ulong from, ulong to, flash_info_t *info);
|
||||||
|
|
Loading…
Reference in New Issue