aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2020-02-27 08:48:44 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-02-27 08:48:44 +0000
commit953347792146abb23ae3cc8ff291f1dc2f33a1a9 (patch)
tree8d062e42c753e8e9ab7cab035ed1b1295f8dae92 /plat
parent74013057aa0f38f1d82a8acd884c0b23f837316f (diff)
parent73e5cb494d3d49ba05ecb3fc9707544e29e50c89 (diff)
downloadtf-a-tests-953347792146abb23ae3cc8ff291f1dc2f33a1a9.tar.gz
Merge changes from topic "gic_update"
* changes: Max SPI INTID is 1019 Switch AARCH32/AARCH64 to __aarch64__
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/fvp/fvp_mem_prot.c4
-rw-r--r--plat/arm/fvp/include/platform_def.h4
-rw-r--r--plat/arm/juno/include/platform_def.h6
-rw-r--r--plat/arm/juno/juno_mem_prot.c4
-rw-r--r--plat/common/plat_common.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/plat/arm/fvp/fvp_mem_prot.c b/plat/arm/fvp/fvp_mem_prot.c
index 6a7d651ef..2682ba92e 100644
--- a/plat/arm/fvp/fvp_mem_prot.c
+++ b/plat/arm/fvp/fvp_mem_prot.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -14,7 +14,7 @@
static const mem_region_t fvp_ram_ranges[] = {
{NS_IMAGE_LIMIT, 1 << ONE_GB_SHIFT},
-#ifdef AARCH64
+#ifdef __aarch64__
{FVP_DRAM2_BASE, 1 << ONE_GB_SHIFT},
#endif
};
diff --git a/plat/arm/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h
index b6c926bc7..d5dc81840 100644
--- a/plat/arm/fvp/include/platform_def.h
+++ b/plat/arm/fvp/include/platform_def.h
@@ -19,7 +19,7 @@
/*******************************************************************************
* Platform binary types for linking
******************************************************************************/
-#ifndef AARCH32
+#ifdef __aarch64__
#define PLATFORM_LINKER_FORMAT "elf64-littleaarch64"
#define PLATFORM_LINKER_ARCH aarch64
#else
@@ -177,7 +177,7 @@
/*******************************************************************************
* Platform specific page table and MMU setup constants
******************************************************************************/
-#if AARCH64
+#ifdef __aarch64__
#define PLAT_PHY_ADDR_SPACE_SIZE (ULL(1) << 34)
#define PLAT_VIRT_ADDR_SPACE_SIZE (ULL(1) << 34)
#else
diff --git a/plat/arm/juno/include/platform_def.h b/plat/arm/juno/include/platform_def.h
index 4be864595..03a71246b 100644
--- a/plat/arm/juno/include/platform_def.h
+++ b/plat/arm/juno/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -19,7 +19,7 @@
/*******************************************************************************
* Platform binary types for linking
******************************************************************************/
-#ifndef AARCH32
+#ifdef __aarch64__
#define PLATFORM_LINKER_FORMAT "elf64-littleaarch64"
#define PLATFORM_LINKER_ARCH aarch64
#else
@@ -171,7 +171,7 @@
/*******************************************************************************
* Platform specific page table and MMU setup constants
******************************************************************************/
-#if AARCH64
+#ifdef __aarch64__
#define PLAT_PHY_ADDR_SPACE_SIZE (ULL(1) << 34)
#define PLAT_VIRT_ADDR_SPACE_SIZE (ULL(1) << 34)
#else
diff --git a/plat/arm/juno/juno_mem_prot.c b/plat/arm/juno/juno_mem_prot.c
index f0e350673..3570e38fc 100644
--- a/plat/arm/juno/juno_mem_prot.c
+++ b/plat/arm/juno/juno_mem_prot.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -14,7 +14,7 @@
static const mem_region_t juno_ram_ranges[] = {
{NS_IMAGE_LIMIT, 128 << TWO_MB_SHIFT},
-#ifdef AARCH64
+#ifdef __aarch64__
{JUNO_DRAM2_BASE, 1 << ONE_GB_SHIFT},
#endif
};
diff --git a/plat/common/plat_common.c b/plat/common/plat_common.c
index 4cfbebbf3..b6cfec30c 100644
--- a/plat/common/plat_common.c
+++ b/plat/common/plat_common.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -112,7 +112,7 @@ void tftf_plat_configure_mmu(void)
void tftf_plat_enable_mmu(void)
{
-#ifndef AARCH32
+#ifdef __aarch64__
if (IS_IN_EL1())
enable_mmu_el1(0);
else if (IS_IN_EL2())