diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-05-16 08:33:56 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-05-16 08:33:56 +0000 |
| commit | 482fc9c88840c7d9c74e1fa57a8e25a291cc02be (patch) | |
| tree | 1baf224d58fe4d1c4ab0f5b8d46f83bc53ccaca4 /include | |
| parent | d8b11091b6f9032c16fdc54218ceda10d21e3355 (diff) | |
| parent | 603b372e5349ef4bfc2fbea395787d64620a73d3 (diff) | |
| download | platform_external_arm-trusted-firmware-482fc9c88840c7d9c74e1fa57a8e25a291cc02be.tar.gz platform_external_arm-trusted-firmware-482fc9c88840c7d9c74e1fa57a8e25a291cc02be.tar.bz2 platform_external_arm-trusted-firmware-482fc9c88840c7d9c74e1fa57a8e25a291cc02be.zip | |
Merge changes from topic "sami/550_fix_n1sdp_issues_v1" into integration
* changes:
N1SDP: Initialise CNTFRQ in Non Secure CNTBaseN
N1SDP: Fix DRAM2 start address
Add option for defining platform DRAM2 base
Disable speculative loads only if SSBS is supported
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/board/common/board_css_def.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/plat/arm/board/common/board_css_def.h b/include/plat/arm/board/common/board_css_def.h index 452afbcc8..f982b57b4 100644 --- a/include/plat/arm/board/common/board_css_def.h +++ b/include/plat/arm/board/common/board_css_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -54,7 +54,7 @@ * Required platform porting definitions common to all ARM CSS-based * development platforms */ - +#define PLAT_ARM_DRAM2_BASE ULL(0x880000000) #define PLAT_ARM_DRAM2_SIZE ULL(0x180000000) /* UART related constants */ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 62623c1bf..69a9959ad 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -148,7 +148,7 @@ #define ARM_DRAM1_END (ARM_DRAM1_BASE + \ ARM_DRAM1_SIZE - 1) -#define ARM_DRAM2_BASE UL(0x880000000) +#define ARM_DRAM2_BASE PLAT_ARM_DRAM2_BASE #define ARM_DRAM2_SIZE PLAT_ARM_DRAM2_SIZE #define ARM_DRAM2_END (ARM_DRAM2_BASE + \ ARM_DRAM2_SIZE - 1) |