board/etx094/flash.c: Fix flash initialization
The ETX094 has only one NOR flash bank. Remove all code trying to deal with a second bank. This also fixes a number of GCC 4.6 build warnings: flash.c: In function 'flash_init': flash.c:68:13: warning: array subscript is above array bounds [-Warray-bounds] flash.c:70:13: warning: array subscript is above array bounds [-Warray-bounds] flash.c:72:13: warning: array subscript is above array bounds [-Warray-bounds] flash.c:128:13: warning: array subscript is above array bounds [-Warray-bounds] flash.c:129:13: warning: array subscript is above array bounds [-Warray-bounds] flash.c:133:12: warning: array subscript is above array bounds [-Warray-bounds] Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
d0bb8d485e
commit
28c665d4d5
|
@ -40,7 +40,7 @@ unsigned long flash_init(void)
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
|
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
|
||||||
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
volatile memctl8xx_t *memctl = &immap->im_memctl;
|
||||||
unsigned long size_b0, size_b1;
|
unsigned long size_b0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Init: no FLASHes known */
|
/* Init: no FLASHes known */
|
||||||
|
@ -56,23 +56,6 @@ unsigned long flash_init(void)
|
||||||
size_b0, size_b0<<20);
|
size_b0, size_b0<<20);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_b1 = flash_get_size((vu_long *)FLASH_BASE1_PRELIM, &flash_info[1]);
|
|
||||||
|
|
||||||
if (size_b1 > size_b0) {
|
|
||||||
printf("## ERROR: "
|
|
||||||
"Bank 1 (0x%08lx = %ld MB) > Bank 0 (0x%08lx = %ld MB)\n",
|
|
||||||
size_b1, size_b1<<20,
|
|
||||||
size_b0, size_b0<<20
|
|
||||||
);
|
|
||||||
flash_info[0].flash_id = FLASH_UNKNOWN;
|
|
||||||
flash_info[1].flash_id = FLASH_UNKNOWN;
|
|
||||||
flash_info[0].sector_count = -1;
|
|
||||||
flash_info[1].sector_count = -1;
|
|
||||||
flash_info[0].size = 0;
|
|
||||||
flash_info[1].size = 0;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Remap FLASH according to real size */
|
/* Remap FLASH according to real size */
|
||||||
memctl->memc_or0 = CONFIG_SYS_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
|
memctl->memc_or0 = CONFIG_SYS_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
|
||||||
#ifdef CONFIG_FLASH_16BIT
|
#ifdef CONFIG_FLASH_16BIT
|
||||||
|
@ -97,42 +80,11 @@ unsigned long flash_init(void)
|
||||||
&flash_info[0]);
|
&flash_info[0]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (size_b1) {
|
memctl->memc_br1 = 0; /* invalidate bank 1 */
|
||||||
memctl->memc_or1 = CONFIG_SYS_OR_TIMING_FLASH |
|
|
||||||
(-size_b1 & 0xFFFF8000);
|
|
||||||
#ifdef CONFIG_FLASH_16BIT
|
|
||||||
memctl->memc_br1 = ((CONFIG_SYS_FLASH_BASE + size_b0) &
|
|
||||||
BR_BA_MSK) | BR_MS_GPCM | BR_V | BR_PS_16;
|
|
||||||
#else
|
|
||||||
memctl->memc_br1 = ((CONFIG_SYS_FLASH_BASE + size_b0) &
|
|
||||||
BR_BA_MSK) | BR_MS_GPCM | BR_V;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Re-do sizing to get full correct info */
|
|
||||||
size_b1 = flash_get_size((vu_long *)(CONFIG_SYS_FLASH_BASE +
|
|
||||||
size_b0), &flash_info[1]);
|
|
||||||
|
|
||||||
flash_get_offsets(CONFIG_SYS_FLASH_BASE + size_b0,
|
|
||||||
&flash_info[1]);
|
|
||||||
|
|
||||||
#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
|
|
||||||
/* monitor protection ON by default */
|
|
||||||
flash_protect(FLAG_PROTECT_SET,
|
|
||||||
CONFIG_SYS_MONITOR_BASE,
|
|
||||||
CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1,
|
|
||||||
&flash_info[1]);
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
memctl->memc_br1 = 0; /* invalidate bank */
|
|
||||||
|
|
||||||
flash_info[1].flash_id = FLASH_UNKNOWN;
|
|
||||||
flash_info[1].sector_count = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
flash_info[0].size = size_b0;
|
flash_info[0].size = size_b0;
|
||||||
flash_info[1].size = size_b1;
|
|
||||||
|
|
||||||
return size_b0 + size_b1;
|
return size_b0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue