GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 10:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc/85xx: don't init SDRAM when CONFIG_SYS_RAMBOOT

Browse source 
Signed-off-by: Zhao Chenhui <b35336@freescale.com>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Zhao Chenhui 2011-01-28 17:58:37 +08:00 • committed by Kumar Gala
parent 4db2fa7f94
commit c1fc2d4fc2
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/powerpc/cpu/mpc85xx/cpu.c
View file

@ -299,6 +299,16 @@ void mpc85xx_reginfo(void)
/* Common ddr init for non-corenet fsl 85xx platforms */ /* Common ddr init for non-corenet fsl 85xx platforms */
#ifndef CONFIG_FSL_CORENET #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 initdram(int board_type)
{ {
phys_size_t dram_size = 0; phys_size_t dram_size = 0;
@ -348,6 +358,7 @@ phys_size_t initdram(int board_type)
puts("DDR: "); puts("DDR: ");
return dram_size; return dram_size;
} }
#endif /* CONFIG_SYS_RAMBOOT */
#endif #endif
#if CONFIG_POST & CONFIG_SYS_POST_MEMORY #if CONFIG_POST & CONFIG_SYS_POST_MEMORY

1
arch/powerpc/include/asm/fsl_ddr_sdram.h
View file

@ -271,6 +271,7 @@ typedef struct memctl_options_s {
} memctl_options_t; } memctl_options_t;
extern phys_size_t fsl_ddr_sdram(void); extern phys_size_t fsl_ddr_sdram(void);
extern phys_size_t fsl_ddr_sdram_size(void);
extern int fsl_use_spd(void); extern int fsl_use_spd(void);
extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
unsigned int ctrl_num); unsigned int ctrl_num);