projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
eltec
/
mhpc
/
flash.c
diff --git
a/board/eltec/mhpc/flash.c
b/board/eltec/mhpc/flash.c
index
4cc66a9
..
2fbdb27
100644
(file)
--- a/
board/eltec/mhpc/flash.c
+++ b/
board/eltec/mhpc/flash.c
@@
-25,7
+25,7
@@
#include <mpc8xx.h>
#include <linux/byteorder/swab.h>
#include <mpc8xx.h>
#include <linux/byteorder/swab.h>
-flash_info_t flash_info[C
FG_MAX_FLASH_BANKS]; /* info for FLASH chips
*/
+flash_info_t flash_info[C
ONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips
*/
/*-----------------------------------------------------------------------
* Protection Flags:
/*-----------------------------------------------------------------------
* Protection Flags:
@@
-62,13
+62,13
@@
static void flash_get_offsets (ulong base, flash_info_t *info);
unsigned long flash_init (void)
{
unsigned long flash_init (void)
{
- volatile immap_t *immap = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *immap = (immap_t *)C
ONFIG_SYS
_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
unsigned long size_b0;
int i;
/* Init: no FLASHes known */
volatile memctl8xx_t *memctl = &immap->im_memctl;
unsigned long size_b0;
int i;
/* Init: no FLASHes known */
- for (i=0; i<C
FG
_MAX_FLASH_BANKS; ++i) {
+ for (i=0; i<C
ONFIG_SYS
_MAX_FLASH_BANKS; ++i) {
flash_info[i].flash_id = FLASH_UNKNOWN;
}
flash_info[i].flash_id = FLASH_UNKNOWN;
}
@@
-81,18
+81,18
@@
unsigned long flash_init (void)
}
/* Remap FLASH according to real size */
}
/* Remap FLASH according to real size */
- memctl->memc_or0 = C
FG
_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
- memctl->memc_br0 = (C
FG
_FLASH_BASE & BR_BA_MSK) | BR_PS_16 | BR_MS_GPCM | BR_V;
+ memctl->memc_or0 = C
ONFIG_SYS
_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
+ memctl->memc_br0 = (C
ONFIG_SYS
_FLASH_BASE & BR_BA_MSK) | BR_PS_16 | BR_MS_GPCM | BR_V;
/* Re-do sizing to get full correct info */
/* Re-do sizing to get full correct info */
- size_b0 = flash_get_size((FPW *)C
FG
_FLASH_BASE, &flash_info[0]);
+ size_b0 = flash_get_size((FPW *)C
ONFIG_SYS
_FLASH_BASE, &flash_info[0]);
- flash_get_offsets (C
FG
_FLASH_BASE, &flash_info[0]);
+ flash_get_offsets (C
ONFIG_SYS
_FLASH_BASE, &flash_info[0]);
/* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
FG
_FLASH_BASE,
- C
FG
_FLASH_BASE+monitor_flash_len-1,
+ C
ONFIG_SYS
_FLASH_BASE,
+ C
ONFIG_SYS
_FLASH_BASE+monitor_flash_len-1,
&flash_info[0]);
flash_info[0].size = size_b0;
&flash_info[0]);
flash_info[0].size = size_b0;
@@
-203,10
+203,10
@@
static ulong flash_get_size (FPW *addr, flash_info_t *info)
break;
}
break;
}
- if (info->sector_count > C
FG
_MAX_FLASH_SECT) {
+ if (info->sector_count > C
ONFIG_SYS
_MAX_FLASH_SECT) {
printf ("** ERROR: sector count %d > max (%d) **\n",
printf ("** ERROR: sector count %d > max (%d) **\n",
- info->sector_count, C
FG
_MAX_FLASH_SECT);
- info->sector_count = C
FG
_MAX_FLASH_SECT;
+ info->sector_count, C
ONFIG_SYS
_MAX_FLASH_SECT);
+ info->sector_count = C
ONFIG_SYS
_MAX_FLASH_SECT;
}
addr[0] = (FPW)0xFF00FF00; /* restore read mode */
}
addr[0] = (FPW)0xFF00FF00; /* restore read mode */
@@
-277,7
+277,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
udelay (1000);
while (((status = SWAP(*addr)) & (FPW)0x00800080) != (FPW)0x00800080) {
udelay (1000);
while (((status = SWAP(*addr)) & (FPW)0x00800080) != (FPW)0x00800080) {
- if ((now=get_timer(start)) > C
FG
_FLASH_ERASE_TOUT) {
+ if ((now=get_timer(start)) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout\n");
*addr = (FPW)0xB000B000; /* suspend erase */
*addr = (FPW)0xFF00FF00; /* reset to read mode */
printf ("Timeout\n");
*addr = (FPW)0xB000B000; /* suspend erase */
*addr = (FPW)0xFF00FF00; /* reset to read mode */
@@
-419,7
+419,7
@@
static int write_data (flash_info_t *info, ulong dest, FPW data)
start = get_timer (0);
while (((status = SWAP(*addr)) & (FPW)0x00800080) != (FPW)0x00800080) {
start = get_timer (0);
while (((status = SWAP(*addr)) & (FPW)0x00800080) != (FPW)0x00800080) {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
*addr = (FPW)0xFF00FF00; /* restore read mode */
return (1);
}
*addr = (FPW)0xFF00FF00; /* restore read mode */
return (1);
}