| commit | 814003f9ca83d35162cf23c5540324496597e8a6 | [log] [tgz] |
|---|---|---|
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | Thu Nov 15 11:53:50 2018 +0000 |
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | Tue Nov 20 14:02:08 2018 +0000 |
| tree | 5692d392dc7bd795343c9f8efb2c3dd5952d6a54 | |
| parent | 957514d4f73cc05bc222ceb18de24c5d9bb16623 [diff] |
xlat v2: Synchronise code with TF Change-Id: Ibf4fffbfc025b205223d17a579f8cde386252199 Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/include/lib/xlat_tables/xlat_mmu_helpers.h b/include/lib/xlat_tables/xlat_mmu_helpers.h index ffb5abe..85effca 100644 --- a/include/lib/xlat_tables/xlat_mmu_helpers.h +++ b/include/lib/xlat_tables/xlat_mmu_helpers.h
@@ -54,7 +54,7 @@ #include <stdbool.h> #include <stdint.h> -#include <sys/types.h> +#include <string.h> /* * Return the values that the MMU configuration registers must contain for the
diff --git a/include/lib/xlat_tables/xlat_tables_defs.h b/include/lib/xlat_tables/xlat_tables_defs.h index d260c3e..09baae9 100644 --- a/include/lib/xlat_tables/xlat_tables_defs.h +++ b/include/lib/xlat_tables/xlat_tables_defs.h
@@ -170,4 +170,4 @@ #define XN_SHIFT 54 #define UXN_SHIFT XN_SHIFT -#endif /* __XLAT_TABLES_DEFS_H__ */ +#endif /* XLAT_TABLES_DEFS_H */
diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h index 4299c31..fa2f9f5 100644 --- a/include/lib/xlat_tables/xlat_tables_v2.h +++ b/include/lib/xlat_tables/xlat_tables_v2.h
@@ -110,10 +110,6 @@ #define MT_RO_DATA (MT_MEMORY | MT_RO | MT_EXECUTE_NEVER) #define MT_RW_DATA (MT_MEMORY | MT_RW | MT_EXECUTE_NEVER) -#if !ERROR_DEPRECATED -typedef unsigned int mmap_attr_t; -#endif - /* * Structure for specifying a single region of memory. */