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
board_f: Rename initdram() to dram_init()
[platform/kernel/u-boot.git]
/
board
/
esd
/
vme8349
/
vme8349.c
diff --git
a/board/esd/vme8349/vme8349.c
b/board/esd/vme8349/vme8349.c
index
01365dc
..
36a5519
100644
(file)
--- a/
board/esd/vme8349/vme8349.c
+++ b/
board/esd/vme8349/vme8349.c
@@
-26,15
+26,17
@@
#include <i2c.h>
#include <netdev.h>
#include <i2c.h>
#include <netdev.h>
+DECLARE_GLOBAL_DATA_PTR;
+
void ddr_enable_ecc(unsigned int dram_size);
void ddr_enable_ecc(unsigned int dram_size);
-
phys_size_t initdram(int board_type
)
+
int dram_init(void
)
{
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = 0;
if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32)im)
{
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
u32 msize = 0;
if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32)im)
- return -
1
;
+ return -
ENXIO
;
/* DDR SDRAM - Main memory */
im->sysconf.ddrlaw[0].bar = CONFIG_SYS_DDR_BASE & LAWBAR_BAR;
/* DDR SDRAM - Main memory */
im->sysconf.ddrlaw[0].bar = CONFIG_SYS_DDR_BASE & LAWBAR_BAR;
@@
-52,7
+54,9
@@
phys_size_t initdram(int board_type)
msize = get_ram_size(0, msize);
/* return total bus SDRAM size(bytes) -- DDR */
msize = get_ram_size(0, msize);
/* return total bus SDRAM size(bytes) -- DDR */
- return msize * 1024 * 1024;
+ gd->ram_size = msize * 1024 * 1024;
+
+ return 0;
}
int checkboard(void)
}
int checkboard(void)
@@
-74,13
+78,15
@@
int board_eth_init(bd_t *bis)
#endif
#if defined(CONFIG_OF_BOARD_SETUP)
#endif
#if defined(CONFIG_OF_BOARD_SETUP)
-
void
ft_board_setup(void *blob, bd_t *bd)
+
int
ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCI
ft_pci_setup(blob, bd);
#endif
{
ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCI
ft_pci_setup(blob, bd);
#endif
+
+ return 0;
}
#endif
}
#endif