diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
| commit | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (patch) | |
| tree | 9e796e38d4edeabec4d091ed89d6fe179e84956c /arch/arm/cpu/arm_cortexa8/omap3/board.c | |
| parent | 86caca1cd97ba71b7a7c82f2b0163682df35ce5d (diff) | |
| parent | 1f241263e088a71b8f33f87b03a37c5418d41e2e (diff) | |
Merge branch 'master' into next
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/cpu/arm_cortexa8/omap3/board.c')
| -rw-r--r-- | arch/arm/cpu/arm_cortexa8/omap3/board.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/arch/arm/cpu/arm_cortexa8/omap3/board.c b/arch/arm/cpu/arm_cortexa8/omap3/board.c index 7b78fa448b..d2500ca3b2 100644 --- a/arch/arm/cpu/arm_cortexa8/omap3/board.c +++ b/arch/arm/cpu/arm_cortexa8/omap3/board.c @@ -40,8 +40,6 @@ extern omap3_sysinfo sysinfo; -extern u32 is_mem_sdr(void); - /****************************************************************************** * Routine: delay * Description: spinning delay to use before udelay works @@ -233,7 +231,7 @@ void s_init(void) per_clocks_enable(); if (!in_sdram) - sdrc_init(); + mem_init(); } /****************************************************************************** @@ -274,36 +272,6 @@ void watchdog_init(void) } /****************************************************************************** - * Routine: dram_init - * Description: sets uboots idea of sdram size - *****************************************************************************/ -int dram_init(void) -{ - DECLARE_GLOBAL_DATA_PTR; - unsigned int size0 = 0, size1 = 0; - - /* - * If a second bank of DDR is attached to CS1 this is - * where it can be started. Early init code will init - * memory on CS0. - */ - if ((sysinfo.mtype == DDR_COMBO) || (sysinfo.mtype == DDR_STACKED)) { - do_sdrc_init(CS1, NOT_EARLY); - make_cs1_contiguous(); - } - - size0 = get_sdr_cs_size(CS0); - size1 = get_sdr_cs_size(CS1); - - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = size0; - gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + get_sdr_cs_offset(CS1); - gd->bd->bi_dram[1].size = size1; - - return 0; -} - -/****************************************************************************** * Dummy function to handle errors for EABI incompatibility *****************************************************************************/ void abort(void) |