[U-Boot] [PATCH V3 4/6] mpc85xx: rename sdram_init() lbc_sdram_init()

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

From: Becky Bruce <beckyb@kernel.crashing.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V3 4/6] mpc85xx: rename sdram_init() lbc_sdram_init()
Date: Fri, 17 Dec 2010 17:17:57 -0600	[thread overview]
Message-ID: <1292627879-9027-5-git-send-email-beckyb@kernel.crashing.org> (raw)
In-Reply-To: <1292627879-9027-4-git-send-email-beckyb@kernel.crashing.org>

sdram_init() is used to initialize sdram on the lbc.  Rename it
accordingly.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc85xx/cpu.c          |    2 +-
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c      |    4 ++--
 arch/powerpc/include/asm/fsl_lbc.h      |    2 +-
 board/freescale/mpc8540ads/mpc8540ads.c |    4 +---
 board/freescale/mpc8541cds/mpc8541cds.c |    3 +--
 board/freescale/mpc8548cds/mpc8548cds.c |    3 +--
 board/freescale/mpc8555cds/mpc8555cds.c |    3 +--
 board/freescale/mpc8560ads/mpc8560ads.c |    4 +---
 board/freescale/mpc8568mds/mpc8568mds.c |    3 +--
 board/sbc8548/sbc8548.c                 |    3 +--
 10 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index d7c3d4c..c785fb9 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
 
 
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index fcf3371..c504732 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/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
diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c
index deab811..9eeb134 100644
--- a/board/freescale/mpc8540ads/mpc8540ads.c
+++ b/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;
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 59df2bd..3ee666f 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/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)
 
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 79b6c4f..154435f 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/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)
 
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index 5fe7f13..02df6ae 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/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)
 
diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c
index 38f59d1..0a87d62 100644
--- a/board/freescale/mpc8560ads/mpc8560ads.c
+++ b/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;
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 50c7b45..6a746ae 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/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)
 
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c
index cda9497..0118598 100644
--- a/board/sbc8548/sbc8548.c
+++ b/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)
 
-- 
1.5.6.5

next prev parent reply	other threads:[~2010-12-17 23:17 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-17 23:17 [U-Boot] [PATCH V3 00/06] Go to common initdram() on 85xx-based boards Becky Bruce
2010-12-17 23:17 ` [U-Boot] [PATCH V3 1/6] tqm85xx: create fixed_sdram() to do sdram setup Becky Bruce
2010-12-17 23:17   ` [U-Boot] [PATCH V3 2/6] mpc85xx/tlb.c: Allow platforms to specify wimge bits Becky Bruce
2010-12-17 23:17     ` [U-Boot] [PATCH V3 3/6] mpc85xx boards: initdram() cleanup/bugfix Becky Bruce
2010-12-17 23:17       ` Becky Bruce [this message]
2010-12-17 23:17         ` [U-Boot] [PATCH V3 5/6] 85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN Becky Bruce
2010-12-17 23:17           ` [U-Boot] [PATCH V3 6/6] MPC8xxx DDR: align informational prints Becky Bruce
2011-01-05  0:25             ` Kumar Gala
2011-01-05  0:25           ` [U-Boot] [PATCH V3 5/6] 85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN Kumar Gala
2011-01-05  0:25         ` [U-Boot] [PATCH V3 4/6] mpc85xx: rename sdram_init() lbc_sdram_init() Kumar Gala
2011-01-05  0:25       ` [U-Boot] [PATCH V3 3/6] mpc85xx boards: initdram() cleanup/bugfix Kumar Gala
2011-05-04 21:53       ` Wolfgang Denk
2011-06-01 20:31         ` Wolfgang Denk
2011-01-05  0:24     ` [U-Boot] [PATCH V3 2/6] mpc85xx/tlb.c: Allow platforms to specify wimge bits Kumar Gala
2010-12-21 17:52   ` [U-Boot] [PATCH V3 1/6] tqm85xx: create fixed_sdram() to do sdram setup Kumar Gala
2010-12-22  8:44     ` Stefan Roese
2011-01-05  0:24   ` Kumar Gala

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d7c3d4c dfblob:c785fb9 dfblob:10fcd24 dfblob:6f401e7
dfblob:fcf3371 dfblob:c504732 dfblob:deab811 dfblob:9eeb134
dfblob:59df2bd dfblob:3ee666f dfblob:79b6c4f dfblob:154435f
dfblob:5fe7f13 dfblob:02df6ae dfblob:38f59d1 dfblob:0a87d62
dfblob:50c7b45 dfblob:6a746ae dfblob:cda9497 dfblob:0118598 )
 OR (
bs:"[U-Boot] [PATCH V3 4/6] mpc85xx: rename sdram_init() lbc_sdram_init()" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1292627879-9027-5-git-send-email-beckyb@kernel.crashing.org \
    --to=beckyb@kernel.crashing.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox