projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edb93xx: change calculation un early_udelay.h
[oweals/u-boot.git]
/
board
/
gth
/
flash.c
diff --git
a/board/gth/flash.c
b/board/gth/flash.c
index 41a5c50b0fac45e5bcb988e6189bcb054443e299..169270be1a651cdff376a4d7af6362dc98a08fe6 100644
(file)
--- a/
board/gth/flash.c
+++ b/
board/gth/flash.c
@@
-24,7
+24,7
@@
#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
*/
/*-----------------------------------------------------------------------
* Functions
/*-----------------------------------------------------------------------
* Functions
@@
-44,7
+44,7
@@
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, size_b1;
int i;
volatile memctl8xx_t *memctl = &immap->im_memctl;
unsigned long size_b0, size_b1;
int i;
@@
-54,7
+54,7
@@
unsigned long flash_init (void)
return(0x1fffff);
/* Init: no FLASHes known */
return(0x1fffff);
/* 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;
}
@@
-75,7
+75,7
@@
unsigned long flash_init (void)
if (size_b1 > size_b0) {
printf ("## ERROR: Bank 1 (0x%08lx = %ld MB) > Bank 0 (0x%08lx = %ld MB)\n",
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);
+ 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].flash_id = FLASH_UNKNOWN;
flash_info[1].flash_id = FLASH_UNKNOWN;
@@
-90,45
+90,45
@@
unsigned long flash_init (void)
size_b1 = 0;
/* Remap FLASH according to real size */
size_b1 = 0;
/* Remap FLASH according to real size */
- memctl->memc_or0 = C
FG
_OR0_PRELIM;
- memctl->memc_br0 = C
FG
_BR0_PRELIM;
+ memctl->memc_or0 = C
ONFIG_SYS
_OR0_PRELIM;
+ memctl->memc_br0 = C
ONFIG_SYS
_BR0_PRELIM;
/* Re-do sizing to get full correct info */
/* 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]);
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE
/* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* monitor protection ON by default */
(void)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
if (size_b1)
{
&flash_info[0]);
#endif
if (size_b1)
{
- /* memctl->memc_or1 = C
FG
_OR1_PRELIM;
- memctl->memc_br1 = C
FG
_BR1_PRELIM; */
+ /* memctl->memc_or1 = C
ONFIG_SYS
_OR1_PRELIM;
+ memctl->memc_br1 = C
ONFIG_SYS
_BR1_PRELIM; */
/* Re-do sizing to get full correct info */
/* Re-do sizing to get full correct info */
- size_b1 = flash_get_size((vu_long *)(C
FG
_FLASH_BASE + size_b0),
+ size_b1 = flash_get_size((vu_long *)(C
ONFIG_SYS
_FLASH_BASE + size_b0),
&flash_info[1]);
&flash_info[1]);
- flash_get_offsets (C
FG
_FLASH_BASE + size_b0, &flash_info[1]);
+ flash_get_offsets (C
ONFIG_SYS
_FLASH_BASE + size_b0, &flash_info[1]);
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE
/* monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* monitor protection ON by default */
(void)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[1]);
#endif
}
else
{
&flash_info[1]);
#endif
}
else
{
-/* memctl->memc_or1 = C
FG
_OR1_PRELIM;
- FIXME memctl->memc_br1 = C
FG
_BR1_PRELIM; */
+/* memctl->memc_or1 = C
ONFIG_SYS
_OR1_PRELIM;
+ FIXME memctl->memc_br1 = C
ONFIG_SYS
_BR1_PRELIM; */
flash_info[1].flash_id = FLASH_UNKNOWN;
flash_info[1].sector_count = -1;
flash_info[1].flash_id = FLASH_UNKNOWN;
flash_info[1].sector_count = -1;
@@
-501,7
+501,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
while ((addr[0] & 0xFFFFFFFF) != 0xFFFFFFFF)
#endif
{
while ((addr[0] & 0xFFFFFFFF) != 0xFFFFFFFF)
#endif
{
- 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;
}
@@
-638,7
+638,7
@@
static int write_word (flash_info_t *info, ulong dest, ulong data)
while ((*((vu_long *)dest) & 0x80808080) != (data & 0x80808080))
#endif
{
while ((*((vu_long *)dest) & 0x80808080) != (data & 0x80808080))
#endif
{
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
return (1);
}
}
return (1);
}
}