sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: AM335x: Beaglebone: Fix memory setup for Beaglebone black 

Commit 0d6392de4a introduced a stripped
down device tree used for both white and black Beaglebone variants
that included the 256 MiB memory node from am335x-bone-common.dtsi.
This leads to the following error in the MLO:

    mmu: Critical Error: Can't request SDRAM region for ttb at 9fff4000

This patch removes the (for the Beaglebone black) invalid memory size
from the common device tree and instead registers the memory bank
manually in the board file.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Philipp Zabel 2014-06-16 17:13:54 +02:00 committed by Sascha Hauer
parent 3ee907d89e
commit cfd028800e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/boards/beaglebone/board.c
View File

@ -51,6 +51,23 @@ static int beaglebone_coredevice_init(void)
}
coredevice_initcall(beaglebone_coredevice_init);
static int beaglebone_mem_init(void)
{
uint32_t sdram_size;
if (!of_machine_is_compatible("ti,am335x-bone"))
return 0;
if (is_beaglebone_black())
sdram_size = SZ_512M;
else
sdram_size = SZ_256M;
arm_add_mem_device("ram0", 0x80000000, sdram_size);
return 0;
}
mem_initcall(beaglebone_mem_init);
static int beaglebone_devices_init(void)
{
int black;

5
arch/arm/dts/am335x-bone-common.dtsi
View File

@ -17,11 +17,6 @@
};
};
memory {
device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */
};
leds {
pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>;