arm: imx: mx53loco: remove usage of mx53_dram_size

Static variables are not available during board_init_f().
'static uint32_t mx53_dram_size[2];' was used in board specific
dram_init(), dram_init_banksize() and get_effective_memsize() to avoid
multiple calls to get_ram_size().

Reused dram initialization functions from arch/arm/mach-imx/mx5/mx53_dram.c

Signed-off-by: Patrick Bruenn <p.bruenn@beckhoff.com>

diff --git a/arch/arm/mach-imx/mx5/Makefile b/arch/arm/mach-imx/mx5/Makefile
index 2cc2cbc07aa05bab17ea5ae814e422b89a21cafb..4e305e92cf50a9f9f56544846052a6f4860c5287 100644 (file)
--- a/arch/arm/mach-imx/mx5/Makefile
+++ b/arch/arm/mach-imx/mx5/Makefile
@@ -13,3 +13,4 @@ obj-y += lowlevel_init.o
 # common files for mx53 dram initialization
 obj-$(CONFIG_TARGET_M53EVK)     += mx53_dram.o
 obj-$(CONFIG_TARGET_MX53CX9020) += mx53_dram.o
+obj-$(CONFIG_TARGET_MX53LOCO)   += mx53_dram.o

diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index db0e2fbdd6d0ceca0c784c4bb5c1daffd76c443a..0beecf3459648349f1adddc6139a8e20a1b7a90d 100644 (file)
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -31,45 +31,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static uint32_t mx53_dram_size[2];
-
-phys_size_t get_effective_memsize(void)
-{
-       /*
-        * WARNING: We must override get_effective_memsize() function here
-        * to report only the size of the first DRAM bank. This is to make
-        * U-Boot relocator place U-Boot into valid memory, that is, at the
-        * end of the first DRAM bank. If we did not override this function
-        * like so, U-Boot would be placed at the address of the first DRAM
-        * bank + total DRAM size - sizeof(uboot), which in the setup where
-        * each DRAM bank contains 512MiB of DRAM would result in placing
-        * U-Boot into invalid memory area close to the end of the first
-        * DRAM bank.
-        */
-       return mx53_dram_size[0];
-}
-
-int dram_init(void)
-{
-       mx53_dram_size[0] = get_ram_size((void *)PHYS_SDRAM_1, 1 << 30);
-       mx53_dram_size[1] = get_ram_size((void *)PHYS_SDRAM_2, 1 << 30);
-
-       gd->ram_size = mx53_dram_size[0] + mx53_dram_size[1];
-
-       return 0;
-}
-
-int dram_init_banksize(void)
-{
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = mx53_dram_size[0];
-
-       gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-       gd->bd->bi_dram[1].size = mx53_dram_size[1];
-
-       return 0;
-}
-
 u32 get_board_rev(void)
 {
        struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;