From: Becky Bruce <beckyb@kernel.crashing.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 01/13] mpc8540eval: Split initdram() into initdram() and sdram_init()
Date: Thu, 2 Dec 2010 17:45:27 -0600 [thread overview]
Message-ID: <1291333539-11884-2-git-send-email-beckyb@kernel.crashing.org> (raw)
In-Reply-To: <1291333539-11884-1-git-send-email-beckyb@kernel.crashing.org>
Modeled after the MPC8540DS code; this will allow us to use a common
initdram() once that is available. There should be no functional
change.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
---
board/mpc8540eval/mpc8540eval.c | 64 +++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/board/mpc8540eval/mpc8540eval.c b/board/mpc8540eval/mpc8540eval.c
index 054d644..f1ab360 100644
--- a/board/mpc8540eval/mpc8540eval.c
+++ b/board/mpc8540eval/mpc8540eval.c
@@ -64,41 +64,15 @@ int checkboard (void)
return (0);
}
-phys_size_t initdram (int board_type)
+void sdram_init(void)
{
- long dram_size = 0;
-
-#if !defined(CONFIG_RAM_AS_FLASH)
+#if !defined(CONFIG_RAM_AS_FLASH) /* LocalBus is not emulating flash */
volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
+ volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
sys_info_t sysinfo;
uint temp_lbcdll = 0;
-#endif
-#if !defined(CONFIG_RAM_AS_FLASH) || defined(CONFIG_DDR_DLL)
- volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-#endif
-#if defined(CONFIG_DDR_DLL)
- uint temp_ddrdll = 0;
- /* Work around to stabilize DDR DLL */
- temp_ddrdll = gur->ddrdllcr;
- gur->ddrdllcr = ((temp_ddrdll & 0xff) << 16) | 0x80000000;
- asm("sync;isync;msync");
-#endif
-
-#if defined(CONFIG_SPD_EEPROM)
- dram_size = fsl_ddr_sdram();
- dram_size = setup_ddr_tlbs(dram_size / 0x100000);
- dram_size *= 0x100000;
-#else
- dram_size = fixed_sdram ();
-#endif
-
-#if defined(CONFIG_SYS_RAMBOOT)
- return dram_size;
-#endif
-
-#if !defined(CONFIG_RAM_AS_FLASH) /* LocalBus is not emulating flash */
get_sys_info(&sysinfo);
/* if localbus freq is less than 66MHz,we use bypass mode,otherwise use DLL */
if(sysinfo.freqSystemBus/(CONFIG_SYS_LBC_LCRR & LCRR_CLKDIV) < 66000000) {
@@ -132,6 +106,38 @@ phys_size_t initdram (int board_type)
lbc->mrtpr = CONFIG_SYS_LBC_MRTPR;
asm("sync");
#endif
+}
+
+phys_size_t initdram(int board_type)
+{
+ long dram_size = 0;
+
+#if !defined(CONFIG_RAM_AS_FLASH) || defined(CONFIG_DDR_DLL)
+ volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+#endif
+
+#if defined(CONFIG_DDR_DLL)
+ uint temp_ddrdll = 0;
+
+ /* Work around to stabilize DDR DLL */
+ temp_ddrdll = gur->ddrdllcr;
+ gur->ddrdllcr = ((temp_ddrdll & 0xff) << 16) | 0x80000000;
+ asm("sync;isync;msync");
+#endif
+
+#if defined(CONFIG_SPD_EEPROM)
+ dram_size = fsl_ddr_sdram();
+ dram_size = setup_ddr_tlbs(dram_size / 0x100000);
+ dram_size *= 0x100000;
+#else
+ dram_size = fixed_sdram();
+#endif
+
+#if defined(CONFIG_SYS_RAMBOOT)
+ return dram_size;
+#endif
+
+ sdram_init();
#if defined(CONFIG_DDR_ECC)
{
--
1.6.0.6
next prev parent reply other threads:[~2010-12-02 23:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 23:45 [U-Boot] [PATCH 00/13] Go to common initdram() on 85xx-based boards Becky Bruce
2010-12-02 23:45 ` Becky Bruce [this message]
2010-12-02 23:45 ` [U-Boot] [PATCH 02/13] tqm85xx: create fixed_sdram() to do sdram setup Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 03/13] mpc85xx/tlb.c: Allow platforms to specify wimge bits Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 04/13] socrates: rename sdram_setup fixed_sdram() Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 05/13] mpc8569mds: Remove unnecessary CONFIG_SYS_LBC_SDRAM_BASE definition Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 06/13] PM854: rename CONFIG_SYS_LBC_SDRAM_BASE CONFIG_SYS_LBC_BASE Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 07/13] PM856: Rename " Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 08/13] SBC8560: #define CONFIG_SYS_LBC_NO_SDRAM_INIT Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 09/13] stxgp3: " Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 10/13] SBC8540: " Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 11/13] MPC8568/MPC8569: Remove CONFIG_DDR_DLL define Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 12/13] mpc85xx boards: initdram() cleanup/bugfix Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 13/13] 85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN Becky Bruce
2010-12-03 16:09 ` [U-Boot] [PATCH 12/13] mpc85xx boards: initdram() cleanup/bugfix Peter Tyser
2010-12-03 20:54 ` [U-Boot] [PATCH 08/13] SBC8560: #define CONFIG_SYS_LBC_NO_SDRAM_INIT Becky Bruce
2010-12-03 21:22 ` Peter Tyser
2010-12-03 2:26 ` Timur Tabi
2010-12-03 20:44 ` Becky Bruce
2010-12-03 21:48 ` Kumar Gala
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=1291333539-11884-2-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