ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw: remove memory region duplicate (fix #1304) 

On the Versatile Express Cortex A9x4 platform the first memory region
0x0 - 0x4000000 is a hardware remapped memory area, containing flash
and DDR RAM copies and thus should not be added in addition to all
DDR RAM regions and the SRAM region.
This commit is contained in:
Stefan Kalkowski 2014-11-27 09:45:45 +01:00 committed by Christian Helmuth
parent 604b831e1e
commit 4d3fa001e0
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/base-hw/include/platform/vea9x4/drivers/trustzone.h
View File

@ -20,8 +20,8 @@
namespace Trustzone
{
enum {
SECURE_RAM_BASE = Genode::Board_base::RAM_3_BASE,
SECURE_RAM_SIZE = Genode::Board_base::RAM_3_SIZE,
SECURE_RAM_BASE = Genode::Board_base::RAM_2_BASE,
SECURE_RAM_SIZE = Genode::Board_base::RAM_2_SIZE,
NONSECURE_RAM_BASE = 0x80000000,
NONSECURE_RAM_SIZE = 0x20000000,
};

3
repos/base-hw/src/core/spec/vea9x4/platform_support.cc
View File

@ -26,8 +26,7 @@ Native_region * Platform::_ram_regions(unsigned const i)
{
{ Board::RAM_0_BASE, Board::RAM_0_SIZE },
{ Board::RAM_1_BASE, Board::RAM_1_SIZE },
{ Board::RAM_2_BASE, Board::RAM_2_SIZE },
{ Board::RAM_3_BASE, Board::RAM_3_SIZE }
{ Board::RAM_2_BASE, Board::RAM_2_SIZE }
};
return i < sizeof(_regions)/sizeof(_regions[0]) ? &_regions[i] : 0;
}

14
repos/base/include/platform/vea9x4/drivers/board_base.h
View File

@ -32,14 +32,12 @@ namespace Genode
MMIO_1_SIZE = 0x04000000,
/* RAM */
RAM_0_BASE = 0x00000000,
RAM_0_SIZE = 0x04000000,
RAM_1_BASE = 0x60000000,
RAM_1_SIZE = 0x20000000,
RAM_2_BASE = 0x84000000,
RAM_2_SIZE = 0x1c000000,
RAM_3_BASE = 0x48000000,
RAM_3_SIZE = 0x02000000,
RAM_0_BASE = 0x60000000,
RAM_0_SIZE = 0x20000000,
RAM_1_BASE = 0x84000000,
RAM_1_SIZE = 0x1c000000,
RAM_2_BASE = 0x48000000,
RAM_2_SIZE = 0x02000000,
/* UART */
PL011_0_MMIO_BASE = MMIO_0_BASE + 0x9000,