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
Merge branch 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
board
/
mcc200
/
mcc200.c
diff --git
a/board/mcc200/mcc200.c
b/board/mcc200/mcc200.c
index
5d74bde
..
65b8184
100644
(file)
--- a/
board/mcc200/mcc200.c
+++ b/
board/mcc200/mcc200.c
@@
-44,6
+44,7
@@
DECLARE_GLOBAL_DATA_PTR;
extern flash_info_t flash_info[]; /* FLASH chips info */
extern flash_info_t flash_info[]; /* FLASH chips info */
+extern int do_auto_update(void);
ulong flash_get_size (ulong base, int banknum);
#ifndef CFG_RAMBOOT
ulong flash_get_size (ulong base, int banknum);
#ifndef CFG_RAMBOOT
@@
-91,11
+92,11
@@
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 CFG_SDRAM_BASE. The code does not work if CFG_SDRAM_BASE
- *
is something else than 0x00000000.
+ * use of CFG_SDRAM_BASE. The code does not work if CFG_SDRAM_BASE
+ * is something else than 0x00000000.
*/
*/
-
long in
t initdram (int board_type)
+
phys_size_
t initdram (int board_type)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
{
ulong dramsize = 0;
ulong dramsize2 = 0;
@@
-262,14
+263,14
@@
int misc_init_r (void)
/* 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,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* 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,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
}
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
}
@@
-289,6
+290,9
@@
int misc_init_r (void)
flash_info[0].sector_count = snum;
}
flash_info[0].sector_count = snum;
}
+#ifdef CONFIG_AUTO_UPDATE
+ do_auto_update();
+#endif
return (0);
}
return (0);
}
@@
-303,7
+307,7
@@
void pci_init_board(void)
}
#endif
}
#endif
-#if defined
(CFG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
+#if defined
(CONFIG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
void init_ide_reset (void)
{
@@
-316,10
+320,9
@@
void ide_set_reset (int idereset)
debug ("ide_reset(%d)\n", idereset);
}
debug ("ide_reset(%d)\n", idereset);
}
-#endif
/* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
-extern void doc_probe (ulong physadr);
+#if defined(CONFIG_CMD_DOC)
void doc_init (void)
{
doc_probe (CFG_DOC_BASE);
void doc_init (void)
{
doc_probe (CFG_DOC_BASE);