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 commit 'wd/master'
[oweals/u-boot.git]
/
board
/
pm520
/
pm520.c
diff --git
a/board/pm520/pm520.c
b/board/pm520/pm520.c
index 7c32f5d95461d38b4e7eafcf280602ff6cf98d4f..83d9bcd025f35f183eb45fdab32f6356fa4c2dff 100644
(file)
--- a/
board/pm520/pm520.c
+++ b/
board/pm520/pm520.c
@@
-84,7
+84,7
@@
static void sdram_start (int hi_addr)
*/
#if defined(CONFIG_MPC5200)
*/
#if defined(CONFIG_MPC5200)
-
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;
@@
-187,7
+187,7
@@
long int initdram (int board_type)
#elif defined(CONFIG_MGT5100)
#elif defined(CONFIG_MGT5100)
-
long in
t initdram (int board_type)
+
phys_size_
t initdram (int board_type)
{
ulong dramsize = 0;
#ifndef CFG_RAMBOOT
{
ulong dramsize = 0;
#ifndef CFG_RAMBOOT
@@
-299,7
+299,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)
{
@@
-312,9
+312,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) ||
defined(CONFIG_CMD_DOC)
+#if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{
extern void doc_probe (ulong physadr);
void doc_init (void)
{