aboutsummaryrefslogtreecommitdiff
path: root/plat/hisilicon/hikey/aarch64
diff options
context:
space:
mode:
authorMichael Brandl <git@fineon.pw>2018-02-22 16:30:30 +0100
committergitfineon <gitfineon@iuga.eu>2018-03-12 13:19:00 +0100
commit4368ae07baf455d2939212ffa739113bc572c101 (patch)
tree110bf508b028866280c696998d9f0748fe6bdf77 /plat/hisilicon/hikey/aarch64
parent16b05e94a2d1757cbb98de068c662d58a6919613 (diff)
downloadtrusted-firmware-a-4368ae07baf455d2939212ffa739113bc572c101.tar.gz
plat/hikey: boot memory layout to dedicated file
Boot memory layout is specific for a platform, but should not be mixed up with other platform specific attributes. A separate file is much cleaner and better to compare with other platforms. Take a look at plat/poplar where it is done the same way. Moved hikey_def.h to system include folder and moved includes from hikey_def.h to more general platform_def.h. Signed-off-by: Michael Brandl <git@fineon.pw>
Diffstat (limited to 'plat/hisilicon/hikey/aarch64')
-rw-r--r--plat/hisilicon/hikey/aarch64/hikey_common.c5
-rw-r--r--plat/hisilicon/hikey/aarch64/hikey_helpers.S4
2 files changed, 4 insertions, 5 deletions
diff --git a/plat/hisilicon/hikey/aarch64/hikey_common.c b/plat/hisilicon/hikey/aarch64/hikey_common.c
index f95af5870f..658760b5a7 100644
--- a/plat/hisilicon/hikey/aarch64/hikey_common.c
+++ b/plat/hisilicon/hikey/aarch64/hikey_common.c
@@ -9,13 +9,12 @@
#include <assert.h>
#include <bl_common.h>
#include <debug.h>
+#include <hikey_def.h>
+#include <hikey_layout.h>
#include <mmio.h>
#include <platform.h>
-#include <platform_def.h>
#include <xlat_tables.h>
-#include "../hikey_def.h"
-
#define MAP_DDR MAP_REGION_FLAT(DDR_BASE, \
DDR_SIZE - DDR_SEC_SIZE, \
MT_DEVICE | MT_RW | MT_NS)
diff --git a/plat/hisilicon/hikey/aarch64/hikey_helpers.S b/plat/hisilicon/hikey/aarch64/hikey_helpers.S
index 680c0a1d49..32ff8b40cd 100644
--- a/plat/hisilicon/hikey/aarch64/hikey_helpers.S
+++ b/plat/hisilicon/hikey/aarch64/hikey_helpers.S
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <arch.h>
#include <asm_macros.S>
-#include "../hikey_def.h"
+#include <hikey_def.h>
.globl plat_my_core_pos
.globl platform_mem_init