From 7b5237f9ff477c0774cb70c7e482ea072407ba2b Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Mon, 23 Jun 2014 10:27:54 +0200 Subject: [PATCH] hw: add CSU I/O memory to core's memory regions The central security regions has to be mapped when starting the hw-kernel on the i.MX53 and using the TrustZone mechanisms. Ref #1182 --- repos/base-hw/src/core/imx53/trustzone/platform_support.cc | 3 +++ repos/base-hw/src/core/imx53/trustzone/trustzone.cc | 2 +- repos/base/include/platform/imx53/drivers/board_base.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/repos/base-hw/src/core/imx53/trustzone/platform_support.cc b/repos/base-hw/src/core/imx53/trustzone/platform_support.cc index 9bea14a99..6d5258aaf 100644 --- a/repos/base-hw/src/core/imx53/trustzone/platform_support.cc +++ b/repos/base-hw/src/core/imx53/trustzone/platform_support.cc @@ -59,6 +59,9 @@ Native_region * Platform::_core_only_mmio_regions(unsigned const i) /* vm state memory */ { Trustzone::VM_STATE_BASE, Trustzone::VM_STATE_SIZE }, + + /* central security unit */ + { Board::CSU_BASE, Board::CSU_SIZE }, }; return i < sizeof(_regions)/sizeof(_regions[0]) ? &_regions[i] : 0; } diff --git a/repos/base-hw/src/core/imx53/trustzone/trustzone.cc b/repos/base-hw/src/core/imx53/trustzone/trustzone.cc index 562c87e67..b98fd1e57 100644 --- a/repos/base-hw/src/core/imx53/trustzone/trustzone.cc +++ b/repos/base-hw/src/core/imx53/trustzone/trustzone.cc @@ -49,5 +49,5 @@ void Kernel::init_trustzone(Pic * pic) } /* configure central security unit */ - Genode::Csu csu(0x63f9c000); + Genode::Csu csu(Imx53::Board::CSU_BASE); } diff --git a/repos/base/include/platform/imx53/drivers/board_base.h b/repos/base/include/platform/imx53/drivers/board_base.h index ab3256193..82b0025fa 100644 --- a/repos/base/include/platform/imx53/drivers/board_base.h +++ b/repos/base/include/platform/imx53/drivers/board_base.h @@ -103,6 +103,9 @@ namespace Genode IIM_BASE = 0x63f98000, IIM_SIZE = 0x00004000, + CSU_BASE = 0x63f9c000, + CSU_SIZE = 0x00001000, + M4IF_BASE = 0x63fd8000, M4IF_SIZE = 0x00001000,