Patchwork [U-Boot] powerpc/85xx: don't init SDRAM when CONFIG_SYS_RAMBOOT

login
register
mail settings
Submitter Kumar Gala
Date March 7, 2011, 4:17 a.m.
Message ID <1299471420-26619-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/85660/
State Accepted
Commit c1fc2d4fc282fb59f42c82fd0b5e8255497093b5
Delegated to: Kumar Gala
Headers show

Comments

Kumar Gala - March 7, 2011, 4:17 a.m.
From: Zhao Chenhui <b35336@freescale.com>

Signed-off-by: Zhao Chenhui <b35336@freescale.com>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc85xx/cpu.c           |   11 +++++++++++
 arch/powerpc/include/asm/fsl_ddr_sdram.h |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)
Kumar Gala - April 5, 2011, 6:47 p.m.
On Mar 6, 2011, at 10:17 PM, Kumar Gala wrote:

> From: Zhao Chenhui <b35336@freescale.com>
> 
> Signed-off-by: Zhao Chenhui <b35336@freescale.com>
> Acked-by: Li Yang <leoli@freescale.com>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc85xx/cpu.c           |   11 +++++++++++
> arch/powerpc/include/asm/fsl_ddr_sdram.h |    1 +
> 2 files changed, 12 insertions(+), 0 deletions(-)

applied to 85xx

- k

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 49ea6cc..f5b39c0 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -299,6 +299,16 @@  void mpc85xx_reginfo(void)
 
 /* Common ddr init for non-corenet fsl 85xx platforms */
 #ifndef CONFIG_FSL_CORENET
+#if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_SYS_INIT_L2_ADDR)
+phys_size_t initdram(int board_type)
+{
+#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD)
+	return fsl_ddr_sdram_size();
+#else
+	return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
+#endif
+}
+#else /* CONFIG_SYS_RAMBOOT */
 phys_size_t initdram(int board_type)
 {
 	phys_size_t dram_size = 0;
@@ -348,6 +358,7 @@  phys_size_t initdram(int board_type)
 	puts("DDR: ");
 	return dram_size;
 }
+#endif /* CONFIG_SYS_RAMBOOT */
 #endif
 
 #if CONFIG_POST & CONFIG_SYS_POST_MEMORY
diff --git a/arch/powerpc/include/asm/fsl_ddr_sdram.h b/arch/powerpc/include/asm/fsl_ddr_sdram.h
index 99dddb4..127a840 100644
--- a/arch/powerpc/include/asm/fsl_ddr_sdram.h
+++ b/arch/powerpc/include/asm/fsl_ddr_sdram.h
@@ -271,6 +271,7 @@  typedef struct memctl_options_s {
 } memctl_options_t;
 
 extern phys_size_t fsl_ddr_sdram(void);
+extern phys_size_t fsl_ddr_sdram_size(void);
 extern int fsl_use_spd(void);
 extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 					unsigned int ctrl_num);