summaryrefslogtreecommitdiff
path: root/board/freescale/mpc8555cds/mpc8555cds.c
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/freescale/mpc8555cds/mpc8555cds.c
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/freescale/mpc8555cds/mpc8555cds.c')
-rw-r--r--board/freescale/mpc8555cds/mpc8555cds.c54
1 files changed, 4 insertions, 50 deletions
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index edaba26..60d1758 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -40,7 +40,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
#endif
void local_bus_init(void);
-void sdram_init(void);
/*
* I/O Port configuration table
@@ -240,50 +239,6 @@ int checkboard (void)
return 0;
}
-phys_size_t
-initdram(int board_type)
-{
- long dram_size = 0;
-
- puts("Initializing\n");
-
-#if defined(CONFIG_DDR_DLL)
- {
- /*
- * Work around to stabilize DDR DLL MSYNC_IN.
- * Errata DDR9 seems to have been fixed.
- * This is now the workaround for Errata DDR11:
- * Override DLL = 1, Course Adj = 1, Tap Select = 0
- */
-
- volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-
- gur->ddrdllcr = 0x81000000;
- asm("sync;isync;msync");
- udelay(200);
- }
-#endif
-
- dram_size = fsl_ddr_sdram();
- dram_size = setup_ddr_tlbs(dram_size / 0x100000);
- dram_size *= 0x100000;
-
-#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
- /*
- * Initialize and enable DDR ECC.
- */
- ddr_enable_ecc(dram_size);
-#endif
-
- /*
- * SDRAM Initialization
- */
- sdram_init();
-
- puts(" DDR: ");
- return dram_size;
-}
-
/*
* Initialize Local Bus
*/
@@ -334,8 +289,7 @@ local_bus_init(void)
/*
* Initialize SDRAM memory on the Local Bus.
*/
-void
-sdram_init(void)
+void lbc_sdram_init(void)
{
#if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
@@ -345,9 +299,9 @@ sdram_init(void)
uint cpu_board_rev;
uint lsdmr_common;
- puts(" SDRAM: ");
-
- print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+ puts("LBC SDRAM: ");
+ print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+ "\n ");
/*
* Setup SDRAM Base and Option Registers