projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/85xx: Add eSDHC support on P2020DS
[oweals/u-boot.git]
/
board
/
c2mon
/
flash.c
diff --git
a/board/c2mon/flash.c
b/board/c2mon/flash.c
index 7cc5ef0c3bdfc74f67ea52dbd245f5fb8432e296..d33cb6ce433b80c639df5dfcacb9b7489dbdb2c0 100644
(file)
--- a/
board/c2mon/flash.c
+++ b/
board/c2mon/flash.c
@@
-25,10
+25,10
@@
#include <mpc8xx.h>
#ifndef CONFIG_ENV_ADDR
#include <mpc8xx.h>
#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
*/
/*-----------------------------------------------------------------------
* Functions
/*-----------------------------------------------------------------------
* Functions
@@
-42,13
+42,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, size_b1;
int i;
/* Init: no FLASHes known */
volatile memctl8xx_t *memctl = &immap->im_memctl;
unsigned long size_b0, size_b1;
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;
}
@@
-79,19
+79,19
@@
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 & OR_AM_MSK);
- memctl->memc_br0 = (C
FG
_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | 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_V;
/* 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 */
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
@@
-104,21
+104,21
@@
unsigned long flash_init (void)
#endif
if (size_b1) {
#endif
if (size_b1) {
- memctl->memc_or1 = C
FG
_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
- memctl->memc_br1 = ((C
FG
_FLASH_BASE + size_b0) & BR_BA_MSK) |
+ memctl->memc_or1 = C
ONFIG_SYS
_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
+ memctl->memc_br1 = ((C
ONFIG_SYS
_FLASH_BASE + size_b0) & BR_BA_MSK) |
BR_MS_GPCM | BR_V;
/* Re-do sizing to get full correct info */
BR_MS_GPCM | BR_V;
/* 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 */
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[1]);
#endif
&flash_info[1]);
#endif
@@
-436,7
+436,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
last = start;
addr = (vu_long*)(info->start[l_sect]);
while ((addr[0] & 0x00800080) != 0x00800080) {
last = start;
addr = (vu_long*)(info->start[l_sect]);
while ((addr[0] & 0x00800080) != 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");
return 1;
}
printf ("Timeout\n");
return 1;
}
@@
-559,7
+559,7
@@
static int write_word (flash_info_t *info, ulong dest, ulong data)
/* data polling for D7 */
start = get_timer (0);
while ((*((vu_long *)dest) & 0x00800080) != (data & 0x00800080)) {
/* data polling for D7 */
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);
}
}