diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-05 05:13:12 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-07 22:48:10 +0100 |
| commit | 2bf22a54316f83942a1b6fbe5c805c90339229b4 (patch) | |
| tree | e11c3841dc9ac475026b2a1f7d6107c183920983 /board/rpxsuper | |
| parent | d72512406ac04d89a2d58e866e83eed945dbc461 (diff) | |
| download | blackbird-obmc-uboot-2bf22a54316f83942a1b6fbe5c805c90339229b4.tar.gz blackbird-obmc-uboot-2bf22a54316f83942a1b6fbe5c805c90339229b4.zip | |
board/rpxsuper/flash.c: minimal CodingStyle cleanup
Really minimal and local, just good enough to make checkpatch not
complain about the changes in the following commit.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/rpxsuper')
| -rw-r--r-- | board/rpxsuper/flash.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c index be29b65cf4..724ae88431 100644 --- a/board/rpxsuper/flash.c +++ b/board/rpxsuper/flash.c @@ -47,41 +47,40 @@ static int write_word (flash_info_t *info, ulong dest, ulong data); /*----------------------------------------------------------------------- */ -unsigned long flash_init (void) +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; - } + /* 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]); + /* 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 - */ + /* + * 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 /*size*/ (CONFIG_SYS_FLASH0_SIZE * 1024 * 1024); + return /*size */ (CONFIG_SYS_FLASH0_SIZE * 1024 * 1024); } /*----------------------------------------------------------------------- |
