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
/
ivm
/
flash.c
diff --git
a/board/ivm/flash.c
b/board/ivm/flash.c
index
29821ba
..
cf309d7
100644
(file)
--- a/
board/ivm/flash.c
+++ b/
board/ivm/flash.c
@@
-24,11
+24,11
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.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
*/
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CONFIG_ENV_ADDR
#if defined(CONFIG_ENV_IS_IN_FLASH)
# 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
# ifndef CONFIG_ENV_SIZE
# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif
# ifndef CONFIG_ENV_SIZE
# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
@@
-50,13
+50,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;
}
@@
-72,22
+72,22
@@
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) | \
+ memctl->memc_or0 = C
ONFIG_SYS
_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
+ memctl->memc_br0 = (C
ONFIG_SYS
_FLASH_BASE & BR_BA_MSK) | \
BR_MS_GPCM | BR_PS_16 | BR_V;
/* Re-do sizing to get full correct info */
BR_MS_GPCM | BR_PS_16 | BR_V;
/* Re-do sizing to get full correct info */
- size_b0 = flash_get_size((vu_long *)C
FG
_FLASH_BASE, &flash_info[0]);
+ size_b0 = flash_get_size((vu_long *)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]);
flash_info[0].size = size_b0;
flash_info[0].size = size_b0;
-#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,10
+383,10
@@
static ulong flash_get_size (vu_long *addr, flash_info_t *info)
}
}
- 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;
}
saddr[0] = 0x00FF; /* restore read mode */
}
saddr[0] = 0x00FF; /* restore read mode */
@@
-454,7
+454,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
udelay (1000);
while (((status = *addr) & 0x0080) != 0x0080) {
udelay (1000);
while (((status = *addr) & 0x0080) != 0x0080) {
- 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 = 0x00FF; /* reset to read mode */
return 1;
printf ("Timeout\n");
*addr = 0x00FF; /* reset to read mode */
return 1;
@@
-583,7
+583,7
@@
static int write_data (flash_info_t *info, ulong dest, ulong data)
start = get_timer (0);
while (((status = *addr) & 0x0080) != 0x0080) {
start = get_timer (0);
while (((status = *addr) & 0x0080) != 0x0080) {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
*addr = 0x00FF; /* restore read mode */
return (1);
}
*addr = 0x00FF; /* restore read mode */
return (1);
}