diff options
Diffstat (limited to 'board/gw8260/flash.c')
| -rw-r--r-- | board/gw8260/flash.c | 75 | 
1 files changed, 36 insertions, 39 deletions
| diff --git a/board/gw8260/flash.c b/board/gw8260/flash.c index 6035f6976..c1c26ea1b 100644 --- a/board/gw8260/flash.c +++ b/board/gw8260/flash.c @@ -63,54 +63,51 @@ static int write_word (flash_info_t *info, ulong dest, ulong data);  /*		      functions					     */  /*********************************************************************/ -/*********************************************************************/ -/* NAME: flash_init() -	 initializes flash banks		     */ -/*								     */ -/* DESCRIPTION:							     */ -/*   This function initializes the flash bank(s).		     */ -/*								     */ -/* RETURNS:							     */ -/*   The size in bytes of the flash				     */ -/*								     */ -/* RESTRICTIONS/LIMITATIONS:					     */ -/*								     */ -/*								     */ -/*********************************************************************/ -unsigned long flash_init (void) +/* + * NAME: flash_init() -	 initializes flash banks + * + * DESCRIPTION: + *   This function initializes the flash bank(s). + * + * RETURNS: + *   The size in bytes of the flash + * + * RESTRICTIONS/LIMITATIONS: + * + * + */ +unsigned long flash_init(void)  { -    unsigned long size; -    int i; +	unsigned long size; +	int i; -    /* Init: no FLASHes known */ -    for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) { -	flash_info[i].flash_id = FLASH_UNKNOWN; -    } - -    /* for now, only support the 4 MB Flash SIMM */ -    size = flash_get_size((vu_long *)CONFIG_SYS_FLASH0_BASE, &flash_info[0]); - -    /* -     * protect monitor and environment sectors -     */ +	/* Init: no FLASHes known */ +	for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) +		flash_info[i].flash_id = FLASH_UNKNOWN; +	/* for now, only support the 4 MB Flash SIMM */ +	size = flash_get_size((vu_long *) CONFIG_SYS_FLASH0_BASE, +			      &flash_info[0]); +	/* +	 * protect monitor and environment sectors +	 */  #if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH0_BASE -    flash_protect(FLAG_PROTECT_SET, -		  CONFIG_SYS_MONITOR_BASE, -		  CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1, -		  &flash_info[0]); +	flash_protect(FLAG_PROTECT_SET, +		      CONFIG_SYS_MONITOR_BASE, +		      CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, +		      &flash_info[0]);  #endif  #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) -# ifndef  CONFIG_ENV_SIZE -#  define CONFIG_ENV_SIZE	CONFIG_ENV_SECT_SIZE -# endif -    flash_protect(FLAG_PROTECT_SET, -		  CONFIG_ENV_ADDR, -		  CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, -		  &flash_info[0]); +#ifndef CONFIG_ENV_SIZE +#define CONFIG_ENV_SIZE	CONFIG_ENV_SECT_SIZE +#endif +	flash_protect(FLAG_PROTECT_SET, +		      CONFIG_ENV_ADDR, +		      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);  #endif -    return (CONFIG_SYS_FLASH0_SIZE * 1024 * 1024);  /*size*/ +	return CONFIG_SYS_FLASH0_SIZE * 1024 * 1024;	/*size */  }  /*********************************************************************/ |