summaryrefslogtreecommitdiff
path: root/plat/layerscape
diff options
context:
space:
mode:
Diffstat (limited to 'plat/layerscape')
-rw-r--r--plat/layerscape/board/ls1043/include/soc_tzasc.h11
-rw-r--r--plat/layerscape/common/include/tzc380.h19
2 files changed, 9 insertions, 21 deletions
diff --git a/plat/layerscape/board/ls1043/include/soc_tzasc.h b/plat/layerscape/board/ls1043/include/soc_tzasc.h
index b2483d98..46dfba0f 100644
--- a/plat/layerscape/board/ls1043/include/soc_tzasc.h
+++ b/plat/layerscape/board/ls1043/include/soc_tzasc.h
@@ -7,8 +7,6 @@
#ifndef SOC_TZASC_H
#define SOC_TZASC_H
-#include "tzc380.h"
-
#define MAX_NUM_TZC_REGION 3
/* TZASC related constants */
@@ -58,6 +56,15 @@
#define CCI_TERMINATE_BARRIER_TX 0x8
#define CONFIG_SYS_FSL_TZASC_ADDR 0x1500000
+struct tzc380_reg {
+ unsigned int secure;
+ unsigned int enabled;
+ unsigned int low_addr;
+ unsigned int high_addr;
+ unsigned int size;
+ unsigned int sub_mask;
+};
+
/* List of MAX_NUM_TZC_REGION TZC regions' boundaries and configurations. */
static const struct tzc380_reg tzc380_reg_list[] = {
diff --git a/plat/layerscape/common/include/tzc380.h b/plat/layerscape/common/include/tzc380.h
deleted file mode 100644
index 88063a97..00000000
--- a/plat/layerscape/common/include/tzc380.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef TZC380_H
-#define TZC380_H
-
-struct tzc380_reg {
- unsigned int secure;
- unsigned int enabled;
- unsigned int low_addr;
- unsigned int high_addr;
- unsigned int size;
- unsigned int sub_mask;
-};
-
-#endif /* TZC380_H */