summaryrefslogtreecommitdiff
path: root/board/socrates
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-01-17 20:31:46 +0100
committerWolfgang Denk <wd@denx.de>2011-01-17 20:31:46 +0100
commite1ccf97c5d7651664d37c0c5aa243874b8851b2d (patch)
tree666d8970fcb8744ddefb039fc49a7d1a5a1d09e7 /board/socrates
parentaad813a342aca1a8127a283c64813e4ae4464d9c (diff)
parentf133796da8ec87ccbafc9c492636def619d99401 (diff)
downloadu-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.zip
u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.tar.gz
u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/socrates')
-rw-r--r--board/socrates/sdram.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c
index 029ba02..c8235f4 100644
--- a/board/socrates/sdram.c
+++ b/board/socrates/sdram.c
@@ -39,7 +39,7 @@
* so this should be extended for other future boards
* using this routine!
*/
-long int sdram_setup(int casl)
+phys_size_t fixed_sdram(void)
{
volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_MPC85xx_DDR_ADDR);
@@ -77,19 +77,6 @@ long int sdram_setup(int casl)
}
#endif
-phys_size_t initdram (int board_type)
-{
- long dram_size = 0;
-#if defined(CONFIG_SPD_EEPROM)
- dram_size = fsl_ddr_sdram();
- dram_size = setup_ddr_tlbs(dram_size / 0x100000);
- dram_size *= 0x100000;
-#else
- dram_size = sdram_setup(CONFIG_DDR_DEFAULT_CL);
-#endif
- return dram_size;
-}
-
#if defined(CONFIG_SYS_DRAM_TEST)
int testdram (void)
{