summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu
diff options
context:
space:
mode:
authorBecky Bruce <beckyb@kernel.crashing.org>2010-12-17 17:17:57 -0600
committerKumar Gala <galak@kernel.crashing.org>2011-01-14 01:32:19 -0600
commit70961ba41477a709870a01c86af2950124bb64fe (patch)
treed4c6263f7078fa0ecad40a320de78aba01eb29bb /arch/powerpc/cpu
parent38dba0c2ff685e3f8276a236bd70eaa09c84ead5 (diff)
downloadu-boot-imx-70961ba41477a709870a01c86af2950124bb64fe.zip
u-boot-imx-70961ba41477a709870a01c86af2950124bb64fe.tar.gz
u-boot-imx-70961ba41477a709870a01c86af2950124bb64fe.tar.bz2
mpc85xx: rename sdram_init() lbc_sdram_init()
sdram_init() is used to initialize sdram on the lbc. Rename it accordingly. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/cpu')
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu.c2
-rw-r--r--arch/powerpc/cpu/mpc8xxx/fsl_lbc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index bea8e10..afa9ca9 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -331,7 +331,7 @@ phys_size_t initdram(int board_type)
#endif
/* Some boards also have sdram on the lbc */
- sdram_init();
+ lbc_sdram_init();
puts("DDR: ");
return dram_size;
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index 10fcd24..6f401e7 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -11,11 +11,11 @@
#ifdef CONFIG_MPC85xx
/* Boards should provide their own version of this if they use lbc sdram */
-void __sdram_init(void)
+void __lbc_sdram_init(void)
{
/* Do nothing */
}
-void sdram_init(void) __attribute__((weak, alias("__sdram_init")));
+void lbc_sdram_init(void) __attribute__((weak, alias("__lbc_sdram_init")));
#endif