diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-07-26 09:26:14 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-07-26 09:26:14 +0000 |
| commit | 4129340717c215f3cc3841e32ed0b6cd5baf7ffb (patch) | |
| tree | dcf0d8c9fac1ecfead38e02ec8d6539a5a5c9647 /include/plat | |
| parent | df7a906f8803640b23294a4e41ef177a1e6607b3 (diff) | |
| parent | 3c7dcdac5c50c45cb35111a01ecdd7fb93654cb3 (diff) | |
Merge changes from topic "advk-serror" into integration
* changes:
marvell/a3700: Prevent SError accessing PCIe link while it is down
marvell: Switch to xlat_tables_v2
Diffstat (limited to 'include/plat')
| -rw-r--r-- | include/plat/marvell/a3700/common/marvell_def.h | 2 | ||||
| -rw-r--r-- | include/plat/marvell/a3700/common/plat_marvell.h | 2 | ||||
| -rw-r--r-- | include/plat/marvell/a8k/common/marvell_def.h | 2 | ||||
| -rw-r--r-- | include/plat/marvell/a8k/common/plat_marvell.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/plat/marvell/a3700/common/marvell_def.h b/include/plat/marvell/a3700/common/marvell_def.h index 229b8b02..eb13ba8a 100644 --- a/include/plat/marvell/a3700/common/marvell_def.h +++ b/include/plat/marvell/a3700/common/marvell_def.h @@ -12,7 +12,7 @@ #include <arch.h> #include <common/tbbr/tbbr_img_def.h> -#include <lib/xlat_tables/xlat_tables.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #include <plat/common/common_def.h> /**************************************************************************** diff --git a/include/plat/marvell/a3700/common/plat_marvell.h b/include/plat/marvell/a3700/common/plat_marvell.h index 8b8b53ff..ea7cdcd4 100644 --- a/include/plat/marvell/a3700/common/plat_marvell.h +++ b/include/plat/marvell/a3700/common/plat_marvell.h @@ -13,7 +13,7 @@ #include <common/bl_common.h> #include <lib/cassert.h> #include <lib/el3_runtime/cpu_data.h> -#include <lib/xlat_tables/xlat_tables.h> +#include <lib/xlat_tables/xlat_tables_v2.h> /* * Extern declarations common to Marvell standard platforms diff --git a/include/plat/marvell/a8k/common/marvell_def.h b/include/plat/marvell/a8k/common/marvell_def.h index 5ba90f71..4eda01f1 100644 --- a/include/plat/marvell/a8k/common/marvell_def.h +++ b/include/plat/marvell/a8k/common/marvell_def.h @@ -12,7 +12,7 @@ #include <arch.h> #include <common/tbbr/tbbr_img_def.h> -#include <lib/xlat_tables/xlat_tables.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #include <plat/common/common_def.h> /****************************************************************************** diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h index 65d4de8a..5d805a7f 100644 --- a/include/plat/marvell/a8k/common/plat_marvell.h +++ b/include/plat/marvell/a8k/common/plat_marvell.h @@ -13,7 +13,7 @@ #include <lib/cassert.h> #include <lib/el3_runtime/cpu_data.h> #include <lib/utils.h> -#include <lib/xlat_tables/xlat_tables.h> +#include <lib/xlat_tables/xlat_tables_v2.h> /* * Extern declarations common to Marvell standard platforms |