projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
[oweals/u-boot.git]
/
board
/
mcc200
/
mcc200.c
diff --git
a/board/mcc200/mcc200.c
b/board/mcc200/mcc200.c
index 44446501f94b05c4184fee986d510cfd85f1842c..14cf08da3f7abc53b776ccb99d73446b6b48534d 100644
(file)
--- a/
board/mcc200/mcc200.c
+++ b/
board/mcc200/mcc200.c
@@
-47,7
+47,7
@@
extern flash_info_t flash_info[]; /* FLASH chips info */
extern int do_auto_update(void);
ulong flash_get_size (ulong base, int banknum);
extern int do_auto_update(void);
ulong flash_get_size (ulong base, int banknum);
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
static void sdram_start (int hi_addr)
{
long hi_addr_bit = hi_addr ? 0x01000000 : 0;
static void sdram_start (int hi_addr)
{
long hi_addr_bit = hi_addr ? 0x01000000 : 0;
@@
-92,7
+92,7
@@
static void sdram_start (int hi_addr)
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
- * use of C
FG_SDRAM_BASE. The code does not work if CFG
_SDRAM_BASE
+ * use of C
ONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS
_SDRAM_BASE
* is something else than 0x00000000.
*/
* is something else than 0x00000000.
*/
@@
-101,7
+101,7
@@
phys_size_t initdram (int board_type)
ulong dramsize = 0;
ulong dramsize2 = 0;
uint svr, pvr;
ulong dramsize = 0;
ulong dramsize2 = 0;
uint svr, pvr;
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
ulong test1, test2;
/* setup SDRAM chip selects */
ulong test1, test2;
/* setup SDRAM chip selects */
@@
-122,9
+122,9
@@
phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)C
FG
_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((long *)C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
sdram_start(1);
sdram_start(1);
- test2 = get_ram_size((long *)C
FG
_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((long *)C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@
-150,10
+150,10
@@
phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((long *)(C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((long *)(C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
}
if (test1 > test2) {
sdram_start(0);
@@
-175,7
+175,7
@@
phys_size_t initdram (int board_type)
*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
}
*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
}
-#else /* C
FG
_RAMBOOT */
+#else /* C
ONFIG_SYS
_RAMBOOT */
/* retrieve size of memory connected to SDRAM CS0 */
dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
/* retrieve size of memory connected to SDRAM CS0 */
dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
@@
-193,7
+193,7
@@
phys_size_t initdram (int board_type)
dramsize2 = 0;
}
dramsize2 = 0;
}
-#endif /* C
FG
_RAMBOOT */
+#endif /* C
ONFIG_SYS
_RAMBOOT */
/*
* On MPC5200B we need to set the special configuration delay in the
/*
* On MPC5200B we need to set the special configuration delay in the
@@
-237,7
+237,7
@@
int misc_init_r (void)
/*
* Check if boot FLASH isn't max size
*/
/*
* Check if boot FLASH isn't max size
*/
- if (gd->bd->bi_flashsize < (0 - C
FG
_FLASH_BASE)) {
+ if (gd->bd->bi_flashsize < (0 - C
ONFIG_SYS
_FLASH_BASE)) {
/* adjust mapping */
*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
START_REG(gd->bd->bi_flashstart);
/* adjust mapping */
*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
START_REG(gd->bd->bi_flashstart);
@@
-247,31
+247,31
@@
int misc_init_r (void)
/*
* Re-check to get correct base address
*/
/*
* Re-check to get correct base address
*/
- flash_get_size(gd->bd->bi_flashstart, C
FG
_MAX_FLASH_BANKS - 1);
+ flash_get_size(gd->bd->bi_flashstart, C
ONFIG_SYS
_MAX_FLASH_BANKS - 1);
/*
* Re-do flash protection upon new addresses
*/
flash_protect (FLAG_PROTECT_CLEAR,
gd->bd->bi_flashstart, 0xffffffff,
/*
* Re-do flash protection upon new addresses
*/
flash_protect (FLAG_PROTECT_CLEAR,
gd->bd->bi_flashstart, 0xffffffff,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
/* Monitor protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Monitor protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
FG_MONITOR_BASE, CFG
_MONITOR_BASE + monitor_flash_len - 1,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ C
ONFIG_SYS_MONITOR_BASE, CONFIG_SYS
_MONITOR_BASE + monitor_flash_len - 1,
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
- &flash_info[C
FG
_MAX_FLASH_BANKS - 1]);
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
+ &flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS - 1]);
}
if (gd->bd->bi_flashsize > (32 << 20)) {
}
if (gd->bd->bi_flashsize > (32 << 20)) {
@@
-325,6
+325,6
@@
void ide_set_reset (int idereset)
#if defined(CONFIG_CMD_DOC)
void doc_init (void)
{
#if defined(CONFIG_CMD_DOC)
void doc_init (void)
{
- doc_probe (C
FG
_DOC_BASE);
+ doc_probe (C
ONFIG_SYS
_DOC_BASE);
}
#endif
}
#endif