diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2023-11-08 13:49:52 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-11-08 13:49:52 +0100 |
| commit | 7f26777702270f44c3508b2d4e412a01b7b234f2 (patch) | |
| tree | 7cec914ffb7de12e3aa27214b239084cce51c9d4 | |
| parent | dde37f2d76c97ecb3d1e0bfa0a86b0ef4bd0ca90 (diff) | |
| parent | 70524d3df60055b1026c2a44b365d8cd45c1e704 (diff) | |
Merge "build(qemu): use xlat tables v2 directly" into integration
| -rw-r--r-- | plat/qemu/common/qemu_private.h | 2 | ||||
| -rw-r--r-- | plat/qemu/common/qemu_spm.c | 2 | ||||
| -rw-r--r-- | plat/qemu/common/sp_min/sp_min_setup.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plat/qemu/common/qemu_private.h b/plat/qemu/common/qemu_private.h index c8912b22f..25b14e28b 100644 --- a/plat/qemu/common/qemu_private.h +++ b/plat/qemu/common/qemu_private.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include <lib/xlat_tables/xlat_tables_compat.h> +#include <lib/xlat_tables/xlat_tables_v2.h> void plat_qemu_io_setup(void); int qemu_io_register_sp_pkg(const char *name, const char *uuid, diff --git a/plat/qemu/common/qemu_spm.c b/plat/qemu/common/qemu_spm.c index c66f47ebc..abedbe4a7 100644 --- a/plat/qemu/common/qemu_spm.c +++ b/plat/qemu/common/qemu_spm.c @@ -9,7 +9,7 @@ #include <common/debug.h> #include <common/fdt_fixup.h> #include <common/fdt_wrappers.h> -#include <lib/xlat_tables/xlat_tables_compat.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #include <services/spm_mm_partition.h> #include <platform_def.h> diff --git a/plat/qemu/common/sp_min/sp_min_setup.c b/plat/qemu/common/sp_min/sp_min_setup.c index 7ec657b79..d0c38e026 100644 --- a/plat/qemu/common/sp_min/sp_min_setup.c +++ b/plat/qemu/common/sp_min/sp_min_setup.c @@ -16,7 +16,7 @@ #include <drivers/arm/gicv2.h> #include <drivers/console.h> #include <lib/mmio.h> -#include <lib/xlat_tables/xlat_tables.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #include <plat/common/platform.h> #include "../qemu_private.h" |