|
@@ -31,24 +31,41 @@
|
|
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
|
-int dram_init(void)
|
|
|
+static uint32_t mx53_dram_size[2];
|
|
|
+
|
|
|
+phys_size_t get_effective_memsize(void)
|
|
|
{
|
|
|
- u32 size1, size2;
|
|
|
+ /*
|
|
|
+ * 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];
|
|
|
+}
|
|
|
|
|
|
- size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
|
|
|
- size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
|
|
|
+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 = size1 + size2;
|
|
|
+ gd->ram_size = mx53_dram_size[0] + mx53_dram_size[1];
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+
|
|
|
void dram_init_banksize(void)
|
|
|
{
|
|
|
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
|
|
|
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
|
|
|
+ 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 = PHYS_SDRAM_2_SIZE;
|
|
|
+ gd->bd->bi_dram[1].size = mx53_dram_size[1];
|
|
|
}
|
|
|
|
|
|
static void setup_iomux_uart(void)
|