浏览代码

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>
Becky Bruce 14 年之前
父节点
当前提交
70961ba414

+ 1 - 1
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;

+ 2 - 2
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
 
 

+ 1 - 1
arch/powerpc/include/asm/fsl_lbc.h

@@ -17,7 +17,7 @@
 #include <common.h>
 
 #ifdef CONFIG_MPC85xx
-void sdram_init(void);
+void lbc_sdram_init(void);
 #endif
 
 /* BR - Base Registers

+ 1 - 3
board/freescale/mpc8540ads/mpc8540ads.c

@@ -122,9 +122,7 @@ local_bus_init(void)
 /*
  * Initialize SDRAM memory on the Local Bus.
  */
-
-void
-sdram_init(void)
+void lbc_sdram_init(void)
 {
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;

+ 1 - 2
board/freescale/mpc8541cds/mpc8541cds.c

@@ -291,8 +291,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)
 

+ 1 - 2
board/freescale/mpc8548cds/mpc8548cds.c

@@ -111,8 +111,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)
 

+ 1 - 2
board/freescale/mpc8555cds/mpc8555cds.c

@@ -289,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)
 

+ 1 - 3
board/freescale/mpc8560ads/mpc8560ads.c

@@ -327,9 +327,7 @@ local_bus_init(void)
 /*
  * Initialize SDRAM memory on the Local Bus.
  */
-
-void
-sdram_init(void)
+void lbc_sdram_init(void)
 {
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;

+ 1 - 2
board/freescale/mpc8568mds/mpc8568mds.c

@@ -171,8 +171,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)
 

+ 1 - 2
board/sbc8548/sbc8548.c

@@ -104,8 +104,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_LBC_SDRAM_SIZE)