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
/
LEOX
/
elpt860
/
flash.c
diff --git
a/board/LEOX/elpt860/flash.c
b/board/LEOX/elpt860/flash.c
index
668aee2
..
9a75aad
100644
(file)
--- a/
board/LEOX/elpt860/flash.c
+++ b/
board/LEOX/elpt860/flash.c
@@
-33,7
+33,7
@@
/*
** Note 1: In this file, you have to provide the following variable:
** ------
/*
** Note 1: In this file, you have to provide the following variable:
** ------
-** flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS]
+** flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS]
** 'flash_info_t' structure is defined into 'include/flash.h'
** and defined as extern into 'common/cmd_flash.c'
**
** 'flash_info_t' structure is defined into 'include/flash.h'
** and defined as extern into 'common/cmd_flash.c'
**
@@
-62,10
+62,10
@@
#ifndef CONFIG_ENV_ADDR
#ifndef CONFIG_ENV_ADDR
-# define CONFIG_ENV_ADDR (C
FG
_FLASH_BASE + CONFIG_ENV_OFFSET)
+# define CONFIG_ENV_ADDR (C
ONFIG_SYS
_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif
#endif
-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 */
/*-----------------------------------------------------------------------
* Internal Functions
/*-----------------------------------------------------------------------
* Internal Functions
@@
-82,13
+82,13
@@
static int write_byte (flash_info_t *info, ulong dest, uchar data);
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;
}
@@
-105,20
+105,20
@@
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 & OR_AM_MSK);
- memctl->memc_br0 = (C
FG
_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_PS_8 | BR_V;
+ memctl->memc_or0 = C
ONFIG_SYS
_OR_TIMING_FLASH | (-size_b0 & OR_AM_MSK);
+ memctl->memc_br0 = (C
ONFIG_SYS
_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_PS_8 | BR_V;
/* Re-do sizing to get full correct info */
/* Re-do sizing to get full correct info */
- size_b0 = flash_get_size ((volatile unsigned char *)C
FG
_FLASH_BASE,
+ size_b0 = flash_get_size ((volatile unsigned char *)C
ONFIG_SYS
_FLASH_BASE,
&flash_info[0]);
&flash_info[0]);
- flash_get_offsets (C
FG
_FLASH_BASE, &flash_info[0]);
+ flash_get_offsets (C
ONFIG_SYS
_FLASH_BASE, &flash_info[0]);
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE
/* monitor protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* monitor protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
FG
_MONITOR_BASE,
- C
FG
_MONITOR_BASE + monitor_flash_len-1,
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS
_MONITOR_BASE + monitor_flash_len-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-383,7
+383,7
@@
flash_erase (flash_info_t *info,
addr = (volatile unsigned char *)(info->start[l_sect]);
while ( (addr[0] & 0x80) != 0x80 )
{
addr = (volatile unsigned char *)(info->start[l_sect]);
while ( (addr[0] & 0x80) != 0x80 )
{
- if ( (now = get_timer(start)) > C
FG
_FLASH_ERASE_TOUT )
+ if ( (now = get_timer(start)) > C
ONFIG_SYS
_FLASH_ERASE_TOUT )
{
printf ("Timeout\n");
return ( 1 );
{
printf ("Timeout\n");
return ( 1 );
@@
-556,7
+556,7
@@
write_word (flash_info_t *info,
start = get_timer (0);
while ( (*((vu_long *)dest) & 0x00800080) != (data & 0x00800080) )
{
start = get_timer (0);
while ( (*((vu_long *)dest) & 0x00800080) != (data & 0x00800080) )
{
- if ( get_timer(start) > C
FG
_FLASH_WRITE_TOUT )
+ if ( get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT )
{
return (1);
}
{
return (1);
}
@@
-602,7
+602,7
@@
write_byte (flash_info_t *info,
start = get_timer (0);
while ( (*((volatile unsigned char *)dest) & 0x80) != (data & 0x80) )
{
start = get_timer (0);
while ( (*((volatile unsigned char *)dest) & 0x80) != (data & 0x80) )
{
- if ( get_timer(start) > C
FG
_FLASH_WRITE_TOUT )
+ if ( get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT )
{
return (1);
}
{
return (1);
}